My updates

License

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Mayar Waleed Salah
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/deps.py

@@ -4,28 +4,27 @@
 # ============================================
 from __future__ import annotations
 
-import threading
-from typing import Any, Optional
+from typing import Any, List, Optional
 
 from .config import settings
 from .rag_pipeline import build_qa_chain
 
-_lock = threading.RLock()
-_chain: Optional[Any] = None
 
-
-def get_chain():
-    global _chain
-    with _lock:
-        if _chain is None:
-            _chain = build_qa_chain(settings)
-        return _chain
+def get_chain(conversation_history: List[dict] = None):
+    """
+    Build the QA chain with conversation history.
+    Always rebuilds the chain to include current conversation context.
+    
+    Args:
+        conversation_history: List of previous messages for context
+    """
+    # Always build/rebuild the chain with current conversation history
+    # This ensures each request gets the proper context
+    return build_qa_chain(settings, conversation_history=conversation_history)
 
 
 def reload_chain():
-    global _chain
-    with _lock:
-        _chain = build_qa_chain(settings)
-        return _chain
+    """Rebuild the QA chain from scratch without conversation history."""
+    return build_qa_chain(settings)
 
 

app/history.py

@@ -0,0 +1,51 @@
+# ============================================
+# file: app/history.py
+# ============================================
+from __future__ import annotations
+
+import threading
+from typing import Dict, List
+
+from .schemas import Message
+
+_lock = threading.RLock()
+_conversations: Dict[str, List[Message]] = {}
+
+
+def get_history(session_id: str) -> List[Message]:
+    """Retrieve conversation history for a session."""
+    with _lock:
+        return _conversations.get(session_id, [])
+
+
+def add_to_history(session_id: str, user_msg: str, assistant_msg: str):
+    """Add user and assistant messages to conversation history."""
+    with _lock:
+        if session_id not in _conversations:
+            _conversations[session_id] = []
+        _conversations[session_id].append(Message(role="user", content=user_msg))
+        _conversations[session_id].append(Message(role="assistant", content=assistant_msg))
+
+
+def clear_history(session_id: str):
+    """Clear conversation history for a session."""
+    with _lock:
+        if session_id in _conversations:
+            del _conversations[session_id]
+
+
+def get_history_text(session_id: str, max_messages: int = 6) -> str:
+    """Convert conversation history to formatted text for LLM context."""
+    history = get_history(session_id)
+    if not history:
+        return ""
+    
+    # Keep only last max_messages messages
+    recent = history[-max_messages:]
+    
+    history_text = "السجل السابق للمحادثة:\n"
+    for msg in recent:
+        role_label = "المستخدم" if msg.role == "user" else "المستشار"
+        history_text += f"{role_label}: {msg.content}\n"
+    
+    return history_text + "\n---\n\n"

app/main.py

@@ -10,6 +10,7 @@ from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 
 from .deps import get_chain, reload_chain
+from .history import get_history, add_to_history, clear_history
 from .schemas import AskRequest, AskResponse, SourceDoc
 from .utils import convert_to_eastern_arabic
 
@@ -42,6 +43,23 @@ def reload():
     return {"status": "reloaded"}
 
 
+@app.post("/clear-history")
+def clear_session(session_id: str = "default"):
+    """Clear conversation history for a session."""
+    clear_history(session_id)
+    return {"status": "cleared", "session_id": session_id}
+
+
+@app.get("/history")
+def get_session_history(session_id: str = "default"):
+    """Retrieve conversation history for a session."""
+    history = get_history(session_id)
+    return {
+        "session_id": session_id,
+        "messages": [{"role": msg.role, "content": msg.content} for msg in history]
+    }
+
+
 def _dedupe_sources(docs) -> List[SourceDoc]:
     if not docs:
         return []
@@ -70,7 +88,12 @@ def _dedupe_sources(docs) -> List[SourceDoc]:
 
 @app.post("/ask", response_model=AskResponse)
 async def ask(payload: AskRequest):
-    chain = get_chain()
+    # Retrieve conversation history for this session
+    history = get_history(payload.session_id)
+    history_dicts = [{"role": msg.role, "content": msg.content} for msg in history]
+    
+    # Get chain with conversation history context
+    chain = get_chain(conversation_history=history_dicts)
 
     try:
         # LangChain invoke is sync; run in worker thread
@@ -90,7 +113,10 @@ async def ask(payload: AskRequest):
                 if s.article_number:
                     s.article_number = convert_to_eastern_arabic(s.article_number)
 
-    return AskResponse(answer=answer, sources=sources, raw=result)
+    # Save this exchange to history
+    add_to_history(payload.session_id, payload.query, answer)
+
+    return AskResponse(answer=answer, sources=sources, session_id=payload.session_id, raw=result)
 
 
 

app/rag_pipeline.py

