@danhachuel/thunderbolt 0.5.95 → 0.5.97

package/app/main.py

@@ -7982,8 +7982,8 @@ def render_settings():
             composio_user_id = st.text_input("Composio user ID", value=str(settings.get("composio_user_id") or "thunderbolt-local"), key="upload_composio_user_id", help="Identidade estável usada para associar as contas conectadas no Composio.")
             composio_toolkit = st.text_input("Toolkit preferido (opcional)", value=str(settings.get("composio_toolkit") or ""), key="upload_composio_toolkit", help="Deixe vazio para descobrir ferramentas em todos os toolkits.")
             composio_tool_slug = st.text_input("Slug da ferramenta para Automação Youtube", value=str(settings.get("composio_tool_slug") or ""), key="upload_composio_tool_slug", help="Depois de descobrir uma ferramenta em Upload via Composio, copie aqui o slug para a Automação Youtube.")
-            composio_file_field = st.text_input("Campo do ficheiro na ferramenta", value=str(settings.get("composio_file_field") or "file"), key="upload_composio_file_field")
-            composio_channel_field = st.text_input("Campo do canal na ferramenta", value=str(settings.get("composio_channel_field") or "channel_id"), key="upload_composio_channel_field", help="O worker substitui este campo pelo YouTube channel ID do canal da tarefa, impedindo o envio para outro canal.")
+            composio_file_field = st.text_input("Campo do ficheiro na ferramenta", value=str(settings.get("composio_file_field") or "videoFilePath"), key="upload_composio_file_field", help="Para YOUTUBE_UPLOAD_VIDEO use videoFilePath; o Composio envia para o canal da conta YouTube ligada.")
+            composio_channel_field = st.text_input("Campo do canal na ferramenta (opcional)", value=str(settings.get("composio_channel_field") or ""), key="upload_composio_channel_field", help="As ferramentas YouTube actuais usam a conta ligada e não aceitam channel_id. Preencha apenas se a ferramenta descoberta exigir explicitamente esse campo.")
             composio_privacy_field = st.text_input("Campo de privacidade", value=str(settings.get("composio_privacy_field") or "privacy_status"), key="upload_composio_privacy_field", help="Recebe sempre `unlisted` (Não listado), como no upload oficial.")
             composio_category_field = st.text_input("Campo de categoria", value=str(settings.get("composio_category_field") or "category_id"), key="upload_composio_category_field", help="Recebe sempre `22`, categoria Pessoas e blogs, como no upload oficial.")
             composio_language_field = st.text_input("Campo de idioma", value=str(settings.get("composio_language_field") or "language"), key="upload_composio_language_field", help="Recebe o locale do idioma do vídeo/canal, por exemplo `pt-BR`.")
@@ -7995,7 +7995,7 @@ def render_settings():
             with composio_action_cols[1]:
                 test_composio = st.button("Testar configuração", use_container_width=True, key="upload_composio_test")
             if save_composio:
-                settings.update({"composio_enabled": bool(composio_enabled), "composio_auto_upload": bool(composio_auto_upload), "composio_api_key": composio_api_key.strip(), "composio_user_id": composio_user_id.strip() or "thunderbolt-local", "composio_toolkit": composio_toolkit.strip(), "composio_tool_slug": composio_tool_slug.strip(), "composio_file_field": composio_file_field.strip() or "file", "composio_channel_field": composio_channel_field.strip() or "channel_id", "composio_privacy_field": composio_privacy_field.strip() or "privacy_status", "composio_category_field": composio_category_field.strip() or "category_id", "composio_language_field": composio_language_field.strip() or "language", "composio_arguments_json": composio_arguments_json.strip() or "{}"})
+                settings.update({"composio_enabled": bool(composio_enabled), "composio_auto_upload": bool(composio_auto_upload), "composio_api_key": composio_api_key.strip(), "composio_user_id": composio_user_id.strip() or "thunderbolt-local", "composio_toolkit": composio_toolkit.strip(), "composio_tool_slug": composio_tool_slug.strip(), "composio_file_field": composio_file_field.strip() or "videoFilePath", "composio_channel_field": composio_channel_field.strip(), "composio_privacy_field": composio_privacy_field.strip() or "privacy_status", "composio_category_field": composio_category_field.strip() or "category_id", "composio_language_field": composio_language_field.strip() or "language", "composio_arguments_json": composio_arguments_json.strip() or "{}"})
                 write_json("settings.json", settings)
                 st.success("Configuração Composio guardada.")
                 st.rerun()

