auto-coder 0.1.324__tar.gz → 0.1.326__tar.gz

{auto_coder-0.1.324 → auto_coder-0.1.326}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.324
+Version: 0.1.326
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.324 → auto_coder-0.1.326}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.324
+Version: 0.1.326
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.324 → auto_coder-0.1.326}/src/autocoder/auto_coder_runner.py

@@ -1416,8 +1416,8 @@ def commit(query: str):
                 commit_message = git_utils.generate_commit_message.with_llm(llm).run(
                     uncommitted_changes
                 )                
-                memory["conversation"].append(
-                    {"role": "user", "content": commit_message})
+                # memory["conversation"].append(
+                #     {"role": "user", "content": commit_message})
             except Exception as e:
                 printer.print_in_terminal("commit_failed", style="red", error=str(e), model_name=target_model)
                 return
@@ -1479,7 +1479,7 @@ def coding(query: str):
         code_next(query)
         return
 
-    memory["conversation"].append({"role": "user", "content": query})
+    # memory["conversation"].append({"role": "user", "content": query})
     conf = memory.get("conf", {})
 
     current_files = memory["current_files"]["files"]
@@ -1649,13 +1649,11 @@ def chat(query: str):
     if len(commands_infos) > 0:
         if "query" in commands_infos:
             query = " ".join(commands_infos["query"]["args"])
-        else:
-            # 获取第一个有位置参数的command 的最后一个位置参数作为默认query 
+        else:            
             temp_query = ""
             for (command,command_info) in commands_infos.items():
                 if command_info["args"]:
-                    temp_query = " ".join(command_info["args"])
-                    # 删除break，使循环继续，这样最后一个有args的command会覆盖之前的            
+                    temp_query = " ".join(command_info["args"])                    
             query = temp_query
 
     is_new = "new" in commands_infos

{auto_coder-0.1.324 → auto_coder-0.1.326}/src/autocoder/auto_coder_server.py

@@ -198,7 +198,7 @@ async def delete_config(key: str):
 
 @app.post("/coding")
 async def coding(request: QueryRequest, background_tasks: BackgroundTasks):
-    memory["conversation"].append({"role": "user", "content": request.query})
+    # memory["conversation"].append({"role": "user", "content": request.query})
     conf = memory.get("conf", {})
     current_files = memory["current_files"]["files"]
     request_id = str(uuid.uuid4())

{auto_coder-0.1.324 → auto_coder-0.1.326}/src/autocoder/common/v2/code_editblock_manager.py

@@ -39,7 +39,7 @@ class CodeEditBlockManager:
     It generates code, lints it, and if there are errors, regenerates the code up to 5 times
     before merging the final result.
     """
-    
+
     def __init__(
         self,
         llm: byzerllm.ByzerLLM,
@@ -56,11 +56,12 @@ class CodeEditBlockManager:
         self.generate_times_same_model = args.generate_times_same_model
         self.max_correction_attempts = args.auto_fix_lint_max_attempts
         self.printer = Printer()
-        
+
         # Initialize sub-components
-        self.code_generator = CodeAutoGenerateEditBlock(llm, args, action, fence_0, fence_1)
+        self.code_generator = CodeAutoGenerateEditBlock(
+            llm, args, action, fence_0, fence_1)
         self.code_merger = CodeAutoMergeEditBlock(llm, args, fence_0, fence_1)
-        
+
         # Create shadow manager for linting
         self.shadow_manager = ShadowManager(args.source_dir, args.event_file)
         self.shadow_linter = ShadowLinter(self.shadow_manager, verbose=False)
@@ -72,7 +73,7 @@ class CodeEditBlockManager:
         <lint_issues>
         {{ lint_issues }}
         </lint_issues>
-        
+
         用户原始需求:
         <user_query_wrapper>
         {{ query }}
@@ -81,79 +82,80 @@ class CodeEditBlockManager:
         修复上述问题，请确保代码质量问题被解决，同时保持代码的原有功能。
         请严格遵守*SEARCH/REPLACE block*的格式。
         """
