vectorvein 0.1.62__py3-none-any.whl → 0.1.64__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
@@ -41,6 +40,7 @@ from ..types.llm_parameters import (
     NotGiven,
     ToolParam,
     ToolChoice,
+    EndpointSetting,
     AnthropicToolParam,
     AnthropicToolChoice,
     ChatCompletionMessage,
@@ -178,19 +178,45 @@ class AnthropicChatClient(BaseChatClient):
             backend_name,
         )
         self.model_id = None
+        self.endpoint = None
+
+    def set_model_id_by_endpoint_id(self, endpoint_id: str):
+        for endpoint_option in self.backend_settings.models[self.model].endpoints:
+            if isinstance(endpoint_option, dict):
+                if endpoint_id == endpoint_option["endpoint_id"]:
+                    self.model_id = endpoint_option["model_id"]
+                    break
+            else:
+                if endpoint_id == endpoint_option:
+                    self.model_id = endpoint_option
+                    break
+        return self.model_id
+
+    def _set_endpoint(self):
+        if self.endpoint is None:
+            if self.random_endpoint:
+                self.random_endpoint = True
+                endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
+                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 = settings.get_endpoint(self.endpoint_id)
+                self.set_model_id_by_endpoint_id(self.endpoint_id)
+        elif isinstance(self.endpoint, EndpointSetting):
+            self.endpoint_id = self.endpoint.id
+            self.set_model_id_by_endpoint_id(self.endpoint_id)
+        else:
+            raise ValueError("Invalid endpoint")
+
+        return self.endpoint, self.model_id
 
     @property
     def raw_client(self):  # type: ignore
-        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)
+        self.endpoint, self.model_id = self._set_endpoint()
 
         if self.endpoint.is_vertex:
             if self.endpoint.credentials is None:
@@ -330,28 +356,24 @@ 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"]
-            else:
-                self.endpoint_id = endpoint
-            self.endpoint = settings.get_endpoint(self.endpoint_id)
+        self.model_setting = self.backend_settings.models[self.model]
+        if self.model_id is None:
+            self.model_id = self.model_setting.id
+
+        self.endpoint, self.model_id = self._set_endpoint()
 
         if self.endpoint.api_schema_type == "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
 
             formatted_messages = refactor_into_openai_messages(messages)
+            model_id = self.model_id
 
             if self.stream:
 
                 def _generator():
                     response = OpenAICompatibleChatClient(
-                        model=self.model,
+                        model=model_id,
                         stream=True,
                         temperature=self.temperature,
                         context_length_control=self.context_length_control,
@@ -379,7 +401,7 @@ class AnthropicChatClient(BaseChatClient):
                 return _generator()
             else:
                 return OpenAICompatibleChatClient(
-                    model=self.model,
+                    model=model_id,
                     stream=False,
                     temperature=self.temperature,
                     context_length_control=self.context_length_control,
@@ -411,10 +433,6 @@ class AnthropicChatClient(BaseChatClient):
         if isinstance(top_p, OpenAINotGiven) or top_p is None:
             top_p = NOT_GIVEN
 
-        self.model_setting = self.backend_settings.models[self.model]
-        if self.model_id is None:
-            self.model_id = self.model_setting.id
-
         if messages[0].get("role") == "system":
             system_prompt: str = messages[0]["content"]
             messages = messages[1:]
@@ -569,19 +587,45 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
             backend_name,
         )
         self.model_id = None
+        self.endpoint = None
+
+    def set_model_id_by_endpoint_id(self, endpoint_id: str):
+        for endpoint_option in self.backend_settings.models[self.model].endpoints:
+            if isinstance(endpoint_option, dict):
+                if endpoint_id == endpoint_option["endpoint_id"]:
+                    self.model_id = endpoint_option["model_id"]
+                    break
+            else:
+                if endpoint_id == endpoint_option:
+                    self.model_id = endpoint_option
+                    break
+        return self.model_id
+
+    def _set_endpoint(self):
+        if self.endpoint is None:
+            if self.random_endpoint:
+                self.random_endpoint = True
+                endpoint = random.choice(self.backend_settings.models[self.model].endpoints)
+                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 = settings.get_endpoint(self.endpoint_id)
+                self.set_model_id_by_endpoint_id(self.endpoint_id)
+        elif isinstance(self.endpoint, EndpointSetting):
+            self.endpoint_id = self.endpoint.id
+            self.set_model_id_by_endpoint_id(self.endpoint_id)
+        else:
+            raise ValueError("Invalid endpoint")
+
+        return self.endpoint, self.model_id
 
     @property
     def raw_client(self):  # type: ignore
-        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)
+        self.endpoint, self.model_id = self._set_endpoint()
 
         if self.endpoint.is_vertex:
             if self.endpoint.credentials is None:
