Update app.py

app.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# واجهة حديثة ثابتة: كل الأسئلة دفعة واحدة + منع الإرسال قبل الإجابة على الجميع
+# واجهة حديثة: سؤال + زر تحقق لكل سؤال، تلوين أخضر/أحمر مباشرة، بدون نتيجة نهائية
+
 import os, json, uuid, random, unicodedata
 from dataclasses import dataclass
 from pathlib import Path
@@ -31,22 +32,19 @@ def get_ocr(model_id: str):
 # ------------------ PDF/TXT → نص ------------------
 def extract_text_with_pypdf(path: str) -> str:
     reader = PdfReader(path)
-    chunks = []
+    out = []
     for p in reader.pages:
-        try:
-            t = p.extract_text() or ""
-        except Exception:
-            t = ""
-        chunks.append(t)
-    return "\n".join(chunks).strip()
+        try: t = p.extract_text() or ""
+        except Exception: t = ""
+        out.append(t)
+    return "\n".join(out).strip()
 
 def pdf_to_images(path: str, zoom: float=2.5) -> List[Image.Image]:
-    doc = fitz.open(path)
-    M = fitz.Matrix(zoom, zoom)
+    doc = fitz.open(path); M = fitz.Matrix(zoom, zoom)
     imgs = []
     for pg in doc:
         pix = pg.get_pixmap(matrix=M, alpha=False)
-        imgs.append(Image.frombytes("RGB", (pix.width, pix.height), pix.samples))
+        imgs.append(Image.frombytes("RGB",(pix.width,pix.height),pix.samples))
     doc.close()
     return imgs
 
@@ -56,7 +54,7 @@ def extract_text_with_ocr(path: str, model_id: str, zoom: float) -> str:
     for i, img in enumerate(pdf_to_images(path, zoom=zoom), start=1):
         try:
             out = ocr(img)
-            txt = out[0].get("generated_text", "").strip() if out else ""
+            txt = out[0].get("generated_text","").strip() if out else ""
         except Exception:
             txt = ""
         parts.append(f"--- [Page {i}] ---\n{txt}")
@@ -65,21 +63,20 @@ def extract_text_with_ocr(path: str, model_id: str, zoom: float) -> str:
 def is_good(t: str, min_chars=250, min_alpha=0.15) -> bool:
     if len(t) < min_chars: return False
     alnum = sum(ch.isalnum() for ch in t)
-    return (alnum / max(1, len(t))) >= min_alpha
+    return (alnum/max(1,len(t))) >= min_alpha
 
-def file_to_text(path: str, model_id=DEFAULT_TROCR_MODEL, zoom=DEFAULT_TROCR_ZOOM) -> Tuple[str, str]:
+def file_to_text(path: str, model_id=DEFAULT_TROCR_MODEL, zoom=DEFAULT_TROCR_ZOOM) -> Tuple[str,str]:
     ext = Path(path).suffix.lower()
     if ext == ".txt":
-        with open(path, "r", encoding="utf-8", errors="ignore") as f:
-            return f.read(), "plain text"
+        with open(path,"r",encoding="utf-8",errors="ignore") as f: return f.read(), "plain text"
     raw = extract_text_with_pypdf(path)
     if is_good(raw): return raw, "embedded (pypdf)"
     return extract_text_with_ocr(path, model_id, zoom), "OCR (TrOCR)"
 
-# ------------------ تنظيف عربي مبسّط ------------------
+# ------------------ تنظيف عربي ------------------
 AR_DIAC = r"[ًٌٍَُِّْ]"
-def strip_headers(t: str) -> str:
-    out = []
+def strip_headers(t:str)->str:
+    out=[]
     for ln in t.splitlines():
         if re2.match(r"^\s*--- \[Page \d+\] ---\s*$", ln): continue
         if re2.match(r"^\s*(Page\s*\d+|صفحة\s*\d+)\s*$", ln): continue
@@ -87,7 +84,7 @@ def strip_headers(t: str) -> str:
         out.append(ln)
     return "\n".join(out)
 
-def norm_ar(t: str) -> str:
+def norm_ar(t:str)->str:
     t = unicodedata.normalize("NFKC", t)
     t = re2.sub(r"[ـ]", "", t)
     t = re2.sub(AR_DIAC, "", t)
