vectorvein 0.2.53__py3-none-any.whl → 0.2.55__py3-none-any.whl

vectorvein/chat_clients/anthropic_client.py

@@ -44,8 +44,10 @@ from anthropic.types import (
     MessageParam,
     ToolUseBlock,
     ThinkingConfigParam,
+    RawMessageStopEvent,
     RawMessageDeltaEvent,
     RawMessageStartEvent,
+    RawContentBlockStopEvent,
     RawContentBlockStartEvent,
     RawContentBlockDeltaEvent,
 )
@@ -623,13 +625,16 @@ class AnthropicChatClient(BaseChatClient):
                 raise APIConnectionError(message=e.message, request=e.request)
 
             def generator():
-                result = {"content": "", "reasoning_content": "", "usage": {}, "tool_calls": []}
+                result = {"content": "", "reasoning_content": "", "usage": {}, "tool_calls": [], "raw_content": []}
                 for chunk in stream_response:
                     message = {"content": "", "tool_calls": []}
                     if isinstance(chunk, RawMessageStartEvent):
                         result["usage"] = {"prompt_tokens": chunk.message.usage.input_tokens}
                         continue
                     elif isinstance(chunk, RawContentBlockStartEvent):
+                        content_block = chunk.content_block.model_dump()
+                        result["raw_content"].append(content_block)
+
                         if chunk.content_block.type == "tool_use":
                             result["tool_calls"] = message["tool_calls"] = [
                                 {
@@ -646,14 +651,40 @@ class AnthropicChatClient(BaseChatClient):
                             message["content"] = chunk.content_block.text
                         elif chunk.content_block.type == "thinking":
                             message["reasoning_content"] = chunk.content_block.thinking
+                        elif chunk.content_block.type == "redacted_thinking":
+                            pass
+
+                        message["raw_content"] = content_block
                         yield ChatCompletionDeltaMessage(**message)
                     elif isinstance(chunk, RawContentBlockDeltaEvent):
                         if chunk.delta.type == "text_delta":
                             message["content"] = chunk.delta.text
                             result["content"] += chunk.delta.text
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "text":
+                                    result["raw_content"][i]["text"] += chunk.delta.text
+                                    break
                         elif chunk.delta.type == "thinking_delta":
                             message["reasoning_content"] = chunk.delta.thinking
                             result["reasoning_content"] += chunk.delta.thinking
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "thinking":
+                                    result["raw_content"][i]["thinking"] += chunk.delta.thinking
+                                    break
+                        elif chunk.delta.type == "signature_delta":
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "thinking":
+                                    if "signature" not in result["raw_content"][i]:
+                                        result["raw_content"][i]["signature"] = ""
+                                    result["raw_content"][i]["signature"] += chunk.delta.signature
+                                    break
+                        elif chunk.delta.type == "citations_delta":
+                            citation_data = chunk.delta.citation.model_dump()
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if "citations" not in result["raw_content"][i]:
+                                    result["raw_content"][i]["citations"] = []
+                                result["raw_content"][i]["citations"].append(citation_data)
+                                break
                         elif chunk.delta.type == "input_json_delta":
                             result["tool_calls"][0]["function"]["arguments"] += chunk.delta.partial_json
                             message["tool_calls"] = [
@@ -667,6 +698,29 @@ class AnthropicChatClient(BaseChatClient):
                                     "type": "function",
                                 }
                             ]
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "tool_use":
+                                    if "input" not in result["raw_content"][i]:
+                                        result["raw_content"][i]["input"] = {}
+                                    try:
+                                        if result["tool_calls"][0]["function"]["arguments"]:
+                                            result["raw_content"][i]["input"] = json.loads(
+                                                result["tool_calls"][0]["function"]["arguments"]
+                                            )
+                                        else:
+                                            result["raw_content"][i]["input"] = {}
+                                    except json.JSONDecodeError:
+                                        pass
+                                    break
+                        elif chunk.delta.type == "redacted_thinking_delta":
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "redacted_thinking":
+                                    if "data" not in result["raw_content"][i]:
+                                        result["raw_content"][i]["data"] = ""
+                                    result["raw_content"][i]["data"] += chunk.delta.data
+                                    break
+
+                        message["raw_content"] = chunk.delta.model_dump()
                         yield ChatCompletionDeltaMessage(**message)
                     elif isinstance(chunk, RawMessageDeltaEvent):
                         result["usage"]["completion_tokens"] = chunk.usage.output_tokens
@@ -678,8 +732,12 @@ class AnthropicChatClient(BaseChatClient):
                                 prompt_tokens=result["usage"]["prompt_tokens"],
                                 completion_tokens=result["usage"]["completion_tokens"],
                                 total_tokens=result["usage"]["total_tokens"],
-                            )
+                            ),
                         )
