vectorvein 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

vectorvein/workflow/graph/node.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import Dict, Any, Optional, List, Union, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from .port import InputPort, OutputPort
 
@@ -8,7 +8,7 @@ if TYPE_CHECKING:
     from .port import PortType, Port
 
 
-class PortsDict(Dict[str, "Port"]):
+class PortsDict(dict[str, "Port"]):
     """自定义字典类，用于管理节点的端口，并强制执行端口添加权限。"""
 
     def __init__(self, owner_node: "Node", *args, **kwargs):
@@ -22,13 +22,9 @@ class PortsDict(Dict[str, "Port"]):
             return
 
         if isinstance(value, OutputPort) and not self._owner_node.can_add_output_ports:
-            raise ValueError(
-                f"Node<{self._owner_node.id}> '{self._owner_node.type}' does not allow adding output ports"
-            )
+            raise ValueError(f"Node<{self._owner_node.id}> '{self._owner_node.type}' does not allow adding output ports")
         elif isinstance(value, InputPort) and not self._owner_node.can_add_input_ports:
-            raise ValueError(
-                f"Node<{self._owner_node.id}> '{self._owner_node.type}' does not allow adding input ports"
-            )
+            raise ValueError(f"Node<{self._owner_node.id}> '{self._owner_node.type}' does not allow adding input ports")
 
         super().__setitem__(key, value)
 
@@ -44,9 +40,9 @@ class Node:
         category: str,
         task_name: str,
         description: str = "",
-        ports: Optional[Dict[str, "Port"]] = None,
-        node_id: Optional[str] = None,
-        position: Optional[Dict[str, float]] = None,
+        ports: dict[str, "Port"] | None = None,
+        node_id: str | None = None,
+        position: dict[str, float] | None = None,
         seleted_workflow_title: str = "",
         is_template: bool = False,
         initialized: bool = False,
@@ -67,7 +63,7 @@ class Node:
                 self.ports[name] = port
         self.ports.finish_initialization()
 
-        self.position: Dict[str, float] = position or {"x": 0, "y": 0}
+        self.position: dict[str, float] = position or {"x": 0, "y": 0}
         self.seleted_workflow_title: str = seleted_workflow_title
         self.is_template: bool = is_template
         self.initialized: bool = initialized
@@ -78,10 +74,10 @@ class Node:
     def add_port(
         self,
         name: str,
-        port_type: Union["PortType", str],
+        port_type: "PortType | str",
         show: bool = False,
         value: Any = None,
-        options: Optional[List[Any]] = None,
+        options: list[Any] | None = None,
         is_output: bool = False,
         **kwargs,
     ):
@@ -91,20 +87,16 @@ class Node:
 
             if self.has_port(name):
                 raise ValueError(f"Node<{self.id}> '{self.type}' already has a port named '{name}'")
-            self.ports[name] = OutputPort(
-                name=name, port_type=port_type, show=show, value=value, options=options, **kwargs
-            )
+            self.ports[name] = OutputPort(name=name, port_type=port_type, show=show, value=value, options=options, **kwargs)
         else:
             if not self.can_add_input_ports:
                 raise ValueError(f"Node<{self.id}> '{self.type}' does not allow adding input ports")
 
             if self.has_port(name):
                 raise ValueError(f"Node<{self.id}> '{self.type}' already has a port named '{name}'")
-            self.ports[name] = InputPort(
-                name=name, port_type=port_type, show=show, value=value, options=options, **kwargs
-            )
+            self.ports[name] = InputPort(name=name, port_type=port_type, show=show, value=value, options=options, **kwargs)
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         # 如果端口有条件表达式，且根据条件不能显示，则端口 show 要强制设置为 False
         for port in self.ports.values():
             port_show = port.show
@@ -121,11 +113,7 @@ class Node:
                 "description": self.description,
                 "seleted_workflow_title": self.seleted_workflow_title,
                 "is_template": self.is_template,
