jettask 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

jettask/pg_consumer/sql/migrate_to_new_structure.sql

@@ -0,0 +1,179 @@
+-- 数据迁移脚本
+-- 从旧的单表结构迁移到新的双表结构
+
+BEGIN;
+
+-- 1. 先备份原表（如果存在）
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'tasks') THEN
+        -- 如果tasks表已存在，重命名为备份表
+        IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'tasks_backup') THEN
+            ALTER TABLE tasks RENAME TO tasks_backup;
+        ELSE
+            -- 如果备份表已存在，创建带时间戳的备份
+            EXECUTE format('ALTER TABLE tasks RENAME TO tasks_backup_%s', 
+                          to_char(now(), 'YYYYMMDD_HH24MISS'));
+        END IF;
+    END IF;
+END $$;
+
+-- 2. 执行创建新表的SQL（引用create_new_tables.sql的内容）
+-- 注意：在实际使用时，应该先运行create_new_tables.sql
+
+-- 3. 如果有旧数据，进行数据迁移
+DO $$
+BEGIN
+    -- 检查是否有备份表
+    IF EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'tasks_backup') THEN
+        -- 迁移任务基础信息到新的tasks表
+        INSERT INTO tasks (
+            stream_id,
+            queue,
+            task_name,
+            task_type,
+            payload,
+            priority,
+            created_at,
+            scheduled_at,
+            status,
+            source,
+            metadata
+        )
+        SELECT 
+            COALESCE(task_id, 'unknown-' || id::text) as stream_id,  -- 使用task_id作为stream_id
+            COALESCE(queue_name, 'default') as queue,
+            COALESCE(task_name, 'unknown') as task_name,
+            task_type,
+            COALESCE(task_data, '{}'::jsonb) as payload,
+            COALESCE(priority, 0) as priority,
+            created_at,
+            trigger_time as scheduled_at,
+            CASE 
+                WHEN status IN ('pending', 'running', 'completed', 'failed') THEN status
+                WHEN status = 'success' THEN 'completed'
+                ELSE 'pending'
+            END as status,
+            'migration' as source,
+            jsonb_build_object(
+                'migrated_at', now(),
+                'original_id', id,
+                'original_status', status
+            ) as metadata
+        FROM tasks_backup
+        ON CONFLICT (stream_id) DO NOTHING;  -- 避免重复
+
+        -- 迁移执行记录到task_runs表
+        -- 由于旧表是单表结构，我们为每个任务创建一条运行记录
+        INSERT INTO task_runs (
+            task_id,
+            stream_id,
+            consumer_group,
+            consumer_name,
+            worker_id,
+            status,
+            start_time,
+            end_time,
+            retry_count,
+            error_message,
+            result
+        )
+        SELECT 
+            t.id as task_id,
+            t.stream_id,
+            'default_group' as consumer_group,  -- 默认消费者组
+            tb.consumer as consumer_name,
+            tb.consumer as worker_id,
+            CASE 
+                WHEN tb.status = 'success' THEN 'success'
+                WHEN tb.status IN ('failed', 'error') THEN 'failed'
+                WHEN tb.status = 'running' THEN 'running'
+                WHEN tb.status = 'timeout' THEN 'timeout'
+                ELSE 'pending'
+            END as status,
+            tb.started_at as start_time,
+            tb.completed_at as end_time,
+            COALESCE(tb.retry_count, 0) as retry_count,
+            tb.error as error_message,
+            tb.result
+        FROM tasks_backup tb
+        JOIN tasks t ON t.stream_id = COALESCE(tb.task_id, 'unknown-' || tb.id::text)
+        WHERE tb.status IS NOT NULL;
+
+        RAISE NOTICE 'Data migration completed successfully';
+    ELSE
+        RAISE NOTICE 'No backup table found, skipping data migration';
+    END IF;
+END $$;
+
+-- 4. 创建兼容性视图（可选）
+-- 如果有代码依赖旧的表结构，可以创建视图提供兼容性
+CREATE OR REPLACE VIEW tasks_legacy AS
+SELECT 
+    t.id,
+    t.stream_id as task_id,
+    t.queue as queue_name,
+    t.task_name,
+    t.task_type,
+    t.payload as task_data,
+    t.priority,
+    tr.consumer_name as consumer,
+    tr.status,
+    tr.start_time as started_at,
+    tr.end_time as completed_at,
+    tr.retry_count,
+    tr.error_message as error,
+    tr.result,
+    t.created_at,
+    tr.updated_at,
+    t.scheduled_at as trigger_time
+FROM tasks t
+LEFT JOIN task_runs tr ON t.id = tr.task_id 
+    AND tr.consumer_group = 'default_group';  -- 兼容旧代码，只显示默认组
+
+-- 5. 更新序列（如果需要）
+DO $$
+DECLARE
+    max_id BIGINT;
+BEGIN
+    -- 获取最大ID
+    SELECT COALESCE(MAX(id), 0) INTO max_id FROM tasks;
+    -- 更新序列
+    IF max_id > 0 THEN
+        EXECUTE format('ALTER SEQUENCE tasks_id_seq RESTART WITH %s', max_id + 1);
+    END IF;
+    
+    SELECT COALESCE(MAX(id), 0) INTO max_id FROM task_runs;
+    IF max_id > 0 THEN
+        EXECUTE format('ALTER SEQUENCE task_runs_id_seq RESTART WITH %s', max_id + 1);
+    END IF;
+END $$;
+
+COMMIT;
+
+-- 6. 验证迁移结果
+SELECT 
+    'Tasks Table' as table_name,
+    COUNT(*) as row_count
+FROM tasks
+UNION ALL
+SELECT 
+    'Task Runs Table' as table_name,
+    COUNT(*) as row_count
+FROM task_runs
+UNION ALL
+SELECT 
+    'Original Backup Table' as table_name,
+    COUNT(*) as row_count
+FROM tasks_backup
+WHERE EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 'tasks_backup');
+
+-- 显示迁移统计
+SELECT 
+    'Migration Summary' as info,
+    jsonb_build_object(
+        'total_tasks', (SELECT COUNT(*) FROM tasks),
+        'total_runs', (SELECT COUNT(*) FROM task_runs),
+        'unique_consumer_groups', (SELECT COUNT(DISTINCT consumer_group) FROM task_runs),
+        'migration_time', now()
+    ) as details;

