利用 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(llm): strip every non-subscription provider variable, tighten field defaults
fred-ng26bf64107dbf
diff --git a/app/services/llm.py b/app/services/llm.pyindex c8f1ec8a..0f06605b 100644--- a/app/services/llm.py+++ b/app/services/llm.py@@ -59,22 +59,36 @@ CLAUDE_CODE_DEFAULT_TIMEOUT = 300.0# plugins、MCP 等所有用户级定制,同时保持鉴权、模型选择和权限正常工作。# 二者需要较新的 CLI;低版本会以 "unknown option" 退出,由调用处转成明确提示。CLAUDE_CODE_MIN_CLI_VERSION = "2.1.260"-# 这些环境变量会让 CLI 改用 API Key 或第三方供应商,从而绕过订阅登录并产生-# 额外计费。claude_code Provider 的前提是「只用订阅」,所以调用前必须剔除。+# 这些环境变量会让 CLI 改用 API Key 或第三方供应商(Bedrock、Vertex、Foundry、+# Mantle、Gateway 等),从而绕过订阅登录并产生额外计费。逐个列举容易漏项,+# 而且 CLI 后续还会新增供应商,因此按前缀整类剔除:+# ANTHROPIC_* API Key、Auth Token、Base URL、各家供应商端点和 Profile+# CLAUDE_CODE_USE_* 供应商开关+# CLAUDE_CODE_SKIP_*_AUTH 跳过供应商鉴权的开关+CLAUDE_CODE_CONFLICTING_ENV_PREFIXES = ("ANTHROPIC_", "CLAUDE_CODE_USE_")CLAUDE_CODE_CONFLICTING_ENV_VARS = (- "ANTHROPIC_API_KEY",- "ANTHROPIC_AUTH_TOKEN",- "ANTHROPIC_BASE_URL",- "ANTHROPIC_CUSTOM_HEADERS",- "ANTHROPIC_MODEL",- "ANTHROPIC_SMALL_FAST_MODEL",- "ANTHROPIC_DEFAULT_HAIKU_MODEL",- "ANTHROPIC_DEFAULT_SONNET_MODEL",- "ANTHROPIC_DEFAULT_OPUS_MODEL",- "CLAUDE_CODE_USE_BEDROCK",- "CLAUDE_CODE_USE_VERTEX","AWS_BEARER_TOKEN_BEDROCK",+ "CLAUDE_CODE_GATEWAY_TOKEN_FILE_DESCRIPTOR",)+# 这两类变量不能剔除:+# CLAUDE_CODE_OAUTH_TOKEN 是容器内唯一的订阅鉴权方式(不匹配上面的前缀);+# *_CONFIG_DIR 只是指出凭证存放位置,剔除后反而会让已登录的订阅失效。+CLAUDE_CODE_PRESERVED_ENV_VARS = (+ "CLAUDE_CODE_OAUTH_TOKEN",+ "ANTHROPIC_CONFIG_DIR",+ "CLAUDE_CONFIG_DIR",+)+++def _is_conflicting_claude_code_env(name: str) -> bool:+ """判断某个环境变量是否会把 CLI 从订阅登录切换到别的鉴权方式。"""+ if name in CLAUDE_CODE_PRESERVED_ENV_VARS:+ return False+ if name in CLAUDE_CODE_CONFLICTING_ENV_VARS:+ return True+ if name.startswith(CLAUDE_CODE_CONFLICTING_ENV_PREFIXES):+ return True+ return name.startswith("CLAUDE_CODE_SKIP_") and name.endswith("_AUTH")def coerce_claude_code_timeout(value, config_key: str = "claude_code_timeout"):@@ -114,6 +128,21 @@ def coerce_claude_code_timeout(value, config_key: str = "claude_code_timeout"):return seconds+def _resolve_provider_field_value(raw_value, default_value):+ """+ 只有「未配置」时才回退到 Registry 默认值。++ 之前用 `raw or default_value`,会把 0 和 false 这类合法取值也当成未配置+ 替换掉:`claude_code_timeout = 0` 被静默改成 300,而 `"0"` 却报错。默认值+ 只在 None 或空白字符串时生效,配置校验才能对所有写法保持一致。+ """+ if raw_value is None:+ return default_value+ if isinstance(raw_value, str) and not raw_value.strip():+ return default_value+ return raw_value++def build_claude_code_env(base_env=None):"""构造只依赖订阅登录的子进程环境。@@ -123,7 +152,7 @@ def build_claude_code_env(base_env=None):靠它完成订阅鉴权。"""env = dict(os.environ if base_env is None else base_env)- removed = [name for name in CLAUDE_CODE_CONFLICTING_ENV_VARS if name in env]+ removed = sorted(name for name in env if _is_conflicting_claude_code_env(name))for name in removed:env.pop(name, None)return env, removed@@ -273,9 +302,9 @@ def _generate_response(prompt: str, app_config=None) -> str:)extra_values = {- field.config_suffix: (- runtime_app_config.get(provider.config_key(field.config_suffix), "")- or field.default_value+ field.config_suffix: _resolve_provider_field_value(+ runtime_app_config.get(provider.config_key(field.config_suffix)),+ field.default_value,)for field in provider.extra_fields}diff --git a/test/services/test_llm.py b/test/services/test_llm.pyindex 58cf831c..73ff32aa 100644--- a/test/services/test_llm.py+++ b/test/services/test_llm.py@@ -1718,6 +1718,75 @@ class TestClaudeCodeProvider(unittest.TestCase):["ANTHROPIC_API_KEY", "ANTHROPIC_BASE_URL", "CLAUDE_CODE_USE_BEDROCK"],)+ def test_every_cloud_provider_switch_is_removed(self):+ """Bedrock / Vertex / Foundry / Mantle / Gateway 等开关都会改走云厂商计费。"""+ switches = {+ "CLAUDE_CODE_USE_BEDROCK": "1",+ "CLAUDE_CODE_USE_VERTEX": "1",+ "CLAUDE_CODE_USE_FOUNDRY": "1",+ "CLAUDE_CODE_USE_MANTLE": "1",+ "CLAUDE_CODE_USE_GATEWAY": "1",+ "CLAUDE_CODE_USE_ANTHROPIC_AWS": "1",+ "CLAUDE_CODE_USE_ANTHROPIC_GOOGLE_CLOUD": "1",+ }+ env, removed = llm.build_claude_code_env({"PATH": "/usr/bin", **switches})++ self.assertEqual(env, {"PATH": "/usr/bin"})+ self.assertCountEqual(removed, list(switches))++ def test_foundry_credentials_are_removed(self):+ """Foundry 凭证会让 CLI 走 Azure 计费,凭证和开关都必须剔除。"""+ foundry = {+ "CLAUDE_CODE_USE_FOUNDRY": "1",+ "ANTHROPIC_FOUNDRY_API_KEY": "foundry-key",+ "ANTHROPIC_FOUNDRY_AUTH_TOKEN": "foundry-token",+ "ANTHROPIC_FOUNDRY_BASE_URL": "https://example.openai.azure.com",+ "ANTHROPIC_FOUNDRY_RESOURCE": "my-resource",+ "CLAUDE_CODE_SKIP_FOUNDRY_AUTH": "1",+ }+ env, removed = llm.build_claude_code_env(+ {"PATH": "/usr/bin", "CLAUDE_CODE_OAUTH_TOKEN": "sk-ant-oat01", **foundry}+ )++ for name in foundry:+ self.assertNotIn(name, env, name)+ self.assertCountEqual(removed, list(foundry))+ self.assertEqual(env["CLAUDE_CODE_OAUTH_TOKEN"], "sk-ant-oat01")++ def test_auth_bypass_switches_are_removed(self):+ """CLAUDE_CODE_SKIP_*_AUTH 会跳过供应商鉴权,同样不能带进子进程。"""+ bypasses = {+ "CLAUDE_CODE_SKIP_BEDROCK_AUTH": "1",+ "CLAUDE_CODE_SKIP_VERTEX_AUTH": "1",+ "CLAUDE_CODE_SKIP_MANTLE_AUTH": "1",+ "CLAUDE_CODE_SKIP_ANTHROPIC_AWS_AUTH": "1",+ }+ env, removed = llm.build_claude_code_env({"PATH": "/usr/bin", **bypasses})+ self.assertEqual(env, {"PATH": "/usr/bin"})+ self.assertCountEqual(removed, list(bypasses))++ def test_credential_location_variables_are_preserved(self):+ """*_CONFIG_DIR 只指明凭证位置,剔除反而会让已登录的订阅失效。"""+ preserved = {+ "ANTHROPIC_CONFIG_DIR": "/home/user/.config/anthropic",+ "CLAUDE_CONFIG_DIR": "/home/user/.claude",+ "CLAUDE_CODE_OAUTH_TOKEN": "sk-ant-oat01",+ }+ env, removed = llm.build_claude_code_env(dict(preserved))+ self.assertEqual(env, preserved)+ self.assertEqual(removed, [])++ def test_unrelated_variables_are_never_removed(self):+ """过滤只针对鉴权和供应商开关,不应影响 PATH、代理等常规变量。"""+ env, removed = llm.build_claude_code_env(+ {"PATH": "/usr/bin", "HTTPS_PROXY": "http://proxy:3128", "HOME": "/root"}+ )+ self.assertEqual(+ env,+ {"PATH": "/usr/bin", "HTTPS_PROXY": "http://proxy:3128", "HOME": "/root"},+ )+ self.assertEqual(removed, [])+def test_clean_environment_is_left_unchanged(self):env, removed = llm.build_claude_code_env({"PATH": "/usr/bin"})self.assertEqual(env, {"PATH": "/usr/bin"})@@ -1787,6 +1856,25 @@ class TestClaudeCodeProvider(unittest.TestCase):self.assertEqual(llm._generate_response("write something"), "ok")self.assertEqual(run.call_args.kwargs["timeout"], 30.0)+ def test_zero_and_false_timeouts_are_rejected_not_defaulted(self):+ """0 / false 是无效取值,必须报错,而不是被默认值悄悄替换成 300 秒。"""+ for invalid in (0, False, "0", 0.0):+ with self.subTest(invalid=invalid):+ config.app["claude_code_timeout"] = invalid+ with patch.object(llm.shutil, "which", return_value="/usr/bin/claude"):+ response = llm._generate_response("write something")+ self.assertTrue(response.startswith("Error:"), response)+ self.assertIn("claude_code_timeout", response)++ def test_field_default_applies_only_to_empty_values(self):+ """Registry 默认值只在未配置时生效,合法的假值要原样进入校验。"""+ self.assertEqual(llm._resolve_provider_field_value(None, "300"), "300")+ self.assertEqual(llm._resolve_provider_field_value("", "300"), "300")+ self.assertEqual(llm._resolve_provider_field_value(" ", "300"), "300")+ self.assertEqual(llm._resolve_provider_field_value(0, "300"), 0)+ self.assertEqual(llm._resolve_provider_field_value(False, "300"), False)+ self.assertEqual(llm._resolve_provider_field_value("60", "300"), "60")+def test_invalid_timeout_reports_configuration_error(self):config.app["claude_code_timeout"] = "soon"with patch.object(llm.shutil, "which", return_value="/usr/bin/claude"):