Skip to content

利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.

fix(upload-post): bind queued publishes to the selected account

RudyCelekli79857597ea92
diff --git a/app/services/task.py b/app/services/task.py
index 3aad8d82..5804a589 100644
--- a/app/services/task.py
+++ b/app/services/task.py
@@ -1165,6 +1165,7 @@ def _run_cross_post(
platforms: tuple[str, ...],
youtube_privacy_status: str,
youtube_made_for_kids: bool = False,
+ upload_account: dict | None = None,
) -> None:
"""后台执行跨平台发布,并只补充发布相关的任务字段。"""
results = []
@@ -1244,12 +1245,16 @@ def _run_cross_post(
f"task_id={task_id}, request_id={request_id}"
)
+ upload_kwargs = {}
+ if upload_account is not None:
+ upload_kwargs["account"] = upload_account
result = upload_post.cross_post_video(
video_path=video_path,
title=post_title,
platforms=list(platforms),
youtube_extra=youtube_extra,
on_background_start=record_background_request,
+ **upload_kwargs,
)
if not isinstance(result, dict):
result = {
@@ -1390,6 +1395,7 @@ def _schedule_cross_post(
tuple(platforms),
youtube_privacy_status,
youtube_made_for_kids,
+ upload_post.upload_post_service.snapshot_account(),
)
_register_cross_post_future(task_id, future)
future.add_done_callback(partial(_finalize_cross_post_future, task_id))
diff --git a/app/services/upload_post.py b/app/services/upload_post.py
index 85e0d9d6..8cf2dda5 100644
--- a/app/services/upload_post.py
+++ b/app/services/upload_post.py
@@ -21,6 +21,23 @@ _MAX_CONSECUTIVE_STATUS_ERRORS = 3
class UploadPostService:
API_BASE = "https://api.upload-post.com"
+ def __init__(self, account: dict | None = None):
+ # A background publish must keep its account across queueing and polling.
+ # Only the in-memory job carries this snapshot; it is never task metadata.
+ self._account = dict(account) if account is not None else None
+
+ def snapshot_account(self) -> dict:
+ settings = dict(config.app if self._account is None else self._account)
+ return {
+ "upload_post_api_key": settings.get("upload_post_api_key", ""),
+ "upload_post_username": settings.get("upload_post_username", ""),
+ "upload_post_enabled": settings.get("upload_post_enabled", False),
+ }
+
+ def _account_setting(self, key: str, default):
+ settings = config.app if self._account is None else self._account
+ return settings.get(key, default)
+
@staticmethod
def _with_platform_outcome(result: dict, expected_platforms: list | None = None) -> dict:
"""A successful API request can still contain failed platform publishes."""
@@ -121,15 +138,15 @@ class UploadPostService:
@property
def api_key(self) -> str:
- return config.app.get("upload_post_api_key", "")
+ return self._account_setting("upload_post_api_key", "")
@property
def username(self) -> str:
- return config.app.get("upload_post_username", "")
+ return self._account_setting("upload_post_username", "")
@property
def enabled(self) -> bool:
- return config.app.get("upload_post_enabled", False)
+ return self._account_setting("upload_post_enabled", False)
@property
def platforms(self) -> list:
@@ -373,8 +390,10 @@ def cross_post_video(
platforms: Optional[list] = None,
youtube_extra: Optional[dict] = None,
on_background_start: Callable[[str], None] | None = None,
+ account: dict | None = None,
) -> dict:
- return upload_post_service.upload_video(
+ service = UploadPostService(account) if account is not None else upload_post_service
+ return service.upload_video(
video_path,
title,
platforms,
diff --git a/test/services/test_upload_post_account_snapshot.py b/test/services/test_upload_post_account_snapshot.py
new file mode 100644
index 00000000..d3a4e229
--- /dev/null
+++ b/test/services/test_upload_post_account_snapshot.py
@@ -0,0 +1,120 @@
+"""A scheduled publish belongs to the account selected at scheduling time."""
+
+import json
+import tempfile
+import threading
+import unittest
+from concurrent.futures import ThreadPoolExecutor
+from pathlib import Path
+from unittest.mock import patch
+
+import requests
+
+from app.config import config
+from app.models import const
+from app.models.schema import VideoParams
+from app.services import state as sm
+from app.services import task as tm
+from app.services import upload_post
+
+
+def _response(payload):
+ response = requests.Response()
+ response.status_code = 200
+ response._content = json.dumps(payload).encode()
+ return response
+
+
+class TestUploadPostAccountSnapshot(unittest.TestCase):
+ def test_queued_publish_keeps_original_account(self):
+ released = threading.Event()
+ state = sm.MemoryState()
+ task_id = "account-snapshot"
+ state.update_task(task_id, cross_post_state=const.CROSS_POST_STATE_PENDING)
+ account_a = {
+ "upload_post_enabled": True,
+ "upload_post_api_key": "account-a-test-key",
+ "upload_post_username": "channel-a",
+ }
+ with tempfile.TemporaryDirectory() as directory:
+ video = Path(directory, "video.mp4")
+ video.write_bytes(b"local video fixture")
+ with ThreadPoolExecutor(max_workers=1) as executor:
+ blocker = executor.submit(released.wait, 10)
+ try:
+ with (
+ patch.dict(config.app, account_a),
+ patch.object(sm, "state", state),
+ patch.object(tm, "_cross_post_executor", executor),
+ patch.object(tm.llm, "generate_social_metadata", return_value={}),
+ patch.object(upload_post.requests, "post", return_value=_response({
+ "success": True, "results": {"tiktok": {"success": True}}
+ })) as post,
+ ):
+ error = tm._schedule_cross_post(
+ task_id, [str(video)], VideoParams(video_subject="Coffee"),
+ "Prepared script", ["tiktok"], "public",
+ )
+ self.assertIsNone(error)
+ with tm._cross_post_registry_lock:
+ future = tm._cross_post_futures[task_id]
+ config.app.update({
+ "upload_post_api_key": "account-b-test-key",
+ "upload_post_username": "channel-b",
+ })
+ released.set()
+ blocker.result(timeout=10)
+ future.result(timeout=10)
+ post.assert_called_once()
+ self.assertEqual(post.call_args.kwargs["headers"], {
+ "Authorization": "Apikey account-a-test-key"
+ })
+ self.assertEqual(dict(post.call_args.kwargs["data"])["user"], "channel-a")
+ self.assertEqual(state.get_task(task_id)["cross_post_state"], const.CROSS_POST_STATE_COMPLETE)
+ finally:
+ released.set()
+
+ def test_background_status_keeps_account_that_accepted_the_video(self):
+ state = sm.MemoryState()
+ task_id = "account-background"
+ state.update_task(task_id, cross_post_state=const.CROSS_POST_STATE_PENDING)
+ account_a = {
+ "upload_post_enabled": True,
+ "upload_post_api_key": "account-a-test-key",
+ "upload_post_username": "channel-a",
+ }
+
+ def accepted(*args, **kwargs):
+ config.app.update({
+ "upload_post_api_key": "account-b-test-key",
+ "upload_post_username": "channel-b",
+ })
+ return _response({"success": True, "request_id": "accepted-by-a"})
+
+ with (
+ tempfile.TemporaryDirectory() as directory,
+ ThreadPoolExecutor(max_workers=1) as executor,
+ patch.dict(config.app, account_a),
+ patch.object(sm, "state", state),
+ patch.object(tm, "_cross_post_executor", executor),
+ patch.object(tm.llm, "generate_social_metadata", return_value={}),
+ patch.object(upload_post.requests, "post", side_effect=accepted),
+ patch.object(upload_post.requests, "get", return_value=_response({
+ "status": "completed", "results": {"tiktok": {"success": True}}
+ })) as get,
+ ):
+ video = Path(directory, "video.mp4")
+ video.write_bytes(b"local video fixture")
+ error = tm._schedule_cross_post(
+ task_id, [str(video)], VideoParams(video_subject="Coffee"),
+ "Prepared script", ["tiktok"], "public",
+ )
+ self.assertIsNone(error)
+ # Wait for real executor work even if its done callback already
+ # removed the future from the registry.
+ executor.submit(lambda: None).result(timeout=10)
+ get.assert_called_once()
+ self.assertEqual(get.call_args.kwargs["headers"], {
+ "Authorization": "Apikey account-a-test-key"
+ })
+ self.assertEqual(state.get_task(task_id)["cross_post_state"], const.CROSS_POST_STATE_COMPLETE)