vectorvein 0.1.61__py3-none-any.whl → 0.1.63__py3-none-any.whl

vectorvein/chat_clients/anthropic_client.py

@@ -2,7 +2,6 @@
 # @Date:   2024-07-26 14:48:55
 import json
 import random
-from functools import cached_property
 from typing import overload, Generator, AsyncGenerator, Any, Literal, Iterable
 
 import httpx
@@ -178,19 +177,23 @@ class AnthropicChatClient(BaseChatClient):
             backend_name,
         )
         self.model_id = None
-
-    @cached_property
-    def raw_client(self):
-        if self.random_endpoint:
-            self.random_endpoint = True
-            endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
-            self.model_id = None
-            if isinstance(endpoint, dict):
-                self.endpoint_id = endpoint["endpoint_id"]
-                self.model_id = endpoint["model_id"]
+        self.endpoint = None
+
+    @property
+    def raw_client(self):  # type: ignore
+        if self.endpoint is None:
+            if self.random_endpoint:
+                self.random_endpoint = True
+                endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
+                self.model_id = None
+                if isinstance(endpoint, dict):
+                    self.endpoint_id = endpoint["endpoint_id"]
+                    self.model_id = endpoint["model_id"]
+                else:
+                    self.endpoint_id = endpoint
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
             else:
-                self.endpoint_id = endpoint
-            self.endpoint = settings.get_endpoint(self.endpoint_id)
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
 
         if self.endpoint.is_vertex:
             if self.endpoint.credentials is None:
@@ -330,16 +333,19 @@ class AnthropicChatClient(BaseChatClient):
         if temperature is not None:
             self.temperature = temperature
 
-        if self.random_endpoint:
-            self.random_endpoint = True
-            endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
-            self.model_id = None
-            if isinstance(endpoint, dict):
-                self.endpoint_id = endpoint["endpoint_id"]
-                self.model_id = endpoint["model_id"]
+        if self.endpoint is None:
+            if self.random_endpoint:
+                self.random_endpoint = True
+                endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
+                self.model_id = None
+                if isinstance(endpoint, dict):
+                    self.endpoint_id = endpoint["endpoint_id"]
+                    self.model_id = endpoint["model_id"]
+                else:
+                    self.endpoint_id = endpoint
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
             else:
-                self.endpoint_id = endpoint
-            self.endpoint = settings.get_endpoint(self.endpoint_id)
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
 
         if self.endpoint.api_schema_type == "openai":
             _tools = OPENAI_NOT_GIVEN if tools is NOT_GIVEN else tools
@@ -401,7 +407,8 @@ class AnthropicChatClient(BaseChatClient):
                     **kwargs,
                 )
 
-        assert isinstance(self.raw_client, Anthropic | AnthropicVertex | AnthropicBedrock)
+        raw_client = self.raw_client  # 调用完 self.raw_client 后，self.model_id 会被赋值
+        assert isinstance(raw_client, Anthropic | AnthropicVertex | AnthropicBedrock)
 
         if isinstance(tools, OpenAINotGiven):
             tools = NOT_GIVEN
@@ -410,7 +417,6 @@ class AnthropicChatClient(BaseChatClient):
         if isinstance(top_p, OpenAINotGiven) or top_p is None:
             top_p = NOT_GIVEN
 
-        raw_client = self.raw_client  # 调用完 self.raw_client 后，self.model_id 会被赋值
         self.model_setting = self.backend_settings.models[self.model]
         if self.model_id is None:
             self.model_id = self.model_setting.id
@@ -569,19 +575,23 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
             backend_name,
         )
         self.model_id = None
-
-    @cached_property
-    def raw_client(self):
-        if self.random_endpoint:
-            self.random_endpoint = True
-            endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
-            self.model_id = None
-            if isinstance(endpoint, dict):
-                self.endpoint_id = endpoint["endpoint_id"]
-                self.model_id = endpoint["model_id"]
+        self.endpoint = None
+
+    @property
+    def raw_client(self):  # type: ignore
+        if self.endpoint is None:
+            if self.random_endpoint:
+                self.random_endpoint = True
+                endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
+                self.model_id = None
+                if isinstance(endpoint, dict):
+                    self.endpoint_id = endpoint["endpoint_id"]
+                    self.model_id = endpoint["model_id"]
+                else:
+                    self.endpoint_id = endpoint
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
             else:
-                self.endpoint_id = endpoint
-            self.endpoint = settings.get_endpoint(self.endpoint_id)
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
 
         if self.endpoint.is_vertex:
             if self.endpoint.credentials is None:
@@ -720,16 +730,19 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         if temperature is not None:
             self.temperature = temperature
 
-        if self.random_endpoint:
-            self.random_endpoint = True
-            endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
-            self.model_id = None
-            if isinstance(endpoint, dict):
-                self.endpoint_id = endpoint["endpoint_id"]
-                self.model_id = endpoint["model_id"]
+        if self.endpoint is None:
+            if self.random_endpoint:
+                self.random_endpoint = True
+                endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
+                self.model_id = None
+                if isinstance(endpoint, dict):
+                    self.endpoint_id = endpoint["endpoint_id"]
+                    self.model_id = endpoint["model_id"]
+                else:
+                    self.endpoint_id = endpoint
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
             else:
