vectorvein 0.1.63__tar.gz → 0.1.65__tar.gz

{vectorvein-0.1.63 → vectorvein-0.1.65}/PKG-INFO

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

{vectorvein-0.1.63 → vectorvein-0.1.65}/pyproject.toml

@@ -17,7 +17,7 @@ description = "VectorVein python SDK"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.1.63"
+version = "0.1.65"
 
 [project.license]
 text = "MIT"

{vectorvein-0.1.63 → vectorvein-0.1.65}/src/vectorvein/chat_clients/anthropic_client.py

@@ -40,6 +40,7 @@ from ..types.llm_parameters import (
     NotGiven,
     ToolParam,
     ToolChoice,
+    EndpointSetting,
     AnthropicToolParam,
     AnthropicToolChoice,
     ChatCompletionMessage,
@@ -179,13 +180,23 @@ class AnthropicChatClient(BaseChatClient):
         self.model_id = None
         self.endpoint = None
 
-    @property
-    def raw_client(self):  # type: ignore
+    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)
-                self.model_id = None
                 if isinstance(endpoint, dict):
                     self.endpoint_id = endpoint["endpoint_id"]
                     self.model_id = endpoint["model_id"]
@@ -194,6 +205,18 @@ class AnthropicChatClient(BaseChatClient):
                 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
+        self.endpoint, self.model_id = self._set_endpoint()
 
         if self.endpoint.is_vertex:
             if self.endpoint.credentials is None:
@@ -333,31 +356,24 @@ class AnthropicChatClient(BaseChatClient):
         if temperature is not None:
             self.temperature = temperature
 
-        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 = 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,
@@ -385,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,
@@ -417,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:]
@@ -577,13 +589,23 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         self.model_id = None
         self.endpoint = None
 
-    @property
-    def raw_client(self):  # type: ignore
+    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)
-                self.model_id = None
                 if isinstance(endpoint, dict):
                     self.endpoint_id = endpoint["endpoint_id"]
                     self.model_id = endpoint["model_id"]
@@ -592,6 +614,18 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
                 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
+        self.endpoint, self.model_id = self._set_endpoint()
 
         if self.endpoint.is_vertex:
             if self.endpoint.credentials is None:
@@ -631,8 +665,8 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
             if self.endpoint.credentials is None:
                 raise ValueError("Anthropic Bedrock endpoint requires credentials")
             return AsyncAnthropicBedrock(
-                aws_access_key=self.endpoint.credentials.get("aws_access_key"),
-                aws_secret_key=self.endpoint.credentials.get("aws_secret_key"),
+                aws_access_key=self.endpoint.credentials.get("access_key"),
+                aws_secret_key=self.endpoint.credentials.get("secret_key"),
                 aws_region=self.endpoint.region,
                 http_client=self.http_client,
             )
@@ -730,31 +764,24 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         if temperature is not None:
             self.temperature = temperature
 
-        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 = 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,
@@ -783,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,
@@ -816,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-0.1.63 → vectorvein-0.1.65}/src/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,