vectorvein 0.2.12__tar.gz → 0.2.14__tar.gz

{vectorvein-0.2.12 → vectorvein-0.2.14}/PKG-INFO

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

{vectorvein-0.2.12 → vectorvein-0.2.14}/pyproject.toml

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

vectorvein-0.2.14/src/vectorvein/settings/__init__.py

@@ -0,0 +1,196 @@
+# @Author: Bi Ying
+# @Date:   2024-07-27 00:30:56
+import warnings
+from typing import List, Optional, Literal
+
+from pydantic import BaseModel, Field
+
+from ..types import defaults as defs
+from ..types.enums import BackendType
+from ..types.settings import SettingsDict
+from ..types.llm_parameters import BackendSettings, EndpointSetting
+
+
+class RedisConfig(BaseModel):
+    host: str = "localhost"
+    port: int = 6379
+    db: int = 0
+
+
+class DiskCacheConfig(BaseModel):
+    cache_dir: str = ".rate_limit_cache"
+
+
+class RateLimitConfig(BaseModel):
+    enabled: bool = False
+
+    backend: Literal["memory", "redis", "diskcache"] = "memory"
+    redis: Optional[RedisConfig] = Field(default=None)
+    diskcache: Optional[DiskCacheConfig] = Field(default=None)
+    default_rpm: int = 60
+    default_tpm: int = 1000000
+
+
+class Server(BaseModel):
+    host: str
+    port: int
+    url: Optional[str]
+
+
+class Backends(BaseModel):
+    """Model containing all backend configurations in one place."""
+
+    anthropic: BackendSettings = Field(default_factory=BackendSettings, description="Anthropic models settings.")
+    deepseek: BackendSettings = Field(default_factory=BackendSettings, description="Deepseek models settings.")
+    gemini: BackendSettings = Field(default_factory=BackendSettings, description="Gemini models settings.")
+    groq: BackendSettings = Field(default_factory=BackendSettings, description="Groq models settings.")
+    local: BackendSettings = Field(default_factory=BackendSettings, description="Local models settings.")
+    minimax: BackendSettings = Field(default_factory=BackendSettings, description="Minimax models settings.")
+    mistral: BackendSettings = Field(default_factory=BackendSettings, description="Mistral models settings.")
+    moonshot: BackendSettings = Field(default_factory=BackendSettings, description="Moonshot models settings.")
+    openai: BackendSettings = Field(default_factory=BackendSettings, description="OpenAI models settings.")
+    qwen: BackendSettings = Field(default_factory=BackendSettings, description="Qwen models settings.")
+    yi: BackendSettings = Field(default_factory=BackendSettings, description="Yi models settings.")
+    zhipuai: BackendSettings = Field(default_factory=BackendSettings, description="Zhipuai models settings.")
+    baichuan: BackendSettings = Field(default_factory=BackendSettings, description="Baichuan models settings.")
+    stepfun: BackendSettings = Field(default_factory=BackendSettings, description="StepFun models settings.")
+    xai: BackendSettings = Field(default_factory=BackendSettings, description="XAI models settings.")
+
+
+class Settings(BaseModel):
+    VERSION: Optional[str] = Field(
+        default="2", description="Configuration version. If provided, will use the corresponding format."
+    )
+    endpoints: List[EndpointSetting] = Field(
+        default_factory=list, description="Available endpoints for the LLM service."
+    )
+    token_server: Optional[Server] = Field(default=None, description="Token server address. Format: host:port")
+    rate_limit: Optional[RateLimitConfig] = Field(default=None, description="Rate limit settings.")
+
+    # V2 format: all model backend configs in a single dictionary
+    backends: Optional[Backends] = Field(default=None, description="All model backends in one place (V2 format).")
+
+    # V1 format: each model backend config
+    anthropic: Optional[BackendSettings] = Field(
+        default_factory=BackendSettings, description="Anthropic models settings."
+    )
+    deepseek: Optional[BackendSettings] = Field(
+        default_factory=BackendSettings, description="Deepseek models settings."
+    )
+    gemini: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Gemini models settings.")
+    groq: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Groq models settings.")
+    local: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Local models settings.")
+    minimax: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Minimax models settings.")
+    mistral: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Mistral models settings.")
+    moonshot: Optional[BackendSettings] = Field(
+        default_factory=BackendSettings, description="Moonshot models settings."
+    )
+    openai: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="OpenAI models settings.")
+    qwen: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Qwen models settings.")
+    yi: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Yi models settings.")
+    zhipuai: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Zhipuai models settings.")
+    baichuan: Optional[BackendSettings] = Field(
+        default_factory=BackendSettings, description="Baichuan models settings."
+    )
+    stepfun: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="StepFun models settings.")
+    xai: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="XAI models settings.")
+
+    def __init__(self, **data):
+        model_types = {
+            "anthropic": defs.ANTHROPIC_MODELS,
+            "deepseek": defs.DEEPSEEK_MODELS,
+            "gemini": defs.GEMINI_MODELS,
+            "groq": defs.GROQ_MODELS,
+            "local": {},
+            "minimax": defs.MINIMAX_MODELS,
+            "mistral": defs.MISTRAL_MODELS,
+            "moonshot": defs.MOONSHOT_MODELS,
+            "openai": defs.OPENAI_MODELS,
+            "qwen": defs.QWEN_MODELS,
+            "yi": defs.YI_MODELS,
+            "zhipuai": defs.ZHIPUAI_MODELS,
+            "baichuan": defs.BAICHUAN_MODELS,
+            "stepfun": defs.STEPFUN_MODELS,
+            "xai": defs.XAI_MODELS,
+        }
+
+        version = data.get("VERSION")
+
+        if len(data) == 0:
+            version = "2"
+            data["backends"] = {}
+
+        # If V2 format, model configs are in the backends dictionary
+        if version == "2":
+            if "backends" not in data:
+                raise ValueError("backends is required in V2 format.")
+
+            backends = data["backends"]
+        else:
+            backends = data
+            warnings.warn("You're using vectorvein's deprecated V1 format. Please use V2 format.")
+
+        for model_type, default_models in model_types.items():
+            if model_type in backends:
+                model_settings = BackendSettings()
+                user_models = backends[model_type].get("models", {})
+                model_settings.update_models(default_models, user_models)
+                backends[model_type] = model_settings
+            else:
+                backends[model_type] = BackendSettings(models=default_models)
+
+        for endpoint in data.get("endpoints", []):
+            if not endpoint.get("api_base"):
+                continue
+            api_base = endpoint["api_base"]
+            if api_base.startswith("https://generativelanguage.googleapis.com/v1beta"):
+                if not api_base.endswith("openai/"):
+                    endpoint["api_base"] = api_base.strip("/") + "/openai/"
+
+        super().__init__(**data)
+
+    def load(self, settings_dict: SettingsDict):
+        self.__init__(**settings_dict)
+
+    def get_endpoint(self, endpoint_id: str) -> EndpointSetting:
+        for endpoint in self.endpoints:
+            if endpoint.id == endpoint_id:
+                return endpoint
+        raise ValueError(f"Endpoint {endpoint_id} not found.")
+
+    def get_backend(self, backend: BackendType) -> BackendSettings:
+        backend_name = backend.value.lower()
+
+        # Use VERSION 2 format backends field first
+        if self.VERSION == "2" and self.backends is not None:
+            return getattr(self.backends, backend_name)
+
+        # Compatible with VERSION 1 format
+        return getattr(self, backend_name)
+
+    def export(self):
+        if self.VERSION == "2":
+            return super().model_dump(
+                exclude={
+                    "anthropic",
+                    "deepseek",
+                    "gemini",
+                    "groq",
+                    "local",
+                    "minimax",
+                    "mistral",
+                    "moonshot",
+                    "openai",
+                    "qwen",
+                    "yi",
+                    "zhipuai",
+                    "baichuan",
+                    "stepfun",
+                    "xai",
+                }
+            )
+        else:
+            return super().model_dump(exclude={"backends"})
+
+
+settings = Settings()

