From 959cb38ce8e2eba9aa04644be3e92290f6502e49 Mon Sep 17 00:00:00 2001 From: Tyler Hutcherson Date: Thu, 25 Apr 2024 16:55:29 -0400 Subject: [PATCH 1/3] update github actions secrets for azure support --- .github/workflows/run_tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index bc5e76fe..e8b1db1c 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -60,6 +60,9 @@ jobs: GCP_LOCATION: ${{ secrets.GCP_LOCATION }} GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }} + AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}} + AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} + OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}} run: | make test-cov @@ -75,6 +78,9 @@ jobs: GCP_LOCATION: ${{ secrets.GCP_LOCATION }} GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }} COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }} + AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}} + AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} + OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}} run: | cd docs/ && treon -v --exclude="./examples/openai_qna.ipynb" From 1a490837342582128718e4c049b680529e227d54 Mon Sep 17 00:00:00 2001 From: Tyler Hutcherson Date: Thu, 25 Apr 2024 17:24:16 -0400 Subject: [PATCH 2/3] updates to env vars --- docs/user_guide/vectorizers_04.ipynb | 6 ++++-- tests/integration/test_vectorizers.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/user_guide/vectorizers_04.ipynb b/docs/user_guide/vectorizers_04.ipynb index 19972c03..d102b71e 100644 --- a/docs/user_guide/vectorizers_04.ipynb +++ b/docs/user_guide/vectorizers_04.ipynb @@ -194,8 +194,10 @@ "outputs": [], "source": [ "# additionally to the API Key, setup the API endpoint and version\n", + "api_key = os.environ.get(\"AZURE_OPENAI_API_KEY\") or getpass.getpass(\"Enter your AzureOpenAI API key: \")\n", "api_version = os.environ.get(\"OPENAI_API_VERSION\") or getpass.getpass(\"Enter your AzureOpenAI API version: \")\n", - "azure_endpoint = os.environ.get(\"AZURE_OPENAI_ENDPOINT\") or getpass.getpass(\"Enter your AzureOpenAI API endpoint: \")" + "azure_endpoint = os.environ.get(\"AZURE_OPENAI_ENDPOINT\") or getpass.getpass(\"Enter your AzureOpenAI API endpoint: \")\n", + "deployment_name = os.environ.get(\"AZURE_OPENAI_DEPLOYMENT_NAME\", \"text-embedding-ada-002\")\n" ] }, { @@ -235,7 +237,7 @@ "\n", "# create a vectorizer\n", "az_oai = AzureOpenAITextVectorizer(\n", - " model=\"text-embedding-ada-002\", # Must be your custom deployment name\n", + " model=deployment_name, # Must be your CUSTOM deployment name\n", " api_config={\n", " \"api_key\": api_key,\n", " \"api_version\": api_version,\n", diff --git a/tests/integration/test_vectorizers.py b/tests/integration/test_vectorizers.py index 8da824df..e8fd986c 100644 --- a/tests/integration/test_vectorizers.py +++ b/tests/integration/test_vectorizers.py @@ -41,7 +41,7 @@ def vectorizer(request, skip_vectorizer): elif request.param == CohereTextVectorizer: return request.param() elif request.param == AzureOpenAITextVectorizer: - return request.param() + return request.param(model=os.getenv("AZURE_OPENAI_DEPLOYMENT_NAME", "text-embedding-ada-002")) def test_vectorizer_embed(vectorizer, skip_vectorizer): From 064e700f8cda60676beceb246a94aa6d2c613d65 Mon Sep 17 00:00:00 2001 From: Tyler Hutcherson Date: Thu, 25 Apr 2024 17:25:36 -0400 Subject: [PATCH 3/3] update envvars --- .github/workflows/run_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index e8b1db1c..86ef0b70 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -62,6 +62,7 @@ jobs: COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }} AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}} AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} + AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}} OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}} run: | make test-cov @@ -80,6 +81,7 @@ jobs: COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }} AZURE_OPENAI_API_KEY: ${{secrets.AZURE_OPENAI_API_KEY}} AZURE_OPENAI_ENDPOINT: ${{secrets.AZURE_OPENAI_ENDPOINT}} + AZURE_OPENAI_DEPLOYMENT_NAME: ${{secrets.AZURE_OPENAI_DEPLOYMENT_NAME}} OPENAI_API_VERSION: ${{secrets.OPENAI_API_VERSION}} run: | cd docs/ && treon -v --exclude="./examples/openai_qna.ipynb"