Upload 116 files

Dockerfile

@@ -7,11 +7,13 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
 
-RUN mkdir -p /data
+RUN mkdir -p /app/logs /data/logs \
+    && chmod -R 777 /app/logs /data
 
 ENV OPENAI_COMPAT_PORT=7860 \
     PORT=7860 \
-    DATA_DIR=/data
+    DATA_DIR=/data \
+    LOG_DIR=/data/logs
 
 EXPOSE 7860
 

main.py

@@ -9,8 +9,9 @@ import time
 import sys
 import os
 import importlib
-import logging
-import asyncio
+import logging
+import asyncio
+import shutil
 
 # 在导入项目模块之前，确保项目根目录在sys.path中
 # 这有助于解决在不同环境下模块导入失败的问题
@@ -18,14 +19,38 @@ project_root = os.path.dirname(os.path.abspath(__file__))
 if project_root not in sys.path:
     sys.path.insert(0, project_root)
 
-import config
-
-# 配置日志
-logging.basicConfig(
-    level=config.LOG_LEVEL,
-    format=config.LOG_FORMAT
-)
-logger = logging.getLogger(__name__)
+import config
+
+
+def prepare_runtime_environment():
+    data_dir = os.path.dirname(config.DATABASE_PATH)
+    log_dir = os.getenv("LOG_DIR") or os.path.join(os.getenv("DATA_DIR", "/data"), "logs")
+
+    for path in {data_dir, log_dir}:
+        if not path:
+            continue
+        try:
+            os.makedirs(path, exist_ok=True)
+        except Exception as exc:
+            logger = logging.getLogger(__name__)
+            logger.warning(f"无法创建目录 {path}: {exc}")
+
+    default_db = os.path.join(project_root, "warp_accounts.db")
+    if config.DATABASE_PATH and not os.path.exists(config.DATABASE_PATH) and os.path.exists(default_db):
+        try:
+            shutil.copy2(default_db, config.DATABASE_PATH)
+            logging.getLogger(__name__).info(f"已初始化数据库文件: {config.DATABASE_PATH}")
+        except Exception as exc:
+            logging.getLogger(__name__).warning(f"初始化数据库失败: {exc}")
+
+# 配置日志
+logging.basicConfig(
+    level=config.LOG_LEVEL,
+    format=config.LOG_FORMAT
+)
+logger = logging.getLogger(__name__)
+
+prepare_runtime_environment()
 
 
 # ==================== 服务启动函数 ====================
@@ -101,13 +126,17 @@ def run_warp_register():
 
 # ==================== 进程管理 ====================
 
-SERVICES = {
-    "server": run_server,
-    "openai": run_openai_compat,
-    "pool_service": run_pool_service,
-    "pool_maintenance": run_pool_maintenance,
-    "register": run_warp_register,
-}
+SERVICES = {
+    "server": run_server,
+    "openai": run_openai_compat,
+    "pool_service": run_pool_service,
+    "pool_maintenance": run_pool_maintenance,
+    "register": run_warp_register,
+}
+
+if not getattr(config, "ENABLE_AUTO_REGISTER", True):
+    for name in ("pool_maintenance", "register"):
+        SERVICES.pop(name, None)
 
 
 def start_all_services():
@@ -175,4 +204,4 @@ if __name__ == "__main__":
     else:
         print(f"错误: 未知命令 '{command}'\n")
         print_usage()
-        sys.exit(1)
+        sys.exit(1)

protobuf2openai/logging.py

@@ -3,30 +3,44 @@
 """
 Local logging for protobuf2openai package to avoid cross-package dependencies.
 """
-import logging
-from logging.handlers import RotatingFileHandler
-from pathlib import Path
+import logging
+import os
+from logging.handlers import RotatingFileHandler
+from pathlib import Path
+
+_default_log_dir = os.getenv("LOG_DIR") or os.path.join(os.getenv("DATA_DIR", "/data"), "logs")
+LOG_DIR = Path(_default_log_dir)
+
+try:
+    LOG_DIR.mkdir(parents=True, exist_ok=True)
+except Exception as e:
+    fallback = Path("/tmp/protobuf2openai_logs")
+    try:
+        fallback.mkdir(parents=True, exist_ok=True)
+        LOG_DIR = fallback
+    except Exception:
+        LOG_DIR = None
 
-LOG_DIR = Path("logs")
-LOG_DIR.mkdir(exist_ok=True)
-
-_logger = logging.getLogger("protobuf2openai")
-_logger.setLevel(logging.INFO)
-
-# Remove existing handlers to prevent duplication
-for h in _logger.handlers[:]:
-    _logger.removeHandler(h)
-
-file_handler = RotatingFileHandler(LOG_DIR / "openai_compat.log", maxBytes=5*1024*1024, backupCount=3, encoding="utf-8")
-file_handler.setLevel(logging.INFO)
-console_handler = logging.StreamHandler()
-console_handler.setLevel(logging.INFO)
-
-fmt = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(funcName)s:%(lineno)d - %(message)s')
-file_handler.setFormatter(fmt)
-console_handler.setFormatter(fmt)
-
-_logger.addHandler(file_handler)
-_logger.addHandler(console_handler)
-
-logger = _logger 
+_logger = logging.getLogger("protobuf2openai")
+_logger.setLevel(logging.INFO)
+
+for h in _logger.handlers[:]:
+    _logger.removeHandler(h)
+
+console_handler = logging.StreamHandler()
+console_handler.setLevel(logging.INFO)
+
+fmt = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(funcName)s:%(lineno)d - %(message)s')
+console_handler.setFormatter(fmt)
+_logger.addHandler(console_handler)
+
+if LOG_DIR is not None:
+    try:
+        file_handler = RotatingFileHandler(LOG_DIR / "openai_compat.log", maxBytes=5*1024*1024, backupCount=3, encoding="utf-8")
+        file_handler.setLevel(logging.INFO)
+        file_handler.setFormatter(fmt)
+        _logger.addHandler(file_handler)
+    except Exception as e:
+        _logger.warning(f"Unable to create file logger under {LOG_DIR}: {e}")
+
+logger = _logger

warp2protobuf/config/settings.py

@@ -12,10 +12,12 @@ from dotenv import load_dotenv
 # Load environment variables
 load_dotenv()
 
-# Path configurations
-SCRIPT_DIR = pathlib.Path(__file__).resolve().parent.parent.parent
-PROTO_DIR = SCRIPT_DIR / "proto"
-LOGS_DIR = SCRIPT_DIR / "logs"
+# Path configurations
+SCRIPT_DIR = pathlib.Path(__file__).resolve().parent.parent.parent
+PROTO_DIR = SCRIPT_DIR / "proto"
+
+_log_base = os.getenv("WARP_LOG_DIR") or os.getenv("LOG_DIR") or os.path.join(os.getenv("DATA_DIR", "/data"), "logs")
+LOGS_DIR = pathlib.Path(_log_base)
 
 # API configuration
 WARP_URL = "https://app.warp.dev/ai/multi-agent"
