vectorvein 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

vectorvein/settings/__init__.py

@@ -2,7 +2,7 @@
 # @Date:   2024-07-27 00:30:56
 import warnings
 from copy import deepcopy
-from typing import List, Optional, Literal
+from typing import Literal
 
 from pydantic import BaseModel, Field
 
@@ -26,8 +26,8 @@ class RateLimitConfig(BaseModel):
     enabled: bool = False
 
     backend: Literal["memory", "redis", "diskcache"] = "memory"
-    redis: Optional[RedisConfig] = Field(default=None)
-    diskcache: Optional[DiskCacheConfig] = Field(default=None)
+    redis: RedisConfig | None = Field(default=None)
+    diskcache: DiskCacheConfig | None = Field(default=None)
     default_rpm: int = 60
     default_tpm: int = 1000000
 
@@ -35,7 +35,7 @@ class RateLimitConfig(BaseModel):
 class Server(BaseModel):
     host: str
     port: int
-    url: Optional[str]
+    url: str | None
 
 
 class Backends(BaseModel):
@@ -60,31 +60,31 @@ class Backends(BaseModel):
 
 
 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.")
+    VERSION: str | None = 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: Server | None = Field(default=None, description="Token server address. Format: host:port")
+    rate_limit: RateLimitConfig | None = 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).")
+    backends: Backends | None = 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.")
-    ernie: Optional[BackendSettings] = Field(default_factory=BackendSettings, description="Baidu Ernie models settings.")
+    anthropic: BackendSettings | None = Field(default_factory=BackendSettings, description="Anthropic models settings.")
+    deepseek: BackendSettings | None = Field(default_factory=BackendSettings, description="Deepseek models settings.")
+    gemini: BackendSettings | None = Field(default_factory=BackendSettings, description="Gemini models settings.")
+    groq: BackendSettings | None = Field(default_factory=BackendSettings, description="Groq models settings.")
+    local: BackendSettings | None = Field(default_factory=BackendSettings, description="Local models settings.")
+    minimax: BackendSettings | None = Field(default_factory=BackendSettings, description="Minimax models settings.")
+    mistral: BackendSettings | None = Field(default_factory=BackendSettings, description="Mistral models settings.")
+    moonshot: BackendSettings | None = Field(default_factory=BackendSettings, description="Moonshot models settings.")
+    openai: BackendSettings | None = Field(default_factory=BackendSettings, description="OpenAI models settings.")
+    qwen: BackendSettings | None = Field(default_factory=BackendSettings, description="Qwen models settings.")
+    yi: BackendSettings | None = Field(default_factory=BackendSettings, description="Yi models settings.")
+    zhipuai: BackendSettings | None = Field(default_factory=BackendSettings, description="Zhipuai models settings.")
+    baichuan: BackendSettings | None = Field(default_factory=BackendSettings, description="Baichuan models settings.")
+    stepfun: BackendSettings | None = Field(default_factory=BackendSettings, description="StepFun models settings.")
+    xai: BackendSettings | None = Field(default_factory=BackendSettings, description="XAI models settings.")
+    ernie: BackendSettings | None = Field(default_factory=BackendSettings, description="Baidu Ernie models settings.")
 
     def __init__(self, **data):
         model_types = {
@@ -122,7 +122,7 @@ class Settings(BaseModel):
             backends = data["backends"]
         else:
             backends = data
-            warnings.warn("You're using vectorvein's deprecated V1 format. Please use V2 format.")
+            warnings.warn("You're using vectorvein's deprecated V1 format. Please use V2 format.", stacklevel=2)
 
         for model_type, default_models in model_types.items():
             if model_type in backends:
@@ -155,7 +155,7 @@ class Settings(BaseModel):
 
         super().__init__(**data)
 
-    def load(self, settings: SettingsDict | "Settings"):
+    def load(self, settings: "SettingsDict | Settings"):
         if isinstance(settings, Settings):
             settings_dict = settings.export()
         else:

vectorvein/types/defaults.py

@@ -1,6 +1,6 @@
 # @Author: Bi Ying
 # @Date:   2024-07-27 00:02:34
-from typing import Final, Dict
+from typing import Final
 from typing_extensions import TypedDict, NotRequired
 
 from .enums import ContextLengthControlType
@@ -25,7 +25,7 @@ class ModelSettingDict(TypedDict):
 
 # Moonshot models
 MOONSHOT_DEFAULT_MODEL: Final[str] = "kimi-latest"
-MOONSHOT_MODELS: Final[Dict[str, ModelSettingDict]] = {
+MOONSHOT_MODELS: Final[dict[str, ModelSettingDict]] = {
     "moonshot-v1-8k": {
         "id": "moonshot-v1-8k",
         "context_length": 8192,
@@ -87,7 +87,7 @@ MOONSHOT_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Deepseek models
 DEEPSEEK_DEFAULT_MODEL: Final[str] = "deepseek-chat"
-DEEPSEEK_MODELS: Final[Dict[str, ModelSettingDict]] = {
+DEEPSEEK_MODELS: Final[dict[str, ModelSettingDict]] = {
     "deepseek-chat": {
         "id": "deepseek-chat",
         "context_length": 64000,
@@ -108,7 +108,7 @@ DEEPSEEK_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Baichuan models
 BAICHUAN_DEFAULT_MODEL: Final[str] = "Baichuan3-Turbo"
-BAICHUAN_MODELS: Final[Dict[str, ModelSettingDict]] = {
+BAICHUAN_MODELS: Final[dict[str, ModelSettingDict]] = {
     "Baichuan4": {
         "id": "Baichuan4",
         "context_length": 32768,
@@ -153,7 +153,7 @@ BAICHUAN_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Groq models
 GROQ_DEFAULT_MODEL: Final[str] = "llama3-70b-8192"
-GROQ_MODELS: Final[Dict[str, ModelSettingDict]] = {
+GROQ_MODELS: Final[dict[str, ModelSettingDict]] = {
     "mixtral-8x7b-32768": {
         "id": "mixtral-8x7b-32768",
         "context_length": 32768,
@@ -225,7 +225,7 @@ GROQ_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Qwen models
 QWEN_DEFAULT_MODEL: Final[str] = "qwen2.5-72b-instruct"
-QWEN_MODELS: Final[Dict[str, ModelSettingDict]] = {
+QWEN_MODELS: Final[dict[str, ModelSettingDict]] = {
     "qwen2.5-7b-instruct": {
         "id": "qwen2.5-7b-instruct",
         "context_length": 131072,
@@ -414,7 +414,7 @@ QWEN_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Yi models
 YI_DEFAULT_MODEL: Final[str] = "yi-lightning"
-YI_MODELS: Final[Dict[str, ModelSettingDict]] = {
+YI_MODELS: Final[dict[str, ModelSettingDict]] = {
     "yi-lightning": {
         "id": "yi-lightning",
         "context_length": 16000,
@@ -435,7 +435,7 @@ YI_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # ZhiPuAI models
 ZHIPUAI_DEFAULT_MODEL: Final[str] = "glm-4-air"
-ZHIPUAI_MODELS: Final[Dict[str, ModelSettingDict]] = {
+ZHIPUAI_MODELS: Final[dict[str, ModelSettingDict]] = {
     "glm-3-turbo": {
         "id": "glm-3-turbo",
         "context_length": 128000,
@@ -564,11 +564,27 @@ ZHIPUAI_MODELS: Final[Dict[str, ModelSettingDict]] = {
         "max_output_tokens": 32000,
         "native_multimodal": False,
     },
+    "glm-4.1v-thinking-flashx": {
+        "id": "glm-4.1v-thinking-flashx",
+        "context_length": 64000,
+        "function_call_available": False,
+        "response_format_available": False,
+        "max_output_tokens": 16384,
+        "native_multimodal": True,
+    },
+    "glm-4.1v-thinking-flash": {
+        "id": "glm-4.1v-thinking-flash",
+        "context_length": 64000,
+        "function_call_available": False,
+        "response_format_available": False,
+        "max_output_tokens": 16384,
+        "native_multimodal": True,
+    },
 }
 
 # Mistral models
 MISTRAL_DEFAULT_MODEL: Final[str] = "mistral-small"
-MISTRAL_MODELS: Final[Dict[str, ModelSettingDict]] = {
+MISTRAL_MODELS: Final[dict[str, ModelSettingDict]] = {
     "open-mistral-7b": {
         "id": "open-mistral-7b",
         "context_length": 32000,
@@ -629,7 +645,7 @@ MISTRAL_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # OpenAI models
 OPENAI_DEFAULT_MODEL: Final[str] = "gpt-4o"
-OPENAI_MODELS: Final[Dict[str, ModelSettingDict]] = {
+OPENAI_MODELS: Final[dict[str, ModelSettingDict]] = {
     "gpt-35-turbo": {
         "id": "gpt-35-turbo",
         "context_length": 16385,
@@ -746,7 +762,7 @@ OPENAI_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Anthropic models
 ANTHROPIC_DEFAULT_MODEL: Final[str] = "claude-3-7-sonnet-20250219"
-ANTHROPIC_MODELS: Final[Dict[str, ModelSettingDict]] = {
+ANTHROPIC_MODELS: Final[dict[str, ModelSettingDict]] = {
     "claude-3-opus-20240229": {
         "id": "claude-3-opus-20240229",
         "context_length": 200000,
@@ -823,7 +839,7 @@ ANTHROPIC_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Minimax models
 MINIMAX_DEFAULT_MODEL: Final[str] = "MiniMax-Text-01"
-MINIMAX_MODELS: Final[Dict[str, ModelSettingDict]] = {
+MINIMAX_MODELS: Final[dict[str, ModelSettingDict]] = {
     "abab5-chat": {
         "id": "abab5-chat",
         "context_length": 6144,
@@ -884,7 +900,7 @@ MINIMAX_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # Gemini models
 GEMINI_DEFAULT_MODEL: Final[str] = "gemini-2.0-flash"
-GEMINI_MODELS: Final[Dict[str, ModelSettingDict]] = {
+GEMINI_MODELS: Final[dict[str, ModelSettingDict]] = {
     "gemini-1.5-pro": {
         "id": "gemini-1.5-pro",
         "context_length": 2097152,
@@ -1032,7 +1048,7 @@ GEMINI_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 # 百度文心一言 ERNIE 模型
 ERNIE_DEFAULT_MODEL: Final[str] = "ernie-lite"
-ERNIE_MODELS: Final[Dict[str, ModelSettingDict]] = {
+ERNIE_MODELS: Final[dict[str, ModelSettingDict]] = {
     "ernie-lite": {
         "id": "ernie-lite",
         "context_length": 6144,
@@ -1109,7 +1125,7 @@ ERNIE_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 
 STEPFUN_DEFAULT_MODEL: Final[str] = "step-1-8k"
-STEPFUN_MODELS: Final[Dict[str, ModelSettingDict]] = {
+STEPFUN_MODELS: Final[dict[str, ModelSettingDict]] = {
     "step-1-8k": {
         "id": "step-1-8k",
         "context_length": 8192,
@@ -1170,7 +1186,7 @@ STEPFUN_MODELS: Final[Dict[str, ModelSettingDict]] = {
 
 
 XAI_DEFAULT_MODEL: Final[str] = "grok-2-latest"
-XAI_MODELS: Final[Dict[str, ModelSettingDict]] = {
+XAI_MODELS: Final[dict[str, ModelSettingDict]] = {
     "grok-beta": {
         "id": "grok-beta",
         "context_length": 131072,

vectorvein/types/llm_parameters.py

@@ -1,6 +1,7 @@
 # @Author: Bi Ying
 # @Date:   2024-07-26 23:48:04
-from typing import List, Dict, Optional, Union, Iterable, Literal
+from collections.abc import Iterable
+from typing import Literal
 from typing_extensions import TypedDict, NotRequired
 
 import httpx
@@ -15,6 +16,7 @@ from anthropic.types.message_create_params import ToolChoice as AnthropicToolCho
 from openai import OpenAI, AsyncOpenAI, AzureOpenAI, AsyncAzureOpenAI
 from openai._types import NotGiven as OpenAINotGiven
 from openai._types import NOT_GIVEN as OPENAI_NOT_GIVEN
+from openai.types.chat import ChatCompletionMessageParam
 from openai.types.chat.completion_create_params import ResponseFormat
 from openai.types.chat.chat_completion_chunk import ChoiceDeltaToolCall
 from openai.types.chat.chat_completion_tool_param import ChatCompletionToolParam
@@ -35,8 +37,8 @@ class VectorVeinTextMessage(TypedDict):
     create_time: NotRequired[int]
     update_time: NotRequired[int]
     metadata: NotRequired[dict]
-    content: Dict[str, str]
-    attachments: NotRequired[List[str]]
+    content: dict[str, str]
+    attachments: NotRequired[list[str]]
 
 
 class VectorVeinWorkflowMessage(TypedDict):
@@ -47,19 +49,20 @@ class VectorVeinWorkflowMessage(TypedDict):
     create_time: NotRequired[int]
     update_time: NotRequired[int]
     metadata: dict
-    content: Dict[str, str]
-    attachments: NotRequired[List[str]]
+    content: dict[str, str]
+    attachments: NotRequired[list[str]]
 
 
-VectorVeinMessage = Union[VectorVeinTextMessage, VectorVeinWorkflowMessage]
+VectorVeinMessage = VectorVeinTextMessage | VectorVeinWorkflowMessage
 
 
 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: Optional[str] = Field(None, description="The base URL for the API.")
-    api_key: Optional[str] = Field(None, description="The API key for authentication.")
-    endpoint_type: Optional[
+    enabled: bool = Field(True, description="Whether the endpoint is enabled.")
+    region: str | None = Field(None, description="The region for the endpoint.")
+    api_base: str | None = Field(None, description="The base URL for the API.")
+    api_key: str | None = Field(None, description="The API key for authentication.")
+    endpoint_type: (
         Literal[
             "default",
             "openai",
@@ -68,11 +71,12 @@ class EndpointSetting(BaseModel):
             "anthropic_vertex",
             "anthropic_bedrock",
         ]
-    ] = Field(
+        | None
+    ) = Field(
         "default",
         description="The type of endpoint. Set to 'default' will determine the type automatically.",
     )
-    credentials: Optional[dict] = Field(None, description="Additional credentials if needed.")
+    credentials: dict | None = Field(None, description="Additional credentials if needed.")
     is_azure: bool = Field(False, description="Indicates if the endpoint is for Azure.")
     is_vertex: bool = Field(False, description="Indicates if the endpoint is for Vertex.")
     is_bedrock: bool = Field(False, description="Indicates if the endpoint is for Bedrock.")
@@ -82,7 +86,7 @@ class EndpointSetting(BaseModel):
         description="Whether to use concurrent requests for the LLM service.",
         default=defs.ENDPOINT_CONCURRENT_REQUESTS,
     )
-    proxy: Optional[str] = Field(None, description="The proxy URL for the endpoint.")
+    proxy: str | None = Field(None, description="The proxy URL for the endpoint.")
 
     def model_list(self):
         http_client = httpx.Client(proxy=self.proxy) if self.proxy is not None else None
@@ -129,17 +133,18 @@ class EndpointSetting(BaseModel):
 
 class ModelSetting(BaseModel):
     id: str = Field(..., description="The id of the model.")
-    endpoints: List[Union[str, EndpointOptionDict]] = Field(default_factory=list, description="Available endpoints for the model.")
+    enabled: bool = Field(True, description="Whether the model is enabled.")
+    endpoints: list[str | EndpointOptionDict] = Field(default_factory=list, description="Available endpoints for the model.")
     function_call_available: bool = Field(False, description="Indicates if function call is available.")
     response_format_available: bool = Field(False, description="Indicates if response format is available.")
     native_multimodal: bool = Field(False, description="Indicates if the model is a native multimodal model.")
     context_length: int = Field(32768, description="The context length for the model.")
-    max_output_tokens: Optional[int] = Field(None, description="Maximum number of output tokens allowed.")
+    max_output_tokens: int | None = Field(None, description="Maximum number of output tokens allowed.")
 
 
 class BackendSettings(BaseModel):
-    models: Dict[str, ModelSetting] = Field(default_factory=dict)
-    default_endpoint: Optional[str] = Field(default_factory=lambda: None, description="The default endpoint for the model.")
+    models: dict[str, ModelSetting] = Field(default_factory=dict)
+    default_endpoint: str | None = Field(default_factory=lambda: None, description="The default endpoint for the model.")
 
     def get_model_setting(self, model_name: str) -> ModelSetting:
         if model_name in self.models:
@@ -150,8 +155,8 @@ class BackendSettings(BaseModel):
         else:
             raise ValueError(f"Model {model_name} not found in {self.models}")
 
-    def update_models(self, default_models: Dict[str, Dict], input_models: Dict[str, Dict]):
-        updated_models = {}
+    def update_models(self, default_models: dict[str, dict], input_models: dict[str, dict]):
+        updated_models: dict[str, ModelSetting] = {}
         for model_name, model_data in default_models.items():
             updated_model = ModelSetting(**model_data)
             if model_name in input_models:
@@ -173,44 +178,44 @@ class Usage(BaseModel):
 
     total_tokens: int
 
-    completion_tokens_details: Optional[CompletionTokensDetails] = None
+    completion_tokens_details: CompletionTokensDetails | None = None
     """Breakdown of tokens used in a completion."""
 
-    prompt_tokens_details: Optional[PromptTokensDetails] = None
+    prompt_tokens_details: PromptTokensDetails | None = None
     """Breakdown of tokens used in the prompt."""
 
 
 class ChatCompletionMessage(BaseModel):
-    content: Optional[str] = None
+    content: str | None = None
 
-    reasoning_content: Optional[str] = None
+    reasoning_content: str | None = None
 
-    raw_content: Optional[List[Dict]] = None
+    raw_content: list[dict] | None = None
 
-    tool_calls: Optional[List[ChatCompletionMessageToolCall]] = None
+    tool_calls: list[ChatCompletionMessageToolCall] | None = None
     """The tool calls generated by the model, such as function calls."""
 
-    function_call_arguments: Optional[dict] = None
+    function_call_arguments: dict | None = None
 
-    usage: Optional[Usage] = None
+    usage: Usage | None = None
 
 
 class ChatCompletionDeltaMessage(BaseModel):
-    content: Optional[str] = None
+    content: str | None = None
 
-    reasoning_content: Optional[str] = None
+    reasoning_content: str | None = None
 
-    raw_content: Optional[Dict] = None
+    raw_content: dict | None = None
 
-    tool_calls: Optional[List[ChoiceDeltaToolCall]] = None
+    tool_calls: list[ChoiceDeltaToolCall] | None = None
     """The tool calls generated by the model, such as function calls."""
 
-    function_call_arguments: Optional[dict] = None
+    function_call_arguments: dict | None = None
 
-    usage: Optional[Usage] = None
+    usage: Usage | None = None
 
 
-NotGiven = Union[AnthropicNotGiven, OpenAINotGiven]
+NotGiven = AnthropicNotGiven | OpenAINotGiven
 
 NOT_GIVEN = OPENAI_NOT_GIVEN
 
@@ -228,6 +233,7 @@ __all__ = [
     "BackendSettings",
     "Usage",
     "ChatCompletionMessage",
+    "ChatCompletionMessageParam",
     "ChatCompletionDeltaMessage",
     "ChatCompletionStreamOptionsParam",
     "NotGiven",

vectorvein/types/settings.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Union, Literal
+from typing import Literal
 from typing_extensions import TypedDict, NotRequired  # Required by pydantic under Python < 3.12
 
 
@@ -49,26 +49,26 @@ class ModelConfigDict(TypedDict):
     """TypedDict representing the model configuration structure."""
 
     id: str
-    endpoints: List[Union[str, EndpointOptionDict]]
+    endpoints: list[str | EndpointOptionDict]
     function_call_available: NotRequired[bool]
     response_format_available: NotRequired[bool]
     native_multimodal: NotRequired[bool]
-    context_length: NotRequired[Optional[int]]
-    max_output_tokens: NotRequired[Optional[int]]
+    context_length: NotRequired[int | None]
+    max_output_tokens: NotRequired[int | None]
 
 
 class BackendSettingsDict(TypedDict):
     """TypedDict representing the BackendSettings structure."""
 
-    models: Dict[str, ModelConfigDict]
-    default_endpoint: NotRequired[Optional[str]]
+    models: dict[str, ModelConfigDict]
+    default_endpoint: NotRequired[str | None]
 
 
 class EndpointSettingDict(TypedDict):
     """TypedDict representing the EndpointSetting structure."""
 
     id: str
-    api_base: NotRequired[Optional[str]]
+    api_base: NotRequired[str | None]
     api_key: NotRequired[str]
     region: NotRequired[str]
     endpoint_type: NotRequired[
@@ -115,7 +115,7 @@ class BackendsDict(TypedDict):
 class SettingsV1Dict(TypedDict):
     """TypedDict representing the expected structure of the settings dictionary."""
 
-    endpoints: List[EndpointSettingDict]
+    endpoints: list[EndpointSettingDict]
     token_server: NotRequired[ServerDict]
     rate_limit: NotRequired[RateLimitConfigDict]
 
@@ -142,7 +142,7 @@ class SettingsV2Dict(TypedDict):
     """TypedDict representing the expected structure of the settings dictionary."""
 
     VERSION: NotRequired[str]
-    endpoints: List[EndpointSettingDict]
+    endpoints: list[EndpointSettingDict]
     token_server: NotRequired[ServerDict]
     rate_limit: NotRequired[RateLimitConfigDict]
 
@@ -150,4 +150,4 @@ class SettingsV2Dict(TypedDict):
     backends: NotRequired[BackendsDict]
 
 
-SettingsDict = Union[SettingsV1Dict, SettingsV2Dict]
+SettingsDict = SettingsV1Dict | SettingsV2Dict

vectorvein/utilities/media_processing.py

@@ -20,7 +20,7 @@ class ImageProcessor:
         max_height: int | None = None,
     ):
         self.image_source = image_source
-        if isinstance(image_source, (Image.Image, Path)):
+        if isinstance(image_source, Image.Image | Path):
             self.is_local = True
         else:
             self.is_local = not image_source.startswith("http")

vectorvein/utilities/rate_limiter.py

@@ -1,6 +1,5 @@
 import time
 import asyncio
-from typing import Tuple
 from collections import defaultdict
 from abc import ABC, abstractmethod
 
@@ -9,7 +8,7 @@ class AsyncRateLimiterBackend(ABC):
     """Rate Limiter Backend Abstract Base Class"""
 
     @abstractmethod
-    async def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> Tuple[bool, float]:
+    async def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> tuple[bool, float]:
         """Returns (allowed, wait_time)"""
         pass
 
@@ -18,7 +17,7 @@ class SyncRateLimiterBackend(ABC):
     """Rate Limiter Backend Abstract Base Class"""
 
     @abstractmethod
-    def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> Tuple[bool, float]:
+    def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> tuple[bool, float]:
         """Returns (allowed, wait_time)"""
         pass
 
@@ -65,7 +64,7 @@ class SyncMemoryRateLimiter(SyncRateLimiterBackend):
     def _get_last_reset(self, key):
         return self.windows[key][0] if self.windows[key] else time.time()
 
-    def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> Tuple[bool, float]:
+    def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> tuple[bool, float]:
         """Sync Rate Limiter Check
 
         Args:
@@ -211,7 +210,7 @@ class AsyncDiskCacheRateLimiter(AsyncRateLimiterBackend):
     def _get_tpm_key(self, key: str) -> str:
         return f"{key}_tpm"
 
-    async def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> Tuple[bool, float]:
+    async def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> tuple[bool, float]:
         """检查是否超出限流阈值
 
         Args:
@@ -272,7 +271,7 @@ class SyncDiskCacheRateLimiter(SyncRateLimiterBackend):
     def _get_tpm_key(self, key: str) -> str:
         return f"{key}_tpm"
 
-    def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> Tuple[bool, float]:
+    def check_limit(self, key: str, rpm: int, tpm: int, request_cost: int = 1) -> tuple[bool, float]:
         """检查是否超出限流阈值
 
         Args:

vectorvein/utilities/retry.py

@@ -1,7 +1,8 @@
 # @Author: Bi Ying
 # @Date:   2024-06-07 16:16:49
 import time
-from typing import Optional, Any, Callable, Tuple, Union, TypeVar, Generic
+from collections.abc import Callable
+from typing import Any, TypeVar, Generic
 
 
 ResultType = TypeVar("ResultType")
@@ -11,9 +12,9 @@ class Retry(Generic[ResultType]):
     def __init__(self, function: Callable[..., ResultType]):
         self.function: Callable[..., ResultType] = function
         self.__retry_times: int = 3
-        self.__sleep_time: Union[int, float] = 1
+        self.__sleep_time: int | float = 1
         self.__timeout: int = 180
-        self.__result_check: Optional[Callable[[ResultType], bool]] = None
+        self.__result_check: Callable[[ResultType], bool] | None = None
         self.pargs: list = []
         self.kwargs: dict = {}
 
@@ -26,7 +27,7 @@ class Retry(Generic[ResultType]):
         self.__retry_times = retry_times
         return self
 
-    def sleep_time(self, sleep_time: Union[int, float]) -> "Retry[ResultType]":
+    def sleep_time(self, sleep_time: int | float) -> "Retry[ResultType]":
         self.__sleep_time = sleep_time
         return self
 
@@ -43,7 +44,7 @@ class Retry(Generic[ResultType]):
             print(f"Retry result check error: {e}")
             return False
 
-    def run(self) -> Tuple[bool, Optional[ResultType]]:
+    def run(self) -> tuple[bool, ResultType | None]:
         try_times = 0
         start_time = time.time()
 

vectorvein/workflow/graph/edge.py

@@ -1,4 +1,4 @@
-from typing import Dict, Any, Union
+from typing import Any
 
 
 class Edge:
@@ -19,9 +19,9 @@ class Edge:
         self.target_handle: str = target_handle
         self.animated: bool = animated
         self.type: str = type
-        self.style: Dict[str, Union[str, int]] = {"stroke": "#28c5e5", "strokeWidth": 3}
+        self.style: dict[str, str | int] = {"stroke": "#28c5e5", "strokeWidth": 3}
 
-    def to_dict(self) -> Dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         return {
             "id": self.id,
             "source": self.source,