Change env, logging

Author: pamelafox

.github/workflows/evaluate.yaml

@@ -23,19 +23,6 @@ jobs:
       AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
       AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
       AZURE_RESOURCE_GROUP: ${{ vars.AZURE_RESOURCE_GROUP }}
-      OPENAI_CHAT_HOST: ${{ vars.OPENAI_CHAT_HOST }}
-      OPENAI_EMBED_HOST: ${{ vars.OPENAI_EMBED_HOST }}
-      AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
-      AZURE_OPENAI_VERSION: ${{ vars.AZURE_OPENAI_VERSION }}
-      AZURE_OPENAI_CHAT_DEPLOYMENT: ${{ vars.AZURE_OPENAI_CHAT_DEPLOYMENT }}
-      AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZURE_OPENAI_CHAT_MODEL }}
-      AZURE_OPENAI_EMBED_DEPLOYMENT: ${{ vars.AZURE_OPENAI_EMBED_DEPLOYMENT }}
-      AZURE_OPENAI_EMBED_MODEL: ${{ vars.AZURE_OPENAI_EMBED_MODEL }}
-      AZURE_OPENAI_EMBED_DIMENSIONS: ${{ vars.AZURE_OPENAI_EMBED_DIMENSIONS }}
-      AZURE_OPENAI_EMBEDDING_COLUMN: ${{ vars.AZURE_OPENAI_EMBEDDING_COLUMN }}
-      AZURE_OPENAI_EVAL_DEPLOYMENT: ${{ vars.AZURE_OPENAI_EVAL_DEPLOYMENT }}
-      AZURE_OPENAI_EVAL_MODEL: ${{ vars.AZURE_OPENAI_EVAL_MODEL }}
-      # Postgres environment variables are not needed, as they're passed in below
     steps:
       - uses: actions/checkout@v4
       - name: Install PostgreSQL development libraries
@@ -115,11 +102,28 @@ jobs:
       - name: Run local server in background
         run: |
           RUNNER_TRACKING_ID="" && (nohup python3 -m uvicorn fastapi_app:create_app --factory > serverlogs.out 2> serverlogs.err &)
-
+        env:
+          OPENAI_CHAT_HOST: ${{ vars.OPENAI_CHAT_HOST }}
+          OPENAI_EMBED_HOST: ${{ vars.OPENAI_EMBED_HOST }}
+          AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
+          AZURE_OPENAI_VERSION: ${{ vars.AZURE_OPENAI_VERSION }}
+          AZURE_OPENAI_CHAT_DEPLOYMENT: ${{ vars.AZURE_OPENAI_CHAT_DEPLOYMENT }}
+          AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZURE_OPENAI_CHAT_MODEL }}
+          AZURE_OPENAI_EMBED_DEPLOYMENT: ${{ vars.AZURE_OPENAI_EMBED_DEPLOYMENT }}
+          AZURE_OPENAI_EMBED_MODEL: ${{ vars.AZURE_OPENAI_EMBED_MODEL }}
+          AZURE_OPENAI_EMBED_DIMENSIONS: ${{ vars.AZURE_OPENAI_EMBED_DIMENSIONS }}
+          AZURE_OPENAI_EMBEDDING_COLUMN: ${{ vars.AZURE_OPENAI_EMBEDDING_COLUMN }}
       - name: Evaluate local RAG flow
         run: |
           python evals/evaluate.py
-
+        env:
+          OPENAI_CHAT_HOST: ${{ vars.OPENAI_CHAT_HOST }}
+          AZURE_OPENAI_ENDPOINT: ${{ vars.AZURE_OPENAI_ENDPOINT }}
+          AZURE_OPENAI_VERSION: ${{ vars.AZURE_OPENAI_VERSION }}
+          AZURE_OPENAI_CHAT_DEPLOYMENT: ${{ vars.AZURE_OPENAI_CHAT_DEPLOYMENT }}
+          AZURE_OPENAI_CHAT_MODEL: ${{ vars.AZURE_OPENAI_CHAT_MODEL }}
+          AZURE_OPENAI_EVAL_DEPLOYMENT: ${{ vars.AZURE_OPENAI_EVAL_DEPLOYMENT }}
+          AZURE_OPENAI_EVAL_MODEL: ${{ vars.AZURE_OPENAI_EVAL_MODEL }}
       - name: Upload server logs as build artifact
         uses: actions/upload-artifact@v4
         with:

src/backend/fastapi_app/openai_clients.py

@@ -17,15 +17,23 @@ async def create_openai_chat_client(
         azure_endpoint = os.environ["AZURE_OPENAI_ENDPOINT"]
         azure_deployment = os.environ["AZURE_OPENAI_CHAT_DEPLOYMENT"]
         if api_key := os.getenv("AZURE_OPENAI_KEY"):
-            logger.info("Authenticating to Azure OpenAI using API key...")
+            logger.info(
+                "Setting up Azure OpenAI client using API key, endpoint %s, deployment %s",
+                azure_endpoint,
+                azure_deployment,
+            )
             openai_chat_client = openai.AsyncAzureOpenAI(
                 api_version=api_version,
                 azure_endpoint=azure_endpoint,
                 azure_deployment=azure_deployment,
                 api_key=api_key,
             )
         else:
-            logger.info("Authenticating to Azure OpenAI Chat using Azure Identity...")
+            logger.info(
+                "Setting up Azure OpenAI client using Azure Identity, endpoint %s, deployment %s",
+                azure_endpoint,
+                azure_deployment,
+            )
             token_provider = azure.identity.get_bearer_token_provider(
                 azure_credential, "https://cognitiveservices.azure.com/.default"
             )
@@ -36,13 +44,13 @@ async def create_openai_chat_client(
                 azure_ad_token_provider=token_provider,
             )
     elif OPENAI_CHAT_HOST == "ollama":
-        logger.info("Authenticating to OpenAI using Ollama...")
+        logger.info("Setting up OpenAI client using Ollama")
         openai_chat_client = openai.AsyncOpenAI(
             base_url=os.getenv("OLLAMA_ENDPOINT"),
             api_key="nokeyneeded",
         )
     else:
-        logger.info("Authenticating to OpenAI using OpenAI.com API key...")
+        logger.info("Setting up OpenAI client using OpenAI.com API key")
         openai_chat_client = openai.AsyncOpenAI(api_key=os.getenv("OPENAICOM_KEY"))
 
     return openai_chat_client