From ac5ac3e9f12a47be365e86056ce535c3ab86989e Mon Sep 17 00:00:00 2001 From: Anton Larin Date: Sat, 5 Aug 2023 14:08:51 +0200 Subject: [PATCH] Revert "Changed environment variable names OPENAI_API_BASE and OPENAI_API_VERSION to AZURE_OPENAI_API_BASE and AZURE_OPENAI_API_VERSION" This reverts commit ce8b29e9d0fbc6c5b33194446d56e9ad945ccde4. --- .env-template | 4 ++-- application/.env_sample | 4 ++-- application/app.py | 14 +++++++------- application/core/settings.py | 4 ++-- docker-compose-azure.yaml | 8 ++++---- run-with-docker-compose.sh | 2 +- scripts/parser/open_ai_func.py | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.env-template b/.env-template index 11a0b7e..09c738f 100644 --- a/.env-template +++ b/.env-template @@ -2,7 +2,7 @@ OPENAI_API_KEY= EMBEDDINGS_KEY= #For Azure -AZURE_OPENAI_API_BASE= -AZURE_OPENAI_API_VERSION= +OPENAI_API_BASE= +OPENAI_API_VERSION= AZURE_DEPLOYMENT_NAME= AZURE_EMBEDDINGS_DEPLOYMENT_NAME= \ No newline at end of file diff --git a/application/.env_sample b/application/.env_sample index e256c40..af270ee 100644 --- a/application/.env_sample +++ b/application/.env_sample @@ -6,7 +6,7 @@ MONGO_URI=mongodb://localhost:27017/docsgpt API_URL=http://localhost:7091 #For OPENAI on Azure -AZURE_OPENAI_API_BASE= -AZURE_OPENAI_API_VERSION= +OPENAI_API_BASE= +OPENAI_API_VERSION= AZURE_DEPLOYMENT_NAME= AZURE_EMBEDDINGS_DEPLOYMENT_NAME= \ No newline at end of file diff --git a/application/app.py b/application/app.py index 99ab8e0..156e34a 100644 --- a/application/app.py +++ b/application/app.py @@ -167,12 +167,12 @@ def complete_stream(question, docsearch, chat_history, api_key, conversation_id) if is_azure_configured(): logger.debug("in Azure") openai.api_type = "azure" - openai.api_version = settings.AZURE_OPENAI_API_VERSION - openai.api_base = settings.AZURE_OPENAI_API_BASE + openai.api_version = settings.OPENAI_API_VERSION + openai.api_base = settings.OPENAI_API_BASE llm = AzureChatOpenAI( openai_api_key=api_key, - openai_api_base=settings.AZURE_OPENAI_API_BASE, - openai_api_version=settings.AZURE_OPENAI_API_VERSION, + openai_api_base=settings.OPENAI_API_BASE, + openai_api_version=settings.OPENAI_API_VERSION, deployment_name=settings.AZURE_DEPLOYMENT_NAME, ) else: @@ -283,7 +283,7 @@ def stream(): def is_azure_configured(): - return settings.AZURE_OPENAI_API_BASE and settings.AZURE_OPENAI_API_VERSION and settings.AZURE_DEPLOYMENT_NAME + return settings.OPENAI_API_BASE and settings.OPENAI_API_VERSION and settings.AZURE_DEPLOYMENT_NAME @app.route("/api/answer", methods=["POST"]) @@ -321,8 +321,8 @@ def api_answer(): logger.debug("in Azure") llm = AzureChatOpenAI( openai_api_key=api_key, - openai_api_base=settings.AZURE_OPENAI_API_BASE, - openai_api_version=settings.AZURE_OPENAI_API_VERSION, + openai_api_base=settings.OPENAI_API_BASE, + openai_api_version=settings.OPENAI_API_VERSION, deployment_name=settings.AZURE_DEPLOYMENT_NAME, ) else: diff --git a/application/core/settings.py b/application/core/settings.py index c63f362..34c8c02 100644 --- a/application/core/settings.py +++ b/application/core/settings.py @@ -16,8 +16,8 @@ class Settings(BaseSettings): API_KEY: str = None # LLM api key EMBEDDINGS_KEY: str = None # api key for embeddings (if using openai, just copy API_KEY - AZURE_OPENAI_API_BASE: str = None # azure openai api base url - AZURE_OPENAI_API_VERSION: str = None # azure openai api version + OPENAI_API_BASE: str = None # azure openai api base url + OPENAI_API_VERSION: str = None # azure openai api version AZURE_DEPLOYMENT_NAME: str = None # azure deployment name for answering AZURE_EMBEDDINGS_DEPLOYMENT_NAME: str = None # azure deployment name for embeddings diff --git a/docker-compose-azure.yaml b/docker-compose-azure.yaml index edebfc5..a015eef 100644 --- a/docker-compose-azure.yaml +++ b/docker-compose-azure.yaml @@ -20,8 +20,8 @@ services: - CELERY_RESULT_BACKEND=redis://redis:6379/1 - MONGO_URI=mongodb://mongo:27017/docsgpt - OPENAI_API_KEY=$OPENAI_API_KEY - - AZURE_OPENAI_API_BASE=$AZURE_OPENAI_API_BASE - - AZURE_OPENAI_API_VERSION=$AZURE_OPENAI_API_VERSION + - OPENAI_API_BASE=$OPENAI_API_BASE + - OPENAI_API_VERSION=$OPENAI_API_VERSION - AZURE_DEPLOYMENT_NAME=$AZURE_DEPLOYMENT_NAME - AZURE_EMBEDDINGS_DEPLOYMENT_NAME=$AZURE_EMBEDDINGS_DEPLOYMENT_NAME ports: @@ -45,8 +45,8 @@ services: - MONGO_URI=mongodb://mongo:27017/docsgpt - API_URL=http://backend:7091 - OPENAI_API_KEY=$OPENAI_API_KEY - - AZURE_OPENAI_API_BASE=$AZURE_OPENAI_API_BASE - - AZURE_OPENAI_API_VERSION=$AZURE_OPENAI_API_VERSION + - OPENAI_API_BASE=$OPENAI_API_BASE + - OPENAI_API_VERSION=$OPENAI_API_VERSION - AZURE_DEPLOYMENT_NAME=$AZURE_DEPLOYMENT_NAME - AZURE_EMBEDDINGS_DEPLOYMENT_NAME=$AZURE_EMBEDDINGS_DEPLOYMENT_NAME depends_on: diff --git a/run-with-docker-compose.sh b/run-with-docker-compose.sh index b65aa5d..4c89229 100755 --- a/run-with-docker-compose.sh +++ b/run-with-docker-compose.sh @@ -2,7 +2,7 @@ source .env -if [[ -n "$AZURE_OPENAI_API_BASE" ]] && [[ -n "$AZURE_OPENAI_API_VERSION" ]] && [[ -n "$AZURE_DEPLOYMENT_NAME" ]] && [[ -n "$AZURE_EMBEDDINGS_DEPLOYMENT_NAME" ]]; then +if [[ -n "$OPENAI_API_BASE" ]] && [[ -n "$OPENAI_API_VERSION" ]] && [[ -n "$AZURE_DEPLOYMENT_NAME" ]] && [[ -n "$AZURE_EMBEDDINGS_DEPLOYMENT_NAME" ]]; then echo "Running Azure Configuration" docker-compose -f docker-compose-azure.yaml build && docker-compose -f docker-compose-azure.yaml up else diff --git a/scripts/parser/open_ai_func.py b/scripts/parser/open_ai_func.py index 70638c3..63b0663 100644 --- a/scripts/parser/open_ai_func.py +++ b/scripts/parser/open_ai_func.py @@ -46,8 +46,8 @@ def call_openai_api(docs, folder_name): # ) # index_name = "pandas" if ( # azure - os.environ.get("AZURE_OPENAI_API_BASE") - and os.environ.get("AZURE_OPENAI_API_VERSION") + os.environ.get("OPENAI_API_BASE") + and os.environ.get("OPENAI_API_VERSION") and os.environ.get("AZURE_DEPLOYMENT_NAME") and os.environ.get("AZURE_EMBEDDINGS_DEPLOYMENT_NAME") ):