-        
+
     def _create_shadow_files_from_edits(self, generation_result: CodeGenerateResult) -> Dict[str, str]:
         """
         从编辑块内容中提取代码并创建临时影子文件用于检查。
-        
+
         参数:
             generation_result (CodeGenerateResult): 包含SEARCH/REPLACE块的内容
-            
+
         返回:
             Dict[str, str]: 映射 {影子文件路径: 内容}
         """
         result = self.code_merger.choose_best_choice(generation_result)
-        merge = self.code_merger._merge_code_without_effect(result.contents[0])        
+        merge = self.code_merger._merge_code_without_effect(result.contents[0])
         shadow_files = {}
         for file_path, new_content in merge.success_blocks:
             self.shadow_manager.update_file(file_path, new_content)
-            shadow_files[self.shadow_manager.to_shadow_path(file_path)] = new_content
+            shadow_files[self.shadow_manager.to_shadow_path(
+                file_path)] = new_content
 
         return shadow_files
 
-    def _format_lint_issues(self, lint_results:ProjectLintResult,levels:List[IssueSeverity]=[IssueSeverity.ERROR]) -> str:
+    def _format_lint_issues(self, lint_results: ProjectLintResult, levels: List[IssueSeverity] = [IssueSeverity.ERROR]) -> str:
         """
         将linter结果格式化为字符串供模型使用
-        
+
         参数:
             lint_results: Linter结果对象
             level: 过滤问题的级别
-            
+
         返回:
             str: 格式化的问题描述
         """
         formatted_issues = []
-        
-        for file_path, result in lint_results.file_results.items():                        
+
+        for file_path, result in lint_results.file_results.items():
             file_has_issues = False
             file_issues = []
-            
-            for issue in result.issues:                
+
+            for issue in result.issues:
                 if issue.severity.value not in levels:
                     continue
-                    
+
                 if not file_has_issues:
                     file_has_issues = True
                     file_issues.append(f"文件: {file_path}")
-                
+
                 severity = "错误" if issue.severity == IssueSeverity.ERROR else "警告" if issue.severity == IssueSeverity.WARNING else "信息"
                 line_info = f"第{issue.position.line}行"
                 if issue.position.column:
                     line_info += f", 第{issue.position.column}列"
-                
+
                 file_issues.append(
                     f"  - [{severity}] {line_info}: {issue.message} (规则: {issue.code})"
                 )
-            
+
             if file_has_issues:
                 formatted_issues.extend(file_issues)
                 formatted_issues.append("")  # 空行分隔不同文件
-            
+
         return "\n".join(formatted_issues)
 
-    def _count_errors(self, lint_results:ProjectLintResult,levels:List[IssueSeverity]=[IssueSeverity.ERROR]) -> int:
+    def _count_errors(self, lint_results: ProjectLintResult, levels: List[IssueSeverity] = [IssueSeverity.ERROR]) -> int:
         """
         计算lint结果中的错误数量
-        
+
         参数:
             lint_results: Linter结果对象
-            
+
         返回:
             int: 错误数量
         """
         error_count = 0
-        
-        for _, result in lint_results.file_results.items():                            
+
+        for _, result in lint_results.file_results.items():
             if IssueSeverity.ERROR in levels:
                 error_count += result.error_count
             if IssueSeverity.WARNING in levels:
@@ -162,25 +164,26 @@ class CodeEditBlockManager:
                 error_count += result.info_count
             if IssueSeverity.HINT in levels:
                 error_count += result.hint_count
-                
+
         return error_count
 
     def generate_and_fix(self, query: str, source_code_list: SourceCodeList) -> CodeGenerateResult:
         """
         生成代码，运行linter，修复错误，最多尝试指定次数
-        
+
         参数:
             query (str): 用户查询
             source_code_list (SourceCodeList): 源代码列表
-            
+
         返回:
             CodeGenerateResult: 生成的代码结果
         """
         # 初始代码生成
         self.printer.print_in_terminal("generating_initial_code")
         start_time = time.time()
