vectorvein 0.2.20__py3-none-any.whl → 0.2.22__py3-none-any.whl

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/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/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/settings/__init__.py

@@ -209,5 +209,52 @@ class Settings(BaseModel):
         else:
             return super().model_dump(exclude={"backends"})
 
+    def upgrade_to_v2(self) -> "Settings":
+        """
+        Upgrade settings from v1 format to v2 format.
+        In v2 format, all backend settings are stored in the 'backends' field.
+
+        Returns:
+            Settings: Self with updated format
+        """
+        # If already v2, no need to upgrade
+        if self.VERSION == "2" and self.backends is not None:
+            return self
+
+        # Initialize backends if not exists
+        if self.backends is None:
+            self.backends = Backends()
+
+        # Move all backend settings to backends field
+        backend_names = [
+            "anthropic",
+            "deepseek",
+            "gemini",
+            "groq",
+            "local",
+            "minimax",
+            "mistral",
+            "moonshot",
+            "openai",
+            "qwen",
+            "yi",
+            "zhipuai",
+            "baichuan",
+            "stepfun",
+            "xai",
+            "ernie",
+        ]
+
+        for backend_name in backend_names:
+            backend_setting = getattr(self, backend_name)
+            if backend_setting is not None:
+                setattr(self.backends, backend_name, backend_setting)
+                delattr(self, backend_name)
+
+        # Set version to 2
+        self.VERSION = "2"
+
+        return self
+
 
 settings = Settings()

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/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]

{vectorvein-0.2.20.dist-info → vectorvein-0.2.22.dist-info}/METADATA

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

{vectorvein-0.2.20.dist-info → vectorvein-0.2.22.dist-info}/RECORD

@@ -1,13 +1,13 @@
-vectorvein-0.2.20.dist-info/METADATA,sha256=6WQKUSKUztXILQmkVzYPwBN9JOkV6lArHUGHB_OOXxA,4414
-vectorvein-0.2.20.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.20.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.22.dist-info/METADATA,sha256=0ieuDuHWOgzKsC97jdtfo2Y-8Oi8ez40v14NIMHGDIg,4414
+vectorvein-0.2.22.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.22.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=KFOyUR-Vg9Ux75KYtqgOJz2B3cSYXKQoqaaapxqZfRs,58554
+vectorvein/chat_clients/anthropic_client.py,sha256=6yAZ6YYsyt96yqfjugjXQCgA_YhUhEw0whvZAWrPGbM,58768
 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,25 +19,25 @@ 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=L8SXCRA7OO_eXh6b-oya8k6XZZJ-j8SrJSvy8BFhCgs,48498
+vectorvein/chat_clients/openai_compatible_client.py,sha256=d6V6T_FvPxEuOhHoQC-NH0Ox6h8ux9T3buOPO2_RonY,48596
 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=sXqp-RAxCeNmNoh3SKptPoYqS0ZNb_y2Eemuz919IJk,25195
+vectorvein/chat_clients/utils.py,sha256=Um_RAhZOIsmrQabb76EZkiF61bGcX2enWScUC9Pk8ik,25393
 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
 vectorvein/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/server/token_server.py,sha256=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7wtdQ,1353
-vectorvein/settings/__init__.py,sha256=1KHgIF3hAXFMHlNZcgB4IcQg9iRy9WMh0BZUcBq5dGI,9509
+vectorvein/settings/__init__.py,sha256=fqOfdTZ_b1P1Mx_6rFOUkgaSqS06hvrjzIQArRUPjU0,10849
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/types/__init__.py,sha256=DJYGhlshgUQgzXPfMfKW5sTpBClZUCLhqmCqF44lVuU,3329
 vectorvein/types/defaults.py,sha256=wNPrfYDwsXMNIxofgGdN-ix9-by6WQu3cGIRySl3Q2E,27350
 vectorvein/types/enums.py,sha256=LplSVkXLBK-t8TWtJKj_f7ktWTd6CSHWRLb67XKMm54,1716
 vectorvein/types/exception.py,sha256=gnW4GnJ76jND6UGnodk9xmqkcbeS7Cz2rvncA2HpD5E,69
-vectorvein/types/llm_parameters.py,sha256=4SxDbJKVb9oGYymyxQtNZ66YZmUQd9_CpYYg81_Inkk,7650
+vectorvein/types/llm_parameters.py,sha256=1-8G6ieUj_Hb_hnJNTj7kt_7R6LkPmA6fcbNuIIiDDs,8070
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/types/settings.py,sha256=U-pgcgwzaWIIrBl-XmSRCG4Btq5fyGgpj8toWEMFBYE,4575
+vectorvein/types/settings.py,sha256=82RsherFSCc8s9-v0E7F_FK6avVh_XvC1b7EkNlFHbc,4918
 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=LsqomfXfqrXfHJDO1cl0Ox48f4St7X_SL12DSbAMSOw,5415
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
-vectorvein-0.2.20.dist-info/RECORD,,
+vectorvein-0.2.22.dist-info/RECORD,,