Upload app.py

app.py

@@ -1,9 +1,11 @@
 # app.py — Diag Studio (Customer UI)
-# “AI Destekli Araç Motor Ses Analizi” — sade, ticari arayüz.
-# Not: Teknik terimler, model/sağlayıcı adları, loglar UI’da gösterilmez.
-# İdari/teknik ayarlar yalnızca DEV_MODE=1 iken “Yönetici” bölümünde görünür.
+# AI Destekli Araç Motor Ses Analizi — sade ticari arayüz
+# İstekler: Ses oynatıcı, ilerleme çubuğu, kullanıcı dostu akış.
+# Teknik sağlayıcı/kitaplık adları ve loglar UI’da gösterilmez.
+# Yönetici ayarları yalnızca DEV_MODE=1 iken görünür.
 
 import os
+import io
 import json
 import time
 import requests
@@ -11,12 +13,12 @@ import streamlit as st
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
-# ========== güvenli varsayılanlar ==========
+# ---------------- Safe defaults ----------------
 os.environ.setdefault("HOME", "/tmp")
 os.environ.setdefault("STREAMLIT_BROWSER_GATHER_USAGE_STATS", "false")
 os.environ.setdefault("STREAMLIT_SERVER_HEADLESS", "true")
 
-# ========== tema ==========
+# ---------------- Theme ----------------
 try:
     st._config.set_option("theme.base", "dark")
     st._config.set_option("theme.primaryColor", "#ff7a1a")
@@ -26,19 +28,16 @@ try:
 except Exception:
     pass
 
-# ========== ortam & yetki ==========
+# ---------------- Env helpers ----------------
 def _env(k: str) -> str:
     return (os.getenv(k) or "").strip().strip("'\"")
 
 DEV_MODE = (_env("DEV_MODE") in {"1", "true", "yes", "on"})
-
-# Tek bir sabit backend anahtarı (kullanıcıya gösterilmez)
-API_BASE = (_env("CARDIAG_AI_API") or _env("APP_API") or "http://127.0.0.1:7860").rstrip("/")
-
+API_BASE_DEFAULT = (_env("CARDIAG_AI_API") or _env("APP_API") or "http://127.0.0.1:7860").rstrip("/")
 TOKEN = _env("CARDIAG_AI_TOKEN") or _env("APP_TOKEN")
 HEADERS = {"Authorization": f"Bearer {TOKEN}"} if TOKEN else {}
 
