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.

Sign up for GitHub

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

Jump to bottom

[Backport/2.x] Backport commits from feature branch #300

Merged
merged 27 commits into from
Dec 18, 2023
Merged

[Backport/2.x] Backport commits from feature branch #300

merged 27 commits into from
Dec 18, 2023

Commits on Dec 18, 2023

  1. [Feature/agent_framework] Registers a single agent with multiple tools ( 

    opensearch-project#198)

* Initial register agent workflow step

Signed-off-by: Owais Kazi <[email protected]>

* Added tools step

Signed-off-by: Owais Kazi <[email protected]>

* Fixed ClassCastException

Signed-off-by: Owais Kazi <[email protected]>

* Handled exception for Instant

Signed-off-by: Owais Kazi <[email protected]>

* Added type Instant for WorklowNode Parser

Signed-off-by: Owais Kazi <[email protected]>

* Removed created and last updated time

Signed-off-by: Owais Kazi <[email protected]>

* Addressed parsing error

Signed-off-by: Owais Kazi <[email protected]>

* Handled parsing of Long values for Instant

Signed-off-by: Owais Kazi <[email protected]>

* Handled nested object for llm key

Signed-off-by: Owais Kazi <[email protected]>

* Handled parsing error

Signed-off-by: Owais Kazi <[email protected]>

* Another attempt to fix parsing error for llm

Signed-off-by: Owais Kazi <[email protected]>

* Another attemp to fix XContent

Signed-off-by: Owais Kazi <[email protected]>

* Fixed Parsing error

Signed-off-by: Owais Kazi <[email protected]>

* Added tests for toolstep and javadocs

Signed-off-by: Owais Kazi <[email protected]>

* Undo CI changes

Signed-off-by: Owais Kazi <[email protected]>

* Addressing PR comments

Signed-off-by: Owais Kazi <[email protected]>

* Addressing PR comments

Signed-off-by: Owais Kazi <[email protected]>

* Handled interface changes

Signed-off-by: Owais Kazi <[email protected]>

* Addressed conflicts

Signed-off-by: Owais Kazi <[email protected]>

* Added TODO

Signed-off-by: Owais Kazi <[email protected]>

---------

Signed-off-by: Owais Kazi <[email protected]>
    @owaiskazi19 @dbwiddis
    owaiskazi19 authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    73c2803 View commit details
    Browse the repository at this point in the history

  2. [Feature/agent_framework] Add Delete Connector Step (opensearch-proje… 

    …ct#211)

* Add Delete Connector Step

Signed-off-by: Daniel Widdis <[email protected]>

* Add eclipse core runtime version resolution

Signed-off-by: Daniel Widdis <[email protected]>

* Use JDK17 for spotless

Signed-off-by: Daniel Widdis <[email protected]>

* Add Delete Connector Step

Signed-off-by: Daniel Widdis <[email protected]>

* Add eclipse core runtime version resolution

Signed-off-by: Daniel Widdis <[email protected]>

* Use JDK17 for spotless

Signed-off-by: Daniel Widdis <[email protected]>

* Fetch connector ID from appropriate previous node output

Signed-off-by: Daniel Widdis <[email protected]>

* Fix tests

Signed-off-by: Daniel Widdis <[email protected]>

* Test that actual ID is properly passed

Signed-off-by: Daniel Widdis <[email protected]>

* Update to current setup-java version

Signed-off-by: Daniel Widdis <[email protected]>

* Remove unneeded argument captors

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    ae36486 View commit details
    Browse the repository at this point in the history

  3. [feature/agent_framework] Changing resources created format (opensear… 

    …ch-project#231)

* adding new resources created format and adding enum for resource types

Signed-off-by: Amit Galitzky <[email protected]>

* remove spotless from java 17

Signed-off-by: Amit Galitzky <[email protected]>

* add action listener to update resource created

Signed-off-by: Amit Galitzky <[email protected]>

* fixing UT

Signed-off-by: Amit Galitzky <[email protected]>

* changed exception type

Signed-off-by: Amit Galitzky <[email protected]>

---------

Signed-off-by: Amit Galitzky <[email protected]>
    @amitgalitz @dbwiddis
    amitgalitz authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    ca1c8be View commit details
    Browse the repository at this point in the history

  4. [Feature/agent_framework] Fetches modelID for RegisterAgent and Tools… 

    … workflow steps (opensearch-project#235)

* Flattened llm field of register agent

Signed-off-by: Owais Kazi <[email protected]>

* Handled optional modelId

Signed-off-by: Owais Kazi <[email protected]>

* Handled modelId for llm

Signed-off-by: Owais Kazi <[email protected]>

* Parsing for parameters field of tools

Signed-off-by: Owais Kazi <[email protected]>

* Handled test case failures

Signed-off-by: Owais Kazi <[email protected]>

* Fixed spotless failure

Signed-off-by: Owais Kazi <[email protected]>

---------

Signed-off-by: Owais Kazi <[email protected]>
    @owaiskazi19 @dbwiddis
    owaiskazi19 authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    677eb55 View commit details
    Browse the repository at this point in the history

  5. Add Util method to fetch inputs from parameters, content, and previou… 

    …s step output (opensearch-project#234)

* Util method to get required inputs

Signed-off-by: Daniel Widdis <[email protected]>

* Implement parsing in some of the steps

Signed-off-by: Daniel Widdis <[email protected]>

* Handle parsing exceptions in the future

Signed-off-by: Daniel Widdis <[email protected]>

* Improve exception handling

Signed-off-by: Daniel Widdis <[email protected]>

* More steps using the new input parsing

Signed-off-by: Daniel Widdis <[email protected]>

* Update Delete Connector Step with parsing util

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    7971655 View commit details
    Browse the repository at this point in the history

  6. [Feature/agent_framework] Add Undeploy Model Step (opensearch-project… 

    …#236)

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    47c21bd View commit details
    Browse the repository at this point in the history

  7. [Feature/agent_framework] Actually make the WorkflowStepFactory a Fac… 

    …tory (opensearch-project#243)

Actually make the WorkflowStepFactory a Factory

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    9319fa7 View commit details
    Browse the repository at this point in the history

  8. [Feature/agent_framework] Add Delete Model Step (opensearch-project#237) 

    Add Delete Model Step

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    0a532e1 View commit details
    Browse the repository at this point in the history

  9. [Feature/agent_framework] Registers root agent with an agentId in Too… 

    …lSteps (opensearch-project#242)

* Add agentId to parameters map for root agent

Signed-off-by: Owais Kazi <[email protected]>

* Modified ToolStep with new Util method

Signed-off-by: Owais Kazi <[email protected]>

* Integrated RegisterAgentStep with new Util method

Signed-off-by: Owais Kazi <[email protected]>

* Spotless fixes

Signed-off-by: Owais Kazi <[email protected]>

* Removed TODO

Signed-off-by: Owais Kazi <[email protected]>

---------

Signed-off-by: Owais Kazi <[email protected]>
    @owaiskazi19 @dbwiddis
    owaiskazi19 authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    540f594 View commit details
    Browse the repository at this point in the history

  10. Updating state index after register agent (opensearch-project#250) 

    Adding state index update on agent

Signed-off-by: Amit Galitzky <[email protected]>
    @amitgalitz @dbwiddis
    amitgalitz authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    80fff84 View commit details
    Browse the repository at this point in the history

  11. [Feature/agent_framework] Added Retry functionality for Deploy Model (o… 

    …pensearch-project#245)

* Added retry functionality for DeployModel

Signed-off-by: Owais Kazi <[email protected]>

* Fixed timeout and exception issues

Signed-off-by: Owais Kazi <[email protected]>

* Addressed PR Comments

Signed-off-by: Owais Kazi <[email protected]>

---------

Signed-off-by: Owais Kazi <[email protected]>
    @owaiskazi19 @dbwiddis
    owaiskazi19 authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    9a8573a View commit details
    Browse the repository at this point in the history

  12. Only update state index on register agent (opensearch-project#253) 

    * fixing status api bug with new deploy task

Signed-off-by: Amit Galitzky <[email protected]>

* changed to getName()

Signed-off-by: Amit Galitzky <[email protected]>

---------

Signed-off-by: Amit Galitzky <[email protected]>
    @amitgalitz @dbwiddis
    amitgalitz authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    86c2450 View commit details
    Browse the repository at this point in the history

  13. [Feature/agent_framework] Add Delete Agent Step (opensearch-project#246) 

    Delete Agent Step

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    3f09940 View commit details
    Browse the repository at this point in the history

  14. Includ workflow id and current node id in the exception message (open… 

    …search-project#262)

Includ workflow id and current node id in the exception message during registe agent step

Signed-off-by: Jackie Han <[email protected]>
    @jackiehanyang @dbwiddis
    jackiehanyang authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    50f4cc0 View commit details
    Browse the repository at this point in the history

  15. Change thread queue to 100 and fix headers parsing bug (opensearch-pr… 

    …oject#265)

change thread queue to 100 and fix headers bug

Signed-off-by: Amit Galitzky <[email protected]>
    @amitgalitz @dbwiddis
    amitgalitz authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    eb64425 View commit details
    Browse the repository at this point in the history

  16. Update resources_created with deploy model: (opensearch-project#275) 

    add deploy model resource

Signed-off-by: Amit Galitzky <[email protected]>
    @amitgalitz @dbwiddis
    amitgalitz authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    1f386cf View commit details
    Browse the repository at this point in the history

  17. [feature/agent_framework] Changing resources created format (opensear… 

    …ch-project#231)

* adding new resources created format and adding enum for resource types

Signed-off-by: Amit Galitzky <[email protected]>

* remove spotless from java 17

Signed-off-by: Amit Galitzky <[email protected]>

* add action listener to update resource created

Signed-off-by: Amit Galitzky <[email protected]>

* fixing UT

Signed-off-by: Amit Galitzky <[email protected]>

* changed exception type

Signed-off-by: Amit Galitzky <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    cff3ecc View commit details
    Browse the repository at this point in the history

  18. [Feature/agent_framework] Add Get Workflow API to retrieve a stored 

    template by workflow id (opensearch-project#273)

* renaming status API implementation

Signed-off-by: Joshua Palis <[email protected]>

* Adding GetWorkflow API

Signed-off-by: Joshua Palis <[email protected]>

* addressing PR comments

Signed-off-by: Joshua Palis <[email protected]>

* Adding todo reminder

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>
    @joshpalis @dbwiddis
    joshpalis authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    fcfbc06 View commit details
    Browse the repository at this point in the history

  19. [Feature/agent_framework] Adds a Search Workflow State API (opensearc… 

    …h-project#284)

* Modifying workflow state index mapping and resources created

Signed-off-by: Joshua Palis <[email protected]>

* Adding Search workflow state API

Signed-off-by: Joshua Palis <[email protected]>

* Adding rest unit tests

Signed-off-by: Joshua Palis <[email protected]>

* Transport unit tests

Signed-off-by: Joshua Palis <[email protected]>

* Moving resourceType determination outside of the resources created class

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>
    @joshpalis @dbwiddis
    joshpalis authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    100c701 View commit details
    Browse the repository at this point in the history

  20. Permit ordering of tools in register agent step (opensearch-project#283) 

    Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    597640f View commit details
    Browse the repository at this point in the history

  21. Fix tools ordering class casting bug (opensearch-project#289) 

    Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    466b998 View commit details
    Browse the repository at this point in the history

  22. Combine create api with provision api by adding a provision param (op… 

    …ensearch-project#282)

* replace dryrun parameter with provision in create workflow

Signed-off-by: Jackie Han <[email protected]>

* test

Signed-off-by: Jackie Han <[email protected]>

* test

Signed-off-by: Jackie Han <[email protected]>

* test

Signed-off-by: Jackie Han <[email protected]>

* Combine create api with provision api by adding a provision param

Signed-off-by: Jackie Han <[email protected]>

* cleanup

Signed-off-by: Jackie Han <[email protected]>

* keep dryrun option in create workflow

Signed-off-by: Jackie Han <[email protected]>

* cleanup

Signed-off-by: Jackie Han <[email protected]>

* keep both dryRun and provision parameter

Signed-off-by: Jackie Han <[email protected]>

---------

Signed-off-by: Jackie Han <[email protected]>
    @jackiehanyang @dbwiddis
    jackiehanyang authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5770a70 View commit details
    Browse the repository at this point in the history

  23. [Feature/agent_framework] Deprovision API (opensearch-project#271) 

    * Deprovision REST and Transport Actions

Signed-off-by: Daniel Widdis <[email protected]>

* Fix errors you find actually running the code

Signed-off-by: Daniel Widdis <[email protected]>

* Add test for Rest deprovision action

Signed-off-by: Daniel Widdis <[email protected]>

* Initial copypaste of Deprovision Transport Action Test

Signed-off-by: Daniel Widdis <[email protected]>

* Add some delays to let deletions propagate, reset workflow state

Signed-off-by: Daniel Widdis <[email protected]>

* Improved deprovisioning results and status updates

Signed-off-by: Daniel Widdis <[email protected]>

* Fix bug in resource created parsing

Signed-off-by: Daniel Widdis <[email protected]>

* Completed test implementations

Signed-off-by: Daniel Widdis <[email protected]>

* Fixes after rebase

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    ddfec4b View commit details
    Browse the repository at this point in the history

  24. [Feature/agent_framework] Adding installed plugins validation (opense… 

    …arch-project#290)

* Adding installed plugins validation

Signed-off-by: Joshua Palis <[email protected]>

* Adding failure success unit tests

Signed-off-by: Joshua Palis <[email protected]>

* Combining graph and installed plugin validation

Signed-off-by: Joshua Palis <[email protected]>

* Removing stray comment

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>
    @joshpalis @dbwiddis
    joshpalis authored and dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    4bb1c30 View commit details
    Browse the repository at this point in the history

  25. Add Delete Workflow API (opensearch-project#294) 

    Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    5b367a1 View commit details
    Browse the repository at this point in the history

  26. Consume REST params and consistently handle error messages (opensearc… 

    …h-project#295)

* Always consume the workflow_id param

Signed-off-by: Daniel Widdis <[email protected]>

* Delegate no-content error message to BaseRestHandler

Signed-off-by: Daniel Widdis <[email protected]>

* Don't lose FlowFrameworkException status

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    a7aa712 View commit details
    Browse the repository at this point in the history

  27. Allow YAML Templates (opensearch-project#296) 

    Signed-off-by: Daniel Widdis <[email protected]>
    @dbwiddis
    dbwiddis committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    eb91263 View commit details
    Browse the repository at this point in the history