vectorvein 0.2.78__py3-none-any.whl → 0.2.80__py3-none-any.whl

vectorvein/chat_clients/anthropic_client.py

@@ -596,7 +596,10 @@ class AnthropicChatClient(BaseChatClient):
 
         if max_tokens is None:
             max_output_tokens = self.model_setting.max_output_tokens
-            token_counts = get_message_token_counts(messages=messages, tools=tools_params, model=self.model)
+            native_multimodal = self.model_setting.native_multimodal
+            token_counts = get_message_token_counts(
+                messages=messages, tools=tools, model=self.model, native_multimodal=native_multimodal
+            )
             if max_output_tokens is not None:
                 max_tokens = self.model_setting.context_length - token_counts
                 max_tokens = min(max(max_tokens, 1), max_output_tokens)
@@ -1207,7 +1210,10 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
 
         if max_tokens is None:
             max_output_tokens = self.model_setting.max_output_tokens
-            token_counts = get_message_token_counts(messages=messages, tools=tools_params, model=self.model)
+            native_multimodal = self.model_setting.native_multimodal
+            token_counts = get_message_token_counts(
+                messages=messages, tools=tools, model=self.model, native_multimodal=native_multimodal
+            )
             if max_output_tokens is not None:
                 max_tokens = self.model_setting.context_length - token_counts
                 max_tokens = min(max(max_tokens, 1), max_output_tokens)

vectorvein/chat_clients/openai_compatible_client.py

@@ -326,7 +326,10 @@ class OpenAICompatibleChatClient(BaseChatClient):
 
         if not max_tokens and not max_completion_tokens:
             max_output_tokens = self.model_setting.max_output_tokens
-            token_counts = get_message_token_counts(messages=messages, tools=tools, model=self.model)
+            native_multimodal = self.model_setting.native_multimodal
+            token_counts = get_message_token_counts(
+                messages=messages, tools=tools, model=self.model, native_multimodal=native_multimodal
+            )
             if max_output_tokens is not None:
                 max_tokens = self.model_setting.context_length - token_counts - 64
                 max_tokens = min(max(max_tokens, 1), max_output_tokens)
@@ -805,7 +808,10 @@ class AsyncOpenAICompatibleChatClient(BaseAsyncChatClient):
 
         if not max_tokens and not max_completion_tokens:
             max_output_tokens = self.model_setting.max_output_tokens
-            token_counts = get_message_token_counts(messages=messages, tools=tools, model=self.model)
+            native_multimodal = self.model_setting.native_multimodal
+            token_counts = get_message_token_counts(
+                messages=messages, tools=tools, model=self.model, native_multimodal=native_multimodal
+            )
             if max_output_tokens is not None:
                 max_tokens = self.model_setting.context_length - token_counts - 64
                 max_tokens = min(max(max_tokens, 1), max_output_tokens)

vectorvein/chat_clients/utils.py

@@ -348,9 +348,10 @@ def get_message_token_counts(
     messages: list,
     tools: list | Iterable[ToolParam] | NotGiven = NOT_GIVEN,
     model: str = "gpt-4o",
+    native_multimodal: bool = True,
 ) -> int:
     tokens = 0
-    formatted_messages = format_messages(messages, backend=BackendType.OpenAI, native_multimodal=True)
+    formatted_messages = format_messages(messages, backend=BackendType.OpenAI, native_multimodal=native_multimodal)
     for message in formatted_messages:
         content = message["content"]
         if isinstance(content, str):
@@ -360,8 +361,11 @@ def get_message_token_counts(
                 if isinstance(item, dict) and item["type"] == "text":
                     tokens += get_token_counts(item["text"], model)
                 elif isinstance(item, dict) and item["type"].startswith("image"):
-                    # TODO: Get real image size
-                    tokens += calculate_image_tokens(2048, 2048, model)
+                    if native_multimodal:
+                        # TODO: Get real image size
+                        tokens += calculate_image_tokens(2048, 2048, model)
+                    else:
+                        tokens += 1
     if tools:
         tokens += get_token_counts(str(tools), model)
 

vectorvein/types/defaults.py

@@ -607,6 +607,14 @@ OPENAI_MODELS: Final[Dict[str, ModelSettingDict]] = {
         "response_format_available": True,
         "native_multimodal": False,
     },
+    "gpt-4.1": {
+        "id": "gpt-4.1",
+        "context_length": 1047576,
+        "max_output_tokens": 32768,
+        "function_call_available": True,
+        "response_format_available": True,
+        "native_multimodal": True,
+    },
 }
 
 # Anthropic models

{vectorvein-0.2.78.dist-info → vectorvein-0.2.80.dist-info}/METADATA

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

{vectorvein-0.2.78.dist-info → vectorvein-0.2.80.dist-info}/RECORD

@@ -1,13 +1,13 @@
-vectorvein-0.2.78.dist-info/METADATA,sha256=O7gLy0AVtRV5XY5Pm7lPGE49Iii0mCt6oo1E-fXj6L0,4567
-vectorvein-0.2.78.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-vectorvein-0.2.78.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.80.dist-info/METADATA,sha256=i7b-zBRjuZqgVdWw8cAcBWpnM6WNy2WRwh4wLwsoJdU,4567
+vectorvein-0.2.80.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+vectorvein-0.2.80.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=IjQOFq7Ifxlb5_nN9hXelE-Odf3zvYnQ3VWgzIkk5ZI,68976
+vectorvein/chat_clients/anthropic_client.py,sha256=xAB2JDCqm865mmCXK9jfN636-lNrICTDUcBypuoWu_0,69234
 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
@@ -19,11 +19,11 @@ vectorvein/chat_clients/minimax_client.py,sha256=YOILWcsHsN5tihLTMbKJIyJr9TJREMI
 vectorvein/chat_clients/mistral_client.py,sha256=1aKSylzBDaLYcFnaBIL4-sXSzWmXfBeON9Q0rq-ziWw,534
 vectorvein/chat_clients/moonshot_client.py,sha256=gbu-6nGxx8uM_U2WlI4Wus881rFRotzHtMSoYOcruGU,526
 vectorvein/chat_clients/openai_client.py,sha256=Nz6tV45pWcsOupxjnsRsGTicbQNJWIZyxuJoJ5DGMpg,527
-vectorvein/chat_clients/openai_compatible_client.py,sha256=_vt-yMC62MygFLVuMuWij53SRW-dC0KHeTxmhcn5ZCs,48877
+vectorvein/chat_clients/openai_compatible_client.py,sha256=o0UP2jfTD8qDxd2ayeUaOS7p_yfaj7_S_YR2vmm2w28,49155
 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=ivfnadNH4vTP_kdB10sKQIVa7SMcIKc7KzmLjKPG3qU,29491
+vectorvein/chat_clients/utils.py,sha256=rd7snZT7RGSVTOlr159eJveo9ErUylAW0GLj9fjoWzQ,29652
 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
@@ -32,7 +32,7 @@ vectorvein/server/token_server.py,sha256=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7
 vectorvein/settings/__init__.py,sha256=3Kw3hbvqcIQepAR6Q2m2UXbBnwyJTUm8yAz-aHmbUTg,11163
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/types/__init__.py,sha256=ypg8c8AwF49FrFBMqmgH_eIBH4LFf0KN4kjqQa7zrvM,3376
-vectorvein/types/defaults.py,sha256=zjc26XykhpZH9VwdFnJ0SvERflamAbM7NYQsYUN7tFQ,32451
+vectorvein/types/defaults.py,sha256=lb36arKD9hv3W49vZZzHH1FrsUjLeRz7JsZYkE4lI7U,32698
 vectorvein/types/enums.py,sha256=LplSVkXLBK-t8TWtJKj_f7ktWTd6CSHWRLb67XKMm54,1716
 vectorvein/types/exception.py,sha256=KtnqZ-1DstHm95SZAyZdHhkGq1bJ4A9Aw3Zfdu-VIFo,130
 vectorvein/types/llm_parameters.py,sha256=Bdz9E_x0G96rvJ5TnEFPrU5QV4I2y0YFv7dY4Pq-MuU,7933
@@ -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.78.dist-info/RECORD,,
+vectorvein-0.2.80.dist-info/RECORD,,