aiecs 1.0.8__py3-none-any.whl → 1.2.0__py3-none-any.whl

aiecs/domain/context/context_engine.py

@@ -117,9 +117,11 @@ class ContextEngine(IStorageBackend, ICheckpointerBackend):
 
         Args:
             use_existing_redis: Whether to use the existing Redis client from infrastructure
+                              (已弃用: 现在总是创建独立的 RedisClient 实例以避免事件循环冲突)
         """
         self.use_existing_redis = use_existing_redis
         self.redis_client: Optional[redis.Redis] = None
+        self._redis_client_wrapper: Optional[Any] = None  # RedisClient 包装器实例
 
         # Fallback to memory storage if Redis not available
         self._memory_sessions: Dict[str, SessionMetrics] = {}
@@ -149,49 +151,51 @@ class ContextEngine(IStorageBackend, ICheckpointerBackend):
             return True
 
         try:
-            if self.use_existing_redis and get_redis_client:
-                # First ensure Redis client is initialized
-                from aiecs.infrastructure.persistence.redis_client import initialize_redis_client
-                try:
-                    await initialize_redis_client()
-                except Exception as init_error:
-                    logger.warning(f"Failed to initialize Redis client: {init_error}")
-                    # Fall through to direct connection attempt
-
-                # Use existing Redis client from infrastructure
-                redis_client_instance = await get_redis_client()
-                self.redis_client = await redis_client_instance.get_client()
-
-                # Test connection
-                await self.redis_client.ping()
-                logger.info("ContextEngine connected to existing Redis client successfully")
-                return True
-            else:
-                # Fallback to direct Redis connection (for testing or standalone use)
-                import os
-                redis_url = os.getenv('REDIS_URL', 'redis://localhost:6379/0')
-                self.redis_client = redis.from_url(
-                    redis_url,
-                    decode_responses=True,
-                    socket_connect_timeout=5,
-                    socket_timeout=5
-                )
-
-                # Test connection
-                await self.redis_client.ping()
-                logger.info("ContextEngine connected to Redis directly")
-                return True
+            # ✅ 修复方案：在当前事件循环中创建新的 RedisClient 实例
+            # 
+            # 问题根源：
+            # - 全局 RedisClient 单例在应用启动的事件循环A中创建
+            # - ContextEngine 可能在不同的事件循环B中被初始化（例如在请求处理中）
+            # - redis.asyncio 的连接池绑定到创建时的事件循环
+            # - 跨事件循环使用会导致 "Task got Future attached to a different loop" 错误
+            #
+            # 解决方案：
+            # - 为每个 ContextEngine 实例创建独立的 RedisClient
+            # - 使用 RedisClient 包装器保持架构一致性
+            # - 在当前事件循环中初始化，确保事件循环匹配
+            
+            from aiecs.infrastructure.persistence.redis_client import RedisClient
+            
+            # 创建专属的 RedisClient 实例（在当前事件循环中）
+            self._redis_client_wrapper = RedisClient()
+            await self._redis_client_wrapper.initialize()
+            
+            # 获取底层 redis.Redis 客户端用于现有代码
+            self.redis_client = await self._redis_client_wrapper.get_client()
+
+            # Test connection
+            await self.redis_client.ping()
+            logger.info("ContextEngine connected to Redis successfully using RedisClient wrapper in current event loop")
+            return True
 
         except Exception as e:
             logger.error(f"Failed to connect to Redis: {e}")
             logger.warning("Falling back to memory storage")
             self.redis_client = None
+            self._redis_client_wrapper = None
             return False
 
     async def close(self):
         """Close Redis connection."""
-        if self.redis_client:
+        if hasattr(self, '_redis_client_wrapper') and self._redis_client_wrapper:
+            # 使用 RedisClient 包装器的 close 方法
+            await self._redis_client_wrapper.close()
+            self._redis_client_wrapper = None
+            self.redis_client = None
+        elif self.redis_client:
+            # 兼容性处理：直接关闭 redis 客户端
             await self.redis_client.close()
+            self.redis_client = None
 
     # ==================== Session Management ====================
 

aiecs/main.py

@@ -23,6 +23,10 @@ from aiecs.ws.socket_server import sio
 
 # Import infrastructure
 from aiecs.infrastructure.persistence.database_manager import DatabaseManager
+from aiecs.infrastructure.persistence import (
+    initialize_context_engine,
+    close_context_engine
+)
 from aiecs.infrastructure.messaging.celery_task_manager import CeleryTaskManager
 from aiecs.infrastructure.monitoring.structured_logger import setup_structured_logging
 
@@ -82,6 +86,13 @@ async def lifespan(app: FastAPI):
         logger.error(f"Failed to discover tools: {e}")
         raise
     
+    # Initialize ContextEngine (optional, graceful degradation)
+    try:
+        await initialize_context_engine()
+        logger.info("ContextEngine initialized")
+    except Exception as e:
+        logger.warning(f"ContextEngine initialization failed (continuing without it): {e}")
+    
     # Application startup complete
     logger.info("AIECS startup complete")
     
@@ -90,6 +101,13 @@ async def lifespan(app: FastAPI):
     # Shutdown
     logger.info("Shutting down AIECS...")
     
+    # Close ContextEngine
+    try:
+        await close_context_engine()
+        logger.info("ContextEngine closed")
+    except Exception as e:
+        logger.warning(f"Error closing ContextEngine: {e}")
+    
     # Close database connection
     if db_manager:
         await db_manager.disconnect()
@@ -106,7 +124,7 @@ async def lifespan(app: FastAPI):
 app = FastAPI(
     title="AIECS - AI Execute Services",
     description="Middleware service for AI-powered task execution and tool orchestration",
-    version="1.0.5",
+    version="1.2.0",    
     lifespan=lifespan
 )
 
@@ -131,7 +149,7 @@ async def health_check():
     return {
         "status": "healthy",
         "service": "aiecs",
-        "version": "1.0.8"
+        "version": "1.2.0"
     }
 
 

aiecs/scripts/aid/VERSION_MANAGEMENT.md

@@ -0,0 +1,97 @@
+# AIECS 版本管理
+
+AIECS 提供了一个统一的版本管理工具，可以同时更新项目中所有相关文件的版本号。
+
+## 支持的文件
+
+版本管理工具会自动更新以下文件中的版本号：
+
+1. **`aiecs/__init__.py`** - 更新 `__version__` 变量
+2. **`aiecs/main.py`** - 更新 FastAPI 应用版本和健康检查端点版本
+3. **`pyproject.toml`** - 更新项目版本
+
+## 使用方法
+
+### 1. 显示当前版本
+
+```bash
+poetry run python -m aiecs.scripts.aid.version_manager --show
+```
+
+### 2. 设置特定版本
+
+```bash
+poetry run python -m aiecs.scripts.aid.version_manager --version 1.2.0
+```
+
+### 3. 自动递增版本
+
+#### 补丁版本 (Patch)
+```bash
+poetry run python -m aiecs.scripts.aid.version_manager --bump patch
+# 1.1.0 -> 1.1.1
+```
+
+#### 次版本 (Minor)
+```bash
+poetry run python -m aiecs.scripts.aid.version_manager --bump minor
+# 1.1.0 -> 1.2.0
+```
+
+#### 主版本 (Major)
+```bash
+poetry run python -m aiecs.scripts.aid.version_manager --bump major
+# 1.1.0 -> 2.0.0
+```
+
+## 版本号格式
+
+版本号遵循 [语义化版本控制](https://semver.org/) 规范：
+
+- **主版本号 (Major)**: 不兼容的API修改
+- **次版本号 (Minor)**: 向下兼容的功能性新增
+- **补丁版本号 (Patch)**: 向下兼容的问题修正
+
+格式：`X.Y.Z` (例如：1.2.3)
+
+## 命令行选项
+
+- `--version, -v`: 设置特定版本号
+- `--bump, -b`: 自动递增版本 (major/minor/patch)
+- `--show, -s`: 显示当前版本
+- `--help, -h`: 显示帮助信息
+
+## 示例
+
+```bash
+# 查看当前版本
+poetry run python -m aiecs.scripts.aid.version_manager --show
+
+# 发布补丁版本
+poetry run python -m aiecs.scripts.aid.version_manager --bump patch
+
+# 发布新功能版本
+poetry run python -m aiecs.scripts.aid.version_manager --bump minor
+
+# 发布重大更新版本
+poetry run python -m aiecs.scripts.aid.version_manager --bump major
+
+# 手动设置版本
+poetry run python -m aiecs.scripts.aid.version_manager --version 2.1.0
+```
+
+## 注意事项
+
+1. 版本管理工具会自动验证版本号格式
+2. 所有相关文件会同时更新，确保版本号一致性
+3. 更新前建议先提交当前更改到版本控制系统
+4. 工具会显示详细的更新日志，确认所有文件都已正确更新
+
+## 故障排除
+
+如果遇到问题，请检查：
+
+1. 确保在项目根目录下运行命令
+2. 确保所有目标文件存在且可写
+3. 检查版本号格式是否正确 (X.Y.Z)
+4. 确保没有其他进程正在编辑这些文件

aiecs/scripts/aid/__init__.py

@@ -0,0 +1,15 @@
+"""
+AIECS Development Tools (AID)
+
+This module contains development and maintenance tools for the AIECS project.
+"""
+
+# Lazy import to avoid circular import issues
+def get_version_manager_main():
+    """Get the version manager main function"""
+    from .version_manager import main
+    return main
+
+__all__ = [
+    'get_version_manager_main',
+]

aiecs/scripts/aid/version_manager.py

@@ -0,0 +1,224 @@
+#!/usr/bin/env python3
+"""
+AIECS Version Manager
+
+A script to manage version numbers across multiple files in the AIECS project.
+Updates version numbers in:
+- aiecs/__init__.py (__version__)
+- aiecs/main.py (FastAPI app version and health check version)
+- pyproject.toml (project version)
+
+Usage:
+    aiecs-version --version 1.2.0
+    aiecs-version --bump patch
+    aiecs-version --bump minor
+    aiecs-version --bump major
+    aiecs-version --show
+"""
+
+import argparse
+import re
+import sys
+from pathlib import Path
+from typing import Optional, Tuple
+
+
+class VersionManager:
+    """Manages version numbers across AIECS project files"""
+    
+    def __init__(self, project_root: Optional[Path] = None):
+        """Initialize the version manager with project root path"""
+        if project_root is None:
+            # Find project root by looking for pyproject.toml
+            current = Path(__file__).parent
+            while current != current.parent:
+                if (current / "pyproject.toml").exists():
+                    project_root = current
+                    break
+                current = current.parent
+            
+            if project_root is None:
+                raise RuntimeError("Could not find project root (pyproject.toml)")
+        
+        self.project_root = project_root
+        self.files = {
+            'init': project_root / "aiecs" / "__init__.py",
+            'main': project_root / "aiecs" / "main.py", 
+            'pyproject': project_root / "pyproject.toml"
+        }
+    
+    def get_current_version(self) -> str:
+        """Get the current version from __init__.py"""
+        init_file = self.files['init']
+        if not init_file.exists():
+            raise FileNotFoundError(f"Could not find {init_file}")
+        
+        content = init_file.read_text(encoding='utf-8')
+        match = re.search(r'__version__\s*=\s*["\']([^"\']+)["\']', content)
+        if not match:
+            raise ValueError("Could not find __version__ in __init__.py")
+        
+        return match.group(1)
+    
+    def parse_version(self, version: str) -> Tuple[int, int, int]:
+        """Parse version string into major, minor, patch components"""
+        match = re.match(r'^(\d+)\.(\d+)\.(\d+)$', version)
+        if not match:
+            raise ValueError(f"Invalid version format: {version}. Expected format: X.Y.Z")
+        
+        return int(match.group(1)), int(match.group(2)), int(match.group(3))
+    
+    def bump_version(self, current_version: str, bump_type: str) -> str:
+        """Bump version based on type (major, minor, patch)"""
+        major, minor, patch = self.parse_version(current_version)
+        
+        if bump_type == 'major':
+            major += 1
+            minor = 0
+            patch = 0
+        elif bump_type == 'minor':
+            minor += 1
+            patch = 0
+        elif bump_type == 'patch':
+            patch += 1
+        else:
+            raise ValueError(f"Invalid bump type: {bump_type}. Use 'major', 'minor', or 'patch'")
+        
+        return f"{major}.{minor}.{patch}"
+    
+    def update_init_file(self, new_version: str) -> None:
+        """Update version in aiecs/__init__.py"""
+        init_file = self.files['init']
+        content = init_file.read_text(encoding='utf-8')
+        
+        # Update __version__ line
+        content = re.sub(
+            r'(__version__\s*=\s*["\'])([^"\']+)(["\'])',
+            rf'\g<1>{new_version}\g<3>',
+            content
+        )
+        
+        init_file.write_text(content, encoding='utf-8')
+        print(f"✓ Updated {init_file.relative_to(self.project_root)}: __version__ = \"{new_version}\"")
+    
+    def update_main_file(self, new_version: str) -> None:
+        """Update version in aiecs/main.py"""
+        main_file = self.files['main']
+        content = main_file.read_text(encoding='utf-8')
+        
+        # Update FastAPI app version
+        content = re.sub(
+            r'(version=")([^"]+)(")',
+            rf'\g<1>{new_version}\g<3>',
+            content
+        )
+        
+        # Update health check version
+        content = re.sub(
+            r'("version":\s*")([^"]+)(")',
+            rf'\g<1>{new_version}\g<3>',
+            content
+        )
+        
+        main_file.write_text(content, encoding='utf-8')
+        print(f"✓ Updated {main_file.relative_to(self.project_root)}: FastAPI version and health check version")
+    
+    def update_pyproject_file(self, new_version: str) -> None:
+        """Update version in pyproject.toml"""
+        pyproject_file = self.files['pyproject']
+        content = pyproject_file.read_text(encoding='utf-8')
+        
+        # Update project version (only in [project] section, not in [project.scripts])
+        # Use a more specific pattern to avoid updating script entry points
+        content = re.sub(
+            r'^(\s*version\s*=\s*")([^"]+)(")',
+            rf'\g<1>{new_version}\g<3>',
+            content,
+            flags=re.MULTILINE
+        )
+        
+        pyproject_file.write_text(content, encoding='utf-8')
+        print(f"✓ Updated {pyproject_file.relative_to(self.project_root)}: project version")
+    
+    def update_version(self, new_version: str) -> None:
+        """Update version in all files"""
+        # Validate version format
+        self.parse_version(new_version)
+        
+        print(f"Updating version to {new_version}...")
+        print()
+        
+        # Update all files
+        self.update_init_file(new_version)
+        self.update_main_file(new_version)
+        self.update_pyproject_file(new_version)
+        
+        print()
+        print(f"✓ Successfully updated version to {new_version} in all files!")
+    
+    def show_version(self) -> None:
+        """Show current version"""
+        try:
+            version = self.get_current_version()
+            print(f"Current version: {version}")
+        except Exception as e:
+            print(f"Error getting current version: {e}", file=sys.stderr)
+            sys.exit(1)
+
+
+def main():
+    """Main entry point for the version manager"""
+    parser = argparse.ArgumentParser(
+        description="AIECS Version Manager - Update version numbers across project files",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  aiecs-version --version 1.2.0          # Set specific version
+  aiecs-version --bump patch             # Bump patch version (1.1.0 -> 1.1.1)
+  aiecs-version --bump minor             # Bump minor version (1.1.0 -> 1.2.0)
+  aiecs-version --bump major             # Bump major version (1.1.0 -> 2.0.0)
+  aiecs-version --show                   # Show current version
+        """
+    )
+    
+    # Create mutually exclusive group for version options
+    version_group = parser.add_mutually_exclusive_group(required=True)
+    version_group.add_argument(
+        '--version', '-v',
+        type=str,
+        help='Set specific version (e.g., 1.2.0)'
+    )
+    version_group.add_argument(
+        '--bump', '-b',
+        choices=['major', 'minor', 'patch'],
+        help='Bump version: major (X.0.0), minor (X.Y.0), or patch (X.Y.Z)'
+    )
+    version_group.add_argument(
+        '--show', '-s',
+        action='store_true',
+        help='Show current version'
+    )
+    
+    args = parser.parse_args()
+    
+    try:
+        manager = VersionManager()
+        
+        if args.show:
+            manager.show_version()
+        elif args.version:
+            manager.update_version(args.version)
+        elif args.bump:
+            current_version = manager.get_current_version()
+            new_version = manager.bump_version(current_version, args.bump)
+            print(f"Bumping {args.bump} version: {current_version} -> {new_version}")
+            print()
+            manager.update_version(new_version)
+    
+    except Exception as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()

