feat(treblo): titre obligatoire, nom fichier nettoye, paroles html, script envoi (ticket nyora-2026-10-216-d)
This commit is contained in:
1 parent
a4cbda385c
commit
a325cf221d
5 files changed
+689
-44
No files matched your search
@@ -1,5 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
import re
|
||||
import json
|
||||
import hmac
|
||||
import uuid
|
||||
@@ -55,6 +56,140 @@ def get_envois_path() -> str:
|
||||
return local
|
||||
return path
|
||||
|
||||
def get_titres_path() -> str:
|
||||
path = "/app/data/titres.json"
|
||||
if not os.path.exists(os.path.dirname(path)):
|
||||
local = os.path.join(os.path.dirname(os.path.abspath(__file__)), "data", "titres.json")
|
||||
os.makedirs(os.path.dirname(local), exist_ok=True)
|
||||
return local
|
||||
return path
|
||||
|
||||
def load_titres() -> Dict[str, str]:
|
||||
path = get_titres_path()
|
||||
if os.path.exists(path):
|
||||
try:
|
||||
with open(path, "r", encoding="utf-8") as f:
|
||||
return json.load(f)
|
||||
except Exception:
|
||||
return {}
|
||||
return {}
|
||||
|
||||
def save_titre(task_id: str, titre: str):
|
||||
path = get_titres_path()
|
||||
titres = load_titres()
|
||||
titres[task_id] = titre
|
||||
with open(path, "w", encoding="utf-8") as f:
|
||||
json.dump(titres, f, indent=2, ensure_ascii=False)
|
||||
|
||||
def get_titre_for_task(task_id: str, default: Optional[str] = None) -> str:
|
||||
titres = load_titres()
|
||||
if task_id in titres and titres[task_id]:
|
||||
return titres[task_id]
|
||||
entry = get_journal_entry(task_id)
|
||||
if entry and entry.get("titre"):
|
||||
return entry.get("titre")
|
||||
for sp in ("nyora", "perso"):
|
||||
m_path = os.path.join(get_musique_dir(sp), f"{task_id}.json")
|
||||
if os.path.exists(m_path):
|
||||
try:
|
||||
with open(m_path, "r", encoding="utf-8") as f:
|
||||
meta = json.load(f)
|
||||
if meta.get("titre"):
|
||||
return meta.get("titre")
|
||||
except Exception:
|
||||
pass
|
||||
return default or task_id
|
||||
|
||||
def validate_titre(titre: str) -> str:
|
||||
if not titre or not isinstance(titre, str):
|
||||
raise ValueError("Refus : le paramètre titre est obligatoire")
|
||||
t = titre.strip()
|
||||
if len(t) < 1 or len(t) > 60:
|
||||
raise ValueError(f"Refus : le titre doit comporter entre 1 et 60 caractères (reçu: {len(t)})")
|
||||
if re.search(r'\bcomme\s+\S+', t, re.IGNORECASE) or re.search(r'\blike\s+\S+', t, re.IGNORECASE):
|
||||
raise ValueError("Refus : le titre ne doit contenir ni formule 'comme X' ni référence directe d'artiste")
|
||||
return t
|
||||
|
||||
def nettoyer_titre_fichier(titre: str) -> str:
|
||||
res = []
|
||||
for c in str(titre or ""):
|
||||
if c in '/\\:*?"<>|' or ord(c) < 32 or ord(c) == 127:
|
||||
res.append('-')
|
||||
else:
|
||||
res.append(c)
|
||||
s = "".join(res)
|
||||
s = re.sub(r'\s+', ' ', s).strip()
|
||||
if len(s) > 80:
|
||||
s = s[:80].rstrip()
|
||||
return s
|
||||
|
||||
def titre_vers_nom_fichier(titre: str) -> str:
|
||||
cleaned = nettoyer_titre_fichier(titre)
|
||||
return f"{cleaned}.mp3"
|
||||
|
||||
def echapper_html(text: str) -> str:
|
||||
if not text:
|
||||
return ""
|
||||
return str(text).replace("&", "&").replace("<", "<").replace(">", ">")
|
||||
|
||||
def preparer_messages_paroles(titre: str, tags: Any, paroles: Optional[str]) -> List[str]:
|
||||
t_esc = echapper_html(titre)
|
||||
tags_str = ", ".join(str(t).strip() for t in tags) if isinstance(tags, list) else str(tags or "").strip()
|
||||
tags_esc = echapper_html(tags_str)
|
||||
|
||||
has_paroles = bool(paroles and str(paroles).strip())
|
||||
if not has_paroles:
|
||||
return [f"<b>🎵 {t_esc}</b>\n<i>{tags_esc}</i>\n\nInstrumental"]
|
||||
|
||||
raw_strophes = [s.strip() for s in re.split(r'\n\s*\n', str(paroles).strip()) if s.strip()]
|
||||
escaped_strophes = [echapper_html(s) for s in raw_strophes]
|
||||
|
||||
prefix = f"<b>🎵 {t_esc}</b>\n<i>{tags_esc}</i>\n---\n"
|
||||
tag_open = "<blockquote>"
|
||||
tag_close = "</blockquote>"
|
||||
|
||||
messages: List[str] = []
|
||||
current_strophes: List[str] = []
|
||||
|
||||
for s in escaped_strophes:
|
||||
candidate_strophes = current_strophes + [s]
|
||||
candidate_body = "\n\n".join(candidate_strophes)
|
||||
current_prefix = prefix if len(messages) == 0 else ""
|
||||
candidate_msg = f"{current_prefix}{tag_open}{candidate_body}{tag_close}"
|
||||
|
||||
if len(candidate_msg) <= 4096:
|
||||
current_strophes.append(s)
|
||||
else:
|
||||
if current_strophes:
|
||||
body = "\n\n".join(current_strophes)
|
||||
messages.append(f"{current_prefix}{tag_open}{body}{tag_close}")
|
||||
current_strophes = [s]
|
||||
else:
|
||||
lines = s.split("\n")
|
||||
chunk_lines = []
|
||||
for line in lines:
|
||||
cand = "\n".join(chunk_lines + [line])
|
||||
cand_msg = f"{current_prefix}{tag_open}{cand}{tag_close}"
|
||||
if len(cand_msg) <= 4096:
|
||||
chunk_lines.append(line)
|
||||
else:
|
||||
if chunk_lines:
|
||||
messages.append(f"{current_prefix}{tag_open}{'\n'.join(chunk_lines)}{tag_close}")
|
||||
current_prefix = ""
|
||||
chunk_lines = [line]
|
||||
else:
|
||||
messages.append(f"{current_prefix}{tag_open}{line[:4000]}{tag_close}")
|
||||
current_prefix = ""
|
||||
if chunk_lines:
|
||||
current_strophes = ["\n".join(chunk_lines)]
|
||||
|
||||
if current_strophes:
|
||||
current_prefix = prefix if len(messages) == 0 else ""
|
||||
body = "\n\n".join(current_strophes)
|
||||
messages.append(f"{current_prefix}{tag_open}{body}{tag_close}")
|
||||
|
||||
return messages
|
||||
|
||||
def get_musique_dir(sphere: str) -> str:
|
||||
path = f"/app/musique/{sphere}"
|
||||
if not os.path.exists("/app/musique"):
|
||||
@@ -172,13 +307,16 @@ def get_journal_entry(task_id: str) -> Optional[Dict[str, Any]]:
|
||||
pass
|
||||
return None
|
||||
|
||||
def log_envoi(task_id: str, sphere: str, message_id: int):
|
||||
def log_envoi(task_id: str, sphere: str, message_id: int, titre: str = "", nom_fichier: str = "", texte_message_id: int = 0):
|
||||
path = get_envois_path()
|
||||
entry = {
|
||||
"type": "apercu_mp3",
|
||||
"task_id": task_id,
|
||||
"sphere": sphere,
|
||||
"titre": titre,
|
||||
"nom_fichier": nom_fichier,
|
||||
"message_id": int(message_id),
|
||||
"texte_message_id": int(texte_message_id),
|
||||
"date": datetime.datetime.now(datetime.timezone.utc).isoformat()
|
||||
}
|
||||
with open(path, "a", encoding="utf-8") as f:
|
||||
@@ -196,18 +334,22 @@ def consume_approved_validation(sphere: str, empreinte: str, val_id: Optional[st
|
||||
consumed = False
|
||||
for item in data.get("validations", []):
|
||||
if item.get("sphere") == sphere and item.get("status") == "APPROVED":
|
||||
match = (val_id and item.get("id") == val_id) or (not val_id and item.get("empreinte") == empreinte)
|
||||
if match:
|
||||
exp = datetime.datetime.fromisoformat(item.get("expires_at"))
|
||||
if exp > now_dt:
|
||||
item["status"] = "USED"
|
||||
item["used_at"] = now_dt.isoformat()
|
||||
consumed = True
|
||||
updated = True
|
||||
break
|
||||
else:
|
||||
item["status"] = "EXPIRED"
|
||||
updated = True
|
||||
# L'approbation n'est consommée que si la sphère ET l'empreinte correspondent,
|
||||
# avec ou sans validation_id
|
||||
if item.get("empreinte") != empreinte:
|
||||
continue
|
||||
if val_id and item.get("id") != val_id:
|
||||
continue
|
||||
exp = datetime.datetime.fromisoformat(item.get("expires_at"))
|
||||
if exp > now_dt:
|
||||
item["status"] = "USED"
|
||||
item["used_at"] = now_dt.isoformat()
|
||||
consumed = True
|
||||
updated = True
|
||||
break
|
||||
else:
|
||||
item["status"] = "EXPIRED"
|
||||
updated = True
|
||||
if updated:
|
||||
with open(v_path, "w", encoding="utf-8") as fw:
|
||||
json.dump(data, fw, indent=2, ensure_ascii=False)
|
||||
@@ -226,11 +368,13 @@ def is_validation_approved(sphere: str, empreinte: str, val_id: Optional[str] =
|
||||
now_dt = datetime.datetime.now(TUNIS_TZ)
|
||||
for item in data.get("validations", []):
|
||||
if item.get("sphere") == sphere and item.get("status") == "APPROVED":
|
||||
match = (val_id and item.get("id") == val_id) or (not val_id and item.get("empreinte") == empreinte)
|
||||
if match:
|
||||
exp = datetime.datetime.fromisoformat(item.get("expires_at"))
|
||||
if exp > now_dt:
|
||||
return True
|
||||
if item.get("empreinte") != empreinte:
|
||||
continue
|
||||
if val_id and item.get("id") != val_id:
|
||||
continue
|
||||
exp = datetime.datetime.fromisoformat(item.get("expires_at"))
|
||||
if exp > now_dt:
|
||||
return True
|
||||
except Exception:
|
||||
pass
|
||||
return False
|
||||
@@ -296,40 +440,103 @@ def send_telegram_validation_request(sphere: str, val_id: str, code: str, tags:
|
||||
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) -> Optional[int]:
|
||||
def send_telegram_preview_mp3(
|
||||
sphere: str,
|
||||
mp3_path: str,
|
||||
task_id: str,
|
||||
titre: Optional[str] = None,
|
||||
tags: Optional[Any] = None,
|
||||
paroles: Optional[str] = None
|
||||
) -> Optional[Dict[str, int]]:
|
||||
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):
|
||||
logger.warning("send_telegram_preview_mp3: bot_token, chat_id absent ou mp3_path introuvable (%s)", mp3_path)
|
||||
return None
|
||||
|
||||
if not titre:
|
||||
titre = get_titre_for_task(task_id)
|
||||
|
||||
if tags is None or paroles is None:
|
||||
meta_path = os.path.join(os.path.dirname(mp3_path), f"{task_id}.json")
|
||||
if os.path.exists(meta_path):
|
||||
try:
|
||||
with open(meta_path, "r", encoding="utf-8") as f:
|
||||
meta = json.load(f)
|
||||
if tags is None:
|
||||
tags = meta.get("tags", [])
|
||||
if paroles is None:
|
||||
paroles = meta.get("paroles", "")
|
||||
except Exception:
|
||||
pass
|
||||
if tags is None or paroles is None:
|
||||
entry = get_journal_entry(task_id)
|
||||
if entry:
|
||||
if tags is None:
|
||||
tags = entry.get("tags", [])
|
||||
if paroles is None:
|
||||
paroles = entry.get("paroles", "")
|
||||
|
||||
nom_fichier = titre_vers_nom_fichier(titre)
|
||||
performer = "Nyora" if sphere == "nyora" else "Perso"
|
||||
|
||||
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(),
|
||||
f"--{boundary}\r\nContent-Disposition: form-data; name=\"title\"\r\n\r\n{titre}\r\n".encode(),
|
||||
f"--{boundary}\r\nContent-Disposition: form-data; name=\"performer\"\r\n\r\n{performer}\r\n".encode(),
|
||||
f"--{boundary}\r\nContent-Disposition: form-data; name=\"audio\"; filename=\"{nom_fichier}\"\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}"})
|
||||
url_audio = f"https://api.telegram.org/bot{bot_token}/sendAudio"
|
||||
req_audio = urllib.request.Request(url_audio, data=body, headers={"Content-Type": f"multipart/form-data; boundary={boundary}"})
|
||||
audio_msg_id = None
|
||||
try:
|
||||
with urllib.request.urlopen(req, timeout=60) as resp:
|
||||
with urllib.request.urlopen(req_audio, timeout=60) as resp:
|
||||
data = json.loads(resp.read().decode("utf-8"))
|
||||
if data.get("ok"):
|
||||
msg_id = data.get("result", {}).get("message_id")
|
||||
logger.info("Aperçu MP3 envoyé à Telegram (message_id=%s)", msg_id)
|
||||
if isinstance(msg_id, int):
|
||||
log_envoi(task_id, sphere, msg_id)
|
||||
return msg_id
|
||||
audio_msg_id = data.get("result", {}).get("message_id")
|
||||
logger.info("Aperçu MP3 envoyé à Telegram (message_id=%s, nom_fichier=%s)", audio_msg_id, nom_fichier)
|
||||
except Exception as e:
|
||||
logger.warning("Échec envoi aperçu MP3 Telegram: %s", e)
|
||||
return None
|
||||
logger.warning("Échec envoi audio MP3 Telegram: %s", e)
|
||||
return None
|
||||
|
||||
# Envoi du/des messages de paroles ou instrumental en HTML
|
||||
messages = preparer_messages_paroles(titre, tags, paroles)
|
||||
texte_msg_id = None
|
||||
url_text = f"https://api.telegram.org/bot{bot_token}/sendMessage"
|
||||
|
||||
for idx, msg_text in enumerate(messages):
|
||||
payload = json.dumps({
|
||||
"chat_id": chat_id,
|
||||
"text": msg_text,
|
||||
"parse_mode": "HTML"
|
||||
}).encode("utf-8")
|
||||
req_msg = urllib.request.Request(url_text, data=payload, headers={"Content-Type": "application/json"})
|
||||
try:
|
||||
with urllib.request.urlopen(req_msg, timeout=20) as resp:
|
||||
data = json.loads(resp.read().decode("utf-8"))
|
||||
if data.get("ok"):
|
||||
mid = data.get("result", {}).get("message_id")
|
||||
if idx == 0:
|
||||
texte_msg_id = mid
|
||||
logger.info("Message texte #%d envoyé à Telegram (message_id=%s)", idx + 1, mid)
|
||||
except Exception as e:
|
||||
logger.warning("Échec envoi message texte Telegram #%d: %s", idx + 1, e)
|
||||
|
||||
if isinstance(audio_msg_id, int):
|
||||
first_text_id = int(texte_msg_id) if isinstance(texte_msg_id, int) else 0
|
||||
log_envoi(task_id, sphere, audio_msg_id, titre=titre, nom_fichier=nom_fichier, texte_message_id=first_text_id)
|
||||
|
||||
return {
|
||||
"message_id": audio_msg_id,
|
||||
"texte_message_id": texte_msg_id
|
||||
}
|
||||
|
||||
@mcp.tool()
|
||||
def solde(sphere: str) -> dict:
|
||||
@@ -409,10 +616,18 @@ def valider(val_id: str, code: str) -> dict:
|
||||
}
|
||||
|
||||
@mcp.tool()
|
||||
def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str] = None, prompt: Optional[str] = None, validation_id: Optional[str] = None) -> dict:
|
||||
def generer(
|
||||
sphere: str,
|
||||
titre: 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 tant que la validation humaine n'a pas été confirmée par Telegram."""
|
||||
titre_val = validate_titre(titre)
|
||||
sp = validate_sphere_access(sphere)
|
||||
check_daily_cap(sp)
|
||||
|
||||
@@ -435,8 +650,25 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
|
||||
|
||||
empreinte = compute_empreinte(sp, tag_list, prompt, paroles)
|
||||
|
||||
# Contrôle de la validation humaine obligatoire (usage unique)
|
||||
clean_val_id = str(validation_id).strip().lstrip("#") if validation_id else None
|
||||
if clean_val_id:
|
||||
v_path = get_validations_path()
|
||||
if os.path.exists(v_path):
|
||||
try:
|
||||
with open(v_path, "r", encoding="utf-8") as f:
|
||||
v_data = json.load(f)
|
||||
for item in v_data.get("validations", []):
|
||||
if item.get("id") == clean_val_id and item.get("status") == "APPROVED":
|
||||
if item.get("sphere") != sp or item.get("empreinte") != empreinte:
|
||||
raise ValueError(
|
||||
f"Refus : l'approbation #{clean_val_id} ne correspond pas au contenu demandé "
|
||||
f"(sphère ou empreinte différente). L'approbation reste intacte sans débit."
|
||||
)
|
||||
except ValueError:
|
||||
raise
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if not consume_approved_validation(sp, empreinte, clean_val_id):
|
||||
val_id = uuid.uuid4().hex[:8]
|
||||
code = f"{secrets.randbelow(1000000):06d}"
|
||||
@@ -460,7 +692,7 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
|
||||
empreinte=empreinte,
|
||||
code=code,
|
||||
expires_iso=expires_iso,
|
||||
details={"tags": tag_list or [], "prompt": prompt or "", "paroles": paroles or ""}
|
||||
details={"tags": tag_list or [], "prompt": prompt or "", "paroles": paroles or "", "titre": titre_val}
|
||||
)
|
||||
raise ValueError(
|
||||
f"Refus : validation humaine requise par Telegram (demande non validée ou code non saisi). "
|
||||
@@ -505,9 +737,12 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
|
||||
|
||||
statut_val = resp_data.get("status", "PENDING")
|
||||
|
||||
save_titre(task_id, titre_val)
|
||||
|
||||
entry = {
|
||||
"date": datetime.datetime.now(datetime.timezone.utc).isoformat(),
|
||||
"sphere": sp,
|
||||
"titre": titre_val,
|
||||
"tags": tag_list or [],
|
||||
"prompt": prompt or "",
|
||||
"paroles": paroles or "",
|
||||
@@ -523,6 +758,7 @@ def generer(sphere: str, tags: Optional[List[str]] = None, paroles: Optional[str
|
||||
"task_id": task_id,
|
||||
"statut": statut_val,
|
||||
"sphere": sp,
|
||||
"titre": titre_val,
|
||||
"tags": tag_list or [],
|
||||
"credits_avant": credits_avant,
|
||||
"credits_apres": credits_avant
|
||||
@@ -667,19 +903,21 @@ def recuperer(task_id: str, sphere: str) -> dict:
|
||||
subprocess.run(["ffmpeg", "-y", "-i", path, "-b:a", "192k", mp3_file], capture_output=True, check=True)
|
||||
break
|
||||
|
||||
titre = get_titre_for_task(task_id)
|
||||
entry = get_journal_entry(task_id) or {}
|
||||
meta = {
|
||||
"prompt": entry.get("prompt", data.get("prompt", "")),
|
||||
"tags": entry.get("tags", data.get("tags", [])),
|
||||
"paroles": entry.get("paroles", data.get("lyrics", "")),
|
||||
"titre": entry.get("titre", titre),
|
||||
"date": entry.get("date", datetime.datetime.now(datetime.timezone.utc).isoformat()),
|
||||
"task_id": task_id
|
||||
}
|
||||
json_meta_path = os.path.join(dest_dir, f"{task_id}.json")
|
||||
with open(json_meta_path, "w", encoding="utf-8") as f:
|
||||
json.dump(meta, f, indent=2, ensure_ascii=False)
|
||||
if not os.path.exists(json_meta_path):
|
||||
with open(json_meta_path, "w", encoding="utf-8") as f:
|
||||
json.dump(meta, f, indent=2, ensure_ascii=False)
|
||||
|
||||
# Relecture du solde réel après fin de tâche
|
||||
credits_real = None
|
||||
try:
|
||||
bal = treblo_balance(sp)
|
||||
@@ -689,9 +927,15 @@ def recuperer(task_id: str, sphere: str) -> dict:
|
||||
|
||||
update_journal_task(task_id, "SUCCESS", credits_apres=credits_real)
|
||||
|
||||
# Envoi de l'aperçu MP3 à Telegram et traçage dans envois.jsonl
|
||||
if os.path.exists(mp3_file):
|
||||
send_telegram_preview_mp3(sp, mp3_file, task_id)
|
||||
send_telegram_preview_mp3(
|
||||
sphere=sp,
|
||||
mp3_path=mp3_file,
|
||||
task_id=task_id,
|
||||
titre=titre,
|
||||
tags=meta.get("tags", []),
|
||||
paroles=meta.get("paroles", "")
|
||||
)
|
||||
|
||||
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)]
|
||||
|
||||
Reference in new issue
Block a user