vectorvein 0.2.55__tar.gz → 0.2.57__tar.gz

{vectorvein-0.2.55 → vectorvein-0.2.57}/PKG-INFO

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

{vectorvein-0.2.55 → vectorvein-0.2.57}/pyproject.toml

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

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/chat_clients/anthropic_client.py

@@ -764,9 +764,14 @@ class AnthropicChatClient(BaseChatClient):
                 "reasoning_content": "",
                 "raw_content": [content_block.model_dump() for content_block in response.content],
                 "usage": {
-                    "prompt_tokens": response.usage.input_tokens,
+                    "prompt_tokens": response.usage.input_tokens + response.usage.cache_read_input_tokens
+                    if response.usage.cache_read_input_tokens
+                    else 0,
                     "completion_tokens": response.usage.output_tokens,
                     "total_tokens": response.usage.input_tokens + response.usage.output_tokens,
+                    "prompt_tokens_details": {
+                        "cached_tokens": response.usage.cache_read_input_tokens,
+                    },
                 },
             }
             tool_calls = []
@@ -1370,9 +1375,14 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 "reasoning_content": "",
                 "raw_content": [content_block.model_dump() for content_block in response.content],
                 "usage": {
-                    "prompt_tokens": response.usage.input_tokens,
+                    "prompt_tokens": response.usage.input_tokens + response.usage.cache_read_input_tokens
+                    if response.usage.cache_read_input_tokens
+                    else 0,
                     "completion_tokens": response.usage.output_tokens,
                     "total_tokens": response.usage.input_tokens + response.usage.output_tokens,
+                    "prompt_tokens_details": {
+                        "cached_tokens": response.usage.cache_read_input_tokens,
+                    },
                 },
             }
             tool_calls = []

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/workflow/graph/port.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Optional, Any, Dict, List, Union
+from typing import Optional, Any, Dict, List, Union, Callable
 
 
 class PortType(Enum):
@@ -28,6 +28,7 @@ class Port:
         field_type: Optional[str] = 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,
@@ -48,6 +49,7 @@ class Port:
         self.field_type = field_type
         self.is_output = is_output
         self.condition = condition
+        self.condition_python = condition_python
         self.max_length = max_length
         self.support_file_types = support_file_types
         self.multiple = multiple
@@ -75,7 +77,7 @@ class Port:
             "name": self.name,
             "display_name": self.name,
             "field_type": self.port_type.value if isinstance(self.port_type, PortType) else self.port_type,
-            "required": self.required,
+            "required": False if not isinstance(self.value, bool) and self.value else self.required,
             "show": self.show,
             "value": self._value,
             "options": self.options,
@@ -104,6 +106,12 @@ class Port:
                 raise ValueError(f"Value `{value}` is not in Port `{self.name}` options {self.options}")
         self._value = value
 
+    def __str__(self) -> str:
+        return f"Port(name={self.name}, port_type={self.port_type})"
+
+    def __repr__(self) -> str:
+        return self.__str__()
+
 
 class InputPort(Port):
     def __init__(
@@ -116,6 +124,7 @@ class InputPort(Port):
         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,
@@ -137,6 +146,7 @@ class InputPort(Port):
             field_type=field_type,
             is_output=False,
             condition=condition,
+            condition_python=condition_python,
             max_length=max_length,
             support_file_types=support_file_types,
             multiple=multiple,
@@ -155,12 +165,13 @@ class OutputPort(Port):
         self,
         name: str = "output",
         port_type: Union[PortType, str] = PortType.TEXT,
-        required: bool = True,
+        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,
@@ -182,6 +193,7 @@ class OutputPort(Port):
             field_type=field_type,
             is_output=True,
             condition=condition,
+            condition_python=condition_python,
             max_length=max_length,
             support_file_types=support_file_types,
             multiple=multiple,

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/workflow/graph/workflow.py

@@ -4,7 +4,14 @@ from typing import List, Union, Dict, Any, Optional
 from .node import Node
 from .edge import Edge
 from ..utils.layout import layout
-from ..utils.check import WorkflowCheckResult, check_dag, check_ui, check_useless_nodes
+from ..utils.check import (
+    WorkflowCheckResult,
+    check_dag,
+    check_ui,
+    check_useless_nodes,
+    check_required_ports,
+    check_override_ports,
+)
 
 
 class Workflow:
@@ -128,6 +135,8 @@ class Workflow:
         dag_check = check_dag(self)  # 检查流程图是否为有向无环图，并检测是否存在孤立节点。
         ui_check = check_ui(self)
         useless_nodes = check_useless_nodes(self)
+        required_ports = check_required_ports(self)
+        override_ports = check_override_ports(self)
 
         # 合并结果
         result: WorkflowCheckResult = {
@@ -135,6 +144,8 @@ class Workflow:
             "no_isolated_nodes": dag_check["no_isolated_nodes"],
             "ui_warnings": ui_check,
             "useless_nodes": useless_nodes,
+            "required_ports": required_ports,
+            "override_ports": override_ports,
         }
 
         return result

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/workflow/nodes/control_flows.py

@@ -135,6 +135,7 @@ class JsonProcess(Node):
                     port_type=PortType.INPUT,
                     value="",
                     condition="return fieldsData.process_mode.value == 'get_value'",
+                    condition_python=lambda ports: ports["process_mode"].value == "get_value",
                 ),
                 "keys": InputPort(
                     name="keys",
@@ -146,6 +147,7 @@ class JsonProcess(Node):
                     port_type=PortType.INPUT,
                     value="",
                     condition="return fieldsData.process_mode.value == 'get_value'",
+                    condition_python=lambda ports: ports["process_mode"].value == "get_value",
                 ),
                 "output": OutputPort(),
             },

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/workflow/nodes/file_processing.py

@@ -33,24 +33,28 @@ class FileLoader(Node):
                     port_type=PortType.CHECKBOX,
                     value=True,
                     condition="return fieldsData.parse_quality.value === 'default'",
+                    condition_python=lambda ports: ports["parse_quality"].value == "default",
                 ),
                 "remove_url_and_email": InputPort(
                     name="remove_url_and_email",
                     port_type=PortType.CHECKBOX,
                     value=True,
                     condition="return fieldsData.parse_quality.value === 'default'",
+                    condition_python=lambda ports: ports["parse_quality"].value == "default",
                 ),
                 "parse_table": InputPort(
                     name="parse_table",
                     port_type=PortType.CHECKBOX,
                     value=True,
                     condition="return fieldsData.parse_quality.value === 'high'",
+                    condition_python=lambda ports: ports["parse_quality"].value == "high",
                 ),
                 "parse_formula": InputPort(
                     name="parse_formula",
                     port_type=PortType.CHECKBOX,
                     value=False,
                     condition="return fieldsData.parse_quality.value === 'high'",
+                    condition_python=lambda ports: ports["parse_quality"].value == "high",
                 ),
                 "multiple": InputPort(
                     name="multiple",
@@ -92,6 +96,7 @@ class FileUpload(Node):
                         {"value": "dict", "label": "dict"},
                     ],
                     condition="return fieldsData.unzip_files.value",
+                    condition_python=lambda ports: ports["unzip_files"].value,
                 ),
                 "allowed_file_types": InputPort(
                     name="allowed_file_types",

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/workflow/nodes/image_generation.py

@@ -35,6 +35,7 @@ class BackgroundGeneration(Node):
                         {"value": "portrait", "label": "portrait"},
                     ],
                     condition="return fieldsData.remove_background.value",
+                    condition_python=lambda ports: ports["remove_background"].value,
                 ),
                 "ref_image_url": InputPort(
                     name="ref_image_url",
@@ -199,6 +200,7 @@ class Flux1(Node):
                     value=1024,
                     max=1536,
                     condition="return fieldsData.model.value !== 'FLUX.1 [pro] ultra'",
+                    condition_python=lambda ports: ports["model"].value != "FLUX.1 [pro] ultra",
                 ),
                 "height": InputPort(
                     name="height",
@@ -206,6 +208,7 @@ class Flux1(Node):
                     value=1024,
                     max=1536,
                     condition="return fieldsData.model.value !== 'FLUX.1 [pro] ultra'",
+                    condition_python=lambda ports: ports["model"].value != "FLUX.1 [pro] ultra",
                 ),
                 "aspect_ratio": InputPort(
                     name="aspect_ratio",
@@ -221,12 +224,14 @@ class Flux1(Node):
                         {"value": "9:21", "label": "9:21"},
                     ],
                     condition="return fieldsData.model.value === 'FLUX.1 [pro] ultra'",
+                    condition_python=lambda ports: ports["model"].value == "FLUX.1 [pro] ultra",
                 ),
                 "raw": InputPort(
                     name="raw",
                     port_type=PortType.CHECKBOX,
                     value=False,
                     condition="return fieldsData.model.value === 'FLUX.1 [pro] ultra'",
+                    condition_python=lambda ports: ports["model"].value == "FLUX.1 [pro] ultra",
                 ),
                 "steps": InputPort(
                     name="steps",
@@ -284,6 +289,7 @@ class Inpainting(Node):
                     value=list(),
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     condition="return fieldsData.inpainting_method.value === 'custom'",
+                    condition_python=lambda ports: ports["inpainting_method"].value == "custom",
                     multiple=True,
                 ),
                 "prompt": InputPort(
@@ -314,6 +320,7 @@ class Inpainting(Node):
                 "output": OutputPort(),
                 "output_mask": OutputPort(
                     condition="return fieldsData.inpainting_method.value === 'smart'",
+                    condition_python=lambda ports: ports["inpainting_method"].value == "smart",
                 ),
             },
         )
