vectorvein 0.2.88__py3-none-any.whl → 0.2.90__py3-none-any.whl

vectorvein/chat_clients/utils.py

@@ -4,7 +4,7 @@ import re
 import json
 import warnings
 from math import ceil
-from typing import Iterable
+from typing import Iterable, cast
 
 import httpx
 import tiktoken
@@ -18,6 +18,9 @@ from ..types.llm_parameters import (
     NotGiven,
     NOT_GIVEN,
     ToolParam,
+    VectorVeinMessage,
+    VectorVeinTextMessage,
+    VectorVeinWorkflowMessage,
 )
 
 
@@ -435,7 +438,7 @@ def format_image_message(image: str, backend: BackendType = BackendType.OpenAI,
             return {"type": "image_url", "image_url": {"url": image}}
 
 
-def format_workflow_messages(message: dict, content: str, backend: BackendType):
+def format_workflow_messages(message: VectorVeinWorkflowMessage, content: str, backend: BackendType):
     formatted_messages = []
 
     # 工具调用消息
@@ -626,7 +629,7 @@ def transform_from_openai_message(
 
 
 def format_messages(
-    messages: list,
+    messages: Iterable[ChatCompletionMessageParam | VectorVeinMessage],
     backend: BackendType = BackendType.OpenAI,
     native_multimodal: bool = False,
     function_call_available: bool = False,
@@ -652,16 +655,27 @@ def format_messages(
 
     for message in messages:
         if is_vectorvein_message(message):
+            message = cast(VectorVeinMessage, message)
+            match message["content_type"]:
+                case "TXT":
+                    message = cast(VectorVeinTextMessage, message)
+                case "WKF":
+                    message = cast(VectorVeinWorkflowMessage, message)
+                case _:
+                    raise ValueError(f"Unsupported message type: {message['content_type']}")
             # 处理 VectorVein 格式的消息
             content = message["content"]["text"]
             if message["content_type"] == "TXT":
+                message = cast(VectorVeinTextMessage, message)
                 role = "user" if message["author_type"] == "U" else "assistant"
                 formatted_message = format_text_message(content, role, message.get("attachments", []), backend, native_multimodal, process_image)
                 formatted_messages.append(formatted_message)
             elif message["content_type"] == "WKF" and message["status"] in ("S", "R"):
+                message = cast(VectorVeinWorkflowMessage, message)
                 formatted_messages.extend(format_workflow_messages(message, content, backend))
         else:
             # 处理 OpenAI 格式的消息
+            message = cast(ChatCompletionMessageParam, message)
             formatted_message = transform_from_openai_message(message, backend, native_multimodal, function_call_available, process_image)
             formatted_messages.append(formatted_message)
 

vectorvein/types/__init__.py

@@ -44,12 +44,18 @@ from .llm_parameters import (
     Usage,
     ChatCompletionMessage,
     ChatCompletionDeltaMessage,
+    ChatCompletionStreamOptionsParam,
     NotGiven,
     NOT_GIVEN,
     OpenAIToolParam,
     ToolParam,
     Tools,
     ToolChoice,
+    AnthropicToolParam,
+    AnthropicToolChoice,
+    OPENAI_NOT_GIVEN,
+    ANTHROPIC_NOT_GIVEN,
+    VectorVeinMessage,
 )
 from .settings import (
     RedisConfigDict,
@@ -117,6 +123,12 @@ __all__ = [
     "Usage",
     "ChatCompletionMessage",
     "ChatCompletionDeltaMessage",
+    "ChatCompletionStreamOptionsParam",
+    "AnthropicToolParam",
+    "AnthropicToolChoice",
+    "OPENAI_NOT_GIVEN",
+    "ANTHROPIC_NOT_GIVEN",
+    "VectorVeinMessage",
     "NotGiven",
     "NOT_GIVEN",
     "OpenAIToolParam",

vectorvein/types/llm_parameters.py

@@ -1,6 +1,7 @@
 # @Author: Bi Ying
 # @Date:   2024-07-26 23:48:04
 from typing import List, Dict, Optional, Union, Iterable, Literal
+from typing_extensions import TypedDict, NotRequired
 
 import httpx
 from pydantic import BaseModel, Field
@@ -26,6 +27,33 @@ from . import defaults as defs
 from .settings import EndpointOptionDict
 
 
+class VectorVeinTextMessage(TypedDict):
+    mid: NotRequired[str]
+    author_type: Literal["U", "A"]  # "U" for user, "A" for assistant
+    content_type: Literal["TXT"]
+    status: NotRequired[str]
+    create_time: NotRequired[int]
+    update_time: NotRequired[int]
+    metadata: NotRequired[dict]
+    content: Dict[str, str]
+    attachments: NotRequired[List[str]]
+
+
+class VectorVeinWorkflowMessage(TypedDict):
+    mid: NotRequired[str]
+    author_type: Literal["U", "A"]  # "U" for user, "A" for assistant
+    content_type: Literal["WKF"]
+    status: str
+    create_time: NotRequired[int]
+    update_time: NotRequired[int]
+    metadata: dict
+    content: Dict[str, str]
+    attachments: NotRequired[List[str]]
+
+
+VectorVeinMessage = Union[VectorVeinTextMessage, VectorVeinWorkflowMessage]
+
+
 class EndpointSetting(BaseModel):
     id: str = Field(..., description="The id of the endpoint.")
     region: Optional[str] = Field(None, description="The region for the endpoint.")
@@ -215,4 +243,5 @@ __all__ = [
     "ResponseFormat",
     "ThinkingConfigParam",
     "ThinkingConfigEnabledParam",
+    "VectorVeinMessage",
 ]

{vectorvein-0.2.88.dist-info → vectorvein-0.2.90.dist-info}/METADATA

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

{vectorvein-0.2.88.dist-info → vectorvein-0.2.90.dist-info}/RECORD

@@ -1,6 +1,6 @@
-vectorvein-0.2.88.dist-info/METADATA,sha256=KK0m-TMf6XK5cp8kW6fpkYBGcc1xUDYJynmfLAug6dk,4567
-vectorvein-0.2.88.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-vectorvein-0.2.88.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.90.dist-info/METADATA,sha256=uxiyZMribelfH7JrV7nseeEMhm_XTR9Chcg8bcX2Y80,4567
+vectorvein-0.2.90.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+vectorvein-0.2.90.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
@@ -23,7 +23,7 @@ vectorvein/chat_clients/openai_compatible_client.py,sha256=0nj5DwnY8llctoxbW-UXs
 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=2p2FJT4YNapJCI_kgWj81h0tgTj9-drSY33IizMoFrE,29723
+vectorvein/chat_clients/utils.py,sha256=rMLRLF0l-D0LjamlZsJOtzQlaqqh-34EapxdCVCQq7E,30486
 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
@@ -31,11 +31,11 @@ vectorvein/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/server/token_server.py,sha256=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7wtdQ,1353
 vectorvein/settings/__init__.py,sha256=j8BNRqJ23GWI83vFzOQJZvZuy-WtKMeOTJRghG4cG5I,11471
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/types/__init__.py,sha256=ypg8c8AwF49FrFBMqmgH_eIBH4LFf0KN4kjqQa7zrvM,3376
+vectorvein/types/__init__.py,sha256=2PIMllSLIhgIuM0Ijtms7yDS1dkiGlJVQ1ab9AM2iwk,3714
 vectorvein/types/defaults.py,sha256=v6hE1TGWoYcSBzPtlGlRVy4eg0T9qBJAcn7u_a7EZSE,37593
 vectorvein/types/enums.py,sha256=LplSVkXLBK-t8TWtJKj_f7ktWTd6CSHWRLb67XKMm54,1716
 vectorvein/types/exception.py,sha256=KtnqZ-1DstHm95SZAyZdHhkGq1bJ4A9Aw3Zfdu-VIFo,130
-vectorvein/types/llm_parameters.py,sha256=Fo_-_rFkBvl_dUsCZxy2xNMC9Q4qVGLzDBL9jRVbXIQ,8489
+vectorvein/types/llm_parameters.py,sha256=ZQXASYCbct95tVUOXU_rgE3dxffKzyXJG6tVp6FHFkY,9388
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/types/settings.py,sha256=5wINBiT9qj3ZwDiE6Kf4r6wD3yY1bKN40xxZ7F6jEfI,4844
 vectorvein/utilities/media_processing.py,sha256=TPm73MS_a1WVqpYv0N9BrZcOK-kxWa3QHSFUI_7WgmU,8257
@@ -65,4 +65,4 @@ vectorvein/workflow/utils/analyse.py,sha256=msmvyz35UTYTwqQR5sg9H0sm1vxmGDSmep9X
 vectorvein/workflow/utils/check.py,sha256=B_NdwqIqnc7Ko2HHqFpfOmWVaAu21tPITe0szKfiZKc,11414
 vectorvein/workflow/utils/json_to_code.py,sha256=P8dhhSNgKhTnW17qXNjLO2aLdb0rA8qMAWxhObol2TU,7295
 vectorvein/workflow/utils/layout.py,sha256=j0bRD3uaXu40xCS6U6BGahBI8FrHa5MiF55GbTrZ1LM,4565
-vectorvein-0.2.88.dist-info/RECORD,,
+vectorvein-0.2.90.dist-info/RECORD,,