Upload config.py

app/config/config.py

@@ -6,9 +6,10 @@ import datetime
 import json
 from typing import Any, Dict, List, Type
 
-from pydantic import ValidationError, ValidationInfo, field_validator
+from pydantic import ValidationError, ValidationInfo, field_validator, GetCoreSchemaHandler
 from pydantic_settings import BaseSettings
 from sqlalchemy import insert, select, update
+from pydantic_core import PydanticCustomError, core_schema
 
 from app.core.constants import (
     API_VERSION,
@@ -27,6 +28,29 @@ from app.core.constants import (
 from app.log.logger import Logger
 
 
+class CommaSeparatedList(list):
+    @classmethod
+    def __get_pydantic_core_schema__(
+        cls, source_type: Any, handler: GetCoreSchemaHandler
+    ) -> core_schema.CoreSchema:
+        def validate_from_string(value: str) -> list[str]:
+            if not isinstance(value, str):
+                raise PydanticCustomError(
+                    'comma_separated_list_type',
+                    'Value must be a string to be parsed as comma-separated list'
+                )
+            return [item.strip() for item in value.split(',') if item.strip()]
+
+        return core_schema.no_info_after_validator_function(
+            validate_from_string,
+            core_schema.union_schema([
+                core_schema.list_schema(core_schema.str_schema()), # Allows direct list of strings
+                core_schema.str_schema(), # Allows string input
+            ]),
+            serialization=core_schema.to_list_ser_schema(core_schema.str_schema())
+        )
+
+
 class Settings(BaseSettings):
     # 数据库配置
     DATABASE_TYPE: str = "sqlite"  # sqlite 或 mysql
@@ -51,16 +75,10 @@ class Settings(BaseSettings):
         return v
 
     # API相关配置
-    API_KEYS: List[str]
-    ALLOWED_TOKENS: List[str] = []
+    API_KEYS: CommaSeparatedList # Changed to custom type
+    ALLOWED_TOKENS: CommaSeparatedList = CommaSeparatedList() # Changed to custom type and default
 
-    @field_validator("ALLOWED_TOKENS", mode="before")
-    @classmethod
-    def parse_allowed_tokens(cls, v: Any) -> List[str]:
-        if not isinstance(v, str):
-            v = str(v)
-        return [token.strip() for token in v.split(",") if token.strip()]
-        return v
+    # Removed the old field_validator for ALLOWED_TOKENS
     BASE_URL: str = f"https://generativelanguage.googleapis.com/{API_VERSION}"
     AUTH_TOKEN: str = ""
     MAX_FAILURES: int = 3