-                "template": {
-                    port_name: port.to_dict()
-                    for port_name, port in self.ports.items()
-                    if port_name not in ["debug", "seleted_workflow_title", "is_template"]
-                },
+                "template": {port_name: port.to_dict() for port_name, port in self.ports.items() if port_name not in ["debug", "seleted_workflow_title", "is_template"]},
             },
             "category": self.category,
             "position": self.position,

vectorvein/workflow/graph/port.py

@@ -1,5 +1,6 @@
 from enum import Enum
-from typing import Optional, Any, Dict, List, Union, Callable
+from typing import Any
+from collections.abc import Callable
 
 
 class PortType(Enum):
@@ -20,24 +21,24 @@ class Port:
     def __init__(
         self,
         name: str,
-        port_type: Union[PortType, str],
+        port_type: "PortType | str",
         required: bool = True,
         show: bool = False,
         value: Any = None,
-        options: Optional[List[Any]] = None,
-        field_type: Optional[str] = None,
+        options: list[Any] | None = None,
+        field_type: str | None = None,
         is_output: bool = False,
-        condition: Optional[str] = None,
-        condition_python: Optional[Callable[[Dict[str, "Port"]], bool]] = None,
-        max_length: Optional[int] = None,
-        support_file_types: Optional[List[str]] = None,
-        multiple: Optional[bool] = None,
-        group: Optional[str] = None,
+        condition: str | None = None,
+        condition_python: Callable[[dict[str, "Port"]], bool] | None = None,
+        max_length: int | None = None,
+        support_file_types: list[str] | None = None,
+        multiple: bool | None = None,
+        group: str | None = None,
         group_collpased: bool = False,
         has_tooltip: bool = False,
-        max: Optional[Union[int, float]] = None,
-        min: Optional[Union[int, float]] = None,
-        max_count: Optional[int] = None,
+        max: int | float | None = None,
+        min: int | float | None = None,
+        max_count: int | None = None,
         list: bool = False,
     ) -> None:
         self.name = name