-# ========== çok dilli metin ==========
+# ---------------- i18n ----------------
 LANGS = {
     "tr": {
         "title": "AI Destekli Araç Motor Ses Analizi",
@@ -48,6 +47,7 @@ LANGS = {
         "paste_url": "Ses bağlantısı (opsiyonel)",
         "analyze": "Analiz Et",
         "reset": "Sıfırla",
+        "preview": "Önizleme",
         "result": "Sonuç",
         "commentary": "Özet ve Öneriler",
         "json": "Detaylı Bulgular",
@@ -55,7 +55,7 @@ LANGS = {
         "download_summary": "Özet indir",
         "download_parsed": "Detay indir (JSON)",
         "download_raw": "Ham metin indir",
-        "upload_hint": "mp3/wav/ogg biçimi önerilir. Dosya yerine herkese açık bir bağlantı da kullanabilirsiniz.",
+        "upload_hint": "mp3 / wav / ogg önerilir. İsterseniz herkese açık bir bağlantı da girebilirsiniz.",
         "warming": "Hazırlanıyor…",
         "analyzing": "Analiz ediliyor…",
         "health_ok": "Sistem hazır.",
@@ -63,15 +63,20 @@ LANGS = {
         "need_backend": "Sistem adresi yapılandırılmadı.",
         "need_input": "Lütfen bir dosya yükleyin veya bağlantı girin.",
         "error_generic": "İşlem başarısız. Lütfen tekrar deneyin.",
-        "try_again": "Hizmet yoğun olabilir. Biraz sonra tekrar deneyin.",
+        "try_again": "Yoğunluk olabilir. Biraz sonra tekrar deneyin.",
+        "timeline_title": "İşlem Durumu",
+        "step_prepare": "Hazırlık",
+        "step_upload": "Yükleme",
+        "step_process": "Analiz",
+        "step_summarize": "Özet oluşturma",
         "admin": "Yönetici",
         "admin_desc": "Bu bölüm yalnızca yetkili kullanım içindir.",
         "backend_url": "Sistem adresi",
-        "use_data_uri": "Dosyayı gizli yükle",
-        "warmup": "İşlem öncesi ısıt",
+        "use_data_uri": "Gizli yükleme",
+        "warmup": "Ön ısıtma",
         "auto_retry": "Otomatik yeniden dene",
         "max_wait": "Azami bekleme (sn)",
-        "show_debug": "Hata ayıklama bilgilerini göster",
+        "show_debug": "Hata ayıklama bilgileri",
     },
     "en": {
         "title": "AI-Powered Engine Sound Analysis",
@@ -81,6 +86,7 @@ LANGS = {
         "paste_url": "Audio URL (optional)",
         "analyze": "Analyze",
         "reset": "Reset",
+        "preview": "Preview",
         "result": "Result",
         "commentary": "Summary & Recommendations",
         "json": "Detailed Findings",
@@ -88,7 +94,7 @@ LANGS = {
         "download_summary": "Download summary",
         "download_parsed": "Download details (JSON)",
         "download_raw": "Download raw text",
-        "upload_hint": "Use mp3/wav/ogg. You may also paste a public URL instead of uploading.",
+        "upload_hint": "mp3 / wav / ogg recommended. You may paste a public URL instead of uploading.",
         "warming": "Preparing…",
         "analyzing": "Analyzing…",
         "health_ok": "Service is ready.",
@@ -97,44 +103,40 @@ LANGS = {
         "need_input": "Please upload a file or enter a URL.",
         "error_generic": "Request failed. Please try again.",
         "try_again": "Service may be busy. Try again shortly.",
+        "timeline_title": "Progress",
+        "step_prepare": "Preparing",
+        "step_upload": "Uploading",
+        "step_process": "Processing",
+        "step_summarize": "Summarizing",
         "admin": "Admin",
         "admin_desc": "This section is for authorized use only.",
         "backend_url": "Service URL",
         "use_data_uri": "Private upload",
-        "warmup": "Warm up before analyze",
+        "warmup": "Warm up",
         "auto_retry": "Auto-retry",
         "max_wait": "Max wait (sec)",
         "show_debug": "Show debug info",
     },
 }
 
-# ========== oturum durumu ==========
-if "lang" not in st.session_state:
-    st.session_state.lang = "tr"
-if "res" not in st.session_state:
-    st.session_state.res = None
-if "api_base" not in st.session_state:
-    st.session_state.api_base = API_BASE
-if "use_data_uri" not in st.session_state:
-    st.session_state.use_data_uri = True
-if "warmup" not in st.session_state:
-    st.session_state.warmup = True
-if "auto_retry" not in st.session_state:
-    st.session_state.auto_retry = True
-if "max_wait" not in st.session_state:
-    st.session_state.max_wait = 60
-if "show_debug" not in st.session_state:
-    st.session_state.show_debug = False
-if "prompt_override" not in st.session_state:
-    st.session_state.prompt_override = ""  # UI’da gösterilmez; sadece admin
+# ---------------- Session ----------------
+if "lang" not in st.session_state: st.session_state.lang = "tr"
+if "api_base" not in st.session_state: st.session_state.api_base = API_BASE_DEFAULT
+if "use_data_uri" not in st.session_state: st.session_state.use_data_uri = True
+if "warmup" not in st.session_state: st.session_state.warmup = True
+if "auto_retry" not in st.session_state: st.session_state.auto_retry = True
+if "max_wait" not in st.session_state: st.session_state.max_wait = 60
+if "show_debug" not in st.session_state: st.session_state.show_debug = False
+if "prompt_override" not in st.session_state: st.session_state.prompt_override = ""
+if "res" not in st.session_state: st.session_state.res = None
 
 T = LANGS[st.session_state.lang]
 
-# ========== başlık ==========
-c1, c2 = st.columns([0.7, 0.3])
-with c1:
+# ---------------- Header ----------------
+left, right = st.columns([0.7, 0.3])
+with left:
     st.title(T["title"])
-with c2:
+with right:
     st.session_state.lang = st.selectbox(
         "Language / Dil", ["tr", "en"],
         index=(0 if st.session_state.lang == "tr" else 1),
@@ -142,7 +144,7 @@ with c2:
 T = LANGS[st.session_state.lang]
 st.caption(T["about"])
 
-# ========== admin (yalnızca DEV_MODE) ==========
+# ---------------- Admin (DEV only) ----------------
 if DEV_MODE:
     with st.expander(f"🛠 {T['admin']}", expanded=False):
         st.write(T["admin_desc"])
@@ -152,24 +154,31 @@ if DEV_MODE:
         st.session_state.auto_retry = st.checkbox(T["auto_retry"], value=st.session_state.auto_retry)
         st.session_state.max_wait = st.slider(T["max_wait"], 10, 240, st.session_state.max_wait, step=10)
         st.session_state.show_debug = st.checkbox(T["show_debug"], value=st.session_state.show_debug)
-        # İsteğe bağlı gelişmiş prompt (son kullanıcıya görünmez)
         st.session_state.prompt_override = st.text_area("Advanced prompt (optional)", value=st.session_state.prompt_override, height=120)
 
 st.markdown("---")
 
-# ========== yükleme / URL ==========
+# ---------------- Upload / 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://...")
 
-# ========== butonlar ==========
-b1, b2, b3 = st.columns([0.22, 0.22, 0.56])
-go = b1.button(f"▶ {T['analyze']}", type="primary")
-reset = b2.button(f"↩ {T['reset']}")
-health = b3.button("🔄 Health")
-
-# ========== HTTP oturumu (retry) ==========
+# Audio preview block (player)
+if file is not None:
+    st.markdown(f"**{T['preview']}**")
+    st.audio(file, format=file.type or "audio/mpeg")
+elif audio_url.strip():
+    st.markdown(f"**{T['preview']}**")
+    st.audio(audio_url)
+
+# ---------------- Controls ----------------
+c1, c2, c3 = st.columns([0.22, 0.22, 0.56])
+go     = c1.button(f"▶ {T['analyze']}", type="primary")
+reset  = c2.button(f"↩ {T['reset']}")
+health = c3.button("🔄 Health")
+
+# ---------------- HTTP helpers ----------------
 def build_session(auto_retry: bool) -> requests.Session:
     s = requests.Session()
     s.headers.update(HEADERS)
@@ -186,39 +195,42 @@ def build_session(auto_retry: bool) -> requests.Session:
         s.mount("https://", adapter)
     return s
 
-def warm_up(sess: requests.Session, base: str, budget: int = 30):
+def warm_up(sess: requests.Session, base: str, progress_cb=None, total_budget: int = 25):
     start = time.time()
-    with st.spinner(T["warming"]):
-        for path in ["/", "/health"]:
-            try:
-                r = sess.get(f"{base.rstrip('/')}{path}", timeout=8)
-                if r.ok:
-                    continue
-            except Exception:
-                pass
-            if time.time() - start > budget:
-                break
-            time.sleep(2)
+    paths = ["/", "/health"]
+    for i, path in enumerate(paths, 1):
+        try:
+            _ = sess.get(f"{base.rstrip('/')}{path}", timeout=8)
+        except Exception:
+            pass
+        if progress_cb:
+            progress_cb(min(int(i/len(paths)*18), 18))  # 0-18%
+        if time.time() - start > total_budget:
+            break
+        time.sleep(0.4)
 
 def fetch_bytes(sess: requests.Session, base: str, url: str) -> bytes:
     full = url if url.startswith("http") else f"{base.rstrip('/')}{url}"
-    r = sess.get(full, timeout=60)
+    r = sess.get(full, timeout=90)
     r.raise_for_status()
     return r.content
 
-def post_analyze(sess: requests.Session, base: str, _file, _url: str) -> dict:
+def post_analyze(sess: requests.Session, base: str, _file, _url: str, progress_cb=None) -> dict:
     data = {
         "use_data_uri": "true" if st.session_state.use_data_uri else "false",
         "lang": st.session_state.lang,
     }
-    # prompt_override yalnızca admin kullanımında backend’e gönderilir
     if DEV_MODE and st.session_state.prompt_override.strip():
         data["prompt"] = st.session_state.prompt_override.strip()
 
     files = None
     if _file is not None:
+        # read into BytesIO for repeatable upload
+        content = _file.read()
+        buf = io.BytesIO(content)
         mime = getattr(_file, "type", None) or "application/octet-stream"
-        files = {"file": (_file.name, _file, mime)}
+        files = {"file": (_file.name, buf, mime)}
+        if progress_cb: progress_cb(30)  # after upload prep
     elif _url.strip():
         data["audio_url"] = _url.strip()
 
@@ -227,28 +239,30 @@ def post_analyze(sess: requests.Session, base: str, _file, _url: str) -> dict:
 
     url = f"{base.rstrip('/')}/analyze"
     deadline = time.time() + st.session_state.max_wait
+    last_err = None
     while True:
         try:
-            resp = sess.post(url, data=data, files=files, timeout=180)
+            if progress_cb: progress_cb(35)  # request start
+            resp = sess.post(url, data=data, files=files, timeout=240)
+            if progress_cb: progress_cb(78)  # server responded
             resp.raise_for_status()
+            if progress_cb: progress_cb(92)  # parse
             return resp.json()
         except Exception as e:
-            if not st.session_state.auto_retry or time.time() > deadline:
-                return {"ok": False, "error": f"{T['error_generic']} ({e})"}
+            last_err = e
+            if time.time() > deadline or not st.session_state.auto_retry:
+                return {"ok": False, "error": f"{T['error_generic']} ({last_err})"}
             time.sleep(1.2)
 
-# ========== işlemler ==========
+# ---------------- Actions ----------------
 sess = build_session(st.session_state.auto_retry)
 
 if health:
     try:
         r = sess.get(f"{st.session_state.api_base.rstrip('/')}/health", timeout=10)
-        if r.ok:
-            st.success(T["health_ok"])
-            if DEV_MODE:
-                st.code(json.dumps(r.json(), ensure_ascii=False, indent=2), language="json")
-        else:
-            st.error(T["health_fail"])
+        st.success(T["health_ok"] if r.ok else T["health_fail"])
+        if DEV_MODE and r.ok:
+            st.code(json.dumps(r.json(), ensure_ascii=False, indent=2), language="json")
     except Exception:
         st.error(T["health_fail"])
 
@@ -256,18 +270,45 @@ if reset:
     st.session_state.res = None
     st.rerun()
 
+# Progress widgets (player stays above)
+progress_box = st.container()
+timeline = progress_box.expander(T["timeline_title"], expanded=True)
+p_text = progress_box.empty()
+p_bar = progress_box.progress(0)
+
+def progress_update(pct: int, label: str = ""):
+    p_bar.progress(min(max(pct, 0), 100))
+    if label:
+        p_text.write(label)
+
 if go:
     if not st.session_state.api_base:
         st.error(T["need_backend"])
     elif not file and not audio_url.strip():
         st.error(T["need_input"])
     else:
+        # timeline
+        with timeline:
+            st.write(f"1) {T['step_prepare']}")
+            st.write(f"2) {T['step_upload']}")
+            st.write(f"3) {T['step_process']}")
+            st.write(f"4) {T['step_summarize']}")
+
+        # warmup (optional)
         if st.session_state.warmup:
-            warm_up(sess, st.session_state.api_base, budget=min(st.session_state.max_wait, 40))
-        with st.spinner(T["analyzing"]):
-            st.session_state.res = post_analyze(sess, st.session_state.api_base, file, audio_url)
+            progress_update(5, T["warming"])
+            warm_up(sess, st.session_state.api_base, progress_cb=lambda v: progress_update(v, T["warming"]))
+
+        # analyze
+        progress_update(22, T["analyzing"])
+        res = post_analyze(
+            sess, st.session_state.api_base, file, audio_url,
+            progress_cb=lambda v: progress_update(v, T["analyzing"])
+        )
+        st.session_state.res = res
+        progress_update(100, "")
 
-# ========== sonuçlar ==========
+# ---------------- Results ----------------
 res = st.session_state.res
 if res:
     if not res.get("ok", True) and res.get("error"):
@@ -279,45 +320,44 @@ if res:
     else:
         st.subheader(T["result"])
 
-        # Son kullanıcıya uygun kısa özet
+        # Summary for drivers
         comm = (res.get("commentary") or "").strip()
         if comm:
             st.markdown(f"**{T['commentary']}**")
             st.write(comm)
 
-        # Detaylı bulgular (JSON) — teknik isimler içerebilir; ama sağlayıcı/altyapı adı içermez
+        # Detailed findings (JSON). This is the structured diagnosis — no provider names.
         parsed = res.get("fal_parsed")
         if parsed:
             st.markdown(f"**{T['json']}**")
             st.json(parsed)
 
-        # İndirilebilir çıktılar (dosya adlarını sade tutuyoruz)
+        # Downloads
         dls = res.get("downloads") or {}
         if any(dls.get(k) for k in ("summary_txt", "fal_parsed_json", "fal_raw_txt")):
             st.markdown(f"**{T['artifacts']}**")
-            ca, cb, cc = st.columns(3)
+            col_a, col_b, col_c = st.columns(3)
 
             if dls.get("summary_txt"):
                 try:
                     data = fetch_bytes(sess, st.session_state.api_base, dls["summary_txt"])
-                    ca.download_button(label=T["download_summary"], data=data, file_name="ozet.txt")
+                    col_a.download_button(label=T["download_summary"], data=data, file_name="ozet.txt" if st.session_state.lang=="tr" else "summary.txt")
                 except Exception:
-                    ca.error("Özet indirilemedi")
+                    col_a.error("✖")
 
             if dls.get("fal_parsed_json"):
                 try:
                     data = fetch_bytes(sess, st.session_state.api_base, dls["fal_parsed_json"])
-                    cb.download_button(label=T["download_parsed"], data=data, file_name="detay.json", mime="application/json")
+                    col_b.download_button(label=T["download_parsed"], data=data, file_name="detay.json" if st.session_state.lang=="tr" else "details.json", mime="application/json")
                 except Exception:
-                    cb.error("Detay indirilemedi")
+                    col_b.error("✖")
 
             if dls.get("fal_raw_txt"):
-                # “Ham metin” geliştirici içindir; kullanıcı isterse indirebilir.
                 try:
                     data = fetch_bytes(sess, st.session_state.api_base, dls["fal_raw_txt"])
-                    cc.download_button(label=T["download_raw"], data=data, file_name="ham.txt")
+                    col_c.download_button(label=T["download_raw"], data=data, file_name="ham.txt" if st.session_state.lang=="tr" else "raw.txt")
                 except Exception:
-                    cc.error("Ham metin indirilemedi")
+                    col_c.error("✖")
 
-# ========== alt bilgi ==========
+# ---------------- Footer ----------------
 st.caption("© 2025 Diag Studio — Araç Motor Ses Analizi")