+                    elif isinstance(chunk, RawMessageStopEvent):
+                        pass
+                    elif isinstance(chunk, RawContentBlockStopEvent):
+                        pass
 
             return generator()
         else:
@@ -704,6 +762,7 @@ class AnthropicChatClient(BaseChatClient):
             result = {
                 "content": "",
                 "reasoning_content": "",
+                "raw_content": [content_block.model_dump() for content_block in response.content],
                 "usage": {
                     "prompt_tokens": response.usage.input_tokens,
                     "completion_tokens": response.usage.output_tokens,
@@ -1172,13 +1231,16 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 raise APIConnectionError(message=e.message, request=e.request)
 
             async def generator():
-                result = {"content": "", "reasoning_content": "", "usage": {}, "tool_calls": []}
+                result = {"content": "", "reasoning_content": "", "usage": {}, "tool_calls": [], "raw_content": []}
                 async for chunk in stream_response:
                     message = {"content": "", "tool_calls": []}
                     if isinstance(chunk, RawMessageStartEvent):
                         result["usage"] = {"prompt_tokens": chunk.message.usage.input_tokens}
                         continue
                     elif isinstance(chunk, RawContentBlockStartEvent):
+                        content_block = chunk.content_block.model_dump()
+                        result["raw_content"].append(content_block)
+
                         if chunk.content_block.type == "tool_use":
                             result["tool_calls"] = message["tool_calls"] = [
                                 {
@@ -1195,14 +1257,40 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                             message["content"] = chunk.content_block.text
                         elif chunk.content_block.type == "thinking":
                             message["reasoning_content"] = chunk.content_block.thinking
+                        elif chunk.content_block.type == "redacted_thinking":
+                            pass
+
+                        message["raw_content"] = content_block
                         yield ChatCompletionDeltaMessage(**message)
                     elif isinstance(chunk, RawContentBlockDeltaEvent):
                         if chunk.delta.type == "text_delta":
                             message["content"] = chunk.delta.text
                             result["content"] += chunk.delta.text
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "text":
+                                    result["raw_content"][i]["text"] += chunk.delta.text
+                                    break
                         elif chunk.delta.type == "thinking_delta":
                             message["reasoning_content"] = chunk.delta.thinking
                             result["reasoning_content"] += chunk.delta.thinking
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "thinking":
+                                    result["raw_content"][i]["thinking"] += chunk.delta.thinking
+                                    break
+                        elif chunk.delta.type == "signature_delta":
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "thinking":
+                                    if "signature" not in result["raw_content"][i]:
+                                        result["raw_content"][i]["signature"] = ""
+                                    result["raw_content"][i]["signature"] += chunk.delta.signature
+                                    break
+                        elif chunk.delta.type == "citations_delta":
+                            citation_data = chunk.delta.citation.model_dump()
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if "citations" not in result["raw_content"][i]:
+                                    result["raw_content"][i]["citations"] = []
+                                result["raw_content"][i]["citations"].append(citation_data)
+                                break
                         elif chunk.delta.type == "input_json_delta":
                             result["tool_calls"][0]["function"]["arguments"] += chunk.delta.partial_json
                             message["tool_calls"] = [
@@ -1216,6 +1304,29 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                                     "type": "function",
                                 }
                             ]
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "tool_use":
+                                    if "input" not in result["raw_content"][i]:
+                                        result["raw_content"][i]["input"] = {}
+                                    try:
+                                        if result["tool_calls"][0]["function"]["arguments"]:
+                                            result["raw_content"][i]["input"] = json.loads(
+                                                result["tool_calls"][0]["function"]["arguments"]
+                                            )
+                                        else:
+                                            result["raw_content"][i]["input"] = {}
+                                    except json.JSONDecodeError:
+                                        pass
+                                    break
+                        elif chunk.delta.type == "redacted_thinking_delta":
+                            for i in range(len(result["raw_content"]) - 1, -1, -1):
+                                if result["raw_content"][i]["type"] == "redacted_thinking":
+                                    if "data" not in result["raw_content"][i]:
+                                        result["raw_content"][i]["data"] = ""
+                                    result["raw_content"][i]["data"] += chunk.delta.data
+                                    break
+
+                        message["raw_content"] = chunk.delta.model_dump()
                         yield ChatCompletionDeltaMessage(**message)
                     elif isinstance(chunk, RawMessageDeltaEvent):
                         result["usage"]["completion_tokens"] = chunk.usage.output_tokens
@@ -1227,8 +1338,12 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                                 prompt_tokens=result["usage"]["prompt_tokens"],
                                 completion_tokens=result["usage"]["completion_tokens"],
                                 total_tokens=result["usage"]["total_tokens"],
-                            )
+                            ),
                         )
