Update app.py

app.py

@@ -1,26 +1,15 @@
 """
-app.py
-Step 8: Add generative mode controls and pass them to Evo synthesis.
-
-New (Objective):
-- Radio to choose "Extractive (safe)" vs "Generative (Evo)".
-- Sliders for temperature and max tokens.
-- We pass these to synthesize_with_evo().
+app.py — Step 7
+- Admin can upload .txt/.pdf/.html to data/seed/ and reindex
+- Q&A uses retrieval + Evo templated synthesis from earlier steps
 """
 
 from pathlib import Path
 from typing import List
-
 import gradio as gr
 
 from indexer import build_index
-from rag_search import (
-    RAGSearcher,
-    format_sources,
-    extract_links,
-    split_form_links,
-    links_markdown,
-)
+from rag_search import RAGSearcher, format_sources, extract_links, split_form_links, links_markdown
 from evo_inference import synthesize_with_evo
 from utils_lang import SUPPORTED, normalize_lang, L
 
@@ -28,103 +17,70 @@ _searcher = None
 DATA_SEED_DIR = Path("data/seed")
 ALLOWED_EXTS = {".txt", ".pdf", ".html", ".htm", ".xhtml"}
 
-
 def ensure_searcher():
     global _searcher
-    if _searcher is None:
-        _searcher = RAGSearcher()
+    if _searcher is None: _searcher = RAGSearcher()
     return _searcher
 
-
 def on_build_index():
     try:
         msg = build_index()
-        global _searcher
-        _searcher = None
+        global _searcher; _searcher = None
     except Exception as e:
         msg = f"Error while building index: {e}"
     return msg
 
-
 def _save_files(files: List[gr.File]) -> List[str]:
-    saved = []
-    DATA_SEED_DIR.mkdir(parents=True, exist_ok=True)
-    if not files:
-        return saved
-
+    saved=[]; DATA_SEED_DIR.mkdir(parents=True, exist_ok=True)
+    if not files: return saved
     for f in files:
         try:
             path = None
-            if isinstance(f, dict) and "name" in f:
-                path = Path(f["name"])
-            elif hasattr(f, "name"):
-                path = Path(getattr(f, "name"))
-            elif isinstance(f, str):
-                path = Path(f)
-            if not path or not path.exists():
-                continue
-            if path.suffix.lower() not in ALLOWED_EXTS:
-                continue
+            if isinstance(f, dict) and "name" in f: path = Path(f["name"])
+            elif hasattr(f, "name"): path = Path(getattr(f, "name"))
+            elif isinstance(f, str): path = Path(f)
+            if not path or not path.exists(): continue
+            if path.suffix.lower() not in ALLOWED_EXTS: continue
             dest = DATA_SEED_DIR / path.name
             dest.write_bytes(path.read_bytes())
             saved.append(path.name)
-        except Exception:
-            continue
+        except: continue
     return saved
 
-
-def on_upload_and_reindex(files) -> str:
+def on_upload_and_reindex(files):
     saved = _save_files(files or [])
-    if not saved:
-        return "No valid .txt/.pdf/.html uploaded."
+    if not saved: return "No valid .txt/.pdf/.html uploaded."
     status = on_build_index()
     return f"Uploaded: {', '.join(saved)}\n{status}"
 
-
-def on_ask(question: str, top_k: int, lang_code: str, mode: str, temp: float, max_tokens: int, history: list):
+def on_ask(question: str, top_k: int, lang_code: str, history: list):
     lang = normalize_lang(lang_code)
     if not question or len(question.strip()) < 3:
-        return history, L(lang, "intro_err"), f"{L(lang, 'sources')}: (none)", "", ""
-
+        return history, L(lang,"intro_err"), f"{L(lang,'sources')}: (none)", "", ""
     try:
         searcher = ensure_searcher()
         hits = searcher.search(question, k=int(top_k))
-
-        # Map UI mode label to function arg
-        use_mode = "generative" if mode.startswith("Generative") else "extractive"
-
-        answer = synthesize_with_evo(
-            question, lang, hits,
-            mode=use_mode,
-            max_new_tokens=int(max_tokens),
-            temperature=float(temp),
-        )
-
+        answer = synthesize_with_evo(question, lang, hits)  # templated synthesis (Step 5)
         srcs = format_sources(hits)
