Update app.py

app.py

@@ -1,85 +1,134 @@
-import streamlit as st
-import os
-import json
-import time
-import requests
-from openai import OpenAI
-
-# ------------------ App Configuration ------------------
-st.set_page_config(page_title="Forrestdale Drawing Assistant", layout="wide")
-st.title("📐 Forrestdale Technical Drawing Assistant")
-
-# ------------------ Load API Key and Assistant ID ------------------
-OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
-ASSISTANT_ID = os.environ.get("ASSISTANT_ID")
-
-if not OPENAI_API_KEY or not ASSISTANT_ID:
-    st.error("❌ Missing secrets. Please set OPENAI_API_KEY and ASSISTANT_ID in secrets.")
-    st.stop()
-
-client = OpenAI(api_key=OPENAI_API_KEY)
-
-# ------------------ Session State Init ------------------
-if "thread_id" not in st.session_state:
-    st.session_state.thread_id = None
-if "results" not in st.session_state:
-    st.session_state.results = []
-
-# ------------------ Query Bar ------------------
-prompt = st.text_input("Ask about plans, drawings or components", placeholder="e.g. Show me all electrical plans")
-
-if prompt:
-    if st.session_state.thread_id is None:
-        thread = client.beta.threads.create()
-        st.session_state.thread_id = thread.id
-
-    client.beta.threads.messages.create(
-        thread_id=st.session_state.thread_id,
-        role="user",
-        content=prompt
-    )
-
-    run = client.beta.threads.runs.create(
-        thread_id=st.session_state.thread_id,
-        assistant_id=ASSISTANT_ID
-    )
-
-    with st.spinner("Thinking..."):
-        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"):
-                break
-            time.sleep(1)
-
-    if run_status.status == "completed":
-        messages = client.beta.threads.messages.list(thread_id=st.session_state.thread_id)
-        for message in reversed(messages.data):
-            if message.role == "assistant":
-                try:
-                    json_data = json.loads(message.content[0].text.value)
-                    st.session_state.results = json_data["results"]
-                except Exception as e:
-                    st.error("⚠️ Could not parse assistant response as JSON.")
-                break
-    else:
-        st.error(f"⚠️ Assistant failed: {run_status.status}")
-
-# ------------------ Display Results as Cards ------------------
-if st.session_state.results:
-    cols = st.columns(4)
-    for i, result in enumerate(st.session_state.results):
-        with cols[i % 4]:
-            st.markdown("""
-                <div style='border:1px solid #444; padding:10px; border-radius:10px; background:#111;'>
-                    <h5 style='color:#fdd;'>📁 {drawing_number}</h5>
-                    <b>Summary:</b> {summary}<br>
-                    <img src="{image_url}" style="width:100%; margin-top:10px; border-radius:6px;">
-                </div>
-            """.format(
-                drawing_number=result.get("drawing_number", "Untitled"),
-                summary=result.get("summary", "No summary available."),
-                image_url=result.get("image_url", "")
-            ), unsafe_allow_html=True)
+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.**