Default values

Author: pamelafox

src/backend/fastapi_app/dependencies.py

@@ -37,34 +37,35 @@ class FastAPIAppContext(BaseModel):
 async def common_parameters():
     """
     Get the common parameters for the FastAPI app
+    Use the pattern of `os.getenv("VAR_NAME") or "default_value"` to avoid empty string values
     """
     OPENAI_EMBED_HOST = os.getenv("OPENAI_EMBED_HOST")
     OPENAI_CHAT_HOST = os.getenv("OPENAI_CHAT_HOST")
     if OPENAI_EMBED_HOST == "azure":
-        openai_embed_deployment = os.getenv("AZURE_OPENAI_EMBED_DEPLOYMENT", "text-embedding-ada-002")
-        openai_embed_model = os.getenv("AZURE_OPENAI_EMBED_MODEL", "text-embedding-ada-002")
-        openai_embed_dimensions = int(os.getenv("AZURE_OPENAI_EMBED_DIMENSIONS", 1536))
-        embedding_column = os.getenv("AZURE_OPENAI_EMBEDDING_COLUMN", "embedding_ada002")
+        openai_embed_deployment = os.getenv("AZURE_OPENAI_EMBED_DEPLOYMENT") or "text-embedding-ada-002"
+        openai_embed_model = os.getenv("AZURE_OPENAI_EMBED_MODEL") or "text-embedding-ada-002"
+        openai_embed_dimensions = int(os.getenv("AZURE_OPENAI_EMBED_DIMENSIONS") or 1536)
+        embedding_column = os.getenv("AZURE_OPENAI_EMBEDDING_COLUMN") or "embedding_ada002"
     elif OPENAI_EMBED_HOST == "ollama":
         openai_embed_deployment = None
-        openai_embed_model = os.getenv("OLLAMA_EMBED_MODEL", "nomic-embed-text")
+        openai_embed_model = os.getenv("OLLAMA_EMBED_MODEL") or "nomic-embed-text"
         openai_embed_dimensions = None
-        embedding_column = os.getenv("OLLAMA_EMBEDDING_COLUMN", "embedding_nomic")
+        embedding_column = os.getenv("OLLAMA_EMBEDDING_COLUMN") or "embedding_nomic"
     else:
         openai_embed_deployment = None
-        openai_embed_model = os.getenv("OPENAICOM_EMBED_MODEL", "text-embedding-ada-002")
+        openai_embed_model = os.getenv("OPENAICOM_EMBED_MODEL") or "text-embedding-ada-002"
         openai_embed_dimensions = int(os.getenv("OPENAICOM_EMBED_DIMENSIONS", 1536))
-        embedding_column = os.getenv("OPENAICOM_EMBEDDING_COLUMN", "embedding_ada002")
+        embedding_column = os.getenv("OPENAICOM_EMBEDDING_COLUMN") or "embedding_ada002"
     if OPENAI_CHAT_HOST == "azure":
-        openai_chat_deployment = os.getenv("AZURE_OPENAI_CHAT_DEPLOYMENT", "gpt-4o-mini")
-        openai_chat_model = os.getenv("AZURE_OPENAI_CHAT_MODEL", "gpt-4o-mini")
+        openai_chat_deployment = os.getenv("AZURE_OPENAI_CHAT_DEPLOYMENT") or "gpt-4o-mini"
+        openai_chat_model = os.getenv("AZURE_OPENAI_CHAT_MODEL") or "gpt-4o-mini"
     elif OPENAI_CHAT_HOST == "ollama":
         openai_chat_deployment = None
-        openai_chat_model = os.getenv("OLLAMA_CHAT_MODEL", "phi3:3.8b")
-        openai_embed_model = os.getenv("OLLAMA_EMBED_MODEL", "nomic-embed-text")
+        openai_chat_model = os.getenv("OLLAMA_CHAT_MODEL") or "phi3:3.8b"
+        openai_embed_model = os.getenv("OLLAMA_EMBED_MODEL") or "nomic-embed-text"
     else:
         openai_chat_deployment = None
-        openai_chat_model = os.getenv("OPENAICOM_CHAT_MODEL", "gpt-3.5-turbo")
+        openai_chat_model = os.getenv("OPENAICOM_CHAT_MODEL") or "gpt-3.5-turbo"
     return FastAPIAppContext(
         openai_chat_model=openai_chat_model,
         openai_embed_model=openai_embed_model,