Upload app.py

app.py

@@ -1,4 +1,4 @@
-# app.py — Streamlit Frontend (robust retries + warmup)
+# app.py — Streamlit Frontend for Diag Studio AI (TR/EN, robust retries, warmup, downloads)
 import os
 import json
 import time
@@ -7,12 +7,12 @@ import streamlit as st
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
-# ---- container-safe defaults
+# ---------------- Container-safe defaults ----------------
 os.environ.setdefault("HOME", "/tmp")
 os.environ.setdefault("STREAMLIT_BROWSER_GATHER_USAGE_STATS", "false")
 os.environ.setdefault("STREAMLIT_SERVER_HEADLESS", "true")
 
-# ================= Theme (no extra files)
+# ---------------- Theme ----------------
 try:
     st._config.set_option("theme.base", "dark")
     st._config.set_option("theme.primaryColor", "#ff7a1a")
@@ -22,23 +22,20 @@ try:
 except Exception:
     pass
 
-# ================= Env & API pickers
+# ---------------- Env helpers ----------------
 def _env(k: str) -> str:
     return (os.getenv(k) or "").strip().strip("'\"")
 
-API_BASE_ENV = (
-    _env("CARDIAG_AI_API") or _env("AI_LIGHTBOX_API") or _env("LUXFIT_API")
-)
+API_BASE_ENV = _env("CARDIAG_AI_API") or _env("AI_LIGHTBOX_API") or _env("LUXFIT_API")
 API_BASE_ENV = API_BASE_ENV.rstrip("/") if API_BASE_ENV else ""
-
 HF_TOKEN = _env("CARDIAG_AI_TOKEN") or _env("AI_LIGHTBOX_TOKEN") or _env("LUXFIT_TOKEN")
 HEADERS = {"Authorization": f"Bearer {HF_TOKEN}"} if HF_TOKEN else {}
 