@@ -72,7 +73,7 @@ class Port:
         else:
             return "str"
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         return {
             "name": self.name,
             "display_name": self.name,
@@ -102,7 +103,7 @@ class Port:
     @value.setter
     def value(self, value: Any) -> None:
         if self.options:
-            if value not in map(lambda x: x["value"], self.options):
+            if value not in (x["value"] for x in self.options):
                 raise ValueError(f"Value `{value}` is not in Port `{self.name}` options {self.options}")
         self._value = value
 
@@ -117,23 +118,23 @@ class InputPort(Port):
     def __init__(
         self,
         name: str,
-        port_type: Union[PortType, str],
+        port_type: PortType | str,
         required: bool = True,
         show: bool = False,
         value: Any = None,
-        options: Optional[List[Any]] = None,
-        field_type: Optional[str] = None,
-        condition: Optional[str] = None,
-        condition_python: Optional[Callable[[Dict[str, "Port"]], bool]] = None,
-        max_length: Optional[int] = None,
-        support_file_types: Optional[List[str]] = None,
-        multiple: Optional[bool] = None,
-        group: Optional[str] = None,
+        options: list[Any] | None = None,
+        field_type: str | None = None,
+        condition: str | None = None,
+        condition_python: Callable[[dict[str, "Port"]], bool] | None = None,
+        max_length: int | None = None,
+        support_file_types: list[str] | None = None,
+        multiple: bool | None = None,
+        group: str | None = None,
         group_collpased: bool = False,
         has_tooltip: bool = False,
-        max: Optional[Union[int, float]] = None,
-        min: Optional[Union[int, float]] = None,
-        max_count: Optional[int] = None,
+        max: int | float | None = None,
+        min: int | float | None = None,
+        max_count: int | None = None,
         list: bool = False,
     ) -> None:
         super().__init__(
@@ -164,23 +165,23 @@ class OutputPort(Port):
     def __init__(
         self,
         name: str = "output",
-        port_type: Union[PortType, str] = PortType.TEXT,
+        port_type: PortType | str = PortType.TEXT,
         required: bool = False,
         show: bool = False,
         value: Any = None,
-        options: Optional[List[Any]] = None,
-        field_type: Optional[str] = None,
-        condition: Optional[str] = None,
-        condition_python: Optional[Callable[[Dict[str, "Port"]], bool]] = None,
-        max_length: Optional[int] = None,
-        support_file_types: Optional[List[str]] = None,
-        multiple: Optional[bool] = None,
-        group: Optional[str] = None,
+        options: list[Any] | None = None,
+        field_type: str | None = None,
+        condition: str | None = None,
+        condition_python: Callable[[dict[str, "Port"]], bool] | None = None,
+        max_length: int | None = None,
+        support_file_types: list[str] | None = None,
+        multiple: bool | None = None,
+        group: str | None = None,
         group_collpased: bool = False,
         has_tooltip: bool = False,
-        max: Optional[Union[int, float]] = None,
-        min: Optional[Union[int, float]] = None,
-        max_count: Optional[int] = None,
+        max: int | float | None = None,
+        min: int | float | None = None,
+        max_count: int | None = None,
         list: bool = False,
     ) -> None:
         super().__init__(

vectorvein/workflow/graph/workflow.py

@@ -1,5 +1,5 @@
 import json
-from typing import List, Union, Dict, Any, Optional
+from typing import Any
 
 from .node import Node
 from .edge import Edge
@@ -18,13 +18,13 @@ from ..utils.check import (
 
 class Workflow:
     def __init__(self) -> None:
-        self.nodes: List[Node] = []
-        self.edges: List[Edge] = []
+        self.nodes: list[Node] = []
+        self.edges: list[Edge] = []
 
     def add_node(self, node: Node):
         self.nodes.append(node)
 
-    def add_nodes(self, nodes: List[Node]):
+    def add_nodes(self, nodes: list[Node]):
         self.nodes.extend(nodes)
 
     def add_edge(self, edge: Edge):
@@ -32,9 +32,9 @@ class Workflow:
 
     def connect(
         self,
-        source_node: Union[str, Node],
+        source_node: str | Node,
         source_port: str,
-        target_node: Union[str, Node],
+        target_node: str | Node,
         target_port: str,
     ):
         # 获取源节点ID
@@ -72,9 +72,7 @@ class Workflow:
         # 确保目标端口是InputPort而不是OutputPort
         target_port_obj = target_node_obj.ports[target_port]
         if isinstance(target_port_obj, OutputPort):
-            raise ValueError(
-                f"The target port {target_port} of node {target_node_id} is an output port. OutputPort cannot be a connection target."
-            )
+            raise ValueError(f"The target port {target_port} of node {target_node_id} is an output port. OutputPort cannot be a connection target.")
 
         # 检查目标端口是否已有被连接的线
         for edge in self.edges:
@@ -161,7 +159,7 @@ class Workflow:
 
         return result
 
-    def layout(self, options: Optional[Dict[str, Any]] = None) -> "Workflow":
+    def layout(self, options: dict[str, Any] | None = None) -> "Workflow":
         """对工作流中的节点进行自动布局，计算并更新每个节点的位置。
 
         此方法实现了一个简单的分层布局算法，将节点按照有向图的拓扑结构进行排列。
@@ -222,9 +220,7 @@ class Workflow:
                 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 ""
-                ),
+                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", ""),
@@ -278,9 +274,7 @@ class Workflow:
                     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
-                    ):
+                    if (is_output and not node.can_add_output_ports) or (not is_output and not node.can_add_input_ports):
                         # 如果不允许添加，跳过该端口
                         continue
 
@@ -295,9 +289,7 @@ class Workflow:
                             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,
+                            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),
@@ -316,9 +308,7 @@ class Workflow:
                             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,
+                            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),
@@ -348,9 +338,7 @@ class Workflow:
             if target_node.has_port(target_port_name):
                 target_port = target_node.ports[target_port_name]
                 if isinstance(target_port, OutputPort):
-                    raise ValueError(
-                        f"The target port {target_port_name} of node {target_node_id} is an output port. OutputPort cannot be a connection target."
-                    )
+                    raise ValueError(f"The target port {target_port_name} of node {target_node_id} is an output port. OutputPort cannot be a connection target.")
 
             edge = Edge(
                 id=edge_data["id"],

vectorvein/workflow/nodes/audio_generation.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 from ..graph.node import Node
 from ..graph.port import PortType, InputPort, OutputPort
 
 
 class MinimaxMusicGeneration(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="MinimaxMusicGeneration",
             category="audio_generation",
@@ -15,7 +13,7 @@ class MinimaxMusicGeneration(Node):
                 "audio_file": InputPort(
                     name="audio_file",
                     port_type=PortType.FILE,
-                    value=list(),
+                    value=[],
                     support_file_types=[".wav", ".mp3"],
                     multiple=True,
                 ),
@@ -88,7 +86,7 @@ class MinimaxMusicGeneration(Node):
 
 
 class SoundEffects(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="SoundEffects",
             category="audio_generation",
@@ -105,7 +103,7 @@ class SoundEffects(Node):
                 "video": InputPort(
                     name="video",
                     port_type=PortType.FILE,
-                    value=list(),
+                    value=[],
                     support_file_types=[".mp4", ".mov", ".webm", ".m4v", ".gif"],
                     multiple=True,
                 ),
@@ -131,7 +129,7 @@ class SoundEffects(Node):
 
 
 class Tts(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="Tts",
             category="audio_generation",

vectorvein/workflow/nodes/control_flows.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 from ..graph.node import Node
 from ..graph.port import PortType, InputPort, OutputPort
 
 
 class Conditional(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="Conditional",
             category="control_flows",
@@ -66,7 +64,7 @@ class Conditional(Node):
 
 
 class Empty(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="Empty",
             category="control_flows",
@@ -84,7 +82,7 @@ class Empty(Node):
 
 
 class HumanFeedback(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="HumanFeedback",
             category="control_flows",
@@ -107,7 +105,7 @@ class HumanFeedback(Node):
 
 
 class JsonProcess(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="JsonProcess",
             category="control_flows",
@@ -140,7 +138,7 @@ class JsonProcess(Node):
                 "keys": InputPort(
                     name="keys",
                     port_type=PortType.INPUT,
-                    value=list(),
+                    value=[],
                 ),
                 "default_value": InputPort(
                     name="default_value",
@@ -156,7 +154,7 @@ class JsonProcess(Node):
 
 
 class RandomChoice(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="RandomChoice",
             category="control_flows",
@@ -166,7 +164,7 @@ class RandomChoice(Node):
                 "input": InputPort(
                     name="input",
                     port_type=PortType.LIST,
-                    value=list(),
+                    value=[],
                 ),
                 "output": OutputPort(),
             },

vectorvein/workflow/nodes/file_processing.py

@@ -1,11 +1,9 @@
-from typing import Optional
-
 from ..graph.node import Node
 from ..graph.port import PortType, InputPort, OutputPort
 
 
 class FileLoader(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="FileLoader",
             category="file_processing",
@@ -15,7 +13,7 @@ class FileLoader(Node):
                 "files": InputPort(
                     name="files",
                     port_type=PortType.FILE,
-                    value=list(),
+                    value=[],
                     multiple=True,
                     show=True,
                 ),
@@ -67,7 +65,7 @@ class FileLoader(Node):
 
 
 class FileUpload(Node):
-    def __init__(self, id: Optional[str] = None):
+    def __init__(self, id: str | None = None):
         super().__init__(
             node_type="FileUpload",
             category="file_processing",
@@ -77,7 +75,7 @@ class FileUpload(Node):
                 "files": InputPort(
                     name="files",
                     port_type=PortType.FILE,
-                    value=list(),
+                    value=[],
                     support_file_types=["*/*"],
                     multiple=True,
                     show=True,