@@ -98,8 +95,8 @@ def norm_ar(t: str) -> str:
     t = re2.sub(r'(\p{L})\1', r'\1', t)
     return t.strip()
 
-def postprocess(raw: str) -> str:
-    t = strip_headers(raw).replace("\r", "\n")
+def postprocess(raw:str)->str:
+    t = strip_headers(raw).replace("\r","\n")
     t = re2.sub(r"\n{3,}", "\n\n", t)
     t = re2.sub(r"\d+\s*[\[\(][^\]\)]*[\]\)]", " ", t)
     t = re2.sub(r"\[\d+\]", " ", t)
@@ -116,168 +113,171 @@ class MCQ:
     choices: List[str]
     answer_index: int
 
-def split_sents(t: str) -> List[str]:
-    s = [x.strip() for x in SENT_SPLIT.split(t) if x.strip()]
-    return [x for x in s if len(x) >= 25]
+def split_sents(t:str)->List[str]:
+    s=[x.strip() for x in SENT_SPLIT.split(t) if x.strip()]
+    return [x for x in s if len(x)>=25]
 
-def yake_keywords(t: str, k: int = 160) -> List[str]:
+def yake_keywords(t:str, k:int=160)->List[str]:
     ex = yake.KeywordExtractor(lan='ar', n=1, top=k)
-    cands = [w for w, _ in ex.extract_keywords(t)]
-    out, seen = [], set()
+    cands = [w for w,_ in ex.extract_keywords(t)]
+    out=[]; seen=set()
     for k in cands:
-        k = k.strip()
+        k=k.strip()
         if not k or k in seen or k in AR_STOP: continue
-        if len(k) < 3 or re2.match(r"^[\p{P}\p{S}]+$", k): continue
+        if len(k)<3 or re2.match(r"^[\p{P}\p{S}]+$",k): continue
         seen.add(k); out.append(k)
     return out
 
-def good_kw(kw: str) -> bool:
-    return kw and len(kw) >= 3 and kw not in AR_STOP and not re2.match(r"^[\p{P}\p{S}\d_]+$", kw)
+def good_kw(kw:str)->bool:
+    return kw and len(kw)>=3 and kw not in AR_STOP and not re2.match(r"^[\p{P}\p{S}\d_]+$", kw)
 
-def distractors(correct: str, pool: List[str], k: int = 3) -> List[str]:
-    L = len(correct.strip()); cand = []
+def distractors(correct:str, pool:List[str], k:int=3)->List[str]:
+    L=len(correct.strip()); cand=[]
     for w in pool:
-        w = w.strip()
-        if not w or w == correct or w in AR_STOP: continue
+        w=w.strip()
+        if not w or w==correct or w in AR_STOP: continue
         if re2.match(r"^[\p{P}\p{S}\d_]+$", w): continue
-        if abs(len(w) - L) <= 3: cand.append(w)
+        if abs(len(w)-L)<=3: cand.append(w)
     random.shuffle(cand)
-    out = cand[:k]
-    while len(out) < k: out.append("—")
+    out=cand[:k]
+    while len(out)<k: out.append("—")
     return out
 
-def make_mcqs(text: str, n: int = 6) -> List[MCQ]:
-    sents = split_sents(text)
+def make_mcqs(text:str, n:int=6)->List[MCQ]:
+    sents=split_sents(text)
     if not sents: raise ValueError("النص قصير أو غير صالح.")
-    kws = yake_keywords(text) or [w for w, _ in sorted(((t, text.count(t)) for t in re2.findall(r"[\p{L}\p{N}_]+", text)), key=lambda x: -x[1])][:80]
-    sent_for = {}
+    kws=yake_keywords(text) or [w for w,_ in sorted(((t, text.count(t)) for t in re2.findall(r"[\p{L}\p{N}_]+",text)), key=lambda x:-x[1])][:80]
+    sent_for={}
     for s in sents:
         for kw in kws:
             if good_kw(kw) and re2.search(rf"(?<!\p{{L}}){re2.escape(kw)}(?!\p{{L}})", s) and kw not in sent_for:
-                sent_for[kw] = s
-    items, used = [], set()
+                sent_for[kw]=s
+    items=[]; used=set()
     for kw in [k for k in kws if k in sent_for]:
-        if len(items) >= n: break
-        s = sent_for[kw]
+        if len(items)>=n: break
+        s=sent_for[kw]
         if s in used: continue
-        q = re2.sub(rf"(?<!\p{{L}}){re2.escape(kw)}(?!\p{{L}})", "_____", s, count=1)
-        ch = distractors(kw, [x for x in kws if x != kw], 3) + [kw]
-        random.shuffle(ch); ans = ch.index(kw)
+        q=re2.sub(rf"(?<!\p{{L}}){re2.escape(kw)}(?!\p{{L}})", "_____", s, count=1)
+        ch=distractors(kw, [x for x in kws if x!=kw], 3)+[kw]
+        random.shuffle(ch); ans=ch.index(kw)
         items.append(MCQ(id=str(uuid.uuid4())[:8], question=q, choices=ch, answer_index=ans))
         used.add(s)
     if not items: raise RuntimeError("تعذّر توليد أسئلة.")
     return items
 
-# ------------------ تحويل إلى سجلات ------------------
-def to_records(items: List[MCQ]) -> List[dict]:
-    recs = []
+def to_records(items:List[MCQ])->List[dict]:
+    recs=[]
     for it in items:
-        opts = []
-        for i, lbl in enumerate(["A","B","C","D"]):
-            txt = (it.choices[i] if i < len(it.choices) else "—").strip()
-            txt = txt.replace(",", "،").replace("?", "؟").replace(";", "؛")
-            opts.append({"id": lbl, "text": txt or "—", "is_correct": (i == it.answer_index)})
-        recs.append({"id": it.id, "question": it.question.strip(), "options": opts})
+        opts=[]
+        for i,lbl in enumerate(["A","B","C","D"]):
+            txt=(it.choices[i] if i<len(it.choices) else "—").strip()
+            txt=txt.replace(",", "،").replace("?", "؟").replace(";", "؛")
+            opts.append({"id":lbl,"text":txt or "—","is_correct":(i==it.answer_index)})
+        recs.append({"id":it.id,"question":it.question.strip(),"options":opts})
     return recs
 
-# ------------------ HTML للامتحان (كل الأسئلة دفعة واحدة) ------------------
+# ------------------ HTML: كل الأسئلة + زر تحقق لكل سؤال ------------------
 def render_quiz_html(records: List[dict]) -> str:
-    parts = []
+    parts=[]
     for i, rec in enumerate(records, start=1):
-        qid = rec["id"]; qtxt = rec["question"]; opts = rec["options"]
-        opts_html = []
-        for o in opts:
+        qid = rec["id"]
+        qtxt = rec["question"]
+        cor  = next((o["id"] for o in rec["options"] if o["is_correct"]), "")
+        opts_html=[]
+        for o in rec["options"]:
             lid, txt = o["id"], o["text"]
             opts_html.append(f"""
-                <label class="opt">
+                <label class="opt" data-letter="{lid}">
                     <input type="radio" name="q_{qid}" value="{lid}">
                     <span class="opt-letter">{lid}</span>
                     <span class="opt-text">{txt}</span>
                 </label>
             """)
         parts.append(f"""
-        <div class="q-card" data-qid="{qid}">
+        <div class="q-card" data-qid="{qid}" data-correct="{cor}">
             <div class="q-header">
                 <div class="q-title">السؤال {i}</div>
                 <div class="q-badge" id="b_{qid}" hidden></div>
             </div>
             <div class="q-text">{qtxt}</div>
             <div class="opts">{''.join(opts_html)}</div>
+            <div class="q-actions">
+                <button class="q-submit">تحقّق</button>
+                <span class="q-note" id="n_{qid}"></span>
+            </div>
         </div>
         """)
-    # عدّاد تقدّم بسيط أعلى مجموعة الأسئلة
     html = f"""
     <div id="quiz" class="quiz-wrap">
-      <div class="progress-pill"><span id="ans_count">0</span>/<span id="total">{len(records)}</span> تمّت الإجابة</div>
+      <div class="hint">اختر إجابة لكل سؤال ثم اضغط <b>تحقّق</b>، سيتم تلوين اختيارك أخضر/أحمر ويُقفل السؤال.</div>
       {''.join(parts)}
     </div>
     <script>
-      // تحديث العدّاد كلما تغيرت إجابة
-      const updateCounter = () => {{
-        const cards = document.querySelectorAll('.q-card');
-        let filled = 0;
-        cards.forEach(c => {{
-          if (c.querySelector('input[type="radio"]:checked')) filled += 1;
+      // تفويض حدث للنقر على كل أزرار "تحقّق"
+      document.querySelectorAll('.q-card .q-submit').forEach(btn => {{
+        btn.addEventListener('click', (e) => {{
+          const card = e.target.closest('.q-card');
+          const qid = card.getAttribute('data-qid');
+          const correct = card.getAttribute('data-correct');
+          const note = document.getElementById('n_'+qid);
+          const badge = document.getElementById('b_'+qid);
+          const chosenInput = card.querySelector('input[type="radio"]:checked');
+
+          if (!chosenInput) {{
+            if (note) {{
+              note.textContent = 'اختر إجابة أولاً';
+              note.className = 'q-note warn';
+            }}
+            return;
+          }}
+
+          // امسح ألوان قديمة
+          card.querySelectorAll('.opt').forEach(l => l.classList.remove('ok','err'));
+
+          const chosen = chosenInput.value;
+          const chosenLabel = chosenInput.closest('.opt');
+
+          if (chosen === correct) {{
+            chosenLabel.classList.add('ok');
+            if (badge) {{ badge.hidden = false; badge.className='q-badge ok'; badge.textContent='Correct!'; }}
+          }} else {{
+            chosenLabel.classList.add('err');
+            if (badge) {{ badge.hidden = false; badge.className='q-badge err'; badge.textContent='Incorrect.'; }}
+          }}
+
+          // قفل السؤال بعد التحقق
+          card.querySelectorAll('input[type="radio"]').forEach(i => i.disabled = true);
+          e.target.disabled = true;
+          if (note) note.textContent = '';
         }});
-        const el = document.getElementById('ans_count');
-        if (el) el.textContent = String(filled);
-      }};
-      document.querySelectorAll('.q-card input[type="radio"]').forEach(i => i.addEventListener('change', updateCounter));
-      updateCounter();
+      }});
     </script>
     """
     return html
 
 # ------------------ بناء الامتحان ------------------
 def build_quiz(text_area, file_path, n, model_id, zoom):
-    txt = (text_area or "").strip()
-    if not txt and not file_path:
-        return None, "", "🛈 أدخل نصًا أو ارفع ملفًا."
-    if txt:
-        raw, method = txt, "user text"
+    text_area = (text_area or "").strip()
+    if not text_area and not file_path:
+        return "", "🛈 أدخل نصًا أو ارفع ملفًا."
+    if text_area:
+        raw = text_area
     else:
-        raw, method = file_to_text(file_path, model_id=model_id, zoom=float(zoom))
+        raw, _ = file_to_text(file_path, model_id=model_id, zoom=float(zoom))
     cleaned = postprocess(raw)
     items = make_mcqs(cleaned, n=int(n))
     recs = to_records(items)
-    state = {"records": recs, "method": method}
-    return state, render_quiz_html(recs), f"تم توليد {len(recs)} سؤالًا. أجب عن جميعها ثم اضغط إرسال."
-
-# ------------------ التصحيح (يعيد الدرجة + خريطة الصحة) ------------------
-def grade(state, answers_json):
-    try:
-        user_map = json.loads(answers_json or "{}")
-    except Exception:
-        return "حدث خطأ في قراءة الإجابات.", "{}"
-    recs = state["records"] if state else []
-    total = len(recs)
-    # التحقق من الإجابة على الجميع
-    missing = [r["id"] for r in recs if not user_map.get(r["id"])]
-    if missing:
-        return "⚠️ يجب الإجابة على جميع الأسئلة قبل الإرسال.", "{}"
-    correctness = {}
-    correct = 0
-    for rec in recs:
-        qid = rec["id"]
-        chosen = user_map.get(qid)
-        cor = next((o["id"] for o in rec["options"] if o["is_correct"]), "")
-        ok = (chosen == cor)
-        correctness[qid] = ok
-        if ok: correct += 1
-    score_text = f"### نتيجتك: **{correct} / {total}**"
-    return score_text, json.dumps(correctness, ensure_ascii=False)
-
-# =======================================================
-#                             واجهة
-# =======================================================
+    return render_quiz_html(recs), f"تم توليد {len(recs)} سؤالًا. لكل سؤال زر تحقّق مستقل."
+
+# ------------------ الثيم ------------------
 CSS = """
 :root{
   --bg:#0e0e11; --panel:#15161a; --card:#1a1b20; --muted:#a7b0be;
   --text:#f6f7fb; --accent:#6ee7b7; --accent2:#34d399; --danger:#ef4444; --border:#262833;
 }
 body{direction:rtl; font-family:system-ui,'Cairo','IBM Plex Arabic',sans-serif; background:var(--bg);}
-.gradio-container{max-width:1000px;margin:0 auto;padding:12px 12px 40px;}
-h2.top{color:#eaeaf2;margin:4px 0 16px}
+.gradio-container{max-width:980px;margin:0 auto;padding:12px 12px 40px;}
+h2.top{color:#eaeaf2;margin:6px 0 16px}
 .panel{background:var(--panel);border:1px solid var(--border);border-radius:14px;padding:14px;box-shadow:0 16px 38px rgba(0,0,0,.35)}
 .small{opacity:.9;color:#d9dee8}
 
@@ -288,7 +288,7 @@ h2.top{color:#eaeaf2;margin:4px 0 16px}
 textarea{min-height:120px}
 
 /* الامتحان */
-.progress-pill{display:inline-block;background:#0f1116;border:1px solid #2a2d3a;border-radius:999px;padding:6px 12px;color:#cfd5e3;margin:10px 0}
+.hint{color:#cfd5e3;background:#0f1116;border:1px solid #2a2d3a;border-radius:10px;padding:10px;margin:10px 0}
 .q-card{background:var(--card);border:1px solid var(--border);border-radius:14px;padding:14px;margin:12px 0}
 .q-header{display:flex;gap:10px;align-items:center;justify-content:space-between;margin-bottom:6px}
 .q-title{color:#eaeaf2;font-weight:800}
@@ -298,18 +298,31 @@ textarea{min-height:120px}
 
 .q-text{color:var(--text);font-size:1.06rem;line-height:1.8;margin:8px 0 12px}
 .opts{display:flex;flex-direction:column;gap:8px}
-.opt{display:flex;gap:10px;align-items:center;background:#14161c;border:1px solid #2a2d3a;border-radius:12px;padding:10px}
+.opt{display:flex;gap:10px;align-items:center;background:#14161c;border:1px solid #2a2d3a;border-radius:12px;padding:10px;transition:background .15s,border-color .15s}
 .opt input{accent-color:var(--accent2)}
 .opt-letter{display:inline-flex;width:28px;height:28px;border-radius:8px;background:#0f1116;border:1px solid #2a2d3a;align-items:center;justify-content:center;font-weight:800;color:#dfe6f7}
 .opt-text{color:#eaeaf2}
+
+/* التلوين بعد التحقق */
+.opt.ok{background:#0f2f22;border-color:#1b6a52}
+.opt.err{background:#3a0d14;border-color:#6a1e2b}
+
+.q-actions{display:flex;gap:10px;align-items:center;margin-top:10px}
+.q-actions .q-submit{
+  background:linear-gradient(180deg,var(--accent),var(--accent2));
+  border:none;color:#0b0d10;font-weight:800;border-radius:10px;padding:8px 14px;cursor:pointer;
+}
+.q-actions .q-submit:disabled{opacity:.5;cursor:not-allowed}
+.q-note{color:#ffd1d6}
+.q-note.warn{color:#ffd1d6}
 """
 
+# ------------------ واجهة Gradio ------------------
 with gr.Blocks(title="Question Generator", css=CSS) as demo:
     gr.Markdown("<h2 class='top'>Question Generator</h2>")
 
     with gr.Group(elem_classes=["panel"]):
