From b9f28092d8dd7474ed7b7e830bed8cf3f875ac1a Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Mon, 29 Jan 2024 17:52:19 +0200 Subject: [PATCH 1/7] ci: rc branch trigger for integration test --- .github/workflows/integration-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 83291bbc..96806925 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - rc_* env: POETRY_VERSION: "1.7.1" From 8d894fc70d709ceac6323657ac6f4cf146aa7691 Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Mon, 29 Jan 2024 17:52:48 +0200 Subject: [PATCH 2/7] fix: wrapped in quotes --- .github/workflows/integration-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 96806925..ee23e90d 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -4,7 +4,7 @@ on: push: branches: - main - - rc_* + - "rc_*" env: POETRY_VERSION: "1.7.1" From b8a08d2d6a1f1e5c3c979e4bce069fc435850619 Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Tue, 30 Jan 2024 09:51:57 +0200 Subject: [PATCH 3/7] fix: AWS tests --- .github/workflows/integration-tests.yaml | 2 +- ai21/clients/bedrock/resources/bedrock_completion.py | 2 +- ai21/clients/sagemaker/resources/sagemaker_completion.py | 4 ++-- examples/bedrock/completion.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index ee23e90d..6b12cbde 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -34,7 +34,7 @@ jobs: poetry env use ${{ matrix.python-version }} - name: Install dependencies run: | - poetry install --no-root --only dev --all-extras + poetry install --only dev --all-extras - name: Lint Python (Black) run: | poetry run inv formatter diff --git a/ai21/clients/bedrock/resources/bedrock_completion.py b/ai21/clients/bedrock/resources/bedrock_completion.py index f9ff4646..3f1418e3 100644 --- a/ai21/clients/bedrock/resources/bedrock_completion.py +++ b/ai21/clients/bedrock/resources/bedrock_completion.py @@ -1,7 +1,7 @@ from typing import Optional, List -from ai21.resources import Penalty from ai21.clients.bedrock.resources.bedrock_resource import BedrockResource +from ai21.models import Penalty from ai21.models.responses.completion_response import CompletionsResponse diff --git a/ai21/clients/sagemaker/resources/sagemaker_completion.py b/ai21/clients/sagemaker/resources/sagemaker_completion.py index 373fdcb8..7aeddfaa 100644 --- a/ai21/clients/sagemaker/resources/sagemaker_completion.py +++ b/ai21/clients/sagemaker/resources/sagemaker_completion.py @@ -1,8 +1,8 @@ from typing import Optional, List -from ai21.resources import Penalty -from ai21.models.responses.completion_response import CompletionsResponse from ai21.clients.sagemaker.resources.sagemaker_resource import SageMakerResource +from ai21.models import Penalty +from ai21.models.responses.completion_response import CompletionsResponse class SageMakerCompletion(SageMakerResource): diff --git a/examples/bedrock/completion.py b/examples/bedrock/completion.py index 8002e258..def48813 100644 --- a/examples/bedrock/completion.py +++ b/examples/bedrock/completion.py @@ -1,5 +1,5 @@ from ai21 import AI21BedrockClient, BedrockModelID -from ai21.resources import Penalty +from ai21.models import Penalty # Bedrock is currently supported only in us-east-1 region. # Either set your profile's region to us-east-1 or uncomment next line From 96be34218c03da8b7eb09850d7b296b4de57dd0d Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Tue, 30 Jan 2024 09:52:20 +0200 Subject: [PATCH 4/7] test: ci --- .github/workflows/integration-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 6b12cbde..5221394c 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -5,6 +5,7 @@ on: branches: - main - "rc_*" + - "fix_*" env: POETRY_VERSION: "1.7.1" From db9e78046ca117de1dc8004b9d6f760bbd406c1a Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Tue, 30 Jan 2024 09:51:57 +0200 Subject: [PATCH 5/7] fix: AWS tests --- .github/workflows/integration-tests.yaml | 2 +- ai21/clients/bedrock/resources/bedrock_completion.py | 2 +- ai21/clients/sagemaker/resources/sagemaker_completion.py | 4 ++-- examples/bedrock/completion.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index ee23e90d..6b12cbde 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -34,7 +34,7 @@ jobs: poetry env use ${{ matrix.python-version }} - name: Install dependencies run: | - poetry install --no-root --only dev --all-extras + poetry install --only dev --all-extras - name: Lint Python (Black) run: | poetry run inv formatter diff --git a/ai21/clients/bedrock/resources/bedrock_completion.py b/ai21/clients/bedrock/resources/bedrock_completion.py index f9ff4646..3f1418e3 100644 --- a/ai21/clients/bedrock/resources/bedrock_completion.py +++ b/ai21/clients/bedrock/resources/bedrock_completion.py @@ -1,7 +1,7 @@ from typing import Optional, List -from ai21.resources import Penalty from ai21.clients.bedrock.resources.bedrock_resource import BedrockResource +from ai21.models import Penalty from ai21.models.responses.completion_response import CompletionsResponse diff --git a/ai21/clients/sagemaker/resources/sagemaker_completion.py b/ai21/clients/sagemaker/resources/sagemaker_completion.py index 373fdcb8..7aeddfaa 100644 --- a/ai21/clients/sagemaker/resources/sagemaker_completion.py +++ b/ai21/clients/sagemaker/resources/sagemaker_completion.py @@ -1,8 +1,8 @@ from typing import Optional, List -from ai21.resources import Penalty -from ai21.models.responses.completion_response import CompletionsResponse from ai21.clients.sagemaker.resources.sagemaker_resource import SageMakerResource +from ai21.models import Penalty +from ai21.models.responses.completion_response import CompletionsResponse class SageMakerCompletion(SageMakerResource): diff --git a/examples/bedrock/completion.py b/examples/bedrock/completion.py index 8002e258..def48813 100644 --- a/examples/bedrock/completion.py +++ b/examples/bedrock/completion.py @@ -1,5 +1,5 @@ from ai21 import AI21BedrockClient, BedrockModelID -from ai21.resources import Penalty +from ai21.models import Penalty # Bedrock is currently supported only in us-east-1 region. # Either set your profile's region to us-east-1 or uncomment next line From 57c064133605300fc471f6a308a148a45676b040 Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Tue, 30 Jan 2024 09:52:20 +0200 Subject: [PATCH 6/7] test: ci --- .github/workflows/integration-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 6b12cbde..5221394c 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -5,6 +5,7 @@ on: branches: - main - "rc_*" + - "fix_*" env: POETRY_VERSION: "1.7.1" From d7f7e8de7074f4b8c158016d753f797ea7f1a508 Mon Sep 17 00:00:00 2001 From: Asaf Gardin Date: Tue, 30 Jan 2024 09:56:06 +0200 Subject: [PATCH 7/7] fix: Removed testing pattern for tests --- .github/workflows/integration-tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 5221394c..6b12cbde 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -5,7 +5,6 @@ on: branches: - main - "rc_*" - - "fix_*" env: POETRY_VERSION: "1.7.1"