vectorvein 0.2.44__py3-none-any.whl → 0.2.45__py3-none-any.whl

vectorvein/chat_clients/utils.py

@@ -489,7 +489,9 @@ def format_workflow_messages(message: dict, content: str, backend: BackendType):
                     "type": "function",
                     "function": {
                         "name": message["metadata"]["selected_workflow"]["function_name"],
-                        "arguments": json.dumps(message["metadata"]["selected_workflow"]["params"]),
+                        "arguments": json.dumps(
+                            message["metadata"]["selected_workflow"]["params"], ensure_ascii=False
+                        ),
                     },
                 }
             ],
@@ -513,7 +515,7 @@ def format_workflow_messages(message: dict, content: str, backend: BackendType):
             "content": json.dumps(
                 {
                     "name": message["metadata"]["selected_workflow"]["function_name"],
-                    "arguments": json.dumps(message["metadata"]["selected_workflow"]["params"]),
+                    "arguments": json.dumps(message["metadata"]["selected_workflow"]["params"], ensure_ascii=False),
                 },
                 ensure_ascii=False,
             ),
@@ -559,7 +561,12 @@ def format_workflow_messages(message: dict, content: str, backend: BackendType):
     return formatted_messages
 
 
-def transform_from_openai_message(message: ChatCompletionMessageParam, backend: BackendType):
+def transform_from_openai_message(
+    message: ChatCompletionMessageParam,
+    backend: BackendType,
+    native_multimodal: bool = False,
+    function_call_available: bool = False,
+):
     role = message.get("role", "user")
     content = message.get("content", "")
     tool_calls = message.get("tool_calls", [])
@@ -613,13 +620,57 @@ def transform_from_openai_message(message: ChatCompletionMessageParam, backend:
             else:
                 return {"role": role, "content": content}
     else:
-        return message  # 对于其他后端，保持原样
+        if isinstance(content, str):
+            if not function_call_available:
+                if message["role"] == "tool":
+                    return {
+                        "role": "user",
+                        "content": f"Tool<tool_call_id: {message['tool_call_id']}> Call result: {content}",
+                    }
+                elif message["role"] == "assistant":
+                    if tool_calls:
+                        tool_calls_content = json.dumps(tool_calls, ensure_ascii=False)
+                        content += f"Tool calls: {tool_calls_content}"
+                    return {"role": role, "content": content}
+
+            return message
+        elif isinstance(content, list):
+            formatted_content = []
+            for item in content:
+                if item["type"] == "image_url" and not native_multimodal:
+                    formatted_content.append({"type": "text", "text": f"Image<image_url: {item['image_url']['url']}>"})
+                else:
+                    formatted_content.append(item)
+
+            if not function_call_available:
+                if message["role"] == "tool":
+                    role = "user"
+                    formatted_content = [
+                        {
+                            "type": "text",
+                            "text": f"Tool<tool_call_id: {message['tool_call_id']}> Call result: {formatted_content}",
+                        }
+                    ]
+                elif message["role"] == "assistant":
+                    if tool_calls:
+                        tool_calls_content = json.dumps(tool_calls, ensure_ascii=False)
+                        formatted_content.append({"type": "text", "text": f"Tool calls: {tool_calls_content}"})
+
+                return {"role": role, "content": formatted_content}
+
+            if tool_calls:
+                return {"role": role, "content": formatted_content, "tool_calls": tool_calls}
+            else:
+                return {"role": role, "content": formatted_content}
+        else:
+            return message
 
 
 def format_messages(
     messages: list,
     backend: BackendType = BackendType.OpenAI,
     native_multimodal: bool = False,
+    function_call_available: bool = False,
 ) -> list:
     """将 VectorVein 和 OpenAI 的 Message 序列化后的格式转换为不同模型支持的格式
 
@@ -651,7 +702,9 @@ def format_messages(
                 formatted_messages.extend(format_workflow_messages(message, content, backend))
         else:
             # 处理 OpenAI 格式的消息
-            formatted_message = transform_from_openai_message(message, backend)
+            formatted_message = transform_from_openai_message(
+                message, backend, native_multimodal, function_call_available
+            )
             formatted_messages.append(formatted_message)
 
     return formatted_messages

{vectorvein-0.2.44.dist-info → vectorvein-0.2.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.2.44
+Version: 0.2.45
 Summary: VectorVein Python SDK
 Author-Email: Anderson <andersonby@163.com>
 License: MIT

{vectorvein-0.2.44.dist-info → vectorvein-0.2.45.dist-info}/RECORD

@@ -1,6 +1,6 @@
-vectorvein-0.2.44.dist-info/METADATA,sha256=2wdCQXnS2piq9XnsrS6wQ9Bt0BuGTuy3B0cq1AxaW_E,4570
-vectorvein-0.2.44.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.44.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.45.dist-info/METADATA,sha256=MOa2CywVU8Bj0cGja2WL5V1wdAMUf0YKhkxVG2uXxO8,4570
+vectorvein-0.2.45.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.45.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/api/__init__.py,sha256=lfY-XA46fgD2iIZTU0VYP8i07AwA03Egj4Qua0vUKrQ,738
 vectorvein/api/client.py,sha256=xF-leKDQzVyyy9FnIRaz0k4eElYW1XbbzeRLcpnyk90,33047
@@ -23,7 +23,7 @@ vectorvein/chat_clients/openai_compatible_client.py,sha256=HOL7sgWCBgwYdiAnNPCbO
 vectorvein/chat_clients/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/chat_clients/qwen_client.py,sha256=-ryh-m9PgsO0fc4ulcCmPTy1155J8YUy15uPoJQOHA0,513
 vectorvein/chat_clients/stepfun_client.py,sha256=zsD2W5ahmR4DD9cqQTXmJr3txrGuvxbRWhFlRdwNijI,519
-vectorvein/chat_clients/utils.py,sha256=OlyIomsDxpSV7R9PmMcL_elnUyMhriREx6W9jsQA8uw,27103
+vectorvein/chat_clients/utils.py,sha256=gpayOz5rfoINCAZRiKof5k4z_P2iW2XUxz6DQaheyRU,29393
 vectorvein/chat_clients/xai_client.py,sha256=eLFJJrNRJ-ni3DpshODcr3S1EJQLbhVwxyO1E54LaqM,491
 vectorvein/chat_clients/yi_client.py,sha256=RNf4CRuPJfixrwLZ3-DEc3t25QDe1mvZeb9sku2f8Bc,484
 vectorvein/chat_clients/zhipuai_client.py,sha256=Ys5DSeLCuedaDXr3PfG1EW2zKXopt-awO2IylWSwY0s,519
@@ -62,4 +62,4 @@ vectorvein/workflow/nodes/vector_db.py,sha256=t6I17q6iR3yQreiDHpRrksMdWDPIvgqJs0
 vectorvein/workflow/nodes/video_generation.py,sha256=qmdg-t_idpxq1veukd-jv_ChICMOoInKxprV9Z4Vi2w,4118
 vectorvein/workflow/nodes/web_crawlers.py,sha256=BhJBX1AZH7-22Gu95Ox4qJqmH5DU-m4dbUb5N5DTA-M,5559
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
-vectorvein-0.2.44.dist-info/RECORD,,
+vectorvein-0.2.45.dist-info/RECORD,,