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

Split API version references for LLM and embedding configurations to use different values #216

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/src/api/pipeline-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions infra/deploy.parameters.json
Original file line number Diff line number Diff line change
@@ -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__"
}
}
6 changes: 4 additions & 2 deletions infra/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" \
Expand Down
3 changes: 2 additions & 1 deletion infra/helm/graphrag/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
Loading