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

Substitute REST path or body parameters in Workflow Steps #525

Merged
merged 9 commits into from
Feb 22, 2024

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Feb 16, 2024

Description

When provisioning a workflow, additonal parameters can be passed on the REST path or in the body. For example:

POST /_plugins/_flow_framework/workflow/bhPBgI0BQfVbnJKtHwGU/_provision?foo=one&bar=two

or

POST /_plugins/_flow_framework/workflow/bhPBgI0BQfVbnJKtHwGU/_provision
{
  "foo": "one",
  "bar": "two"
}

When creating a workflow with provision=true the parameters are allowed on the path only, since the body already contains a template.

In this case, instances of the parameter in the template values (user_params, user_inputs, or previous_node_inputs) will be replaced by its value, e.g.,

"user_inputs": {
  "parameters": {
    "math": "${{foo}} plus ${{ foo }} is ${{ bar }}"
  }
}

will become

"user_inputs": {
  "parameters": {
    "math": "one plus one is two"
  }
}

Issues Resolved

Part of #496 and #522.

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.

@github-actions github-actions bot added the backport 2.x backport PRs to 2.x branch label Feb 16, 2024
Copy link

codecov bot commented Feb 16, 2024

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (24bf51a) 71.91% compared to head (098e75f) 72.71%.

Files Patch % Lines
...arch/flowframework/workflow/RegisterAgentStep.java 60.00% 1 Missing and 1 partial ⚠️
...h/flowframework/rest/RestCreateWorkflowAction.java 94.73% 0 Missing and 1 partial ⚠️
.../transport/DeprovisionWorkflowTransportAction.java 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main     #525      +/-   ##
============================================
+ Coverage     71.91%   72.71%   +0.79%     
- Complexity      612      639      +27     
============================================
  Files            78       78              
  Lines          3201     3258      +57     
  Branches        246      255       +9     
============================================
+ Hits           2302     2369      +67     
+ Misses          787      777      -10     
  Partials        112      112              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dbwiddis
Copy link
Member Author

@YANG-DB FYI

@dbwiddis dbwiddis marked this pull request as draft February 16, 2024 18:29
@dbwiddis dbwiddis marked this pull request as ready for review February 16, 2024 18:44
@dbwiddis dbwiddis force-pushed the pass-params-to-steps branch 2 times, most recently from 4f64879 to c50b00f Compare February 17, 2024 01:16
@owaiskazi19
Copy link
Member

Continuing the discussion here

@dbwiddis dbwiddis force-pushed the pass-params-to-steps branch from c50b00f to 7a00506 Compare February 20, 2024 00:44
@dbwiddis dbwiddis changed the title Substitute REST path parameters in Workflow Steps Substitute REST path or body parameters in Workflow Steps Feb 20, 2024
Copy link
Member

@joshpalis joshpalis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good to me, just a small comment

Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM with few questions/comments

@amitgalitz
Copy link
Member

amitgalitz commented Feb 21, 2024

In the description you highlight the changes for provision API and mention when provision=true on create. If we are creating a template without the provision parameter(false) then should we also allow users to have dynamic params?

Additionally just so I understand correctly, technically a user can create this with create API and then when provisioning give the input to the params or give it during provisioning?