-        generation_result = self.code_generator.single_round_run(query, source_code_list)
-        
+        generation_result = self.code_generator.single_round_run(
+            query, source_code_list)
+
         token_cost_calculator = TokenCostCalculator(args=self.args)
         token_cost_calculator.track_token_usage_by_generate(
             llm=self.llm,
@@ -189,113 +192,112 @@ class CodeEditBlockManager:
             start_time=start_time,
             end_time=time.time()
         )
-        
+
         # 确保结果非空
         if not generation_result.contents:
             self.printer.print_in_terminal("generation_failed", style="red")
             return generation_result
-                            
-        
+
         # 最多尝试修复5次
         for attempt in range(self.max_correction_attempts):
             global_cancel.check_and_raise()
             # 代码生成结果更新到影子文件里去
-            shadow_files = self._create_shadow_files_from_edits(generation_result)
-            
+            shadow_files = self._create_shadow_files_from_edits(
+                generation_result)
+
             if not shadow_files:
-                self.printer.print_in_terminal("no_files_to_lint", style="yellow")
+                self.printer.print_in_terminal(
+                    "no_files_to_lint", style="yellow")
                 break
-                
+
             # 运行linter
             lint_results = self.shadow_linter.lint_all_shadow_files()
             error_count = self._count_errors(lint_results)
             # print(f"error_count: {error_count}")
-            # print(f"lint_results: {json.dumps(lint_results.model_dump(), indent=4,ensure_ascii=False)}")            
-            
+            # print(f"lint_results: {json.dumps(lint_results.model_dump(), indent=4,ensure_ascii=False)}")
+
             # 如果没有错误则完成
             if error_count == 0:
-                self.printer.print_in_terminal("no_lint_errors_found", style="green")
+                self.printer.print_in_terminal(
+                    "no_lint_errors_found", style="green")
                 break
 
             # 格式化lint问题
-            formatted_issues = self._format_lint_issues(lint_results, [IssueSeverity.ERROR, IssueSeverity.WARNING])            
+            formatted_issues = self._format_lint_issues(
+                lint_results, [IssueSeverity.ERROR, IssueSeverity.WARNING])
 
             # 打印当前错误
             self.printer.print_in_terminal(
-                "lint_attempt_status", 
-                style="yellow", 
-                attempt=(attempt + 1), 
+                "lint_attempt_status",
+                style="yellow",
+                attempt=(attempt + 1),
                 max_correction_attempts=self.max_correction_attempts,
                 error_count=error_count,
                 formatted_issues=formatted_issues
             )
 
