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

jettask/schemas/namespace.py

@@ -0,0 +1,168 @@
+"""
+命名空间相关的数据模型
+"""
+from typing import Optional, Dict, Any, List
+from datetime import datetime
+from pydantic import BaseModel, Field
+from enum import Enum
+
+
+class ConfigMode(str, Enum):
+    """配置模式枚举"""
+    DIRECT = "direct"  # 直接配置模式（自由输入）
+    NACOS = "nacos"    # Nacos配置模式
+
+
+class NamespaceCreate(BaseModel):
+    """创建命名空间请求模型"""
+    name: str = Field(..., description="命名空间名称")
+    description: Optional[str] = Field(None, description="命名空间描述")
+    
+    # 配置模式
+    config_mode: ConfigMode = Field(ConfigMode.DIRECT, description="配置模式: direct(直接配置) 或 nacos(Nacos配置)")
+    
+    # Redis配置 - 支持两种方式
+    # 方式1: 直接配置字符串 (格式: redis://[password@]host:port/db)
+    redis_url: Optional[str] = Field(None, description="Redis连接字符串，格式: redis://[password@]host:port/db")
+    # 方式2: Nacos配置键
+    redis_nacos_key: Optional[str] = Field(None, description="Redis连接字符串的Nacos配置键")
+    
+    # PostgreSQL配置 - 支持两种方式
+    # 方式1: 直接配置字符串 (格式: postgresql://user:password@host:port/database)
+    pg_url: Optional[str] = Field(None, description="PostgreSQL连接字符串，格式: postgresql://user:password@host:port/database")
+    # 方式2: Nacos配置键
+    pg_nacos_key: Optional[str] = Field(None, description="PostgreSQL连接字符串的Nacos配置键")
+
+
+class NamespaceUpdate(BaseModel):
+    """更新命名空间请求模型"""
+    description: Optional[str] = Field(None, description="命名空间描述")
+    
+    # 配置模式
+    config_mode: Optional[ConfigMode] = Field(None, description="配置模式: direct(直接配置) 或 nacos(Nacos配置)")
+    
+    # Redis配置 - 支持两种方式
+    redis_url: Optional[str] = Field(None, description="Redis连接字符串，格式: redis://[password@]host:port/db")
+    redis_nacos_key: Optional[str] = Field(None, description="Redis连接字符串的Nacos配置键")
+    
+    # PostgreSQL配置 - 支持两种方式
+    pg_url: Optional[str] = Field(None, description="PostgreSQL连接字符串，格式: postgresql://user:password@host:port/database")
+    pg_nacos_key: Optional[str] = Field(None, description="PostgreSQL连接字符串的Nacos配置键")
+    
+    enabled: Optional[bool] = Field(None, description="是否启用")
+
+
+class NamespaceResponse(BaseModel):
+    """命名空间响应模型"""
+    name: str = Field(..., description="命名空间名称")
+    description: Optional[str] = Field(None, description="命名空间描述")
+    
+    # Redis配置信息 - 只返回最终的URL
+    redis_url: str = Field(..., description="Redis连接字符串")
+    
+    # PostgreSQL配置信息 - 只返回最终的URL
+    pg_url: Optional[str] = Field(None, description="PostgreSQL连接字符串")
+    
+    # 连接信息
+    connection_url: str = Field(..., description="用于连接此命名空间的URL路径")
+    version: int = Field(default=1, description="配置版本号")
+    
+    enabled: bool = Field(..., description="是否启用")
+    created_at: datetime = Field(..., description="创建时间")
+    updated_at: Optional[datetime] = Field(None, description="更新时间")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class NamespaceInfo(BaseModel):
+    """命名空间详细信息模型"""
+    name: str = Field(..., description="命名空间名称")
+    description: Optional[str] = Field(None, description="命名空间描述")
+    redis_config: Dict[str, Any] = Field(..., description="Redis配置")
+    status: str = Field(..., description="状态")
+    enabled: bool = Field(default=True, description="是否启用")
+    created_at: datetime = Field(..., description="创建时间")
+    updated_at: Optional[datetime] = Field(None, description="更新时间")
+    last_activity: Optional[datetime] = Field(None, description="最后活动时间")
+    
+    # 统计信息
+    total_queues: int = Field(default=0, description="总队列数")
+    total_tasks: int = Field(default=0, description="总任务数")
+    active_workers: int = Field(default=0, description="活跃工作节点数")
+    pending_tasks: int = Field(default=0, description="待处理任务数")
+    processing_tasks: int = Field(default=0, description="处理中任务数")
+    completed_tasks: int = Field(default=0, description="已完成任务数")
+    failed_tasks: int = Field(default=0, description="失败任务数")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class NamespaceCreateRequest(BaseModel):
+    """命名空间创建请求模型（详细版）"""
+    name: str = Field(..., min_length=1, max_length=100, description="命名空间名称")
+    display_name: Optional[str] = Field(None, max_length=200, description="显示名称")
+    description: Optional[str] = Field(None, max_length=1000, description="命名空间描述")
+    
+    # Redis连接配置
+    redis_host: str = Field(..., description="Redis主机地址")
+    redis_port: int = Field(..., ge=1, le=65535, description="Redis端口号")
+    redis_db: int = Field(default=0, ge=0, le=15, description="Redis数据库编号")
+    redis_password: Optional[str] = Field(None, description="Redis密码")
+    redis_ssl: bool = Field(default=False, description="是否使用SSL连接")
+    redis_ssl_cert_reqs: Optional[str] = Field(None, description="SSL证书验证")
+    redis_ssl_ca_certs: Optional[str] = Field(None, description="SSL CA证书路径")
+    redis_ssl_certfile: Optional[str] = Field(None, description="SSL客户端证书路径")
+    redis_ssl_keyfile: Optional[str] = Field(None, description="SSL私钥路径")
+    
+    # 连接池配置
+    redis_max_connections: int = Field(default=50, ge=1, le=1000, description="最大连接数")
+    redis_connection_timeout: int = Field(default=30, ge=1, description="连接超时（秒）")
+    redis_socket_timeout: int = Field(default=30, ge=1, description="套接字超时（秒）")
+    
+    # 业务配置
+    default_queue_prefix: str = Field(default="task", description="默认队列前缀")
+    max_queue_size: Optional[int] = Field(None, ge=1, description="队列最大大小")
+    task_ttl: int = Field(default=86400, ge=60, description="任务TTL（秒）")
+    result_ttl: int = Field(default=3600, ge=60, description="结果TTL（秒）")
+    
+    # 其他设置
+    enabled: bool = Field(default=True, description="是否启用")
+    auto_create_queues: bool = Field(default=True, description="是否自动创建队列")
+    tags: List[str] = Field(default=[], description="标签列表")
+    metadata: Dict[str, Any] = Field(default={}, description="元数据")
+
+
+class NamespaceUpdateRequest(BaseModel):
+    """命名空间更新请求模型（详细版）"""
+    display_name: Optional[str] = Field(None, max_length=200, description="显示名称")
+    description: Optional[str] = Field(None, max_length=1000, description="命名空间描述")
+    
+    # Redis连接配置
+    redis_host: Optional[str] = Field(None, description="Redis主机地址")
+    redis_port: Optional[int] = Field(None, ge=1, le=65535, description="Redis端口号")
+    redis_db: Optional[int] = Field(None, ge=0, le=15, description="Redis数据库编号")
+    redis_password: Optional[str] = Field(None, description="Redis密码")
+    redis_ssl: Optional[bool] = Field(None, description="是否使用SSL连接")
+    
+    # 连接池配置
+    redis_max_connections: Optional[int] = Field(None, ge=1, le=1000, description="最大连接数")
+    redis_connection_timeout: Optional[int] = Field(None, ge=1, description="连接超时（秒）")
+    redis_socket_timeout: Optional[int] = Field(None, ge=1, description="套接字超时（秒）")
+    
+    # 业务配置
+    default_queue_prefix: Optional[str] = Field(None, description="默认队列前缀")
+    max_queue_size: Optional[int] = Field(None, ge=1, description="队列最大大小")
+    task_ttl: Optional[int] = Field(None, ge=60, description="任务TTL（秒）")
+    result_ttl: Optional[int] = Field(None, ge=60, description="结果TTL（秒）")
+    
+    # 其他设置
+    enabled: Optional[bool] = Field(None, description="是否启用")
+    auto_create_queues: Optional[bool] = Field(None, description="是否自动创建队列")
+    tags: Optional[List[str]] = Field(None, description="标签列表")
+    metadata: Optional[Dict[str, Any]] = Field(None, description="元数据")

