Merge conflicts

Author: nick863

src/api/main.py

@@ -84,7 +84,7 @@ async def lifespan(app: fastapi.FastAPI):
             else:
                 configure_azure_monitor(connection_string=application_insights_connection_string)
 
-        if os.environ.get("AZURE_AI_AGENT_ID") is not None:
+        if os.environ.get("AZURE_AI_AGENT_ID"):
             try: 
                 agent = await ai_client.agents.get_agent(os.environ["AZURE_AI_AGENT_ID"])
                 logger.info("Agent already exists, skipping creation")

src/api/routes.py

@@ -94,9 +94,9 @@ async def on_thread_message(self, message: ThreadMessage) -> Optional[str]:
     async def on_thread_run(self, run: ThreadRun) -> Optional[str]:
         logger.info("MyEventHandler: on_thread_run event received")
         run_information = f"ThreadRun status: {run.status}, thread ID: {run.thread_id}"
-        if run.status == "failed":
-            run_information += f", error: {run.last_error}"
         stream_data = {'content': run_information, 'type': 'thread_run'}
+        if run.status == "failed":
+            stream_data['error'] = run.last_error.as_dict()
         return serialize_sse_event(stream_data)
 
     async def on_error(self, data: str) -> Optional[str]:

src/api/static/ChatClient.js

@@ -106,6 +106,19 @@ class ChatClient {
 
                         console.log("[ChatClient] Parsed SSE event:", data);
 
+                        if (data.error) {
+                            if (!messageDiv) {
+                                messageDiv = this.ui.createAssistantMessageDiv();
+                                console.log("[ChatClient] Created new messageDiv for assistant.");
+                            }
+                            this.ui.appendAssistantMessage(
+                                messageDiv,
+                                data.error.message || "An error occurred.",
+                                false
+                            );           
+                            return;                 
+                        }
+
                         // Check the data type to decide how to update the UI
                         if (data.type === "stream_end") {
                             // End of the stream

src/gunicorn.conf.py

@@ -216,7 +216,6 @@ async def initialize_resources():
                 credential=creds,
                 conn_str=os.environ["AZURE_AIPROJECT_CONNECTION_STRING"],
             ) as ai_client:
-
                 # If the environment already has AZURE_AI_AGENT_ID, try
                 # fetching that agent
                 if os.environ.get("AZURE_AI_AGENT_ID") is not None: