Upload 68 files

app/config/config.py

@@ -10,6 +10,41 @@ 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 []
+
 from app.core.constants import (
     API_VERSION,
     DEFAULT_CREATE_IMAGE_MODEL,
@@ -29,7 +64,7 @@ from app.log.logger import Logger
 
 class Settings(BaseSettings):
     # 数据库配置
-    DATABASE_TYPE: str = "mysql"  # sqlite 或 mysql
+    DATABASE_TYPE: str = "sqlite"  # sqlite 或 mysql
     SQLITE_DATABASE: str = "default_db"
     MYSQL_HOST: str = ""
     MYSQL_PORT: int = 3306
@@ -51,8 +86,25 @@ class Settings(BaseSettings):
         return v
 
     # API相关配置
-    API_KEYS: List[str]
-    ALLOWED_TOKENS: List[str]
+    API_KEYS: str = ""
+    ALLOWED_TOKENS: str = ""
+    
+    @field_validator("API_KEYS")
+    @classmethod
+    def validate_api_keys(cls, v: str) -> str:
+        if not v or v.strip() == "":
+            raise ValueError("API_KEYS cannot be empty. Please provide at least one API key.")
+        return v
+    
+    @property
+    def api_keys_list(self) -> List[str]:
+        """将API_KEYS字符串转换为列表"""
+        return parse_comma_separated_string(self.API_KEYS)
+    
+    @property
+    def allowed_tokens_list(self) -> List[str]:
+        """将ALLOWED_TOKENS字符串转换为列表"""
+        return parse_comma_separated_string(self.ALLOWED_TOKENS)
     BASE_URL: str = f"https://generativelanguage.googleapis.com/{API_VERSION}"
     AUTH_TOKEN: str = ""
     MAX_FAILURES: int = 3
@@ -72,6 +124,13 @@ 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] = []
@@ -90,7 +149,6 @@ 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
@@ -125,12 +183,18 @@ class Settings(BaseSettings):
         super().__init__(**kwargs)
         # 设置默认AUTH_TOKEN（如果未提供）
         if not self.AUTH_TOKEN and self.ALLOWED_TOKENS:
-            self.AUTH_TOKEN = self.ALLOWED_TOKENS[0]
+            tokens_list = self.allowed_tokens_list
+            if tokens_list:
+                self.AUTH_TOKEN = tokens_list[0]
 
 
 # 创建全局配置实例
 settings = Settings()
 
+def get_settings() -> Settings:
+    """获取配置实例"""
+    return settings
+
 
 def _parse_db_value(key: str, db_value: str, target_type: Type) -> Any:
     """尝试将数据库字符串值解析为目标 Python 类型"""
@@ -477,4 +541,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.")

app/core/application.py

@@ -43,7 +43,7 @@ async def _setup_database_and_config(app_settings):
     logger.info("Database initialized successfully")
     await connect_to_db()
     await sync_initial_settings()
-    await get_key_manager_instance(app_settings.API_KEYS, app_settings.VERTEX_API_KEYS)
+    await get_key_manager_instance(app_settings.api_keys_list, app_settings.VERTEX_API_KEYS)
     logger.info("Database, config sync, and KeyManager initialized successfully")
 
 

app/core/security.py

@@ -15,7 +15,7 @@ def verify_auth_token(token: str) -> bool:
 class SecurityService:
 
     async def verify_key(self, key: str):
-        if key not in settings.ALLOWED_TOKENS and key != settings.AUTH_TOKEN:
+        if key not in settings.allowed_tokens_list and key != settings.AUTH_TOKEN:
             logger.error("Invalid key")
             raise HTTPException(status_code=401, detail="Invalid key")
         return key
@@ -34,7 +34,7 @@ class SecurityService:
             )
 
         token = authorization.replace("Bearer ", "")
-        if token not in settings.ALLOWED_TOKENS and token != settings.AUTH_TOKEN:
+        if token not in settings.allowed_tokens_list and token != settings.AUTH_TOKEN:
             logger.error("Invalid token")
             raise HTTPException(status_code=401, detail="Invalid token")
 
@@ -49,7 +49,7 @@ class SecurityService:
             raise HTTPException(status_code=401, detail="Missing x-goog-api-key header")
 
         if (
-            x_goog_api_key not in settings.ALLOWED_TOKENS
+            x_goog_api_key not in settings.allowed_tokens_list
             and x_goog_api_key != settings.AUTH_TOKEN
         ):
             logger.error("Invalid x-goog-api-key")
