Skip to content

[BUG] Agent Framework: Handle model response when toolUse is not accompanied by text#3755

Merged
ylwu-amzn merged 2 commits intoopensearch-project:mainfrom
pyek-bot:bug_fix_no_text_with_tooluse
Apr 26, 2025
Merged

[BUG] Agent Framework: Handle model response when toolUse is not accompanied by text#3755
ylwu-amzn merged 2 commits intoopensearch-project:mainfrom
pyek-bot:bug_fix_no_text_with_tooluse

Conversation

@pyek-bot
Copy link
Copy Markdown
Collaborator

Description

Fix for when model doesn't return a text along with a toolUse request.

Example failure payload:

{"metrics":{"latencyMs":2875},"output":{"message":{"content":[{"toolUse":{"input":{"index":"ss4o_logs-2025.04.18","query":{"size":10,"_source":["body","time","severityText","log.attributes","resource.attributes.service.name"],"query":{"bool":{"must":[{"wildcard":{"body":"*cart*"}},{"term":{"severityText":"ERROR"}}]}}}},"name":"SearchIndexTool","toolUseId":"tooluse_c33B609fSbCsgDeTTj8VmA"}}],"role":"assistant"}},"stopReason":"tool_use","usage":{"cacheReadInputTokenCount":0,"cacheReadInputTokens":0,"cacheWriteInputTokenCount":0,"cacheWriteInputTokens":0,"inputTokens":9000,"outputTokens":152,"totalTokens":9152}}

Related Issues

