Fix returns 500 error for AI agent APIs when OpenSearch returns 4xx error with json format error message #380
+702
−20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ode with json format error message Signed-off-by: gaobinlong <[email protected]>
gaobinlong
requested review from
lezzago,
joshuali925,
anirudha,
ruanyl,
SuZhou-Joe,
xluo-aws,
Hailong-am,
wanglam and
raintygao
as code owners
Signed-off-by: gaobinlong <[email protected]>
ruanyl
approved these changes
Dec 26, 2024
xluo-aws
reviewed
Dec 26, 2024
| statusCode: e.statusCode, | ||
| headers: e.headers, | ||
| }); | ||
| } else { | ||
| return res.customError({ | ||
| body: 'Execute agent failed!', | ||
| statusCode: 500, |
There was a problem hiding this comment.
Should we return original statusCode? As long as we don't disclose server side information, we should be fine.
|
I will merge now, will address @xluo-aws concern in a separate PR |
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Dec 27, 2024
…rror with json format error message (#380) * Fix returns 500 error for AI agent APIs when OpenSearch returns 4xx code with json format error message Signed-off-by: gaobinlong <[email protected]> * Modify change log Signed-off-by: gaobinlong <[email protected]> --------- Signed-off-by: gaobinlong <[email protected]> (cherry picked from commit ffa509b) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md
ruanyl
pushed a commit
that referenced
this pull request
Dec 27, 2024
…rror with json format error message (#380) (#381) * Fix returns 500 error for AI agent APIs when OpenSearch returns 4xx code with json format error message Signed-off-by: gaobinlong <[email protected]> * Modify change log Signed-off-by: gaobinlong <[email protected]> --------- Signed-off-by: gaobinlong <[email protected]> (cherry picked from commit ffa509b) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
In this PR:#373, we returns 4xx error for the AI agent APIs when the execute agent API in ml-commons plugin responds with a 4xx error, but previously, the execute agent API in ml-commons plugin returns string format error message if the request failed, now it changed to json format, this triggers different condition here in OSD-core, so we the AI agent APIs return 500 internal error because the custom response body doesn't have a
messagefield, this PR fixed the bug.In addition, when customizing the response,
headersis not needed because the headers comes from ml-commons API, that is useless for node APIs.Issues Resolved
No issue.
Check List
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.