feat(mcp): validation humaine telegram, apercu mp3, journal tunis (nyora-2026-10-216-b)

This commit is contained in:
bolbol committed 2026-11-02 11:21:09 +01:00
1 parent 5f274df47d
commit 1d6c3a157d
6 files changed
+416 -49

No files matched your search

+192 -22
View File
@@ -10,6 +10,7 @@ import subprocess
import urllib.request
import urllib.error
import urllib.parse
from zoneinfo import ZoneInfo
from contextlib import asynccontextmanager
from contextvars import ContextVar
from typing import Any, Dict, List, Optional
@@ -20,7 +21,7 @@ from starlette.middleware.base import BaseHTTPMiddleware
from mcp.server.fastmcp import FastMCP
from mcp.server.streamable_http_manager import StreamableHTTPSessionManager
from cap_check import count_today
from cap_check import count_today, TUNIS_TZ
logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s] %(name)s: %(message)s")
logger = logging.getLogger("treblo-mcp")
@@ -37,6 +38,14 @@ def get_journal_path() -> str:
return local
return path
def get_validations_path() -> str:
path = "/app/data/validations.json"
if not os.path.exists(os.path.dirname(path)):
local = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data", "validations.json")
os.makedirs(os.path.dirname(local), exist_ok=True)
return local
return path
def get_musique_dir(sphere: str) -> str:
path = f"/app/musique/{sphere}"
if not os.path.exists("/app/musique"):
@@ -57,6 +66,13 @@ def get_api_key(sphere: str) -> str:
raise ValueError(f"Clé Treblo non configurée pour la sphère {sphere}")
return k
def get_bot_token(sphere: str) -> str:
if sphere == "nyora":
return os.environ.get("TELEGRAM_BOT_TOKEN_NYORA", "").strip()
elif sphere == "perso":
return os.environ.get("TELEGRAM_BOT_TOKEN_PERSO", "").strip()
return ""
def validate_sphere_access(requested_sphere: str) -> str:
req = requested_sphere.lower().strip()
auth = current_sphere_var.get()
@@ -97,7 +113,7 @@ def append_journal(entry: Dict[str, Any]):
with open(journal_path, "a", encoding="utf-8") as f:
f.write(json.dumps(entry, ensure_ascii=False) + "\n")
def update_journal_status(task_id: str, new_status: str):
def update_journal_task(task_id: str, new_status: str, credits_apres: Optional[int] = None):
journal_path = get_journal_path()
if not os.path.exists(journal_path):
return
@@ -112,6 +128,8 @@ def update_journal_status(task_id: str, new_status: str):
entry = json.loads(line)
if entry.get("task_id") == task_id:
entry["statut"] = new_status
if credits_apres is not None:
entry["credits_apres"] = credits_apres
updated = True
lines.append(json.dumps(entry, ensure_ascii=False))
except Exception:
@@ -138,6 +156,113 @@ def get_journal_entry(task_id: str) -> Optional[Dict[str, Any]]:
pass
return None
def is_validation_approved(sphere: str, empreinte: str, val_id: Optional[str] = None) -> bool:
v_path = get_validations_path()
if not os.path.exists(v_path):
return False
try:
with open(v_path, "r", encoding="utf-8") as f:
data = json.load(f)
now_dt = datetime.datetime.now(TUNIS_TZ)
for item in data.get("validations", []):
if item.get("sphere") == sphere and item.get("status") == "APPROVED":
if val_id and item.get("id") == val_id:
exp = datetime.datetime.fromisoformat(item.get("expires_at"))
if exp > now_dt:
return True
elif item.get("empreinte") == empreinte:
exp = datetime.datetime.fromisoformat(item.get("expires_at"))
if exp > now_dt:
return True
except Exception as e:
logger.warning("Erreur lecture validations.json: %s", e)
return False
def record_pending_validation(sphere: str, val_id: str, empreinte: str, expires_iso: str, details: dict):
v_path = get_validations_path()
data = {"validations": []}
if os.path.exists(v_path):
try:
with open(v_path, "r", encoding="utf-8") as f:
data = json.load(f)
except Exception:
data = {"validations": []}
data.setdefault("validations", []).append({
"id": val_id,
"sphere": sphere,
"empreinte": empreinte,
"status": "PENDING",
"created_at": datetime.datetime.now(TUNIS_TZ).isoformat(),
"expires_at": expires_iso,
"details": details
})
data["validations"] = data["validations"][-50:]
with open(v_path, "w", encoding="utf-8") as f:
json.dump(data, f, indent=2, ensure_ascii=False)
def send_telegram_validation_request(sphere: str, val_id: str, tags: list, prompt: str, paroles: str, expires_str: str):
bot_token = get_bot_token(sphere)
chat_id = os.environ.get("TELEGRAM_CHAT_ID", "2084513684").strip()
if not bot_token or not chat_id:
logger.warning("Telegram bot non configuré pour la sphère %s", sphere)
return
tags_str = ", ".join(tags) if tags else "aucun"
prompt_str = (prompt[:120] + "...") if prompt and len(prompt) > 120 else (prompt or "aucun")
paroles_str = (paroles[:120] + "...") if paroles and len(paroles) > 120 else (paroles or "aucune")
text = (
f"🎵 Demande de génération musicale Treblo (validation requise)\n"
f"• Sphère : {sphere}\n"
f"• Tags : {tags_str}\n"
f"• Prompt : {prompt_str}\n"
f"• Paroles : {paroles_str}\n"
f"• Réf : #{val_id}\n\n"
f"Répondre OUI pour valider ou NON pour refuser (expiration : {expires_str})"
)
url = f"https://api.telegram.org/bot{bot_token}/sendMessage"
payload = json.dumps({"chat_id": chat_id, "text": text}).encode("utf-8")
req = urllib.request.Request(url, data=payload, headers={"Content-Type": "application/json"})
try:
with urllib.request.urlopen(req, timeout=10) as resp:
data = json.loads(resp.read().decode("utf-8"))
if data.get("ok"):
logger.info("Notification Telegram envoyée avec succès (message_id=%s)", data.get("result", {}).get("message_id"))
except Exception as e:
logger.warning("Échec envoi notification Telegram: %s", e)
def send_telegram_preview_mp3(sphere: str, mp3_path: str, task_id: str):
bot_token = get_bot_token(sphere)
chat_id = os.environ.get("TELEGRAM_CHAT_ID", "2084513684").strip()
if not bot_token or not chat_id or not os.path.exists(mp3_path):
return
boundary = f"----TrebloBoundary{uuid.uuid4().hex}"
with open(mp3_path, "rb") as f:
audio_bytes = f.read()
fname = os.path.basename(mp3_path)
caption = f"Aperçu Treblo ({sphere}) - {task_id}"
parts = [
f"--{boundary}\r\nContent-Disposition: form-data; name=\"chat_id\"\r\n\r\n{chat_id}\r\n".encode(),
f"--{boundary}\r\nContent-Disposition: form-data; name=\"caption\"\r\n\r\n{caption}\r\n".encode(),
f"--{boundary}\r\nContent-Disposition: form-data; name=\"audio\"; filename=\"{fname}\"\r\nContent-Type: audio/mpeg\r\n\r\n".encode(),
audio_bytes,
f"\r\n--{boundary}--\r\n".encode()
]
body = b"".join(parts)
url = f"https://api.telegram.org/bot{bot_token}/sendAudio"
req = urllib.request.Request(url, data=body, headers={"Content-Type": f"multipart/form-data; boundary={boundary}"})
try:
with urllib.request.urlopen(req, timeout=60) as resp:
data = json.loads(resp.read().decode("utf-8"))
if data.get("ok"):
logger.info("Aperçu MP3 envoyé à Telegram (message_id=%s)", data.get("result", {}).get("message_id"))
except Exception as e:
logger.warning("Échec envoi aperçu MP3 Telegram: %s", e)
@mcp.tool()
def solde(sphere: str) -> dict:
"""Consulte le solde de crédits Treblo pour la sphère indiquée (nyora ou perso)."""
@@ -145,10 +270,10 @@ def solde(sphere: str) -> dict:
return treblo_balance(sp)
@mcp.tool()
def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str] = None, prompt: Optional[str] = None) -> dict:
def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str] = None, prompt: Optional[str] = None, validation_id: Optional[str] = None) -> dict:
"""Lance une génération musicale auprès de Treblo.
Refuse si tags + paroles + prompt sont fournis ensemble, ou si plus de 64 tags,
ou si le plafond journalier est atteint."""
ou si le plafond journalier est atteint, ou tant que la validation humaine n'a pas été confirmée par Telegram."""
sp = validate_sphere_access(sphere)
check_daily_cap(sp)
@@ -169,6 +294,38 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
if not has_tags and not has_prompt:
raise ValueError("Refus : un prompt ou des étiquettes (tags) doivent être fournis")
txt = str(prompt) if has_prompt else (str(paroles) if has_paroles else "")
empreinte = hashlib.sha256(txt.encode("utf-8")).hexdigest()
# Contrôle de la validation humaine obligatoire (T2)
if not is_validation_approved(sp, empreinte, validation_id):
val_id = uuid.uuid4().hex[:8]
now_tunis = datetime.datetime.now(TUNIS_TZ)
exp_dt = now_tunis + datetime.timedelta(minutes=15)
expires_iso = exp_dt.isoformat()
expires_str = exp_dt.strftime("%H:%M:%S")
send_telegram_validation_request(
sphere=sp,
val_id=val_id,
tags=tag_list or [],
prompt=prompt or "",
paroles=paroles or "",
expires_str=expires_str
)
record_pending_validation(
sphere=sp,
val_id=val_id,
empreinte=empreinte,
expires_iso=expires_iso,
details={"tags": tag_list or [], "prompt": prompt or "", "paroles": paroles or ""}
)
raise ValueError(
f"Refus : validation humaine requise par Telegram (demande non validée ou étiquette invalide). "
f"Une demande d'approbation #{val_id} a été envoyée à Nabil sur Telegram pour la sphère {sp} (expiration à {expires_str}). "
f"Tant que Nabil n'a pas validé, la génération est refusée sans débit."
)
bal_avant = treblo_balance(sp)
credits_avant = bal_avant["total"]
@@ -206,12 +363,6 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
statut_val = resp_data.get("status", "PENDING")
bal_apres = treblo_balance(sp)
credits_apres = bal_apres["total"]
txt = str(prompt) if has_prompt else (str(paroles) if has_paroles else "")
empreinte = hashlib.sha256(txt.encode("utf-8")).hexdigest()
entry = {
"date": datetime.datetime.now(datetime.timezone.utc).isoformat(),
"sphere": sp,
@@ -222,7 +373,7 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
"task_id": task_id,
"statut": statut_val,
"credits_avant": credits_avant,
"credits_apres": credits_apres
"credits_apres": credits_avant
}
append_journal(entry)
@@ -232,7 +383,7 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
"sphere": sp,
"tags": tag_list or [],
"credits_avant": credits_avant,
"credits_apres": credits_apres
"credits_apres": credits_avant
}
@mcp.tool()
@@ -263,9 +414,14 @@ def statut(task_id: str) -> dict:
res = {"status": st, "task_id": task_id}
if st == "SUCCESS":
update_journal_status(task_id, "SUCCESS")
try:
bal = treblo_balance(auth_sp)
update_journal_task(task_id, "SUCCESS", credits_apres=bal["total"])
except Exception as e:
logger.warning("Échec actualisation solde dans statut: %s", e)
update_journal_task(task_id, "SUCCESS")
elif st == "FAILURE":
update_journal_status(task_id, "FAILURE")
update_journal_task(task_id, "FAILURE")
return res
@@ -329,19 +485,21 @@ def recuperer(task_id: str, sphere: str) -> dict:
return "mp3"
if "wav" in ct:
return "wav"
if "ogg" in ct:
return "ogg"
return "flac"
return "bin"
downloaded = {}
for u in urls:
for idx, u in enumerate(urls):
try:
req_dl = urllib.request.Request(u, headers={"User-Agent": "Mozilla/5.0 (treblo-mcp)"})
req_dl = urllib.request.Request(u, headers={"User-Agent": "treblo-mcp/1.0"})
with urllib.request.urlopen(req_dl, timeout=60) as dl_resp:
fmt = detect_format(u, dl_resp.headers)
target_file = os.path.join(dest_dir, f"{task_id}.{fmt}")
with open(target_file, "wb") as f_out:
f_out.write(dl_resp.read())
with open(target_file, "wb") as out_f:
while True:
chunk = dl_resp.read(65536)
if not chunk:
break
out_f.write(chunk)
if os.path.exists(target_file) and os.path.getsize(target_file) > 0:
downloaded[fmt] = target_file
except Exception as e:
@@ -379,7 +537,19 @@ def recuperer(task_id: str, sphere: str) -> dict:
with open(json_meta_path, "w", encoding="utf-8") as f:
json.dump(meta, f, indent=2, ensure_ascii=False)
update_journal_status(task_id, "SUCCESS")
# Relecture du solde réel après fin de tâche (T4)
credits_real = None
try:
bal = treblo_balance(sp)
credits_real = bal["total"]
except Exception as e:
logger.warning("Échec lecture solde post-tâche: %s", e)
update_journal_task(task_id, "SUCCESS", credits_apres=credits_real)
# Envoi de l'aperçu MP3 à Telegram (T3)
if os.path.exists(mp3_file):
send_telegram_preview_mp3(sp, mp3_file, task_id)
archive_target = flac_file if os.path.exists(flac_file) else (wav_file if os.path.exists(wav_file) else None)
files = [f for f in [json_meta_path, mp3_file, archive_target] if f and os.path.exists(f)]