jettask/pg_consumer/sql/modify_time_fields.sql

@@ -0,0 +1,69 @@
+-- 修改task_runs表的时间字段，改为存储秒数而不是毫秒
+-- 1. 重命名字段并修改类型
+-- 2. 将已有的毫秒数据转换为秒
+
+DO $$ 
+BEGIN
+    -- 处理duration_ms字段
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'duration_ms'
+    ) THEN
+        -- 如果duration字段不存在，创建它
+        IF NOT EXISTS (
+            SELECT 1 FROM information_schema.columns 
+            WHERE table_name = 'task_runs' AND column_name = 'duration'
+        ) THEN
+            ALTER TABLE task_runs ADD COLUMN duration DOUBLE PRECISION;
+        END IF;
+        
+        -- 将毫秒转换为秒
+        UPDATE task_runs 
+        SET duration = duration_ms / 1000.0 
+        WHERE duration_ms IS NOT NULL AND duration IS NULL;
+        
+        -- 删除旧字段
+        ALTER TABLE task_runs DROP COLUMN IF EXISTS duration_ms;
+    END IF;
+    
+    -- 处理execution_time_ms字段
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'execution_time_ms'
+    ) THEN
+        -- 如果execution_time字段不存在，创建它
+        IF NOT EXISTS (
+            SELECT 1 FROM information_schema.columns 
+            WHERE table_name = 'task_runs' AND column_name = 'execution_time'
+        ) THEN
+            ALTER TABLE task_runs ADD COLUMN execution_time DOUBLE PRECISION;
+        END IF;
+        
+        -- 将毫秒转换为秒
+        UPDATE task_runs 
+        SET execution_time = execution_time_ms / 1000.0 
+        WHERE execution_time_ms IS NOT NULL AND execution_time IS NULL;
+        
+        -- 删除旧字段
+        ALTER TABLE task_runs DROP COLUMN IF EXISTS execution_time_ms;
+    END IF;
+    
+    -- 如果字段已经是正确的格式，确保它们存在
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'duration'
+    ) THEN
+        ALTER TABLE task_runs ADD COLUMN duration DOUBLE PRECISION;
+    END IF;
+    
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.columns 
+        WHERE table_name = 'task_runs' AND column_name = 'execution_time'
+    ) THEN
+        ALTER TABLE task_runs ADD COLUMN execution_time DOUBLE PRECISION;
+    END IF;
+END $$;
+
+-- 添加注释
+COMMENT ON COLUMN task_runs.duration IS '总耗时（秒），从任务创建到执行完成的时间';
+COMMENT ON COLUMN task_runs.execution_time IS '实际执行时间（秒），从任务开始执行到执行完成的时间';

jettask/webui/frontend/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "jettask-monitor",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "@ant-design/charts": "^2.6.1",
+    "@ant-design/colors": "^7.2.1",
+    "@ant-design/cssinjs": "^1.24.0",
+    "@ant-design/icons": "^5.0.1",
+    "@ant-design/plots": "^2.6.3",
+    "@ant-design/pro-components": "^2.8.10",
+    "@ant-design/pro-table": "^3.21.0",
+    "antd": "^5.4.0",
+    "axios": "^1.3.4",
+    "dayjs": "^1.11.7",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.8.2",
+    "uuid": "^11.1.0"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-react": "^3.1.0",
+    "vite": "^4.1.4"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  }
+}