Resolves #3751

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env-require-approval April 23, 2025 00:00 — with GitHub Actions Failure
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env-require-approval April 23, 2025 00:00 — with GitHub Actions Error
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env-require-approval April 23, 2025 00:00 — with GitHub Actions Failure
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env-require-approval April 23, 2025 00:00 — with GitHub Actions Error
Object response;
boolean isToolUseResponse = false;
try {
response = JsonPath.read(dataAsMap, parameters.get(LLM_RESPONSE_FILTER));
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it easier just to check if LLM_RESPONSE_FILTER in parameters.keys then get the response, else you read from the TOOL_CALLS_PATH? this exception is not necessary

Copy link
Copy Markdown
Collaborator

@mingshl mingshl Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

boolean hasResponseFilter = parameters.containsKey(LLM_RESPONSE_FILTER);

if (hasResponseFilter) {
    response = JsonPath.read(dataAsMap, parameters.get(LLM_RESPONSE_FILTER));
} else {
    response = JsonPath.read(dataAsMap, parameters.get(TOOL_CALLS_PATH));
}

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

both of the keys will be present in the map for all models supporting function calling:

LLM_RESPONSE_FILTER points to where we can fetch the text returned by the model. Once we fetch the text, the logic checks for whether there is a toolUse block after or not.

TOOL_CALLS_PATH points to where we can fetch a toolUse block returned by the model.

For example, these are values for claude
LLM_RESPONSE_FILTER: $.choices[0].message.content
TOOL_CALLS_PATH: $.choices[0].message.tool_calls

Before this fix, we would always look for LLM_RESPONSE_FILTER and in the case of this payload:

{"metrics":{"latencyMs":2875},"output":{"message":{"content":[{"toolUse":{"input":{"index":"ss4o_logs-2025.04.18","query":{"size":10,"_source":["body","time","severityText","log.attributes","resource.attributes.service.name"],"query":{"bool":{"must":[{"wildcard":{"body":"*cart*"}},{"term":{"severityText":"ERROR"}}]}}}},"name":"SearchIndexTool","toolUseId":"tooluse_c33B609fSbCsgDeTTj8VmA"}}],"role":"assistant"}},"stopReason":"tool_use","usage":{"cacheReadInputTokenCount":0,"cacheReadInputTokens":0,"cacheWriteInputTokenCount":0,"cacheWriteInputTokens":0,"inputTokens":9000,"outputTokens":152,"totalTokens":9152}}

It would lead to an error since there is no text field. Therefore, we then check for toolUse path. This is required as different models have a different response format. A better way to handle this would be to first check for a parent path like $.choices[0].message which might contain both the text and toolUse as children. However, this is not guaranteed as the response heavily depends on the model. Hence, the try-catch.

Signed-off-by: Pavan Yekbote <pybot@amazon.com>
@pyek-bot pyek-bot force-pushed the bug_fix_no_text_with_tooluse branch 2 times, most recently from f5b7674 to 22dc728 Compare April 25, 2025 18:17
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 18:19 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 18:19 — with GitHub Actions Inactive
@pyek-bot pyek-bot had a problem deploying to ml-commons-cicd-env-require-approval April 25, 2025 18:19 — with GitHub Actions Failure
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 18:19 — with GitHub Actions Inactive
ylwu-amzn
ylwu-amzn previously approved these changes Apr 25, 2025
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 25, 2025

Codecov Report

Attention: Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Project coverage is 78.24%. Comparing base (9e417e6) to head (0b565a3).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
...nsearch/ml/engine/algorithms/agent/AgentUtils.java 85.71% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #3755      +/-   ##
============================================
+ Coverage     78.12%   78.24%   +0.12%     
- Complexity     7156     7161       +5     
============================================
  Files           631      631              
  Lines         32211    32216       +5     
  Branches       3660     3660              
============================================
+ Hits          25164    25207      +43     
+ Misses         5492     5452      -40     
- Partials       1555     1557       +2     
Flag Coverage Δ
ml-commons 78.24% <85.71%> (+0.12%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Signed-off-by: Pavan Yekbote <pybot@amazon.com>
@pyek-bot
Copy link
Copy Markdown
Collaborator Author

Added a testcase to validate 3 cases for the 3 models:

  1. Only tooluse
  2. Only text
  3. Both tooluse and text

@ylwu-amzn can you review again please? thanks!

@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 20:55 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 20:55 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 20:55 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 20:55 — with GitHub Actions Inactive
@pyek-bot
Copy link
Copy Markdown
Collaborator Author

Please add 3.0 backport label!

@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 23:22 — with GitHub Actions Inactive
@pyek-bot pyek-bot temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 23:22 — with GitHub Actions Inactive
@ylwu-amzn ylwu-amzn merged commit 736bf10 into opensearch-project:main Apr 26, 2025
13 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 26, 2025
…mpanied by text (#3755)

* fix: handle model response when toolUse is not accompanied by text

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* feat: add test case for parseLLMOutput

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

---------

Signed-off-by: Pavan Yekbote <pybot@amazon.com>
(cherry picked from commit 736bf10)
dhrubo-os pushed a commit that referenced this pull request Apr 28, 2025
…mpanied by text (#3755) (#3783)

* fix: handle model response when toolUse is not accompanied by text



* feat: add test case for parseLLMOutput



---------


(cherry picked from commit 736bf10)

Signed-off-by: Pavan Yekbote <pybot@amazon.com>
Co-authored-by: Pavan Yekbote <pybot@amazon.com>
dhrubo-os added a commit that referenced this pull request May 8, 2025
* [BUG] Agent Framework: Handle model response when toolUse is not accompanied by text (#3755)

* fix: handle model response when toolUse is not accompanied by text

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* feat: add test case for parseLLMOutput

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

---------

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* [BUG] Allow user to control react agent max_interations value to prevent empty response (#3756)

* fix: expose max_iteration for react

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* fix: defaults for agent execution and differentiate between step and step result

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* fix: return react agent id in agent response to expose more details

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* spotless

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* fix: remove test prompt from react system prompt

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* refactor: rename parameters exposed to user to executor

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* fix: give user complete control over planner system prompt

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

---------

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* Clean up JSM from MCP (#3773)

Signed-off-by: rithin-pullela-aws <rithinp@amazon.com>

* [Bug] ListTools call does not return tool attributes (#3785)

* initial commit for MCP server in OpenSearch (#3781)

* initial commit for MCP server in OpenSearch

Signed-off-by: zane-neo <zaniu@amazon.com>

* Make change to support register or remove tools across cluster

Signed-off-by: zane-neo <zaniu@amazon.com>

* format code

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix UT failure caused by code change

Signed-off-by: zane-neo <zaniu@amazon.com>

* format code

Signed-off-by: zane-neo <zaniu@amazon.com>

* format code

Signed-off-by: zane-neo <zaniu@amazon.com>

* add license header

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix notifications initialized not respond issue

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix minor issues and add UTs

Signed-off-by: zane-neo <zaniu@amazon.com>

* Add more UTs

Signed-off-by: zane-neo <zaniu@amazon.com>

---------

Signed-off-by: zane-neo <zaniu@amazon.com>

* Remove beta1 qualifier (#3794) (#3795)

(cherry picked from commit 3f503f1)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

* [AUTO] Increment version to 3.1.0-SNAPSHOT (#3789)

* Increment version to 3.1.0-SNAPSHOT

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* Update build.gradle

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

---------

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

* add release note for 3.0 (#3792)

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

* support MCP session management (#3803)

* support MCP session management

Signed-off-by: zane-neo <zaniu@amazon.com>

* Addressing comments

Signed-off-by: zane-neo <zaniu@amazon.com>

* add feature flag for mcp server and renaming mcp connector feature flag

Signed-off-by: zane-neo <zaniu@amazon.com>

* Address critical comments in #3781

Signed-off-by: zane-neo <zaniu@amazon.com>

---------

Signed-off-by: zane-neo <zaniu@amazon.com>

* upgrade http client to version align with core (#3809)

* upgrade http client to versoin align with core

Signed-off-by: zane-neo <zaniu@amazon.com>

* upgrade httpclient-h2 to correct versiono

Signed-off-by: zane-neo <zaniu@amazon.com>

* use placeholder approach

Signed-off-by: zane-neo <zaniu@amazon.com>

---------

Signed-off-by: zane-neo <zaniu@amazon.com>

* support customized message endpoint and addressing comments (#3810)

* support customized message endpoint and addressing comments

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix UT failures

Signed-off-by: zane-neo <zaniu@amazon.com>

* add files to jacoco exception

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix tool name issue and optimize register tool api

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix schema not parsed correctly issue and NPE when parameters is null

Signed-off-by: zane-neo <zaniu@amazon.com>

* fix failure UT

Signed-off-by: zane-neo <zaniu@amazon.com>

---------

Signed-off-by: zane-neo <zaniu@amazon.com>

* excluding circuit breaker for Agent (#3814)

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

* change release note (#3811)

* change release note

Signed-off-by: zane-neo <zaniu@amazon.com>

* Update opensearch-ml-common.release-notes-3.0.0.0.md

* Update opensearch-ml-common.release-notes-3.0.0.0.md

* Update opensearch-ml-common.release-notes-3.0.0.0.md

---------

Signed-off-by: zane-neo <zaniu@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

* Downgrade MCP version to 0.9 (#3821)

Signed-off-by: rithin-pullela-aws <rithinp@amazon.com>

* remove libs folder (#3824)

Signed-off-by: Yaliang Wu <ylwu@amazon.com>

* add more logging to deploy/undeploy flows for better debugging (#3825)

* add more logging to deploy/undeploy flows for better debugging

Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

* Fix python client not able to connect to MCP server issue (#3822)

Signed-off-by: zane-neo <zaniu@amazon.com>
Co-authored-by: Dhrubo Saha <dhrubo@amazon.com>

* exclude trusted connector check for hidden model (#3838)

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

* adding tenantId to the connector executor when this is inline connector (#3837)

* adding tenantId to the connector executor when this is inline connector

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

* added more unit tests

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

---------

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

---------

Signed-off-by: Pavan Yekbote <pybot@amazon.com>
Signed-off-by: rithin-pullela-aws <rithinp@amazon.com>
Signed-off-by: zane-neo <zaniu@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>
Signed-off-by: Yaliang Wu <ylwu@amazon.com>
Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
Co-authored-by: Pavan Yekbote <pybot@amazon.com>
Co-authored-by: Rithin Pullela <rithinp@amazon.com>
Co-authored-by: zane-neo <zaniu@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: Mingshi Liu <mingshl@amazon.com>
Co-authored-by: Yaliang Wu <ylwu@amazon.com>
Co-authored-by: Bhavana Goud Ramaram <rbhavna@amazon.com>
akolarkunnu pushed a commit to akolarkunnu/ml-commons that referenced this pull request Jun 6, 2025
…mpanied by text (opensearch-project#3755)

* fix: handle model response when toolUse is not accompanied by text

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

* feat: add test case for parseLLMOutput

Signed-off-by: Pavan Yekbote <pybot@amazon.com>

---------

Signed-off-by: Pavan Yekbote <pybot@amazon.com>
Signed-off-by: Abdul Muneer Kolarkunnu <muneer.kolarkunnu@netapp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Agent Framework: When model responds only with a toolUse block without any text agent execution fails.

4 participants