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

Revert 422 backport/backport 413 2.17 #430

Closed
wants to merge 121 commits into from

Conversation

xinyual
Copy link
Collaborator

@xinyual xinyual commented Oct 12, 2024

Description

[Describe what this change achieves]

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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.

zane-neo and others added 30 commits December 14, 2023 11:39
Adding get-ci-image-tag dynamic retrival on CI workflows
(cherry picked from commit c037b2a)

Signed-off-by: Joshua Li <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: zhichao-aws <[email protected]>
Fix the compile of 2.x branch
…lSparseTools (#58)

* Merge pull request #40 from zhichao-aws/SearchTools

feature: Add AbstractRetriverTool, VectorDBTool, NeuralSparseTools
(cherry picked from commit c088f77)

* fix commons-lang3 version (#45) (#59)

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
Co-authored-by: zane-neo <[email protected]>

(cherry picked from commit 18445e6)

Signed-off-by: Tyler Ohlsen <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Fix backport branch name is not correct (#69)

Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit 05c8fe0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* include fix in #70

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: zhichao-aws <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
(cherry picked from commit d2e9c72)

Signed-off-by: zane-neo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…60)

* Change job-scheduler plguin group to point to correct localtion



* Add publish task



* add dependency task to publishToStagingRepo



* Fix publishAllPublicationsToStagingRepository failure issue



* add comment to JS plugin path



---------


(cherry picked from commit 37bbd3b)

Signed-off-by: zane-neo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* Visualization Tool



* fix build failure due to forbiddenApis



* Address review comments



* spotlessApply



* update default tool name



* update number of visualization be dynamic



---------


(cherry picked from commit 3774eb9)

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 2f06f6f)

Signed-off-by: Tyler Ohlsen <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* increase AbstractRetrieverToolTests code coverage



* add RAGTool



* Change exception handling from input field in RAGTool



---------


(cherry picked from commit 24d5cf9)

Signed-off-by: Mingshi Liu <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* add search index tool



* run spotless apply



* remove unncessary string util operation



* add test cases



* spotless apply



* update tool description and add model group search



---------


(cherry picked from commit 2e05330)

Signed-off-by: yuye-aws <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 018cd03)

Signed-off-by: Mingshi Liu <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…arseSearchTool (#91)

* Base class for Integ test; add integ test for NeuralSparseSearchTool (#86)

* add common components

Signed-off-by: zhichao-aws <[email protected]>

* add common components

Signed-off-by: zhichao-aws <[email protected]>

* add basic components

Signed-off-by: zhichao-aws <[email protected]>

* rebase main

Signed-off-by: zhichao-aws <[email protected]>

* add basic components for it, add it

Signed-off-by: zhichao-aws <[email protected]>

* rebase main

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* change neural sparse model to pretrained tokenizer

Signed-off-by: zhichao-aws <[email protected]>

* rm redundant line

Signed-off-by: zhichao-aws <[email protected]>

* add comments

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* add register connector

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
(cherry picked from commit 34ae75f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix http dependency

Signed-off-by: zhichao-aws <[email protected]>

* tidy

Signed-off-by: zhichao-aws <[email protected]>

* fix read http entity twice

Signed-off-by: zhichao-aws <[email protected]>

---------

Signed-off-by: zhichao-aws <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: zhichao-aws <[email protected]>
* add two more parsing method for search index tool



* fix unit test failure



* add two unit cases



* add unit test case for model group index



* add unit test case for model group index



* remove unnecessary logs



---------


(cherry picked from commit 8466e91)

Signed-off-by: yuye-aws <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* provide PPL for querying system indices



* check error message



* provide all indices starting from '.'



---------


(cherry picked from commit ce6b6d9)

Signed-off-by: xinyual <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* ignore alias field



* add default value for safety



---------


(cherry picked from commit 57cba90)

Signed-off-by: xinyual <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
… (#102)

* mock server and integTest for visualization



* update rest status



* add refresh



* merge from main



* rename variable name



---------


(cherry picked from commit 4c76e4c)

Signed-off-by: Hailong Cui <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 4573cc3)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* add PPL IT



* add IT for ppl tool



* apply spotless



* remove uesless full name



* apply spotless



---------


(cherry picked from commit b706e1e)

Signed-off-by: xinyual <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* update search index tool parse logic



* Update src/main/java/org/opensearch/agent/tools/SearchIndexTool.java




* update parsing logic and unit tests



* Update src/main/java/org/opensearch/agent/tools/SearchIndexTool.java




* import classes in search index tool



---------




(cherry picked from commit da31992)

Signed-off-by: yuye-aws <[email protected]>
Signed-off-by: Yuye Zhu <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: zane-neo <[email protected]>
* integration test for search index tool



* import MatcherAssert to avoid fully qualified name



---------


(cherry picked from commit 815b666)

Signed-off-by: yuye-aws <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit ecb4033)

Signed-off-by: Tyler Ohlsen <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
zane-neo and others added 9 commits August 28, 2024 15:48
Signed-off-by: zane-neo <[email protected]>
(cherry picked from commit 1d43c5d)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
(cherry picked from commit 9989ac6)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
* Add 2.17 release note



* change dependencies to maintenance



---------


(cherry picked from commit d4051e5)

Signed-off-by: zane-neo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 8e73e33)

Signed-off-by: zane-neo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: opensearch-ci-bot <[email protected]>
Co-authored-by: opensearch-ci-bot <[email protected]>
* Add LogPatternTool (#413)

* ut fix: construct update in Monitor



* Add LogPatternTool



* Address comments



* Add function doc



* Address comments



* Address comments



---------


(cherry picked from commit 7d72612)

* Make compatible with java11



* spotlessApply



---------

Signed-off-by: Heng Qian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.