vectorvein 0.2.44__tar.gz → 0.2.46__tar.gz

{vectorvein-0.2.44 → vectorvein-0.2.46}/PKG-INFO

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

{vectorvein-0.2.44 → vectorvein-0.2.46}/pyproject.toml

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

{vectorvein-0.2.44 → vectorvein-0.2.46}/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

{vectorvein-0.2.44 → vectorvein-0.2.46}/src/vectorvein/workflow/graph/workflow.py

@@ -3,13 +3,23 @@ from typing import List, Union, TypedDict
 
 from .node import Node
 from .edge import Edge
+from .port import InputPort
 
 
-class WorkflowCheckResult(TypedDict):
+class UIWarning(TypedDict, total=False):
+    """UI警告类型。"""
+
+    input_ports_shown_but_connected: list[dict]  # 显示的输入端口但被连接
+    has_shown_input_ports: bool  # 是否存在显示的输入端口
+    has_output_nodes: bool  # 是否存在输出节点
+
+
+class WorkflowCheckResult(TypedDict, total=False):
     """工作流检查结果类型。"""
 
     no_cycle: bool  # 工作流是否不包含环
     no_isolated_nodes: bool  # 工作流是否不包含孤立节点
+    ui_warnings: UIWarning  # UI相关警告
 
 
 class Workflow:
@@ -215,10 +225,61 @@ class Workflow:
 
         return result
 
+    def _check_ui(self) -> UIWarning:
+        """
+        检查工作流的 UI 情况。
+        以下情况会警告：
+        1. 某个输入端口的 show=True，但是又有连线连接到该端口（实际运行时会被覆盖）。
+        2. 整个工作流没有任何输入端口是 show=True 的，说明没有让用户输入的地方。
+        3. 整个工作流没有任何输出节点，这样工作流结果无法呈现。
+        """
+        warnings: UIWarning = {
+            "input_ports_shown_but_connected": [],
+            "has_shown_input_ports": False,
+            "has_output_nodes": False,
+        }
+
+        # 检查是否有任何显示的输入端口
+        has_shown_input_ports = False
+
+        # 找出所有连接的目标端口
+        connected_ports = {(edge.target, edge.target_handle) for edge in self.edges}
+
+        # 遍历所有节点
+        for node in self.nodes:
+            # 检查是否为输出节点
+            if hasattr(node, "category") and node.category == "outputs":
+                warnings["has_output_nodes"] = True
+
+            # 检查节点的输入端口
+            for port_name in node.ports.keys() if hasattr(node, "ports") else []:
+                port = node.ports.get(port_name)
+                # 确保是输入端口且设置为显示
+                if hasattr(port, "show") and getattr(port, "show", False) and isinstance(port, InputPort):
+                    has_shown_input_ports = True
+
+                    # 检查显示的端口是否也被连接
+                    if (node.id, port_name) in connected_ports:
+                        warnings["input_ports_shown_but_connected"].append(
+                            {"node_id": node.id, "node_type": node.type, "port_name": port_name}
+                        )
+
+        # 如果没有任何显示的输入端口
+        warnings["has_shown_input_ports"] = has_shown_input_ports
+
+        return warnings
+
     def check(self) -> WorkflowCheckResult:
         """检查流程图的有效性。
 
         Returns:
             WorkflowCheckResult: 包含各种检查结果的字典
         """
-        return self._check_dag()
+        dag_check = self._check_dag()
+        ui_check = self._check_ui()
+
+        # 合并结果
+        result: WorkflowCheckResult = dag_check
+        result["ui_warnings"] = ui_check
+
+        return result

{vectorvein-0.2.44 → vectorvein-0.2.46}/src/vectorvein/workflow/nodes/file_processing.py

@@ -17,6 +17,7 @@ class FileLoader(Node):
                     port_type=PortType.FILE,
                     value=list(),
                     multiple=True,
+                    show=True,
                 ),
                 "parse_quality": InputPort(
                     name="parse_quality",
@@ -75,6 +76,7 @@ class FileUpload(Node):
                     value=list(),
                     support_file_types=["*/*"],
                     multiple=True,
+                    show=True,
                 ),
                 "unzip_files": InputPort(
                     name="unzip_files",

{vectorvein-0.2.44 → vectorvein-0.2.46}/src/vectorvein/workflow/nodes/image_generation.py

@@ -18,6 +18,7 @@ class BackgroundGeneration(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "remove_background": InputPort(
                     name="remove_background",
@@ -266,6 +267,7 @@ class Inpainting(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "inpainting_method": InputPort(
                     name="inpainting_method",
@@ -402,12 +404,14 @@ class Pulid(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "prompt": InputPort(
                     name="prompt",
                     port_type=PortType.TEXTAREA,
                     value="",
                     multiple=True,
+                    show=True,
                 ),
                 "negative_prompt": InputPort(
                     name="negative_prompt",

{vectorvein-0.2.44 → vectorvein-0.2.46}/src/vectorvein/workflow/nodes/media_editing.py

@@ -18,6 +18,7 @@ class AudioEditing(Node):
                     value=list(),
                     support_file_types=[".mp3", ".wav", ".ogg", ".m4a"],
                     multiple=True,
+                    show=True,
                 ),
                 "audio_processing_logic": InputPort(
                     name="audio_processing_logic",
@@ -166,6 +167,7 @@ class ImageBackgroundRemoval(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "remove_background_method": InputPort(
                     name="remove_background_method",
@@ -223,6 +225,7 @@ class ImageEditing(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "crop": InputPort(
                     name="crop",
@@ -365,6 +368,7 @@ class ImageSegmentation(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "selection_method": InputPort(
                     name="selection_method",
@@ -426,6 +430,7 @@ class ImageWatermark(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
+                    show=True,
                 ),
                 "image_or_text": InputPort(
                     name="image_or_text",
@@ -559,6 +564,7 @@ class VideoEditing(Node):
                     value=list(),
                     support_file_types=["video/*"],
                     multiple=True,
+                    show=True,
                 ),
                 "video_processing_logic": InputPort(
                     name="video_processing_logic",
@@ -637,6 +643,7 @@ class VideoScreenshot(Node):
                     value=list(),
                     support_file_types=["video/*"],
                     multiple=True,
+                    show=True,
                 ),
                 "screenshot_method": InputPort(
                     name="screenshot_method",

{vectorvein-0.2.44 → vectorvein-0.2.46}/src/vectorvein/workflow/nodes/media_processing.py

@@ -51,6 +51,7 @@ class ClaudeVision(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -100,6 +101,7 @@ class DeepseekVl(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -159,6 +161,7 @@ class GeminiVision(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -210,6 +213,7 @@ class GlmVision(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.images_or_urls.value == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -260,6 +264,7 @@ class GptVision(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -320,6 +325,7 @@ class InternVision(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -366,6 +372,7 @@ class Ocr(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -439,6 +446,7 @@ class QwenVision(Node):
                     multiple=True,
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="fields_data.get('images_or_urls') == 'images'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",
@@ -475,6 +483,7 @@ class SpeechRecognition(Node):
                     multiple=True,
                     support_file_types=[".wav", ".mp3", ".mp4", ".m4a", ".wma", ".aac", ".ogg", ".amr", ".flac"],
                     condition="fields_data.get('files_or_urls') == 'files'",
+                    show=True,
                 ),
                 "urls": InputPort(
                     name="urls",