-
Notifications
You must be signed in to change notification settings - Fork 129
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
[Backport 2.x] Fix MLModelTool returns null if the response of LLM is a pure json object #2675
Conversation
…ject (opensearch-project#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914)
Signed-off-by: Heng Qian <[email protected]>
Let's not diverge the code. Let's apply this into main too. I meant:
|
Raised this PR #2682 to avoid diverge on main branch. |
@dhrubo-os What about backporting this PR change into 2.13, 2.15, and better 2.14 (although it does not have patch release but we should keep code base as consistent as possible). |
Yup we should do that. |
… a pure json object (#2675) * Fix MLModelTool returns null if the response of LLM is a pure json object (#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914) * remove java21 API for backporting to 2.x Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 0a6a2b0)
… a pure json object (#2675) * Fix MLModelTool returns null if the response of LLM is a pure json object (#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914) * remove java21 API for backporting to 2.x Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 0a6a2b0)
… a pure json object (#2675) * Fix MLModelTool returns null if the response of LLM is a pure json object (#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914) * remove java21 API for backporting to 2.x Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 0a6a2b0)
… a pure json object (#2675) (#2685) * Fix MLModelTool returns null if the response of LLM is a pure json object (#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914) * remove java21 API for backporting to 2.x Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 0a6a2b0) Co-authored-by: qianheng <[email protected]>
@dhrubo-os Remember me if I was wrong, did we come into a conclusion that if we need to backport this PR to 2.11 or not? |
We introduced Agent feature from 2.13: https://opensearch.org/docs/latest/ml-commons-plugin/agents-tools/index/ |
… a pure json object (#2675) (#2683) * Fix MLModelTool returns null if the response of LLM is a pure json object (#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914) * remove java21 API for backporting to 2.x Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 0a6a2b0) Co-authored-by: qianheng <[email protected]>
… a pure json object (#2675) (#2684) * Fix MLModelTool returns null if the response of LLM is a pure json object (#2655) * Fix MLModelTool returns null if the response of LLM is a pure json object Signed-off-by: Heng Qian <[email protected]> * Fix UT failure Signed-off-by: Heng Qian <[email protected]> * Avoid NPE Signed-off-by: Heng Qian <[email protected]> * spotlessApply Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 007b914) * remove java21 API for backporting to 2.x Signed-off-by: Heng Qian <[email protected]> --------- Signed-off-by: Heng Qian <[email protected]> (cherry picked from commit 0a6a2b0) Co-authored-by: qianheng <[email protected]>
This PR backports upstream fix for ML Commons: opensearch-project/ml-commons#2675 To be added to our distribution. Given we are currently targeting upstream branch 2.14, instead of upstream tag 2.14.0.0, this build is using a new release from our build from source: 2.14.0-ubuntu1.
This PR backports upstream fix for ML Commons: opensearch-project/ml-commons#2675 Given we are currently targeting upstream branch 2.14, instead of upstream tag 2.14.0.0, this build is using a new release from our build from source: 2.14.0-ubuntu1.
Description
Backport 007b914 from #2655
And fix compiling failure by removing java21 API. (main use java 21 while 2.x use java17)
Issues Resolved
#2654
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.