vectorvein 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

vectorvein/settings/__init__.py

@@ -1,11 +1,13 @@
 # @Author: Bi Ying
 # @Date:   2024-07-27 00:30:56
-from typing import List, Dict, Optional, Literal
+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
 
 
@@ -35,12 +37,8 @@ class Server(BaseModel):
     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.")
+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.")
@@ -58,6 +56,45 @@ class Settings(BaseModel):
     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,
@@ -74,15 +111,33 @@ class Settings(BaseModel):
             "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 data:
+            if model_type in backends:
                 model_settings = BackendSettings()
-                model_settings.update_models(default_models, data[model_type].get("models", {}))
-                data[model_type] = model_settings
+                user_models = backends[model_type].get("models", {})
+                model_settings.update_models(default_models, user_models)
+                backends[model_type] = model_settings
             else:
-                data[model_type] = BackendSettings(models=default_models)
+                backends[model_type] = BackendSettings(models=default_models)
 
         for endpoint in data.get("endpoints", []):
             if not endpoint.get("api_base"):
@@ -94,7 +149,7 @@ class Settings(BaseModel):
 
         super().__init__(**data)
 
-    def load(self, settings_dict: Dict):
+    def load(self, settings_dict: SettingsDict):
         self.__init__(**settings_dict)
 
     def get_endpoint(self, endpoint_id: str) -> EndpointSetting:
@@ -104,7 +159,38 @@ class Settings(BaseModel):
         raise ValueError(f"Endpoint {endpoint_id} not found.")
 
     def get_backend(self, backend: BackendType) -> BackendSettings:
-        return getattr(self, backend.value.lower())
+        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/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/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.dist-info → vectorvein-0.2.14.dist-info}/METADATA

@@ -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.dist-info → vectorvein-0.2.14.dist-info}/RECORD

@@ -1,6 +1,6 @@
-vectorvein-0.2.12.dist-info/METADATA,sha256=tceoZCMvKLrKIQMxR0iZlKF1WHIHxgYS5Kqmozm0b8U,4414
-vectorvein-0.2.12.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.12.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.14.dist-info/METADATA,sha256=wwlfZ9Lw99_k9njtZDoMABWOsoG8OmbSLszqPHa0304,4414
+vectorvein-0.2.14.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.14.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/api/__init__.py,sha256=lfY-XA46fgD2iIZTU0VYP8i07AwA03Egj4Qua0vUKrQ,738
 vectorvein/api/client.py,sha256=xF-leKDQzVyyy9FnIRaz0k4eElYW1XbbzeRLcpnyk90,33047
@@ -28,15 +28,15 @@ vectorvein/chat_clients/yi_client.py,sha256=RNf4CRuPJfixrwLZ3-DEc3t25QDe1mvZeb9s
 vectorvein/chat_clients/zhipuai_client.py,sha256=Ys5DSeLCuedaDXr3PfG1EW2zKXopt-awO2IylWSwY0s,519
 vectorvein/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/server/token_server.py,sha256=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7wtdQ,1353
-vectorvein/settings/__init__.py,sha256=ecGyrE_6YfX9z6Igb1rDCu1Q-qMTcVozWF3WEl_hiKA,4871
+vectorvein/settings/__init__.py,sha256=Ctunz8dVj_cHhBEjOfnmDjP3V4lZ662NMUTqffuY_1g,8854
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/types/__init__.py,sha256=ie7H3rTMq_Fg836vOmy96m3wzjDkqfekQecPXXEDbcM,3005
+vectorvein/types/__init__.py,sha256=J0VG3Vc45-ojjMgf95kDlCichZr01KiQcRn6gRmgXrQ,3093
 vectorvein/types/defaults.py,sha256=VrkQoyHqC_eK3g1b6egpPYLLo0ltwMHqxDscCX4y-N0,27417
 vectorvein/types/enums.py,sha256=7KTJSVtQueImmbr1fSwv3rQVtc0RyMWXJmoE2tDOaso,1667
 vectorvein/types/exception.py,sha256=gnW4GnJ76jND6UGnodk9xmqkcbeS7Cz2rvncA2HpD5E,69
 vectorvein/types/llm_parameters.py,sha256=4SxDbJKVb9oGYymyxQtNZ66YZmUQd9_CpYYg81_Inkk,7650
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/types/settings.py,sha256=71D94qqG4PVY59NDp1M29ZGcINOByilGcnCrNs5rbX8,3214
+vectorvein/types/settings.py,sha256=B8eVJsJRrv-op8Enn-Rbour2b9vD01TLXz3xlXEF9vo,4485
 vectorvein/utilities/media_processing.py,sha256=7KtbLFzOYIn1e9QTN9G6C76NH8CBlV9kfAgiRKEIeXY,6263
 vectorvein/utilities/rate_limiter.py,sha256=dwolIUVw2wP83Odqpx0AAaE77de1GzxkYDGH4tM_u_4,10300
 vectorvein/utilities/retry.py,sha256=6KFS9R2HdhqM3_9jkjD4F36ZSpEx2YNFGOVlpOsUetM,2208
@@ -61,4 +61,4 @@ vectorvein/workflow/nodes/vector_db.py,sha256=t6I17q6iR3yQreiDHpRrksMdWDPIvgqJs0
 vectorvein/workflow/nodes/video_generation.py,sha256=qmdg-t_idpxq1veukd-jv_ChICMOoInKxprV9Z4Vi2w,4118
 vectorvein/workflow/nodes/web_crawlers.py,sha256=LsqomfXfqrXfHJDO1cl0Ox48f4St7X_SL12DSbAMSOw,5415
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
-vectorvein-0.2.12.dist-info/RECORD,,
+vectorvein-0.2.14.dist-info/RECORD,,