vectorvein 0.2.21__tar.gz → 0.2.23__tar.gz

{vectorvein-0.2.21 → vectorvein-0.2.23}/PKG-INFO

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

{vectorvein-0.2.21 → vectorvein-0.2.23}/pyproject.toml

@@ -18,7 +18,7 @@ description = "VectorVein Python SDK"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.2.21"
+version = "0.2.23"
 
 [project.license]
 text = "MIT"

{vectorvein-0.2.21 → vectorvein-0.2.23}/src/vectorvein/chat_clients/anthropic_client.py

@@ -214,7 +214,7 @@ class AnthropicChatClient(BaseChatClient):
         if self.endpoint.proxy is not None and self.http_client is None:
             self.http_client = httpx.Client(proxy=self.endpoint.proxy)
 
-        if self.endpoint.is_vertex:
+        if self.endpoint.is_vertex or self.endpoint.endpoint_type == "anthropic_vertex":
             if self.endpoint.credentials is None:
                 raise ValueError("Anthropic Vertex endpoint requires credentials")
             self.creds = Credentials(
@@ -248,7 +248,7 @@ class AnthropicChatClient(BaseChatClient):
                 access_token=self.creds.token,
                 http_client=self.http_client,
             )
-        elif self.endpoint.is_bedrock:
+        elif self.endpoint.is_bedrock or self.endpoint.endpoint_type == "anthropic_bedrock":
             if self.endpoint.credentials is None:
                 raise ValueError("Anthropic Bedrock endpoint requires credentials")
             return AnthropicBedrock(
@@ -747,7 +747,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         if self.endpoint.proxy is not None and self.http_client is None:
             self.http_client = httpx.AsyncClient(proxy=self.endpoint.proxy)
 
-        if self.endpoint.is_vertex:
+        if self.endpoint.is_vertex or self.endpoint.endpoint_type == "anthropic_vertex":
             if self.endpoint.credentials is None:
                 raise ValueError("Anthropic Vertex endpoint requires credentials")
             self.creds = Credentials(
@@ -781,7 +781,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 access_token=self.creds.token,
                 http_client=self.http_client,
             )
-        elif self.endpoint.is_bedrock:
+        elif self.endpoint.is_bedrock or self.endpoint.endpoint_type == "anthropic_bedrock":
             if self.endpoint.credentials is None:
                 raise ValueError("Anthropic Bedrock endpoint requires credentials")
             return AsyncAnthropicBedrock(

{vectorvein-0.2.21 → vectorvein-0.2.23}/src/vectorvein/chat_clients/openai_compatible_client.py

@@ -93,7 +93,7 @@ class OpenAICompatibleChatClient(BaseChatClient):
         if self.endpoint.proxy is not None and self.http_client is None:
             self.http_client = httpx.Client(proxy=self.endpoint.proxy)
 
-        if self.endpoint.is_azure:
+        if self.endpoint.is_azure or self.endpoint.endpoint_type == "openai_azure":
             if self.endpoint.api_base is None:
                 raise ValueError("Azure endpoint is not set")
             return AzureOpenAI(
@@ -568,7 +568,7 @@ class AsyncOpenAICompatibleChatClient(BaseAsyncChatClient):
         if self.endpoint.proxy is not None and self.http_client is None:
             self.http_client = httpx.AsyncClient(proxy=self.endpoint.proxy)
 
-        if self.endpoint.is_azure:
+        if self.endpoint.is_azure or self.endpoint.endpoint_type == "openai_azure":
             if self.endpoint.api_base is None:
                 raise ValueError("Azure endpoint is not set")
             return AsyncAzureOpenAI(

{vectorvein-0.2.21 → vectorvein-0.2.23}/src/vectorvein/chat_clients/utils.py

@@ -230,7 +230,12 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
                 endpoint_id = endpoint_choice
             endpoint = settings.get_endpoint(endpoint_id)
 
-            if endpoint.is_vertex or endpoint.is_bedrock:
+            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 (
@@ -243,7 +248,7 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
                 )
 
         # TODO: Use anthropic token counting
-        warnings.warn("Anthropic token counting is not implemented yet")
+        warnings.warn("Anthropic token counting is not implemented in Vertex or Bedrock yet")
         return len(get_gpt_4o_encoding().encode(text))
     elif model.startswith("deepseek"):
         from deepseek_tokenizer import deepseek_tokenizer

{vectorvein-0.2.21 → vectorvein-0.2.23}/src/vectorvein/settings/__init__.py

@@ -148,6 +148,12 @@ class Settings(BaseModel):
                 backends[model_type] = BackendSettings(models=default_models)
 
         for endpoint in data.get("endpoints", []):
+            if endpoint.get("is_azure"):
+                endpoint["endpoint_type"] = "openai_azure"
+            if endpoint.get("is_vertex"):
+                endpoint["endpoint_type"] = "anthropic_vertex"
+            if endpoint.get("is_bedrock"):
+                endpoint["endpoint_type"] = "anthropic_bedrock"
             if not endpoint.get("api_base"):
                 continue
             api_base = endpoint["api_base"]
@@ -159,7 +165,7 @@ class Settings(BaseModel):
 
     def load(self, settings: SettingsDict | "Settings"):
         if isinstance(settings, Settings):
-            settings_dict = settings.model_dump()
+            settings_dict = settings.export()
         else:
             settings_dict = settings
         self.__init__(**settings_dict)

{vectorvein-0.2.21 → vectorvein-0.2.23}/src/vectorvein/types/llm_parameters.py

@@ -1,6 +1,6 @@
 # @Author: Bi Ying
 # @Date:   2024-07-26 23:48:04
-from typing import List, Dict, Optional, Union, Iterable
+from typing import List, Dict, Optional, Union, Iterable, Literal
 
 import httpx
 from pydantic import BaseModel, Field
@@ -31,7 +31,20 @@ class EndpointSetting(BaseModel):
     region: Optional[str] = Field(None, description="The region for the endpoint.")
     api_base: Optional[str] = Field(None, description="The base URL for the API.")
     api_key: Optional[str] = Field(None, description="The API key for authentication.")
-    api_schema_type: Optional[str] = Field(
+    endpoint_type: Optional[
+        Literal[
+            "default",
+            "openai",
+            "openai_azure",
+            "anthropic",
+            "anthropic_vertex",
+            "anthropic_bedrock",
+        ]
+    ] = Field(
+        "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.",
     )

{vectorvein-0.2.21 → vectorvein-0.2.23}/src/vectorvein/types/settings.py

@@ -70,7 +70,23 @@ class EndpointSettingDict(TypedDict):
     api_base: NotRequired[Optional[str]]
     api_key: NotRequired[str]
     region: NotRequired[str]
-    api_schema_type: NotRequired[str]
+    endpoint_type: NotRequired[
+        Literal[
+            "default",
+            "openai",
+            "openai_azure",
+            "anthropic",
+            "anthropic_vertex",
+            "anthropic_bedrock",
+        ]
+    ]
+    api_schema_type: NotRequired[
+        Literal[
+            "default",
+            "openai",
+            "anthropic",
+        ]
+    ]
     credentials: NotRequired[dict]
     is_azure: NotRequired[bool]
     is_vertex: NotRequired[bool]