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

jettask/__init__.py

@@ -1,40 +1,19 @@
-from .core.app import Jettask
-from .core.task import Task, Request, ExecuteResponse
-from .core.context import TaskContext
-from .router import TaskRouter
-from .exceptions import JetTaskException, TaskTimeoutError, TaskExecutionError, TaskNotFoundError, RetryableError
-from .utils.error_handler import clean_task_errors, handle_task_error
-from .utils.task_logger import (
-    configure_task_logging,
-    get_task_logger,
-    TaskContextManager,
-    set_task_context,
-    clear_task_context,
-    LogContext
-)
+# -*- coding: utf-8 -*-
+"""
+JetTask - High Performance Distributed Task Queue System
+"""
 
-# 自动安装简化的异常显示（用户可通过环境变量 JETTASK_FULL_TRACEBACK=1 禁用）
-from .utils import exception_hook  # 这会自动安装 excepthook
+# Core class imports
+from jettask.core.app import Jettask
+from jettask.core.message import TaskMessage
+from jettask.task_center import TaskCenter
 
+# Version info
 __version__ = "0.1.0"
+
+# Public API exports
 __all__ = [
-    "Jettask", 
-    "Task",
-    "TaskContext",
-    "TaskRouter", 
-    "Request", 
-    "ExecuteResponse",
-    "JetTaskException",
-    "TaskTimeoutError",
-    "TaskExecutionError",
-    "TaskNotFoundError",
-    "RetryableError",
-    "clean_task_errors",
-    "handle_task_error",
-    "configure_task_logging",
-    "get_task_logger",
-    "TaskContextManager",
-    "set_task_context",
-    "clear_task_context",
-    "LogContext"
+    "Jettask",
+    "TaskMessage", 
+    "TaskCenter",
 ]

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

@@ -9,10 +9,10 @@ import asyncio
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
 
 import uvicorn
-from jettask.webui.api import app
-from jettask.webui.config import PostgreSQLConfig, WebUIConfig, RedisConfig
-from jettask.webui.db_init import init_database
-from jettask.webui.pg_consumer import PostgreSQLConsumer
+from jettask.api import app
+from jettask.webui_config import PostgreSQLConfig, WebUIConfig, RedisConfig
+from jettask.db_init import init_database
+from jettask.pg_consumer import PostgreSQLConsumer
 
 def parse_pg_config(args):
     """解析PostgreSQL配置"""

jettask/api/__init__.py

