änderung des retrivals

math-tutor/backend/app/LLM_services/decision_LLM.py

@@ -13,16 +13,16 @@ CLASSIFIER_PROMPT = (
 
 def needs_more_context(history: str, context_sheet: str) -> dict:
     prompt = (
-        "Historie:\n"
-        + history
-        + "\n\nKontextblatt:\n"
+        "Kontextblatt:\n"
         + context_sheet
+        + "\n\nHistorie:\n"
+        + history
         + "\n\nAntwortformat: JSON."
     )
     result = llm_client.chat(
         messages=[
-            {"role": "system", "content": CLASSIFIER_PROMPT},
             {"role": "user", "content": prompt},
+            {"role": "system", "content": CLASSIFIER_PROMPT},
         ],
         use_ollama=True,
     )

math-tutor/backend/app/deterministic_services/context_store.py

@@ -80,14 +80,28 @@ def add_retrieval_context(
     sheet: dict[str, Any],
     query: str,
     context: str,
-    sources: list[str],
+    sources: list[dict],
 ) -> None:
-    sheet["retrieval_contexts"].append(
-        {"query": query, "context": context, "sources": sources}
-    )
+    retrieval_entry = {"query": query, "context": context, "sources": sources}
+    sheet["retrieval_contexts"].append(retrieval_entry)
     sheet["updated_at"] = _utc_now()
 
 
+def update_retrieval_context(
+    sheet: dict[str, Any],
+    query: str,
+    context: str,
+    sources: list[dict],
+) -> None:
+    retrievals = sheet.get("retrieval_contexts", [])
+    if retrievals:
+        latest_retrieval = retrievals[-1]
+        latest_retrieval["context"] = context
+        latest_retrieval["sources"] = sources
+        latest_retrieval["query"] = query
+        sheet["updated_at"] = _utc_now()
+
+
 def add_math_solution(
     sheet: dict[str, Any],
     task: str,
@@ -145,7 +159,17 @@ def format_sheet(sheet: dict[str, Any]) -> str:
     if retrievals:
         blocks = []
         for item in retrievals:
-            blocks.append(f"QUERY: {item.get('query', '')}\n{item.get('context', '')}")
+            query = item.get('query', '')
+            context = item.get('context', '')
+            sources = item.get('sources', [])
+            
+            # Erstelle eine formatierte Liste der Quellen mit ihren Scores
+            source_blocks = []
+            for source in sources:
+                source_blocks.append(f"  - [{source.get('score', 0):.3f}] {source.get('label', '')} {source.get('ref', '')}")
+            
+            source_info = "\n".join(source_blocks) if source_blocks else ""
+            blocks.append(f"QUERY: {query}\n{context}\nSOURCES:\n{source_info}")
         parts.append("RETRIEVAL_CONTEXT:\n" + "\n\n".join(blocks))
     else:
         parts.append("RETRIEVAL_CONTEXT:\n(leer)")

math-tutor/backend/app/deterministic_services/orchestrator.py

 from app.deterministic_services import context_store, retrieval_service, tool_logging
 from app.tools import math_tool
 from app.LLM_services import hint_LLM, decision_LLM, math_intent_LLM, solver_LLM
+from typing import List
 
 
 def _append_tool_log(tool_log: list[dict], name: str, args: dict, response: object) -> None:
@@ -8,10 +9,17 @@ def _append_tool_log(tool_log: list[dict], name: str, args: dict, response: obje
 
 
 def _bootstrap_context(sheet: dict, query_text: str, tool_log: list[dict]) -> None:
+    # Erstelle einen neuen Retrieval-Block oder aktualisiere den bestehenden
     context, sources = retrieval_service.retrieve_context(query_text=query_text)
-    context_store.add_retrieval_context(sheet, query_text, context, sources)
-    _append_tool_log(tool_log, "retrieve_context", {"query": query_text}, {"context": context, "sources": sources})
-
+    
+    retrievals = sheet.get("retrieval_contexts", [])
+    if retrievals:
+        context_store.update_retrieval_context(sheet, query_text, context, sources)
+        _append_tool_log(tool_log, "update_retrieve_context", {"query": query_text}, {"context": context, "sources": sources})
+    else:
+        context_store.add_retrieval_context(sheet, query_text, context, sources)
+        _append_tool_log(tool_log, "retrieve_context", {"query": query_text}, {"context": context, "sources": sources})
+    
     math_request = math_intent_LLM.extract_math_request(query_text)
     if math_request:
         solution = math_tool.sympy_solve(**math_request)
@@ -73,8 +81,8 @@ def run_chat(messages: list[dict], draft: str | None = None) -> dict:
         context_store.add_decision(sheet, decision)
 
         if decision.get("needs_more_context"):
-            _bootstrap_context(sheet, ("\n").join(_extract_user_messages(messages)), tool_log)
-            sheet_text = context_store.format_sheet(sheet)
+            full_query = ("\n").join(_extract_user_messages(messages))
+            _bootstrap_context(sheet, full_query, tool_log)
 
     # Hinweis und Ausgaben generierung
     hint_args = {

math-tutor/backend/app/deterministic_services/retrieval_service.py

@@ -54,19 +54,24 @@ def _append_group(
     items: List[vector_store.Retrieved],
     limit: int,
     blocks: List[str],
-    sources: List[str],
+    sources: List[dict],
 ) -> None:
     if not items:
         return
     for doc in items[:limit]:
         ref = _format_ref(doc)
         blocks.append(f"{label} {ref}\n{doc.markdown}")
-        sources.append(ref)
+        sources.append({
+            "ref": ref,
+            "context": doc.markdown,
+            "score": doc.score,
+            "label": label
+        })
 
 
-def build_context(result: dict) -> tuple[str, List[str]]:
+def build_context(result: dict) -> tuple[str, List[dict]]:
     blocks: List[str] = []
-    sources: List[str] = []
+    sources: List[dict] = []
 
     _append_group("DIRECT", result.get("children_direct", []), CONTEXT_LIMITS["direct"], blocks, sources)
     _append_group("INDIRECT", result.get("children_expanded", []), CONTEXT_LIMITS["indirect"], blocks, sources)
@@ -78,7 +83,7 @@ def build_context(result: dict) -> tuple[str, List[str]]:
     return "KONTEXT:\n" + "\n\n".join(blocks), sources
 
 
-def retrieve_context(query_text: str, pg_url: str | None = None) -> tuple[str, List[str]]:
+def retrieve_context(query_text: str, pg_url: str | None = None) -> tuple[str, List[dict]]:
     url = pg_url or config.get_postgres_url()
     embedder = _get_embedder()
     retrieval = vector_store.retrieve(