vectorvein 0.2.61__tar.gz → 0.2.63__tar.gz

{vectorvein-0.2.61 → vectorvein-0.2.63}/PKG-INFO

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

{vectorvein-0.2.61 → vectorvein-0.2.63}/pyproject.toml

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

{vectorvein-0.2.61 → vectorvein-0.2.63}/src/vectorvein/workflow/graph/node.py

@@ -1,10 +1,14 @@
 import uuid
-from typing import Dict, Any, Optional, List, Union
+from typing import Dict, Any, Optional, List, Union, TYPE_CHECKING
 
-from .port import PortType, Port, InputPort, OutputPort
+from .port import InputPort, OutputPort
 
 
-class PortsDict(Dict[str, Port]):
+if TYPE_CHECKING:
+    from .port import PortType, Port
+
+
+class PortsDict(Dict[str, "Port"]):
     """自定义字典类，用于管理节点的端口，并强制执行端口添加权限。"""
 
     def __init__(self, owner_node: "Node", *args, **kwargs):
@@ -12,7 +16,7 @@ class PortsDict(Dict[str, Port]):
         self._owner_node = owner_node
         self._initializing = True
 
-    def __setitem__(self, key: str, value: Port) -> None:
+    def __setitem__(self, key: str, value: "Port") -> None:
         if self._initializing or key in self:
             super().__setitem__(key, value)
             return
@@ -40,7 +44,7 @@ class Node:
         category: str,
         task_name: str,
         description: str = "",
-        ports: Optional[Dict[str, Any]] = None,
+        ports: Optional[Dict[str, "Port"]] = None,
         node_id: Optional[str] = None,
         position: Optional[Dict[str, float]] = None,
         seleted_workflow_title: str = "",
@@ -74,7 +78,7 @@ class Node:
     def add_port(
         self,
         name: str,
-        port_type: Union[PortType, str],
+        port_type: Union["PortType", str],
         show: bool = False,
         value: Any = None,
         options: Optional[List[Any]] = None,

{vectorvein-0.2.61 → vectorvein-0.2.63}/src/vectorvein/workflow/utils/json_to_code.py

@@ -142,8 +142,8 @@ def generate_python_code(
         code.append("")
 
     # 生成节点实例化代码
-    for info in node_instances.values():
-        code.append(f"{info['var_name']} = {info['type']}()")
+    for node_info in node_instances.values():
+        code.append(f"{node_info['var_name']} = {node_info['type']}()")
 
     code.append("")
     code.append("workflow = Workflow()")
@@ -153,8 +153,8 @@ def generate_python_code(
     code.append(f"workflow.add_nodes([\n{'\n'.join(node_list)}\n])")
 
     code.append("")
-    for info in node_instances.values():
-        for port in info["add_ports"]:
+    for node_info in node_instances.values():
+        for port in node_info["add_ports"]:
             params = [
                 f"name={to_python_str(port['name'])}",
                 f"port_type={to_python_str(port['field_type'])}",
@@ -166,13 +166,15 @@ def generate_python_code(
                 params.append(f"options={port['options']}")
             if port.get("is_output"):
                 params.append(f"is_output={bool(port['is_output'])}")
-            code.append(f"{info['var_name']}.add_port({', '.join(params)})")
+            if node_info["type"] == "ProgrammingFunction":
+                params.append(f'field_type="{port["type"]}"')
+            code.append(f"{node_info['var_name']}.add_port({', '.join(params)})")
 
-        for port_name in info["show_ports"]:
-            code.append(f"{info['var_name']}.ports['{port_name}'].show = True")
+        for port_name in node_info["show_ports"]:
+            code.append(f"{node_info['var_name']}.ports['{port_name}'].show = True")
 
-        for port in info["values"]:
-            code.append(f"{info['var_name']}.ports['{port['name']}'].value = {to_python_str(port['value'])}")
+        for port in node_info["values"]:
+            code.append(f"{node_info['var_name']}.ports['{port['name']}'].value = {to_python_str(port['value'])}")
 
     code.append("")