Update app.py

app.py

@@ -69,8 +69,15 @@ if not OPENAI_API_KEY:
 
 client = OpenAI(api_key=OPENAI_API_KEY)
 
-# Assistant PPG ID (quello che mi hai dato)
-ASSISTANT_ID = "asst_20DNMEENkfBsYupFjPCwfijZ"
+# Assistant PPG ID
+# Usa la env se presente, altrimenti il tuo ID fornito
+ASSISTANT_ID = os.environ.get("PPG_ASSISTANT_ID", "asst_20DNMEENkfBsYupFjPCwfijZ")
+
+# Facoltativo: vector store per forzare File Search
+VECTOR_STORE_ID = os.environ.get("PPG_VECTOR_STORE_ID", "")
+
+# Se vuoi forzare la seconda lingua nelle risposte (es. "Italian")
+APP_FORCE_LANG = os.environ.get("APP_FORCE_LANG", "").strip()
 
 # ======================
 # Helpers
@@ -89,53 +96,84 @@ def predict_image(image: Image.Image):
 
 def call_assistant(label, confidence, zone, note, user_question, thread_id=None):
     """
-    Manda input all'assistente OpenAI. Se thread_id è None, crea un nuovo thread.
+    Manda input all'assistente OpenAI.
+    - Se VECTOR_STORE_ID è impostato, lo collega al thread per File Search.
+    - Usa 'instructions' del run per imporre regole (file-first, dual language, ecc.).
     Ritorna (reply, thread_id).
     """
-    # se non esiste un thread, crealo
+    # crea thread con risorse file_search, se disponibile
     if not thread_id:
-        thread = client.beta.threads.create()
+        if VECTOR_STORE_ID:
+            thread = client.beta.threads.create(
+                tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}}
+            )
+        else:
+            thread = client.beta.threads.create()
         thread_id = thread.id
 
-    # messaggio utente con contesto
-    context = f"""
-Classification result: {label} ({round(confidence*100,2)}%).
+    # contesto minimo
+    core_context = f"""
+Classification: {label} ({round(confidence*100,2)}%).
 Zone: {zone or "Not specified"}.
-Note: {note or "(none)"}.
+User note: {note or "(none)"}.
+"""
 
-User question:
-{user_question}
+    # richiesta utente
+    user_payload = core_context + "\nUser question:\n" + (user_question or "Provide initial advisory based on classification and note.")
 
-Always act as a PPG marine coatings technical specialist.
-Keep answers concise, technical, and always add:
-"Research use only; verify with official PPG specs."
-"""
     client.beta.threads.messages.create(
         thread_id=thread_id,
         role="user",
-        content=context
+        content=user_payload,
+        # Se vuoi agganciare file specifici a questo messaggio, usa attachments con file_id e tool file_search.
+        # attachments=[{"file_id":"<FILE_ID>", "tools":[{"type":"file_search"}]}]
     )
 
