fix(provider): forward extra user content in streams

Author: VonLan233

astrbot/core/provider/sources/openai_source.py

@@ -517,7 +517,6 @@ def _apply_provider_specific_extra_body_overrides(
 
     def _requires_tool_call_reasoning_content(
         self,
-        payloads: dict,
         extra_body: dict[str, Any],
     ) -> bool:
         thinking = extra_body.get("thinking")
@@ -534,7 +533,7 @@ def _ensure_tool_call_reasoning_content(
         payloads: dict,
         extra_body: dict[str, Any],
     ) -> None:
-        if not self._requires_tool_call_reasoning_content(payloads, extra_body):
+        if not self._requires_tool_call_reasoning_content(extra_body):
             return
 
         messages = payloads.get("messages")
@@ -1280,6 +1279,7 @@ async def text_chat_stream(
         system_prompt=None,
         tool_calls_result=None,
         model=None,
+        extra_user_content_parts=None,
         tool_choice: Literal["auto", "required"] = "auto",
         **kwargs,
     ) -> AsyncGenerator[LLMResponse, None]:
@@ -1292,6 +1292,7 @@ async def text_chat_stream(
             system_prompt,
             tool_calls_result,
             model=model,
+            extra_user_content_parts=extra_user_content_parts,
             **kwargs,
         )
         if func_tool and not func_tool.empty():

astrbot/core/provider/sources/opencode_go_source.py

@@ -132,6 +132,7 @@ async def text_chat_stream(
         system_prompt: str | None = None,
         tool_calls_result: ToolCallsResult | list[ToolCallsResult] | None = None,
         model: str | None = None,
+        extra_user_content_parts: list[ContentPart] | None = None,
         tool_choice: Literal["auto", "required"] = "auto",
         **kwargs,
     ) -> AsyncGenerator[LLMResponse, None]:
@@ -145,6 +146,7 @@ async def text_chat_stream(
             system_prompt=system_prompt,
             tool_calls_result=tool_calls_result,
             model=self._resolve_model(model),
+            extra_user_content_parts=extra_user_content_parts,
             tool_choice=tool_choice,
             **kwargs,
         ):

tests/test_openai_source.py

@@ -8,6 +8,7 @@
 from PIL import Image as PILImage
 
 import astrbot.core.provider.sources.openai_source as openai_source_module
+from astrbot.core.agent.message import ContentPart, TextPart
 from astrbot.core.exceptions import EmptyModelOutputError
 from astrbot.core.provider.sources.groq_source import ProviderGroq
 from astrbot.core.provider.sources.openai_source import ProviderOpenAIOfficial
@@ -34,6 +35,15 @@ async def get_models(self) -> list[str]:
         return self._models
 
 
+class _OpenCodeGoDelegateStub:
+    def __init__(self):
+        self.stream_kwargs: dict[str, object] | None = None
+
+    async def text_chat_stream(self, **kwargs):
+        self.stream_kwargs = kwargs
+        yield SimpleNamespace(role="assistant")
+
+
 class _OpenCodeGoUnitProvider(ProviderOpenCodeGo):
     openai_provider: _ModelsProviderStub
 
@@ -42,6 +52,14 @@ def __init__(self, models: list[str]):
         self.model_name = "kimi-k2.6"
 
 
+class _OpenCodeGoStreamUnitProvider(ProviderOpenCodeGo):
+    openai_provider: _OpenCodeGoDelegateStub
+
+    def __init__(self, delegate: _OpenCodeGoDelegateStub):
+        self.openai_provider = delegate
+        self.model_name = "kimi-k2.6"
+
+
 def _make_provider(overrides: dict | None = None) -> ProviderOpenAIOfficial:
     provider_config = {
         "id": "test-openai",
@@ -481,6 +499,25 @@ def test_opencode_go_delegate_config_defaults_force_reasoning_content_only_when_
     assert config["force_tool_call_reasoning_content"] is False
 
 
+@pytest.mark.asyncio
+async def test_opencode_go_text_chat_stream_forwards_extra_user_content_parts():
+    delegate = _OpenCodeGoDelegateStub()
+    provider = _OpenCodeGoStreamUnitProvider(delegate)
+    extra_parts: list[ContentPart] = [TextPart(text="extra context")]
+
+    responses = [
+        response
+        async for response in provider.text_chat_stream(
+            prompt="hello",
+            extra_user_content_parts=extra_parts,
+        )
+    ]
+
+    assert responses
+    assert delegate.stream_kwargs is not None
+    assert delegate.stream_kwargs["extra_user_content_parts"] is extra_parts
+
+
 @pytest.mark.asyncio
 async def test_handle_api_error_content_moderated_without_images_raises():
     provider = _make_provider(