jettask 0.2.13__py3-none-any.whl → 0.2.14__py3-none-any.whl

jettask/webui/backend/namespace_data_access.py

@@ -181,62 +181,39 @@ class NamespaceDataAccessManager:
     
     async def get_namespace_config(self, namespace_name: str) -> dict:
         """从任务中心API获取命名空间配置"""
-        # 直接从数据库获取，而不是通过HTTP调用自己
-        # 这避免了循环依赖和网络问题
+        # 使用127.0.0.1替代localhost，确保容器内能正确连接
+        base_url = self.task_center_base_url
+        if 'localhost' in base_url:
+            base_url = base_url.replace('localhost', '127.0.0.1')
+        url = f"{base_url}/api/namespaces/{namespace_name}"
+        
         try:
-            # 先尝试从缓存或直接数据库访问
-            from jettask.webui.backend.models import NamespaceModel
-            from jettask.webui.backend.db_init import get_async_session
-            from sqlalchemy import select
-            
-            async with get_async_session() as session:
-                stmt = select(NamespaceModel).where(NamespaceModel.name == namespace_name)
-                result = await session.execute(stmt)
-                namespace = result.scalar_one_or_none()
-                
-                if namespace:
+            session = await self._get_session()
+            async with session.get(url) as resp:
+                if resp.status == 200:
+                    data = await resp.json()
+                    # API返回的是redis_config和pg_config，直接使用
+                    redis_config = data.get('redis_config', {})
+                    pg_config = data.get('pg_config', {})
+                    
+                    # 兼容旧格式：如果有redis_url和pg_url字段
+                    if not redis_config and data.get('redis_url'):
+                        redis_config = {'url': data.get('redis_url')}
+                    
+                    if not pg_config and data.get('pg_url'):
+                        pg_config = {'url': data.get('pg_url')}
+                    
                     return {
-                        'name': namespace.name,
-                        'redis_config': namespace.redis_config or {},
-                        'pg_config': namespace.pg_config or {}
+                        'name': data.get('name'),
+                        'redis_config': redis_config,
+                        'pg_config': pg_config
                     }
                 else:
-                    raise ValueError(f"命名空间 {namespace_name} 不存在")
-        except (ImportError, Exception) as e:
-            # 如果无法直接访问数据库，则通过HTTP调用（但使用127.0.0.1）
-            logger.warning(f"直接数据库访问失败，回退到HTTP调用: {e}")
-            base_url = self.task_center_base_url
-            if 'localhost' in base_url:
-                base_url = base_url.replace('localhost', '127.0.0.1')
-            url = f"{base_url}/api/namespaces/{namespace_name}"
-            
-            try:
-                session = await self._get_session()
-                async with session.get(url) as resp:
-                    if resp.status == 200:
-                        data = await resp.json()
-                        # API返回的是redis_config和pg_config，直接使用
-                        redis_config = data.get('redis_config', {})
-                        pg_config = data.get('pg_config', {})
-                        
-                        # 兼容旧格式：如果有redis_url和pg_url字段
-                        if not redis_config and data.get('redis_url'):
-                            redis_config = {'url': data.get('redis_url')}
-                        
-                        if not pg_config and data.get('pg_url'):
-                            pg_config = {'url': data.get('pg_url')}
-                        
-                        return {
-                            'name': data.get('name'),
-                            'redis_config': redis_config,
-                            'pg_config': pg_config
-                        }
-                    else:
-                        raise ValueError(f"无法获取命名空间 {namespace_name} 的配置: HTTP {resp.status}")
-            except Exception as e:
-                logger.error(f"通过HTTP获取命名空间 {namespace_name} 配置失败: {e}")
-                traceback.print_exc()
-                raise
+                    raise ValueError(f"无法获取命名空间 {namespace_name} 的配置: HTTP {resp.status}")
+        except Exception as e:
+            logger.error(f"获取命名空间 {namespace_name} 配置失败: {e}")
+            traceback.print_exc()
+            raise
     
     async def get_connection(self, namespace_name: str) -> NamespaceConnection:
         """

{jettask-0.2.13.dist-info → jettask-0.2.14.dist-info}/METADATA

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

{jettask-0.2.13.dist-info → jettask-0.2.14.dist-info}/RECORD

@@ -92,7 +92,7 @@ jettask/webui/backend/main_unified.py,sha256=4owlt7n1Axg2zwzmaACHkuIZTj-KJonXxjK
 jettask/webui/backend/main_v2.py,sha256=XU7LZriOuTcMHt8rZTeNUAtY7HBIu50vzJT-f8_AbCs,11603
 jettask/webui/backend/namespace_api.py,sha256=Q-VmwszGjJXrGI_GlNM356l1TSprRENE-p1vtR-WUt0,11310
 jettask/webui/backend/namespace_api_old.py,sha256=lGmkWurtt5LTsTDzjkG8q3rhyMrzzm73VUFkCmafI5Y,11240
-jettask/webui/backend/namespace_data_access.py,sha256=GB4mzL1SGObnk7iW2ns6OC94NRifiFKZZLmvrBcKw2I,27134
+jettask/webui/backend/namespace_data_access.py,sha256=Cw2_FLm5MqRKEVLaRyM6qBpIU8Azb0qPIeXBTfNeRWM,25823
 jettask/webui/backend/queue_backlog_api.py,sha256=HQphpAj4gFRxw7S4h1LC3HxM6eWWMleNr7cDSaxKnyI,26681
 jettask/webui/backend/queue_stats_v2.py,sha256=VeI46WQREFAQgqW330eKs0jO7ZBehLIEKsxAAu907T8,24402
 jettask/webui/backend/redis_monitor_api.py,sha256=fmDCzHAm2jtx1IhKZ299W5IS2CSI1RS7EC9V3rDtELs,18287
@@ -164,9 +164,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/init_database.sql,sha256=CSjhBZldtfV0SGBLTFf576ALaRfCFe3wywpezzkX1TQ,22369
-jettask-0.2.13.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
-jettask-0.2.13.dist-info/METADATA,sha256=KbsHMYpOfvTjraDeGQdFNDNqMoiDbZKFK3EdO_n_rNY,2956
-jettask-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jettask-0.2.13.dist-info/entry_points.txt,sha256=VC3byRkkSfRHu_QzczGtpGjcFERkJUlCrD__TFLVqxI,153
-jettask-0.2.13.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
-jettask-0.2.13.dist-info/RECORD,,
+jettask-0.2.14.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
+jettask-0.2.14.dist-info/METADATA,sha256=FOi8o9_uBTUDLricQRla6hTHpCaG6vigrp6GZiSch5Q,2956
+jettask-0.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jettask-0.2.14.dist-info/entry_points.txt,sha256=VC3byRkkSfRHu_QzczGtpGjcFERkJUlCrD__TFLVqxI,153
+jettask-0.2.14.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
+jettask-0.2.14.dist-info/RECORD,,