@@ -437,12 +444,14 @@ class Pulid(Node):
                     port_type=PortType.NUMBER,
                     value=1024,
                     condition="return fieldsData.image_size.value === 'custom'",
+                    condition_python=lambda ports: ports["image_size"].value == "custom",
                 ),
                 "custom_height": InputPort(
                     name="custom_height",
                     port_type=PortType.NUMBER,
                     value=768,
                     condition="return fieldsData.image_size.value === 'custom'",
+                    condition_python=lambda ports: ports["image_size"].value == "custom",
                 ),
                 "num_inference_steps": InputPort(
                     name="num_inference_steps",
@@ -518,12 +527,14 @@ class Recraft(Node):
                     support_file_types=[".jpg", ".jpeg", ".png", ".webp"],
                     multiple=True,
                     condition="return fieldsData.generation_type.value === 'image_to_vector'",
+                    condition_python=lambda ports: ports["generation_type"].value == "image_to_vector",
                 ),
                 "prompt": InputPort(
                     name="prompt",
                     port_type=PortType.TEXTAREA,
                     value="",
                     condition="return fieldsData.generation_type.value === 'text_to_image'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image",
                     multiple=True,
                 ),
                 "base_style": InputPort(
@@ -537,6 +548,7 @@ class Recraft(Node):
                         {"value": "vector_illustration", "label": "vector_illustration"},
                     ],
                     condition="return fieldsData.generation_type.value === 'text_to_image'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image",
                     multiple=True,
                 ),
                 "substyle_realistic_image": InputPort(
@@ -554,6 +566,8 @@ class Recraft(Node):
                         {"value": "motion_blur", "label": "motion_blur"},
                     ],
                     condition="return fieldsData.generation_type.value === 'text_to_image' && fieldsData.base_style.value === 'realistic_image'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image"
+                    and ports["base_style"].value == "realistic_image",
                     multiple=True,
                 ),
                 "substyle_digital_illustration": InputPort(
@@ -573,6 +587,8 @@ class Recraft(Node):
                         {"value": "2d_art_poster_2", "label": "2d_art_poster_2"},
                     ],
                     condition="return fieldsData.generation_type.value === 'text_to_image' && fieldsData.base_style.value === 'digital_illustration'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image"
+                    and ports["base_style"].value == "digital_illustration",
                     multiple=True,
                 ),
                 "substyle_vector_illustration": InputPort(
@@ -587,6 +603,8 @@ class Recraft(Node):
                         {"value": "linocut", "label": "linocut"},
                     ],
                     condition="return fieldsData.generation_type.value === 'text_to_image' && fieldsData.base_style.value === 'vector_illustration'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image"
+                    and ports["base_style"].value == "vector_illustration",
                     multiple=True,
                 ),
                 "size": InputPort(
@@ -611,6 +629,7 @@ class Recraft(Node):
                         {"value": "1707x1024", "label": "1707x1024"},
                     ],
                     condition="return fieldsData.generation_type.value === 'text_to_image'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image",
                 ),
                 "colors": InputPort(
                     name="colors",
@@ -618,6 +637,7 @@ class Recraft(Node):
                     value=list(),
                     multiple=True,
                     condition="return fieldsData.generation_type.value === 'text_to_image'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image",
                 ),
                 "background_color": InputPort(
                     name="background_color",
@@ -626,6 +646,7 @@ class Recraft(Node):
                     multiple=True,
                     max_count=1,
                     condition="return fieldsData.generation_type.value === 'text_to_image'",
+                    condition_python=lambda ports: ports["generation_type"].value == "text_to_image",
                 ),
                 "output_type": InputPort(
                     name="output_type",

{vectorvein-0.2.55 → vectorvein-0.2.57}/src/vectorvein/workflow/nodes/llms.py

@@ -146,10 +146,12 @@ class Baichuan(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -269,10 +271,12 @@ class ChatGLM(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -404,14 +408,17 @@ class Deepseek(Node):
                 "reasoning_content": OutputPort(
                     name="reasoning_content",
                     condition="return fieldsData.llm_model.value === 'deepseek-reasoner'",
+                    condition_python=lambda ports: ports["llm_model"].value == "deepseek-reasoner",
                 ),
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -505,10 +512,12 @@ class Gemini(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -636,10 +645,12 @@ class MiniMax(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -723,10 +734,12 @@ class Moonshot(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -814,10 +827,12 @@ class OpenAI(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -899,10 +914,12 @@ class XAi(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )
@@ -988,10 +1005,12 @@ class CustomModel(Node):
                 "function_call_output": OutputPort(
                     name="function_call_output",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
                 "function_call_arguments": OutputPort(
                     name="function_call_arguments",
                     condition="return fieldsData.use_function_call.value",
+                    condition_python=lambda ports: ports["use_function_call"].value,
                 ),
             },
         )