vectorvein 0.2.40__py3-none-any.whl → 0.2.42__py3-none-any.whl

vectorvein/chat_clients/anthropic_client.py

@@ -263,13 +263,13 @@ class AnthropicChatClient(BaseChatClient):
                 base_url=self.endpoint.api_base,
                 http_client=self.http_client,
             )
-        elif self.endpoint.api_schema_type == "default":
+        elif self.endpoint.endpoint_type in ("default", "anthropic"):
             return Anthropic(
                 api_key=self.endpoint.api_key,
                 base_url=self.endpoint.api_base,
                 http_client=self.http_client,
             )
-        elif self.endpoint.api_schema_type == "openai":
+        else:
             return OpenAICompatibleChatClient(
                 model=self.model,
                 stream=self.stream,
@@ -455,7 +455,7 @@ class AnthropicChatClient(BaseChatClient):
 
         self.endpoint, self.model_id = self._set_endpoint()
 
-        if self.endpoint.api_schema_type == "openai":
+        if self.endpoint.endpoint_type and self.endpoint.endpoint_type.startswith("openai"):
             _tools = OPENAI_NOT_GIVEN if tools is NOT_GIVEN else tools
             _tool_choice = OPENAI_NOT_GIVEN if tool_choice is NOT_GIVEN else tool_choice
 
@@ -810,13 +810,13 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 aws_region=self.endpoint.region,
                 http_client=self.http_client,
             )
-        elif self.endpoint.api_schema_type == "default":
+        elif self.endpoint.endpoint_type in ("default", "anthropic"):
             return AsyncAnthropic(
                 api_key=self.endpoint.api_key,
                 base_url=self.endpoint.api_base,
                 http_client=self.http_client,
             )
-        elif self.endpoint.api_schema_type == "openai":
+        else:
             return AsyncOpenAICompatibleChatClient(
                 model=self.model,
                 stream=self.stream,
@@ -1002,7 +1002,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
 
         self.endpoint, self.model_id = self._set_endpoint()
 
-        if self.endpoint.api_schema_type == "openai":
+        if self.endpoint.endpoint_type and self.endpoint.endpoint_type.startswith("openai"):
             _tools = OPENAI_NOT_GIVEN if tools is NOT_GIVEN else tools
             _tool_choice = OPENAI_NOT_GIVEN if tool_choice is NOT_GIVEN else tool_choice
 

vectorvein/chat_clients/utils.py

@@ -223,29 +223,32 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         return result["totalTokens"]
     elif model.startswith("claude"):
         backend_setting = settings.get_backend(BackendType.Anthropic)
-        for endpoint_choice in backend_setting.models[model].endpoints:
-            if isinstance(endpoint_choice, dict):
-                endpoint_id = endpoint_choice["endpoint_id"]
-            else:
-                endpoint_id = endpoint_choice
-            endpoint = settings.get_endpoint(endpoint_id)
-
-            if (
-                endpoint.is_vertex
-                or endpoint.is_bedrock
-                or endpoint.endpoint_type == "anthropic_vertex"
-                or endpoint.endpoint_type == "anthropic_bedrock"
-            ):
-                continue
-            elif endpoint.api_schema_type == "default":
-                return (
-                    Anthropic(
-                        api_key=endpoint.api_key,
-                        base_url=endpoint.api_base,
+        try:
+            for endpoint_choice in backend_setting.models[model].endpoints:
+                if isinstance(endpoint_choice, dict):
+                    endpoint_id = endpoint_choice["endpoint_id"]
+                else:
+                    endpoint_id = endpoint_choice
+                endpoint = settings.get_endpoint(endpoint_id)
+
+                if (
+                    endpoint.is_vertex
+                    or endpoint.is_bedrock
+                    or endpoint.endpoint_type == "anthropic_vertex"
+                    or endpoint.endpoint_type == "anthropic_bedrock"
+                ):
+                    continue
+                elif endpoint.endpoint_type in ("default", "anthropic"):
+                    return (
+                        Anthropic(
+                            api_key=endpoint.api_key,
+                            base_url=endpoint.api_base,
+                        )
+                        .beta.messages.count_tokens(messages=[{"role": "user", "content": text}], model=model)
+                        .input_tokens
                     )
-                    .beta.messages.count_tokens(messages=[{"role": "user", "content": text}], model=model)
-                    .input_tokens
-                )
+        except Exception as e:
+            warnings.warn(f"Anthropic token counting failed: {e}")
 
         # TODO: Use anthropic token counting
         warnings.warn("Anthropic token counting is not implemented in Vertex or Bedrock yet")

vectorvein/types/llm_parameters.py

@@ -44,10 +44,6 @@ class EndpointSetting(BaseModel):
         "default",
         description="The type of endpoint. Set to 'default' will determine the type automatically.",
     )
-    api_schema_type: Optional[Literal["default", "openai", "anthropic"]] = Field(
-        "default",
-        description="The type of client for the endpoint. Set to 'default' will determine the type automatically.",
-    )
     credentials: Optional[dict] = Field(None, description="Additional credentials if needed.")
     is_azure: bool = Field(False, description="Indicates if the endpoint is for Azure.")
     is_vertex: bool = Field(False, description="Indicates if the endpoint is for Vertex.")

vectorvein/types/settings.py

@@ -80,13 +80,6 @@ class EndpointSettingDict(TypedDict):
             "anthropic_bedrock",
         ]
     ]