-                self.endpoint_id = endpoint
-            self.endpoint = settings.get_endpoint(self.endpoint_id)
+                self.endpoint = settings.get_endpoint(self.endpoint_id)
 
         if self.endpoint.api_schema_type == "openai":
             _tools = OPENAI_NOT_GIVEN if tools is NOT_GIVEN else tools
@@ -793,7 +806,8 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                     **kwargs,
                 )
 
-        assert isinstance(self.raw_client, AsyncAnthropic | AsyncAnthropicVertex | AsyncAnthropicBedrock)
+        raw_client = self.raw_client  # 调用完 self.raw_client 后，self.model_id 会被赋值
+        assert isinstance(raw_client, AsyncAnthropic | AsyncAnthropicVertex | AsyncAnthropicBedrock)
 
         if isinstance(tools, OpenAINotGiven):
             tools = NOT_GIVEN
@@ -802,7 +816,6 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         if isinstance(top_p, OpenAINotGiven) or top_p is None:
             top_p = NOT_GIVEN
 
-        raw_client = self.raw_client  # 调用完 self.raw_client 后，self.model_id 会被赋值
         self.model_setting = self.backend_settings.models[self.model]
         if self.model_id is None:
             self.model_id = self.model_setting.id

vectorvein/types/llm_parameters.py

@@ -28,7 +28,7 @@ class EndpointOptionDict(TypedDict):
 class EndpointSetting(BaseModel):
     id: str = Field(..., description="The id of the endpoint.")
     region: Optional[str] = Field(None, description="The region for the endpoint.")
-    api_base: str = Field(None, description="The base URL for the API.")
+    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(
         "default",

{vectorvein-0.1.61.dist-info → vectorvein-0.1.63.dist-info}/METADATA

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

{vectorvein-0.1.61.dist-info → vectorvein-0.1.63.dist-info}/RECORD

@@ -1,9 +1,9 @@
-vectorvein-0.1.61.dist-info/METADATA,sha256=Yz8aiNuG2sLEimpEUrWwJSO6p8kfd2q6ObpwLYwZR0E,641
-vectorvein-0.1.61.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.1.61.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.1.63.dist-info/METADATA,sha256=Nhl-efJ6b-cKBEYgetKraAgBsmre6FyZI8imEsWkzCI,641
+vectorvein-0.1.63.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.1.63.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/chat_clients/__init__.py,sha256=Oev7Lv1DIEWCMD-2Pm7e2cwzX7JFQTnIK-j6o4iUuyQ,17725
-vectorvein/chat_clients/anthropic_client.py,sha256=ZDHkKY4MApGgRPuVtWAIxcnJXnRu7eCIEY6GoRBgNrQ,38556
+vectorvein/chat_clients/anthropic_client.py,sha256=tRBhX6k2cKvlm0XCiE6wvI6iYYBMV_RpBoquWSCkAmk,39240
 vectorvein/chat_clients/baichuan_client.py,sha256=CVMvpgjdrZGv0BWnTOBD-f2ufZ3wq3496wqukumsAr4,526
 vectorvein/chat_clients/base_client.py,sha256=tmD3ai6YjQnCKHuPsUww1khRlJeJ2AJzYubksb-2UaM,10489
 vectorvein/chat_clients/deepseek_client.py,sha256=3qWu01NlJAP2N-Ff62d5-CZXZitlizE1fzb20LNetig,526
@@ -29,8 +29,8 @@ vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 vectorvein/types/defaults.py,sha256=Hb9BFNJIRJcwjePsQTKKihHqJGeJGbFHfNeV_pIV8gM,24479
 vectorvein/types/enums.py,sha256=7KTJSVtQueImmbr1fSwv3rQVtc0RyMWXJmoE2tDOaso,1667
 vectorvein/types/exception.py,sha256=gnW4GnJ76jND6UGnodk9xmqkcbeS7Cz2rvncA2HpD5E,69
-vectorvein/types/llm_parameters.py,sha256=Q1mBJPMF7pzFQw1G9ut9RgRPGUEYmY5Kvb7CSYurZQ8,5350
+vectorvein/types/llm_parameters.py,sha256=g2Q0RKMC2vOcMI0tFpZ53xfVSfC8MLoK0YntPqce49U,5360
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/utilities/media_processing.py,sha256=CTRq-lGlFkFgP_FSRhNwF_qUgmOrXPf2_1Ok9HY42_g,5887
 vectorvein/utilities/retry.py,sha256=6KFS9R2HdhqM3_9jkjD4F36ZSpEx2YNFGOVlpOsUetM,2208
-vectorvein-0.1.61.dist-info/RECORD,,
+vectorvein-0.1.63.dist-info/RECORD,,