fix: use explicit LLM user agent config

This commit is contained in:
jxxghp
2026-05-26 08:24:58 +08:00
parent b65c8dcfe0
commit 821bd3decd
4 changed files with 5 additions and 7 deletions
+2 -2
View File
@@ -469,7 +469,7 @@ class MoviePilotAgent:
api_key=settings.LLM_API_KEY, api_key=settings.LLM_API_KEY,
base_url=settings.LLM_BASE_URL, base_url=settings.LLM_BASE_URL,
base_url_preset=settings.LLM_BASE_URL_PRESET, base_url_preset=settings.LLM_BASE_URL_PRESET,
user_agent=getattr(settings, "LLM_USER_AGENT", None), user_agent=settings.LLM_USER_AGENT,
thinking_level=None, thinking_level=None,
) )
selected_event = await eventmanager.async_send_event( selected_event = await eventmanager.async_send_event(
@@ -500,7 +500,7 @@ class MoviePilotAgent:
) )
user_agent = ( user_agent = (
self._clean_optional_text(self._get_event_value(resolved_data, "user_agent")) self._clean_optional_text(self._get_event_value(resolved_data, "user_agent"))
or getattr(settings, "LLM_USER_AGENT", None) or settings.LLM_USER_AGENT
) )
thinking_level = self._clean_optional_text( thinking_level = self._clean_optional_text(
self._get_event_value(resolved_data, "thinking_level") self._get_event_value(resolved_data, "thinking_level")
+1 -3
View File
@@ -724,9 +724,7 @@ class LLMHelper:
base_url_preset_value = ( base_url_preset_value = (
base_url_preset if base_url_preset is not None else settings.LLM_BASE_URL_PRESET base_url_preset if base_url_preset is not None else settings.LLM_BASE_URL_PRESET
) )
user_agent_value = ( user_agent_value = user_agent if user_agent is not None else settings.LLM_USER_AGENT
user_agent if user_agent is not None else getattr(settings, "LLM_USER_AGENT", None)
)
normalized_thinking_level = cls._resolve_thinking_level( normalized_thinking_level = cls._resolve_thinking_level(
thinking_level=thinking_level, thinking_level=thinking_level,
) )
+1 -1
View File
@@ -249,7 +249,7 @@ async def llm_test(
api_key=settings.LLM_API_KEY, api_key=settings.LLM_API_KEY,
base_url=settings.LLM_BASE_URL, base_url=settings.LLM_BASE_URL,
base_url_preset=settings.LLM_BASE_URL_PRESET, base_url_preset=settings.LLM_BASE_URL_PRESET,
user_agent=getattr(settings, "LLM_USER_AGENT", None), user_agent=settings.LLM_USER_AGENT,
) )
if not payload.provider: if not payload.provider:
+1 -1
View File
@@ -146,7 +146,7 @@ class LlmTestEndpointTest(unittest.TestCase):
), patch.object( ), patch.object(
system_endpoint.settings, "LLM_BASE_URL_PRESET", "deepseek-default" system_endpoint.settings, "LLM_BASE_URL_PRESET", "deepseek-default"
), patch.object( ), patch.object(
system_endpoint.settings, "LLM_USER_AGENT", "MoviePilot-Test/1.0", create=True system_endpoint.settings, "LLM_USER_AGENT", "MoviePilot-Test/1.0"
), patch.object( ), patch.object(
system_endpoint.LLMHelper, system_endpoint.LLMHelper,
"test_current_settings", "test_current_settings",