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

use local_regex as default type for guardrails #2853

Merged
merged 2 commits into from
Aug 28, 2024

Conversation

jngz-es
Copy link
Collaborator

@jngz-es jngz-es commented Aug 28, 2024

Description

When the guardrails type is not setup, we use local_regex as default type.

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.

Signed-off-by: Jing Zhang <[email protected]>
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env August 28, 2024 18:58 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env August 28, 2024 18:58 — with GitHub Actions Inactive
@jngz-es jngz-es requested a review from lezzago August 28, 2024 18:58
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env August 28, 2024 20:10 — with GitHub Actions Inactive
@jngz-es jngz-es merged commit 7ecff1a into opensearch-project:main Aug 28, 2024
9 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 28, 2024
* use local_regex as default type for guardrails

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

* add UT for model type

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

---------

Signed-off-by: Jing Zhang <[email protected]>
(cherry picked from commit 7ecff1a)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.15 2.15
# Navigate to the new working tree
cd .worktrees/backport-2.15
# Create a new branch
git switch --create backport/backport-2853-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7ecff1aaa17d8ee04fc0a408b49384624db0b93b
# Push it to GitHub
git push --set-upstream origin backport/backport-2853-to-2.15
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.15

Then, create a pull request where the base branch is 2.15 and the compare/head branch is backport/backport-2853-to-2.15.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.16 2.16
# Navigate to the new working tree
cd .worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-2853-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7ecff1aaa17d8ee04fc0a408b49384624db0b93b
# Push it to GitHub
git push --set-upstream origin backport/backport-2853-to-2.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.16

Then, create a pull request where the base branch is 2.16 and the compare/head branch is backport/backport-2853-to-2.16.

dhrubo-os pushed a commit that referenced this pull request Aug 29, 2024
* use local_regex as default type for guardrails

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

* add UT for model type

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

---------

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

Co-authored-by: Jing Zhang <[email protected]>
jngz-es added a commit to jngz-es/ml-commons that referenced this pull request Aug 29, 2024
…) (opensearch-project#2856)

* use local_regex as default type for guardrails

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

* add UT for model type

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

---------

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

Co-authored-by: Jing Zhang <[email protected]>
jngz-es added a commit to jngz-es/ml-commons that referenced this pull request Aug 29, 2024
…) (opensearch-project#2856)

* use local_regex as default type for guardrails

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

* add UT for model type

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

---------

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

Co-authored-by: Jing Zhang <[email protected]>
dhrubo-os pushed a commit that referenced this pull request Aug 30, 2024
* use local_regex as default type for guardrails



* add UT for model type



---------


(cherry picked from commit 7ecff1a)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
jngz-es added a commit that referenced this pull request Aug 30, 2024
* use local_regex as default type for guardrails



* add UT for model type



---------


(cherry picked from commit 7ecff1a)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 2, 2024
* use local_regex as default type for guardrails

* add UT for model type

---------

(cherry picked from commit 7ecff1a)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
(cherry picked from commit fe74150)
dhrubo-os pushed a commit that referenced this pull request Oct 2, 2024
#3050)

* use local_regex as default type for guardrails

* add UT for model type

---------

(cherry picked from commit 7ecff1a)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
(cherry picked from commit fe74150)

Co-authored-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.

4 participants