Upload 2 files

agentic_rag.py

@@ -126,7 +126,7 @@ def tool_search_db(engine, query: str):
         if not top:
             return "لم أجد معلومات كافية في قاعدة البيانات.", []
         context = "\n\n".join([f"[{i+1}] {c['content']}" for i, c in enumerate(top)])
-        sources = [{"url": c.get("url", ""), "page_name": c.get("page_name", ""), "content": c.get("content", "")} for c in top]
+        sources = [{"url": c["meta"].get("url", ""), "page_name": c["meta"].get("page_name", ""), "content": c.get("content", "")} for c in top]
         return context, sources
     except Exception as e:
         return f"خطأ في البحث: {e}", []
@@ -348,8 +348,8 @@ class AgenticRAG:
     def evaluate_user_profile(self, user_info: str, lang: str) -> str:
         """يقيّم تأهل المستخدم بعد ما يعطي معلوماته"""
         # جيب شروط المناظرات
-        context_ar = tool_get_concours_page("superieur_ar")
-        context_fr = tool_get_concours_page("general_ar")
+        context_ar, _ = tool_get_concours_page("superieur_ar")
+        context_fr, _ = tool_get_concours_page("general_ar")
         context    = f"{context_ar}\n\n{context_fr}"[:5000]
 
         if lang == "ar":
@@ -445,4 +445,4 @@ Réponds en JSON uniquement: ["question1", "question2", "question3"]"""
                 "Quels documents pour le dossier?",
                 "Quand ouvrent les prochains concours?",
                 "Suis-je éligible?"
-            ]
+            ]

rag_engine.py

@@ -118,6 +118,8 @@ class ENAEngine:
                     if "informations-generales" in m_url:
                         score *= 1.5
 
+                content_lower = t.lower()
+
                 # Boost الاستثناءات القانونية للسن — مهمة جداً
                 EXCEPTION_KEYWORDS = ["استثناء", "مكتب تشغيل", "مكتب التشغيل",
                                        "سنوات العمل", "الجماعات المحلية",
@@ -131,7 +133,6 @@ class ENAEngine:
                 is_competition_q = any(b in qn.lower() for b in CONTEXT_PENALTIES["competition"])
                 is_journal_q = any(b in qn.lower() for b in CONTEXT_PENALTIES["journal"])
                 
-                content_lower = t.lower()
                 has_journal_terms = any(b in content_lower for b in CONTEXT_PENALTIES["journal"])
                 
                 # If it's a competition query, penalize journal content heavily
@@ -265,4 +266,4 @@ class ENAEngine:
 
 5. **Rigueur numérique** : Ne jamais omettre un chiffre, un âge ou une dérogation légale.
 
-6. **Sources** : Citer la référence [1] après chaque information."""
+6. **Sources** : Citer la référence [1] après chaque information."""