利用 AI 大模型和自动化工作流,根据主题或关键词一键生成高清短视频。Generate HD short videos from a topic or keyword with an automated AI workflow.
Python ai-video-generatorcontent-creationffmpeginstagram-reelsllmpythonshort-videosubtitlestext-to-speechtiktokvideo-automationvideo-workflowworkflow-automationyoutube-shorts
fix(material): stop paid image submissions at redirects
Rudy Celeklib244dd3b4152
diff --git a/app/services/material.py b/app/services/material.pyindex 7a584a5e..27ae372c 100644--- a/app/services/material.py+++ b/app/services/material.py@@ -1540,6 +1540,7 @@ def _request_openai_image(endpoint: str, payload: dict) -> tuple[bytes | None, sproxies=config.proxy,verify=_get_tls_verify(),timeout=OPENAI_IMAGE_REQUEST_TIMEOUT,+ allow_redirects=False,)except requests.exceptions.ConnectTimeout as e:# 连接阶段超时:请求确定没有送达服务端,没有创建生成任务,@@ -1557,6 +1558,12 @@ def _request_openai_image(endpoint: str, payload: dict) -> tuple[bytes | None, s) from eelse:status = int(getattr(response, "status_code", 200) or 200)+ if 300 <= status < 400:+ response.close()+ raise OpenAIImageUnconfirmedError(+ "image submission returned a redirect; no redirected request "+ "or retry was sent because the paid outcome is unconfirmed"+ )if status in OPENAI_IMAGE_KEY_ERROR_STATUS_CODES:failure_detail = _openai_image_http_failure(response, status, api_key)# 只有多 key 配置下,重试才可能轮换到可用 key。diff --git a/test/services/test_image_submission_redirect.py b/test/services/test_image_submission_redirect.pynew file mode 100644index 00000000..3f7ad8d5--- /dev/null+++ b/test/services/test_image_submission_redirect.py@@ -0,0 +1,56 @@+import base64+import json+import threading+from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer+from unittest.mock import patch++import pytest++from app.services import material++[email protected]("status", [301, 302, 303, 307, 308])+def test_paid_image_submission_does_not_follow_redirects(status):+ requests = []++ class Handler(BaseHTTPRequestHandler):+ def log_message(self, *_args):+ pass++ def do_POST(self):+ requests.append(("POST", self.path))+ self.rfile.read(int(self.headers.get("Content-Length", 0)))+ if self.path == "/generation":+ self.send_response(status)+ self.send_header("Location", "/redirected")+ self.send_header("Content-Length", "0")+ self.end_headers()+ else:+ self.respond()++ def do_GET(self):+ requests.append(("GET", self.path))+ self.respond()++ def respond(self):+ body = json.dumps({"data": [{"b64_json": base64.b64encode(b"fixture").decode()}]}).encode()+ self.send_response(200)+ self.send_header("Content-Length", str(len(body)))+ self.end_headers()+ self.wfile.write(body)++ server = ThreadingHTTPServer(("127.0.0.1", 0), Handler)+ thread = threading.Thread(target=server.serve_forever, daemon=True)+ thread.start()+ try:+ with (+ patch.object(material.config, "proxy", {}),+ patch.object(material.config, "app", {"openai_image_api_keys": []}),+ pytest.raises(material.OpenAIImageUnconfirmedError, match="redirect"),+ ):+ material._request_openai_image(f"http://127.0.0.1:{server.server_port}/generation", {"prompt": "fixture"})+ assert requests == [("POST", "/generation")]+ finally:+ server.shutdown()+ server.server_close()+ thread.join(timeout=2)