Update app.py

app.py

@@ -1,104 +1,95 @@
-import time
-import streamlit as st
-import openai
 import os
 import json
-import re
+import time
 import requests
-from PIL import Image
-from io import BytesIO
-from urllib.parse import quote
+import streamlit as st
+from openai import OpenAI
 
-# ------------------ Configuration ------------------
-st.set_page_config(page_title="Forrestdale Technical Drawing Assistant", layout="wide")
-st.markdown("""
-    <h1 style='font-size: 2.5rem;'>🏪 Forrestdale Technical Drawing Assistant</h1>
-    <p style='font-size: 1rem;'>Ask about plans, drawings or components</p>
-""", unsafe_allow_html=True)
+# -------------------- CONFIG --------------------
+OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
+ASSISTANT_ID = os.environ.get("ASSISTANT_ID")
 
-# ------------------ Environment ------------------
-OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
-ASSISTANT_ID = os.getenv("ASSISTANT_ID")
+st.set_page_config(page_title="Forrestdale Technical Drawing Assistant", layout="wide")
+st.title("🧱 Forrestdale Technical Drawing Assistant")
 
+# -------------------- ERROR CHECK --------------------
 if not OPENAI_API_KEY or not ASSISTANT_ID:
-    st.error("❌ Missing environment variables: OPENAI_API_KEY or ASSISTANT_ID.")
+    st.error("❌ Missing API credentials. Please set OPENAI_API_KEY and ASSISTANT_ID as environment variables.")
     st.stop()
 
-client = openai.OpenAI(api_key=OPENAI_API_KEY)
+client = OpenAI(api_key=OPENAI_API_KEY)
 
-# ------------------ Helper Functions ------------------
-def extract_json_from_response(response_text):
-    try:
-        match = re.search(r"```json\s*([\s\S]+?)```", response_text.strip())
-        if not match:
-            raise ValueError("No valid JSON block found.")
-        json_str = match.group(1).strip()
-        return json.loads(json_str)
-    except Exception as e:
-        st.error("⚠️ Could not parse assistant response as JSON.")
-        st.stop()
+# -------------------- CHAT SESSION --------------------
+if "messages" not in st.session_state:
+    st.session_state.messages = []
+if "thread_id" not in st.session_state:
+    st.session_state.thread_id = None
 
-def display_card(item):
-    st.markdown("""
-        <div style="border: 1px solid #333; border-radius: 12px; padding: 16px; margin: 10px; background-color: #111;">
-            <h3>📁 {} ({})</h3>
-            <p><b>Discipline:</b> {}</p>
-            <p><b>Summary:</b> {}</p>
-            <div style="display: flex; flex-wrap: wrap; gap: 10px;">
-    """.format(item["drawing_number"], item.get("drawing_type", ""), item["discipline"], item["summary"]), unsafe_allow_html=True)
-
-    for img in item.get("images", []):
-        try:
-            response = requests.get(img)
-            if response.status_code == 200:
-                image = Image.open(BytesIO(response.content))
-                st.image(image, caption=os.path.basename(img), width=200)
-        except:
-            st.warning(f"Image failed to load: {img}")
-
-    st.markdown("</div></div>", unsafe_allow_html=True)
-
-# ------------------ Input ------------------
-query = st.text_input("Ask about plans, drawings or components", placeholder="Show me all architectural plans")
+query = st.text_input("Ask about plans, drawings or components", placeholder="e.g. Show me all electrical plans")
 
 if query:
-    with st.spinner("🔍 Querying assistant..."):
+    with st.spinner("Querying assistant..."):
         try:
-            if "thread_id" not in st.session_state:
+            # Create thread if needed
+            if not st.session_state.thread_id:
                 thread = client.beta.threads.create()
                 st.session_state.thread_id = thread.id
 
+            # Submit message
             client.beta.threads.messages.create(
                 thread_id=st.session_state.thread_id,
                 role="user",
                 content=query
             )
 
+            # Run assistant
             run = client.beta.threads.runs.create(
                 thread_id=st.session_state.thread_id,
                 assistant_id=ASSISTANT_ID
             )
 
+            # Poll for result
             while True:
                 run_status = client.beta.threads.runs.retrieve(
                     thread_id=st.session_state.thread_id,
                     run_id=run.id
                 )
-                if run_status.status in ["completed", "failed", "cancelled"]:
+                if run_status.status == "completed":
                     break
+                elif run_status.status in ("failed", "cancelled"):
+                    raise Exception(f"Assistant failed: {run_status.status}")
                 time.sleep(1)
 
-            if run_status.status != "completed":
-                st.error(f"❌ Assistant run failed: {run_status.status}")
-            else:
-                messages = client.beta.threads.messages.list(thread_id=st.session_state.thread_id)
-                for message in reversed(messages.data):
-                    if message.role == "assistant":
-                        response_text = message.content[0].text.value
-                        data = extract_json_from_response(response_text)
-                        for item in data:
-                            display_card(item)
-                        break
+            # Fetch assistant message
+            messages = client.beta.threads.messages.list(thread_id=st.session_state.thread_id)
+            for message in reversed(messages.data):
+                if message.role == "assistant":
+                    content = message.content[0].text.value.strip()
+                    if content.startswith("```json") and content.endswith("```"):
+                        json_block = content.strip("```json\n").strip("```")
+                        parsed = json.loads(json_block)
+                        st.session_state.messages.append(parsed)
+                    else:
+                        st.error("⚠️ Could not parse assistant response as JSON.")
+                    break
 
         except Exception as e:
-            st.error(f"❌ Error during assistant call: {e}")
+            st.error(f"❌ Error: {e}")
+
+# -------------------- DISPLAY RESULTS --------------------
+if st.session_state.messages:
+    drawings = st.session_state.messages[-1]
+    if isinstance(drawings, list):
+        cols = st.columns(4)
+        for idx, item in enumerate(drawings):
+            with cols[idx % 4]:
+                st.subheader(f"📘 {item['drawing_number']}")
+                st.caption(f"Discipline: {item['discipline']}")
+                st.write(item.get("summary", "No summary available."))
+                if "images" in item:
+                    for img in item["images"][:1]:
+                        st.image(img, use_column_width=True)
+                elif "image" in item:
+                    st.image(item["image"], use_column_width=True)
+                if "question" in item:
+                    st.markdown(f"**Related Question:** {item['question']}")