jettask 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

jettask/core/cli.py

@@ -29,12 +29,14 @@ def cli():
 @cli.command()
 @click.option('--host', default='0.0.0.0', help='服务器监听地址')
 @click.option('--port', default=8001, type=int, help='服务器监听端口')
+@click.option('--jettask-pg-url', envvar='JETTASK_PG_URL', 
+              default='postgresql://jettask:123456@localhost:5432/jettask',
+              help='PostgreSQL连接URL')
 @click.option('--reload', is_flag=True, default=False, help='启用自动重载')
 @click.option('--log-level', default='info', 
               type=click.Choice(['debug', 'info', 'warning', 'error']),
               help='日志级别')
-@click.option('--unified', is_flag=True, default=False, help='使用统一的API路由器（实验性）')
-def api(host, port, reload, log_level, unified):
+def api(host, port, jettask_pg_url, reload, log_level):
     """启动 API 服务和监控界面
     
     示例:
@@ -42,34 +44,26 @@ def api(host, port, reload, log_level, unified):
       # 使用默认配置启动
       jettask api
       
-      # 指定端口和主机
-      jettask api --host 0.0.0.0 --port 8080
+      # 指定端口和数据库
+      jettask api --host 0.0.0.0 --port 8080 --jettask-pg-url postgresql://user:pass@host/db
+      
+      # 通过环境变量配置
+      export JETTASK_PG_URL=postgresql://jettask:123456@localhost:5432/jettask
+      jettask api
       
       # 启用开发模式（自动重载）
       jettask api --reload --log-level debug
-      
-      # 使用旧版API（不推荐）
-      jettask api --no-unified
     """
     import os
     import uvicorn
     
-    # 设置环境变量（如果需要）
-    if not os.getenv('JETTASK_PG_URL'):
-        os.environ['JETTASK_PG_URL'] = 'postgresql://jettask:123456@localhost:5432/jettask'
+    # 设置环境变量（供应用内部使用）
+    os.environ['JETTASK_PG_URL'] = jettask_pg_url
+    os.environ['TASK_CENTER_PG_URL'] = jettask_pg_url  # 兼容旧版本配置名
     
-    if not os.getenv('JETTASK_CENTER_URL'):
-        os.environ['JETTASK_CENTER_URL'] = f'http://localhost:{port}/api/namespaces/default'
-    
-    # 选择使用的应用模块
-    if unified:
-        app_module = "jettask.webui.backend.main_unified:app"
-        click.echo(f"Starting JetTask API Server (Unified Mode - Experimental) on {host}:{port}")
-        click.echo("All API endpoints are consolidated in unified_api_router.py")
-        click.echo("NOTE: This mode requires specific database schema. Use --no-unified for production.")
-    else:
-        app_module = "jettask.webui.backend.main:app"
-        click.echo(f"Starting JetTask API Server on {host}:{port}")
+    # 使用标准应用模块
+    app_module = "jettask.webui.backend.main:app"
+    click.echo(f"Starting JetTask API Server on {host}:{port}")
     
     # 显示配置信息
     click.echo("=" * 60)
@@ -77,10 +71,12 @@ def api(host, port, reload, log_level, unified):
     click.echo("=" * 60)
     click.echo(f"Host:        {host}")
     click.echo(f"Port:        {port}")
-    click.echo(f"API Mode:    {'Unified' if unified else 'Legacy'}")
     click.echo(f"Auto-reload: {reload}")
     click.echo(f"Log level:   {log_level}")
-    click.echo(f"Database:    {os.getenv('JETTASK_PG_URL', 'Not configured')}")
+    click.echo(f"Database:    {jettask_pg_url}")
+    click.echo("=" * 60)
+    click.echo(f"API Endpoint: http://{host}:{port}/api")
+    click.echo(f"WebUI:        http://{host}:{port}/")
     click.echo("=" * 60)
     
     # 启动服务器

{jettask-0.2.3.dist-info → jettask-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jettask
-Version: 0.2.3
+Version: 0.2.5
 Summary: A high-performance distributed task queue system with web monitoring
 Home-page: https://github.com/yourusername/jettask
 Author: JetTask Team

{jettask-0.2.3.dist-info → jettask-0.2.5.dist-info}/RECORD

@@ -7,7 +7,7 @@ jettask/config/performance.py,sha256=bOdLEskfB_6cRfS10IRgmtKEsJw_CaIZsPHbXxaHwbU
 jettask/core/__init__.py,sha256=CvBoBCERXCo-jgnkPqAuIgT4uC7oQMnSi7okRxMi6Vc,181
 jettask/core/app.py,sha256=D6wqdGIVR8E1a7RNevNDaICfKGDsea4RqS9aRlMU810,74906
 jettask/core/app_importer.py,sha256=B8WiSUz5_O5jlFIBr1CxI_F2gqFYK6ItpONiY_4AiXI,10266
-jettask/core/cli.py,sha256=obaU7jXrP_N57AXQHUZyeACYHYaUp2ntOJAC9--aFAI,18476
+jettask/core/cli.py,sha256=C4OJAhLKjXk7kc9Xg1LyAQh3E7TyD8D7x1aWq_e2mRA,18185
 jettask/core/consumer_manager.py,sha256=7z3IBvH85YD61ZkVNfOVsuP5NaAwV2Ki8aVz9TCplAM,79870
 jettask/core/context.py,sha256=XI4Q1s75NIWImcrHIkCLgGo_kpuJIk8MlBoNIJuEfF0,993
 jettask/core/delay_scanner.py,sha256=rwbIA7SFyOxAV14FW7NB40_djFrrqJJpNkpOri7XcZI,8394
@@ -126,9 +126,9 @@ jettask/webui/static/workers.html,sha256=Tybg1uEcecAv6B5dCCK84deon9shRVBWGiTtqun
 jettask/webui/static/dist/index.html,sha256=h2tFcGYZQ8byRZaLA8_mruZCbzl5mzKFt40iyOUh5s8,454
 jettask/webui/static/dist/assets/index-7129cfe1.css,sha256=cSnP4SXPWnF_GNtmJq7QRvF3HMvlp364jfusGRWbSSs,12296
 jettask/webui/static/dist/assets/index-8d1935cc.js,sha256=FKAjJHhI3Fz0kROP3JgDI46YvsJxW9zW4eV0nOdLTIQ,3339169
-jettask-0.2.3.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
-jettask-0.2.3.dist-info/METADATA,sha256=uM6iotvGWkCnXpdJTjWivS9g6u_mkbnNmrgJYT9fk9E,1858
-jettask-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jettask-0.2.3.dist-info/entry_points.txt,sha256=VC3byRkkSfRHu_QzczGtpGjcFERkJUlCrD__TFLVqxI,153
-jettask-0.2.3.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
-jettask-0.2.3.dist-info/RECORD,,
+jettask-0.2.5.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
+jettask-0.2.5.dist-info/METADATA,sha256=X5h7CTtb9u7XO4BA5XBDbnp3W5dA-3QIuuuwZhCuw7o,1858
+jettask-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jettask-0.2.5.dist-info/entry_points.txt,sha256=VC3byRkkSfRHu_QzczGtpGjcFERkJUlCrD__TFLVqxI,153
+jettask-0.2.5.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
+jettask-0.2.5.dist-info/RECORD,,