vectorvein 0.2.43__tar.gz → 0.2.45__tar.gz

{vectorvein-0.2.43 → vectorvein-0.2.45}/PKG-INFO

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

{vectorvein-0.2.43 → vectorvein-0.2.45}/pyproject.toml

@@ -17,7 +17,7 @@ description = "VectorVein Python SDK"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.2.43"
+version = "0.2.45"
 
 [project.license]
 text = "MIT"

{vectorvein-0.2.43 → vectorvein-0.2.45}/src/vectorvein/chat_clients/anthropic_client.py

@@ -211,7 +211,7 @@ class AnthropicChatClient(BaseChatClient):
     def raw_client(self):  # type: ignore
         self.endpoint, self.model_id = self._set_endpoint()
 
-        if self.endpoint.proxy is not None and self.http_client is None:
+        if self.endpoint.proxy and self.http_client is None:
             self.http_client = httpx.Client(proxy=self.endpoint.proxy)
 
         if self.endpoint.is_vertex or self.endpoint.endpoint_type == "anthropic_vertex":
@@ -759,7 +759,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
     def raw_client(self):  # type: ignore
         self.endpoint, self.model_id = self._set_endpoint()
 
-        if self.endpoint.proxy is not None and self.http_client is None:
+        if self.endpoint.proxy and self.http_client is None:
             self.http_client = httpx.AsyncClient(proxy=self.endpoint.proxy)
 
         if self.endpoint.is_vertex or self.endpoint.endpoint_type == "anthropic_vertex":

{vectorvein-0.2.43 → vectorvein-0.2.45}/src/vectorvein/chat_clients/openai_compatible_client.py

@@ -90,7 +90,7 @@ class OpenAICompatibleChatClient(BaseChatClient):
     def raw_client(self) -> OpenAI | AzureOpenAI:
         self.endpoint, self.model_id = self._set_endpoint()
 
-        if self.endpoint.proxy is not None and self.http_client is None:
+        if self.endpoint.proxy and self.http_client is None:
             self.http_client = httpx.Client(proxy=self.endpoint.proxy)
 
         if self.endpoint.is_azure or self.endpoint.endpoint_type == "openai_azure":
@@ -565,7 +565,7 @@ class AsyncOpenAICompatibleChatClient(BaseAsyncChatClient):
     def raw_client(self):
         self.endpoint, self.model_id = self._set_endpoint()
 
-        if self.endpoint.proxy is not None and self.http_client is None:
+        if self.endpoint.proxy and self.http_client is None:
             self.http_client = httpx.AsyncClient(proxy=self.endpoint.proxy)
 
         if self.endpoint.is_azure or self.endpoint.endpoint_type == "openai_azure":

{vectorvein-0.2.43 → vectorvein-0.2.45}/src/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