{
  "name": "{template.name}",
  "description": "{template.description}",
  "use_case": "MODEL_DEPLOYMENT_API_KEY",
  "version": {
    "template": "1.0.0",
    "compatibility": [
      "2.12.0",
      "3.0.0"
    ]
  },
  "workflows": {
    "provision": {
      "nodes": [
        {
          "id": "create_connector_1",
          "type": "create_connector",
          "user_inputs": {
            "name": "${create_connector_1}",
            "description": "${create_connector_1.description}",
            "version": "1",
            "protocol": "${create_connector_1.protocol}",
            "parameters": {
              "endpoint": "${create_connector_1.endpoint}",
              "model": "${create_connector_1.model}"
            },
            "credential": {
              "key": "${create_connector_1.credential.key}"
            },
            "actions": [
              {
                "action_type": "predict",
                "method": "POST",
                "url": "https://${parameters.endpoint}/v1/chat/completions"
              }
            ]
          }
        },
        {
          "id": "register_remote_model_1",
          "type": "register_remote_model",
          "previous_node_inputs": {
            "create_connector_1": "parameters"
          },
          "user_inputs": {
            "name": "${register_remote_1_model.name}",
            "function_name": "remote",
            "description": "${register_remote_model_1.description}"
          }
        },
         {
            "id": "deploy_model_1",
            "type": "deploy_model",
            "previous_node_inputs": {
              "register_remote_model_1": "model_id"
            }
          }
      ],
      "edges": [
        {
          "source": "create_connector_1",
          "dest": "register_remote_model_1"
        },
         {
            "source": "register_remote_model_1",
            "dest": "deploy_model_1"
          }
      ]
    }
  }
}

@dbwiddis
Copy link
Member Author

If we are creating a template without the provision parameter(false) then should we also allow users to have dynamic params?

No, because the params are only substituted during provisioning, when processing the data in the Workflow Steps. They have no impact when we are not provisioning, as we are simply parsing and storing the template content.

Additionally just so I understand correctly, technically a user can create this with create API and then when provisioning give the input to the params or give it during provisioning?

Yes, classic example is the feature request issue. The template would include a step configuration with something like this (this exact syntax was from observability workflow RFC, our syntax is slightly different).

"steps": [
{
  "name": "add_timestamp_field_to_otel_spans_index",
  "method": "PUT",
  "endpoint": "/${index_name}",
  "body": { ... }
 },
 ....
]

In this case we'd create the workflow with the "endpoint" field having a value of /${{ index_name }}.

When we went to provision the workflow, if we passed ?index_name=foo on the REST path, then the "endpoint" field value would become /foo. The original template would remain unchanged.

Note that in our current code we couldn't provision a second time in this case, we'd have to "deprovision" first and I'll have to eventually address this before 2.13. We could then deprovision (TODO, not require this) and provision again passing ?index_name=bar on the REST path. Same template, but "endpoint" would now be /bar.

@dbwiddis dbwiddis force-pushed the pass-params-to-steps branch from 7b63f78 to 098e75f Compare February 21, 2024 23:21
@amitgalitz
Copy link
Member

amitgalitz commented Feb 22, 2024

Could we also potentially add an ability to reprovision a workflow and give it a new ID for the state index breaking the 1:1 template to state index ratio. Up to customer to change things if there are issues.

Yeah, generally I'm thinking with "fine grained provisioning" we could allow provisioning a "completed" workflow a second time, and do the "partial" deprovisioning by default as part of it.

Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for patiently discussing comments

@dbwiddis dbwiddis merged commit 3019fb8 into opensearch-project:main Feb 22, 2024
29 checks passed
@dbwiddis dbwiddis deleted the pass-params-to-steps branch February 22, 2024 20:24
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 22, 2024
* Include params map in WorkflowRequest when provisioning

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

* Pass params to ProcessNode

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

* Pass params to WorkflowSteps

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

* Substitute params

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

* Add change log

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

* Improve param consuming checks, add coverage

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

* Allow specifying key-value pairs in body

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

* Update title in change log

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

* Refactor param and content map generation to a new method

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

---------

Signed-off-by: Daniel Widdis <[email protected]>
(cherry picked from commit 3019fb8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis pushed a commit that referenced this pull request Feb 22, 2024
…eps (#536)

Substitute REST path or body parameters in Workflow Steps (#525)

* Include params map in WorkflowRequest when provisioning



* Pass params to ProcessNode



* Pass params to WorkflowSteps



* Substitute params



* Add change log



* Improve param consuming checks, add coverage



* Allow specifying key-value pairs in body



* Update title in change log



* Refactor param and content map generation to a new method



---------


(cherry picked from commit 3019fb8)

Signed-off-by: Daniel Widdis <[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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants