Upload 4 files

badge_game_manager.py

@@ -39,7 +39,7 @@ except Exception:
 class BadgeGameManager:
     """مدير لعبة الوسام والتشخيص التفاعلي."""
 
-    VERSION = "badge_game_manager_v31_adaptive_probe_dedup"
+    VERSION = "badge_game_manager_v32_evidence_signature_dedup"
     UNKNOWN_LABEL = "لا أعلم"
     UNKNOWN_GUIDANCE = (
         "لا تخمّن. إذا لم تكن متأكدًا من الإجابة اختر «لا أعلم»؛ "
@@ -653,6 +653,9 @@ class BadgeGameManager:
         options.sort()
         return "|".join([
             str(q.get("skill_id") or ""),
+            str(q.get("condition_slot_id") or (q.get("stimulus_plan") or {}).get("condition_slot_id") or ""),
+            str(q.get("diagnostic_condition") or (q.get("stimulus_plan") or {}).get("diagnostic_condition") or ""),
+            str(q.get("stimulus_identity_group") or ""),
             str(q.get("media_fact_name") or q.get("question_type") or q.get("item_type") or ""),
             self.normalize_answer(q.get("correct_answer") or q.get("answer") or ""),
             *options,
@@ -688,8 +691,13 @@ class BadgeGameManager:
             old_sig = str(old.get("runtime_evidence_signature") or "").strip()
             if runtime_sig and old_sig and runtime_sig == old_sig:
                 return {"success": False, "error": "duplicate_evidence_signature", "runtime_evidence_signature": runtime_sig, "version": self.version}
-            if not fresh_recheck_role and semantic_key and semantic_key == self._adaptive_probe_semantic_key(old):
-                return {"success": False, "error": "duplicate_diagnostic_probe", "semantic_key": semantic_key, "version": self.version}
+
+            # إذا كان السؤالان يحملان Evidence Signature صحيحة ومختلفة،
+            # لا نرفضهما بسبب صياغة/خيارات متشابهة؛ الاختلاف في stimulus/slot
+            # قد يكون هو الدليل التشخيصي المقصود.
+            if not (runtime_sig and old_sig):
+                if not fresh_recheck_role and semantic_key and semantic_key == self._adaptive_probe_semantic_key(old):
+                    return {"success": False, "error": "duplicate_diagnostic_probe", "semantic_key": semantic_key, "version": self.version}
 
         state_dict.setdefault("questions", []).append(cleaned)
         state_dict["total_questions"] = len(state_dict.get("questions") or [])

question_bank_builder.py

@@ -48,7 +48,7 @@ def _fmt(value: Any) -> str:
         return f"{value:.3f}".rstrip("0").rstrip(".")
     return str(value)
 
-VERSION = "question_bank_builder_v29_diagnostic_condition_media_truth"
+VERSION = "question_bank_builder_v30_strict_arabic_probe_identity"
 
 _RUNTIME_CLARIFICATION_SERVICE = None
 _RUNTIME_QUESTION_GENERATION_CALLBACK = None
@@ -2503,6 +2503,18 @@ class QuestionBankBuilder(_GeneratorBase):
             "remedial_practice": ["applied", "direct", "contrast"],
             "prerequisite_probe": ["direct", "foundation"],
             "micro_step_probe": ["direct", "guided"],
+
+            # canonical diagnostic compatibility vocabulary
+            "screening_probe": ["direct"],
+            "diagnostic_discrimination": ["contrast", "applied", "direct"],
+            "diagnostic_confirmation": ["contrast", "evidence", "applied"],
+            "representation_probe": ["contrast", "applied"],
+            "transfer_probe": ["transfer"],
+            "parallel_reassessment": ["recheck"],
+            "progress_monitoring_probe": ["recheck", "applied"],
+            "spaced_recheck_probe": ["recheck"],
+            "maintenance_worksheet": ["recheck", "applied"],
+
             # compatibility with older names
             "diagnostic_probe": ["direct", "contrast"],
             "guided_practice": ["direct", "applied", "contrast"],
@@ -2545,17 +2557,30 @@ class QuestionBankBuilder(_GeneratorBase):
                 or ""
             ).strip().lower()
 
-        role_filtered = [
+        requested_role = str(question_role or "").strip()
+        exact_role_filtered = [
             item for item in templates
-            if template_kind(item) in wanted_kinds
+            if str(item.get("question_role") or "").strip() == requested_role
         ]
-        if role_filtered:
-            templates = role_filtered
+        if exact_role_filtered:
+            templates = exact_role_filtered
+        else:
+            role_filtered = [
+                item for item in templates
+                if template_kind(item) in wanted_kinds
+            ]
+            if role_filtered:
+                templates = role_filtered
 
         excluded_template_set = {str(x) for x in (exclude_template_ids or []) if str(x).strip()}
         if excluded_template_set:
             templates = [x for x in templates if str(x.get("template_id") or "") not in excluded_template_set]
 
+        strict_arabic_diagnostic = (
+            str(skill_id or "").startswith("AR-")
+            and str(assessment_mode or "").strip().lower() == "diagnostic"
+        )
+
         if condition_slot_id:
             matched = [
                 x for x in templates
@@ -2563,6 +2588,8 @@ class QuestionBankBuilder(_GeneratorBase):
             ]
             if matched:
                 templates = matched
+            elif strict_arabic_diagnostic:
+                return []
 
         if diagnostic_condition_family:
             matched = [
@@ -2571,6 +2598,8 @@ class QuestionBankBuilder(_GeneratorBase):
             ]
             if matched:
                 templates = matched
+            elif strict_arabic_diagnostic:
+                return []
 
         if primary_target_attribute:
             matched = [x for x in templates if str(x.get("primary_target_attribute") or "") == str(primary_target_attribute)]
@@ -3541,6 +3570,10 @@ class QuestionBankBuilder(_GeneratorBase):
 
         stable_seed = (
             f"{skill_id}|{template_id}|{sequence}|"
+            f"{request.get('condition_slot_id','')}|"
+            f"{request.get('diagnostic_condition','')}|"
+            f"{request.get('runtime_generation_seed','')}|"
+            f"{request.get('runtime_generation_attempt','')}|"
             f"{fact_name}|{answer}|{prompt}"
         )
         question_id = (
@@ -3583,6 +3616,8 @@ class QuestionBankBuilder(_GeneratorBase):
                 "generation_mode": "media_ground_truth_direct",
                 "generator_owner": "QuestionBankBuilder",
                 "generator_version": VERSION,
+                "diagnostic_runtime_schema": "arabic_diag_runtime_v2",
+                "runtime_generation_seed": str(request.get("runtime_generation_seed") or ""),
                 "answer_source": "media_ground_truth",
                 "media_fact_name": fact_name,
                 "media_ground_truth": dict(ground_truth),
@@ -3609,6 +3644,8 @@ class QuestionBankBuilder(_GeneratorBase):
             f"MEDIA_GROUND_TRUTH_ITEM_BUILT=True "
             f"QUESTION_ID={question_id} "
             f"FACT={fact_name} "
+            f"SOUND_PRESENT={ground_truth.get('sound_present') if isinstance(ground_truth.get('sound_present'), bool) else ''} "
+            f"DIAG_CONDITION={actual_diagnostic_condition} "
             f"ANSWER={answer!r} "
             f"CHOICES={len(options)} "
             f"SEQUENCE={sequence} "
@@ -3655,6 +3692,10 @@ class QuestionBankBuilder(_GeneratorBase):
                         (
                             f"{request.get('skill_id','')}|"
                             f"{request.get('template_id','')}|"
+                            f"{request.get('condition_slot_id','')}|"
+                            f"{request.get('diagnostic_condition','')}|"
+                            f"{request.get('runtime_generation_seed','')}|"
+                            f"{request.get('runtime_generation_attempt','')}|"
                             f"{index + 1}"
                         ).encode("utf-8")
                     ).hexdigest()[:14]
@@ -4028,6 +4069,8 @@ class QuestionBankBuilder(_GeneratorBase):
                             error_target=error_target,
                         )
                         request.update({
+                            "runtime_generation_seed": str(seed or ""),
+                            "runtime_generation_attempt": int(attempts),
                             "difficulty": difficulty,
                             "representation_type": representation_type,
                             "cognitive_domain": cognitive_domain,
@@ -4266,14 +4309,55 @@ class QuestionBankBuilder(_GeneratorBase):
 
     @staticmethod
     def question_fingerprint(question: Dict[str, Any]) -> str:
-        """بصمة مستقرة تمنع تكرار نص السؤال حتى لو تغير question_id."""
-        skill_id = str(question.get("skill_id") or "").strip()
+        """
+        بصمة السؤال.
+
+        في السؤال التشخيصي لا يجوز اعتبار نفس الصياغة مع Stimulus/Condition
+        مختلف سؤالًا مكررًا؛ Evidence Signature هي التي تحسم الاستقلال.
+        """
+        q = question if isinstance(question, dict) else {}
+        skill_id = str(q.get("skill_id") or "").strip()
         text = re.sub(
             r"\s+",
             " ",
-            str(question.get("question") or question.get("prompt") or "").strip().lower(),
+            str(q.get("question") or q.get("prompt") or "").strip().lower(),
         )
-        return hashlib.sha256(f"{skill_id}|{text}".encode("utf-8")).hexdigest()[:24]
+        slot = str(
+            q.get("condition_slot_id")
+            or (q.get("stimulus_plan") or {}).get("condition_slot_id")
+            or ""
+        ).strip()
+        condition = str(
+            q.get("diagnostic_condition")
+            or (q.get("stimulus_plan") or {}).get("diagnostic_condition")
+            or ""
+        ).strip()
+
+        media_tokens = []
+        for asset in q.get("media_assets") or []:
+            if not isinstance(asset, dict):
+                continue
+            token = (
+                asset.get("remote_path")
+                or asset.get("source_id")
+                or asset.get("path")
+                or asset.get("url")
+                or asset.get("asset_id")
+            )
+            if token:
+                media_tokens.append(str(token))
+
+        if slot or condition or media_tokens:
+            payload = "|".join([
+                skill_id,
+                text,
+                f"slot={slot}",
+                f"condition={condition}",
+                "media=" + "|".join(sorted(media_tokens)),
+            ])
+        else:
+            payload = f"{skill_id}|{text}"
+        return hashlib.sha256(payload.encode("utf-8")).hexdigest()[:24]
 
     def get_challenge_questions(
         self,
@@ -4947,6 +5031,8 @@ def generate_by_contract(
 
         item["question_role"] = question_role
         item["question_kind"] = question_role
+        if str(item.get("skill_id") or "").startswith("AR-") and str(c.get("assessment_mode") or "") == "diagnostic":
+            item["diagnostic_runtime_schema"] = "arabic_diag_runtime_v2"
 
         ok, reason = _contract_question_is_acceptable(item, c)
         if not ok:

question_bank_manager.py

@@ -18,7 +18,7 @@ import json, os, threading
 from pathlib import Path
 from typing import Any, Dict, Iterable, List, Optional
 
-VERSION = "question_bank_manager_v29_diagnostic_condition_match"
+VERSION = "question_bank_manager_v30_arabic_runtime_schema_guard"
 
 BANK_PERSISTENCE_OWNER = "QuestionBankManager"
 QUESTION_BANK_REPO_KEY = (
@@ -811,6 +811,14 @@ class QuestionBankManager:
 
         c = dict(c or {})
 
+        # أسئلة العربية التشخيصية القديمة V29 قد تشترك في media path واحد
+        # لأن هوية الـstimulus لم تكن تتضمن condition/seed. لا نعيد استخدامها.
+        requested_subject = _norm_subject(c.get("subject"))
+        requested_mode = str(c.get("assessment_mode") or "").strip().lower()
+        if requested_subject == "arabic" and requested_mode == "diagnostic":
+            if str(row.get("diagnostic_runtime_schema") or "").strip() != "arabic_diag_runtime_v2":
+                return False
+
         sid = str(
             c.get("skill_id")
             or c.get("target_skill_id")

strategy_manager.py

@@ -42,7 +42,7 @@ except Exception:
 
 
 STRATEGY_MANAGER_VERSION = "strategy_manager_v14_arabic_qmatrix_conditions_runtime"
-STRATEGY_SCHEMA_VERSION = "strategy_schema_v14"
+STRATEGY_SCHEMA_VERSION = "strategy_schema_v15"
 
 
 class StrategyManager:
@@ -773,7 +773,12 @@ class StrategyManager:
             "representation": str(template.get("representation") or ""),
             "modality": str(template.get("modality") or ""),
             "response_mode": str(template.get("response_mode") or ""),
-            "cognitive_domain": str(template.get("normalized_cognitive_domain") or (row.get("cognitive_domain_profile") or {}).get("primary") or ""),
+            "cognitive_domain": str(
+                template.get("normalized_cognitive_domain")
+                or (row.get("cognitive_domain_profile") or {}).get("primary")
+                or contract.get("cognitive_domain")
+                or "applying"
+            ),
             "preferred_question_types": [str(template.get("item_type"))] if template.get("item_type") else [],
             "hypothesis_to_test": str(hypothesis or ""),
             "exclude_question_ids": excluded_ids,