package/hermes_ui/pipeline_worker.py

@@ -1577,7 +1577,17 @@ def _run_task(task: dict[str, Any]) -> dict[str, Any]:
         captions_path=str(artifacts.get("captions") or ""),
     )
     if not result.ok:
-        raise PipelineError(result.message)
+        attempts = (result.data or {}).get("attempts") if isinstance(result.data, dict) else None
+        detail = ""
+        if isinstance(attempts, list):
+            failed = [
+                f"{item.get('route')}: {item.get('message')}"
+                for item in attempts
+                if isinstance(item, dict) and item.get("status") == "failed" and item.get("message")
+            ]
+            if failed:
+                detail = " Detalhes: " + " | ".join(failed[-4:])
+        raise PipelineError(f"{result.message}{detail}")
     artifacts["upload"] = result.data
     return _update(task_id, stage="upload", state="done", progress=100, artifacts=artifacts, error=None)
 

package/hermes_ui/storage.py

@@ -293,8 +293,8 @@ DEFAULTS: dict[str, Any] = {
         "composio_user_id": "thunderbolt-local",
         "composio_toolkit": "",
         "composio_tool_slug": "",
-        "composio_file_field": "file",
-        "composio_channel_field": "channel_id",
+        "composio_file_field": "videoFilePath",
+        "composio_channel_field": "",
         "composio_privacy_field": "privacy_status",
         "composio_category_field": "category_id",
         "composio_language_field": "language",

package/integrations/composio_upload.py

@@ -59,10 +59,17 @@ def _response(result: Any) -> dict[str, Any]:
     raw = _safe_value(result)
     if not isinstance(raw, dict):
         raw = {"data": raw}
-    error = raw.get("error")
+    data = raw.get("data")
+    if not isinstance(data, dict):
+        data = {"value": data} if data is not None else {}
+    error = raw.get("error") or raw.get("message") or data.get("error") or data.get("message")
+    explicit_success = raw.get("successful")
+    if explicit_success is None:
+        explicit_success = raw.get("success")
+    successful = bool(explicit_success) if explicit_success is not None else not bool(error)
     return {
-        "successful": not bool(error),
-        "data": raw.get("data") or {},
+        "successful": successful and not bool(error),
+        "data": data,
         "error": str(error) if error else "",
         "log_id": str(raw.get("log_id") or raw.get("request_id") or ""),
     }
@@ -161,7 +168,11 @@ def execute_upload(api_key: str, user_id: str, slug: str, video_path: str, file_
             version="latest",
             dangerously_skip_version_check=True,
         )
-        return _response(result)
+        response = _response(result)
+        if not response["successful"] and not response["error"]:
+            response["error"] = f"A ferramenta `{slug}` devolveu uma resposta sem sucesso."
+        response["tool_slug"] = slug
+        return response
     except ComposioUploadError:
         raise
     except Exception as exc:

package/integrations/upload_routing.py

@@ -229,12 +229,17 @@ def upload_with_default_route(
 
 
 def _composio_upload(settings: dict[str, Any], *, channel: dict[str, Any], **kwargs: Any) -> IntegrationResult:
+    slug = str(settings.get("composio_tool_slug") or "").strip()
+    youtube_upload_tool = slug.upper() in {"YOUTUBE_UPLOAD_VIDEO", "YOUTUBE_MULTIPART_UPLOAD_VIDEO"}
     channel_id = str(channel.get("youtube_channel_id") or "").strip()
-    if not channel_id:
-        return IntegrationResult(False, "Composio não foi executado: o canal da tarefa não tem um YouTube channel ID sincronizado.", {"missing": ["youtube_channel_id"]})
     channel_field = str(settings.get("composio_channel_field") or "channel_id").strip()
-    if not channel_field:
+    if not youtube_upload_tool and not channel_id:
+        return IntegrationResult(False, "Composio não foi executado: o canal da tarefa não tem um YouTube channel ID sincronizado.", {"missing": ["youtube_channel_id"]})
+    if not youtube_upload_tool and not channel_field:
         return IntegrationResult(False, "Composio não foi executado: configure o campo de canal da ferramenta.", {"missing": ["composio_channel_field"]})
+    file_field = str(settings.get("composio_file_field") or "").strip()
+    if not file_field or (youtube_upload_tool and file_field == "file"):
+        file_field = "videoFilePath"
     try:
         arguments = str(settings.get("composio_arguments_json") or "{}").strip() or "{}"
         import json
@@ -242,7 +247,7 @@ def _composio_upload(settings: dict[str, Any], *, channel: dict[str, Any], **kwa
         if not isinstance(parsed_arguments, dict):
             return IntegrationResult(False, "Composio não foi executado: os argumentos JSON devem ser um objecto.", {})
         locked_values = {
-            channel_field: channel_id,
+            **({channel_field: channel_id} if channel_field and not youtube_upload_tool else {}),
             str(settings.get("composio_privacy_field") or "privacy_status").strip(): str(kwargs.get("privacy_status") or "unlisted"),
             str(settings.get("composio_category_field") or "category_id").strip(): str(kwargs.get("category_id") or "22"),
             str(settings.get("composio_language_field") or "language").strip(): language_locale(kwargs.get("language") or channel.get("language") or "pt"),
@@ -261,7 +266,7 @@ def _composio_upload(settings: dict[str, Any], *, channel: dict[str, Any], **kwa
             str(settings.get("composio_user_id") or ""),
             str(settings.get("composio_tool_slug") or ""),
             str(kwargs.get("video_path") or ""),
-            str(settings.get("composio_file_field") or "file"),
+            file_field,
             json.dumps(parsed_arguments, ensure_ascii=False),
         )
     except ComposioUploadError as exc:
@@ -269,5 +274,5 @@ def _composio_upload(settings: dict[str, Any], *, channel: dict[str, Any], **kwa
     return IntegrationResult(
         bool(result.get("successful")),
         str(result.get("error") or "Upload via Composio concluído."),
-        {"composio_data": result.get("data") or {}, "log_id": result.get("log_id") or ""},
+        {"composio_data": result.get("data") or {}, "log_id": result.get("log_id") or "", "tool_slug": result.get("tool_slug") or slug},
     )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danhachuel/thunderbolt",
-  "version": "0.5.95",
+  "version": "0.5.97",
   "description": "Thunderbolt — interface local para operação de canais faceless e motor MoneyPrinterTurbo",
   "license": "MIT",
   "main": "scripts/cli.mjs",

package/requirements.txt

@@ -6,6 +6,7 @@ pandas>=2.0,<3
 openpyxl>=3.1,<4
 xlrd>=2.0,<3
 imageio-ffmpeg>=0.6,<1
+moviepy==2.2.1
 toml>=0.10,<1
 google-auth>=2.29,<3
 google-auth-oauthlib>=1.2,<2

package/seed/skills/mpt_agent.py

@@ -24,6 +24,7 @@ PROJECT_ARCHIVE_URL = (
     "https://github.com/harry0703/MoneyPrinterTurbo/archive/refs/heads/main.zip"
 )
 DEFAULT_ROOT = Path.home() / "MoneyPrinterTurbo"
+MOVIEPY_REQUIREMENT = "moviepy==2.2.1"
 CHUNKED_SYNTHESIS_TIMEOUT_SECONDS = 15 * 60
 DEPENDENCY_SYNC_TIMEOUT_SECONDS = 15 * 60
 DEFAULT_VOICE_NAME = "zh-CN-XiaoxiaoNeural-Female"
@@ -686,6 +687,22 @@ def run_checked(command: list[str], *, cwd: Path) -> None:
     log("project dependencies verified with uv")
 
 
+def ensure_moviepy(root: Path, uv: str) -> None:
+    """Ensure the render engine matches MoneyPrinterTurbo's MoviePy release."""
+    run_checked(
+        [
+            uv,
+            "run",
+            "--with",
+            MOVIEPY_REQUIREMENT,
+            "python",
+            "-c",
+            "import moviepy; assert moviepy.__version__ == '2.2.1'",
+        ],
+        cwd=root,
+    )
+
+
 def generate_video(
     root: Path,
     subject: str,
@@ -696,6 +713,7 @@ def generate_video(
     if not uv:
         raise SkillError("uv was not found; reopen the terminal or add uv to PATH")
     run_checked([uv, "sync", "--frozen"], cwd=root)
+    ensure_moviepy(root, uv)
     config_path = ensure_config(root)
 
     task_id = str(uuid.uuid4())
@@ -748,6 +766,8 @@ def generate_video(
     command = [
         uv,
         "run",
+        "--with",
+        MOVIEPY_REQUIREMENT,
         "python",
         "cli.py",
         *forwarded_args,