@@ -720,28 +764,24 @@ 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"]
-            else:
-                self.endpoint_id = endpoint
-            self.endpoint = settings.get_endpoint(self.endpoint_id)
+        self.model_setting = self.backend_settings.models[self.model]
+        if self.model_id is None:
+            self.model_id = self.model_setting.id
+
+        self.endpoint, self.model_id = self._set_endpoint()
 
         if self.endpoint.api_schema_type == "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
 
             formatted_messages = refactor_into_openai_messages(messages)
+            model_id = self.model_id
 
             if self.stream:
 
                 async def _generator():
                     client = AsyncOpenAICompatibleChatClient(
-                        model=self.model,
+                        model=model_id,
                         stream=True,
                         temperature=self.temperature,
                         context_length_control=self.context_length_control,
@@ -770,7 +810,7 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 return _generator()
             else:
                 client = AsyncOpenAICompatibleChatClient(
-                    model=self.model,
+                    model=model_id,
                     stream=False,
                     temperature=self.temperature,
                     context_length_control=self.context_length_control,
@@ -803,10 +843,6 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         if isinstance(top_p, OpenAINotGiven) or top_p is None:
             top_p = NOT_GIVEN
 
-        self.model_setting = self.backend_settings.models[self.model]
-        if self.model_id is None:
-            self.model_id = self.model_setting.id
-
         if messages[0].get("role") == "system":
             system_prompt = messages[0]["content"]
             messages = messages[1:]

vectorvein/chat_clients/openai_compatible_client.py

@@ -73,6 +73,8 @@ class OpenAICompatibleChatClient(BaseChatClient):
             self.endpoint = settings.get_endpoint(self.endpoint_id)
 
         if self.endpoint.is_azure:
+            if self.endpoint.api_base is None:
+                raise ValueError("Azure endpoint is not set")
             return AzureOpenAI(
                 azure_endpoint=self.endpoint.api_base,
                 api_key=self.endpoint.api_key,
@@ -339,6 +341,8 @@ class AsyncOpenAICompatibleChatClient(BaseAsyncChatClient):
             self.endpoint = settings.get_endpoint(self.endpoint_id)
 
         if self.endpoint.is_azure:
+            if self.endpoint.api_base is None:
+                raise ValueError("Azure endpoint is not set")
             return AsyncAzureOpenAI(
                 azure_endpoint=self.endpoint.api_base,
                 api_key=self.endpoint.api_key,

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.62.dist-info → vectorvein-0.1.64.dist-info}/METADATA

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

{vectorvein-0.1.62.dist-info → vectorvein-0.1.64.dist-info}/RECORD

@@ -1,9 +1,9 @@
-vectorvein-0.1.62.dist-info/METADATA,sha256=5c_Miwx6OAcWpmDNNdP7SGXZQXmudq6y4TB7weXGL_w,641
-vectorvein-0.1.62.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.1.62.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.1.64.dist-info/METADATA,sha256=ZthopkhnsP7tm1D9r-6TLH88LewZUC235dwC9ZPF3fQ,641
+vectorvein-0.1.64.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.1.64.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=efuegF1XFMgC5AKK-CqxAx_ktJHYth_ojCtELqv-RF0,38564
+vectorvein/chat_clients/anthropic_client.py,sha256=4d1LvkJxHEbbNKfkkeHtqSKG3sREqe9OYZlbLiWvLS8,40005
 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
@@ -14,7 +14,7 @@ vectorvein/chat_clients/minimax_client.py,sha256=uNYz3ccJOhTAgzkDNvWfM4_LaBaOpHj
 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=hbSggW5itvTRk3Qb3rejNTt3vd0r6R95irLTjeSzm2g,23102
+vectorvein/chat_clients/openai_compatible_client.py,sha256=-n0iDTuthnbVmS_Dbc49TafjmheVS1LeGEF5cY1L2qY,23324
 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
@@ -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.62.dist-info/RECORD,,
+vectorvein-0.1.64.dist-info/RECORD,,