@@ -75,7 +75,7 @@ class SecurityService:
     ) -> str:
         """验证URL中的key或请求头中的x-goog-api-key"""
         # 如果URL中的key有效，直接返回
-        if key in settings.ALLOWED_TOKENS or key == settings.AUTH_TOKEN:
+        if key in settings.allowed_tokens_list or key == settings.AUTH_TOKEN:
             return key
         
         # 否则检查请求头中的x-goog-api-key
@@ -83,7 +83,7 @@ class SecurityService:
             logger.error("Invalid key and missing x-goog-api-key header")
             raise HTTPException(status_code=401, detail="Invalid key and missing x-goog-api-key header")
         
-        if x_goog_api_key not in settings.ALLOWED_TOKENS and x_goog_api_key != settings.AUTH_TOKEN:
+        if x_goog_api_key not in settings.allowed_tokens_list and x_goog_api_key != settings.AUTH_TOKEN:
             logger.error("Invalid key and invalid x-goog-api-key")
             raise HTTPException(status_code=401, detail="Invalid key and invalid x-goog-api-key")
         

app/service/config/config_service.py

@@ -115,7 +115,7 @@ class ConfigService:
         # 重置并重新初始化 KeyManager
         try:
             await reset_key_manager_instance()
-            await get_key_manager_instance(settings.API_KEYS, settings.VERTEX_API_KEYS)
+            await get_key_manager_instance(settings.api_keys_list, settings.VERTEX_API_KEYS)
             logger.info("KeyManager instance re-initialized with updated settings.")
         except Exception as e:
             logger.error(f"Failed to re-initialize KeyManager: {str(e)}")
@@ -125,17 +125,15 @@ class ConfigService:
     @staticmethod
     async def delete_key(key_to_delete: str) -> Dict[str, Any]:
         """删除单个API密钥"""
-        # 确保 settings.API_KEYS 是一个列表
-        if not isinstance(settings.API_KEYS, list):
-            settings.API_KEYS = []
-
-        original_keys_count = len(settings.API_KEYS)
+        # 获取当前API密钥列表
+        current_api_keys = settings.api_keys_list
+        original_keys_count = len(current_api_keys)
         # 创建一个不包含待删除密钥的新列表
-        updated_api_keys = [k for k in settings.API_KEYS if k != key_to_delete]
+        updated_api_keys = [k for k in current_api_keys if k != key_to_delete]
 
         if len(updated_api_keys) < original_keys_count:
-            # 密钥已找到并从列表中移除
-            settings.API_KEYS = updated_api_keys  # 首先更新内存中的 settings
+            # 密钥已找到并从列表中移除，更新为逗号分隔的字符串
+            settings.API_KEYS = ",".join(updated_api_keys)
             # 使用 update_config 持久化更改，它同时处理数据库和 KeyManager
             await ConfigService.update_config({"API_KEYS": settings.API_KEYS})
             logger.info(f"密钥 '{key_to_delete}' 已成功删除。")
@@ -148,13 +146,10 @@ class ConfigService:
     @staticmethod
     async def delete_selected_keys(keys_to_delete: List[str]) -> Dict[str, Any]:
         """批量删除选定的API密钥"""
-        if not isinstance(settings.API_KEYS, list):
-            settings.API_KEYS = []
-
+        # 获取当前API密钥列表
+        current_api_keys = settings.api_keys_list.copy()
         deleted_count = 0
         not_found_keys: List[str] = []
-
-        current_api_keys = list(settings.API_KEYS)
         keys_actually_removed: List[str] = []
 
         for key_to_del in keys_to_delete:
@@ -166,7 +161,8 @@ class ConfigService:
                 not_found_keys.append(key_to_del)
 
         if deleted_count > 0:
-            settings.API_KEYS = current_api_keys
+            # 更新为逗号分隔的字符串
+            settings.API_KEYS = ",".join(current_api_keys)
             await ConfigService.update_config({"API_KEYS": settings.API_KEYS})
             logger.info(
                 f"成功删除 {deleted_count} 个密钥。密钥: {keys_actually_removed}"
@@ -213,7 +209,7 @@ class ConfigService:
         try:
             await reset_key_manager_instance()
             # 确保使用更新后的 settings 中的 API_KEYS
-            await get_key_manager_instance(settings.API_KEYS)
+            await get_key_manager_instance(settings.api_keys_list)
             logger.info("KeyManager instance re-initialized with reloaded settings.")
         except Exception as e:
             logger.error(f"Failed to re-initialize KeyManager during reset: {str(e)}")