{vectorvein-0.2.12 → vectorvein-0.2.14}/src/vectorvein/types/__init__.py

@@ -61,6 +61,8 @@ from .settings import (
     BackendSettingsDict,
     EndpointSettingDict,
     SettingsDict,
+    SettingsV1Dict,
+    SettingsV2Dict,
 )
 
 
@@ -126,4 +128,6 @@ __all__ = [
     "BackendSettingsDict",
     "EndpointSettingDict",
     "SettingsDict",
+    "SettingsV1Dict",
+    "SettingsV2Dict",
 ]

{vectorvein-0.2.12 → vectorvein-0.2.14}/src/vectorvein/types/settings.py

@@ -48,7 +48,7 @@ class EndpointOptionDict(TypedDict):
 class ModelConfigDict(TypedDict):
     """TypedDict representing the model configuration structure."""
 
-    id: NotRequired[str]
+    id: str
     endpoints: List[Union[str, EndpointOptionDict]]
     function_call_available: NotRequired[bool]
     response_format_available: NotRequired[bool]
@@ -81,13 +81,34 @@ class EndpointSettingDict(TypedDict):
     proxy: NotRequired[str]
 
 
-class SettingsDict(TypedDict):
+class BackendsDict(TypedDict):
+    """TypedDict representing all model backends in a single dictionary."""
+
+    anthropic: NotRequired[BackendSettingsDict]
+    deepseek: NotRequired[BackendSettingsDict]
+    gemini: NotRequired[BackendSettingsDict]
+    groq: NotRequired[BackendSettingsDict]
+    local: NotRequired[BackendSettingsDict]
+    minimax: NotRequired[BackendSettingsDict]
+    mistral: NotRequired[BackendSettingsDict]
+    moonshot: NotRequired[BackendSettingsDict]
+    openai: NotRequired[BackendSettingsDict]
+    qwen: NotRequired[BackendSettingsDict]
+    yi: NotRequired[BackendSettingsDict]
+    zhipuai: NotRequired[BackendSettingsDict]
+    baichuan: NotRequired[BackendSettingsDict]
+    stepfun: NotRequired[BackendSettingsDict]
+    xai: NotRequired[BackendSettingsDict]
+
+
+class SettingsV1Dict(TypedDict):
     """TypedDict representing the expected structure of the settings dictionary."""
 
     endpoints: List[EndpointSettingDict]
     token_server: NotRequired[ServerDict]
     rate_limit: NotRequired[RateLimitConfigDict]
