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

jettask/config/nacos_config.py

@@ -53,23 +53,38 @@ class Config:
         # 配置锁，保证线程安全
         self._config_lock = threading.RLock()
         
+        # 标记是否已初始化
+        self._initialized = False
+        self._config = None
+    
+    @property
+    def config(self) -> dict:
+        """获取当前配置（线程安全，延迟初始化）"""
+        with self._config_lock:
+            # 延迟初始化：第一次访问时才初始化并加载配置
+            if not self._initialized:
+                self._lazy_init()
+            return self._config
+    
+    def _lazy_init(self):
+        """延迟初始化：第一次访问配置时才执行"""
+        if self._initialized:
+            return
+        
+        logger.info("第一次访问配置，开始初始化...")
+        
         # 初始化配置
         self._init_config()
         
+        # 加载配置
         self._config = self._load_config()
         
-        
         # 启动定时刷新
-        if not self.local_dev_mode and refresh_interval > 0:
+        if not self.local_dev_mode and self.refresh_interval > 0:
             self.start_refresh_thread()
-    
-    @property
-    def config(self) -> dict:
-        """获取当前配置（线程安全）"""
-        with self._config_lock:
-            if not hasattr(self, '_config'):
-                self._config = self._load_config()
-            return self._config
+        
+        self._initialized = True
+        logger.info("配置初始化完成")
     
     def _init_config(self):
         """初始化配置"""
@@ -265,8 +280,7 @@ class Config:
     
     def get(self, key, default=None):
         """获取配置项（线程安全）"""
-        with self._config_lock:
-            return self.config.get(key, default)
+        return self.config.get(key, default)
     
     def refresh(self) -> bool:
         """手动刷新配置
@@ -274,9 +288,14 @@ class Config:
         Returns:
             True if config was refreshed, False otherwise
         """
+        # 如果还未初始化，不执行刷新
+        if not self._initialized:
+            logger.debug("配置尚未初始化，跳过刷新")
+            return False
+        
         try:
             logger.info("手动触发配置刷新")
-            old_config = self._config.copy() if hasattr(self, '_config') else {}
+            old_config = self._config.copy() if self._config else {}
             
             with self._config_lock:
                 new_config = self._load_config()
@@ -365,6 +384,7 @@ class Config:
     def get_config_info(self) -> Dict[str, Any]:
         """获取配置信息"""
         return {
+            'initialized': self._initialized,
             'version': self.config_version,
             'last_refresh_time': self.last_refresh_time.isoformat() if self.last_refresh_time else None,
             'refresh_interval': self.refresh_interval,
@@ -374,7 +394,7 @@ class Config:
             'nacos_group': self.nacos_group,
             'nacos_data_id': self.nacos_data_id,
             'local_dev_mode': self.local_dev_mode,
-            'config_items_count': len(self.config) if hasattr(self, '_config') else 0
+            'config_items_count': len(self._config) if self._config else 0
         }
     
     def __del__(self):

jettask/core/unified_manager_base.py

@@ -97,6 +97,12 @@ class UnifiedManagerBase(ABC):
             elif '/api/namespaces/' in self.task_center_url:
                 # 兼容旧格式
                 return self.task_center_url.split('/api/namespaces/')[0]
+        
+        # 多命名空间模式，如果URL以 /api/v1/ 结尾，去掉 /api/v1/ 部分
+        if self.task_center_url.endswith('/api/v1/') or self.task_center_url.endswith('/api/v1'):
+            # 从 http://localhost:8001/api/v1/ 提取 http://localhost:8001
+            return self.task_center_url.rstrip('/').rsplit('/api/v1', 1)[0]
+        
         return self.task_center_url
     
     def get_target_namespaces(self) -> Optional[Set[str]]:
@@ -139,13 +145,16 @@ class UnifiedManagerBase(ABC):
                                 if response.status == 200:
                                     data = await response.json()
                                     # 构建redis和pg配置
-                                    redis_config = {}
-                                    if data.get('redis_url'):
-                                        redis_config = {'url': data['redis_url']}
+                                    # 跳过没有有效配置的命名空间
+                                    redis_url = data.get('redis_url', '')
+                                    pg_url = data.get('pg_url', '')
                                     
