@danhachuel/thunderbolt 0.6.86 → 0.6.88

package/app/main.py

@@ -77,7 +77,7 @@ def display_version(version: str) -> str:
 
 APP_VERSION_LABEL = display_version(APP_VERSION)
 
-from hermes_ui.domain import STAGES, create_batch, create_channel, create_tasks_for_batch, delete_channel, delete_task, pipeline_summary, remake_video_task, retry_task_with_current_settings, set_channel_defaults, stop_task_by_user, transition_task, update_channel, update_channel_video
+from hermes_ui.domain import STAGES, composio_connected_account_id_from_channel_name, create_batch, create_channel, create_tasks_for_batch, delete_channel, delete_task, pipeline_summary, remake_video_task, retry_task_with_current_settings, set_channel_defaults, stop_task_by_user, transition_task, update_channel, update_channel_video
 from hermes_ui.channel_import import build_channel_template_xlsx, channel_is_duplicate, find_duplicate_channel, parse_channel_workbook, resolve_blueprint, resolve_google_account, resolve_voice
 from hermes_ui.drafts import list_drafts, save_draft
 from hermes_ui.automation_worker import load_worker_status
@@ -1399,6 +1399,7 @@ def render_channel_audio_subtitle_defaults(channel: dict) -> None:
 def render_channel_edit_form(channel: dict, youtube_account_ids: list[str], youtube_account_labels: dict[str, str], youtube_accounts_by_id: dict[str, dict[str, Any]]) -> None:
     channel_id = str(channel["id"])
     blueprint_ids, blueprint_labels, current_blueprint, voice_options, current_voice = channel_default_options(channel)
+    current_composio_account_id = str(channel.get("composio_connected_account_id") or composio_connected_account_id_from_channel_name(channel.get("name") or ""))
     account_ids = list(youtube_account_ids)
     current_account = str(channel.get("google_account_id") or "")
     if current_account and current_account not in account_ids:
@@ -1423,6 +1424,7 @@ def render_channel_edit_form(channel: dict, youtube_account_ids: list[str], yout
             edited_blueprint = st.selectbox("Blueprint Padrão", blueprint_ids, index=blueprint_ids.index(current_blueprint) if current_blueprint in blueprint_ids else 0, format_func=lambda item: blueprint_labels.get(item, item or "Sem Blueprint padrão"))
             edited_voice = st.selectbox("Narrador/Voz Padrão", voice_options, index=voice_options.index(current_voice) if current_voice in voice_options else 0, format_func=lambda item: item or "Sem voz padrão")
             edited_account = st.selectbox("Conta Google para Upload directo", account_ids, index=account_ids.index(current_account) if current_account in account_ids else 0, format_func=lambda item: youtube_account_labels.get(item, item or "Sem conta Google associada"))
+            edited_composio_account_id = st.text_input("Connected account ID do Composio", value=current_composio_account_id, help="Gerado automaticamente a partir do nome do canal no formato Nome-Do-Canal. Pode editar este valor para coincidir com o alias ligado no Composio.")
             edited_description = st.text_area("Descrição", value=str(channel.get("description") or ""), height=100)
             edited_automation = st.toggle("Automação ON", value=bool(channel.get("automation_on", False)), key=f"edit_automation_{channel_id}")
             edited_time = st.text_input("Horário diário (HH:MM)", value=str(channel.get("automation_time") or "00:00"))
@@ -1444,6 +1446,7 @@ def render_channel_edit_form(channel: dict, youtube_account_ids: list[str], yout
                 "default_blueprint_id": edited_blueprint.strip(), "blueprint_id": edited_blueprint.strip(),
                 "default_voice": edited_voice.strip(), "voice": edited_voice.strip(),
                 "google_account_id": edited_account.strip(), "google_account_email": str(youtube_accounts_by_id.get(edited_account, {}).get("email", "")),
+                "composio_connected_account_id": edited_composio_account_id.strip() or composio_connected_account_id_from_channel_name(edited_name),
                 "description": edited_description.strip(), "automation_on": bool(edited_automation), "automation_time": edited_time.strip(),
                 "subscriber_count": _channel_count_value(edited_subscribers) or None, "video_count": _channel_count_value(edited_videos) or None, "view_count": _channel_count_value(edited_views) or None,
             })
@@ -6363,6 +6366,7 @@ def render_upload_composio():
     settings = read_json("settings.json", {})
     api_key = str(settings.get("composio_api_key") or "").strip()
     user_id = str(settings.get("composio_user_id") or "").strip()
+    connected_account_id = str(settings.get("composio_connected_account_id") or "").strip()
     if not settings.get("composio_enabled", False) or not api_key:
         st.warning("Composio está desactivado ou sem API key. Configure-o em Configuração API > API Keys Upload > Composio.")
         return
@@ -6414,7 +6418,7 @@ def render_upload_composio():
     if st.button("Enviar vídeo via Composio", type="primary", key=f"composio_upload_send_{selected_task_id}", use_container_width=True):
         try:
             parse_arguments(arguments_json)
-            result = execute_upload(api_key, user_id, selected_slug, video_path, file_field, arguments_json)
+            result = execute_upload(api_key, user_id, selected_slug, video_path, file_field, arguments_json, connected_account_id)
             record = {"id": uuid.uuid4().hex, "task_id": task.get("id"), "destination": "Composio", "target": {"toolkit": selected_tool.get("toolkit"), "slug": selected_slug, "file_field": file_field}, "status": "published" if result.get("successful") else "failed", "message": result.get("error") or "Upload Composio concluído.", "data": result.get("data") or {}, "log_id": result.get("log_id") or "", "created_at": now()}
             uploads = read_json("uploads.json", [])
             uploads.append(record)