jettask/webui/frontend/src/App.css

@@ -0,0 +1,109 @@
+/* 全局样式重置 */
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+html, body, #root {
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* 页面容器样式 */
+.page-container {
+  padding: 24px;
+  height: 100%;
+  overflow: auto;
+  background: #f0f2f5;
+}
+
+/* 页面内容包装器 - 用于需要padding的页面 */
+.page-wrapper {
+  padding: 24px;
+  height: 100%;
+  overflow: auto;
+  background: #f0f2f5;
+}
+
+.page-header {
+  background: #fff;
+  padding: 16px 24px;
+  border-radius: 4px;
+  margin-bottom: 16px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
+}
+
+.page-title {
+  margin: 0;
+  font-size: 20px;
+  font-weight: 500;
+  color: #262626;
+}
+
+/* 卡片样式优化 */
+.ant-card {
+  border-radius: 4px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
+}
+
+/* 表格样式优化 */
+.ant-table {
+  font-size: 13px;
+}
+
+.ant-table-thead > tr > th {
+  background: #fafafa;
+  font-weight: 600;
+}
+
+/* 按钮样式优化 */
+.ant-btn {
+  border-radius: 4px;
+  font-weight: 400;
+}
+
+/* 滚动条统一样式 */
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f0f0f0;
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #bfbfbf;
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: #8c8c8c;
+}
+
+/* 动画效果 */
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.fade-in {
+  animation: fadeIn 0.3s ease-in-out;
+}

jettask/webui/frontend/src/App.jsx

@@ -0,0 +1,66 @@
+import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom'
+import { ConfigProvider, theme } from 'antd'
+import zhCN from 'antd/locale/zh_CN'
+import AppLayout from './components/layout/AppLayout'
+import Dashboard from './pages/Dashboard'
+import Queues from './pages/Queues'
+import Workers from './pages/Workers'
+import QueueDetail from './pages/QueueDetail'
+import ScheduledTasks from './pages/ScheduledTasks'
+import Alerts from './pages/Alerts'
+import Settings from './pages/Settings'
+import { LoadingProvider } from './contexts/LoadingContext'
+import { NamespaceProvider } from './contexts/NamespaceContext'
+import './App.css'
+
+function App() {
+  // 自定义主题
+  const customTheme = {
+    algorithm: theme.defaultAlgorithm,
+    token: {
+      colorPrimary: '#1890ff',
+      borderRadius: 4,
+      colorBgContainer: '#ffffff',
+    },
+    components: {
+      Layout: {
+        siderBg: '#1a1d21',
+        headerBg: '#2a2d31',
+      },
+      Menu: {
+        darkItemBg: 'transparent',
+        darkItemSelectedBg: '#1890ff',
+        darkItemHoverBg: 'rgba(24, 144, 255, 0.1)',
+      },
+    },
+  }
+
+  return (
+    <ConfigProvider theme={customTheme} locale={zhCN}>
+      <LoadingProvider>
+        <NamespaceProvider>
+          <Router>
+            <Routes>
+              <Route path="/" element={<AppLayout />}>
+                <Route index element={<Navigate to="/dashboard" replace />} />
+                <Route path="dashboard" element={<Dashboard />} />
+                <Route path="queues" element={<Queues />} />
+                <Route path="queue/:queueName" element={<QueueDetail />} />
+                <Route path="scheduled-tasks" element={<ScheduledTasks />} />
+                <Route path="alerts" element={<Alerts />} />
+                {/* 新增路由 */}
+                <Route path="analytics" element={<div style={{ padding: 24 }}>数据分析页面开发中...</div>} />
+                <Route path="performance" element={<div style={{ padding: 24 }}>性能监控页面开发中...</div>} />
+                <Route path="logs" element={<div style={{ padding: 24 }}>日志查询页面开发中...</div>} />
+                <Route path="api-docs" element={<div style={{ padding: 24 }}>API文档页面开发中...</div>} />
+                <Route path="settings" element={<Settings />} />
+              </Route>
+            </Routes>
+          </Router>
+        </NamespaceProvider>
+      </LoadingProvider>
+    </ConfigProvider>
+  )
+}
+
+export default App

jettask/webui/frontend/src/components/NamespaceSelector.jsx