jettask/schemas/queue.py

@@ -0,0 +1,83 @@
+"""
+队列相关的数据模型
+"""
+from typing import Optional, List, Dict, Any
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+
+class TimeRangeQuery(BaseModel):
+    """时间范围查询模型"""
+    queues: Optional[List[str]] = Field(None, description="队列名称列表，为空时统计所有队列")
+    time_range: Optional[str] = Field(None, description="时间范围（如 '1h', '24h', '7d'），与 start_time/end_time 二选一")
+    start_time: Optional[str] = Field(None, description="开始时间，与 time_range 二选一")
+    end_time: Optional[str] = Field(None, description="结束时间，与 time_range 二选一")
+    interval: Optional[str] = Field(default="1h", description="时间间隔")
+
+
+class QueueStatsResponse(BaseModel):
+    """队列统计响应模型"""
+    queue_name: str = Field(..., description="队列名称")
+    pending_count: int = Field(default=0, description="待处理任务数")
+    processing_count: int = Field(default=0, description="处理中任务数")
+    completed_count: int = Field(default=0, description="已完成任务数")
+    failed_count: int = Field(default=0, description="失败任务数")
+    success_rate: float = Field(default=0.0, description="成功率")
+    avg_processing_time: Optional[float] = Field(None, description="平均处理时间")
+
+
+class QueueTimelineResponse(BaseModel):
+    """队列时间线响应模型"""
+    queue_name: str = Field(..., description="队列名称")
+    timeline: List[Dict[str, Any]] = Field(default=[], description="时间线数据")
+
+
+class TrimQueueRequest(BaseModel):
+    """修剪队列请求模型"""
+    queue_name: str = Field(..., description="队列名称")
+    max_length: int = Field(..., ge=1, description="最大长度")
+    trim_strategy: str = Field(default="oldest", description="修剪策略", pattern="^(oldest|newest)$")
+
+
+class QueueInfo(BaseModel):
+    """队列信息模型"""
+    name: str = Field(..., description="队列名称")
+    namespace: str = Field(..., description="命名空间")
+    pending_count: int = Field(default=0, description="待处理任务数")
+    processing_count: int = Field(default=0, description="处理中任务数")
+    completed_count: int = Field(default=0, description="已完成任务数")
+    failed_count: int = Field(default=0, description="失败任务数")
+    created_at: Optional[datetime] = Field(None, description="创建时间")
+    updated_at: Optional[datetime] = Field(None, description="更新时间")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class QueueStats(BaseModel):
+    """队列统计模型"""
+    queue_name: str = Field(..., description="队列名称")
+    total_tasks: int = Field(default=0, description="总任务数")
+    pending_tasks: int = Field(default=0, description="待处理任务数")
+    processing_tasks: int = Field(default=0, description="处理中任务数")
+    completed_tasks: int = Field(default=0, description="已完成任务数")
+    failed_tasks: int = Field(default=0, description="失败任务数")
+    success_rate: float = Field(default=0.0, description="成功率")
+    avg_processing_time: Optional[float] = Field(None, description="平均处理时间")
+    throughput: Optional[float] = Field(None, description="吞吐量（任务/秒）")
+    last_activity: Optional[datetime] = Field(None, description="最后活动时间")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class QueueActionRequest(BaseModel):
+    """队列操作请求模型"""
+    queue_names: List[str] = Field(..., min_items=1, description="队列名称列表")
+    action: str = Field(..., description="操作类型", pattern="^(pause|resume|clear|delete)$")
+    reason: Optional[str] = Field(None, description="操作原因")
+    force: bool = Field(default=False, description="是否强制执行")