-        if srcs.startswith("Sources:"):
-            srcs = srcs.replace("Sources:", f"{L(lang, 'sources')}:")
-
+        if srcs.startswith("Sources:"): srcs = srcs.replace("Sources:", f"{L(lang,'sources')}:")
         all_links = extract_links(hits)
         form_links, other_links = split_form_links(all_links)
-        links_md = links_markdown(L(lang, "links"), other_links)
-        forms_md = links_markdown(L(lang, "forms"), form_links)
-
+        links_md = links_markdown(L(lang,"links"), other_links)
+        forms_md = links_markdown(L(lang,"forms"), form_links)
     except Exception as e:
-        answer = f"Error: {e}\n\n{L(lang, 'tip_build')}"
-        srcs = f"{L(lang, 'sources')}: (none)"
-        links_md = f"**{L(lang, 'links')}:** (none)"
-        forms_md = f"**{L(lang, 'forms')}:** (none)"
-
+        answer = f"Error: {e}\n\n{L(lang,'tip_build')}"
+        srcs = f"{L(lang,'sources')}: (none)"
+        links_md = f"**{L(lang,'links')}:** (none)"
+        forms_md = f"**{L(lang,'forms')}:** (none)"
     history = history + [(question, answer)]
     return history, answer, srcs, links_md, forms_md
 
-
-with gr.Blocks(title=L("en", "title")) as demo:
-    gr.Markdown(f"# 🇲🇺 **{L('en','title')}** — Step 8")
+with gr.Blocks(title=L("en","title")) as demo:
+    gr.Markdown(f"# 🇲🇺 **{L('en','title')}** — Step 7")
 
     with gr.Row():
-        build_btn = gr.Button(L("en", "build_btn"))
-        status = gr.Markdown(L("en", "status_idle"))
+        build_btn = gr.Button(L("en","build_btn"))
+        status = gr.Markdown(L("en","status_idle"))
     build_btn.click(fn=on_build_index, outputs=status)
 
     with gr.Accordion("Admin: upload TXT / PDF / HTML and auto-reindex", open=False):
@@ -136,20 +92,10 @@ with gr.Blocks(title=L("en", "title")) as demo:
     gr.Markdown("### Language / Langue / Langaz")
     lang = gr.Dropdown(choices=list(SUPPORTED.keys()), value="en", label="EN / FR / MFE")
 
-    gr.Markdown("### Answer mode & controls")
-    with gr.Row():
-        mode = gr.Radio(
-            choices=["Extractive (safe)", "Generative (Evo)"],
-            value="Extractive (safe)",
-            label="Mode"
-        )
-        temp = gr.Slider(0.0, 1.2, value=0.4, step=0.05, label="Temperature (gen)")
-        max_tokens = gr.Slider(64, 384, value=192, step=16, label="Max new tokens (gen)")
-
     gr.Markdown("### Ask a question / Posez une question / Poz enn kestyon")
     with gr.Row():
-        q = gr.Textbox(placeholder=L("en", "ask_placeholder"), label=L("en", "ask_label"))
-        k = gr.Slider(3, 12, step=1, value=6, label=L("en", "k_label"))
+        q = gr.Textbox(placeholder=L("en","ask_placeholder"), label=L("en","ask_label"))
+        k = gr.Slider(3, 12, step=1, value=6, label=L("en","k_label"))
         ask_btn = gr.Button("Ask / Demander / Rode")
 
     chat = gr.Chatbot(label="Assistant", height=360)
@@ -158,15 +104,7 @@ with gr.Blocks(title=L("en", "title")) as demo:
     links_md = gr.Markdown()
     forms_md = gr.Markdown()
 
-    ask_btn.click(
-        fn=on_ask,
-        inputs=[q, k, lang, mode, temp, max_tokens, chat],
-        outputs=[chat, answer_md, sources_md, links_md, forms_md],
-    )
-    q.submit(
-        fn=on_ask,
-        inputs=[q, k, lang, mode, temp, max_tokens, chat],
-        outputs=[chat, answer_md, sources_md, links_md, forms_md],
-    )
+    ask_btn.click(fn=on_ask, inputs=[q, k, lang, chat], outputs=[chat, answer_md, sources_md, links_md, forms_md])
+    q.submit(fn=on_ask, inputs=[q, k, lang, chat], outputs=[chat, answer_md, sources_md, links_md, forms_md])
 
 demo.launch()