jettask 0.2.13__tar.gz → 0.2.15__tar.gz

{jettask-0.2.13/jettask.egg-info → jettask-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jettask
-Version: 0.2.13
+Version: 0.2.15
 Summary: A high-performance distributed task queue system with web monitoring
 Author-email: JetTask Team <support@jettask.io>
 License-Expression: MIT
@@ -32,6 +32,7 @@ Requires-Dist: websockets>=11.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: aiohttp>=3.8.0
+Requires-Dist: requests>=2.28.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.0
 Requires-Dist: psycopg[binary,pool]>=3.1.0
 Requires-Dist: asyncpg>=0.28.0

{jettask-0.2.13 → jettask-0.2.15}/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 → jettask-0.2.15/jettask.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jettask
-Version: 0.2.13
+Version: 0.2.15
 Summary: A high-performance distributed task queue system with web monitoring
 Author-email: JetTask Team <support@jettask.io>
 License-Expression: MIT
@@ -32,6 +32,7 @@ Requires-Dist: websockets>=11.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: aiohttp>=3.8.0
+Requires-Dist: requests>=2.28.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.0
 Requires-Dist: psycopg[binary,pool]>=3.1.0
 Requires-Dist: asyncpg>=0.28.0

{jettask-0.2.13 → jettask-0.2.15}/jettask.egg-info/requires.txt

@@ -10,6 +10,7 @@ websockets>=11.0
 pydantic>=2.0.0
 python-multipart>=0.0.6
 aiohttp>=3.8.0
+requests>=2.28.0
 sqlalchemy[asyncio]>=2.0.0
 psycopg[binary,pool]>=3.1.0
 asyncpg>=0.28.0

{jettask-0.2.13 → jettask-0.2.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jettask"
-version = "0.2.13"
+version = "0.2.15"
 authors = [
     {name = "JetTask Team", email = "support@jettask.io"},
 ]
@@ -42,6 +42,7 @@ dependencies = [
     
     # HTTP客户端
     "aiohttp>=3.8.0",
+    "requests>=2.28.0",
     
     # 数据库
     "sqlalchemy[asyncio]>=2.0.0",