@@ -86,10 +86,14 @@ def _load_json_folder(folder_path: str) -> List[dict]:
     return all_items
 
 
-def build_qa_chain(settings: Settings):
+def build_qa_chain(settings: Settings, conversation_history: List[dict] = None):
     """
     Builds and returns:
       qa_chain: Runnable that returns {"context": [Document...], "input": str, "answer": str}
+    
+    Args:
+        settings: Configuration settings
+        conversation_history: Optional list of previous messages for context
     """
     if not os.path.exists(settings.data_dir):
         raise FileNotFoundError(f"Data folder not found: {settings.data_dir}")
@@ -345,6 +349,8 @@ def build_qa_chain(settings: Settings):
 
 مهمتك الأساسية: الإجابة بدقة استناداً إلى "السياق التشريعي" المرفق أدناه.
 عند وجود نص قانوني في السياق، هو مصدرك الأول والأهم.
+
+استخدم سجل المحادثة السابقة (إن وجد) لفهم السياق والإجابة بتسلسل منطقي.
 </role>
 
 <decision_logic>
@@ -407,10 +413,19 @@ def build_qa_chain(settings: Settings):
 </formatting_rules>
 """
 
+    # Build conversation history text for context
+    history_text = ""
+    if conversation_history:
+        history_text = "السجل السابق للمحادثة:\n"
+        for msg in conversation_history[-6:]:  # Keep last 6 messages
+            role_label = "المستخدم" if msg.get("role") == "user" else "المستشار"
+            history_text += f"{role_label}: {msg.get('content', '')}\n"
+        history_text += "\n---\n\n"
+
     prompt = ChatPromptTemplate.from_messages(
         [
             ("system", system_instructions),
-            ("system", "السياق التشريعي المتاح (المصدر الأساسي):\n{context}"),
+            ("system", f"{history_text}السياق التشريعي المتاح (المصدر الأساسي):\n{{context}}"),
             ("human", "سؤال المستفيد:\n{input}"),
         ]
     )

app/schemas.py

@@ -4,8 +4,14 @@ from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field
 
 
+class Message(BaseModel):
+    role: str = Field(..., description="'user' or 'assistant'")
+    content: str = Field(..., description="Message content")
+
+
 class AskRequest(BaseModel):
     query: str = Field(..., min_length=1, description="User question in Arabic")
+    session_id: str = Field(default="default", description="Unique session identifier")
     include_sources: bool = Field(default=True, description="Return retrieved source docs")
     eastern_arabic_numerals: bool = Field(
         default=False, description="Convert digits 0-9 to Eastern Arabic numerals"
@@ -26,4 +32,5 @@ class SourceDoc(BaseModel):
 class AskResponse(BaseModel):
     answer: str
     sources: List[SourceDoc] = Field(default_factory=list)
+    session_id: str
     raw: Dict[str, Any] = Field(default_factory=dict)

test_dataset_5_questions.json

@@ -1,22 +0,0 @@
-[
-  {
-    "question": "ما الطبيعة القانونية لحق العمل في الدستور المصري؟",
-    "ground_truth": "حق أساسي/حرية: العمل حق وواجب تكفله الدولة. يُمنع العمل الجبري إلا بقانون ولخدمة عامة وبمقابل عادل."
-  },
-  {
-    "question": "ما حكم التحرش أو التنمر أو العنف ضد العامل في مكان العمل وفق قانون العمل؟",
-    "ground_truth": "حظر السخرة والعمل الجبري والتحرش والتنمر والعنف بكافة أشكاله (اللفظي والجسدي والنفسي) ضد العمال، مع تحديد جزاءات تأديبية في لوائح المنشأة."
-  },
-  {
-    "question": "ما المقصود بالتلبس وما أثره الإجرائي بشكل عام؟",
-    "ground_truth": "لمأمور الضبط القضائي في التلبس منع الحاضرين من المغادرة حتى تحرير المحضر واستدعاء من يفيد في التحقيق."
-  },
-  {
-    "question": "ما حكم نشر صور أو معلومات تنتهك خصوصية شخص دون رضاه عبر الإنترنت؟",
-    "ground_truth": "تجرم المادة الاعتداء على القيم الأسرية أو الخصوصية عبر الرسائل الكثيفة دون موافقة، أو تسليم بيانات للترويج دون موافقة، أو نشر محتوى ينتهك الخصوصية سواء كان صحيحًا أو غير صحيح."
-  },
-  {
-    "question": "ما الشروط العامة لاستحقاق الزوجة النفقة وفق قانون الأحوال الشخصية؟",
-    "ground_truth": "تجب النفقة للزوجة من تاريخ العقد الصحيح وتشمل الغذاء والكسوة والمسكن والعلاج. لا تجب النفقة إذا ارتدت أو امتنعت عن تسليم نفسها أو خرجت بدون إذن. نفقة الزوجة دين على الزوج ولها امتياز على أمواله."
-  }
-]