Update app.py

app.py

@@ -1,92 +1,85 @@
-import gradio as gr
-import openai
+import streamlit as st
 import os
 import json
+import time
+import requests
+from openai import OpenAI
 
-# === Load Secrets ===
-openai.api_key = os.environ.get("OPENAI_API_KEY")
-ASSISTANT_ID = os.environ.get("ASSISTANT_ID")
-VECTOR_STORE_ID = "vs_68199dddd40c8191973e8a6d1b136cd3"
-
-# === Chat Function ===
-def search_drawings(user_query):
-    try:
-        thread = openai.beta.threads.create()
-        openai.beta.threads.messages.create(
-            thread_id=thread.id,
-            role="user",
-            content=user_query
-        )
+# ------------------ App Configuration ------------------
+st.set_page_config(page_title="Forrestdale Drawing Assistant", layout="wide")
+st.title("📐 Forrestdale Technical Drawing Assistant")
 
-        run = openai.beta.threads.runs.create(
-            thread_id=thread.id,
-            assistant_id=ASSISTANT_ID,
-            tool_choice="auto",
-            vector_store_ids=[VECTOR_STORE_ID]
-        )
-
-        # Wait for completion
-        while True:
-            run_status = openai.beta.threads.runs.retrieve(thread_id=thread.id, run_id=run.id)
-            if run_status.status in ["completed", "failed", "cancelled"]:
-                break
-
-        if run_status.status != "completed":
-            return gr.update(visible=True), f"❌ Assistant failed: {run_status.status}", []
+# ------------------ Load API Key and Assistant ID ------------------
+OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
+ASSISTANT_ID = os.environ.get("ASSISTANT_ID")
 
-        messages = openai.beta.threads.messages.list(thread_id=thread.id)
-        for m in reversed(messages.data):
-            if m.role == "assistant":
-                raw = m.content[0].text.value
-                try:
-                    result = json.loads(raw)
-                    cards = []
-                    for entry in result.get("drawings", []):
-                        img_tag = f'<img src="{entry["image_url"]}" style="width:100%; border-radius:12px"/>'
-                        page_caption = f"{entry['drawing_number']} – Page {entry['page_number']}"
-                        summary = f"<b>Summary:</b> {entry['summary']}"
+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()
 
-                        with gr.Column(scale=1):
-                            cards.append(gr.HTML(f"""
-                            <div style='background:#1a1a1a; border:1px solid #333; border-radius:14px; padding:16px; height:100%'>
-                                {img_tag}<br>
-                                <p style='margin-top:8px; font-weight:bold;'>{page_caption}</p>
-                                <p style='font-size:14px'>{summary}</p>
-                            </div>
-                            """))
-                    return gr.update(visible=False), "", cards
-                except Exception as e:
-                    return gr.update(visible=True), "⚠️ Could not parse assistant response as JSON.", []
-        return gr.update(visible=True), "⚠️ No assistant response found.", []
+client = OpenAI(api_key=OPENAI_API_KEY)
 
-    except Exception as e:
-        return gr.update(visible=True), f"❌ Error: {str(e)}", []
+# ------------------ 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 = []
 
-# === UI ===
-title = "\U0001F5A9 Forrestdale Technical Drawing Assistant"
-description = "Ask for plans by discipline, components or tags (e.g. \"Show all architectural plans\")"
+# ------------------ Query Bar ------------------
+prompt = st.text_input("Ask about plans, drawings or components", placeholder="e.g. Show me all electrical plans")
 
-def ui():
-    with gr.Blocks(theme=gr.themes.Monochrome()) as demo:
-        gr.Markdown(f"""
-        <h1 style='font-size:32px'>{title}</h1>
-        <p style='color:#aaa; font-size:16px'>{description}</p>
-        """)
+if prompt:
+    if st.session_state.thread_id is None:
+        thread = client.beta.threads.create()
+        st.session_state.thread_id = thread.id
 
-        with gr.Row():
-            query_input = gr.Textbox(placeholder="e.g. Show all electrical plans", scale=4)
-            submit_btn = gr.Button("Search", variant="primary", scale=1)
+    client.beta.threads.messages.create(
+        thread_id=st.session_state.thread_id,
+        role="user",
+        content=prompt
+    )
 
-        error_box = gr.Markdown("", visible=False)
-        result_gallery = gr.Group([])
+    run = client.beta.threads.runs.create(
+        thread_id=st.session_state.thread_id,
+        assistant_id=ASSISTANT_ID
+    )
 
-        submit_btn.click(
-            fn=search_drawings,
-            inputs=[query_input],
-            outputs=[error_box, error_box, result_gallery]
-        )
+    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)
 
-    return demo
+    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}")
 
-app = ui()
-app.launch()
+# ------------------ 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)