überarbeitet mit Gemini
This commit is contained in:
1 parent
4ab44e36a2
commit
079cf174d4
2 files changed
+50
-58
No files matched your search
+17
-8
@@ -1,10 +1,10 @@
|
||||
"""
|
||||
FILE: app/core/ingestion.py
|
||||
DESCRIPTION: Haupt-Ingestion-Logik. Transformiert Markdown in den Graphen.
|
||||
WP-20: Smart Edge Allocation via Hybrid LLM (OpenRouter/Gemini).
|
||||
WP-22: Content Lifecycle, Edge Registry Validation & Multi-Hash.
|
||||
FIX: Behebung des AttributeError und Härtung des Prompt-Formattings.
|
||||
VERSION: 2.11.7
|
||||
WP-20: Optimiert für OpenRouter (openai/gpt-oss-20b:free) als Primary.
|
||||
WP-22: Fallback-Unterstützung für Google Gemini und Ollama.
|
||||
FIX: Dynamische Provider-Wahl und Modell-Zuweisung für den Turbo-Modus.
|
||||
VERSION: 2.11.9
|
||||
STATUS: Active
|
||||
"""
|
||||
import os
|
||||
@@ -131,9 +131,19 @@ class IngestionService:
|
||||
return get_chunk_config(note_type)
|
||||
|
||||
async def _perform_smart_edge_allocation(self, text: str, note_id: str) -> List[Dict]:
|
||||
"""Nutzt das Hybrid LLM für die semantische Kanten-Extraktion."""
|
||||
provider = "openrouter" if self.settings.OPENROUTER_API_KEY else self.settings.MINDNET_LLM_PROVIDER
|
||||
model = self.settings.GEMMA_MODEL
|
||||
"""
|
||||
WP-20: Nutzt das Hybrid LLM für die semantische Kanten-Extraktion.
|
||||
Bevorzugt den primär eingestellten Provider (z.B. OpenRouter).
|
||||
"""
|
||||
# 1. Provider & Modell Bestimmung (User-Request: OpenRouter Primary)
|
||||
provider = self.settings.MINDNET_LLM_PROVIDER
|
||||
|
||||
if provider == "openrouter":
|
||||
model = self.settings.OPENROUTER_MODEL
|
||||
elif provider == "gemini":
|
||||
model = self.settings.GEMINI_MODEL
|
||||
else:
|
||||
model = self.settings.LLM_MODEL
|
||||
|
||||
logger.info(f"🚀 [Ingestion] Turbo-Mode: Extracting edges for '{note_id}' using {model} on {provider}")
|
||||
|
||||
@@ -238,7 +248,6 @@ class IngestionService:
|
||||
body_text = getattr(parsed, "body", "") or ""
|
||||
if hasattr(edge_registry, "ensure_latest"): edge_registry.ensure_latest()
|
||||
|
||||
# FIX: Behebung des AttributeError durch korrekten Aufruf der Klassenmethode
|
||||
chunk_config = self._get_chunk_config_by_profile(effective_profile, note_type)
|
||||
chunks = await assemble_chunks(fm["id"], body_text, fm["type"], config=chunk_config)
|
||||
chunk_pls = make_chunk_payloads(fm, note_pl["path"], chunks, note_text=body_text)
|
||||
|
||||
Reference in new issue
Block a user