remove multiple env loading, use single azure_credentials

Author: john0isaac

src/fastapi_app/__init__.py

@@ -1,40 +1,21 @@
-import contextlib
 import logging
 import os
 
 from dotenv import load_dotenv
-from environs import Env
 from fastapi import FastAPI
 
-from fastapi_app.dependencies import get_azure_credentials
-from fastapi_app.postgres_engine import create_postgres_engine_from_env
-
 logger = logging.getLogger("ragapp")
 
 
-@contextlib.asynccontextmanager
-async def lifespan(app: FastAPI):
-    load_dotenv(override=True)
-
-    azure_credential = await get_azure_credentials()
-    engine = await create_postgres_engine_from_env(azure_credential)
-
-    yield
-
-    await engine.dispose()
-
-
 def create_app(testing: bool = False):
-    env = Env()
-
     if os.getenv("RUNNING_IN_PRODUCTION"):
         logging.basicConfig(level=logging.WARNING)
     else:
         if not testing:
-            env.read_env(".env", override=True)
+            load_dotenv(override=True)
         logging.basicConfig(level=logging.INFO)
 
-    app = FastAPI(docs_url="/docs", lifespan=lifespan)
+    app = FastAPI(docs_url="/docs")
 
     from fastapi_app.routes import api_routes, frontend_routes
 

src/fastapi_app/dependencies.py

@@ -3,7 +3,6 @@
 from typing import Annotated
 
 import azure.identity
-from dotenv import load_dotenv
 from fastapi import Depends
 from openai import AsyncAzureOpenAI, AsyncOpenAI
 from pydantic import BaseModel
@@ -40,7 +39,6 @@ async def common_parameters():
     """
     Get the common parameters for the FastAPI app
     """
-    load_dotenv(override=True)
     OPENAI_EMBED_HOST = os.getenv("OPENAI_EMBED_HOST")
     OPENAI_CHAT_HOST = os.getenv("OPENAI_CHAT_HOST")
     if OPENAI_EMBED_HOST == "azure":
@@ -69,7 +67,7 @@ async def common_parameters():
     )
 
 
-async def get_azure_credentials() -> azure.identity.DefaultAzureCredential | azure.identity.ManagedIdentityCredential:
+def get_azure_credentials() -> azure.identity.DefaultAzureCredential | azure.identity.ManagedIdentityCredential:
     azure_credential: azure.identity.DefaultAzureCredential | azure.identity.ManagedIdentityCredential
     try:
         if client_id := os.getenv("APP_IDENTITY_ID"):
@@ -88,10 +86,11 @@ async def get_azure_credentials() -> azure.identity.DefaultAzureCredential | azu
         raise e
 
 
+azure_credentials = get_azure_credentials()
+
+
 async def get_engine():
     """Get the agent database engine"""
-    load_dotenv(override=True)
-    azure_credentials = await get_azure_credentials()
     engine = await create_postgres_engine_from_env(azure_credentials)
     return engine
 
@@ -105,14 +104,12 @@ async def get_async_session(engine: Annotated[AsyncEngine, Depends(get_engine)])
 
 async def get_openai_chat_client():
     """Get the OpenAI chat client"""
-    azure_credentials = await get_azure_credentials()
     chat_client = await create_openai_chat_client(azure_credentials)
     return OpenAIClient(client=chat_client)
 
 
 async def get_openai_embed_client():
     """Get the OpenAI embed client"""
-    azure_credentials = await get_azure_credentials()
     embed_client = await create_openai_embed_client(azure_credentials)
     return OpenAIClient(client=embed_client)
 

src/fastapi_app/openai_clients.py

@@ -25,7 +25,7 @@ async def create_openai_chat_client(
                 api_key=api_key,
             )
         else:
-            logger.info("Authenticating to Azure OpenAI using Azure Identity...")
+            logger.info("Authenticating to Azure OpenAI Chat using Azure Identity...")
             token_provider = azure.identity.get_bearer_token_provider(
                 azure_credential, "https://cognitiveservices.azure.com/.default"
             )
@@ -66,7 +66,7 @@ async def create_openai_embed_client(
                 api_key=api_key,
             )
         else:
-            logger.info("Authenticating to Azure OpenAI using Azure Identity...")
+            logger.info("Authenticating to Azure OpenAI Embedding using Azure Identity...")
             token_provider = azure.identity.get_bearer_token_provider(
                 azure_credential, "https://cognitiveservices.azure.com/.default"
             )

tests/conftest.py

@@ -56,6 +56,7 @@ def mock_session_env(monkeypatch_session):
         # Azure OpenAI
         monkeypatch_session.setenv("OPENAI_CHAT_HOST", "azure")
         monkeypatch_session.setenv("OPENAI_EMBED_HOST", "azure")
+        monkeypatch_session.setenv("AZURE_OPENAI_ENDPOINT", "https://api.openai.com")
         monkeypatch_session.setenv("AZURE_OPENAI_VERSION", "2024-03-01-preview")
         monkeypatch_session.setenv("AZURE_OPENAI_CHAT_DEPLOYMENT", "gpt-35-turbo")
         monkeypatch_session.setenv("AZURE_OPENAI_CHAT_MODEL", "gpt-35-turbo")