@danhachuel/thunderbolt 0.6.7 → 0.6.9

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 COMPOSIO_OPERATION_OPTIONS, OFFICIAL_DAILY_LIMIT, official_upload_count, upload_with_default_route
+from integrations.upload_routing import COMPOSIO_OPERATION_OPTIONS, OFFICIAL_DAILY_LIMIT, official_upload_count, resolve_youtube_account, 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
@@ -5597,7 +5597,7 @@ def render_upload_direct():
         with st.container(border=True):
             st.write(f"**{task.get('topic', 'Sem tópico')}** — {task.get('channel_name', 'Canal')}")
             st.caption(video_path or "Sem caminho de vídeo registado")
-            account = direct_accounts.get(str(channel.get("google_account_id", "")))
+            account = resolve_youtube_account(settings, channel)
             credential_status = document_status(STORAGE, account, channel, settings, channels) if account else None
             if not account:
                 st.warning("Este canal não tem uma conta Google associada. Associe a conta no cartão deste canal em Canais cadastrados.")
@@ -6364,7 +6364,7 @@ def render_upload_conventional():
             st.caption(video_path or "Sem caminho de vídeo registado")
             selected_youtube_channel = upload_targets.get("YouTube") if "YouTube" in destination else None
             channel = selected_youtube_channel or channel_map.get(str(task.get("channel_id")), {})
-            account = direct_accounts.get(str(channel.get("google_account_id", "")))
+            account = resolve_youtube_account(settings, channel)
             if "YouTube" in destination:
                 detected_language = normalize_video_language(task.get("language") or channel.get("language") or "pt")
                 language_state_key = f"yt_language_{task['id']}"

package/hermes_ui/pipeline_worker.py

@@ -23,7 +23,7 @@ from typing import Any
 
 from integrations.moneyprinter_config import sync_moneyprinter_config
 from integrations.session_info_health import check_all_accounts_session_info_health, emit_session_info_health_alerts
-from integrations.upload_routing import upload_with_default_route
+from integrations.upload_routing import resolve_youtube_account, upload_with_default_route
 from hermes_ui.creative_generation import CreativeGenerationError, generate_creative_package, generate_title_and_keywords, generate_thumbnail_prompt, generate_topic_for_channel
 from hermes_ui.script_documents import save_script_document
 from hermes_ui.script_generation import generate_script_document
@@ -693,7 +693,18 @@ def _material_video_attempts(task: dict[str, Any], settings: dict[str, Any]) ->
     fallback = [item for item in attempts if item[0] != route]
     ordered = preferred + fallback
     if ordered:
-        return ordered
+        # Uma execução do helper já recebe a lista de chaves do provider
+        # configurado; não repetir o mesmo provider por cada cartão/key.
+        # Repetições anteriores reinstalavam dependências e produziam cascatas
+        # como Pexels → Pexels → Pixabay sem acrescentar uma estratégia real.
+        unique: list[tuple[str, str]] = []
+        seen: set[str] = set()
+        for provider, api_key in ordered:
+            if provider in seen:
+                continue
+            seen.add(provider)
+            unique.append((provider, api_key))
+        return unique
     # Legacy settings keep the complete key list in one config field. Let
     # MoneyPrinterTurbo retain its own list handling when no individual cards
     # are available, preserving backwards compatibility for older installs.
@@ -1566,7 +1577,7 @@ def _run_task(task: dict[str, Any]) -> dict[str, Any]:
         settings,
         storage_root=STORAGE,
         channel=channel,
-        account=next((item for item in settings.get("youtube_batch_accounts", []) if isinstance(item, dict) and str(item.get("id")) == str(channel.get("google_account_id"))), None),
+        account=resolve_youtube_account(settings, channel),
         video_path=str(video_path),
         title=title,
         description=str(script.get("summary") or "") + "\n\n" + str(script.get("content") or "")[:5000],

package/integrations/upload_routing.py

@@ -45,11 +45,41 @@ def _attempt_record(name: str, result: IntegrationResult, *, skipped: bool = Fal
     }
 
 
+def resolve_youtube_account(settings: dict[str, Any], channel: dict[str, Any] | None) -> dict[str, Any] | None:
+    """Resolve the configured Google account without relying only on the channel ID.
+
+    Older channel records may retain the account e-mail while the account ID is
+    missing or stale. Prefer an exact ID match, then use a case-insensitive
+    e-mail match, and finally accept a sole configured account only when the
+    channel has no contradictory account reference.
+    """
+    if not isinstance(channel, dict):
+        return None
+    accounts = [item for item in settings.get("youtube_batch_accounts", []) if isinstance(item, dict) and item.get("id")]
+    if not accounts:
+        return None
+    account_id = str(channel.get("google_account_id") or "").strip()
+    if account_id:
+        match = next((item for item in accounts if str(item.get("id") or "").strip() == account_id), None)
+        if match is not None:
+            return match
+    account_email = str(channel.get("google_account_email") or "").strip().casefold()
+    if account_email:
+        match = next((item for item in accounts if str(item.get("email") or "").strip().casefold() == account_email), None)
+        if match is not None:
+            return match
+    if not account_id and not account_email and len(accounts) == 1:
+        return accounts[0]
+    return None
+
+
 def _quota_key(channel: dict[str, Any], account: dict[str, Any] | None) -> str:
     if account and account.get("id"):
         return f"account:{account['id']}"
     if channel.get("google_account_id"):
         return f"account:{channel['google_account_id']}"
+    if channel.get("google_account_email"):
+        return f"account-email:{str(channel['google_account_email']).strip().casefold()}"
     return f"channel:{channel.get('id', 'unknown')}"
 
 
@@ -107,6 +137,7 @@ def upload_with_default_route(
     composio_publisher: Callable[..., IntegrationResult] | None = None,
 ) -> IntegrationResult:
     attempts: list[dict[str, Any]] = []
+    account = account or resolve_youtube_account(settings, channel)
     composio_enabled = bool(settings.get("composio_enabled", False)) and bool(settings.get("composio_auto_upload", True))
     composio_ready = composio_enabled and bool(settings.get("composio_api_key")) and bool(settings.get("composio_tool_slug"))
     if composio_enabled and not composio_ready:

package/package.json

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

package/seed/skills/mpt_agent.py

@@ -697,7 +697,7 @@ def ensure_moviepy(root: Path, uv: str) -> None:
             MOVIEPY_REQUIREMENT,
             "python",
             "-c",
-            "import moviepy; assert moviepy.__version__ == '2.2.1'",
+            "import importlib.metadata; print(f\"moviepy {importlib.metadata.version('moviepy')}\")",
         ],
         cwd=root,
     )