GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-08-27 11:11:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support llm user agent

Browse Source
This commit is contained in:
jxxghp
2026-05-26 08:20:02 +08:00
parent 877d89abb3
commit b65c8dcfe0
9 changed files with 199 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/agent/llm/helper.py
View File

@@ -602,6 +602,7 @@ class LLMHelper:
model_name: str | None,
api_key: str | None = None,
base_url: str | None = None,
user_agent: str | None = None,
) -> dict[str, Any]:
"""
在 provider 目录不可用时回退到旧的直接构造逻辑。
@@ -625,12 +626,36 @@ class LLMHelper:
"model_id": model_name,
"api_key": api_key_value,
"base_url": base_url_value,
"default_headers": None,
"default_headers": LLMHelper._build_openai_default_headers(
None,
user_agent=user_agent,
),
"use_responses_api": None,
"model_record": None,
"model_metadata": None,
}
@staticmethod
def _build_openai_default_headers(
default_headers: dict[str, str] | None = None,
user_agent: str | None = None,
) -> dict[str, str] | None:
"""
合并 OpenAI 兼容接口默认请求头。
:param default_headers: provider 运行时已解析的默认请求头
:param user_agent: 用户配置的 User-Agent，非空时写入标准请求头
:return: 可传给 OpenAI SDK 的请求头字典
"""
headers = dict(default_headers or {})
normalized_user_agent = str(user_agent or "").strip()
if normalized_user_agent:
for key in list(headers.keys()):
if key.lower() == "user-agent":
headers.pop(key)
headers["User-Agent"] = normalized_user_agent
return headers or None
@classmethod
def _resolve_thinking_level(
cls,
@@ -675,6 +700,7 @@ class LLMHelper:
api_key: str | None = None,
base_url: str | None = None,
base_url_preset: str | None = None,
user_agent: str | None = None,
):
"""
获取LLM实例
@@ -688,6 +714,7 @@ class LLMHelper:
:param api_key: API Key。未显式传入时使用当前配置项 LLM_API_KEY。对于某些提供商（如 DeepSeek），可能需要同时提供 base_url。
:param base_url: API Base URL。未显式传入时使用当前配置项 LLM_BASE_URL。
:param base_url_preset: Base URL 预设。未显式传入时使用当前配置项 LLM_BASE_URL_PRESET。
:param user_agent: OpenAI兼容接口请求 User-Agent。未显式传入时使用配置项 LLM_USER_AGENT。
:return: LLM实例
"""
provider_name = str(provider if provider is not None else settings.LLM_PROVIDER).lower()
@@ -697,6 +724,9 @@ class LLMHelper:
base_url_preset_value = (
base_url_preset if base_url_preset is not None else settings.LLM_BASE_URL_PRESET
)
user_agent_value = (
user_agent if user_agent is not None else getattr(settings, "LLM_USER_AGENT", None)
)
normalized_thinking_level = cls._resolve_thinking_level(
thinking_level=thinking_level,
)
@@ -711,6 +741,7 @@ class LLMHelper:
api_key=api_key_value,
base_url=base_url_value,
base_url_preset_id=base_url_preset_value,
user_agent=user_agent_value,
)
except Exception as err:
logger.debug(f"LLM provider 目录不可用，回退到旧运行时逻辑: {err}")
@@ -719,8 +750,13 @@ class LLMHelper:
model_name=model_name,
api_key=api_key_value,
base_url=base_url_value,
user_agent=user_agent_value,
)
model_name = runtime.get("model_id") or model_name
default_headers = cls._build_openai_default_headers(
runtime.get("default_headers"),
user_agent=user_agent_value,
)
thinking_kwargs = cls._build_thinking_kwargs(
provider=provider_name,
model=model_name,
@@ -776,7 +812,7 @@ class LLMHelper:
streaming=streaming,
stream_usage=True,
anthropic_proxy=settings.PROXY_HOST,
default_headers=runtime.get("default_headers"),
default_headers=default_headers,
**thinking_kwargs,
)
else:
@@ -797,7 +833,7 @@ class LLMHelper:
streaming=streaming,
stream_usage=True,
openai_proxy=settings.PROXY_HOST,
default_headers=runtime.get("default_headers"),
default_headers=default_headers,
use_responses_api=runtime.get("use_responses_api"),
**thinking_kwargs,
)
@@ -873,6 +909,7 @@ class LLMHelper:
api_key: str | None = None,
base_url: str | None = None,
base_url_preset: str | None = None,
user_agent: str | None = None,
) -> dict:
"""
使用当前已保存配置执行一次最小 LLM 调用。
@@ -888,6 +925,7 @@ class LLMHelper:
api_key=api_key,
base_url=base_url,
base_url_preset=base_url_preset,
user_agent=user_agent,
)
try:
response = await asyncio.wait_for(llm.ainvoke(prompt), timeout=timeout)
@@ -918,6 +956,7 @@ class LLMHelper:
api_key: str | None = None,
base_url: str | None = None,
base_url_preset: str | None = None,
user_agent: str | None = None,
force_refresh: bool = False,
) -> List[dict[str, Any]]:
"""
@@ -935,6 +974,7 @@ class LLMHelper:
api_key=api_key,
base_url=base_url,
base_url_preset_id=base_url_preset,
user_agent=user_agent,
force_refresh=force_refresh,
)
except Exception as err:
@@ -963,6 +1003,7 @@ class LLMHelper:
provider,
api_key or "",
model_list_base_url,
user_agent=user_agent,
)
]
@@ -997,7 +1038,10 @@ class LLMHelper:
@staticmethod
async def _get_openai_compatible_models(
provider: str, api_key: str, base_url: str = None
provider: str,
api_key: str,
base_url: str = None,
user_agent: str | None = None,
) -> List[str]:
"""获取OpenAI兼容模型列表"""
try:
@@ -1006,7 +1050,14 @@ class LLMHelper:
if provider == "deepseek":
base_url = base_url or "https://api.deepseek.com"
client = AsyncOpenAI(api_key=api_key, base_url=base_url)
client = AsyncOpenAI(
api_key=api_key,
base_url=base_url,
default_headers=LLMHelper._build_openai_default_headers(
None,
user_agent=user_agent,
),
)
models = await client.models.list()
await client.close()
return [model.id for model in models.data]