@@ -40,4 +42,4 @@ SYSTEM_STR = {"agent_output.text", "server_message_data", "USER_INITIATED", "age
 
 # JWT refresh configuration
 REFRESH_TOKEN_B64 = "Z3JhbnRfdHlwZT1yZWZyZXNoX3Rva2VuJnJlZnJlc2hfdG9rZW49QU1mLXZCeFNSbWRodmVHR0JZTTY5cDA1a0RoSW4xaTd3c2NBTEVtQzlmWURScEh6akVSOWRMN2trLWtIUFl3dlk5Uk9rbXk1MHFHVGNJaUpaNEFtODZoUFhrcFZQTDkwSEptQWY1Zlo3UGVqeXBkYmNLNHdzbzhLZjNheGlTV3RJUk9oT2NuOU56R2FTdmw3V3FSTU5PcEhHZ0JyWW40SThrclc1N1I4X3dzOHU3WGNTdzh1MERpTDlIcnBNbTBMdHdzQ2g4MWtfNmJiMkNXT0ViMWxJeDNIV1NCVGVQRldzUQ=="
-REFRESH_URL = "https://app.warp.dev/proxy/token?key=AIzaSyBdy3O3S9hrdayLJxJ7mriBR4qgUaUygAs" 
+REFRESH_URL = "https://app.warp.dev/proxy/token?key=AIzaSyBdy3O3S9hrdayLJxJ7mriBR4qgUaUygAs" 

warp2protobuf/core/logging.py

@@ -5,12 +5,14 @@ Logging system for Warp API server
 
 Provides comprehensive logging with file rotation and console output.
 """
-import logging
-import os
-import shutil
-from datetime import datetime
-from logging.handlers import RotatingFileHandler
-from ..config.settings import LOGS_DIR
+import logging
+import os
+import shutil
+from datetime import datetime
+from logging.handlers import RotatingFileHandler
+from pathlib import Path
+
+from ..config.settings import LOGS_DIR
 
 
 def backup_existing_log():
@@ -29,39 +31,45 @@ def backup_existing_log():
             print(f"Warning: Could not backup log file: {e}")
 
 
-def setup_logging():
-    """Configure comprehensive logging system"""
-    LOGS_DIR.mkdir(exist_ok=True)
-
-    backup_existing_log()
-    
-    logger = logging.getLogger('warp_api')
-    logger.setLevel(logging.DEBUG)
-    
-    for handler in logger.handlers[:]:
-        logger.removeHandler(handler)
-    
-    file_handler = RotatingFileHandler(
-        LOGS_DIR / 'warp_api.log',
-        maxBytes=10*1024*1024,
-        backupCount=5,
-        encoding='utf-8'
-    )
-    file_handler.setLevel(logging.DEBUG)
-    
-    console_handler = logging.StreamHandler()
-    console_handler.setLevel(logging.INFO)
-    
-    formatter = logging.Formatter(
-        '%(asctime)s - %(name)s - %(levelname)s - %(funcName)s:%(lineno)d - %(message)s'
-    )
-    file_handler.setFormatter(formatter)
-    console_handler.setFormatter(formatter)
-    
-    logger.addHandler(file_handler)
-    logger.addHandler(console_handler)
-    
-    return logger
+def setup_logging():
+    """Configure comprehensive logging system"""
+    log_dir = Path(LOGS_DIR)
+    file_handler = None
+
+    try:
+        log_dir.mkdir(parents=True, exist_ok=True)
+        backup_existing_log()
+        file_handler = RotatingFileHandler(
+            log_dir / 'warp_api.log',
+            maxBytes=10*1024*1024,
+            backupCount=5,
+            encoding='utf-8'
+        )
+        file_handler.setLevel(logging.DEBUG)
+    except Exception as e:
+        print(f"Warning: Cannot use log directory {log_dir}: {e}")
+
+    logger = logging.getLogger('warp_api')
+    logger.setLevel(logging.DEBUG)
+
+    for handler in logger.handlers[:]:
+        logger.removeHandler(handler)
+
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(logging.INFO)
+
+    formatter = logging.Formatter(
+        '%(asctime)s - %(name)s - %(levelname)s - %(funcName)s:%(lineno)d - %(message)s'
+    )
+
+    console_handler.setFormatter(formatter)
+    logger.addHandler(console_handler)
+
+    if file_handler is not None:
+        file_handler.setFormatter(formatter)
+        logger.addHandler(file_handler)
+
+    return logger
 
 
 # Initialize logger
@@ -118,4 +126,4 @@ def set_log_file(log_file_name: str) -> None:
     try:
         logger.info(f"Logging redirected to: {LOGS_DIR / log_file_name}")
     except Exception:
-        pass 
+        pass