-            get_event_manager(self.args.event_file).add_event(Event(
-                event_type=EventType.RESULT,
-                content=EventContentCreator.create_result(
-                    content=EventContentCreator.ResultContent(
-                        content=f"Lint attempt {attempt + 1}/{self.max_correction_attempts}: Found {error_count} issues:\n {formatted_issues}",
-                        metadata={}
-                    )
-                ).to_dict(),
+            get_event_manager(self.args.event_file).write_result(EventContentCreator.create_result(
+                content=EventContentCreator.ResultContent(content=f"Lint attempt {attempt + 1}/{self.max_correction_attempts}: Found {error_count} issues:\n {formatted_issues}",
+                                                          metadata={}
+                                                          ).to_dict(),
                 metadata={
                     "stream_out_type": LintStreamOutType.LINT.value,
                     "action_file": self.args.file
                 }
             ))
-            
+
             if attempt == self.max_correction_attempts - 1:
-                self.printer.print_in_terminal("max_attempts_reached", style="yellow")
+                self.printer.print_in_terminal(
+                    "max_attempts_reached", style="yellow")
                 break
-                
-            
-            
+
             # 准备修复提示
             fix_prompt = self.fix_linter_errors.prompt(
                 query=query,
                 lint_issues=formatted_issues
             )
-            
+
             # for source in source_code_list.sources:
-            #     print(f"file_path: {source.module_name}")                
+            #     print(f"file_path: {source.module_name}")
             # print(f"fix_prompt: {fix_prompt}")
-            
+
             # 将 shadow_files 转化为 source_code_list
             start_time = time.time()
-            source_code_list = self.code_merger.get_source_code_list_from_shadow_files(shadow_files)
-            generation_result = self.code_generator.single_round_run(fix_prompt, source_code_list) 
+            source_code_list = self.code_merger.get_source_code_list_from_shadow_files(
+                shadow_files)
+            generation_result = self.code_generator.single_round_run(
+                fix_prompt, source_code_list)
             token_cost_calculator.track_token_usage_by_generate(
                 llm=self.llm,
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
                 end_time=time.time()
-            )           
+            )
 
-        
         # 清理临时影子文件
         self.shadow_manager.clean_shadows()
-        
+
         # 返回最终结果
         return generation_result
 
     def run(self, query: str, source_code_list: SourceCodeList) -> CodeGenerateResult:
         """
         执行完整的代码生成、修复、合并流程
-        
+
         参数:
             query (str): 用户查询
             source_code_list (SourceCodeList): 源代码列表
-            
+
         返回:
             CodeGenerateResult: 生成和修复的代码结果
         """
-        # 生成代码并自动修复lint错误        
+        # 生成代码并自动修复lint错误
 
         generation_result = self.generate_and_fix(query, source_code_list)
-        global_cancel.check_and_raise()        
+        global_cancel.check_and_raise()
 
-        # 合并代码        
+        # 合并代码
         self.code_merger.merge_code(generation_result)
-        
-        return generation_result 
+
+        return generation_result

{auto_coder-0.1.324 → auto_coder-0.1.326}/src/autocoder/memory/active_context_manager.py

@@ -108,8 +108,22 @@ class ActiveContextManager:
         global_logger.configure(
             handlers=[
                 # 移除控制台输出，只保留文件输出
-                {"sink": log_file, "level": "DEBUG", "rotation": "10 MB", "retention": "1 week",
-                 "format": "{time:YYYY-MM-DD HH:mm:ss} | {level} | {name} | {message}"}
+                # 文件 Handler（仅处理 DirectoryMapper）
+                {
+                    "sink": log_file,
+                    "level": "INFO",
+                    "rotation": "10 MB",
+                    "retention": "1 week",
+                    "format": "{time:YYYY-MM-DD HH:mm:ss} | {level} | {name} | {message}",
+                    "filter": lambda record: record["extra"].get("name") in ["DirectoryMapper", "ActiveContextManager","ActivePackage","AsyncProcessor"]
+                },
+                # 控制台 Handler（排除 DirectoryMapper）
+                {
+                    "sink": sys.stdout,
+                    "level": "INFO",
+                    "format": "{time:YYYY-MM-DD HH:mm:ss} | {name} | {message}",
+                    "filter": lambda record: record["extra"].get("name") not in ["ActiveContextManager"]
+                }
             ]
         )
 
@@ -118,17 +132,18 @@ class ActiveContextManager:
         self.logger.info(f"初始化 ActiveContextManager，日志输出到 {log_file}")
 
         self.llm = llm
-        self.directory_mapper = DirectoryMapper()        
+        self.directory_mapper = DirectoryMapper()
         self.async_processor = AsyncProcessor()
         self.yml_manager = ActionYmlFileManager(source_dir)
-        
+
         # 任务持久化文件路径
-        self.tasks_file_path = os.path.join(source_dir, ".auto-coder", "active-context", "tasks.json")
-        
+        self.tasks_file_path = os.path.join(
+            source_dir, ".auto-coder", "active-context", "tasks.json")
+
         # 加载已存在的任务
         self.tasks = self._load_tasks_from_disk()
         self.tasks_lock = threading.Lock()  # 添加锁以保护任务字典的操作
-        
+
         self.printer = Printer()
 
         # 初始化任务队列和锁
@@ -142,11 +157,11 @@ class ActiveContextManager:
 
         # 标记为已初始化
         self._is_initialized = True
-        
+
     def _load_tasks_from_disk(self) -> Dict[str, Dict[str, Any]]:
         """
         从磁盘加载任务信息
-        
+
         Returns:
             Dict: 任务字典
         """
@@ -154,22 +169,25 @@ class ActiveContextManager:
             if os.path.exists(self.tasks_file_path):
                 with open(self.tasks_file_path, 'r', encoding='utf-8') as f:
                     tasks_json = json.load(f)
-                
+
                 # 转换时间字符串为datetime对象
                 for task_id, task in tasks_json.items():
                     if 'start_time' in task and task['start_time']:
                         try:
-                            task['start_time'] = datetime.fromisoformat(task['start_time'])
+                            task['start_time'] = datetime.fromisoformat(
+                                task['start_time'])
                         except:
                             task['start_time'] = None
-                            
+
                     if 'completion_time' in task and task['completion_time']:
                         try:
-                            task['completion_time'] = datetime.fromisoformat(task['completion_time'])
+                            task['completion_time'] = datetime.fromisoformat(
+                                task['completion_time'])
                         except:
                             task['completion_time'] = None
-                
-                self.logger.info(f"从 {self.tasks_file_path} 加载了 {len(tasks_json)} 个任务")
+
+                self.logger.info(
+                    f"从 {self.tasks_file_path} 加载了 {len(tasks_json)} 个任务")
                 return tasks_json
             else:
                 self.logger.info(f"任务文件 {self.tasks_file_path} 不存在，将创建新文件")
@@ -177,7 +195,7 @@ class ActiveContextManager:
         except Exception as e:
             self.logger.error(f"加载任务文件失败: {e}")
             return {}
-            
+
     def _save_tasks_to_disk(self):
         """
         将任务信息保存到磁盘
@@ -195,22 +213,24 @@ class ActiveContextManager:
                         else:
                             task_copy[k] = v
                     tasks_copy[task_id] = task_copy
-                
+
                 # 确保目录存在
-                os.makedirs(os.path.dirname(self.tasks_file_path), exist_ok=True)
-                
+                os.makedirs(os.path.dirname(
+                    self.tasks_file_path), exist_ok=True)
+
                 # 写入JSON文件
                 with open(self.tasks_file_path, 'w', encoding='utf-8') as f:
                     json.dump(tasks_copy, f, ensure_ascii=False, indent=2)
-                
-                self.logger.debug(f"成功保存 {len(tasks_copy)} 个任务到 {self.tasks_file_path}")
+
+                self.logger.debug(
+                    f"成功保存 {len(tasks_copy)} 个任务到 {self.tasks_file_path}")
         except Exception as e:
             self.logger.error(f"保存任务到磁盘失败: {e}")
-            
+
     def _update_task(self, task_id: str, **kwargs):
         """
         更新任务信息并持久化到磁盘
-        
+
         Args:
             task_id: 任务ID
             **kwargs: 要更新的任务属性
@@ -221,7 +241,7 @@ class ActiveContextManager:
                 self.logger.debug(f"更新任务 {task_id} 信息: {kwargs.keys()}")
             else:
                 self.logger.warning(f"尝试更新不存在的任务: {task_id}")
-                
+
         # 持久化到磁盘
         self._save_tasks_to_disk()
 
@@ -326,8 +346,8 @@ class ActiveContextManager:
             self.logger.error(f"Error in process_changes: {e}")
             raise
 
-    def _execute_task_in_background(self, task_id: str, 
-                                    query: str, 
+    def _execute_task_in_background(self, task_id: str,
+                                    query: str,
                                     changed_urls: List[str], current_urls: List[str],
                                     args: AutoCoderArgs):
         """
@@ -348,7 +368,8 @@ class ActiveContextManager:
                 task_id, query, changed_urls, current_urls, args)
 
             # 更新任务状态为已完成
-            self._update_task(task_id, status='completed', completion_time=datetime.now())
+            self._update_task(task_id, status='completed',
+                              completion_time=datetime.now())
 
         except Exception as e:
             # 记录错误，但不允许异常传播到主线程
@@ -409,7 +430,7 @@ class ActiveContextManager:
             input_tokens = 0
             output_tokens = 0
             cost = 0.0
-            
+
             for i, context in enumerate(directory_contexts):
                 dir_path = context['directory_path']
                 self.logger.info(
@@ -417,29 +438,30 @@ class ActiveContextManager:
                 try:
                     result = self._process_directory_context(
                         context, query, file_changes, args)
-                    
+
                     # 如果返回了token和费用信息，则累加
                     if isinstance(result, dict):
                         dir_tokens = result.get('total_tokens', 0)
                         dir_input_tokens = result.get('input_tokens', 0)
                         dir_output_tokens = result.get('output_tokens', 0)
                         dir_cost = result.get('cost', 0.0)
-                        
+
                         total_tokens += dir_tokens
                         input_tokens += dir_input_tokens
                         output_tokens += dir_output_tokens
                         cost += dir_cost
-                        
-                        self.logger.info(f"目录 {dir_path} 处理完成，使用了 {dir_tokens} tokens，费用 {dir_cost:.6f}")
-                    
+
+                        self.logger.info(
+                            f"目录 {dir_path} 处理完成，使用了 {dir_tokens} tokens，费用 {dir_cost:.6f}")
+
                     processed_dirs.append(os.path.basename(dir_path))
-                    
+
                 except Exception as e:
                     self.logger.error(f"处理目录 {dir_path} 时出错: {str(e)}")
-            
+
             # 更新任务的token和费用信息
             self._update_task(
-                task_id, 
+                task_id,
                 total_tokens=total_tokens,
                 input_tokens=input_tokens,
                 output_tokens=output_tokens,
@@ -448,16 +470,17 @@ class ActiveContextManager:
             )
 
             # 3. 更新任务状态
-            self._update_task(task_id, 
-                             status='completed', 
-                             completion_time=datetime.now())
+            self._update_task(task_id,
+                              status='completed',
+                              completion_time=datetime.now())
 
             duration = (datetime.now() -
                         self.tasks[task_id]['start_time']).total_seconds()
             self.logger.info(f"==== 任务 {task_id} 处理完成 ====")
             self.logger.info(f"总耗时: {duration:.2f}秒")
             self.logger.info(f"处理的目录数: {len(processed_dirs)}")
-            self.logger.info(f"使用总tokens: {total_tokens} (输入: {input_tokens}, 输出: {output_tokens})")
+            self.logger.info(
+                f"使用总tokens: {total_tokens} (输入: {input_tokens}, 输出: {output_tokens})")
             self.logger.info(f"总费用: {cost:.6f}")
 
         except Exception as e:
@@ -474,7 +497,7 @@ class ActiveContextManager:
             query: 用户查询/需求
             file_changes: 文件变更字典，键为文件路径，值为(变更前内容, 变更后内容)的元组
             args: AutoCoderArgs实例，包含配置信息
-            
+
         Returns:
             Dict: 包含token和费用信息的字典
         """
@@ -544,9 +567,9 @@ class ActiveContextManager:
 
             # 3. 生成活动文件内容
             self.logger.info(f"开始为目录 {directory_path} 生成活动文件内容...")
-            
+
             active_package = ActivePackage(self.llm, args.product_mode)
-            
+
             # 调用生成方法，捕获token和费用信息
             generation_result = active_package.generate_active_file(
                 context,
@@ -555,7 +578,7 @@ class ActiveContextManager:
                 file_changes=directory_changes,
                 args=args
             )
-            
+
             # 检查返回值类型，兼容现有逻辑
             if isinstance(generation_result, tuple) and len(generation_result) >= 2:
                 markdown_content = generation_result[0]
@@ -582,7 +605,7 @@ class ActiveContextManager:
 
             self.logger.info(f"成功创建/更新目录 {directory_path} 的活动文件")
             self.logger.debug(f"--- 处理目录上下文完成: {directory_path} ---")
-            
+
             # 返回token和费用信息
             return tokens_info
 
@@ -661,7 +684,7 @@ class ActiveContextManager:
 
         if 'error' in task:
             result['error'] = task['error']
-            
+
         # 添加token和费用信息
         for key in ['total_tokens', 'input_tokens', 'output_tokens', 'cost']:
             if key in task: