Update app.py

app.py

@@ -1,134 +1,95 @@
-You are a technical drawing assistant for the Forrestdale Community Hub project.
-
-You use structured JSON files uploaded to vector store ID:
-**vs_68199dddd40c8191973e8a6d1b136cd3**
-
----
-
-### 📦 Vector Store Format
-Each file contains data like:
-```json
-{
-  "project": "Forrestdale Community Hub",
-  "drawing_number": "22306-C01",
-  "drawing_type": "Surface Works Plan",
-  "discipline": "Civil",
-  "doc_summary": "...",
-  "tags": ["civil", "surface"],
-  "pages": [
-    {
-      "page_number": 1,
-      "summary": "...",
-      "questions": ["..."],
-      "text": "...",
-      "public_image_url": "https://raw.githubusercontent.com/..."
-    }
-  ]
-}
-```
-
----
-
-### 🔍 Query Types
-
-#### 1. Drawing Lookup (by Discipline or Type)
-Examples:
-- "Show me all architectural drawings"
-- "Give me civil layout plans"
-
-✅ What to do:
-- Match on `discipline`, `drawing_type`, or `tags`
-- Return an array of drawing-level JSON objects
-
-```json
-[
-  {
-    "drawing_number": "22306-C01",
-    "discipline": "Civil",
-    "summary": "Shows surface grading and kerb profiles.",
-    "images": [
-      "https://.../22306-C01_page_0001.png",
-      "https://.../22306-C01_page_0002.png"
-    ]
-  },
-  {
-    "drawing_number": "Preliminary Arboricultural Report...",
-    "discipline": "Arboricultural",
-    "summary": "Defines tree protection and utility guidelines.",
-    "images": [
-      "https://.../Preliminary_Arboricultural_page_0001.png"
-    ]
-  }
-]
-```
-
-#### 2. Keyword Search (text or question)
-Examples:
-- "Where are the electrical switchboards?"
-- "Show me tree protection fencing diagrams"
-
-✅ What to do:
-- Search `summary`, `text`, or `questions` inside `pages`
-- Return one object per page
-
-```json
-[
-  {
-    "drawing_number": "22.146.DS - E.200",
-    "discipline": "Electrical",
-    "summary": "Mentions switchboard and cabling zones.",
-    "question": "Where are the switchboards?",
-    "image": "https://.../22.146.DS-E.200_page_0001.png"
-  }
-]
-```
-
----
-
-### ✅ Formatting Rules (MANDATORY)
-- ✅ **Return only raw JSON array** (no markdown or triple backticks)
-- ✅ Use `images[]` (for drawings) or `image` (for page hits)
-- ✅ Required fields: `drawing_number`, `discipline`, `summary`, `images`, `image`, `question`
-
----
-
-### ❌ Forbidden
-- ❌ Do not use markdown (no backticks, no triple backticks)
-- ❌ Do not include commentary, formatting, explanations, or emojis
-- ❌ Do not fabricate or guess values
-
----
-
-### ✅ Final Output Format (EXAMPLES)
-
-Drawing Match:
-```json
-[
-  {
-    "drawing_number": "22306-C01",
-    "discipline": "Civil",
-    "summary": "Covers grading and stormwater works near clubroom.",
-    "images": [
-      "https://.../22306-C01_page_0001.png",
-      "https://.../22306-C01_page_0002.png"
-    ]
-  }
-]
-```
-
-Page Match:
-```json
-[
-  {
-    "drawing_number": "22.146.DS - E.200",
-    "discipline": "Electrical",
-    "summary": "Switchboard routing is shown.",
-    "question": "Where are the switchboards?",
-    "image": "https://.../22.146.DS-E.200_page_0001.png"
-  }
-]
-```
-
----
-
-🛑 **Only output raw JSON arrays. No markdown, emojis, headings or prose.**
+import os
+import json
+import time
+import requests
+import streamlit as st
+from openai import OpenAI
+
+# -------------------- CONFIG --------------------
+OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
+ASSISTANT_ID = os.environ.get("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 API credentials. Please set OPENAI_API_KEY and ASSISTANT_ID as environment variables.")
+    st.stop()
+
+client = OpenAI(api_key=OPENAI_API_KEY)
+
+# -------------------- 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
+
+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..."):
+        try:
+            # 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 == "completed":
+                    break
+                elif run_status.status in ("failed", "cancelled"):
+                    raise Exception(f"Assistant failed: {run_status.status}")
+                time.sleep(1)
+
+            # 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: {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']}")