feat: intégration extraction universelle multi-fournisseurs avec timeout 90s et routage dynamique
Build and Push Docker Image / build-and-push (push) Successful in 43s
Build and Push Docker Image / build-and-push (push) Successful in 43s
This commit is contained in:
1 parent
95125df3b2
commit
007e723e4e
1 file changed
+155
-53
+155
-53
@@ -8,40 +8,39 @@ from datetime import datetime, timezone
|
|||||||
|
|
||||||
def determine_domain(model_id: str) -> str:
|
def determine_domain(model_id: str) -> str:
|
||||||
mid = model_id.lower()
|
mid = model_id.lower()
|
||||||
if "vision" in mid or "vl" in mid: return "Vision & Texte"
|
if "vision" in mid or "vl" in mid or "omni" in mid: return "Vision & Texte"
|
||||||
if "coder" in mid or "code" in mid or "math" in mid: return "Code & Logique"
|
if "coder" in mid or "code" in mid or "math" in mid: return "Code & Logique"
|
||||||
if "audio" in mid or "whisper" in mid: return "Audio"
|
if "audio" in mid or "whisper" in mid: return "Audio"
|
||||||
return "Texte Polyvalent"
|
return "Texte Polyvalent"
|
||||||
|
|
||||||
async def sync_finances(db: Session, settings: SystemSettings):
|
async def sync_finances(db: Session, settings: SystemSettings):
|
||||||
"""Interroge les fournisseurs pour récupérer le solde financier exact."""
|
"""Interroge les fournisseurs pour récupérer le solde financier exact."""
|
||||||
async with httpx.AsyncClient() as client:
|
async with httpx.AsyncClient(timeout=30.0) as client:
|
||||||
|
# OpenRouter
|
||||||
if settings.openrouter_management_key or settings.openrouter_api_key:
|
if settings.openrouter_management_key or settings.openrouter_api_key:
|
||||||
try:
|
try:
|
||||||
key = settings.openrouter_management_key or settings.openrouter_api_key
|
key = settings.openrouter_management_key or settings.openrouter_api_key
|
||||||
# Test de l'endpoint des crédits prépayés en priorité
|
|
||||||
cred_resp = await client.get("https://openrouter.ai/api/v1/credits", headers={"Authorization": f"Bearer {key}"})
|
cred_resp = await client.get("https://openrouter.ai/api/v1/credits", headers={"Authorization": f"Bearer {key}"})
|
||||||
balance = 0.0
|
balance = 0.0
|
||||||
usage = 0.0
|
usage = 0.0
|
||||||
|
|
||||||
if cred_resp.status_code == 200 and cred_resp.json().get("data"):
|
if cred_resp.status_code == 200 and cred_resp.json().get("data"):
|
||||||
data = cred_resp.json().get("data", {})
|
c_data = cred_resp.json().get("data", {})
|
||||||
balance = float(data.get("total_credits") or 0.0) - float(data.get("total_usage") or 0.0)
|
balance = float(c_data.get("total_credits") or 0.0) - float(c_data.get("total_usage") or 0.0)
|
||||||
usage = float(data.get("total_usage") or 0.0)
|
usage = float(c_data.get("total_usage") or 0.0)
|
||||||
else:
|
else:
|
||||||
# Fallback sur l'usage de la clé si pas de crédits prépayés
|
|
||||||
key_resp = await client.get("https://openrouter.ai/api/v1/auth/key", headers={"Authorization": f"Bearer {key}"})
|
key_resp = await client.get("https://openrouter.ai/api/v1/auth/key", headers={"Authorization": f"Bearer {key}"})
|
||||||
if key_resp.status_code == 200:
|
if key_resp.status_code == 200:
|
||||||
data = key_resp.json().get("data", {})
|
data = key_resp.json().get("data", {})
|
||||||
limit = data.get("limit")
|
limit = data.get("limit")
|
||||||
usage = float(data.get("usage") or 0.0)
|
usage = float(data.get("usage") or 0.0)
|
||||||
balance = (float(limit) - usage) if limit is not None else -usage
|
balance = (float(limit) - usage) if limit is not None else -usage
|
||||||
|
|
||||||
update_finance_db(db, "OpenRouter", balance, usage)
|
update_finance_db(db, "OpenRouter", balance, usage)
|
||||||
except Exception as e: print(f"Erreur Finance OR: {e}")
|
except Exception as e: print(f"Erreur Finance OR: {e}")
|
||||||
|
|
||||||
if settings.groq_api_key: update_finance_db(db, "Groq", 999.0, 0.0) # Gratuit en Beta
|
# Groq (Gratuit Beta)
|
||||||
|
if settings.groq_api_key: update_finance_db(db, "Groq", 999.0, 0.0)
|
||||||
|
|
||||||
|
# DeepSeek
|
||||||
if settings.deepseek_api_key:
|
if settings.deepseek_api_key:
|
||||||
try:
|
try:
|
||||||
resp = await client.get("https://api.deepseek.com/user/balance", headers={"Authorization": f"Bearer {settings.deepseek_api_key}"})
|
resp = await client.get("https://api.deepseek.com/user/balance", headers={"Authorization": f"Bearer {settings.deepseek_api_key}"})
|
||||||
@@ -49,62 +48,156 @@ async def sync_finances(db: Session, settings: SystemSettings):
|
|||||||
infos = resp.json().get("balance_infos", [{}])[0]
|
infos = resp.json().get("balance_infos", [{}])[0]
|
||||||
update_finance_db(db, "DeepSeek", float(infos.get("total_balance", 0)), 0.0)
|
update_finance_db(db, "DeepSeek", float(infos.get("total_balance", 0)), 0.0)
|
||||||
except Exception: pass
|
except Exception: pass
|
||||||
db.commit()
|
|
||||||
|
# Mistral AI (Pas de route standard simple pour le budget public, on mock)
|
||||||
|
if settings.mistral_api_key: update_finance_db(db, "Mistral", 0.0, 0.0)
|
||||||
|
|
||||||
|
# Gemini (Quota lié à GCP, pas de budget direct simple via API clé)
|
||||||
|
if settings.gemini_api_key: update_finance_db(db, "Gemini", 0.0, 0.0)
|
||||||
|
|
||||||
|
try: db.commit()
|
||||||
|
except: db.rollback()
|
||||||
|
|
||||||
def update_finance_db(db, provider, balance, usage):
|
def update_finance_db(db, provider, balance, usage):
|
||||||
log = db.query(FinancialLog).filter(FinancialLog.provider == provider).first()
|
try:
|
||||||
if log:
|
log = db.query(FinancialLog).filter(FinancialLog.provider == provider).first()
|
||||||
log.balance = balance; log.total_usage = usage; log.checked_at = datetime.now(timezone.utc)
|
if log:
|
||||||
else:
|
log.balance = balance; log.total_usage = usage; log.checked_at = datetime.now(timezone.utc)
|
||||||
db.add(FinancialLog(provider=provider, balance=balance, total_usage=usage))
|
else:
|
||||||
|
db.add(FinancialLog(provider=provider, balance=balance, total_usage=usage))
|
||||||
|
except Exception as e: print(f"Finance DB Error: {e}")
|
||||||
|
|
||||||
async def sync_providers_models(db: Session, settings: SystemSettings, sync_type: str = "Automatique"):
|
async def sync_providers_models(db: Session, settings: SystemSettings, sync_type: str = "Automatique"):
|
||||||
added = 0
|
added = 0
|
||||||
async with httpx.AsyncClient() as client:
|
# TIMEOUT PASSÉ À 90 SECONDES
|
||||||
|
async with httpx.AsyncClient(timeout=90.0) as client:
|
||||||
|
# 1. OpenRouter
|
||||||
if settings.openrouter_api_key:
|
if settings.openrouter_api_key:
|
||||||
try:
|
try:
|
||||||
resp = await client.get("https://openrouter.ai/api/v1/models")
|
resp = await client.get("https://openrouter.ai/api/v1/models")
|
||||||
if resp.status_code == 200:
|
if resp.status_code == 200:
|
||||||
for item in resp.json().get("data", []):
|
for item in resp.json().get("data", []):
|
||||||
pricing = item.get("pricing") or {}
|
try:
|
||||||
pp = float(pricing.get("prompt") or 0.0) * 1000000
|
pricing = item.get("pricing") or {}
|
||||||
pc = float(pricing.get("completion") or 0.0) * 1000000
|
try: pp = float(pricing.get("prompt") or 0.0) * 1000000
|
||||||
is_free = (pp == 0.0 and pc == 0.0)
|
except: pp = 0.0
|
||||||
desc = item.get("description", "Modèle IA générique.")[:200] + "..."
|
try: pc = float(pricing.get("completion") or 0.0) * 1000000
|
||||||
process_model(db, "openrouter", item["id"], item["name"], desc, determine_domain(item["id"]), is_free, item.get("context_length", 0), pp, pc)
|
except: pc = 0.0
|
||||||
added += 1
|
is_free = (pp == 0.0 and pc == 0.0)
|
||||||
except Exception as e: print(f"Erreur Modèles OR: {e}")
|
desc = item.get("description", "Modèle OpenRouter.")[:200] + "..."
|
||||||
|
process_model(db, "openrouter", item.get("id", "inconnu"), item.get("name", "Inconnu"), desc, determine_domain(item.get("id", "")), is_free, item.get("context_length", 0), pp, pc)
|
||||||
|
added += 1
|
||||||
|
except: pass
|
||||||
|
except Exception as e: print(f"Erreur OR Models: {e}")
|
||||||
|
|
||||||
|
# 2. Groq
|
||||||
if settings.groq_api_key:
|
if settings.groq_api_key:
|
||||||
try:
|
try:
|
||||||
resp = await client.get("https://api.groq.com/openai/v1/models", headers={"Authorization": f"Bearer {settings.groq_api_key}"})
|
resp = await client.get("https://api.groq.com/openai/v1/models", headers={"Authorization": f"Bearer {settings.groq_api_key}"})
|
||||||
if resp.status_code == 200:
|
if resp.status_code == 200:
|
||||||
for item in resp.json().get("data", []):
|
for item in resp.json().get("data", []):
|
||||||
process_model(db, "groq", item["id"], item["id"].capitalize(), "Modèle ultra-rapide exécuté sur LPU Groq.", determine_domain(item["id"]), True, 8192, 0.0, 0.0)
|
try:
|
||||||
added += 1
|
process_model(db, "groq", item["id"], item["id"].capitalize(), "Modèle rapide LPU Groq.", determine_domain(item["id"]), True, 8192, 0.0, 0.0)
|
||||||
|
added += 1
|
||||||
|
except: pass
|
||||||
except Exception: pass
|
except Exception: pass
|
||||||
|
|
||||||
settings.last_sync_date = datetime.now(timezone.utc)
|
# 3. DeepSeek
|
||||||
settings.last_sync_type = sync_type
|
if settings.deepseek_api_key:
|
||||||
db.commit()
|
try:
|
||||||
|
resp = await client.get("https://api.deepseek.com/models", headers={"Authorization": f"Bearer {settings.deepseek_api_key}"})
|
||||||
|
if resp.status_code == 200:
|
||||||
|
for item in resp.json().get("data", []):
|
||||||
|
try:
|
||||||
|
process_model(db, "deepseek", item["id"], item["id"].capitalize(), "Modèle officiel DeepSeek.", determine_domain(item["id"]), False, 64000, 0.14, 0.28)
|
||||||
|
added += 1
|
||||||
|
except: pass
|
||||||
|
except Exception: pass
|
||||||
|
|
||||||
|
# 4. Mistral
|
||||||
|
if settings.mistral_api_key:
|
||||||
|
try:
|
||||||
|
resp = await client.get("https://api.mistral.ai/v1/models", headers={"Authorization": f"Bearer {settings.mistral_api_key}"})
|
||||||
|
if resp.status_code == 200:
|
||||||
|
for item in resp.json().get("data", []):
|
||||||
|
try:
|
||||||
|
process_model(db, "mistral", item["id"], item["id"].capitalize(), "Modèle officiel Mistral AI.", determine_domain(item["id"]), False, 32000, 0.2, 0.6)
|
||||||
|
added += 1
|
||||||
|
except: pass
|
||||||
|
except Exception: pass
|
||||||
|
|
||||||
|
# 5. Gemini (Google)
|
||||||
|
if settings.gemini_api_key:
|
||||||
|
try:
|
||||||
|
resp = await client.get(f"https://generativelanguage.googleapis.com/v1beta/models?key={settings.gemini_api_key}")
|
||||||
|
if resp.status_code == 200:
|
||||||
|
for item in resp.json().get("models", []):
|
||||||
|
try:
|
||||||
|
m_id = item["name"].replace("models/", "")
|
||||||
|
desc = item.get("description", "Modèle Google Gemini.")[:200] + "..."
|
||||||
|
ctx = item.get("inputTokenLimit", 32000)
|
||||||
|
process_model(db, "gemini", m_id, item.get("displayName", m_id), desc, determine_domain(m_id), True, ctx, 0.0, 0.0)
|
||||||
|
added += 1
|
||||||
|
except: pass
|
||||||
|
except Exception: pass
|
||||||
|
|
||||||
|
# 6. Cloudflare
|
||||||
|
if settings.cloudflare_account_id and settings.cloudflare_api_token:
|
||||||
|
try:
|
||||||
|
url = f"https://api.cloudflare.com/client/v4/accounts/{settings.cloudflare_account_id}/ai/models/search"
|
||||||
|
resp = await client.get(url, headers={"Authorization": f"Bearer {settings.cloudflare_api_token}"})
|
||||||
|
if resp.status_code == 200:
|
||||||
|
for item in resp.json().get("result", []):
|
||||||
|
try:
|
||||||
|
m_id = item.get("name")
|
||||||
|
desc = item.get("description", "Modèle Cloudflare Workers AI.")[:200] + "..."
|
||||||
|
process_model(db, "cloudflare", m_id, m_id.split("/")[-1], desc, determine_domain(m_id), True, 4096, 0.0, 0.0)
|
||||||
|
added += 1
|
||||||
|
except: pass
|
||||||
|
except Exception: pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
settings.last_sync_date = datetime.now(timezone.utc)
|
||||||
|
settings.last_sync_type = sync_type
|
||||||
|
db.commit()
|
||||||
|
except Exception as e:
|
||||||
|
db.rollback()
|
||||||
|
print(f"Erreur DB Commit Sync: {e}")
|
||||||
|
|
||||||
await sync_finances(db, settings)
|
await sync_finances(db, settings)
|
||||||
return {"status": "success", "models_processed": added}
|
return {"status": "success", "models_processed": added}
|
||||||
|
|
||||||
def process_model(db, provider, mod_id, name, desc, domain, is_free, ctx, pp, pc):
|
def process_model(db, provider, mod_id, name, desc, domain, is_free, ctx, pp, pc):
|
||||||
existing = db.query(AIModel).filter(AIModel.model_id == mod_id).first()
|
try:
|
||||||
if existing:
|
existing = db.query(AIModel).filter(AIModel.model_id == mod_id).first()
|
||||||
existing.pricing_prompt = pp; existing.pricing_completion = pc; existing.is_free = is_free; existing.last_updated = datetime.now(timezone.utc)
|
if existing:
|
||||||
else:
|
existing.pricing_prompt = pp; existing.pricing_completion = pc; existing.is_free = is_free; existing.last_updated = datetime.now(timezone.utc)
|
||||||
db.add(AIModel(provider=provider, model_id=mod_id, name=name, description_fr=desc, domain=domain, is_free=is_free, context_length=ctx, pricing_prompt=pp, pricing_completion=pc))
|
else:
|
||||||
|
db.add(AIModel(provider=provider, model_id=mod_id, name=name, description_fr=desc, domain=domain, is_free=is_free, context_length=ctx, pricing_prompt=pp, pricing_completion=pc))
|
||||||
|
except Exception: pass
|
||||||
|
|
||||||
def get_client_for_model(model_id: str, settings: SystemSettings):
|
def get_client_for_model(db: Session, model_id: str, settings: SystemSettings):
|
||||||
if "gemini" in model_id.lower() and settings.gemini_api_key: return AsyncOpenAI(base_url="https://generativelanguage.googleapis.com/v1beta/openai/", api_key=settings.gemini_api_key)
|
"""Récupère dynamiquement le bon client OpenAI en fonction du fournisseur du modèle."""
|
||||||
elif "groq" in model_id.lower() or "llama" in model_id.lower(): return AsyncOpenAI(base_url="https://api.groq.com/openai/v1", api_key=settings.groq_api_key)
|
model_db = db.query(AIModel).filter(AIModel.model_id == model_id).first()
|
||||||
return AsyncOpenAI(base_url="https://openrouter.ai/api/v1", api_key=settings.openrouter_api_key)
|
provider = model_db.provider if model_db else "openrouter"
|
||||||
|
|
||||||
async def ask_agent(client, model_id, messages, is_openrouter=False):
|
if provider == "gemini" and settings.gemini_api_key:
|
||||||
|
return AsyncOpenAI(base_url="https://generativelanguage.googleapis.com/v1beta/openai/", api_key=settings.gemini_api_key), "gemini"
|
||||||
|
elif provider == "groq" and settings.groq_api_key:
|
||||||
|
return AsyncOpenAI(base_url="https://api.groq.com/openai/v1", api_key=settings.groq_api_key), "groq"
|
||||||
|
elif provider == "deepseek" and settings.deepseek_api_key:
|
||||||
|
return AsyncOpenAI(base_url="https://api.deepseek.com/v1", api_key=settings.deepseek_api_key), "deepseek"
|
||||||
|
elif provider == "mistral" and settings.mistral_api_key:
|
||||||
|
return AsyncOpenAI(base_url="https://api.mistral.ai/v1", api_key=settings.mistral_api_key), "mistral"
|
||||||
|
elif provider == "cloudflare" and settings.cloudflare_account_id and settings.cloudflare_api_token:
|
||||||
|
return AsyncOpenAI(base_url=f"https://api.cloudflare.com/client/v4/accounts/{settings.cloudflare_account_id}/ai/v1", api_key=settings.cloudflare_api_token), "cloudflare"
|
||||||
|
|
||||||
|
return AsyncOpenAI(base_url="https://openrouter.ai/api/v1", api_key=settings.openrouter_api_key), "openrouter"
|
||||||
|
|
||||||
|
async def ask_agent(client, model_id, messages, provider="openrouter"):
|
||||||
kwargs = {"model": model_id, "messages": messages}
|
kwargs = {"model": model_id, "messages": messages}
|
||||||
if is_openrouter: kwargs["extra_headers"] = {"HTTP-Referer": "https://aethas38.duckdns.org", "X-Title": "AETHAS38 Orchestrator"}
|
if provider == "openrouter":
|
||||||
|
kwargs["extra_headers"] = {"HTTP-Referer": "https://aethas38.duckdns.org", "X-Title": "AETHAS38 Orchestrator"}
|
||||||
resp = await client.chat.completions.create(**kwargs)
|
resp = await client.chat.completions.create(**kwargs)
|
||||||
return resp.choices[0].message.content
|
return resp.choices[0].message.content
|
||||||
|
|
||||||
@@ -114,20 +207,29 @@ async def run_orchestrator(db: Session, history: list, settings: SystemSettings,
|
|||||||
formatted_history = [{"role": msg.role, "content": msg.content} for msg in history[:-1]]
|
formatted_history = [{"role": msg.role, "content": msg.content} for msg in history[:-1]]
|
||||||
|
|
||||||
final_response = ""
|
final_response = ""
|
||||||
if len(workers) == 1:
|
try:
|
||||||
w_mod = workers[0]
|
if len(workers) == 1:
|
||||||
final_response = await ask_agent(get_client_for_model(w_mod, settings), w_mod, formatted_history + [{"role": "user", "content": user_prompt}], "openrouter" in w_mod.lower())
|
w_mod = workers[0]
|
||||||
else:
|
client, provider = get_client_for_model(db, w_mod, settings)
|
||||||
p_mod = config.get("prompter", "gemini-3.5-flash-lite")
|
final_response = await ask_agent(client, w_mod, formatted_history + [{"role": "user", "content": user_prompt}], provider)
|
||||||
optimized = await ask_agent(get_client_for_model(p_mod, settings), p_mod, [{"role": "system", "content": "Optimise cette requête."}, {"role": "user", "content": user_prompt}])
|
else:
|
||||||
|
p_mod = config.get("prompter", "gemini-3.5-flash-lite")
|
||||||
|
p_client, p_prov = get_client_for_model(db, p_mod, settings)
|
||||||
|
optimized = await ask_agent(p_client, p_mod, [{"role": "system", "content": "Optimise cette requête."}, {"role": "user", "content": user_prompt}], p_prov)
|
||||||
|
|
||||||
w_tasks = [ask_agent(get_client_for_model(w, settings), w, formatted_history + [{"role": "user", "content": optimized}], "openrouter" in w.lower()) for w in workers]
|
w_tasks = []
|
||||||
responses = await asyncio.gather(*w_tasks, return_exceptions=True)
|
for w in workers:
|
||||||
|
w_client, w_prov = get_client_for_model(db, w, settings)
|
||||||
|
w_tasks.append(ask_agent(w_client, w, formatted_history + [{"role": "user", "content": optimized}], w_prov))
|
||||||
|
|
||||||
|
responses = await asyncio.gather(*w_tasks, return_exceptions=True)
|
||||||
|
|
||||||
c_mod = config.get("concatenator", "gemini-3.5-flash-lite")
|
c_mod = config.get("concatenator", "gemini-3.5-flash-lite")
|
||||||
synth = f"Requête: {user_prompt}\n\n" + "\n".join([f"--- EXPERT {i+1} ---\n{r}" for i, r in enumerate(responses)]) + "\n\nFais une synthèse finale."
|
c_client, c_prov = get_client_for_model(db, c_mod, settings)
|
||||||
final_response = await ask_agent(get_client_for_model(c_mod, settings), c_mod, [{"role": "user", "content": synth}])
|
synth = f"Requête: {user_prompt}\n\n" + "\n".join([f"--- EXPERT {i+1} ---\n{r}" for i, r in enumerate(responses)]) + "\n\nFais une synthèse finale."
|
||||||
|
final_response = await ask_agent(c_client, c_mod, [{"role": "user", "content": synth}], c_prov)
|
||||||
|
except Exception as e:
|
||||||
|
final_response = f"L'IA a rencontré une erreur critique: {str(e)}"
|
||||||
|
|
||||||
# MAJ Financière après requête
|
|
||||||
await sync_finances(db, settings)
|
await sync_finances(db, settings)
|
||||||
return final_response
|
return final_response
|
||||||
Reference in new issue
Block a user