Merge to upstream

Author: nick863

src/api/main.py

@@ -5,6 +5,7 @@
 import logging
 import os
 import sys
+import json
 from typing import Dict
 
 from azure.ai.projects.aio import AIProjectClient
@@ -56,10 +57,7 @@
 
 @contextlib.asynccontextmanager
 async def lifespan(app: fastapi.FastAPI):
-    files: Dict[str, Dict[str, str]] = {}  # File name -> {"id": file_id, "path": file_path}
-    vector_store = None
     agent = None
-    create_new_agent = True
 
     try:
         if not os.getenv("RUNNING_IN_PRODUCTION"):
@@ -89,33 +87,35 @@ async def lifespan(app: fastapi.FastAPI):
         if os.environ.get("AZURE_AI_AGENT_ID") is not None:
             try: 
                 agent = await ai_client.agents.get_agent(os.environ["AZURE_AI_AGENT_ID"])
-                create_new_agent = False
                 logger.info("Agent already exists, skipping creation")
                 logger.info(f"Fetched agent, agent ID: {agent.id}")
                 logger.info(f"Fetched agent, model name: {agent.model}")
             except Exception as e:
                 logger.error(f"Error fetching agent: {e}", exc_info=True)
-                create_new_agent = True
-        if create_new_agent:
-            # Check if a previous agent created by the template exists
+
+        if not agent:
+            # Fallback to searching by name
+            agent_name = os.environ["AZURE_AI_AGENT_NAME"]
             agent_list = await ai_client.agents.list_agents()
             if agent_list.data:
                 for agent_object in agent_list.data:
-                    if agent_object.name == os.environ["AZURE_AI_AGENT_NAME"]:
+                    if agent_object.name == agent_name:
                         agent = agent_object
-        if agent == None:
-            raise Exception("Agent not found")
+                        logger.info(f"Found agent by name '{agent_name}', ID={agent_object.id}")
+                        break
 
-    except Exception as e:
-        logger.error(f"Error creating agent: {e}", exc_info=True)
-        raise RuntimeError(f"Failed to create the agent: {e}")
+        if not agent:
+            raise RuntimeError("No agent found. Ensure qunicorn.py created one or set AZURE_AI_AGENT_ID.")
 
-    app.state.ai_client = ai_client
-    app.state.agent = agent
-    app.state.files = files
+        app.state.ai_client = ai_client
+        app.state.agent = agent
 
-    try:
         yield
+
+    except Exception as e:
+        logger.error(f"Error during startup: {e}", exc_info=True)
+        raise RuntimeError(f"Error during startup: {e}")
+
     finally:
         try:
             await ai_client.close()

src/api/routes.py

@@ -197,7 +197,15 @@ async def fetch_document(request: Request):
     if not file_name:
         raise HTTPException(status_code=400, detail="file_name is required")
 
-    files = getattr(request.app.state, "files", {})
+    # Reconstruct the file dictionary from the env variable:
+    files_env = os.environ['UPLOADED_FILE_MAP']
+    try:
+        files = json.loads(files_env)
+        logger.info("Successfully parsed UPLOADED_FILE_MAP from environment variable.")
+    except json.JSONDecodeError:
+        files = {}
+        logger.warning("Failed to parse UPLOADED_FILE_MAP from environment variable.", exc_info=True)
+
     logger.info(f"File requested: {file_name}. Current file keys: {list(files.keys())}")
 
     if file_name not in files:

src/api/static/main.js

@@ -9,12 +9,18 @@ function initChat() {
     const chatClient = new ChatClient(chatUI);
 
     const form = document.getElementById("chat-form");
-
     const messageInput = document.getElementById("message");
-
+    const targetContainer = document.getElementById("messages");
+    const placeholderWrapper = document.getElementById("placeholder-wrapper");
 
     form.addEventListener("submit", async function(e) {
         e.preventDefault();
+        
+        // Remove placeholder message if it exists
+        if (placeholderWrapper) {
+            placeholderWrapper.remove();
+        }
+
         await chatClient.sendMessage("/chat", messageInput.value.trim());
         messageInput.value = "";
     });
@@ -24,4 +30,4 @@ function initChat() {
     };
 }
 
-document.addEventListener("DOMContentLoaded", initChat);
+document.addEventListener("DOMContentLoaded", initChat);

src/api/templates/index.html

@@ -12,14 +12,44 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/cosmo/bootstrap.min.css"
         integrity="sha256-axRDISYf7Hht1KhcMnfDV2nq7hD/8Q9Rxa0YlW/o3NU=" crossorigin="anonymous">
     <link href="/static/styles.css" rel="stylesheet" type="text/css">
+    <style>
+        #messages {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            text-align: center;
+        }
+        #placeholder-wrapper {
+            display: flex;
+            flex-grow: 1;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+        }
+        #placeholder-message {
+            color: #6c757d;
+        }
+        .header {
+            font-size: 2em;
+            font-weight: bold;
+            margin-bottom: 10px;
+        }
+        .message-content {
+            text-align: left;
+        }
+    </style>
 </head>
 <body>
     <div class="container-fluid h-100 d-flex flex-row">
         <div class="row flex-grow-1 h-100">
             <!-- Chat Section -->
             <div class="col-full d-flex flex-column h-100" id="chat-container"> <!-- Full width initially -->
                 <div id="messages" class="px-4 pb-4 pt-2 flex-grow-1 overflow-y-auto align-items-stretch">
-                    <!-- Message content goes here -->
+                    <div id="placeholder-wrapper">
+                        <div id="placeholder-message" class="text-center text-muted my-3">
+                            <div class="header">Getting Started with Agents Using Azure AI Foundry</div>
+                            Type your message below. You can start casually with something fun like "Tell me a joke," or ask specifically about the Azure Search files, such as "What is Contoso Galaxy Innovations product?"                        </div>
+                    </div>
                 </div>
 
                 <div id="chat-area" class="text-light px-4 py-2 rounded-top text-dark d-flex flex-column justify-content-center background-user">
@@ -76,4 +106,4 @@ <h5 class="mb-0">Document Viewer</h5>
     <script src="https://cdn.jsdelivr.net/npm/markdown-it/dist/markdown-it.min.js"></script>
     <script type="module" src="/static/main.js"></script>
 </body>
-</html>
+</html>

src/gunicorn.conf.py

@@ -94,7 +94,7 @@ async def create_index_maybe(
             vector_index_dimensions=int(
                 os.getenv('AZURE_AI_EMBED_DIMENSIONS'))):
             embeddings_path = os.path.join(
-                os.path.dirname(__file__), 'api', 'data', 'embeddings.csv')
+                os.path.dirname(__file__), 'data', 'embeddings.csv')
 
             assert embeddings_path, f'File {embeddings_path} not found.'
             await search_mgr.upload_documents(embeddings_path)
@@ -224,15 +224,15 @@ async def initialize_resources():
                           "AZURE_AI_AGENT_NAME"]:
                             logger.info(
                                 "Found existing agent named "
-                                f"'{agent_object.name}', "
-                                f"ID: {agent_object.id}")
+                                f"'{agent_object.name}'"
+                                f", ID: {agent_object.id}")
                             os.environ["AZURE_AI_AGENT_ID"] = agent_object.id
                             # Update the agent with the latest resources
                             agent = await update_agent(agent_object, ai_client)
                             return
 
                 # Create a new agent
-                agent = await create_agent(ai_client, creds)
+                agent = await create_agent(ai_client)
                 os.environ["AZURE_AI_AGENT_ID"] = agent.id
                 logger.info(f"Created agent, agent ID: {agent.id}")