auto-coder-web 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

auto_coder_web/routers/commit_router.py

@@ -416,33 +416,47 @@ async def get_current_changes(
     Returns:
         提交哈希列表
     """
+    logger.info(f"开始获取当前变更 - 参数: limit={limit}, hours_ago={hours_ago}, event_file_id={event_file_id}, project_path={project_path}")
     try:
         repo = get_repo(project_path)
+        logger.info(f"成功获取Git仓库: {project_path}")
         
         # 如果提供了事件文件ID，从事件中获取相关提交
         if event_file_id:
+            logger.info(f"使用事件文件模式获取提交, event_file_id={event_file_id}")
             try:
                 # 获取事件文件路径
                 event_file_path = get_event_file_path(event_file_id, project_path)
+                logger.info(f"事件文件路径: {event_file_path}")
                 
                 # 获取事件管理器
                 event_manager = get_event_manager(event_file_path)
+                logger.info(f"成功获取事件管理器")
                 
                 # 获取所有事件
                 all_events = event_manager.event_store.get_events()
-                logger.info(f"获取事件: {len(all_events)}")
+                logger.info(f"获取事件总数: {len(all_events)}")
                 
                 # 创建ActionYmlFileManager实例
                 action_manager = ActionYmlFileManager(project_path)                                                
+                logger.info(f"成功创建ActionYmlFileManager实例")
 
                 action_files = set()
                 final_action_files = []
                 
-                for event in all_events:                    
+                # 记录事件中包含action_file字段的事件数量
+                action_file_count = 0
+                
+                for i, event in enumerate(all_events):
+                    logger.debug(f"处理事件 {i+1}/{len(all_events)}, 事件类型: {event.event_type}")
                     # 检查元数据中是否有action_file字段
-                    if 'action_file' in event.metadata and event.metadata['action_file']:                        
+                    if 'action_file' in event.metadata and event.metadata['action_file']:
+                        action_file_count += 1
                         action_file = event.metadata['action_file']
-                        if action_file in action_files:                            
+                        logger.debug(f"事件 {i+1} 包含action_file: {action_file}")
+                        
+                        if action_file in action_files:
+                            logger.debug(f"跳过重复的action_file: {action_file}")
                             continue
                                                 
                         action_files.add(action_file)
@@ -450,25 +464,58 @@ async def get_current_changes(
                         # action_file 这里的值是 类似这样的 actions/000000000104_chat_action.yml
                         if action_file.startswith("actions"):
                             action_file = action_file[len("actions/"):]
+                            logger.debug(f"处理后的action_file: {action_file}")
 
                         final_action_files.append(action_file)
                 
+                logger.info(f"从 {len(all_events)} 个事件中提取到 {action_file_count} 个包含action_file的事件")
+                logger.info(f"去重后得到 {len(action_files)} 个唯一action_file")
+                logger.info(f"最终处理的action_files: {final_action_files}")
+                
                 commits = []
-                for action_file in final_action_files:            
-                    commit_msg_part = action_manager.get_commit_id_from_file(action_file)
-                    commit_id = None
-                    logger.info(f"获取Action文件提交ID: {commit_msg_part}")                    
-                    for commit in repo.iter_commits():
-                        if commit_msg_part in commit.message:
-                            commit_id = commit.hexsha
-                            break
-
-                    if commit_id:
+                for i, action_file in enumerate(final_action_files):
+                    logger.info(f"处理action文件 {i+1}/{len(final_action_files)}: {action_file}")
+                    commit_ids = action_manager.get_all_commit_id_from_file(action_file)                                        
+                    
+                    logger.info(f"从action文件 {action_file} 获取到的提交ID列表: {commit_ids}")
+                    
+                    if not commit_ids:
+                        logger.warning(f"无法从action文件 {action_file} 获取提交ID")
+                        continue
+                    
+                    # 如果有两个提交，检查是否有一个是revert提交
+                    if len(commit_ids) == 2:
+                        logger.info(f"检测到两个提交ID，可能存在revert操作: {commit_ids}")
+                        revert_commit_id = None
+                        
+                        # 检查每个提交是否是revert提交
+                        for cid in commit_ids:
+                            try:
+                                commit = repo.commit(cid)
+                                message = commit.message.strip()
+                                logger.info(f"检查提交 {cid[:7]} 是否为revert提交，消息: {message[:50]}...")
+                                
+                                if message.startswith("<revert>"):
+                                    logger.info(f"找到revert提交: {cid}")
+                                    revert_commit_id = cid
+                                    break
+                            except Exception as e:
+                                logger.warning(f"检查提交 {cid} 时出错: {str(e)}")
+                        
+                        # 如果找到revert提交，只处理这个提交
+                        if revert_commit_id:
+                            logger.info(f"将只处理revert提交: {revert_commit_id}")
+                            commit_ids = [revert_commit_id]
+                    
+                    # 处理所有提交ID（或者只处理revert提交）
+                    for commit_id in commit_ids:
                         # 验证提交ID是否存在于仓库中
                         try:
+                            logger.info(f"获取提交详情: {commit_id}")
                             commit = repo.commit(commit_id)
                             # 获取提交统计信息
                             stats = commit.stats.total
+                            logger.info(f"提交统计信息: 插入={stats['insertions']}, 删除={stats['deletions']}, 文件变更={stats['files']}")
                             
                             # 构建提交信息
                             commit_info = {
@@ -485,27 +532,38 @@ async def get_current_changes(
                                 }
                             }
                             commits.append(commit_info)
-                            
-                            return {"commits": commits, "total": len(list(repo.iter_commits()))}
+                            logger.info(f"成功添加提交信息到结果列表，当前结果数: {len(commits)}")
                         except Exception as e:
-                            logger.warning(f"无法获取提交 {commit_id}: {str(e)}")
+                            logger.warning(f"无法获取提交 {commit_id} 的详情: {str(e)}")
+                
+                logger.info(f"处理完所有action文件，共找到 {len(commits)} 个提交")
                 
                 # 按提交时间戳排序（降序 - 最新的在前面）
-                commits.sort(key=lambda x: x['timestamp'], reverse=True)
+                if commits:
+                    commits.sort(key=lambda x: x['timestamp'], reverse=True)
+                    logger.info("提交已按时间戳降序排序")
                                 
-                
+                logger.info(f"返回结果: {len(commits)} 个提交")
                 return {"commits": commits, "total": len(commits)}
             
             except Exception as e:
                 logger.error(f"从事件文件获取提交失败: {str(e)}")
-                
+                import traceback
+                logger.error(f"详细错误信息: {traceback.format_exc()}")
                 return {"commits": [], "total": 0}
         else:
             # 如果没有提供事件文件ID，返回最近的提交
+            logger.info("未提供event_file_id，应返回最近的提交，但当前实现返回空列表")
+            # 这里应该调用get_recent_commits函数获取最近的提交
+            # recent_commits = await get_recent_commits(repo, limit, hours_ago)
+            # logger.info(f"获取到 {len(recent_commits.get('commit_hashes', []))} 个最近的提交")
+            # return recent_commits
             return {"commits": [], "total": 0}
             
     except Exception as e:
         logger.error(f"获取当前变更失败: {str(e)}")
+        import traceback
+        logger.error(f"详细错误信息: {traceback.format_exc()}")
         raise HTTPException(
             status_code=500, 
             detail=f"获取当前变更失败: {str(e)}"
@@ -593,7 +651,7 @@ async def revert_commit(
             repo.git.revert(commit.hexsha, no_commit=True)
             
             # 创建带有信息的 revert 提交
-            revert_message = f"Revert \"{commit.message.strip()}\"\n\nThis reverts commit {commit.hexsha}"
+            revert_message = f"<revert>{commit.message.strip()}\n{commit.hexsha}"
             new_commit = repo.index.commit(
                 revert_message,
                 author=repo.active_branch.commit.author,

auto_coder_web/routers/config_router.py

@@ -0,0 +1,199 @@
+import os
+import json
+import logging
+import asyncio
+import aiofiles
+from fastapi import APIRouter, HTTPException
+from pydantic import BaseModel, Field
+from typing import Optional, List, Union, Dict, Any
+from datetime import datetime
+from pathlib import Path
+
+router = APIRouter()
+
+# 配置存储路径
+CONFIG_FILE = Path(".auto-coder/auto-coder.web/configs/config.json")
+
+# 确保目录存在
+CONFIG_FILE.parent.mkdir(parents=True, exist_ok=True)
+
+logger = logging.getLogger(__name__)
+
+# UI 配置模型
+class UIConfig(BaseModel):
+    mode: str = "agent"  # agent/expert
+    theme: str = "dark"
+    language: str = "zh-CN"
+
+# 编辑器配置模型
+class EditorConfig(BaseModel):
+    fontSize: int = 14
+    tabSize: int = 2
+    wordWrap: str = "on"
+
+# 功能配置模型
+class FeaturesConfig(BaseModel):
+    autoSave: bool = True
+    livePreview: bool = True
+
+# 配置设置模型
+class ConfigSettings(BaseModel):
+    ui: UIConfig = Field(default_factory=UIConfig)
+    editor: EditorConfig = Field(default_factory=EditorConfig)
+    features: FeaturesConfig = Field(default_factory=FeaturesConfig)
+    updated_at: str = Field(default_factory=lambda: datetime.now().isoformat())
+
+# 更新请求模型 - 所有字段都是可选的
+class UIConfigUpdate(BaseModel):
+    mode: Optional[str] = None
+    theme: Optional[str] = None
+    language: Optional[str] = None
+
+class EditorConfigUpdate(BaseModel):
+    fontSize: Optional[int] = None
+    tabSize: Optional[int] = None
+    wordWrap: Optional[str] = None
+
+class FeaturesConfigUpdate(BaseModel):
+    autoSave: Optional[bool] = None
+    livePreview: Optional[bool] = None
+
+class ConfigUpdateRequest(BaseModel):
+    ui: Optional[UIConfigUpdate] = None
+    editor: Optional[EditorConfigUpdate] = None
+    features: Optional[FeaturesConfigUpdate] = None
+
+async def load_config() -> ConfigSettings:
+    """异步加载配置，如果文件不存在则返回默认配置"""
+    if not await asyncio.to_thread(lambda: CONFIG_FILE.exists()):
+        return ConfigSettings()
+    
+    try:
+        async with aiofiles.open(CONFIG_FILE, mode='r') as f:
+            content = await f.read()
+            config_data = json.loads(content)
+            return ConfigSettings(**config_data)
+    except (json.JSONDecodeError, FileNotFoundError):
+        logger.error("Failed to parse config.json, returning default config")
+        return ConfigSettings()
+
+async def save_config(config: ConfigSettings):
+    """异步保存配置"""
+    async with aiofiles.open(CONFIG_FILE, mode='w') as f:
+        await f.write(json.dumps(config.dict(), indent=2, ensure_ascii=False))
+
+@router.get("/api/config", response_model=ConfigSettings)
+async def get_config():
+    """获取当前所有配置"""
+    return await load_config()
+
+@router.get("/api/config/ui", response_model=UIConfig)
+async def get_ui_config():
+    """获取UI配置"""
+    config = await load_config()
+    return config.ui
+
+@router.get("/api/config/editor", response_model=EditorConfig)
+async def get_editor_config():
+    """获取编辑器配置"""
+    config = await load_config()
+    return config.editor
+
+@router.get("/api/config/features", response_model=FeaturesConfig)
+async def get_features_config():
+    """获取功能配置"""
+    config = await load_config()
+    return config.features
+
+@router.put("/api/config", response_model=ConfigSettings)
+async def update_config(request: ConfigUpdateRequest):
+    """更新配置"""
+    config = await load_config()
+    
+    # 更新UI配置
+    if request.ui:
+        ui_update = request.ui.dict(exclude_unset=True)
+        if ui_update:
+            config.ui = UIConfig(**{**config.ui.dict(), **ui_update})
+    
+    # 更新编辑器配置
+    if request.editor:
+        editor_update = request.editor.dict(exclude_unset=True)
+        if editor_update:
+            config.editor = EditorConfig(**{**config.editor.dict(), **editor_update})
+    
+    # 更新功能配置
+    if request.features:
+        features_update = request.features.dict(exclude_unset=True)
+        if features_update:
+            config.features = FeaturesConfig(**{**config.features.dict(), **features_update})
+    
+    # 更新时间戳
+    config.updated_at = datetime.now().isoformat()
+    
+    await save_config(config)
+    return config
+
+@router.put("/api/config/ui", response_model=UIConfig)
+async def update_ui_config(request: UIConfigUpdate):
+    """更新UI配置"""
+    config = await load_config()
+    
+    # 只更新提供的字段
+    update_data = request.dict(exclude_unset=True)
+    if update_data:
+        config.ui = UIConfig(**{**config.ui.dict(), **update_data})
+        config.updated_at = datetime.now().isoformat()
+        await save_config(config)
+    
+    return config.ui
+
+@router.put("/api/config/editor", response_model=EditorConfig)
+async def update_editor_config(request: EditorConfigUpdate):
+    """更新编辑器配置"""
+    config = await load_config()
+    
+    # 只更新提供的字段
+    update_data = request.dict(exclude_unset=True)
+    if update_data:
+        config.editor = EditorConfig(**{**config.editor.dict(), **update_data})
+        config.updated_at = datetime.now().isoformat()
+        await save_config(config)
+    
+    return config.editor
+
+@router.put("/api/config/features", response_model=FeaturesConfig)
+async def update_features_config(request: FeaturesConfigUpdate):
+    """更新功能配置"""
+    config = await load_config()
+    
+    # 只更新提供的字段
+    update_data = request.dict(exclude_unset=True)
+    if update_data:
+        config.features = FeaturesConfig(**{**config.features.dict(), **update_data})
+        config.updated_at = datetime.now().isoformat()
+        await save_config(config)
+    
+    return config.features
+
+# 单个配置项更新端点
+@router.get("/api/config/ui/mode")
+async def get_ui_mode():
+    """获取UI模式配置"""
+    config = await load_config()
+    return {"mode": config.ui.mode}
+
+@router.put("/api/config/ui/mode")
+async def update_ui_mode(mode: str):
+    """更新UI模式配置"""
+    config = await load_config()
+    
+    # 验证模式值
+    if mode not in ["agent", "expert"]:
+        raise HTTPException(status_code=400, detail="Mode must be 'agent' or 'expert'")
+    
+    config.ui.mode = mode
+    config.updated_at = datetime.now().isoformat()
+    await save_config(config)
+    
+    return {"mode": mode}