@danhachuel/thunderbolt 0.6.2 → 0.6.4

package/app/main.py

@@ -118,7 +118,7 @@ from integrations.upload_post import UploadPostAdapter, UPLOAD_POST_PLATFORM_OPT
 from integrations.bilibili_upload import BilibiliApiAdapter, BILIBILI_DEFAULT_TID, BILIBILI_VIDEO_EXTENSIONS, normalise_bilibili_api_cards
 from integrations.distrokid_upload import DistroKidAdapter, DISTROKID_AUDIO_EXTENSIONS, DISTROKID_COVER_EXTENSIONS, close_distrokid_session
 from integrations.music_uploads import JewelMusicAdapter, PushtunesAdapter, YTMusicApiAdapter, MUSIC_UPLOAD_EXTENSIONS, PUSHTUNES_OPERATIONS, PUSHTUNES_SOURCES, PUSHTUNES_TARGETS, YT_MUSIC_UPLOAD_EXTENSIONS
-from integrations.upload_routing import OFFICIAL_DAILY_LIMIT, official_upload_count, upload_with_default_route
+from integrations.upload_routing import COMPOSIO_OPERATION_OPTIONS, OFFICIAL_DAILY_LIMIT, official_upload_count, upload_with_default_route
 from integrations.youtube_direct_upload import YouTubeDirectUploader
 from integrations.youtube_direct_credentials import delete_credentials_document, direct_account_status, document_status, ensure_credentials_document, load_credentials_document, merge_credentials_document, parse_credentials_document, save_credentials_document, update_credentials_document_session_info
 from integrations.session_info_health import check_account_session_info_health
