vectorvein 0.2.68__tar.gz → 0.2.71__tar.gz

{vectorvein-0.2.68 → vectorvein-0.2.71}/PKG-INFO

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

{vectorvein-0.2.68 → vectorvein-0.2.71}/pyproject.toml

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

{vectorvein-0.2.68 → vectorvein-0.2.71}/src/vectorvein/chat_clients/anthropic_client.py

@@ -766,7 +766,7 @@ class AnthropicChatClient(BaseChatClient):
                 "usage": {
                     "prompt_tokens": response.usage.input_tokens + response.usage.cache_read_input_tokens
                     if response.usage.cache_read_input_tokens
-                    else 0,
+                    else response.usage.input_tokens,
                     "completion_tokens": response.usage.output_tokens,
                     "total_tokens": response.usage.input_tokens + response.usage.output_tokens,
                     "prompt_tokens_details": {
@@ -1377,7 +1377,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 "usage": {
                     "prompt_tokens": response.usage.input_tokens + response.usage.cache_read_input_tokens
                     if response.usage.cache_read_input_tokens
-                    else 0,
+                    else response.usage.input_tokens,
                     "completion_tokens": response.usage.output_tokens,
                     "total_tokens": response.usage.input_tokens + response.usage.output_tokens,
                     "prompt_tokens_details": {

vectorvein-0.2.71/src/vectorvein/workflow/utils/analyse.py

@@ -0,0 +1,115 @@
+import json
+from typing import TypedDict, Any
+
+
+class PortRecord(TypedDict):
+    """
+    端口记录
+    """
+
+    name: str
+    type: str
+    show: bool
+    value: Any
+    connected: bool
+
+
+class NodeRecord(TypedDict):
+    """
+    节点记录
+    """
+
+    id: str
+    name: str
+    type: str
+    category: str
+    ports: list[PortRecord]
+
+
+class AnalyseResult(TypedDict):
+    """
+    分析结果
+    """
+
+    nodes: list[NodeRecord]
+
+
+def analyse_workflow_record(
+    json_str: str, connected_only: bool = False, reserver_programming_function_ports: bool = False
+) -> AnalyseResult:
+    """
+    分析工作流JSON字符串，提取节点和端口信息
+
+    Args:
+        json_str: 工作流JSON字符串
+
+    Returns:
+        分析结果
+    """
+    # 解析JSON
+    workflow_data = json.loads(json_str)
+
+    # 收集所有连接的端口
+    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))
+
+    # 分析节点
+    nodes_records = []
+
+    for node in workflow_data["nodes"]:
+        node_id = node["id"]
+        node_type = node["type"]
+        category = node["category"]
+
+        # 跳过辅助节点
+        if category == "assistedNodes":
+            continue
+
+        # 获取任务名称
+        task_name = node["data"]["task_name"].split(".")[-1] if "task_name" in node["data"] else ""
+
+        # 收集端口信息
+        ports_records = []
+
+        if "template" in node["data"]:
+            for port_name, port in node["data"]["template"].items():
+                if "name" not in port:
+                    continue
+
+                port_is_connected = (node_id, port["name"]) in connected_ports
+
+                if node_type != "ProgrammingFunction" or not reserver_programming_function_ports:
+                    if connected_only and not port_is_connected:
+                        continue
+
+                port_record: PortRecord = {
+                    "name": port["name"],
+                    "type": port.get("field_type", port.get("type", "")),
+                    "show": port.get("show", False),
+                    "value": port.get("value", None),
+                    "connected": port_is_connected,
+                }
+
+                ports_records.append(port_record)
+
+        # 创建节点记录
+        node_record: NodeRecord = {
+            "id": node_id,
+            "name": task_name,
+            "type": node_type,
+            "category": category,
+            "ports": ports_records,
+        }
+
+        nodes_records.append(node_record)
+
+    # 返回分析结果
+    result: AnalyseResult = {"nodes": nodes_records}
+
+    return result

{vectorvein-0.2.68 → vectorvein-0.2.71}/src/vectorvein/workflow/utils/json_to_code.py

@@ -135,12 +135,18 @@ 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
 
-            # 判断端口是否有值且值与默认不同，并且端口满足以下条件之一：有连接、是输入端口、在UI上显示
+            # 判断端口是否有值且值与默认不同，并且端口满足以下条件之一：
+            # 有连接、是输入端口、在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))
+                and (
+                    port_is_connected
+                    or not port.get("is_output", False)
+                    or port.get("show", False)
+                    or node_type == "ProgrammingFunction"
+                )
             ):
                 values.append(port)