fix: 避免 Spark Lite 改写结构化消息

Author: w33d

astrbot/core/provider/sources/openai_source.py

@@ -434,7 +434,19 @@ def _apply_provider_specific_request_overrides(
                 extra_body.pop(field, None)
 
             messages = payloads.get("messages")
-            if isinstance(messages, list):
+            first_user = (
+                next(
+                    (
+                        message
+                        for message in messages
+                        if isinstance(message, dict) and message.get("role") == "user"
+                    ),
+                    None,
+                )
+                if isinstance(messages, list)
+                else None
+            )
+            if first_user is not None and isinstance(first_user.get("content"), str):
                 system_parts: list[str] = []
                 compatible_messages: list[Any] = []
                 for message in messages:
@@ -454,11 +466,7 @@ def _apply_provider_specific_request_overrides(
                 if system_parts:
                     system_prompt = "\n\n".join(system_parts)
                     for index, message in enumerate(compatible_messages):
-                        if (
-                            isinstance(message, dict)
-                            and message.get("role") == "user"
-                            and isinstance(message.get("content"), str)
-                        ):
+                        if isinstance(message, dict) and message.get("role") == "user":
                             user_message = dict(message)
                             user_content = user_message.get("content", "")
                             user_message["content"] = (
@@ -468,11 +476,6 @@ def _apply_provider_specific_request_overrides(
                             )
                             compatible_messages[index] = user_message
                             break
-                    else:
-                        compatible_messages.insert(
-                            0,
-                            {"role": "user", "content": system_prompt},
-                        )
 
                 payloads["messages"] = compatible_messages
 

tests/test_openai_source.py

@@ -1373,6 +1373,60 @@ async def test_spark_lite_does_not_drop_unsupported_history_content():
         await provider.terminate()
 
 
+@pytest.mark.asyncio
+async def test_spark_lite_keeps_structured_first_user_content_unchanged():
+    """Keep structured first-user content unchanged for fallback handling."""
+    provider = _make_provider(
+        {
+            "api_base": "https://spark-api-open.xf-yun.com/v1",
+            "model": "lite",
+        }
+    )
+    try:
+        messages = [
+            {"role": "system", "content": "persona"},
+            {
+                "role": "user",
+                "content": [{"type": "text", "text": "hello"}],
+            },
+        ]
+        payloads = {"model": "lite", "messages": messages}
+
+        provider._apply_provider_specific_request_overrides(payloads, {})
+
+        assert payloads["messages"] == messages
+    finally:
+        await provider.terminate()
+
+
+@pytest.mark.asyncio
+async def test_spark_lite_does_not_move_system_prompt_past_structured_user():
+    """Do not move a system prompt into a later string user message."""
+    provider = _make_provider(
+        {
+            "api_base": "https://spark-api-open.xf-yun.com/v1",
+            "model": "lite",
+        }
+    )
+    try:
+        messages = [
+            {"role": "system", "content": "persona"},
+            {
+                "role": "user",
+                "content": [{"type": "text", "text": "hello"}],
+            },
+            {"role": "assistant", "content": "answer"},
+            {"role": "user", "content": "continue"},
+        ]
+        payloads = {"model": "lite", "messages": messages}
+
+        provider._apply_provider_specific_request_overrides(payloads, {})
+
+        assert payloads["messages"] == messages
+    finally:
+        await provider.terminate()
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("streaming", [False, True])
 async def test_spark_lite_query_removes_unsupported_request_fields(