@@ -694,6 +694,25 @@ def generate_topic_for_ui(settings: dict[str, Any], channel: dict, user_context:
     return generate_topic_for_channel(settings, channel, blueprint_for_channel(channel), user_context=user_context)
 
 
+def resolve_video_subject_for_generation(
+    settings: dict[str, Any],
+    channel: dict,
+    entered_subject: str,
+    blueprint: dict[str, Any] | None = None,
+) -> tuple[str, dict[str, Any] | None]:
+    """Keep the user's Video Subject or generate one only when the field is empty."""
+    manual_subject = str(entered_subject or "").strip()
+    if manual_subject:
+        return manual_subject, None
+
+    selected_blueprint = blueprint if isinstance(blueprint, dict) else blueprint_for_channel(channel)
+    topic_result = generate_topic_for_channel(settings, channel, selected_blueprint)
+    generated_subject = str(topic_result.get("topic") or "").strip()
+    if not generated_subject:
+        raise CreativeGenerationError("A IA não devolveu um Video Subject válido.")
+    return generated_subject, topic_result
+
+
 def generate_video_content_for_ui(
     settings: dict[str, Any],
     channel: dict,
@@ -703,19 +722,7 @@ def generate_video_content_for_ui(
     blueprint: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
     """Generate the subject, script and English keywords in one MoneyPrinter-style action."""
-    entered_subject = str(subject or "").strip()
-    subject = entered_subject
-    topic_result: dict[str, Any] | None = None
-    if entered_subject:
-        # Um Video Subject escrito pelo utilizador é sempre o tema editorial;
-        # nunca o substituímos por um tópico aleatório gerado pela IA.
-        subject = entered_subject
-    else:
-        selected_blueprint = blueprint if isinstance(blueprint, dict) else blueprint_for_channel(channel)
-        topic_result = generate_topic_for_channel(settings, channel, selected_blueprint)
-        subject = str(topic_result.get("topic") or "").strip()
-    if not subject:
-        raise CreativeGenerationError("A IA não devolveu um Video Subject válido.")
+    subject, topic_result = resolve_video_subject_for_generation(settings, channel, subject, blueprint)
 
     blueprint = blueprint if isinstance(blueprint, dict) else blueprint_for_channel(channel)
     script_result = generate_script_document(
@@ -8021,19 +8028,39 @@ def render_settings():
             _api_status_badge("Configured" if bilibili_ready else "Missing configuration", "ready" if bilibili_ready else "missing")
             render_bilibili_api_cards(settings)
         with st.expander("Composio", expanded=False):
-            st.caption("A API key é guardada apenas no storage local. O slug da ferramenta e o provider são descobertos no Upload via Composio; a autenticação da conta é feita pelo Connect Link do Composio.")
+            composio_operation_options = COMPOSIO_OPERATION_OPTIONS
+            composio_operation_slugs = list(composio_operation_options)
+            st.caption("Os slugs e parâmetros técnicos do Composio são definidos pelo Thunderbolt conforme a operação; a autenticação da conta continua a ser feita pelo Connect Link do Composio.")
             composio_enabled = st.checkbox("Activar Composio", value=bool(settings.get("composio_enabled", False)), key="upload_composio_enabled")
             composio_auto_upload = st.checkbox("Usar Composio por defeito na Automação Youtube", value=bool(settings.get("composio_auto_upload", True)), key="upload_composio_auto_upload", help="Quando estiver configurado, Composio é tentado antes da API Oficial, Upload directo e Postiz.")
             composio_api_key = st.text_input("Composio API key", value=str(settings.get("composio_api_key") or ""), type="password", key="upload_composio_api_key", help="Use a API key de projecto do Composio Platform. Nunca coloque esta chave no GitHub, em URLs ou em mensagens.")
             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 "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`.")
-            composio_arguments_json = st.text_area("Argumentos JSON da Automação Youtube", value=str(settings.get("composio_arguments_json") or "{}"), key="upload_composio_arguments_json", height=120)
+            current_tool_slug = str(settings.get("composio_tool_slug") or "upload_video")
+            if current_tool_slug not in composio_operation_slugs:
+                current_tool_slug = "upload_video"
+            composio_tool_slug = st.selectbox("Slug da ferramenta para Automação Youtube", composio_operation_slugs, index=composio_operation_slugs.index(current_tool_slug), format_func=lambda slug: f"{composio_operation_options[slug]} ({slug})", key="upload_composio_tool_slug", help="O Thunderbolt selecciona internamente o slug da operação; `upload_video` é o default.")
+            current_toolkit = str(settings.get("composio_toolkit") or composio_tool_slug)
+            if current_toolkit not in composio_operation_slugs:
+                current_toolkit = composio_tool_slug
+            composio_toolkit = st.selectbox("Toolkit preferido (opcional)", composio_operation_slugs, index=composio_operation_slugs.index(current_toolkit), format_func=lambda slug: f"{composio_operation_options[slug]} ({slug})", key="upload_composio_toolkit", help="A lista segue as operações suportadas pelo Thunderbolt.")
+            st.text_input("Campo do ficheiro na ferramenta", value="videoFilePath", disabled=True, help="Configurado internamente pelo backend. O path do vídeo é injectado automaticamente a partir do artefacto da tarefa.")
+            composio_privacy_options = ["unlisted", "listed"]
+            current_privacy = str(settings.get("composio_privacy_status") or "unlisted")
+            if current_privacy not in composio_privacy_options:
+                current_privacy = "unlisted"
+            composio_privacy_status = st.selectbox("Campo de privacidade", composio_privacy_options, index=composio_privacy_options.index(current_privacy), key="upload_composio_privacy_status", help="O valor é enviado pelo backend para a operação de publicação; `unlisted` é o default.")
+            composio_category_options = [str(category_id) for category_id in range(1, 101)]
+            current_category = str(settings.get("composio_category_id") or "22")
+            if current_category not in composio_category_options:
+                current_category = "22"
+            composio_category_id = st.selectbox("Campo de categoria", composio_category_options, index=composio_category_options.index(current_category), key="upload_composio_category_id", help="Categorias YouTube de 1 a 100; `22` é o default.")
+            composio_language_options = list(LANGUAGE_CODES)
+            current_language = str(settings.get("composio_language") or "pt")
+            if current_language not in composio_language_options:
+                current_language = "pt"
+            composio_language = st.selectbox("Campo de idioma", composio_language_options, index=composio_language_options.index(current_language), format_func=language_label, key="upload_composio_language", help="Idioma usado pelo backend nos argumentos da ferramenta.")
+            composio_channel_field = str(settings.get("composio_channel_field") or "")
+            composio_arguments_json = str(settings.get("composio_arguments_json") or "{}")
             _render_credential_status(composio_api_key)
             composio_action_cols = st.columns(2)
             with composio_action_cols[0]:
@@ -8041,7 +8068,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 "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 "{}"})
+                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, "composio_tool_slug": composio_tool_slug, "composio_file_field": "videoFilePath", "composio_channel_field": composio_channel_field, "composio_privacy_status": composio_privacy_status, "composio_category_id": composio_category_id, "composio_language": composio_language, "composio_privacy_field": "privacyStatus", "composio_category_field": "categoryId", "composio_language_field": "defaultLanguage", "composio_arguments_json": composio_arguments_json or "{}"})
                 write_json("settings.json", settings)
                 st.success("Configuração Composio guardada.")
                 st.rerun()

package/hermes_ui/storage.py

@@ -291,13 +291,16 @@ DEFAULTS: dict[str, Any] = {
         "composio_auto_upload": True,
         "composio_api_key": "",
         "composio_user_id": "thunderbolt-local",
-        "composio_toolkit": "",
-        "composio_tool_slug": "",
+        "composio_toolkit": "upload_video",
+        "composio_tool_slug": "upload_video",
         "composio_file_field": "videoFilePath",
         "composio_channel_field": "",
-        "composio_privacy_field": "privacy_status",
-        "composio_category_field": "category_id",
-        "composio_language_field": "language",
+        "composio_privacy_status": "unlisted",
+        "composio_category_id": "22",
+        "composio_language": "pt",
+        "composio_privacy_field": "privacyStatus",
+        "composio_category_field": "categoryId",
+        "composio_language_field": "defaultLanguage",
         "composio_arguments_json": "{}",
         "postiz_enabled": False,
         "postiz_api_key": "",

package/integrations/upload_routing.py

@@ -25,6 +25,15 @@ from hermes_ui.languages import language_locale
 
 OFFICIAL_DAILY_LIMIT = 5
 QUOTA_FILENAME = "official_upload_quota.json"
+COMPOSIO_VIDEO_FILE_FIELD = "videoFilePath"
+COMPOSIO_OPERATION_OPTIONS = {
+    "upload_video": "Upload Video",
+    "update_video": "Update video",
+    "upload_tiktok_video": "Upload TikTok Video",
+    "upload_instagram_media": "Upload Instagram vídeo/Reel/foto",
+}
+COMPOSIO_PRIVACY_VALUES = {"listed", "unlisted"}
+COMPOSIO_CATEGORY_RANGE = range(1, 101)
 
 
 def _attempt_record(name: str, result: IntegrationResult, *, skipped: bool = False) -> dict[str, Any]:
@@ -232,7 +241,8 @@ 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()
     normalized_slug = slug.upper().replace("-", "_")
-    youtube_upload_tool = normalized_slug in {"YOUTUBE_UPLOAD", "YOUTUBE_UPLOAD_VIDEO", "YOUTUBE_MULTIPART_UPLOAD_VIDEO"} or ("YOUTUBE" in normalized_slug and "UPLOAD" in normalized_slug)
+    connected_account_tool = normalized_slug in {"UPLOAD_VIDEO", "UPDATE_VIDEO", "UPLOAD_TIKTOK_VIDEO", "UPLOAD_INSTAGRAM_MEDIA"}
+    youtube_upload_tool = normalized_slug in {"UPLOAD_VIDEO", "YOUTUBE_UPLOAD_VIDEO", "YOUTUBE_MULTIPART_UPLOAD_VIDEO"} or ("YOUTUBE" in normalized_slug and "UPLOAD" in normalized_slug and normalized_slug != "YOUTUBE_UPLOAD")
     channel_id = str(
         channel.get("youtube_channel_id")
         or channel.get("youtube_id")
@@ -245,24 +255,32 @@ def _composio_upload(settings: dict[str, Any], *, channel: dict[str, Any], **kwa
         match = re.search(r"/channel/(UC[\w-]+)", str(channel.get("url") or ""))
         channel_id = match.group(1) if match else ""
     channel_field = str(settings.get("composio_channel_field") or "channel_id").strip()
-    if not youtube_upload_tool and not channel_id:
+    if not connected_account_tool and 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:
+    if not connected_account_tool and 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"
+    # O path técnico nunca vem da configuração editável: é injectado pelo backend.
+    file_field = COMPOSIO_VIDEO_FILE_FIELD
     try:
         arguments = str(settings.get("composio_arguments_json") or "{}").strip() or "{}"
         import json
         parsed_arguments = json.loads(arguments)
         if not isinstance(parsed_arguments, dict):
             return IntegrationResult(False, "Composio não foi executado: os argumentos JSON devem ser um objecto.", {})
+        privacy_value = str(settings.get("composio_privacy_status") or kwargs.get("privacy_status") or "unlisted").strip().lower()
+        if privacy_value not in COMPOSIO_PRIVACY_VALUES:
+            privacy_value = "unlisted"
+        try:
+            category_value = int(str(settings.get("composio_category_id") or kwargs.get("category_id") or "22").strip())
+        except ValueError:
+            category_value = 22
+        if category_value not in COMPOSIO_CATEGORY_RANGE:
+            category_value = 22
         locked_values = {
             **({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"),
+            str(settings.get("composio_privacy_field") or "privacy_status").strip(): privacy_value,
+            str(settings.get("composio_category_field") or "category_id").strip(): str(category_value),
+            str(settings.get("composio_language_field") or "language").strip(): language_locale(settings.get("composio_language") or kwargs.get("language") or channel.get("language") or "pt"),
         }
         for field, expected in locked_values.items():
             if not field:

package/package.json

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