Skip to content
Merged
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
6 changes: 2 additions & 4 deletions .github/workflows/e2e_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
environment: [ "ci", "azure"]
env:
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
E2E_OPENAI_MODEL: ${{ vars.E2E_OPENAI_MODEL }}
CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
CLIENT_ID: ${{ secrets.CLIENT_ID }}
TENANT_ID: ${{ secrets.TENANT_ID }}
Expand Down Expand Up @@ -139,10 +140,7 @@ jobs:
# Update paths for container environment (relative -> absolute)
sed -i 's|db_path: \.llama/distributions|db_path: /app-root/.llama/distributions|g' run.yaml
sed -i 's|db_path: tmp/|db_path: /app-root/.llama/distributions/|g' run.yaml

# Set OpenAI API key for container
sed -i "s|api_key: \${env\.OPENAI_API_KEY}|api_key: $OPENAI_API_KEY|g" run.yaml


echo "Successfully configured for environment: $ENVIRONMENT"
echo "Using configuration: $(basename "$CONFIG_FILE")"

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ services:
- ./run.yaml:/opt/app-root/run.yaml:Z
environment:
- OPENAI_API_KEY=${OPENAI_API_KEY}
- E2E_OPENAI_MODEL=${E2E_OPENAI_MODEL}
- AZURE_API_KEY=${AZURE_API_KEY}
- BRAVE_SEARCH_API_KEY=${BRAVE_SEARCH_API_KEY:-}
- TAVILY_SEARCH_API_KEY=${TAVILY_SEARCH_API_KEY:-}
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/configs/run-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ server:
shields:
- shield_id: llama-guard-shield
provider_id: llama-guard
provider_shield_id: "gpt-4-turbo"
provider_shield_id: ${env.E2E_OPENAI_MODEL}
vector_dbs:
- vector_db_id: my_knowledge_base
embedding_model: sentence-transformers/all-mpnet-base-v2
Expand All @@ -147,10 +147,10 @@ models:
provider_id: sentence-transformers
provider_model_id: sentence-transformers/all-mpnet-base-v2 # Location of embedding model
model_type: embedding
- model_id: gpt-4-turbo
- model_id: ${env.E2E_OPENAI_MODEL}
provider_id: openai
model_type: llm
provider_model_id: gpt-4-turbo
provider_model_id: ${env.E2E_OPENAI_MODEL}

tool_groups:
- toolgroup_id: builtin::rag
Expand Down
Loading