-    # run con l'assistente
-    run = client.beta.threads.runs.create(
-        thread_id=thread_id,
-        assistant_id=ASSISTANT_ID
+    # Istruzioni addizionali per il run
+    second_lang_clause = f"Then provide the same content in {APP_FORCE_LANG}." if APP_FORCE_LANG else \
+                         "Then repeat in the user's language if detectable from note; else in Italian."
+
+    extra_instructions = (
+        "Act as a PPG marine coatings technical specialist for ships (marine environments only). "
+        "Answer ONLY using information found in the attached docs via File Search (TDS/SDS, standard cycles). "
+        "If the docs lack details, reply 'Not in docs' and ask a targeted follow-up. "
+        "ALWAYS ask for the area/zone if it's missing before prescribing a cycle. "
+        "Structure: Diagnosis; Surface Preparation (ISO 8501-1, profile); System (primer/build/top or AF; DFT per coat; coats; recoat windows); Notes; Short disclaimer: "
+        "'Research use only; verify with official PPG specs.' "
+        "Cite file name and section/page when relevant. "
+        "Provide first in English. " + second_lang_clause
     )
 
-    # polling fino a completamento
+    run_kwargs = {
+        "thread_id": thread_id,
+        "assistant_id": ASSISTANT_ID,
+        "instructions": extra_instructions,
+    }
+
+    # Se vuoi forzare l'uso del file_search come tool principale, alcune versioni supportano:
+    # run_kwargs["tool_choice"] = "file_search"
+
+    run = client.beta.threads.runs.create(**run_kwargs)
+
+    # polling
     while True:
         r = client.beta.threads.runs.retrieve(thread_id=thread_id, run_id=run.id)
         if r.status in ["completed", "failed", "cancelled", "expired"]:
             break
         time.sleep(0.8)
 
-    # recupera ultimo messaggio
+    # prendi ultimo messaggio assistant
     msgs = client.beta.threads.messages.list(thread_id=thread_id)
     reply = None
     for m in msgs.data:
         if m.role == "assistant":
-            reply = m.content[0].text.value
-            break
+            # m.content può avere più parti; prendiamo la prima testuale
+            for part in m.content:
+                if getattr(part, "type", "") == "text":
+                    reply = part.text.value
+                    break
+            if reply:
+                break
 
     return reply or "No reply from Assistant.", thread_id
 
@@ -147,7 +185,14 @@ def run_analysis(image, note, zone, chat_history, thread_state):
     if image is None:
         return "No image received.", chat_history, thread_state
 
+    # blocco: serve una zona chiara
+    if not zone or zone == "Other / Not sure":
+        msg = "**Please select the area/zone first.** The assistant needs the zone to propose a correct cycle."
+        return msg, chat_history, thread_state
+
     label, conf = predict_image(image)
+
+    # prompt iniziale
     user_question = "Provide initial advisory based on classification and note."
     reply, thread_id = call_assistant(label, conf, zone, note, user_question)
 
@@ -160,7 +205,7 @@ def run_analysis(image, note, zone, chat_history, thread_state):
     return out_text, new_history, {"thread_id": thread_id, "label": label, "confidence": conf, "zone": zone or ""}
 
 def continue_chat(user_msg, chat_history, thread_state, note, zone):
-    if not user_msg.strip():
+    if not user_msg or not user_msg.strip():
         return chat_history, ""
 
     label = (thread_state or {}).get("label") or "unknown"
@@ -174,6 +219,27 @@ def continue_chat(user_msg, chat_history, thread_state, note, zone):
     thread_state["thread_id"] = thread_id
     return chat_history, ""
 
+# ======================
+# UI helpers: spinner + button state
+# ======================
+
+def show_spinner():
+    spinner_html = gr.update(visible=True)
+    quick_msg = "**Analyzing image...** This may take a few seconds."
+    btn_state = gr.update(interactive=False)
+    return spinner_html, quick_msg, btn_state
+
+def hide_spinner():
+    spinner_html = gr.update(visible=False)
+    btn_state = gr.update(interactive=True)
+    return spinner_html, btn_state
+
+def show_chat_sending():
+    return gr.update(interactive=False)
+
+def hide_chat_sending():
+    return gr.update(interactive=True)
+
 # ======================
 # UI
 # ======================
@@ -182,9 +248,9 @@ WELCOME = """
 # Corrosion Assistant — Beta
 
 **Welcome!** This demo runs a custom **ResNet50 corrosion classifier** and connects to a dedicated **PPG Assistant** on OpenAI.
-- **Model**: ResNet50 classifier, **trained locally** on ~9,000 images  
-- **Data collection**: a public link for contributing images will open soon  
-- **Disclaimer**: research & experimental only. No professional advice, no warranty.  
+- **Model**: ResNet50 classifier, **trained locally** on ~**9,000 images**
+- **Data collection**: a public link for contributing images will open **soon**
+- **Disclaimer**: research & experimental only. No professional advice, no warranty.
 
 After image analysis you can continue chatting with the assistant.
 """
@@ -192,6 +258,21 @@ After image analysis you can continue chatting with the assistant.
 with gr.Blocks(title="Corrosion Assistant", theme=gr.themes.Soft()) as demo:
     gr.Markdown(WELCOME)
 
+    # CSS per spinner
+    gr.HTML("""
+    <style>
+    .ca-spinner { display:flex; align-items:center; gap:10px; padding:8px 0; }
+    .ca-spinner .loader {
+      border: 4px solid #e5e7eb;
+      border-top: 4px solid #3b82f6;
+      border-radius: 50%;
+      width: 20px; height: 20px;
+      animation: ca-spin 0.9s linear infinite;
+    }
+    @keyframes ca-spin { 100% { transform: rotate(360deg); } }
+    </style>
+    """)
+
     with gr.Row():
         with gr.Column(scale=2):
             img = gr.Image(type="pil", sources=["upload","webcam"], label="Upload or webcam")
@@ -199,6 +280,10 @@ with gr.Blocks(title="Corrosion Assistant", theme=gr.themes.Soft()) as demo:
             zone = gr.Dropdown(choices=ZONES, label="Zone (indicative)", value="Other / Not sure")
             analyze_btn = gr.Button("Analyze image", variant="primary")
         with gr.Column(scale=3):
+            spinner = gr.HTML(
+                "<div class='ca-spinner'><div class='loader'></div><div>Processing...</div></div>",
+                visible=False
+            )
             out_md = gr.Markdown(label="Analysis")
 
     gr.Markdown("### Continue the conversation with the PPG Assistant")
@@ -219,20 +304,38 @@ with gr.Blocks(title="Corrosion Assistant", theme=gr.themes.Soft()) as demo:
     chat_state = gr.State([])
     thread_state = gr.State({"thread_id": None, "label": None, "confidence": 0.0, "zone": ""})
 
+    # Analyze chain with spinner
     analyze_btn.click(
+        fn=show_spinner,
+        inputs=[],
+        outputs=[spinner, out_md, analyze_btn]
+    ).then(
         fn=run_analysis,
         inputs=[img, note, zone, chat_state, thread_state],
         outputs=[out_md, chat_state, thread_state]
+    ).then(
+        fn=hide_spinner,
+        inputs=[],
+        outputs=[spinner, analyze_btn]
     ).then(
         lambda h: h,
         inputs=[chat_state],
         outputs=[chat]
     )
 
+    # Chat chain with "sending" state
     send_btn.click(
+        fn=show_chat_sending,
+        inputs=[],
+        outputs=[send_btn]
+    ).then(
         fn=continue_chat,
         inputs=[chat_in, chat_state, thread_state, note, zone],
         outputs=[chat, chat_in]
+    ).then(
+        fn=hide_chat_sending,
+        inputs=[],
+        outputs=[send_btn]
     )
 
     clear_btn.click(