aiecs/scripts/dependance_check/__init__.py

@@ -0,0 +1,18 @@
+"""
+依赖检查和修复工具
+
+提供 AIECS 系统依赖的检查、修复和 NLP 数据下载功能。
+"""
+
+from .dependency_checker import main as dependency_checker_main
+from .dependency_fixer import main as dependency_fixer_main
+from .quick_dependency_check import main as quick_dependency_check_main
+from .download_nlp_data import main as download_nlp_data_main
+
+__all__ = [
+    'dependency_checker_main',
+    'dependency_fixer_main',
+    'quick_dependency_check_main',
+    'download_nlp_data_main',
+]
+

aiecs/scripts/{download_nlp_data.py → dependance_check/download_nlp_data.py}

@@ -103,6 +103,7 @@ def download_nltk_data(logger: logging.Logger) -> bool:
         packages_to_download = [
             'stopwords',
             'punkt',
+            'punkt_tab',  # Added for RAKE-NLTK compatibility
             'wordnet',
             'averaged_perceptron_tagger'
         ]
@@ -305,21 +306,21 @@ def verify_installation(logger: logging.Logger) -> bool:
     return success
 
 
-def main():
-    """Main function to download all required NLP data."""
+def download_all_nlp_data():
+    """Download all required NLP data."""
     logger = setup_logging()
     logger.info("Starting AIECS NLP data download process...")
-    
+
     success = True
-    
+
     # Download NLTK data
     if not download_nltk_data(logger):
         success = False
-    
+
     # Download spaCy English model
     if not download_spacy_model('en_core_web_sm', logger):
         success = False
-    
+
     # Download spaCy Chinese model (optional)
     if not download_spacy_model('zh_core_web_sm', logger):
         logger.warning("Chinese model download failed, but this is optional")
@@ -329,10 +330,10 @@ def main():
     if not download_spacy_pkuseg_model(logger):
         logger.warning("spaCy PKUSeg model download failed, but this is optional")
         # Don't mark as failure for PKUSeg model
-    
+
     # Check RAKE-NLTK (optional)
     download_rake_nltk_data(logger)
-    
+
     # Verify installation
     if success and verify_installation(logger):
         logger.info("✅ All NLP data downloaded and verified successfully!")
@@ -344,5 +345,47 @@ def main():
         return 1
 
 
+def main():
+    """Main entry point with argument parsing."""
+    import argparse
+
+    parser = argparse.ArgumentParser(
+        description='Download NLP data for AIECS tools',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # Show this help message
+  aiecs-download-nlp-data --help
+
+  # Download all NLP data
+  aiecs-download-nlp-data --download
+  aiecs-download-nlp-data -d
+
+NLP Data Includes:
+  - NLTK packages: stopwords, punkt, wordnet, averaged_perceptron_tagger
+  - spaCy models: en_core_web_sm (English), zh_core_web_sm (Chinese, optional)
+  - spaCy PKUSeg model (Chinese segmentation, optional)
+  - RAKE-NLTK data (keyword extraction, optional)
+        """
+    )
+
+    parser.add_argument(
+        '-d', '--download',
+        action='store_true',
+        help='Download all NLP data packages'
+    )
+
+    args = parser.parse_args()
+
+    # If no arguments provided, show help
+    if not args.download:
+        parser.print_help()
+        print("\n⚠️  No action specified. Use --download or -d to download NLP data.")
+        return 0
+
+    # Execute download
+    return download_all_nlp_data()
+
+
 if __name__ == "__main__":
     sys.exit(main())

aiecs/scripts/dependance_patch/__init__.py

@@ -0,0 +1,8 @@
+"""
+依赖补丁工具
+
+提供各种依赖库的补丁修复功能。
+"""
+
+__all__ = []
+

aiecs/scripts/dependance_patch/fix_weasel/__init__.py

@@ -0,0 +1,12 @@
+"""
+Weasel 库补丁工具
+
+修复 Weasel 库的验证器问题。
+"""
+
+from .fix_weasel_validator import main as fix_weasel_validator_main
+
+__all__ = [
+    'fix_weasel_validator_main',
+]
+