Update app.py

app.py

@@ -173,41 +173,62 @@ User note: {note or "(none)"}.
     return reply or "No reply from Assistant.", thread_id
 
 # ======================
-# Pipelines (generator)
+# Pipelines (generator) con barra di avanzamento
 # ======================
 
 def run_analysis(image, note, zone, chat_history, thread_state):
-    if image is None:
-        yield "No image received.", chat_history, thread_state
-        return
-    if not zone or zone == "Other / Not sure":
-        msg = "**Please select the area/zone first.**"
-        yield msg, chat_history, thread_state
-        return
-
-    # messaggio intermedio
-    yield "**Analyzing image...** Please wait.", chat_history, thread_state
-
-    label, conf = predict_image(image)
-    reply, thread_id = call_assistant(label, conf, zone, note, "Provide initial advisory.")
-
-    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 []
-    new_history.append(("", reply))
-    yield out_text, new_history, {"thread_id": thread_id, "label": label, "confidence": conf, "zone": zone or ""}
+    # La progress bar mostra avanzamenti deterministici lato server.
+    with gr.Progress() as prog:
+        prog(0.02, desc="Ricezione immagine")
+        if image is None:
+            yield "No image received.", chat_history, thread_state
+            return
+
+        prog(0.06, desc="Validazione input")
+        if not zone or zone == "Other / Not sure":
+            yield "**Please select the area/zone first.**", chat_history, thread_state
+            return
+
+        # messaggio intermedio per feedback immediato
+        yield "**Analyzing image...** Please wait.", chat_history, thread_state
+
+        prog(0.15, desc="Preprocessing")
+        # un micro ritardo solo per dare feedback visivo
+        time.sleep(0.05)
+
+        prog(0.45, desc="Classificazione (CNN)")
+        label, conf = predict_image(image)
+
+        prog(0.70, desc="Consulto PPG Assistant")
+        reply, thread_id = call_assistant(label, conf, zone, note, "Provide initial advisory.")
+
+        prog(0.98, desc="Composizione risposta")
+
+        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 []
+        new_history.append(("", reply))
+        prog(1.0, desc="Fatto")
+
+        yield 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():
         return chat_history, ""
-    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")
-    reply, thread_id = call_assistant(label, conf, current_zone, note, user_msg, thread_id)
-    chat_history.append((user_msg, reply))
-    thread_state["thread_id"] = thread_id
-    return chat_history, ""
+    with gr.Progress() as prog:
+        prog(0.1, desc="Invio messaggio")
+        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.6, desc="Consulto PPG Assistant")
+        reply, thread_id = call_assistant(label, conf, current_zone, note, user_msg, thread_id)
+
+        chat_history.append((user_msg, reply))
+        thread_state["thread_id"] = thread_id
+        prog(1.0, desc="Fatto")
+        return chat_history, ""
 
 # ======================
 # UI
@@ -223,11 +244,46 @@ recognized so use this Model at your own risk.
 **Disclaimer**: research & experimental only. Made with love by JQ.
 """
 
+# Overlay HTML/CSS per stato di caricamento/analisi
+LOADER_HTML = """
+<div id="overlay-mask" style="
+  position: fixed; inset: 0; background: rgba(0,0,0,0.55);
+  display: flex; align-items: center; justify-content: center;
+  z-index: 9999; backdrop-filter: blur(2px);
+">
+  <div style="background:#111; color:#fff; padding:24px 28px; border-radius:16px;
+              font-family: ui-sans-serif, system-ui, -apple-system; text-align:center;
+              box-shadow: 0 10px 30px rgba(0,0,0,0.5);">
+    <div class="spinner" style="
+      width:48px;height:48px;border:4px solid #444;border-top-color:#fff;border-radius:50%;
+      margin:0 auto 14px; animation: spin 1s linear infinite;"></div>
+    <div style="font-size:16px; font-weight:600;">Elaborazione in corso…</div>
+    <div style="opacity:0.85; font-size:12px; margin-top:6px;">Non toccare nulla, grazie.</div>
+  </div>
+</div>
+<style>
+@keyframes spin { to { transform: rotate(360deg); } }
+</style>
+"""
+
+# piccoli helper per mostrare/nascondere overlay e bloccare/sbloccare bottone
+def _show_overlay_and_busy():
+    return gr.update(visible=True), gr.update(interactive=False, value="🔄 Analisi in corso…")
+
+def _hide_overlay_and_idle():
+    return gr.update(visible=False), gr.update(interactive=True, value="Analyze image")
+
 with gr.Blocks(title="Corrosion Assistant", theme=gr.themes.Soft()) as demo:
     gr.Markdown(WELCOME)
 
+    # overlay nascosto di default
+    overlay = gr.HTML(LOADER_HTML, visible=False)
+    # NB: l’overlay sta in cima all’app grazie a position:fixed
+
     with gr.Row():
         with gr.Column(scale=2):
+            # Lato “upload”: non posso mostrare percentuale reale dell’upload,
+            # ma il bottone mostrerà spinner e l’overlay partirà subito al click.
             img = gr.Image(type="pil", sources=["upload","webcam"], label="Upload or webcam")
             note = gr.Textbox(label="Notes / Context (optional)")
             zone = gr.Dropdown(choices=ZONES, label="Zone (indicative)", value="Other / Not sure")
@@ -252,26 +308,41 @@ 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": ""})
 
+    # catena: mostra overlay + disabilita bottone -> run -> nascondi overlay + riabilita -> aggiorna chat
     analyze_btn.click(
+        fn=_show_overlay_and_busy,
+        inputs=[],
+        outputs=[overlay, analyze_btn],
+        show_progress=False
+    ).then(
         fn=run_analysis,
         inputs=[img, note, zone, chat_state, thread_state],
-        outputs=[out_md, chat_state, thread_state]
+        outputs=[out_md, chat_state, thread_state],
+        show_progress=True  # barra deterministica server-side
+    ).then(
+        fn=_hide_overlay_and_idle,
+        inputs=[],
+        outputs=[overlay, analyze_btn],
+        show_progress=False
     ).then(
         lambda h: h,
         inputs=[chat_state],
-        outputs=[chat]
+        outputs=[chat],
+        show_progress=False
     )
 
     send_btn.click(
         fn=continue_chat,
         inputs=[chat_in, chat_state, thread_state, note, zone],
-        outputs=[chat, chat_in]
+        outputs=[chat, chat_in],
+        show_progress=True
     )
 
     clear_btn.click(
         lambda: ([], ""),
         inputs=[],
-        outputs=[chat, chat_in]
+        outputs=[chat, chat_in],
+        show_progress=False
     )
 
     demo.api_mode = "enabled"