refractor: modified code

app.py

@@ -1,33 +1,97 @@
-import os, gradio as gr, requests
+# ui/app.py (remplace par ce bloc complet si tu veux)
+import os, re, tempfile
+import requests
+import gradio as gr
 from dotenv import load_dotenv
 
 load_dotenv()
 
-API_URL = os.getenv("API_URL")
+API_URL = os.getenv("API_URL","http://127.0.0.1:8000/process")
 API_KEY = os.getenv("API_KEY", "")
-assert API_URL, "API_URL manquante"
 
-def fill_quitus(source_pdf, quitus_pdf, doc_type):
-    files = {
-        "source_pdf": ("source.pdf", source_pdf, "application/pdf"),
-        "quitus_pdf": ("quitus.pdf", quitus_pdf, "application/pdf"),
-    }
+def _to_bytes(f):
+    if f is None:
+        return None
+    if isinstance(f, (bytes, bytearray)):
+        return bytes(f)
+    path = getattr(f, "name", f)
+    with open(path, "rb") as fh:
+        return fh.read()
+
+def _base_api(url: str) -> str:
+    # retire /process final s'il existe
+    return re.sub(r"/process/?$", "", url or "")
+
+def fill_quitus(source_pdf, doc_type):
+    if not API_URL:
+        return None, "API_URL manquante."
+    payload = _to_bytes(source_pdf)
+    if not payload:
+        return None, "Fichier vide ou introuvable."
+
+    files = {"source_pdf": ("source.pdf", payload, "application/pdf")}
+    data = {"doc_type": (doc_type or "licence").lower()}
     headers = {"X-API-Key": API_KEY} if API_KEY else {}
-    r = requests.post(API_URL, files=files, data={"doc_type": doc_type}, headers=headers)
+
+    try:
+        r = requests.post(API_URL, files=files, data=data, headers=headers, timeout=90)
+    except Exception as e:
+        return None, f"Erreur réseau: {e}"
+
+    ctype = (r.headers.get("content-type") or "").split(";")[0].strip().lower()
+    if r.status_code != 200 or ctype != "application/pdf":
+        return None, f"Erreur API: {r.status_code} - {r.text}"
+
+    # récupère le nom de fichier renvoyé par l'API
+    filename = f"quitus_{data['doc_type']}.pdf"
+    cd = r.headers.get("content-disposition", "")
+    m = re.search(r'filename\*?=(?:UTF-8\'\')?"?([^";]+)"?', cd, re.IGNORECASE)
+    if m:
+        filename = m.group(1)
+
+    tmp_dir = tempfile.mkdtemp()
+    out_path = os.path.join(tmp_dir, filename)
+    with open(out_path, "wb") as f:
+        f.write(r.content)
+
+    return out_path, "OK"
+
+def download_excel():
+    base = _base_api(API_URL)
+    url = f"{base}/download/excel"
+    headers = {"X-API-Key": API_KEY} if API_KEY else {}
+    try:
+        r = requests.get(url, headers=headers, timeout=60)
+    except Exception as e:
+        return None, f"Erreur réseau: {e}"
     if r.status_code != 200:
         return None, f"Erreur API: {r.status_code} - {r.text}"
-    return (r.content, "quitus_filled.pdf"), "OK"
+    # filename depuis Content-Disposition
+    filename = "students_data.xlsx"
+    cd = r.headers.get("content-disposition", "")
+    m = re.search(r'filename\*?=(?:UTF-8\'\')?"?([^";]+)"?', cd, re.IGNORECASE)
+    if m:
+        filename = m.group(1)
+    tmp_dir = tempfile.mkdtemp()
+    out_path = os.path.join(tmp_dir, filename)
+    with open(out_path, "wb") as f:
+        f.write(r.content)
+    return out_path, "OK"
 
-with gr.Blocks() as demo:
+with gr.Blocks(title="Quitus Filler") as demo:
     gr.Markdown("## Remplir Quitus (Licence/Master)")
-    with gr.Row():
-        src = gr.File(label="PDF source (licence/master)", file_types=[".pdf"])
-        # q = gr.File(label="Modèle Quitus (PDF)", file_types=[".pdf"])
-    doc_type = gr.Radio(["licence","master"], value="licence", label="Type de document")
+    
+    src = gr.File(label="PDF source (licence/master)", file_types=[".pdf"])
+    dtype = gr.Radio(["licence", "master"], value="licence", label="Type de document")
+
     out_pdf = gr.File(label="Quitus rempli")
-    status = gr.Textbox(label="Statut")
-    btn = gr.Button("Remplir et télécharger")
-    # btn.click(fill_quitus, inputs=[src,q,doc_type], outputs=[out_pdf, status])
-    btn.click(fill_quitus, inputs=[src,doc_type], outputs=[out_pdf, status])
+    excel_file = gr.File(label="students_data.xlsx")
+    status = gr.Textbox(label="Statut", interactive=False)
+
+    with gr.Row():
+        gr.Button("Remplir et télécharger").click(fill_quitus, [src, dtype], [out_pdf, status])
+        gr.Button("Télécharger l’Excel").click(download_excel, [], [excel_file, status])
 
-demo.launch()
+if __name__ == "__main__":
+    port = int(os.getenv("PORT", "7860"))
+    demo.launch(server_name="0.0.0.0", server_port=port)