jettask 0.2.16__tar.gz → 0.2.18__tar.gz

{jettask-0.2.16/jettask.egg-info → jettask-0.2.18}/PKG-INFO

@@ -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 → jettask-0.2.18}/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-0.2.16 → jettask-0.2.18}/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-0.2.16 → jettask-0.2.18}/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-0.2.16 → jettask-0.2.18}/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 → jettask-0.2.18/jettask.egg-info}/PKG-INFO

@@ -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 → jettask-0.2.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jettask"
-version = "0.2.16"
+version = "0.2.18"
 authors = [
     {name = "JetTask Team", email = "support@jettask.io"},
 ]