@@ -0,0 +1,103 @@
+"""
+JetTask API 应用初始化
+"""
+from fastapi import FastAPI
+from fastapi.middleware.cors import CORSMiddleware
+from contextlib import asynccontextmanager
+import logging
+
+# 设置日志
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+
+def create_app() -> FastAPI:
+    """创建并配置 FastAPI 应用"""
+    
+    @asynccontextmanager
+    async def lifespan(app: FastAPI):
+        """应用生命周期管理"""
+        # 启动时初始化
+        try:
+            import os
+            # 检查是否使用Nacos配置
+            use_nacos = os.getenv('USE_NACOS', 'false').lower() == 'true'
+            
+            # 初始化数据库管理器
+            from jettask.core.db_manager import init_db_manager
+            await init_db_manager(use_nacos=use_nacos)
+            
+            # 延迟导入，避免循环依赖
+            from jettask.backend.data_access import JetTaskDataAccess
+            from jettask.backend.namespace_data_access import get_namespace_data_access
+            from jettask.backend.config import task_center_config
+            
+            # 创建数据访问实例
+            data_access = JetTaskDataAccess()
+            namespace_data_access = get_namespace_data_access()
+            
+            # 存储在app.state中供路由使用
+            app.state.data_access = data_access
+            app.state.namespace_data_access = namespace_data_access
+            
+            # 初始化JetTask数据访问
+            await data_access.initialize()
+            
+            # 记录任务中心配置
+            logger.info("=" * 60)
+            logger.info("任务中心配置:")
+            logger.info(f"  配置模式: {'Nacos' if use_nacos else '环境变量'}")
+            logger.info(f"  元数据库: {task_center_config.meta_db_host}:{task_center_config.meta_db_port}/{task_center_config.meta_db_name}")
+            logger.info(f"  API服务: {task_center_config.api_host}:{task_center_config.api_port}")
+            logger.info(f"  基础URL: {task_center_config.base_url}")
+            logger.info("=" * 60)
+            
+            logger.info("JetTask Monitor API 启动成功")
+        except Exception as e:
+            logger.error(f"启动失败: {e}")
+            import traceback
+            traceback.print_exc()
+            raise
+        
+        yield
+        
+        # 关闭时清理资源
+        try:
+            await app.state.data_access.close()
+            
+            # 关闭数据库管理器
+            from jettask.core.db_manager import close_db_manager
+            await close_db_manager()
+            
+            logger.info("JetTask Monitor API 关闭完成")
+        except Exception as e:
+            logger.error(f"关闭时出错: {e}")
+            import traceback
+            traceback.print_exc()
+    
+    # 创建 FastAPI 应用
+    app = FastAPI(
+        title="JetTask Monitor API", 
+        version="1.0.0",
+        lifespan=lifespan
+    )
+    
+    # 配置CORS
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],  # 生产环境应该配置具体的前端地址
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+    
+    # 注册路由
+    from jettask.api.v1 import api_router
+    
+    app.include_router(api_router)
+    
+    return app
+
+
+# 创建默认应用实例
+app = create_app()

jettask/api/v1/__init__.py

@@ -0,0 +1,29 @@
+"""
+API v1 路由模块集合
+"""
+from fastapi import APIRouter
+
+# 导入7个主要模块的路由
+from .overview import router as overview_router      # 概览
+from .namespaces import router as namespaces_router  # 命名空间
+from .queues import router as queues_router         # 队列
+from .scheduled import router as scheduled_router    # 定时任务
+from .alerts import router as alerts_router         # 告警
+from .analytics import router as analytics_router    # 分析
+from .settings import router as settings_router      # 设置
+
+# 创建 v1 总路由，添加统一的 /api/v1 前缀
+api_router = APIRouter(prefix="/api/v1")
+
+# 按功能模块组织路由（namespaces和settings现在是平级的）
+api_router.include_router(overview_router)    # 系统概览、健康检查
+api_router.include_router(namespaces_router)  # 命名空间管理（独立路由）
+api_router.include_router(queues_router)      # 队列管理、任务处理
+api_router.include_router(scheduled_router)   # 定时任务管理
+api_router.include_router(alerts_router)      # 告警规则管理
+api_router.include_router(analytics_router)   # 数据分析查询
+api_router.include_router(settings_router)    # 系统配置
+
+__all__ = ['api_router']
+
+

jettask/api/v1/alerts.py

