vectorvein 0.2.22__tar.gz → 0.2.24__tar.gz

{vectorvein-0.2.22 → vectorvein-0.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.2.22
+Version: 0.2.24
 Summary: VectorVein Python SDK
 Author-Email: Anderson <andersonby@163.com>
 License: MIT
@@ -8,12 +8,11 @@ Requires-Python: >=3.10
 Requires-Dist: openai>=1.37.1
 Requires-Dist: tiktoken>=0.7.0
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: anthropic[bedrock,vertex]>=0.47.1
+Requires-Dist: anthropic>=0.47.1
 Requires-Dist: pydantic>=2.8.2
 Requires-Dist: Pillow>=10.4.0
 Requires-Dist: deepseek-tokenizer>=0.1.0
 Requires-Dist: qwen-tokenizer>=0.2.0
-Requires-Dist: google-auth>=2.35.0
 Requires-Dist: pycryptodome>=3.21.0
 Provides-Extra: server
 Requires-Dist: fastapi; extra == "server"
@@ -22,6 +21,11 @@ Provides-Extra: redis
 Requires-Dist: redis; extra == "redis"
 Provides-Extra: diskcache
 Requires-Dist: diskcache; extra == "diskcache"
+Provides-Extra: vertex
+Requires-Dist: anthropic[vertex]; extra == "vertex"
+Requires-Dist: google-auth>=2.35.0; extra == "vertex"
+Provides-Extra: bedrock
+Requires-Dist: anthropic[bedrock]; extra == "bedrock"
 Description-Content-Type: text/markdown
 
 # 向量脉络 API 包

{vectorvein-0.2.22 → vectorvein-0.2.24}/pyproject.toml

@@ -6,19 +6,18 @@ dependencies = [
     "openai>=1.37.1",
     "tiktoken>=0.7.0",
     "httpx>=0.27.0",
-    "anthropic[vertex,bedrock]>=0.47.1",
+    "anthropic>=0.47.1",
     "pydantic>=2.8.2",
     "Pillow>=10.4.0",
     "deepseek-tokenizer>=0.1.0",
     "qwen-tokenizer>=0.2.0",
-    "google-auth>=2.35.0",
     "pycryptodome>=3.21.0",
 ]
 description = "VectorVein Python SDK"
 name = "vectorvein"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "0.2.22"
+version = "0.2.24"
 
 [project.license]
 text = "MIT"
@@ -34,6 +33,13 @@ redis = [
 diskcache = [
     "diskcache",
 ]
+vertex = [
+    "anthropic[vertex]",
+    "google-auth>=2.35.0",
+]
+bedrock = [
+    "anthropic[bedrock]",
+]
 
 [build-system]
 build-backend = "pdm.backend"

{vectorvein-0.2.22 → vectorvein-0.2.24}/src/vectorvein/chat_clients/anthropic_client.py

@@ -47,9 +47,6 @@ from anthropic.types import (
     RawContentBlockStartEvent,
     RawContentBlockDeltaEvent,
 )
-from google.oauth2.credentials import Credentials
-from google.auth.transport.requests import Request
-from google.auth import _helpers
 
 from ..types import defaults as defs
 from .utils import cutoff_messages, get_message_token_counts
@@ -217,6 +214,11 @@ class AnthropicChatClient(BaseChatClient):
         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")
+
+            from google.auth import _helpers
+            from google.oauth2.credentials import Credentials
+            from google.auth.transport.requests import Request
+
             self.creds = Credentials(
                 token=self.endpoint.credentials.get("token"),
                 refresh_token=self.endpoint.credentials.get("refresh_token"),
@@ -750,6 +752,11 @@ class AsyncAnthropicChatClient(BaseAsyncChatClient):
         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")
+
+            from google.auth import _helpers
+            from google.oauth2.credentials import Credentials
+            from google.auth.transport.requests import Request
+
             self.creds = Credentials(
                 token=self.endpoint.credentials.get("token"),
                 refresh_token=self.endpoint.credentials.get("refresh_token"),

{vectorvein-0.2.22 → vectorvein-0.2.24}/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)