feat: 模型视觉多模态支持

pkg/provider/modelmgr/apis/anthropicmsgs.py

@@ -38,30 +38,42 @@ class AnthropicMessages(api.LLMAPIRequester):
         args = self.ap.provider_cfg.data['requester']['anthropic-messages']['args'].copy()
         args["model"] = model.name if model.model_name is None else model.model_name
 
-        req_messages = [
-            m.dict(exclude_none=True) for m in messages if m.content.strip() != ""
-        ]
+        # 处理消息
 
-        # 删除所有 role=system & content='' 的消息  
-        req_messages = [
-            m for m in req_messages if not (m["role"] == "system" and m["content"].strip() == "")
-        ]
+        # system
+        system_role_message = None
 
-        # 检查是否有 role=system 的消息，若有，改为 role=user，并在后面加一个 role=assistant 的消息
-        system_role_index = []
-        for i, m in enumerate(req_messages):
-            if m["role"] == "system":
-                system_role_index.append(i)
-                m["role"] = "user"
+        for i, m in enumerate(messages):
+            if m.role == "system":
+                system_role_message = m
 
-        if system_role_index:
-            for i in system_role_index[::-1]:
-                req_messages.insert(i + 1, {"role": "assistant", "content": "Okay, I'll follow."})
+                messages.pop(i)
+                break
 
-        # 忽略掉空消息，用户可能发送空消息，而上层未过滤
-        req_messages = [
-            m for m in req_messages if m["content"].strip() != ""
-        ]
+        if isinstance(system_role_message, llm_entities.Message) \
+            and isinstance(system_role_message.content, str):
+            args['system'] = system_role_message.content
+
+        # 其他消息
+        # req_messages = [
+        #     m.dict(exclude_none=True) for m in messages \
+        #         if (isinstance(m.content, str) and m.content.strip() != "") \
+        #         or (isinstance(m.content, list) and )
+        # ]
+        # 暂时不支持vision，仅保留纯文字的content
+        req_messages = []
+
+        for m in messages:
+            if isinstance(m.content, str) and m.content.strip() != "":
+                req_messages.append(m.dict(exclude_none=True))
+            elif isinstance(m.content, list):
+                # 删除m.content中的type!=text的元素
+                m.content = [
+                    c for c in m.content if c.get("type") == "text"
+                ]
+
+                if len(m.content) > 0:
+                    req_messages.append(m.dict(exclude_none=True))
 
         args["messages"] = req_messages