@@ -0,0 +1,166 @@
+/**
+ * 命名空间选择器组件
+ * 放置在页面顶部，用于切换不同的命名空间
+ */
+import React, { useState, useEffect } from 'react';
+import { Select, Space, Tag, Tooltip, message, Button, Dropdown, Modal } from 'antd';
+import { DatabaseOutlined, CloudServerOutlined, SettingOutlined, PlusOutlined, EditOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { useNavigate } from 'react-router-dom';
+import { useNamespace } from '../contexts/NamespaceContext';
+
+const { Option } = Select;
+
+const NamespaceSelector = ({ value, onChange, style }) => {
+  const [namespaces, setNamespaces] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const navigate = useNavigate();
+  const { refreshTrigger } = useNamespace();  // 获取刷新触发器
+
+  // 获取命名空间列表
+  const fetchNamespaces = async () => {
+    setLoading(true);
+    try {
+      const response = await fetch('/api/data/namespaces');
+      if (response.ok) {
+        const data = await response.json();
+        setNamespaces(data);
+        
+        // 如果没有选中的命名空间，默认选中第一个
+        if (!value && data.length > 0) {
+          const firstNamespace = data[0].name;
+          if (onChange) {
+            onChange(firstNamespace);
+          }
+        } else if (data.length === 0) {
+          // 如果没有任何命名空间，弹出提示并引导到管理页面
+          showNoNamespaceModal();
+        }
+      } else {
+        message.error('获取命名空间列表失败');
+      }
+    } catch (error) {
+      console.error('获取命名空间失败:', error);
+      message.error('连接任务中心失败');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 组件挂载时获取命名空间列表，以及当refreshTrigger变化时刷新
+  useEffect(() => {
+    fetchNamespaces();
+  }, [refreshTrigger]);  // 监听刷新触发器而不是value
+
+  // 处理命名空间切换
+  const handleNamespaceChange = (namespaceName) => {
+    console.log('🔧 NamespaceSelector切换命名空间:', namespaceName);
+    console.log('🔧 当前props.value:', value);
+    console.log('🔧 onChange函数存在:', !!onChange);
+    
+    if (onChange) {
+      onChange(namespaceName);
+      console.log('🔧 已调用onChange函数');
+    }
+    message.success(`已切换到命名空间: ${namespaceName}`);
+  };
+
+  // 显示无命名空间提示弹窗
+  const showNoNamespaceModal = () => {
+    Modal.confirm({
+      title: '暂无可用命名空间',
+      icon: <ExclamationCircleOutlined />,
+      content: '当前系统中没有配置任何命名空间，请先创建一个命名空间。',
+      okText: '去管理命名空间',
+      cancelText: '取消',
+      onOk: () => {
+        navigate('/settings');
+      },
+    });
+  };
+
+  // 获取命名空间标签颜色
+  const getNamespaceTagColor = (name) => {
+    if (name === 'default') return 'blue';
+    if (name.includes('test')) return 'orange';
+    if (name.includes('prod')) return 'green';
+    if (name.includes('dev')) return 'purple';
+    return 'default';
+  };
+
+
+  return (
+    <Space style={{ ...style }}>
+      <span style={{ color: 'rgba(255, 255, 255, 0.65)', fontSize: '14px' }}>
+        <DatabaseOutlined style={{ marginRight: '6px' }} />
+        命名空间:
+      </span>
+      
+      <Select
+        value={value}
+        onChange={handleNamespaceChange}
+        loading={loading}
+        style={{ minWidth: 200 }}
+        placeholder="请选择命名空间"
+        showSearch
+        optionFilterProp="children"
+        filterOption={(input, option) =>
+          option.children.props.children[1]?.toLowerCase().includes(input.toLowerCase())
+        }
+        dropdownRender={(menu) => (
+          <>
+            {menu}
+            <div 
+              style={{ 
+                padding: '8px 12px', 
+                textAlign: 'center', 
+                borderTop: '1px solid #f0f0f0',
+                cursor: 'pointer'
+              }}
+              onClick={(e) => {
+                e.stopPropagation();
+                e.preventDefault();
+                console.log('🔧 点击管理命名空间区域');
+                navigate('/settings');
+              }}
+            >
+              <SettingOutlined style={{ marginRight: 4 }} />
+              管理命名空间
+            </div>
+          </>
+        )}
+      >
+        {namespaces.map(ns => (
+          <Option key={ns.name} value={ns.name}>
+            <Space>
+              <Tag color={getNamespaceTagColor(ns.name)} style={{ margin: 0 }}>
+                {ns.name}
+              </Tag>
+              {ns.description && (
+                <Tooltip title={ns.description}>
+                  <span style={{ color: '#999', fontSize: '12px' }}>
+                    {ns.description.length > 20 
+                      ? `${ns.description.substring(0, 20)}...` 
+                      : ns.description}
+                  </span>
+                </Tooltip>
+              )}
+            </Space>
+          </Option>
+        ))}
+      </Select>
+
+      {value && (
+        <Tooltip title={`当前命名空间: ${value}`}>
+          <CloudServerOutlined 
+            style={{ 
+              color: '#52c41a', 
+              fontSize: '16px'
+            }} 
+          />
+        </Tooltip>
+      )}
+    </Space>
+  );
+};
+
+export default NamespaceSelector;