-    # 各模型后端配置
+
+    # V1 format: each model backend config
     anthropic: NotRequired[BackendSettingsDict]
     deepseek: NotRequired[BackendSettingsDict]
     gemini: NotRequired[BackendSettingsDict]
@@ -103,3 +124,18 @@ class SettingsDict(TypedDict):
     baichuan: NotRequired[BackendSettingsDict]
     stepfun: NotRequired[BackendSettingsDict]
     xai: NotRequired[BackendSettingsDict]
+
+
+class SettingsV2Dict(TypedDict):
+    """TypedDict representing the expected structure of the settings dictionary."""
+
+    VERSION: NotRequired[str]
+    endpoints: List[EndpointSettingDict]
+    token_server: NotRequired[ServerDict]
+    rate_limit: NotRequired[RateLimitConfigDict]
+
+    # V2 format: all model backend configs in a single dictionary
+    backends: NotRequired[BackendsDict]
+
+
+SettingsDict = Union[SettingsV1Dict, SettingsV2Dict]

vectorvein-0.2.12/src/vectorvein/settings/__init__.py

@@ -1,110 +0,0 @@
-# @Author: Bi Ying
-# @Date:   2024-07-27 00:30:56
-from typing import List, Dict, Optional, Literal
-
-from pydantic import BaseModel, Field
-
-from ..types import defaults as defs
-from ..types.enums import BackendType
-from ..types.llm_parameters import BackendSettings, EndpointSetting
-
-
-class RedisConfig(BaseModel):
-    host: str = "localhost"
-    port: int = 6379
-    db: int = 0
-
-
-class DiskCacheConfig(BaseModel):
-    cache_dir: str = ".rate_limit_cache"
-
-
-class RateLimitConfig(BaseModel):
-    enabled: bool = False
-
-    backend: Literal["memory", "redis", "diskcache"] = "memory"
-    redis: Optional[RedisConfig] = Field(default=None)
-    diskcache: Optional[DiskCacheConfig] = Field(default=None)
-    default_rpm: int = 60
-    default_tpm: int = 1000000
-
-
-class Server(BaseModel):
-    host: str
-    port: int
-    url: Optional[str]
-
-
-class Settings(BaseModel):
-    endpoints: List[EndpointSetting] = Field(
-        default_factory=list, description="Available endpoints for the LLM service."
-    )
-    token_server: Optional[Server] = Field(default=None, description="Token server address. Format: host:port")
-    rate_limit: Optional[RateLimitConfig] = Field(default=None, description="Rate limit settings.")
-
-    anthropic: BackendSettings = Field(default_factory=BackendSettings, description="Anthropic models settings.")
-    deepseek: BackendSettings = Field(default_factory=BackendSettings, description="Deepseek models settings.")
-    gemini: BackendSettings = Field(default_factory=BackendSettings, description="Gemini models settings.")
-    groq: BackendSettings = Field(default_factory=BackendSettings, description="Groq models settings.")
-    local: BackendSettings = Field(default_factory=BackendSettings, description="Local models settings.")
-    minimax: BackendSettings = Field(default_factory=BackendSettings, description="Minimax models settings.")
-    mistral: BackendSettings = Field(default_factory=BackendSettings, description="Mistral models settings.")
-    moonshot: BackendSettings = Field(default_factory=BackendSettings, description="Moonshot models settings.")
-    openai: BackendSettings = Field(default_factory=BackendSettings, description="OpenAI models settings.")
-    qwen: BackendSettings = Field(default_factory=BackendSettings, description="Qwen models settings.")
-    yi: BackendSettings = Field(default_factory=BackendSettings, description="Yi models settings.")
-    zhipuai: BackendSettings = Field(default_factory=BackendSettings, description="Zhipuai models settings.")
-    baichuan: BackendSettings = Field(default_factory=BackendSettings, description="Baichuan models settings.")
-    stepfun: BackendSettings = Field(default_factory=BackendSettings, description="StepFun models settings.")
-    xai: BackendSettings = Field(default_factory=BackendSettings, description="XAI models settings.")
-
-    def __init__(self, **data):
-        model_types = {
-            "anthropic": defs.ANTHROPIC_MODELS,
-            "deepseek": defs.DEEPSEEK_MODELS,
-            "gemini": defs.GEMINI_MODELS,
-            "groq": defs.GROQ_MODELS,
-            "local": {},
-            "minimax": defs.MINIMAX_MODELS,
-            "mistral": defs.MISTRAL_MODELS,
-            "moonshot": defs.MOONSHOT_MODELS,
-            "openai": defs.OPENAI_MODELS,
-            "qwen": defs.QWEN_MODELS,
-            "yi": defs.YI_MODELS,
-            "zhipuai": defs.ZHIPUAI_MODELS,
-            "baichuan": defs.BAICHUAN_MODELS,
-            "stepfun": defs.STEPFUN_MODELS,
-        }
-
-        for model_type, default_models in model_types.items():
-            if model_type in data:
-                model_settings = BackendSettings()
-                model_settings.update_models(default_models, data[model_type].get("models", {}))
-                data[model_type] = model_settings
-            else:
-                data[model_type] = BackendSettings(models=default_models)
-
-        for endpoint in data.get("endpoints", []):
-            if not endpoint.get("api_base"):
-                continue
-            api_base = endpoint["api_base"]
-            if api_base.startswith("https://generativelanguage.googleapis.com/v1beta"):
-                if not api_base.endswith("openai/"):
-                    endpoint["api_base"] = api_base.strip("/") + "/openai/"
-
-        super().__init__(**data)
-
-    def load(self, settings_dict: Dict):
-        self.__init__(**settings_dict)
-
-    def get_endpoint(self, endpoint_id: str) -> EndpointSetting:
-        for endpoint in self.endpoints:
-            if endpoint.id == endpoint_id:
-                return endpoint
-        raise ValueError(f"Endpoint {endpoint_id} not found.")
-
-    def get_backend(self, backend: BackendType) -> BackendSettings:
-        return getattr(self, backend.value.lower())
-
-
-settings = Settings()