jettask 0.2.15__py3-none-any.whl → 0.2.16__py3-none-any.whl

jettask/api/v1/scheduled.py

@@ -0,0 +1,420 @@
+"""
+定时任务模块 - 定时任务管理、执行和监控
+提供轻量级的路由入口，业务逻辑在 ScheduledTaskService 中实现
+"""
+from fastapi import APIRouter, HTTPException, Request, Query
+from typing import Optional
+import logging
+
+from jettask.schemas import ScheduledTaskRequest
+from jettask.services.scheduled_task_service import ScheduledTaskService
+
+router = APIRouter(prefix="/scheduled", tags=["scheduled"])
+logger = logging.getLogger(__name__)
+
+
+# ============ 定时任务管理 ============
+
+@router.get("/")
+async def get_scheduled_tasks(
+    request: Request,
+    page: int = Query(1, ge=1),
+    page_size: int = Query(20, ge=1, le=100),
+    search: Optional[str] = Query(None, description="搜索关键字"),
+    is_active: Optional[bool] = Query(None, description="是否激活")
+):
+    """
+    获取定时任务列表
+    
+    Args:
+        page: 页码（从1开始）
+        page_size: 每页数量
+        search: 搜索关键字
+        is_active: 是否激活
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        async with data_access.get_session() as session:
+            tasks, total = await data_access.fetch_scheduled_tasks(
+                session=session,
+                page=page,
+                page_size=page_size,
+                search=search,
+                is_active=is_active
+            )
+        
+        return {
+            "success": True,
+            "data": tasks,
+            "total": total,
+            "page": page,
+            "page_size": page_size
+        }
+    except Exception as e:
+        logger.error(f"获取定时任务列表失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/filter")
+async def get_scheduled_tasks_with_filters(request: Request):
+    """
+    获取定时任务列表（支持高级筛选）
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        # 解析请求体
+        body = await request.json()
+        
+        page = body.get('page', 1)
+        page_size = body.get('page_size', 20)
+        search = body.get('search')
+        is_active = body.get('is_active')
+        filters = body.get('filters', [])
+        time_range = body.get('time_range')
+        start_time = body.get('start_time')
+        end_time = body.get('end_time')
+        
+        async with data_access.get_session() as session:
+            tasks, total = await data_access.fetch_scheduled_tasks(
+                session=session,
+                page=page,
+                page_size=page_size,
+                search=search,
+                is_active=is_active,
+                filters=filters,
+                time_range=time_range,
+                start_time=start_time,
+                end_time=end_time
+            )
+        
+        return {
+            "success": True,
+            "data": tasks,
+            "total": total,
+            "page": page,
+            "page_size": page_size
+        }
+    except Exception as e:
+        logger.error(f"获取定时任务列表失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/", status_code=201)
+async def create_scheduled_task(request: Request, task_request: ScheduledTaskRequest):
+    """
+    创建定时任务
+    
+    Args:
+        task_request: 定时任务创建请求
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        # 验证调度配置
+        ScheduledTaskService.validate_schedule_config(
+            task_request.schedule_type, 
+            task_request.schedule_config
+        )
+        
+        task_data = {
+            "namespace": task_request.namespace,
+            "name": task_request.name,
+            "queue_name": task_request.queue_name,
+            "task_data": task_request.task_data,
+            "schedule_type": task_request.schedule_type,
+            "schedule_config": task_request.schedule_config,
+            "is_active": task_request.is_active,
+            "description": task_request.description,
+            "max_retry": task_request.max_retry,
+            "timeout": task_request.timeout
+        }
+        
+        async with data_access.get_session() as session:
+            task = await data_access.create_scheduled_task(session, task_data)
+        
+        return {
+            "success": True,
+            "data": task,
+            "message": "定时任务创建成功"
+        }
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    except Exception as e:
+        logger.error(f"创建定时任务失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.put("/{task_id}")
+async def update_scheduled_task(request: Request, task_id: str, task_request: ScheduledTaskRequest):
+    """
+    更新定时任务
+    
+    Args:
+        task_id: 任务ID
+        task_request: 定时任务更新请求
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        # 验证调度配置
+        ScheduledTaskService.validate_schedule_config(
+            task_request.schedule_type,
+            task_request.schedule_config
+        )
+        
+        task_data = {
+            "namespace": task_request.namespace,
+            "name": task_request.name,
+            "queue_name": task_request.queue_name,
+            "task_data": task_request.task_data,
+            "schedule_type": task_request.schedule_type,
+            "schedule_config": task_request.schedule_config,
+            "is_active": task_request.is_active,
+            "description": task_request.description,
+            "max_retry": task_request.max_retry,
+            "timeout": task_request.timeout
+        }
+        
+        async with data_access.get_session() as session:
+            task = await data_access.update_scheduled_task(session, task_id, task_data)
+        
+        return {
+            "success": True,
+            "data": task,
+            "message": "定时任务更新成功"
+        }
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    except Exception as e:
+        logger.error(f"更新定时任务失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.delete("/{task_id}")
+async def delete_scheduled_task(request: Request, task_id: str):
+    """
+    删除定时任务
+    
+    Args:
+        task_id: 任务ID
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        async with data_access.get_session() as session:
+            success = await data_access.delete_scheduled_task(session, task_id)
+        
+        if success:
+            return {
+                "success": True,
+                "message": f"定时任务 {task_id} 已删除"
+            }
+        else:
+            raise HTTPException(status_code=404, detail="定时任务不存在")
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"删除定时任务失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/{task_id}/toggle")
+async def toggle_scheduled_task(request: Request, task_id: str):
+    """
+    启用/禁用定时任务
+    
+    Args:
+        task_id: 任务ID
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        async with data_access.get_session() as session:
+            task = await data_access.toggle_scheduled_task(session, task_id)
+        
+        if task:
+            return {
+                "success": True,
+                "data": {
+                    "id": task["id"],
+                    "is_active": task["enabled"]  # 映射 enabled 到 is_active
+                },
+                "message": "定时任务状态已更新"
+            }
+        else:
+            raise HTTPException(status_code=404, detail="定时任务不存在")
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error(f"切换定时任务状态失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/{task_id}/execute")
+async def execute_scheduled_task_now(request: Request, task_id: str):
+    """
+    立即执行定时任务
+    
+    Args:
+        task_id: 任务ID
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        if not hasattr(app.state, 'namespace_data_access'):
+            raise HTTPException(status_code=500, detail="Namespace data access not initialized")
+        
+        data_access = app.state.data_access
+        namespace_data_access = app.state.namespace_data_access
+        
+        # 调用服务层执行任务
+        result = await ScheduledTaskService.execute_task_now(
+            data_access,
+            namespace_data_access,
+            task_id
+        )
+        
+        return result
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except RuntimeError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    except Exception as e:
+        logger.error(f"执行定时任务失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+# ============ 执行历史和统计 ============
+
+@router.get("/{task_id}/history")
+async def get_scheduled_task_history(
+    request: Request,
+    task_id: str,
+    page: int = Query(1, ge=1),
+    page_size: int = Query(20, ge=1, le=100)
+):
+    """
+    获取定时任务执行历史
+    
+    Args:
+        task_id: 任务ID
+        page: 页码
+        page_size: 每页数量
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        async with data_access.get_session() as session:
+            history, total = await data_access.fetch_task_execution_history(
+                session=session,
+                task_id=task_id,
+                page=page,
+                page_size=page_size
+            )
+        
+        return {
+            "success": True,
+            "data": history,
+            "total": total,
+            "page": page,
+            "page_size": page_size
+        }
+    except Exception as e:
+        logger.error(f"获取定时任务执行历史失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/{task_id}/trend")
+async def get_scheduled_task_execution_trend(
+    request: Request,
+    task_id: str,
+    time_range: str = Query("7d", description="时间范围")
+):
+    """
+    获取定时任务执行趋势
+    
+    Args:
+        task_id: 任务ID
+        time_range: 时间范围
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        async with data_access.get_session() as session:
+            data = await data_access.fetch_task_execution_trend(
+                session=session,
+                task_id=task_id,
+                time_range=time_range
+            )
+        
+        return {
+            "success": True,
+            "data": data,
+            "time_range": time_range
+        }
+    except Exception as e:
+        logger.error(f"获取定时任务执行趋势失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/statistics/{namespace}")
+async def get_scheduled_tasks_statistics(request: Request, namespace: str):
+    """
+    获取定时任务统计数据
+    
+    Args:
+        namespace: 命名空间
+    """
+    try:
+        app = request.app
+        if not app or not hasattr(app.state, 'data_access'):
+            raise HTTPException(status_code=500, detail="Data access not initialized")
+        
+        data_access = app.state.data_access
+        
+        async with data_access.AsyncSessionLocal() as session:
+            # 获取统计数据，传递命名空间参数
+            stats = await data_access.get_scheduled_tasks_statistics(session, namespace)
+            return stats
+    except Exception as e:
+        logger.error(f"获取定时任务统计失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+__all__ = ['router']

jettask/api/v1/settings.py

@@ -0,0 +1,44 @@
+"""
+设置模块 - 系统配置
+提供轻量级的路由入口，业务逻辑在 SettingsService 中实现
+"""
+from fastapi import APIRouter, HTTPException
+import logging
+import traceback
+
+from jettask.services.settings_service import SettingsService
+
+logger = logging.getLogger(__name__)
+
+# 创建设置模块路由，添加 /settings 前缀
+router = APIRouter(prefix="/settings", tags=["settings"])
+
+
+# ============ 系统配置接口 ============
+
+@router.get("/system")
+async def get_system_settings():
+    """
+    获取系统配置信息
+    返回系统级别的配置，如数据库连接信息、API配置等
+    """
+    try:
+        return SettingsService.get_system_settings()
+    except Exception as e:
+        logger.error(f"获取系统配置失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/database-status")
+async def check_database_status():
+    """
+    检查数据库连接状态
+    """
+    try:
+        return await SettingsService.check_database_status()
+    except Exception as e:
+        logger.error(f"数据库状态检查失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+__all__ = ['router']

jettask/{webui/api.py → api.py}

@@ -17,9 +17,9 @@ from sqlalchemy.orm import sessionmaker
 from sqlalchemy import select, func, and_, or_, text
 from sqlalchemy.dialects import postgresql
 
-from jettask.webui.pg_consumer import PostgreSQLConsumer
-from jettask.webui.config import PostgreSQLConfig, RedisConfig
-from jettask.webui.models import Base, Task, QueueStats, Worker
+from jettask.pg_consumer import PostgreSQLConsumer
+from jettask.webui_config import PostgreSQLConfig, RedisConfig
+from jettask.models import Base, Task, QueueStats, Worker
 
 logger = logging.getLogger(__name__)
 
@@ -236,44 +236,7 @@ class RedisMonitor:
         except Exception as e:
             print(f"Error reading from stream {prefixed_queue_name}: {e}")
         return None
-        
-    async def get_all_tasks(self) -> List[Dict[str, Any]]:
-        """获取所有任务状态"""
-        tasks = []
-        
-        # 扫描所有状态键
-        cursor = 0
-        pattern = f"{self.redis_prefix}:STATUS:*"
-        
-        while True:
-            cursor, keys = await self.redis.scan(
-                cursor, match=pattern, count=100
-            )
-            
-            for status_key in keys:
-                event_id = status_key.split(":")[-1]
-                task_info = await self.get_task_info(event_id)
-                
-                # 尝试获取Stream信息
-                # 这里需要知道任务所在的队列，可能需要从状态信息中解析
-                if task_info.get("status"):
-                    try:
-                        status_data = json.loads(task_info["status"])
-                        queue_name = status_data.get("queue")
-                        if queue_name:
-                            stream_info = await self.get_stream_info(queue_name, event_id)
-                            if stream_info:
-                                task_info["stream_info"] = stream_info
-                    except:
-                        pass
-                        
-                tasks.append(task_info)
-                
-            if cursor == 0:
-                break
-                
-        return tasks
-    
+ 
     async def get_queue_tasks(self, queue_name: str, start_time: Optional[str] = None, 
                              end_time: Optional[str] = None, limit: int = 100) -> Dict[str, Any]:
         """获取指定队列的任务（基于时间范围）
@@ -1318,11 +1281,6 @@ async def lifespan(app: FastAPI):
 
 app = FastAPI(title="Jettask Monitor", lifespan=lifespan)
 
-@app.get("/api/tasks")
-async def get_tasks():
-    """获取所有任务"""
-    tasks = await monitor.get_all_tasks()
-    return {"tasks": tasks}
 
 @app.get("/api/queue/{queue_name}/tasks")
 async def get_queue_tasks(