Upload 55 files

app/api/dashboard.py

@@ -95,7 +95,7 @@ async def get_dashboard_data():
     api_key_stats.sort(key=lambda x: x['usage_percent'], reverse=True)
     
     # 获取最近的日志
-    recent_logs = log_manager.get_recent_logs(50)  # 获取最近50条日志
+    recent_logs = log_manager.get_recent_logs(500)  # 获取最近50条日志
     
     # 返回JSON格式的数据
     return {

app/config/settings.py

@@ -8,12 +8,13 @@ BASE_DIR = pathlib.Path(__file__).parent.parent
 
 # 流式响应配置
 FAKE_STREAMING = os.environ.get("FAKE_STREAMING", "true").lower() in ["true", "1", "yes"]
+# 假流式请求的空内容返回间隔（秒）
+FAKE_STREAMING_INTERVAL = float(os.environ.get("FAKE_STREAMING_INTERVAL", "1"))
 
 #随机字符串
 RANDOM_STRING = os.environ.get("RANDOM_STRING", "true").lower() in ["true", "1", "yes"]
-RANDOM_STRING_LENGTH = int(os.environ.get("RANDOM_STRING_LENGTH", "25"))
-# 假流式请求的空内容返回间隔（秒）
-FAKE_STREAMING_INTERVAL = float(os.environ.get("FAKE_STREAMING_INTERVAL", "1"))
+RANDOM_STRING_LENGTH = int(os.environ.get("RANDOM_STRING_LENGTH", "20"))
+
 
 # 日志配置
 logging.getLogger("uvicorn").disabled = True
@@ -39,10 +40,12 @@ REMOVE_CACHE_AFTER_USE = os.environ.get("REMOVE_CACHE_AFTER_USE", "true").lower(
 REQUEST_HISTORY_EXPIRY_TIME = int(os.environ.get("REQUEST_HISTORY_EXPIRY_TIME", "600"))  # 默认10分钟
 ENABLE_RECONNECT_DETECTION = os.environ.get("ENABLE_RECONNECT_DETECTION", "true").lower() in ["true", "1", "yes"]
 
-# 版本信息
-local_version = "0.0.4"
-remote_version = "0.0.4"
-has_update = False
+
+version={
+    "local_version":"0.0.0",
+    "remote_version":"0.0.0",
+    "has_update":False
+}
 
 # API调用统计
 api_call_stats = {
@@ -71,4 +74,4 @@ DEFAULT_BLOCKED_MODELS = []
 # 环境变量格式应为逗号分隔的模型名称字符串
 BLOCKED_MODELS = os.environ.get("BLOCKED_MODELS", ",".join(DEFAULT_BLOCKED_MODELS))
 # 将字符串转换为列表
-BLOCKED_MODELS = [model.strip() for model in BLOCKED_MODELS.split(",") if model.strip()]
+BLOCKED_MODELS = [model.strip() for model in BLOCKED_MODELS.split(",") if model.strip()]

app/main.py

@@ -22,6 +22,8 @@ from app.api import router, init_router, dashboard_router, init_dashboard_router
 from app.config.settings import (
     FAKE_STREAMING,
     FAKE_STREAMING_INTERVAL,
+    RANDOM_STRING,
+    RANDOM_STRING_LENGTH,
     PASSWORD,
     MAX_REQUESTS_PER_MINUTE,
     MAX_REQUESTS_PER_DAY_PER_IP,
@@ -34,9 +36,7 @@ from app.config.settings import (
     ENABLE_RECONNECT_DETECTION,
     api_call_stats,
     client_request_history,
-    local_version,
-    remote_version,
-    has_update,
+    version,
     API_KEY_DAILY_LIMIT
 )
 from app.config.safety import SAFETY_SETTINGS, SAFETY_SETTINGS_G2
@@ -115,7 +115,6 @@ async def startup_event():
     
     # 检查版本
     await check_version()
-    
     available_keys = await check_keys()
     if available_keys:
         key_manager.api_keys = available_keys
@@ -202,7 +201,7 @@ async def root(request: Request):
             continue
     
     # 获取最近的日志
-    recent_logs = log_manager.get_recent_logs(50)  # 获取最近50条日志
+    recent_logs = log_manager.get_recent_logs(500)  # 获取最近50条日志
     
     # 获取缓存统计
     total_cache = len(response_cache_manager.cache)
@@ -267,9 +266,15 @@ async def root(request: Request):
         "current_time": datetime.now().strftime('%H:%M:%S'),
         "logs": recent_logs,
         # 添加版本信息
-        "local_version": local_version,
-        "remote_version": remote_version,
-        "has_update": has_update,
+        "local_version": version["local_version"],
+        "remote_version": version["remote_version"],
+        "has_update": version["has_update"],
+        # 添加流式响应配置
+        "fake_streaming": FAKE_STREAMING,
+        "fake_streaming_interval": FAKE_STREAMING_INTERVAL,
+        # 添加随机字符串配置
+        "random_string": RANDOM_STRING,
+        "random_string_length": RANDOM_STRING_LENGTH,
         # 添加缓存信息
         "cache_entries": total_cache,
         "valid_cache": valid_cache,

app/templates/index.html

@@ -240,6 +240,15 @@
         .progress-bar.high {
             background-color: #dc3545; /* 红色 - 高使用率 */
         }
+        
+        /* 版本更新状态样式 */
+        .update-needed {
+            color: #dc3545; /* 红色 - 需要更新 */
+        }
+        
+        .up-to-date {
+            color: #28a745; /* 绿色 - 已是最新 */
+        }
     </style>
 </head>
 <body>
@@ -294,6 +303,9 @@
 
     <div class="info-box">
         <h2 class="section-title">⚙️ 环境配置</h2>
+        
+        <!-- 基本配置 -->
+        <h3 class="section-title">基本配置</h3>
         <div class="stats-grid">
             <div class="stat-card">
                 <div class="stat-value">{{ max_requests_per_minute }}</div>
@@ -308,30 +320,41 @@
                 <div class="stat-label">当前服务器时间</div>
             </div>
         </div>
-    </div>
-
-    <div class="info-box">
-        <h2 class="section-title">📦 版本信息</h2>
-        <div class="version-info" style="text-align: center; margin-bottom: 15px;">
-            <div style="font-size: 18px; margin-bottom: 10px;">
-                当前版本: <span style="font-weight: bold; color: #007bff;">{{ local_version }}</span>
+        
+        <!-- 功能配置 -->
+        <h3 class="section-title">功能配置</h3>
+        <div class="stats-grid">
+            <div class="stat-card">
+                <div class="stat-value">{{ "启用" if fake_streaming else "禁用" }}</div>
+                <div class="stat-label">假流式响应</div>
             </div>
-            {% if has_update %}
-            <div style="display: flex; align-items: center; justify-content: center; margin-top: 15px;">
-                <div style="background-color: #fef6e0; border: 1px solid #ffeeba; border-radius: 4px; padding: 10px 15px; display: inline-flex; align-items: center;">
-                    <span style="color: #ff9800; margin-right: 10px;">
-                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                            <circle cx="12" cy="12" r="10"></circle>
-                            <line x1="12" y1="8" x2="12" y2="12"></line>
-                            <line x1="12" y1="16" x2="12.01" y2="16"></line>
-                        </svg>
-                    </span>
-                    <span>
-                        <strong>发现新版本!</strong> 最新版本: <span style="font-weight: bold; color: #28a745;">{{ remote_version }}</span>
-                    </span>
+            <div class="stat-card">
+                <div class="stat-value">{{ fake_streaming_interval }}秒</div>
+                <div class="stat-label">假流式间隔</div>
+            </div>
+            <div class="stat-card">
+                <div class="stat-value">{{ "启用" if random_string else "禁用" }}</div>
+                <div class="stat-label">伪装信息</div>
+            </div>
+        </div>
+        
+        <!-- 版本信息 -->
+        <h3 class="section-title">版本信息</h3>
+        <div class="stats-grid">
+            <div class="stat-card">
+                <div class="stat-value">{{ local_version }}</div>
+                <div class="stat-label">当前版本</div>
+            </div>
+            <div class="stat-card">
+                <div class="stat-value">{{ remote_version }}</div>
+                <div class="stat-label">最新版本</div>
+            </div>
+            <div class="stat-card">
+                <div class="stat-value {% if has_update %}update-needed{% else %}up-to-date{% endif %}">
+                    {{ "需要更新" if has_update else "已是最新" }}
                 </div>
+                <div class="stat-label">更新状态</div>
             </div>
-            {% endif %}
         </div>
     </div>
 

app/utils/maintenance.py

@@ -1,9 +1,12 @@
-import sys
-from apscheduler.schedulers.background import BackgroundScheduler
+import sys,asyncio
+#from apscheduler.schedulers.background import BackgroundScheduler
+from apscheduler.schedulers.asyncio import AsyncIOScheduler  # 替换为异步调度器
 from app.utils.logging import log
 from app.utils.stats import clean_expired_stats
 from app.config import api_call_stats
 from app.utils import check_version
+from zoneinfo import ZoneInfo
+from app.config import settings
 def handle_exception(exc_type, exc_value, exc_traceback):
     """
     全局异常处理函数
@@ -16,7 +19,7 @@ def handle_exception(exc_type, exc_value, exc_traceback):
     from app.utils.error_handling import translate_error
     error_message = translate_error(str(exc_value))
     log('error', f"未捕获的异常: {error_message}", status_code=500, error_message=error_message)
-
+'''
 def schedule_cache_cleanup(response_cache_manager, active_requests_manager):
     """
     设置定期清理缓存和活跃请求的定时任务
@@ -30,7 +33,45 @@ def schedule_cache_cleanup(response_cache_manager, active_requests_manager):
     scheduler.add_job(active_requests_manager.clean_completed, 'interval', seconds=30)  # 每30秒清理已完成的活跃请求
     scheduler.add_job(active_requests_manager.clean_long_running, 'interval', minutes=5, args=[300])  # 每5分钟清理运行超过5分钟的任务
     scheduler.add_job(clean_expired_stats, 'interval', minutes=5,args=[api_call_stats])  # 每5分钟清理过期的统计数据
-    scheduler.add_job(check_version, 'interval', minutes=240)  # 每4小时检查更新
+    scheduler.add_job(check_version, 'interval', minutes=1)  # 每4小时检查更新
     scheduler.start()
     
-    return scheduler
+    return scheduler
+
+'''
+def schedule_cache_cleanup(response_cache_manager, active_requests_manager):
+    """
+    设置定期清理缓存和活跃请求的定时任务
+    顺便定时检查更新
+    Args:
+        response_cache_manager: 响应缓存管理器实例
+        active_requests_manager: 活跃请求管理器实例
+    """
+    beijing_tz = ZoneInfo("Asia/Shanghai")
+    scheduler = AsyncIOScheduler(timezone=beijing_tz)  # 使用 AsyncIOScheduler 替代 BackgroundScheduler
+    
+    # 添加任务时直接传递异步函数（无需额外包装）
+    scheduler.add_job(response_cache_manager.clean_expired, 'interval', minutes=1)
+    scheduler.add_job(active_requests_manager.clean_completed, 'interval', seconds=30)
+    scheduler.add_job(active_requests_manager.clean_long_running, 'interval', minutes=5, args=[300])
+    scheduler.add_job(clean_expired_stats, 'interval', minutes=5, args=[api_call_stats])
+    scheduler.add_job(check_version, 'interval', hours=4)
+    scheduler.add_job(api_call_stats_clean, 'cron', hour=16,minute=0)
+    scheduler.start()
+    return scheduler
+
+def api_call_stats_clean():
+    settings.api_call_stats = {
+    'last_24h': {
+        'total': {},  
+        'by_endpoint': {}  
+    },
+    'hourly': {
+        'total': {}, 
+        'by_endpoint': {}  
+    },
+    'minute': {
+        'total': {},  
+        'by_endpoint': {}  
+    }
+}

app/utils/version.py

@@ -13,18 +13,17 @@ async def check_version():
         # 读取本地版本
         with open("./version.txt", "r") as f:
             version_line = f.read().strip()
-            settings.local_version = version_line.split("=")[1] if "=" in version_line else "0.0.0"
+            settings.version['local_version'] = version_line.split("=")[1] if "=" in version_line else "0.0.0"
         
         # 获取远程版本
         github_url = "https://raw.githubusercontent.com/wyeeeee/hajimi/refs/heads/main/version.txt"
         response = requests.get(github_url, timeout=5)
         if response.status_code == 200:
             version_line = response.text.strip()
-            settings.remote_version = version_line.split("=")[1] if "=" in version_line else "0.0.0"
-            
+            settings.version['remote_version']= version_line.split("=")[1] if "=" in version_line else "0.0.0"
             # 比较版本号
-            local_parts = [int(x) for x in settings.local_version.split(".")]
-            remote_parts = [int(x) for x in settings.remote_version.split(".")]
+            local_parts = [int(x) for x in settings.version['local_version'].split(".")]
+            remote_parts = [int(x) for x in settings.version['remote_version'].split(".")]
             
             # 确保两个列表长度相同
             while len(local_parts) < len(remote_parts):
@@ -33,18 +32,18 @@ async def check_version():
                 remote_parts.append(0)
                 
             # 比较版本号
-            settings.has_update = False
+            settings.version['has_update'] = False
             for i in range(len(local_parts)):
                 if remote_parts[i] > local_parts[i]:
-                    settings.has_update = True
+                    settings.version['has_update'] = True
                     break
                 elif remote_parts[i] < local_parts[i]:
                     break
             
-            log('info', f"版本检查: 本地版本 {settings.local_version}, 远程版本 {settings.remote_version}, 有更新: {settings.has_update}")
+            log('info', f"版本检查: 本地版本 {settings.version['local_version']}, 远程版本 {settings.version['remote_version']}, 有更新: {settings.version['has_update']}")
         else:
             log('warning', f"无法获取远程版本信息，HTTP状态码: {response.status_code}")
     except Exception as e:
         log('error', f"版本检查失败: {str(e)}")
         
-    return settings.local_version, settings.remote_version, settings.has_update
+    return settings.version['has_update']