-# ================= i18n
+# ---------------- i18n ----------------
 L = {
     "en": {
         "title": "Diag Studio AI — Engine Sound Diagnosis",
-        "about": "Upload an engine sound (mp3/wav/ogg) or paste an audio URL. Backend runs fal.ai audio-understanding with detailed analysis, then summarizes with GPT-4o.",
+        "about": "Upload an engine sound (mp3/wav/ogg) or paste a URL. Backend runs fal.ai detailed analysis, then summarizes with GPT-4o.",
         "backend_url": "Backend URL",
         "lang": "Language",
         "upload": "Upload audio file",
@@ -46,8 +43,8 @@ L = {
         "paste_url": "Paste audio URL (optional)",
         "adv": "Advanced",
         "prompt": "Override prompt (optional)",
-        "detailed": "Detailed analysis",
-        "use_data_uri": "Send as data:URI (safer for private backends)",
+        "detailed": "Detailed analysis (fal)",
+        "use_data_uri": "Send as data:URI",
         "model": "Commentary model (OpenAI)",
         "analyze": "Analyze",
         "reset": "Reset",
@@ -61,17 +58,19 @@ L = {
         "no_backend": "Enter a backend URL (e.g., http://127.0.0.1:7860)",
         "health_ok": "Backend is reachable.",
         "health_fail": "Backend not reachable.",
-        "upload_hint": "Max ~200 MB per Streamlit docs; use mp3/wav/ogg.",
-        "footer": "Tip: You can also paste a public audio URL if you don’t want to upload the file.",
+        "upload_hint": "Default upload limit ~200 MB; use mp3/wav/ogg.",
+        "footer": "Tip: You can also paste a public audio URL.",
         "auto_retry": "Auto-retry on 429/500/502/503/504",
         "warmup": "Warm up backend before analysis",
         "max_wait": "Max total wait (sec) for retries",
         "warming": "Warming up backend…",
-        "analyzing": "Analyzing…"
+        "analyzing": "Analyzing…",
+        "req_failed": "Request failed",
+        "try_again_info": "Backend might be waking up or rate-limited. Try Analyze again, or increase ‘Max total wait’."
     },
     "tr": {
         "title": "Diag Studio AI — Motor Sesi Teşhis",
-        "about": "Motor sesini (mp3/wav/ogg) yükleyin veya bir ses URL’si verin. Backend fal.ai detailed analysis ile çalışır, sonra GPT-4o özetler.",
+        "about": "Motor sesini (mp3/wav/ogg) yükleyin veya bir URL verin. Backend fal.ai ayrıntılı analizi çalıştırır, sonra GPT-4o ile Türkçe özetler.",
         "backend_url": "Backend URL",
         "lang": "Dil",
         "upload": "Ses dosyası yükle",
@@ -79,8 +78,8 @@ L = {
         "paste_url": "Ses URL’si (opsiyonel)",
         "adv": "Gelişmiş",
         "prompt": "Prompt geçersiz kıl (opsiyonel)",
-        "detailed": "Ayrıntılı analiz",
-        "use_data_uri": "data:URI olarak gönder (özel backend için güvenli)",
+        "detailed": "Ayrıntılı analiz (fal)",
+        "use_data_uri": "data:URI olarak gönder",
         "model": "Yorum modeli (OpenAI)",
         "analyze": "Analiz Et",
         "reset": "Sıfırla",
@@ -100,17 +99,19 @@ L = {
         "warmup": "Analizden önce backend’i ısıt",
         "max_wait": "Retry için maksimum toplam bekleme (sn)",
         "warming": "Backend ısıtılıyor…",
-        "analyzing": "Analiz ediliyor…"
+        "analyzing": "Analiz ediliyor…",
+        "req_failed": "İstek başarısız",
+        "try_again_info": "Backend uyanıyor veya sınırda olabilir. Analiz’i yeniden deneyin ya da ‘Maksimum bekleme’ değerini artırın."
     }
 }
 
-# ================= Session State
+# ---------------- Session State ----------------
 if "lang" not in st.session_state:
     st.session_state.lang = "tr"
 if "last_response" not in st.session_state:
     st.session_state.last_response = None
 
-# ================= UI
+# ---------------- Header ----------------
 col1, col2 = st.columns([0.65, 0.35])
 with col1:
     st.title(L[st.session_state.lang]["title"])
@@ -124,11 +125,29 @@ with col2:
 t = L[st.session_state.lang]
 st.caption(t["about"])
 
-backend_default = API_BASE_ENV or "https://renderfy-diagstudio-ai-backend.hf.space"
-api_base = st.text_input(t["backend_url"], value=backend_default)
+api_base = st.text_input(t["backend_url"], value=(API_BASE_ENV or "http://127.0.0.1:7860"))
+
+# Health check (isteğe bağlı)
+hc1, _ = st.columns([0.28, 0.72])
+with hc1:
+    if st.button("🔄 Health"):
+        try:
+            r = requests.get(f"{api_base.rstrip('/')}/health", headers=HEADERS, timeout=10)
+            st.success(t["health_ok"] if r.ok else t["health_fail"])
+        except Exception:
+            st.error(t["health_fail"])
+
+st.markdown("---")
+
+# ---------------- Upload or URL ----------------
+st.write(t["upload_hint"])
+file = st.file_uploader(t["upload"], type=["mp3", "wav", "ogg"])
+st.write(f"**{t['or']}**")
+audio_url = st.text_input(t["paste_url"], value="", placeholder="https://...")
 
+# ---------------- Advanced ----------------
 with st.expander(t["adv"], expanded=False):
-    detailed = st.checkbox(t["detailed"], value=True)
+    detailed = st.checkbox(t["detailed"], value=True)         # fal detailed
     use_data_uri = st.checkbox(t["use_data_uri"], value=True)
     openai_model = st.text_input(t["model"], value="gpt-4o")
     prompt_override = st.text_area(t["prompt"], value="", height=120)
@@ -137,13 +156,8 @@ with st.expander(t["adv"], expanded=False):
     max_wait = st.slider(t["max_wait"], 10, 180, 60, step=10)
     st.caption(t["footer"])
 
-st.markdown("---")
-st.write(t["upload_hint"])
-file = st.file_uploader(t["upload"], type=["mp3", "wav", "ogg"])  # 200 MB default limit. :contentReference[oaicite:3]{index=3}
-st.write(f"**{t['or']}**")
-audio_url = st.text_input(t["paste_url"], value="", placeholder="https://...")
-
-c1, c2, c3 = st.columns([0.2, 0.2, 0.6])
+# ---------------- Controls ----------------
+c1, c2 = st.columns([0.25, 0.75])
 go = c1.button(f"▶ {t['analyze']}", type="primary")
 reset = c2.button(f"↩ {t['reset']}")
 
@@ -151,16 +165,13 @@ if reset:
     st.session_state.last_response = None
     st.rerun()
 
-# ================= HTTP session with retries
+# ---------------- HTTP session with retries ----------------
 def build_session(_auto_retry: bool) -> requests.Session:
     s = requests.Session()
     s.headers.update(HEADERS)
     if _auto_retry:
-        # Retry on common transient errors: 429, 500, 502, 503, 504. Backoff = 0.8s, exponential. :contentReference[oaicite:4]{index=4}
         retry = Retry(
-            total=6,
-            connect=6,
-            read=6,
+            total=6, connect=6, read=6,
             backoff_factor=0.8,
             status_forcelist=[429, 500, 502, 503, 504],
             allowed_methods=frozenset(["GET", "POST"]),
@@ -174,7 +185,6 @@ def build_session(_auto_retry: bool) -> requests.Session:
 def warm_up_backend(s: requests.Session, base: str, total_budget: int = 30):
     start = time.time()
     with st.spinner(t["warming"]):
-        # Many Spaces need a wake-up; hit GET / then /health with short timeouts. Cold boot ~1–2 min typical. :contentReference[oaicite:5]{index=5}
         for path in ["/", "/health"]:
             try:
                 r = s.get(f"{base.rstrip('/')}{path}", timeout=8)
@@ -186,9 +196,11 @@ def warm_up_backend(s: requests.Session, base: str, total_budget: int = 30):
                 break
             time.sleep(2)
 
+# ---------------- Core request ----------------
 def post_analyze(s: requests.Session, base: str, _file, _audio_url: str, timeout_sec: int = 120) -> dict:
     url = f"{base.rstrip('/')}/analyze"
     data = {
+        "lang": st.session_state.lang,  # <<— UI dilini backend’e gönder
         "detailed_analysis": "true" if detailed else "false",
         "use_data_uri": "true" if use_data_uri else "false",
         "openai_model": openai_model or "gpt-4o",
@@ -203,33 +215,25 @@ def post_analyze(s: requests.Session, base: str, _file, _audio_url: str, timeout
     elif _audio_url.strip():
         data["audio_url"] = _audio_url.strip()
 
-    # Guard: nothing to send
-    if not files and "audio_url" not in data:
-        raise RuntimeError("No file or URL provided")
-
-    # Try within a total budget (for bad gateway/cold start); break if succeeded
-    deadline = time.time() + max_wait
-    last_err = None
-    attempts = 0
-    while True:
-        attempts += 1
-        try:
-            resp = s.post(url, data=data, files=files, timeout=timeout_sec)
-            # Accept 200 only; other statuses will be retried by the Session if enabled
-            resp.raise_for_status()
-            return resp.json()
-        except Exception as e:
-            last_err = e
-            if not auto_retry or time.time() > deadline:
-                # Return controlled error payload instead of exploding UI
-                return {
-                    "ok": False,
-                    "error": f"All attempts failed. Last error: {e}",
-                    "attempts": attempts,
-                    "api_base": base,
-                }
-            time.sleep(1.2)  # small manual delay between loops; Session handles backoff too
+    # Gönder ve hataları kontrollü ele al
+    try:
+        resp = s.post(url, data=data, files=files, timeout=timeout_sec)
+        # Backend çoğu hatayı 200 + {"ok": False, ...} ile döndürüyor; yine de .ok değilse yakalayalım
+        if not resp.ok:
+            # JSON gövdesi varsa gösterelim
+            try:
+                j = resp.json()
+                j.setdefault("ok", False)
+                j.setdefault("error", f"{t['req_failed']}: HTTP {resp.status_code}")
+                return j
+            except Exception:
+                return {"ok": False, "error": f"{t['req_failed']}: HTTP {resp.status_code}"}
+        # OK ise normal JSON
+        return resp.json()
+    except requests.RequestException as e:
+        return {"ok": False, "error": f"{t['req_failed']}: {e}"}
 
+# ---------------- Run analysis ----------------
 if go:
     if not api_base:
         st.error(t["no_backend"])
@@ -243,36 +247,32 @@ if go:
             res = post_analyze(sess, api_base, file, audio_url, timeout_sec=180)
         st.session_state.last_response = res
 
-# ================= Results
+# ---------------- Results ----------------
 res = st.session_state.last_response
 if res:
-    # If backend returned controlled error (instead of raising), show nice message
     if not res.get("ok", True) and res.get("error"):
         st.error(res["error"])
-        st.info("Backend might be waking up or rate-limited. Try Analyze again, or increase ‘Max total wait’.")
+        st.info(t["try_again_info"])
     else:
         st.subheader(t["result"])
 
-        # Commentary
+        # Driver-friendly commentary (TR/EN)
         comm = res.get("commentary") or ""
         if comm:
             st.markdown(f"**{t['commentary']}**")
             st.write(comm)
 
-        # JSON pretty
+        # Parsed JSON
         parsed = res.get("fal_parsed")
         if parsed:
             st.markdown(f"**{t['json']}**")
             st.json(parsed)
 
-        # Backend artifacts
-        st.markdown(f"**{t['backend_artifacts']}**")
+        # Artifacts (download)
         dls = res.get("downloads") or {}
         col_a, col_b, col_c = st.columns(3)
 
         def fetch_bytes(url: str) -> bytes:
-            if not url:
-                raise RuntimeError("empty url")
             full = url if url.startswith("http") else f"{api_base.rstrip('/')}{url}"
             r = requests.get(full, headers=HEADERS, timeout=60)
             r.raise_for_status()
@@ -280,23 +280,21 @@ if res:
 
         if dls.get("summary_txt"):
             try:
-                data = fetch_bytes(dls["summary_txt"])
-                col_a.download_button(label=t["download_summary"], data=data, file_name="summary.txt")
+                col_a.download_button(label=t["download_summary"], data=fetch_bytes(dls["summary_txt"]), file_name="summary.txt")
             except Exception:
                 col_a.error("summary.txt ✖")
 
         if dls.get("fal_parsed_json"):
             try:
-                data = fetch_bytes(dls["fal_parsed_json"])
-                col_b.download_button(label=t["download_parsed"], data=data, file_name="parsed.json", mime="application/json")
+                col_b.download_button(label=t["download_parsed"], data=fetch_bytes(dls["fal_parsed_json"]),
+                                      file_name="parsed.json", mime="application/json")
             except Exception:
                 col_b.error("parsed.json ✖")
 
         if dls.get("fal_raw_txt"):
             try:
-                data = fetch_bytes(dls["fal_raw_txt"])
-                col_c.download_button(label=t["download_raw"], data=data, file_name="raw.txt")
+                col_c.download_button(label=t["download_raw"], data=fetch_bytes(dls["fal_raw_txt"]), file_name="raw.txt")
             except Exception:
                 col_c.error("raw.txt ✖")
 
-st.caption("© 2025 Diag Studio AI — Streamlit frontend (robust)")
+st.caption("© 2025 Diag Studio AI — Streamlit frontend (language-aware, robust)")