-    api_schema_type: NotRequired[
-        Literal[
-            "default",
-            "openai",
-            "anthropic",
-        ]
-    ]
     credentials: NotRequired[dict]
     is_azure: NotRequired[bool]
     is_vertex: NotRequired[bool]

{vectorvein-0.2.40.dist-info → vectorvein-0.2.42.dist-info}/METADATA

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

{vectorvein-0.2.40.dist-info → vectorvein-0.2.42.dist-info}/RECORD

@@ -1,13 +1,13 @@
-vectorvein-0.2.40.dist-info/METADATA,sha256=GYBVv1J0YtMCvYEfODN26N3Vg2Vgsl2nDvSasaHRUlU,4570
-vectorvein-0.2.40.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.40.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.42.dist-info/METADATA,sha256=YCH8sZb00gd6r310VwxbEo6p4th4_0QoD0hqYNSqf6g,4570
+vectorvein-0.2.42.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.42.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=MfROOOCPiuaW0N8DRTbkjHSL9Stv4I0xIMvILF-RARM,60547
+vectorvein/chat_clients/anthropic_client.py,sha256=sazkyIMRSO7h5NvHJPhvMwIEjfTRKBnj8fxjmdooJCg,60567
 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=d6V6T_FvPxEuOhHoQC-NH
 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=CNJejyTmZ5x9TMmVfSnn3OR0optuS9fZjF9Ocu8tSOM,26891
+vectorvein/chat_clients/utils.py,sha256=OlyIomsDxpSV7R9PmMcL_elnUyMhriREx6W9jsQA8uw,27103
 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,9 +35,9 @@ vectorvein/types/__init__.py,sha256=ypg8c8AwF49FrFBMqmgH_eIBH4LFf0KN4kjqQa7zrvM,
 vectorvein/types/defaults.py,sha256=U8acSg7yBWz5rOuwqRY45XX6lqPkM7Y7RbuurX9cpxg,27335
 vectorvein/types/enums.py,sha256=LplSVkXLBK-t8TWtJKj_f7ktWTd6CSHWRLb67XKMm54,1716
 vectorvein/types/exception.py,sha256=KtnqZ-1DstHm95SZAyZdHhkGq1bJ4A9Aw3Zfdu-VIFo,130
-vectorvein/types/llm_parameters.py,sha256=1-8G6ieUj_Hb_hnJNTj7kt_7R6LkPmA6fcbNuIIiDDs,8070
+vectorvein/types/llm_parameters.py,sha256=2rF-CQsWcHqTzI2r5x55gSsFm7LW_iCxQxZTEnk0yF8,7843
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/types/settings.py,sha256=08kROkDbb_v0TR8FcdfHA1XBIq6-tkM2ezO6taDLuV8,4938
+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
@@ -62,4 +62,4 @@ vectorvein/workflow/nodes/vector_db.py,sha256=t6I17q6iR3yQreiDHpRrksMdWDPIvgqJs0
 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/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
-vectorvein-0.2.40.dist-info/RECORD,,
+vectorvein-0.2.42.dist-info/RECORD,,