vectorvein 0.2.64__py3-none-any.whl → 0.2.66__py3-none-any.whl

vectorvein/workflow/graph/workflow.py

@@ -3,6 +3,7 @@ from typing import List, Union, Dict, Any, Optional
 
 from .node import Node
 from .edge import Edge
+from .port import InputPort, OutputPort
 from ..utils.layout import layout
 from ..utils.check import (
     WorkflowCheckResult,
@@ -168,3 +169,171 @@ class Workflow:
         """
         layout(self.nodes, self.edges, options)
         return self
+
+    @classmethod
+    def from_json(cls, json_str: str) -> "Workflow":
+        """从 JSON 字符串创建工作流对象。
+
+        Args:
+            json_str: JSON 字符串
+
+        Returns:
+            Workflow: 工作流对象
+        """
+        workflow = cls()
+        data = json.loads(json_str)
+
+        # 创建节点
+        for node_data in data.get("nodes", []):
+            node_type = node_data["type"]
+            category = node_data["category"]
+            task_name = node_data["data"]["task_name"]
+
+            # 尝试动态导入节点类
+            NodeClass = None
+            try:
+                # 如果task_name包含分类信息
+                if "." in task_name:
+                    category, _ = task_name.split(".")
+                    module_path = f"vectorvein.workflow.nodes.{category}"
+                    module = __import__(module_path, fromlist=[node_type])
+                    if hasattr(module, node_type):
+                        NodeClass = getattr(module, node_type)
+            except (ImportError, AttributeError):
+                pass
+
+            if not NodeClass:
+                raise ValueError(f"Node class not found: {node_type}")
+            # 创建节点实例以获取默认值
+            node_instance = NodeClass()
+
+            # 使用节点实例的基本属性
+            node = Node(
+                node_type=node_type,
+                category=category,
+                task_name=task_name,
+                description=node_data["data"].get(
+                    "description", node_instance.description if hasattr(node_instance, "description") else ""
+                ),
+                node_id=node_data["id"],
+                position=node_data.get("position", {"x": 0, "y": 0}),
+                seleted_workflow_title=node_data["data"].get("seleted_workflow_title", ""),
+                is_template=node_data["data"].get("is_template", False),
+                initialized=node_data.get("initialized", False),
+                can_add_input_ports=node_data["data"].get("has_inputs", False),
+                can_add_output_ports=node_data["data"].get("has_outputs", False),
+            )
+
+            # 处理端口
+            for port_name, port_data in node_data["data"].get("template", {}).items():
+                # 如果端口已存在于节点实例中，直接修改其属性
+                if port_name in node_instance.ports:
+                    # 直接修改原始端口的属性，而不是创建新端口
+                    port = node_instance.ports[port_name]
+
+                    # 更新端口的属性
+                    if "field_type" in port_data:
+                        port.port_type = port_data["field_type"]
+                    if "required" in port_data:
+                        port.required = port_data["required"]
+                    if "show" in port_data:
+                        port.show = port_data["show"]
+                    if "value" in port_data:
+                        port.value = port_data["value"]
+                    if "options" in port_data:
+                        port.options = port_data["options"]
+                    if "type" in port_data:
+                        port.field_type = port_data["type"]
+                    if "max_length" in port_data:
+                        port.max_length = port_data["max_length"]
+                    if "support_file_types" in port_data and port_data["support_file_types"]:
+                        port.support_file_types = port_data["support_file_types"].split(", ")
+                    if "multiple" in port_data:
+                        port.multiple = port_data["multiple"]
+                    if "group" in port_data:
+                        port.group = port_data["group"]
+                    if "group_collpased" in port_data:
+                        port.group_collpased = port_data["group_collpased"]
+                    if "has_tooltip" in port_data:
+                        port.has_tooltip = port_data["has_tooltip"]
+                    if "max" in port_data:
+                        port.max = port_data["max"]
+                    if "min" in port_data:
+                        port.min = port_data["min"]
+                    if "list" in port_data:
+                        port.list = port_data["list"]
+                else:
+                    # 对于新添加的端口，检查是否允许添加
+                    port_type = port_data.get("field_type", "text")
+                    is_output = port_data.get("is_output", False)
+
+                    # 检查节点是否允许添加该类型的端口
+                    if (is_output and not node.can_add_output_ports) or (
+                        not is_output and not node.can_add_input_ports
+                    ):
+                        # 如果不允许添加，跳过该端口
+                        continue
+
+                    # 创建并添加新端口
+                    if is_output:
+                        port = OutputPort(
+                            name=port_name,
+                            port_type=port_type,
+                            required=port_data.get("required", False),
+                            show=port_data.get("show", False),
+                            value=port_data.get("value"),
+                            options=port_data.get("options"),
+                            field_type=port_data.get("type"),
+                            max_length=port_data.get("max_length"),
+                            support_file_types=port_data.get("support_file_types", "").split(", ")
+                            if port_data.get("support_file_types")
+                            else None,
+                            multiple=port_data.get("multiple"),
+                            group=port_data.get("group"),
+                            group_collpased=port_data.get("group_collpased", False),
+                            has_tooltip=port_data.get("has_tooltip", False),
+                            max=port_data.get("max"),
+                            min=port_data.get("min"),
+                            list=port_data.get("list", False),
+                        )
+                    else:
+                        port = InputPort(
+                            name=port_name,
+                            port_type=port_type,
+                            required=port_data.get("required", True),
+                            show=port_data.get("show", False),
+                            value=port_data.get("value"),
+                            options=port_data.get("options"),
+                            field_type=port_data.get("type"),
+                            max_length=port_data.get("max_length"),
+                            support_file_types=port_data.get("support_file_types", "").split(", ")
+                            if port_data.get("support_file_types")
+                            else None,
+                            multiple=port_data.get("multiple"),
+                            group=port_data.get("group"),
+                            group_collpased=port_data.get("group_collpased", False),
+                            has_tooltip=port_data.get("has_tooltip", False),
+                            max=port_data.get("max"),
+                            min=port_data.get("min"),
+                            list=port_data.get("list", False),
+                        )
+
+                    # 添加新端口到节点
+                    node.ports[port_name] = port
+
+            workflow.add_node(node)
+
+        # 创建边
+        for edge_data in data.get("edges", []):
+            edge = Edge(
+                id=edge_data["id"],
+                source=edge_data["source"],
+                source_handle=edge_data["sourceHandle"],
+                target=edge_data["target"],
+                target_handle=edge_data["targetHandle"],
+                animated=edge_data.get("animated", True),
+                type=edge_data.get("type", "default"),
+            )
+            workflow.add_edge(edge)
+
+        return workflow

vectorvein/workflow/utils/json_to_code.py

@@ -86,6 +86,16 @@ def generate_python_code(
     node_imports = set()
     node_instances = {}
 
+    # 收集所有连接的端口
+    connected_ports = set()
+    for edge in workflow_data["edges"]:
+        source_id = edge["source"]
+        target_id = edge["target"]
+        source_handle = edge["sourceHandle"]
+        target_handle = edge["targetHandle"]
+        connected_ports.add((source_id, source_handle))
+        connected_ports.add((target_id, target_handle))
+
     # 解析节点并生成导入语句
     for node in workflow_data["nodes"]:
         node_type = node["type"]
@@ -125,7 +135,13 @@ def generate_python_code(
             port_value = port["value"]
             default_value = node_instance.ports[port_name].value if port_name in node_instance.ports else None
 
-            if port_value and port_value != default_value:
+            # 判断端口是否有值且值与默认不同，并且端口满足以下条件之一：有连接、是输入端口、在UI上显示
+            port_is_connected = (node["id"], port["name"]) in connected_ports
+            if (
+                port_value
+                and port_value != default_value
+                and (port_is_connected or not port.get("is_output", False) or port.get("show", False))
+            ):
                 values.append(port)
 
         node_instances[node["id"]] = {
@@ -156,6 +172,8 @@ def generate_python_code(
     code.append("")
     for node_info in node_instances.values():
         for port in node_info["add_ports"]:
+            if "name" not in port:
+                continue
             params = [
                 f"name={to_python_str(port['name'])}",
                 f"port_type={to_python_str(port['field_type'])}",

{vectorvein-0.2.64.dist-info → vectorvein-0.2.66.dist-info}/METADATA

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

{vectorvein-0.2.64.dist-info → vectorvein-0.2.66.dist-info}/RECORD

@@ -1,6 +1,6 @@
-vectorvein-0.2.64.dist-info/METADATA,sha256=Rd5tC_nxsZ9vTIatBOc10n_0OFxSwoK4gf8H_Jq39Pk,4570
-vectorvein-0.2.64.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.64.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.66.dist-info/METADATA,sha256=F0vYXH6hGEh9Og1VPt3DWzsMEEwRESIgks7WjQj--NU,4570
+vectorvein-0.2.66.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.66.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
@@ -44,7 +44,7 @@ vectorvein/utilities/retry.py,sha256=6KFS9R2HdhqM3_9jkjD4F36ZSpEx2YNFGOVlpOsUetM
 vectorvein/workflow/graph/edge.py,sha256=1ckyyjCue_PLm7P1ItUfKOy6AKkemOpZ9m1WJ8UXIHQ,1072
 vectorvein/workflow/graph/node.py,sha256=WtO4MkeMQr59zNl9N2ZoYiCZcVKxebSp1rKMPONmfqk,5628
 vectorvein/workflow/graph/port.py,sha256=HcinzQqNP7ysTvBmi3c4iaWne8nV6m-BpFFX0jTrMIE,7122
-vectorvein/workflow/graph/workflow.py,sha256=f5KAQUXTKii7UFYmSZeZZQ7JCKKPmJlUg0iFAfBEJQE,6366
+vectorvein/workflow/graph/workflow.py,sha256=TfBvuspF1uHxmZl4VThgsXA07xiPvMT_mzd1oUvZ9Ww,14600
 vectorvein/workflow/nodes/__init__.py,sha256=dWrWtL3q0Vsn-MLgJ7gNgLCrwZ5BrqjrN2QFPNeBMuc,3240
 vectorvein/workflow/nodes/audio_generation.py,sha256=ZRFZ_ycMTSJ2LKmekctagQdJYTl-3q4TNOIKETpS9AM,5870
 vectorvein/workflow/nodes/control_flows.py,sha256=fDySWek8Isbfznwn0thmbTwTP4c99w68Up9dlASAtIo,6805
@@ -62,6 +62,6 @@ vectorvein/workflow/nodes/vector_db.py,sha256=p9AT_E8ASbcYHZqHYTCIGvqkIqzxaFM4Ux
 vectorvein/workflow/nodes/video_generation.py,sha256=qmdg-t_idpxq1veukd-jv_ChICMOoInKxprV9Z4Vi2w,4118
 vectorvein/workflow/nodes/web_crawlers.py,sha256=FB0bTimkk___p3Z5UwQx2YarJyQCc45jjnbXbgGA_qw,5640
 vectorvein/workflow/utils/check.py,sha256=Oj_S5WQf4_Fr_ro3ipjZt9unKFSFcuwZrrSmrS9kVLE,10193
-vectorvein/workflow/utils/json_to_code.py,sha256=zCobrmWN33WP6t7i5Yx-lAJMM_PbhJ4H1ckceGB6FqI,6292
+vectorvein/workflow/utils/json_to_code.py,sha256=ozdENkT1fYO67XdZX3Una5_jhGEUJdwD0DfZh0x4q3w,7120
 vectorvein/workflow/utils/layout.py,sha256=j0bRD3uaXu40xCS6U6BGahBI8FrHa5MiF55GbTrZ1LM,4565
-vectorvein-0.2.64.dist-info/RECORD,,
+vectorvein-0.2.66.dist-info/RECORD,,