@@ -0,0 +1,226 @@
+"""
+告警管理路由
+提供轻量级的路由入口，业务逻辑在 AlertService 中实现
+"""
+from fastapi import APIRouter, HTTPException, Query
+from typing import Optional
+import logging
+
+from jettask.schemas import AlertRuleRequest
+from jettask.services.alert_service import AlertService
+
+router = APIRouter(prefix="/alerts", tags=["alerts"])
+logger = logging.getLogger(__name__)
+
+
+@router.get("/rules")
+async def get_alert_rules(
+    page: int = Query(1, ge=1),
+    page_size: int = Query(20, ge=1, le=100),
+    is_active: Optional[bool] = None
+):
+    """
+    获取告警规则列表
+    
+    Args:
+        page: 页码（从1开始）
+        page_size: 每页数量
+        is_active: 是否只返回激活的规则
+    """
+    try:
+        return AlertService.get_alert_rules(page, page_size, is_active)
+    except Exception as e:
+        logger.error(f"获取告警规则列表失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/rules", status_code=201)
+async def create_alert_rule(request: AlertRuleRequest):
+    """
+    创建告警规则
+    
+    Args:
+        request: 告警规则请求数据
+    """
+    try:
+        return AlertService.create_alert_rule(request)
+    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("/rules/{rule_id}")
+async def update_alert_rule(rule_id: str, request: AlertRuleRequest):
+    """
+    更新告警规则
+    
+    Args:
+        rule_id: 规则ID
+        request: 告警规则请求数据
+    """
+    try:
+        return AlertService.update_alert_rule(rule_id, request)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"更新告警规则失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.delete("/rules/{rule_id}")
+async def delete_alert_rule(rule_id: str):
+    """
+    删除告警规则
+    
+    Args:
+        rule_id: 规则ID
+    """
+    try:
+        return AlertService.delete_alert_rule(rule_id)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"删除告警规则失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/rules/{rule_id}/toggle")
+async def toggle_alert_rule(rule_id: str):
+    """
+    启用/禁用告警规则
+    
+    Args:
+        rule_id: 规则ID
+    """
+    try:
+        return AlertService.toggle_alert_rule(rule_id)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"切换告警规则状态失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.get("/rules/{rule_id}/history")
+async def get_alert_history(
+    rule_id: str,
+    page: int = Query(1, ge=1),
+    page_size: int = Query(20, ge=1, le=100)
+):
+    """
+    获取告警触发历史
+    
+    Args:
+        rule_id: 规则ID
+        page: 页码（从1开始）
+        page_size: 每页数量
+    """
+    try:
+        return AlertService.get_alert_history(rule_id, page, page_size)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"获取告警历史失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/rules/{rule_id}/test")
+async def test_alert_rule(rule_id: str):
+    """
+    测试告警规则（发送测试通知）
+    
+    Args:
+        rule_id: 规则ID
+    """
+    try:
+        return AlertService.test_alert_rule(rule_id)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"测试告警规则失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+# ============ 告警统计接口 ============
+
+@router.get("/statistics")
+async def get_alert_statistics(
+    namespace: Optional[str] = Query(None, description="命名空间名称")
+):
+    """
+    获取告警统计信息
+    
+    Args:
+        namespace: 命名空间名称（可选）
+    """
+    try:
+        return AlertService.get_alert_statistics(namespace)
+    except Exception as e:
+        logger.error(f"获取告警统计信息失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+# ============ 活跃告警管理 ============
+
+@router.get("/active")
+async def get_active_alerts(
+    namespace: Optional[str] = Query(None, description="命名空间名称")
+):
+    """
+    获取当前活跃的告警
+    
+    Args:
+        namespace: 命名空间名称（可选）
+    """
+    try:
+        return AlertService.get_active_alerts(namespace)
+    except Exception as e:
+        logger.error(f"获取活跃告警失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/active/{alert_id}/acknowledge")
+async def acknowledge_alert(
+    alert_id: str,
+    user: str = Query("system", description="确认用户")
+):
+    """
+    确认告警
+    
+    Args:
+        alert_id: 告警ID
+        user: 确认用户
+    """
+    try:
+        return AlertService.acknowledge_alert(alert_id, user)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"确认告警失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+@router.post("/active/{alert_id}/resolve")
+async def resolve_alert(
+    alert_id: str,
+    resolution_note: Optional[str] = Query(None, description="解决说明")
+):
+    """
+    解决告警
+    
+    Args:
+        alert_id: 告警ID
+        resolution_note: 解决说明（可选）
+    """
+    try:
+        return AlertService.resolve_alert(alert_id, resolution_note)
+    except ValueError as e:
+        raise HTTPException(status_code=404, detail=str(e))
+    except Exception as e:
+        logger.error(f"解决告警失败: {e}")
+        raise HTTPException(status_code=500, detail=str(e))
+
+
+__all__ = ['router']