package/hermes_ui/domain.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import re
+import unicodedata
 import uuid
 from typing import Any
 
@@ -21,6 +22,13 @@ def slugify(value: str) -> str:
     return value or "item"
 
 
+def composio_connected_account_id_from_channel_name(name: str) -> str:
+    """Create the editable Composio account alias used by a YouTube channel."""
+    normalized = unicodedata.normalize("NFKD", str(name or "")).encode("ascii", "ignore").decode("ascii")
+    words = re.findall(r"[A-Za-z0-9]+", normalized)
+    return "-".join(word[:1].upper() + word[1:] for word in words)
+
+
 def make_id(prefix: str) -> str:
     return f"{prefix}_{uuid.uuid4().hex[:10]}"
 
@@ -31,6 +39,7 @@ def create_channel(name: str, url: str = "", metadata: dict[str, Any] | None = N
         "youtube_channel_id": "",
         "google_account_id": "",
         "google_account_email": "",
+        "composio_connected_account_id": composio_connected_account_id_from_channel_name(name),
         "name": name.strip(),
         "url": url.strip(),
         "platform": "youtube",

package/integrations/composio_upload.py

@@ -112,28 +112,34 @@ def _client(api_key: str, *, upload_dir: Path | None = None):
 
 
 def _connected_account_id(client: Any, user_id: str, toolkit: str, selector: str) -> str:
-    """Resolve a connected-account ID from an ID or UI alias."""
+    """Resolve a connected-account ID from an ID, alias, or sole active account."""
     value = str(selector or "").strip()
-    if not value:
-        return ""
     try:
         response = client.connected_accounts.list(user_ids=[_require_user_id(user_id)], statuses=["ACTIVE"])
         raw = _safe_value(response)
         items = raw.get("items", []) if isinstance(raw, dict) else raw
         if not isinstance(items, list):
             items = []
-        wanted = value.casefold()
+        matching_items = []
         for item in items:
             if not isinstance(item, dict):
                 continue
             toolkit_value = item.get("toolkit")
             if isinstance(toolkit_value, dict):
                 toolkit_value = toolkit_value.get("slug") or toolkit_value.get("name")
-            candidates = [item.get("id"), item.get("nanoid"), item.get("alias"), item.get("name")]
             if str(toolkit or "").strip() and toolkit.casefold() not in str(toolkit_value or "").casefold():
                 continue
-            if any(str(candidate or "").strip().casefold() == wanted for candidate in candidates):
-                return str(item.get("id") or item.get("nanoid") or value).strip()
+            matching_items.append(item)
+        if value:
+            wanted = value.casefold()
+            for item in matching_items:
+                candidates = [item.get("id"), item.get("nanoid"), item.get("alias"), item.get("name")]
+                if any(str(candidate or "").strip().casefold() == wanted for candidate in candidates):
+                    return str(item.get("id") or item.get("nanoid") or value).strip()
+            return value
+        if len(matching_items) == 1:
+            item = matching_items[0]
+            return str(item.get("id") or item.get("nanoid") or "").strip()
     except Exception:
         # Preserve the original selector so Composio returns its actionable error.
         return value
@@ -237,8 +243,12 @@ def execute_upload(api_key: str, user_id: str, slug: str, video_path: str, file_
             "dangerously_skip_version_check": True,
         }
         selected_account = _connected_account_id(client, user_id, "youtube", connected_account_id)
-        if selected_account:
-            execute_kwargs["connected_account_id"] = selected_account
+        if not selected_account:
+            raise ComposioUploadError(
+                f"Nenhuma conta YouTube activa está ligada ao Composio user ID `{_require_user_id(user_id)}`. "
+                "Use `Autorizar toolkit no Composio` ou configure o Connected account ID correcto."
+            )
+        execute_kwargs["connected_account_id"] = selected_account
         result = client.tools.execute(slug, **execute_kwargs)
         response = _response(result)
         if not response["successful"] and not response["error"]:

package/integrations/upload_routing.py

@@ -20,6 +20,7 @@ from integrations.youtube_direct_credentials import document_status
 from integrations.youtube_direct_upload import YouTubeDirectUploader
 from integrations.youtube_session_manager import renew_account_session
 from integrations.composio_upload import ComposioUploadError, execute_upload, resolve_tool_slug
+from hermes_ui.domain import composio_connected_account_id_from_channel_name
 from hermes_ui.storage import read_json, write_json
 from hermes_ui.languages import language_locale
 
@@ -338,7 +339,7 @@ def _composio_upload(settings: dict[str, Any], *, channel: dict[str, Any], **kwa
             str(kwargs.get("video_path") or ""),
             file_field,
             json.dumps(parsed_arguments, ensure_ascii=False),
-            str(settings.get("composio_connected_account_id") or channel.get("composio_connected_account_id") or "").strip(),
+            str(channel.get("composio_connected_account_id") or composio_connected_account_id_from_channel_name(channel.get("name") or "") or settings.get("composio_connected_account_id") or "").strip(),
         )
     except ComposioUploadError as exc:
         return IntegrationResult(False, str(exc), {})

package/package.json

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