-        gr.Markdown("**أدخل نصًا أو ارفع ملفًا، حدّد عدد الأسئلة، ثم اضغط توليد.**\
-                      <br>يجب الإجابة على <u>جميع</u> الأسئلة قبل الإرسال.", elem_classes=["small"])
+        gr.Markdown("**أدخل نصًا أو ارفع ملفًا، حدّد عدد الأسئلة، ثم اضغط توليد.**", elem_classes=["small"])
         text_area = gr.Textbox(lines=6, placeholder="ألصق هنا مقطع نصي...", label="أدخل نصًا")
         num_q = gr.Slider(4, 20, value=DEFAULT_NUM_QUESTIONS, step=1, label="عدد الأسئلة")
         file_comp = gr.File(label="أو اختر ملف PDF/TXT", file_count="single",
@@ -328,78 +341,12 @@ with gr.Blocks(title="Question Generator", css=CSS) as demo:
         btn_build = gr.Button("توليد الأسئلة", elem_classes=["button-primary"])
         toast = gr.Markdown("", elem_classes=["small"])
 
-    state = gr.State(None)
-    quiz_html = gr.HTML("")         # مكان عرض جميع الأسئلة دفعة واحدة
-    btn_submit = gr.Button("إنهاء وإرسال الإجابات", elem_classes=["button-primary"])
-    answers_box = gr.Textbox(visible=False)
-    score_md = gr.Markdown("")
-    correctness_box = gr.Textbox(visible=False)  # نستقبل فيها خريطة الصحة لتلوين الواجهة
+    quiz_html = gr.HTML("")  # أسئلة + زر تحقق لكل سؤال
 
-    # توليد الامتحان
     btn_build.click(
         build_quiz,
         inputs=[text_area, file_comp, num_q, trocr_model, trocr_zoom],
-        outputs=[state, quiz_html, toast]
-    )
-
-    # JS: جمع الإجابات + المنع إن كان هناك سؤال غير مُجاب
-    js_collect = """
-    function () {
-      // عدّاد وإجابات
-      const cards = Array.from(document.querySelectorAll('.q-card'));
-      const map = {};
-      let missing = 0;
-      cards.forEach(c => {
-        const qid = c.getAttribute('data-qid');
-        const chosen = c.querySelector('input[type="radio"]:checked');
-        if (!chosen) { missing += 1; }
-        map[qid] = chosen ? chosen.value : null;
-      });
-      if (missing > 0) {
-        // أظهر رسالة منع بسيطة قرب أعلى الاختبار
-        let pill = document.querySelector('.progress-pill');
-        if (pill) {
-          pill.style.borderColor = '#6a1e2b';
-          pill.style.color = '#ffd1d6';
-          pill.textContent = `لا يمكن الإرسال: ${missing} سؤال/أسئلة بدون إجابة`;
-        }
-        return ["", ""]; // لا نرسل شيئًا للتصحيح
-      }
-      return [JSON.stringify(map), "go"]; // go = سمح بالإرسال
-    }
-    """
-
-    # عند الضغط Submit:
-    # 1) اجمع الإجابات (JS). إذا لم يجب على الجميع، لن نرسل للتصحيح.
-    btn_submit.click(
-        None, inputs=None, outputs=[answers_box, correctness_box], js=js_collect
-    ).then(
-        # 2) صحّح فقط إذا وُجدت إجابات (answers_box غير فارغ)
-        grade, inputs=[state, answers_box], outputs=[score_md, correctness_box]
-    ).then(
-        # 3) لون الواجهة بالصح/الخطأ (Correct!/Incorrect.) بدون تعليل
-        None, inputs=[correctness_box], outputs=None,
-        js="""
-        (correctness_json) => {
-          if (!correctness_json) return;
-          let okmap = {};
-          try { okmap = JSON.parse(correctness_json); } catch(e){ return; }
-          Object.entries(okmap).forEach(([qid, ok]) => {
-            const badge = document.getElementById('b_'+qid);
-            if (!badge) return;
-            badge.hidden = false;
-            if (ok) {
-              badge.classList.remove('err'); badge.classList.add('ok');
-              badge.textContent = 'Correct!';
-            } else {
-              badge.classList.remove('ok'); badge.classList.add('err');
-              badge.textContent = 'Incorrect.';
-            }
-          });
-          const el = document.querySelector('.progress-pill');
-          if (el) { el.style.borderColor = '#2a2d3a'; el.style.color = '#cfd5e3'; }
-        }
-        """
+        outputs=[quiz_html, toast]
     )
 
 if __name__ == "__main__":