Use environ vs getenv (#611)

Author: pamelafox

app/backend/app.py

@@ -142,14 +142,14 @@ async def ensure_openai_token():
 async def setup_clients():
 
     # Replace these with your own values, either in environment variables or directly here
-    AZURE_STORAGE_ACCOUNT = os.getenv("AZURE_STORAGE_ACCOUNT")
-    AZURE_STORAGE_CONTAINER = os.getenv("AZURE_STORAGE_CONTAINER")
-    AZURE_SEARCH_SERVICE = os.getenv("AZURE_SEARCH_SERVICE")
-    AZURE_SEARCH_INDEX = os.getenv("AZURE_SEARCH_INDEX")
-    AZURE_OPENAI_SERVICE = os.getenv("AZURE_OPENAI_SERVICE")
-    AZURE_OPENAI_CHATGPT_DEPLOYMENT = os.getenv("AZURE_OPENAI_CHATGPT_DEPLOYMENT")
-    AZURE_OPENAI_CHATGPT_MODEL = os.getenv("AZURE_OPENAI_CHATGPT_MODEL")
-    AZURE_OPENAI_EMB_DEPLOYMENT = os.getenv("AZURE_OPENAI_EMB_DEPLOYMENT")
+    AZURE_STORAGE_ACCOUNT = os.environ["AZURE_STORAGE_ACCOUNT"]
+    AZURE_STORAGE_CONTAINER = os.environ["AZURE_STORAGE_CONTAINER"]
+    AZURE_SEARCH_SERVICE = os.environ["AZURE_SEARCH_SERVICE"]
+    AZURE_SEARCH_INDEX = os.environ["AZURE_SEARCH_INDEX"]
+    AZURE_OPENAI_SERVICE = os.environ["AZURE_OPENAI_SERVICE"]
+    AZURE_OPENAI_CHATGPT_DEPLOYMENT = os.environ["AZURE_OPENAI_CHATGPT_DEPLOYMENT"]
+    AZURE_OPENAI_CHATGPT_MODEL = os.environ["AZURE_OPENAI_CHATGPT_MODEL"]
+    AZURE_OPENAI_EMB_DEPLOYMENT = os.environ["AZURE_OPENAI_EMB_DEPLOYMENT"]
 
     KB_FIELDS_CONTENT = os.getenv("KB_FIELDS_CONTENT", "content")
     KB_FIELDS_SOURCEPAGE = os.getenv("KB_FIELDS_SOURCEPAGE", "sourcepage")

tests/test_app.py

@@ -1,10 +1,20 @@
 import json
 
 import pytest
+import quart.testing.app
 
-from app import format_as_ndjson
+import app
 
 
+@pytest.mark.asyncio
+async def test_missing_env_vars():
+    quart_app = app.create_app()
+
+    with pytest.raises(quart.testing.app.LifespanError) as exc_info:
+        async with quart_app.test_app() as test_app:
+            test_app.test_client()
+        assert str(exc_info.value) == "Lifespan failure in startup. ''AZURE_OPENAI_EMB_DEPLOYMENT''"
+
 @pytest.mark.asyncio
 async def test_index(client):
     response = await client.get("/")
@@ -209,5 +219,5 @@ async def gen():
         yield {"a": "I ❤️ 🐍"}
         yield {"b": "Newlines inside \n strings are fine"}
 
-    result = [line async for line in format_as_ndjson(gen())]
+    result = [line async for line in app.format_as_ndjson(gen())]
     assert result == ['{"a": "I ❤️ 🐍"}\n', '{"b": "Newlines inside \\n strings are fine"}\n']