-                                    pg_config = {}
-                                    if data.get('pg_url'):
-                                        pg_config = {'url': data['pg_url']}
+                                    if not redis_url or not pg_url:
+                                        logger.warning(f"跳过命名空间 {data['name']}：缺少 Redis 或 PostgreSQL 配置")
+                                        continue
+                                    
+                                    redis_config = {'url': redis_url}
+                                    pg_config = {'url': pg_url}
                                     
                                     ns_info = {
                                         'id': data.get('id', data['name']),  # 如果没有id，使用name作为id
@@ -163,7 +172,7 @@ class UnifiedManagerBase(ABC):
             else:
                 # 获取所有命名空间
                 async with aiohttp.ClientSession() as session:
-                    url = f"{base_url}/api/v1/namespaces"
+                    url = f"{base_url}/api/v1/namespaces/"  # 添加末尾斜杠
                     logger.debug(f"请求所有命名空间配置: {url}")
                     
                     async with session.get(url) as response:
@@ -171,13 +180,16 @@ class UnifiedManagerBase(ABC):
                             data_list = await response.json()
                             for data in data_list:
                                 # 构建redis和pg配置
-                                redis_config = {}
-                                if data.get('redis_url'):
-                                    redis_config = {'url': data['redis_url']}
+                                # 跳过没有有效配置的命名空间
+                                redis_url = data.get('redis_url', '')
+                                pg_url = data.get('pg_url', '')
+                                
+                                if not redis_url or not pg_url:
+                                    logger.warning(f"跳过命名空间 {data['name']}：缺少 Redis 或 PostgreSQL 配置")
+                                    continue
                                 
-                                pg_config = {}
-                                if data.get('pg_url'):
-                                    pg_config = {'url': data['pg_url']}
+                                redis_config = {'url': redis_url}
+                                pg_config = {'url': pg_url}
                                 
                                 ns_info = {
                                     'id': data.get('id', data['name']),  # 如果没有id，使用name作为id

jettask/scheduler/manager.py

@@ -26,6 +26,12 @@ class ScheduledTaskManager:
         else:
             # 从app对象获取pg_url
             self.db_url = app_or_db_url.pg_url
+        
+        # 将SQLAlchemy格式的URL转换为原生PostgreSQL URL
+        # postgresql+asyncpg:// -> postgresql://
+        if self.db_url and '+' in self.db_url:
+            self.db_url = self.db_url.split('+')[0] + self.db_url[self.db_url.index('://'):]
+        
         self.pool: Optional[asyncpg.Pool] = None
     
     async def connect(self):

jettask/scheduler/unified_scheduler_manager.py

@@ -67,18 +67,19 @@ class UnifiedSchedulerManager(UnifiedManagerBase):
             # 创建 Jettask 应用
             app = Jettask(task_center=tc)
             
-            # 创建调度器管理器
-            manager = ScheduledTaskManager(app, namespace=namespace_name)
+            # 创建调度器管理器（不需要传递namespace参数）
+            manager = ScheduledTaskManager(app)
             
             # 创建并启动调度器
             self.scheduler_instance = TaskScheduler(
-                manager=manager,
+                app=app,
+                db_manager=manager,
                 scan_interval=self.scan_interval,
                 batch_size=self.batch_size
             )
             
             # 运行调度器
-            await self.scheduler_instance.start()
+            await self.scheduler_instance.run()
             
         except Exception as e:
             logger.error(f"单命名空间调度器运行失败: {e}", exc_info=self.debug)
@@ -170,13 +171,20 @@ class UnifiedSchedulerManager(UnifiedManagerBase):
         async def run_scheduler():
             try:
                 # 构建命名空间特定的URL
-                if '/api/namespaces/' not in task_center_url:
-                    # 如果是基础URL，添加命名空间路径
-                    url = f"{task_center_url}/api/namespaces/{namespace_name}"
-                else:
-                    # 替换现有的命名空间
+                if task_center_url.endswith('/api/v1/') or task_center_url.endswith('/api/v1'):
+                    # 多命名空间模式，URL是 http://localhost:8001/api/v1/
+                    url = f"{task_center_url.rstrip('/')}/namespaces/{namespace_name}"
+                elif '/api/v1/namespaces/' in task_center_url:
+                    # 单命名空间模式的URL，需要替换命名空间
+                    base_url = task_center_url.split('/api/v1/namespaces/')[0]
+                    url = f"{base_url}/api/v1/namespaces/{namespace_name}"
+                elif '/api/namespaces/' in task_center_url:
+                    # 兼容旧格式
                     base_url = task_center_url.split('/api/namespaces/')[0]
                     url = f"{base_url}/api/namespaces/{namespace_name}"
+                else:
+                    # 如果是基础URL，添加命名空间路径
+                    url = f"{task_center_url.rstrip('/')}/api/v1/namespaces/{namespace_name}"
                 
                 # 创建任务中心连接
                 tc = TaskCenter(url)
@@ -189,7 +197,7 @@ class UnifiedSchedulerManager(UnifiedManagerBase):
                 # 创建调度器管理器 - ScheduledTaskManager 只接受一个参数
                 manager = ScheduledTaskManager(app)
                 
-                # 创建并启动调度器 - 使用正确的参数名
+                # 创建并启动调度器
                 scheduler = TaskScheduler(
                     app=app,
                     db_manager=manager,
@@ -262,7 +270,7 @@ class UnifiedSchedulerManager(UnifiedManagerBase):
         if self.scheduler_instance:
             # 单命名空间模式
             logger.info("停止调度器")
-            await self.scheduler_instance.stop()
+            self.scheduler_instance.stop()  # stop()不是异步方法
         
         # 多命名空间模式
         logger.info("停止所有调度器进程")

{jettask-0.2.16.dist-info → jettask-0.2.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jettask
-Version: 0.2.16
+Version: 0.2.18
 Summary: A high-performance distributed task queue system with web monitoring
 Author-email: JetTask Team <support@jettask.io>
 License-Expression: MIT

{jettask-0.2.16.dist-info → jettask-0.2.18.dist-info}/RECORD

@@ -59,7 +59,7 @@ jettask/backend/models/requests.py,sha256=fsHiv4sU46biQ1bK1KfV-yxak0LRoFLoe-dPvH
 jettask/backend/models/responses.py,sha256=FwGpAFNL61a2okJFD41TYLcuwu-41FHXrk6P190jxzw,8528
 jettask/backend/services/__init__.py,sha256=DCf9NuJo1a65q3CXG0GtRksQpDhg3QuvmTYiWjxGjVE,57
 jettask/config/__init__.py,sha256=qCRGmiXSK45LDU9pr0bUC-VoZAkTK1jAch1i9tvHCeE,158
-jettask/config/nacos_config.py,sha256=ujipoLitNYKJDFMm_zskaLmFF4eoRFCU0L7p-s5LW08,14172
+jettask/config/nacos_config.py,sha256=dgOCwflZVVoA71qj113XPTyQMCetLSS6lD6au-2skfU,14847
 jettask/config/performance.py,sha256=bOdLEskfB_6cRfS10IRgmtKEsJw_CaIZsPHbXxaHwbU,5686
 jettask/core/__init__.py,sha256=CvBoBCERXCo-jgnkPqAuIgT4uC7oQMnSi7okRxMi6Vc,181
 jettask/core/app.py,sha256=qQPYl74uKV1ZgnuNTvPNPD0F_JVH20oZrsz9jIJusjk,70737
@@ -76,7 +76,7 @@ jettask/core/offline_worker_recovery.py,sha256=L1i61RN5NnPiP7neudmdb_qYMEEvIYRd3
 jettask/core/retry.py,sha256=lX56Z0fvKjEhVbYPHYdoN-W4XUPVplHlfIOupBylEeI,10711
 jettask/core/task.py,sha256=7VygTXcsBPjkfecz2oGXIVECvuuEI_p4lCjE2FzvLZc,5261
 jettask/core/task_batch.py,sha256=lSI4ijf7YrMqS9m9NX3qQ3_HMkrCVZ3LGHL_zDOKc4k,4339
-jettask/core/unified_manager_base.py,sha256=foUeCL8FmtI3SY89ZLOapPsX4dbVS7X-bV30DYCYIac,11174
+jettask/core/unified_manager_base.py,sha256=Nc3hMzFJeQaMajoXH6A5u0-LCd2jcT9MxEX-VCFUjUU,12050
 jettask/core/worker_scanner.py,sha256=_ZFlH7eKeg-2lIL-3JFMV_Oht9Shf7VMEw_uyCBh5Tc,11277
 jettask/executors/__init__.py,sha256=1aXRvwHzlypVcHNYy60UgUELOlNmbPp8oFMS5T0tJbs,186
 jettask/executors/asyncio.py,sha256=zy2mezaRtri2RYXzl7jG9_idnvX9edFiTZWutPLfx9U,43167
@@ -101,7 +101,7 @@ jettask/scheduler/add_scheduler_id.sql,sha256=uDPSnYVjGE75LcOMKuT2kMEbCPW1JEbDq0
 jettask/scheduler/add_scheduler_id_index.sql,sha256=xaY4uXa5QitIEgx4tcDqh1SRZ1NIZXuq5NtQQH_4Liw,471
 jettask/scheduler/loader.py,sha256=oZtz-RbXlxlHbzUOE2WVutPljtXV7SuPRU0W-4KGlVM,8727
 jettask/scheduler/make_scheduler_id_required.sql,sha256=ksZ8rA7cAobrcQk3t93CrTePE2G40KQNESqA9WyPF50,854
-jettask/scheduler/manager.py,sha256=dBZJrm72LU0J6BjStW-AOJ62g-Lam0nxBiPCIxdRNds,26236
+jettask/scheduler/manager.py,sha256=atbDUwlW5NmzrEx63FtKcr508qWfSja5pcE8NDIdo_U,26508
 jettask/scheduler/migrate_interval_seconds.sql,sha256=40MSij1-YsOX7mQU958v7Qsse6NCId0R6NkZEjeWr-8,391
 jettask/scheduler/models.py,sha256=Mv-csKjsrYp4nI2H6IldCh6avu-9ke5YTfyufhlYjKI,7376
 jettask/scheduler/multi_namespace_scheduler.py,sha256=629GGTMi8Rsaw62kzkt4Y8yF59WQMjHk67yrQP3I-4A,11375
@@ -110,7 +110,7 @@ jettask/scheduler/run_scheduler.py,sha256=zRp_V5D7CaTsfEDSEuzISN4Pdypj3NR62zbJn8
 jettask/scheduler/scheduler.py,sha256=PUEqVlYH_SyCYxKj0xzvig78AHzpoYhcUHAnLP9v5MU,27733
 jettask/scheduler/schema.sql,sha256=iBGUrsMYv9_FQCr_0b5DC-XFUXOaLIjnwWH-yvy4LdM,4109
 jettask/scheduler/unified_manager.py,sha256=rah9xUiZlTJiKu_2EuuM6shn9vAEE3KJ3tMpXlzhmGk,17580
-jettask/scheduler/unified_scheduler_manager.py,sha256=nq3Xkh-JuZ5iZrJdxt-D0YEDDvro1hiMLgV7GkRtsNs,11142
+jettask/scheduler/unified_scheduler_manager.py,sha256=6sVsoaa_bXg49WbDsrZARY024UhfWISg9Oo4_ujpJDU,11734
 jettask/schemas/__init__.py,sha256=YtyBjdLtZCceqmeVohlykFdgl5xtF_w9jtRmBfMRlqk,3170
 jettask/schemas/alert.py,sha256=Od29QjDrnLN1Tw_F2rPFSGsqRvbBcO2hf1d8GO1_WEQ,4958
 jettask/schemas/backlog.py,sha256=Qxl5I2cVI1ek1JujLl8I55IFINpXZr0Kbd1WWoyyRQg,5493
@@ -142,9 +142,9 @@ jettask/webui_models/__init__.py,sha256=5cv0oZksj1B3_rzCqsPmF3Gn9NRZLwzMnaJ8bOKG
 jettask/webui_models/namespace.py,sha256=jDj-hZF_-wXzrWAWVDyZVU0JUWDax9apb4Gyykwg-rE,2006
 jettask/webui_sql/batch_upsert_functions.sql,sha256=5eWOhOD8gWHhtcop_BrCpZTxPFeyBHtt_leNQZO89Cs,6615
 jettask/webui_sql/verify_database.sql,sha256=HtTup3xHWbOo1BTU_u4i41E9LrPEXB8qYbChL9WeWOc,2313
-jettask-0.2.16.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
-jettask-0.2.16.dist-info/METADATA,sha256=XBPB5oPLr203wel3tDT7JnkmxhcuZmeV0qluyzUb-GE,3015
-jettask-0.2.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jettask-0.2.16.dist-info/entry_points.txt,sha256=9-8eTLJPgzpBgeGC8WHdMYtldZxHAXFspMeqArVUdew,148
-jettask-0.2.16.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
-jettask-0.2.16.dist-info/RECORD,,
+jettask-0.2.18.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
+jettask-0.2.18.dist-info/METADATA,sha256=qyPVUJgGayes-hL7OadkIa010jF8nGrbzv8Zid6VS9o,3015
+jettask-0.2.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jettask-0.2.18.dist-info/entry_points.txt,sha256=9-8eTLJPgzpBgeGC8WHdMYtldZxHAXFspMeqArVUdew,148
+jettask-0.2.18.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
+jettask-0.2.18.dist-info/RECORD,,