+                    elif isinstance(chunk, RawMessageStopEvent):
+                        pass
+                    elif isinstance(chunk, RawContentBlockStopEvent):
+                        pass
 
             return generator()
         else:
@@ -1253,6 +1368,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
             result = {
                 "content": "",
                 "reasoning_content": "",
+                "raw_content": [content_block.model_dump() for content_block in response.content],
                 "usage": {
                     "prompt_tokens": response.usage.input_tokens,
                     "completion_tokens": response.usage.output_tokens,

vectorvein/types/llm_parameters.py

@@ -149,6 +149,8 @@ class ChatCompletionMessage(BaseModel):
 
     reasoning_content: Optional[str] = None
 
+    raw_content: Optional[List[Dict]] = None
+
     tool_calls: Optional[List[ChatCompletionMessageToolCall]] = None
     """The tool calls generated by the model, such as function calls."""
 
@@ -162,6 +164,8 @@ class ChatCompletionDeltaMessage(BaseModel):
 
     reasoning_content: Optional[str] = None
 
+    raw_content: Optional[Dict] = None
+
     tool_calls: Optional[List[ChoiceDeltaToolCall]] = None
     """The tool calls generated by the model, such as function calls."""
 

vectorvein/workflow/graph/node.py

@@ -118,6 +118,12 @@ class Node:
             "shadow": self.shadow,
         }
 
+    def __str__(self) -> str:
+        return f"Node<{self.id}:{self.type}>"
+
+    def __repr__(self) -> str:
+        return self.__str__()
+
     def has_inputs(self) -> bool:
         for port in self.ports.values():
             if isinstance(port, InputPort):

vectorvein/workflow/graph/workflow.py

@@ -4,7 +4,7 @@ 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
+from ..utils.check import WorkflowCheckResult, check_dag, check_ui, check_useless_nodes
 
 
 class Workflow:
@@ -127,10 +127,15 @@ class Workflow:
         """
         dag_check = check_dag(self)  # 检查流程图是否为有向无环图，并检测是否存在孤立节点。
         ui_check = check_ui(self)
+        useless_nodes = check_useless_nodes(self)
 
         # 合并结果
-        result = dag_check
-        result["ui_warnings"] = ui_check
+        result: WorkflowCheckResult = {
+            "no_cycle": dag_check["no_cycle"],
+            "no_isolated_nodes": dag_check["no_isolated_nodes"],
+            "ui_warnings": ui_check,
+            "useless_nodes": useless_nodes,
+        }
 
         return result
 

vectorvein/workflow/utils/check.py

@@ -4,6 +4,7 @@ from ..graph.port import InputPort
 
 if TYPE_CHECKING:
     from ..graph.workflow import Workflow
+    from ..graph.node import Node
 
 
 class UIWarning(TypedDict, total=False):
@@ -14,23 +15,24 @@ class UIWarning(TypedDict, total=False):
     has_output_nodes: bool  # 是否存在输出节点
 
 
-class WorkflowCheckResult(TypedDict, total=False):
+class WorkflowCheckResult(TypedDict):
     """工作流检查结果类型。"""
 
     no_cycle: bool  # 工作流是否不包含环
     no_isolated_nodes: bool  # 工作流是否不包含孤立节点
+    useless_nodes: list["Node"]  # 工作流中无用的节点
     ui_warnings: UIWarning  # UI相关警告
 
 
-def check_dag(workflow: "Workflow") -> WorkflowCheckResult:
+def check_dag(workflow: "Workflow"):
     """检查流程图是否为有向无环图，并检测是否存在孤立节点。
 
     Returns:
-        WorkflowCheckResult: 包含检查结果的字典
+        包含检查结果的字典
             - no_cycle (bool): 如果流程图是有向无环图返回 True，否则返回 False
             - no_isolated_nodes (bool): 如果不存在孤立节点返回 True，否则返回 False
     """
-    result: WorkflowCheckResult = {"no_cycle": True, "no_isolated_nodes": True}
+    result = {"no_cycle": True, "no_isolated_nodes": True}
 
     # 过滤掉触发器节点和辅助节点
     trigger_nodes = [
@@ -159,3 +161,22 @@ def check_ui(workflow: "Workflow") -> UIWarning:
     warnings["has_shown_input_ports"] = has_shown_input_ports
 
     return warnings
+
+
+def check_useless_nodes(workflow: "Workflow") -> list["Node"]:
+    """检查工作流中是否存在无用的节点。
+
+    无用的节点定义：
+    1. 节点非 output 类节点，并且节点的输出端口没有任何连线，说明该节点数据不会传给下一个节点或者显示出来。
+    """
+    useless_nodes = []
+    source_nodes = set(edge.source for edge in workflow.edges)
+
+    for node in workflow.nodes:
+        if hasattr(node, "category") and node.category == "outputs":
+            continue
+
+        if node.id not in source_nodes:
+            useless_nodes.append(node)
+
+    return useless_nodes

{vectorvein-0.2.53.dist-info → vectorvein-0.2.55.dist-info}/METADATA

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

{vectorvein-0.2.53.dist-info → vectorvein-0.2.55.dist-info}/RECORD

@@ -1,13 +1,13 @@
-vectorvein-0.2.53.dist-info/METADATA,sha256=Zhw-vVnJ900HI43MBieVbVDcWHQoox9PDHyTjbKovow,4570
-vectorvein-0.2.53.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.53.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.55.dist-info/METADATA,sha256=7dHFtxetkWiEk21XkKg4ob5uAjBppVwkf0KpA17tRGo,4570
+vectorvein-0.2.55.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.55.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
 vectorvein/api/exceptions.py,sha256=uS_PAdx0ksC0r3dgfSGWdbLMZm4qdLeWSSqCv1g3_Gc,772
 vectorvein/api/models.py,sha256=xtPWMsB0yIJI7i-gY4B6MtvXv0ZIXnoeKspmeInH6fU,1449
 vectorvein/chat_clients/__init__.py,sha256=UIytpIgwo8qkZpIyrHVxLYTyliUOTp4J7C4iHRjbtWE,23850
-vectorvein/chat_clients/anthropic_client.py,sha256=LlT-NeZEEgjOa6g8NdOjVS6Rhdh3T_d5U7gr_KjcX_4,60543
+vectorvein/chat_clients/anthropic_client.py,sha256=lvnE7IrtRehjiuXirhy09VH1NqiV5RFakfG8JAb9WNk,68362
 vectorvein/chat_clients/baichuan_client.py,sha256=CVMvpgjdrZGv0BWnTOBD-f2ufZ3wq3496wqukumsAr4,526
 vectorvein/chat_clients/base_client.py,sha256=p7s-G4Wh9MSpDKEfG8wuFAeWy5DGvj5Go31hqrpQPhM,38817
 vectorvein/chat_clients/deepseek_client.py,sha256=3qWu01NlJAP2N-Ff62d5-CZXZitlizE1fzb20LNetig,526
@@ -35,16 +35,16 @@ vectorvein/types/__init__.py,sha256=ypg8c8AwF49FrFBMqmgH_eIBH4LFf0KN4kjqQa7zrvM,
 vectorvein/types/defaults.py,sha256=MpDvT9vNwIqwHFKXTlBq3FY02PLr4BncCdvNhfbxM60,27563
 vectorvein/types/enums.py,sha256=LplSVkXLBK-t8TWtJKj_f7ktWTd6CSHWRLb67XKMm54,1716
 vectorvein/types/exception.py,sha256=KtnqZ-1DstHm95SZAyZdHhkGq1bJ4A9Aw3Zfdu-VIFo,130
-vectorvein/types/llm_parameters.py,sha256=2rF-CQsWcHqTzI2r5x55gSsFm7LW_iCxQxZTEnk0yF8,7843
+vectorvein/types/llm_parameters.py,sha256=Bdz9E_x0G96rvJ5TnEFPrU5QV4I2y0YFv7dY4Pq-MuU,7933
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/types/settings.py,sha256=zneZcebts-MHcYS1DXakulA_f0fGPzidOo1s9yl51zI,4794
 vectorvein/utilities/media_processing.py,sha256=7KtbLFzOYIn1e9QTN9G6C76NH8CBlV9kfAgiRKEIeXY,6263
 vectorvein/utilities/rate_limiter.py,sha256=dwolIUVw2wP83Odqpx0AAaE77de1GzxkYDGH4tM_u_4,10300
 vectorvein/utilities/retry.py,sha256=6KFS9R2HdhqM3_9jkjD4F36ZSpEx2YNFGOVlpOsUetM,2208
 vectorvein/workflow/graph/edge.py,sha256=1ckyyjCue_PLm7P1ItUfKOy6AKkemOpZ9m1WJ8UXIHQ,1072
-vectorvein/workflow/graph/node.py,sha256=6W9czon4JpWPcjwfN1B5-igEbifRsMemjGByZxa68RY,5047
+vectorvein/workflow/graph/node.py,sha256=ZzOhl7pltPBR5gyyL2ZtYeByPxjDPnM179emliqGFi8,5192
 vectorvein/workflow/graph/port.py,sha256=_QpHCBGAu657VhYAh0Wzjri3ZZ8-WYJp99J465mqmwo,6492
-vectorvein/workflow/graph/workflow.py,sha256=W2ucuclAjtqjHOmvhLx1lWmFw1xMKMCKaYSV66NdDwo,5835
+vectorvein/workflow/graph/workflow.py,sha256=lDF4LafX5dmzjQQqR-mFhqQPdF_AKodiHpM3MygoqyE,6086
 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=l8CjFQlsGV3fNGM6SVzS1Kz361K1xDv1fGT7acuDXuU,6613
@@ -61,7 +61,7 @@ vectorvein/workflow/nodes/triggers.py,sha256=BolH4X6S8HSuU2kwHmYKr-ozHbgKBmdZRcn
 vectorvein/workflow/nodes/vector_db.py,sha256=t6I17q6iR3yQreiDHpRrksMdWDPIvgqJs076z-7dlQQ,5712
 vectorvein/workflow/nodes/video_generation.py,sha256=qmdg-t_idpxq1veukd-jv_ChICMOoInKxprV9Z4Vi2w,4118
 vectorvein/workflow/nodes/web_crawlers.py,sha256=BhJBX1AZH7-22Gu95Ox4qJqmH5DU-m4dbUb5N5DTA-M,5559
-vectorvein/workflow/utils/check.py,sha256=sirsyg4io5BzgGM0VdEq5s9hyJk0z80Y_mNwCqMc6UI,6168
+vectorvein/workflow/utils/check.py,sha256=N2eHyZZVCX_fFriK4pcdDShTCwaLNDngkC_247kF3-c,6836
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
 vectorvein/workflow/utils/layout.py,sha256=j0bRD3uaXu40xCS6U6BGahBI8FrHa5MiF55GbTrZ1LM,4565
-vectorvein-0.2.53.dist-info/RECORD,,
+vectorvein-0.2.55.dist-info/RECORD,,