Update app.py

app.py

@@ -14,7 +14,7 @@ import torchvision.models as models
 try:
     from openai import OpenAI
 except Exception:
-    OpenAI = None  # gestiamo assenza pacchetto elegantemente
+    OpenAI = None  # se il pacchetto non c'è, non esplodiamo
 
 import spaces  # ZeroGPU decorator
 
@@ -173,7 +173,7 @@ def call_assistant(
         )
         user_payload = core_context + "\nUser question:\n" + (user_question or "Provide initial advisory.")
 
-        # costruisci contenuto multi-part con immagine
+        # contenuto multi-part con immagine
         content = [{"type": "input_text", "text": user_payload}]
 
         if image is not None:
@@ -210,7 +210,7 @@ def call_assistant(
             instructions=extra_instructions,
         )
 
-        # polling con timeout hard
+        # polling con timeout
         t0 = time.time()
         while True:
             r = client.beta.threads.runs.retrieve(thread_id=thread_id, run_id=run.id)
@@ -248,98 +248,97 @@ def call_assistant(
 
 def run_analysis(image, note, zone, chat_history, thread_state):
     """
-    Generator sicuro: intercetta ogni eccezione e restituisce sempre qualcosa,
-    così l’overlay non resta appeso e l’utente non rimane a fissare il vuoto cosmico.
+    Generator sicuro: intercetta eccezioni e restituisce sempre qualcosa.
     """
-    with gr.Progress() as prog:
-        try:
-            prog(0.03, desc="Checking input")
-            if image is None:
-                yield "No image received.", chat_history, thread_state
-                return
-
-            if not zone or zone == "Other / Not sure":
-                yield "**Please select the area/zone first.**", chat_history, thread_state
-                return
-
-            # feedback immediato
-            yield "**Analyzing image...** Please wait.", chat_history, thread_state
-
-            prog(0.18, desc="Preprocessing")
-            time.sleep(0.05)
-
-            prog(0.50, desc="Classifying (ResNet50)")
-            label, conf = predict_image(image)
-
-            prog(0.72, desc="Consulting PPG Assistant")
-            reply, thread_id = call_assistant(
-                label=label,
-                confidence=conf,
-                zone=zone,
-                note=note or "",
-                user_question="Provide initial advisory.",
-                image=image,
-                thread_id=(thread_state or {}).get("thread_id")
-            )
+    prog = gr.Progress()  # niente context manager per compat vecchie versioni
+    try:
+        prog(0.03, desc="Checking input")
+        if image is None:
+            yield "No image received.", chat_history, thread_state
+            return
+
+        if not zone or zone == "Other / Not sure":
+            yield "**Please select the area/zone first.**", chat_history, thread_state
+            return
+
+        # feedback immediato
+        yield "**Analyzing image...** Please wait.", chat_history, thread_state
+
+        prog(0.18, desc="Preprocessing")
+        time.sleep(0.05)
+
+        prog(0.50, desc="Classifying (ResNet50)")
+        label, conf = predict_image(image)
+
+        prog(0.72, desc="Consulting PPG Assistant")
+        reply, thread_id = call_assistant(
+            label=label,
+            confidence=conf,
+            zone=zone,
+            note=note or "",
+            user_question="Provide initial advisory.",
+            image=image,
+            thread_id=(thread_state or {}).get("thread_id")
+        )
 
-            header = f"**Model result:** `{label}` — confidence **{round(conf*100,2)}%**\n\n"
-            out_text = header + (reply or "")
-            new_history = (chat_history[:] if chat_history else [])
-            if reply:
-                new_history.append(("", reply))
+        header = f"**Model result:** `{label}` — confidence **{round(conf*100,2)}%**\n\n"
+        out_text = header + (reply or "")
+        new_history = (chat_history[:] if chat_history else [])
+        if reply:
+            new_history.append(("", reply))
 
-            prog(1.0, desc="Done")
+        prog(1.0, desc="Done")
 
-            yield out_text, new_history, {
-                "thread_id": thread_id,
-                "label": label,
-                "confidence": conf,
-                "zone": zone or "",
-            }
+        yield out_text, new_history, {
+            "thread_id": thread_id,
+            "label": label,
+            "confidence": conf,
+            "zone": zone or "",
+        }
 
-        except Exception as e:
-            # non lasciamo l’overlay attivo in eterno
-            print("[Pipeline][ERROR]", e)
-            traceback.print_exc()
-            err = f"**Error during analysis**:\n```\n{e}\n```\nCheck logs/keys and try again."
-            yield err, chat_history, thread_state or {}
+    except Exception as e:
+        print("[Pipeline][ERROR]", e)
+        traceback.print_exc()
+        err = f"**Error during analysis**:\n```\n{e}\n```"
+        yield err, chat_history, thread_state or {}
 
 def continue_chat(user_msg, chat_history, thread_state, note, zone):
     if not user_msg or not user_msg.strip():
         return chat_history, ""
-    with gr.Progress() as prog:
-        try:
-            prog(0.2, desc="Sending")
-            label = (thread_state or {}).get("label") or "unknown"
-            conf = (thread_state or {}).get("confidence") or 0.0
-            current_zone = zone or (thread_state or {}).get("zone") or "Not specified"
-            thread_id = (thread_state or {}).get("thread_id")
-
-            prog(0.7, desc="Consulting PPG Assistant")
-            reply, thread_id = call_assistant(
-                label=label,
-                confidence=conf,
-                zone=current_zone,
-                note=note or "",
-                user_question=user_msg,
-                image=None,  # la thread ha già il file dell'ultima analisi
-                thread_id=thread_id
-            )
 
-            chat_history = chat_history or []
-            chat_history.append((user_msg, reply))
-            if isinstance(thread_state, dict):
-                thread_state["thread_id"] = thread_id
+    prog = gr.Progress()
+    try:
+        prog(0.2, desc="Sending")
+        label = (thread_state or {}).get("label") or "unknown"
+        conf = (thread_state or {}).get("confidence") or 0.0
+        current_zone = zone or (thread_state or {}).get("zone") or "Not specified"
+        thread_id = (thread_state or {}).get("thread_id")
+
+        prog(0.7, desc="Consulting PPG Assistant")
+        reply, thread_id = call_assistant(
+            label=label,
+            confidence=conf,
+            zone=current_zone,
+            note=note or "",
+            user_question=user_msg,
+            image=None,  # la thread ha già l'immagine dell'ultima analisi
+            thread_id=thread_id
+        )
+
+        chat_history = chat_history or []
+        chat_history.append((user_msg, reply))
+        if isinstance(thread_state, dict):
+            thread_state["thread_id"] = thread_id
 
-            prog(1.0, desc="Done")
-            return chat_history, ""
+        prog(1.0, desc="Done")
+        return chat_history, ""
 
-        except Exception as e:
-            print("[Chat][ERROR]", e)
-            traceback.print_exc()
-            chat_history = chat_history or []
-            chat_history.append((user_msg, f"[Error] {e}"))
-            return chat_history, ""
+    except Exception as e:
+        print("[Chat][ERROR]", e)
+        traceback.print_exc()
+        chat_history = chat_history or []
+        chat_history.append((user_msg, f"[Error] {e}"))
+        return chat_history, ""
 
 # ======================
 # UI
@@ -449,6 +448,4 @@ with gr.Blocks(title="Corrosion Assistant", theme=gr.themes.Soft()) as demo:
     demo.api_mode = "enabled"
 
 if __name__ == "__main__":
-    # in Space, Gradio gestisce host/porta; local dev ok
     demo.launch()
-