vectorvein 0.2.52__py3-none-any.whl → 0.2.54__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/chat_clients/utils.py

@@ -126,7 +126,7 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         text = str(text)
     if model == "gpt-3.5-turbo":
         return len(get_gpt_35_encoding().encode(text))
-    elif model.startswith(("gpt-4o", "o1-")):
+    elif model.startswith(("gpt-4o", "o1-", "o3-")):
         return len(get_gpt_4o_encoding().encode(text))
     elif model.startswith(("abab", "MiniMax")):
         backend_setting = settings.get_backend(BackendType.MiniMax).models[model]

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/utils/check.py

@@ -139,10 +139,12 @@ def check_ui(workflow: "Workflow") -> UIWarning:
         # 检查是否为输出节点
         if hasattr(node, "category") and node.category == "outputs":
             warnings["has_output_nodes"] = True
+            continue  # 输出节点不检查连接覆盖问题
 
         # 检查节点的输入端口
-        for port_name in node.ports.keys() if hasattr(node, "ports") else []:
-            port = node.ports.get(port_name)
+        ports = node.ports if hasattr(node, "ports") else {}
+        for port_name in ports.keys():
+            port = ports.get(port_name)
             # 确保是输入端口且设置为显示
             if hasattr(port, "show") and getattr(port, "show", False) and isinstance(port, InputPort):
                 has_shown_input_ports = True

{vectorvein-0.2.52.dist-info → vectorvein-0.2.54.dist-info}/METADATA

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

{vectorvein-0.2.52.dist-info → vectorvein-0.2.54.dist-info}/RECORD

@@ -1,13 +1,13 @@
-vectorvein-0.2.52.dist-info/METADATA,sha256=duh92n055q4yiufJHbzO9O1LFwwrxyhIWOkAkkbMgUw,4570
-vectorvein-0.2.52.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.52.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.54.dist-info/METADATA,sha256=b-MXVu9Jj3l07gGdq2ZyjImBBXXEZFTiCY826pJWT3U,4570
+vectorvein-0.2.54.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.54.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
@@ -23,7 +23,7 @@ vectorvein/chat_clients/openai_compatible_client.py,sha256=3MEyKqlf1BtzbNpmqAHQq
 vectorvein/chat_clients/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/chat_clients/qwen_client.py,sha256=-ryh-m9PgsO0fc4ulcCmPTy1155J8YUy15uPoJQOHA0,513
 vectorvein/chat_clients/stepfun_client.py,sha256=zsD2W5ahmR4DD9cqQTXmJr3txrGuvxbRWhFlRdwNijI,519
-vectorvein/chat_clients/utils.py,sha256=k9Y-sZvBSqZvWhN7oGIYeE7xV2cGRvgITB_DUtB04_4,29474
+vectorvein/chat_clients/utils.py,sha256=G2GBFfDHBf5Z_vR2tXNVb1di5G8KKm2RoYlJpey2oxU,29481
 vectorvein/chat_clients/xai_client.py,sha256=eLFJJrNRJ-ni3DpshODcr3S1EJQLbhVwxyO1E54LaqM,491
 vectorvein/chat_clients/yi_client.py,sha256=RNf4CRuPJfixrwLZ3-DEc3t25QDe1mvZeb9sku2f8Bc,484
 vectorvein/chat_clients/zhipuai_client.py,sha256=Ys5DSeLCuedaDXr3PfG1EW2zKXopt-awO2IylWSwY0s,519
@@ -35,7 +35,7 @@ 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
@@ -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=BJ-Di_6UROoeu_1KQB1AaBi0xdegSBT93VdB-RqI5eY,6085
+vectorvein/workflow/utils/check.py,sha256=sirsyg4io5BzgGM0VdEq5s9hyJk0z80Y_mNwCqMc6UI,6168
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
 vectorvein/workflow/utils/layout.py,sha256=j0bRD3uaXu40xCS6U6BGahBI8FrHa5MiF55GbTrZ1LM,4565
-vectorvein-0.2.52.dist-info/RECORD,,
+vectorvein-0.2.54.dist-info/RECORD,,