Update app/config/config.py

app/config/config.py

@@ -4,49 +4,12 @@
 
 import datetime
 import json
-from typing import Annotated, Any, Dict, List, Type
+from typing import Any, Dict, List, Type
 
-from pydantic import BeforeValidator, ValidationError, ValidationInfo, field_validator
+from pydantic import ValidationError, ValidationInfo, field_validator
 from pydantic_settings import BaseSettings
 from sqlalchemy import insert, select, update
 
-
-def parse_comma_separated_string(v: Any) -> List[str]:
-    # Handle None or empty values
-    if v is None or v == "":
-        return []
-    
-    if isinstance(v, list):
-        return [str(item).strip() for item in v if str(item).strip()]
-    
-    if isinstance(v, str):
-        # Handle empty string or whitespace-only string
-        if not v.strip():
-            return []
-        
-        try:
-            # Attempt to parse as JSON list first, in case it's provided as such
-            parsed = json.loads(v)
-            if isinstance(parsed, list):
-                return [str(item).strip() for item in parsed if str(item).strip()]
-        except json.JSONDecodeError:
-            pass # Not a JSON string, proceed to comma split
-        
-        # Split by comma and filter out empty strings
-        return [token.strip() for token in v.split(',') if token.strip()]
-    
-    # For any other type, try to convert to string and process
-    try:
-        str_val = str(v)
-        if not str_val or str_val.strip() == "":
-            return []
-        return [token.strip() for token in str_val.split(',') if token.strip()]
-    except Exception:
-        return []
-
-
-CommaSeparatedList = Annotated[List[str], BeforeValidator(parse_comma_separated_string)]
-
 from app.core.constants import (
     API_VERSION,
     DEFAULT_CREATE_IMAGE_MODEL,
@@ -66,7 +29,7 @@ from app.log.logger import Logger
 
 class Settings(BaseSettings):
     # 数据库配置
-    DATABASE_TYPE: str = "sqlite"  # sqlite 或 mysql
+    DATABASE_TYPE: str = "mysql"  # sqlite 或 mysql
     SQLITE_DATABASE: str = "default_db"
     MYSQL_HOST: str = ""
     MYSQL_PORT: int = 3306
@@ -88,15 +51,8 @@ class Settings(BaseSettings):
         return v
 
     # API相关配置
-    API_KEYS: CommaSeparatedList
-    ALLOWED_TOKENS: CommaSeparatedList = []
-    
-    @field_validator("API_KEYS")
-    @classmethod
-    def validate_api_keys(cls, v: List[str]) -> List[str]:
-        if not v or len(v) == 0:
-            raise ValueError("API_KEYS cannot be empty. Please provide at least one API key.")
-        return v
+    API_KEYS: List[str]
+    ALLOWED_TOKENS: List[str]
     BASE_URL: str = f"https://generativelanguage.googleapis.com/{API_VERSION}"
     AUTH_TOKEN: str = ""
     MAX_FAILURES: int = 3
@@ -116,13 +72,6 @@ class Settings(BaseSettings):
     IMAGE_MODELS: List[str] = ["gemini-2.0-flash-exp"]
     FILTERED_MODELS: List[str] = DEFAULT_FILTER_MODELS
     TOOLS_CODE_EXECUTION_ENABLED: bool = False
-
-    @field_validator("TOOLS_CODE_EXECUTION_ENABLED", mode="before")
-    @classmethod
-    def parse_boolean(cls, v: Any) -> bool:
-        if isinstance(v, str):
-            return v.lower() == "true"
-        return v
     SHOW_SEARCH_LINK: bool = True
     SHOW_THINKING_PROCESS: bool = True
     THINKING_MODELS: List[str] = []
@@ -141,6 +90,7 @@ class Settings(BaseSettings):
     PICGO_API_KEY: str = ""
     CLOUDFLARE_IMGBED_URL: str = ""
     CLOUDFLARE_IMGBED_AUTH_CODE: str = ""
+    CLOUDFLARE_IMGBED_UPLOAD_FOLDER: str = ""
 
     # 流式输出优化器配置
     STREAM_OPTIMIZER_ENABLED: bool = False
@@ -527,4 +477,4 @@ async def sync_initial_settings():
             except Exception as e:
                 logger.error(f"Error disconnecting database after initial sync: {e}")
 
-    logger.info("Initial settings synchronization finished.")
+    logger.info("Initial settings synchronization finished.")