Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

system error handling #1893

Merged
merged 7 commits into from
Feb 6, 2024
Merged

Conversation

jngz-es
Copy link
Collaborator

@jngz-es jngz-es commented Jan 21, 2024

Description

Catch all system error from agent when executing and wrap them into ErrorMessage to reply.
Tested on local testing cluster.

Some examples:

Old:
{
"error": {
"root_cause": [
{
"type": "illegal_argument_exception",
"reason": "Tool not found: VectorDBTool"
}
],
"type": "illegal_argument_exception",
"reason": "Tool not found: VectorDBTool"
},
"status": 400
}

New:
"{\n "error": {\n "reason": "Invalid Request",\n "details": "Tool not found: VectorDBTool",\n "type": "IllegalArgumentException"\n },\n "status": 400\n}"

Old:
{
"inference_results": [
{
"output": [
{
"result": """ ..."""
}
]
}
]
}

New:
{
"inference_results": [
{
"output": [
{
"name": "response",
"result": "..."
}
]
}
]
}

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Jing Zhang <[email protected]>
Signed-off-by: Jing Zhang <[email protected]>
@jngz-es jngz-es had a problem deploying to ml-commons-cicd-env February 6, 2024 05:57 — with GitHub Actions Failure
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 05:57 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 05:57 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 05:57 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 06:24 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 06:24 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 06:25 — with GitHub Actions Inactive
@jngz-es jngz-es merged commit c2a1d82 into opensearch-project:main Feb 6, 2024
11 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 6, 2024
* system error handling

Signed-off-by: Jing Zhang <[email protected]>

* remove NullPointerException from client error

Signed-off-by: Jing Zhang <[email protected]>

* replace jsonobject with ObjectMapper

Signed-off-by: Jing Zhang <[email protected]>

* add more UT

Signed-off-by: Jing Zhang <[email protected]>

* fix format issue

Signed-off-by: Jing Zhang <[email protected]>

* spotless

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c2a1d82)
jngz-es added a commit that referenced this pull request Feb 6, 2024
* system error handling

Signed-off-by: Jing Zhang <[email protected]>

* remove NullPointerException from client error

Signed-off-by: Jing Zhang <[email protected]>

* replace jsonobject with ObjectMapper

Signed-off-by: Jing Zhang <[email protected]>

* add more UT

Signed-off-by: Jing Zhang <[email protected]>

* fix format issue

Signed-off-by: Jing Zhang <[email protected]>

* spotless

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c2a1d82)

Co-authored-by: Jing Zhang <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 7, 2024
* system error handling

Signed-off-by: Jing Zhang <[email protected]>

* remove NullPointerException from client error

Signed-off-by: Jing Zhang <[email protected]>

* replace jsonobject with ObjectMapper

Signed-off-by: Jing Zhang <[email protected]>

* add more UT

Signed-off-by: Jing Zhang <[email protected]>

* fix format issue

Signed-off-by: Jing Zhang <[email protected]>

* spotless

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c2a1d82)
ylwu-amzn pushed a commit that referenced this pull request Feb 8, 2024
* system error handling

Signed-off-by: Jing Zhang <[email protected]>

* remove NullPointerException from client error

Signed-off-by: Jing Zhang <[email protected]>

* replace jsonobject with ObjectMapper

Signed-off-by: Jing Zhang <[email protected]>

* add more UT

Signed-off-by: Jing Zhang <[email protected]>

* fix format issue

Signed-off-by: Jing Zhang <[email protected]>

* spotless

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit c2a1d82)

Co-authored-by: Jing Zhang <[email protected]>
@jngz-es jngz-es deleted the error_handling branch February 21, 2024 17:29
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Mar 19, 2024
* system error handling

Signed-off-by: Jing Zhang <[email protected]>

* remove NullPointerException from client error

Signed-off-by: Jing Zhang <[email protected]>

* replace jsonobject with ObjectMapper

Signed-off-by: Jing Zhang <[email protected]>

* add more UT

Signed-off-by: Jing Zhang <[email protected]>

* fix format issue

Signed-off-by: Jing Zhang <[email protected]>

* spotless

Signed-off-by: Jing Zhang <[email protected]>

---------

Signed-off-by: Jing Zhang <[email protected]>
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.

7 participants