jettask/schemas/scheduled_task.py

@@ -0,0 +1,128 @@
+"""
+定时任务相关的数据模型
+"""
+from typing import Optional, Dict, Any
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+
+class ScheduleConfig(BaseModel):
+    """调度配置模型"""
+    schedule_type: str = Field(..., description="调度类型", pattern="^(cron|interval)$")
+    cron_expression: Optional[str] = Field(None, description="Cron表达式（当schedule_type为cron时）")
+    interval_seconds: Optional[int] = Field(None, ge=1, description="间隔秒数（当schedule_type为interval时）")
+    timezone: str = Field(default="UTC", description="时区")
+    max_instances: int = Field(default=1, ge=1, description="最大实例数")
+    
+    def validate_schedule_config(self):
+        """验证调度配置"""
+        if self.schedule_type == "cron" and not self.cron_expression:
+            raise ValueError("Cron类型调度必须提供cron_expression")
+        if self.schedule_type == "interval" and not self.interval_seconds:
+            raise ValueError("Interval类型调度必须提供interval_seconds")
+
+
+class ScheduledTaskRequest(BaseModel):
+    """定时任务请求模型"""
+    task_name: str = Field(..., description="任务名称")
+    task_function: str = Field(..., description="任务函数")
+    schedule_config: ScheduleConfig = Field(..., description="调度配置")
+    task_args: Optional[list] = Field(default=[], description="任务参数")
+    task_kwargs: Optional[Dict[str, Any]] = Field(default={}, description="任务关键字参数")
+    queue_name: Optional[str] = Field(None, description="队列名称")
+    priority: int = Field(default=0, description="优先级")
+    enabled: bool = Field(default=True, description="是否启用")
+    description: Optional[str] = Field(None, description="任务描述")
+
+
+class ScheduledTaskCreate(BaseModel):
+    """创建定时任务请求模型"""
+    name: str = Field(..., description="任务名称")
+    task_function: str = Field(..., description="任务函数")
+    schedule_type: str = Field(..., description="调度类型", pattern="^(cron|interval)$")
+    cron_expression: Optional[str] = Field(None, description="Cron表达式")
+    interval_seconds: Optional[int] = Field(None, ge=1, description="间隔秒数")
+    task_args: Optional[list] = Field(default=[], description="任务参数")
+    task_kwargs: Optional[Dict[str, Any]] = Field(default={}, description="任务关键字参数")
+    enabled: bool = Field(default=True, description="是否启用")
+    description: Optional[str] = Field(None, description="任务描述")
+
+
+class ScheduledTaskUpdate(BaseModel):
+    """更新定时任务请求模型"""
+    name: Optional[str] = Field(None, description="任务名称")
+    task_function: Optional[str] = Field(None, description="任务函数")
+    schedule_type: Optional[str] = Field(None, description="调度类型")
+    cron_expression: Optional[str] = Field(None, description="Cron表达式")
+    interval_seconds: Optional[int] = Field(None, ge=1, description="间隔秒数")
+    task_args: Optional[list] = Field(None, description="任务参数")
+    task_kwargs: Optional[Dict[str, Any]] = Field(None, description="任务关键字参数")
+    enabled: Optional[bool] = Field(None, description="是否启用")
+    description: Optional[str] = Field(None, description="任务描述")
+
+
+class ScheduledTaskCreateRequest(BaseModel):
+    """定时任务创建请求模型（详细版）"""
+    task_name: str = Field(..., min_length=1, max_length=255, description="任务名称")
+    task_function: str = Field(..., min_length=1, description="任务函数路径")
+    schedule_type: str = Field(..., description="调度类型", pattern="^(cron|interval|once)$")
+    cron_expression: Optional[str] = Field(None, description="Cron表达式")
+    interval_seconds: Optional[int] = Field(None, ge=1, le=86400*365, description="间隔秒数")
+    start_time: Optional[datetime] = Field(None, description="开始时间")
+    end_time: Optional[datetime] = Field(None, description="结束时间")
+    task_args: list = Field(default=[], description="任务参数")
+    task_kwargs: Dict[str, Any] = Field(default={}, description="任务关键字参数")
+    queue_name: Optional[str] = Field(None, description="目标队列")
+    priority: int = Field(default=0, ge=0, le=100, description="优先级")
+    max_retries: int = Field(default=3, ge=0, le=10, description="最大重试次数")
+    timeout: Optional[int] = Field(None, ge=1, description="超时时间（秒）")
+    enabled: bool = Field(default=True, description="是否启用")
+    description: Optional[str] = Field(None, max_length=1000, description="任务描述")
+
+
+class ScheduledTaskResponse(BaseModel):
+    """定时任务响应模型"""
+    id: str = Field(..., description="任务ID")
+    task_name: str = Field(..., description="任务名称")
+    task_function: str = Field(..., description="任务函数")
+    schedule_type: str = Field(..., description="调度类型")
+    next_run_time: Optional[datetime] = Field(None, description="下次运行时间")
+    last_run_time: Optional[datetime] = Field(None, description="上次运行时间")
+    status: str = Field(..., description="任务状态")
+    enabled: bool = Field(..., description="是否启用")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class ScheduledTaskInfo(BaseModel):
+    """定时任务详细信息模型"""
+    id: str = Field(..., description="任务ID")
+    task_name: str = Field(..., description="任务名称")
+    task_function: str = Field(..., description="任务函数")
+    schedule_type: str = Field(..., description="调度类型")
+    cron_expression: Optional[str] = Field(None, description="Cron表达式")
+    interval_seconds: Optional[int] = Field(None, description="间隔秒数")
+    task_args: list = Field(default=[], description="任务参数")
+    task_kwargs: Dict[str, Any] = Field(default={}, description="任务关键字参数")
+    queue_name: Optional[str] = Field(None, description="队列名称")
+    priority: int = Field(default=0, description="优先级")
+    max_retries: int = Field(default=3, description="最大重试次数")
+    timeout: Optional[int] = Field(None, description="超时时间")
+    enabled: bool = Field(default=True, description="是否启用")
+    status: str = Field(..., description="任务状态")
+    created_at: datetime = Field(..., description="创建时间")
+    updated_at: Optional[datetime] = Field(None, description="更新时间")
+    next_run_time: Optional[datetime] = Field(None, description="下次运行时间")
+    last_run_time: Optional[datetime] = Field(None, description="上次运行时间")
+    run_count: int = Field(default=0, description="运行次数")
+    success_count: int = Field(default=0, description="成功次数")
+    failure_count: int = Field(default=0, description="失败次数")
+    description: Optional[str] = Field(None, description="任务描述")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }

jettask/schemas/task.py

@@ -0,0 +1,70 @@
+"""
+任务相关的数据模型
+"""
+from typing import Optional, List, Dict, Any
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+
+class TasksRequest(BaseModel):
+    """任务查询请求模型"""
+    queue_name: str = Field(..., description="队列名称")
+    page: int = Field(default=1, ge=1, description="页码")
+    page_size: int = Field(default=20, ge=1, le=100, description="每页大小")
+    filters: Optional[List[Dict]] = Field(default=[], description="筛选条件")
+    time_range: Optional[str] = Field(None, description="时间范围，如 '15m', '1h', '7d'")
+    start_time: Optional[str] = Field(None, description="开始时间")
+    end_time: Optional[str] = Field(None, description="结束时间")
+
+
+class TaskInfo(BaseModel):
+    """任务信息模型"""
+    id: str = Field(..., description="任务ID")
+    queue_name: str = Field(..., description="队列名称")
+    status: str = Field(..., description="任务状态")
+    created_at: datetime = Field(..., description="创建时间")
+    started_at: Optional[datetime] = Field(None, description="开始时间")
+    completed_at: Optional[datetime] = Field(None, description="完成时间")
+    worker_id: Optional[str] = Field(None, description="工作节点ID")
+    task_name: Optional[str] = Field(None, description="任务名称")
+    task_data: Optional[Dict[str, Any]] = Field(None, description="任务数据")
+    result: Optional[Any] = Field(None, description="任务结果")
+    error: Optional[str] = Field(None, description="错误信息")
+    retry_count: int = Field(default=0, description="重试次数")
+    execution_time: Optional[float] = Field(None, description="执行时间（秒）")
+    priority: Optional[int] = Field(None, description="优先级")
+    consumer_group: Optional[str] = Field(None, description="消费者组")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class TaskDetailResponse(BaseModel):
+    """任务详细信息响应模型"""
+    success: bool = Field(default=True, description="请求是否成功")
+    data: Optional[TaskInfo] = Field(None, description="任务详细信息")
+    error: Optional[str] = Field(None, description="错误信息")
+    
+    class Config:
+        json_encoders = {
+            datetime: lambda v: v.isoformat() if v else None
+        }
+
+
+class TaskActionRequest(BaseModel):
+    """任务操作请求模型"""
+    task_ids: List[str] = Field(..., min_items=1, description="任务ID列表")
+    action: str = Field(..., description="操作类型", pattern="^(retry|cancel|delete)$")
+    reason: Optional[str] = Field(None, description="操作原因")
+
+
+class TaskListResponse(BaseModel):
+    """任务列表响应模型"""
+    success: bool = Field(default=True, description="请求是否成功")
+    data: List[TaskInfo] = Field(default=[], description="任务列表")
+    total: int = Field(default=0, description="总记录数")
+    page: int = Field(default=1, description="当前页码")
+    page_size: int = Field(default=20, description="每页大小")
+    error: Optional[str] = Field(None, description="错误信息")

jettask/services/__init__.py

@@ -0,0 +1,24 @@
+"""
+业务逻辑服务层
+包含所有业务逻辑处理
+"""
+
+from .overview_service import OverviewService
+from .queue_service import QueueService
+from .scheduled_task_service import ScheduledTaskService
+from .alert_service import AlertService
+from .analytics_service import AnalyticsService
+from .settings_service import SettingsService
+from .task_service import TaskService
+from .redis_monitor_service import RedisMonitorService
+
+__all__ = [
+    'OverviewService',
+    'QueueService', 
+    'ScheduledTaskService',
+    'AlertService',
+    'AnalyticsService',
+    'SettingsService',
+    'TaskService',
+    'RedisMonitorService'
+]