From 1375769b687fc58f2d0f21f5a9b6edccfa2e318f Mon Sep 17 00:00:00 2001 From: Guy Bertental Date: Tue, 7 Jan 2025 12:15:32 +0200 Subject: [PATCH] Update API version references for LLM and embedding configurations to use different values --- backend/src/api/pipeline-settings.yaml | 4 ++-- infra/deploy.parameters.json | 5 +++-- infra/deploy.sh | 6 ++++-- infra/helm/graphrag/values.yaml | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/backend/src/api/pipeline-settings.yaml b/backend/src/api/pipeline-settings.yaml index 92b70fae..98996b75 100644 --- a/backend/src/api/pipeline-settings.yaml +++ b/backend/src/api/pipeline-settings.yaml @@ -32,7 +32,7 @@ cache: llm: type: azure_openai_chat api_base: $GRAPHRAG_API_BASE - api_version: $GRAPHRAG_API_VERSION + api_version: $GRAPHRAG_LLM_API_VERSION model: $GRAPHRAG_LLM_MODEL deployment_name: $GRAPHRAG_LLM_DEPLOYMENT_NAME cognitive_services_endpoint: $GRAPHRAG_COGNITIVE_SERVICES_ENDPOINT @@ -53,7 +53,7 @@ embeddings: llm: type: azure_openai_embedding api_base: $GRAPHRAG_API_BASE - api_version: $GRAPHRAG_API_VERSION + api_version: $GRAPHRAG_EMBEDDING_API_VERSION batch_size: 16 model: $GRAPHRAG_EMBEDDING_MODEL deployment_name: $GRAPHRAG_EMBEDDING_DEPLOYMENT_NAME diff --git a/infra/deploy.parameters.json b/infra/deploy.parameters.json index f2409b87..88ecb88c 100644 --- a/infra/deploy.parameters.json +++ b/infra/deploy.parameters.json @@ -1,10 +1,11 @@ { "GRAPHRAG_API_BASE": "__GRAPHRAG_API_BASE__", - "GRAPHRAG_API_VERSION": "__GRAPHRAG_API_VERSION__", + "GRAPHRAG_EMBEDDING_API_VERSION": "__GRAPHRAG_EMBEDDING_API_VERSION__", "GRAPHRAG_EMBEDDING_DEPLOYMENT_NAME": "__GRAPHRAG_EMBEDDING_DEPLOYMENT_NAME__", "GRAPHRAG_EMBEDDING_MODEL": "__GRAPHRAG_EMBEDDING_MODEL__", + "GRAPHRAG_LLM_API_VERSION": "__GRAPHRAG_LLM_API_VERSION__", "GRAPHRAG_LLM_DEPLOYMENT_NAME": "__GRAPHRAG_LLM_DEPLOYMENT_NAME__", "GRAPHRAG_LLM_MODEL": "__GRAPHRAG_LLM_MODEL__", "LOCATION": "__LOCATION__", "RESOURCE_GROUP": "__RESOURCE_GROUP__" -} \ No newline at end of file +} diff --git a/infra/deploy.sh b/infra/deploy.sh index 888c7589..b7a711ce 100755 --- a/infra/deploy.sh +++ b/infra/deploy.sh @@ -23,9 +23,10 @@ CONTAINER_REGISTRY_NAME="" requiredParams=( LOCATION GRAPHRAG_API_BASE - GRAPHRAG_API_VERSION + GRAPHRAG_LLM_API_VERSION GRAPHRAG_LLM_MODEL GRAPHRAG_LLM_DEPLOYMENT_NAME + GRAPHRAG_EMBEDDING_API_VERSION GRAPHRAG_EMBEDDING_MODEL GRAPHRAG_EMBEDDING_DEPLOYMENT_NAME RESOURCE_GROUP @@ -479,7 +480,8 @@ installGraphRAGHelmChart () { --set "graphragConfig.AI_SEARCH_AUDIENCE=$AISEARCH_AUDIENCE" \ --set "graphragConfig.COSMOS_URI_ENDPOINT=$cosmosEndpoint" \ --set "graphragConfig.GRAPHRAG_API_BASE=$GRAPHRAG_API_BASE" \ - --set "graphragConfig.GRAPHRAG_API_VERSION=$GRAPHRAG_API_VERSION" \ + --set "graphragConfig.GRAPHRAG_EMBEDDING_API_VERSION=$GRAPHRAG_EMBEDDING_API_VERSION" \ + --set "graphragConfig.GRAPHRAG_LLM_API_VERSION=$GRAPHRAG_LLM_API_VERSION" \ --set "graphragConfig.GRAPHRAG_COGNITIVE_SERVICES_ENDPOINT=$GRAPHRAG_COGNITIVE_SERVICES_ENDPOINT" \ --set "graphragConfig.GRAPHRAG_LLM_MODEL=$GRAPHRAG_LLM_MODEL" \ --set "graphragConfig.GRAPHRAG_LLM_DEPLOYMENT_NAME=$GRAPHRAG_LLM_DEPLOYMENT_NAME" \ diff --git a/infra/helm/graphrag/values.yaml b/infra/helm/graphrag/values.yaml index 6ccdeddf..8d2269fd 100644 --- a/infra/helm/graphrag/values.yaml +++ b/infra/helm/graphrag/values.yaml @@ -35,7 +35,8 @@ graphragConfig: APP_INSIGHTS_CONNECTION_STRING: "" COSMOS_URI_ENDPOINT: "" GRAPHRAG_API_BASE: "" - GRAPHRAG_API_VERSION: "" + GRAPHRAG_EMBEDDING_API_VERSION: "" + GRAPHRAG_LLM_API_VERSION: "" GRAPHRAG_COGNITIVE_SERVICES_ENDPOINT: "https://cognitiveservices.azure.com/.default" GRAPHRAG_LLM_MODEL: "" GRAPHRAG_LLM_DEPLOYMENT_NAME: ""