auto-coder 0.1.259__py3-none-any.whl → 0.1.261__py3-none-any.whl

autocoder/common/shells.py

@@ -9,6 +9,8 @@ from rich.panel import Panel
 from rich.text import Text
 from rich.live import Live
 
+from autocoder.common.result_manager import ResultManager
+
 def get_terminal_name() -> str:
     """
     获取当前终端名称(自动适配 Windows/Linux/Mac)
@@ -139,6 +141,7 @@ def execute_shell_command(command: str):
         encoding (str, optional): Override default encoding. Defaults to None.
     """
     console = Console()
+    result_manager = ResultManager()
     try:
         # Get terminal encoding
         encoding = get_terminal_encoding()
@@ -199,7 +202,13 @@ def execute_shell_command(command: str):
             output.append(safe_decode(remaining_out, encoding))
         if remaining_err:
             output.append(f"ERROR: {safe_decode(remaining_err, encoding)}")
-
+        
+        result_manager.add_result(content="\n".join(output),meta={
+            "action": "execute_shell_command",
+            "input": {
+                "command": command
+            }
+        })
         # Show final output
         console.print(
             Panel(
@@ -210,16 +219,23 @@ def execute_shell_command(command: str):
             )
         )
 
-        if process.returncode != 0:
-            console.print(
-                f"[bold red]Command failed with code {process.returncode}[/bold red]"
-            )
-
     except FileNotFoundError:
+        result_manager.add_result(content=f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]",meta={
+            "action": "execute_shell_command",
+            "input": {
+                "command": command
+            }
+        })
         console.print(
             f"[bold red]Command not found:[/bold red] [yellow]{command}[/yellow]"
         )
     except Exception as e:
+        result_manager.add_result(content=f"[bold red]Unexpected error:[/bold red] [yellow]{str(e)}[/yellow]",meta={
+            "action": "execute_shell_command",
+            "input": {
+                "command": command
+            }
+        })
         console.print(
             f"[bold red]Unexpected error:[/bold red] [yellow]{str(e)}[/yellow]"
         )

autocoder/common/utils_code_auto_generate.py

@@ -1,5 +1,5 @@
 from byzerllm import ByzerLLM,SimpleByzerLLM
-from typing import Generator, List, Any, Union
+from typing import Generator, List, Any, Union, Optional, Callable
 from pydantic import BaseModel
 from loguru import logger
 
@@ -41,7 +41,7 @@ def chat_with_continue(llm: Union[ByzerLLM,SimpleByzerLLM], conversations: List[
 def stream_chat_with_continue(
     llm: Union[ByzerLLM, SimpleByzerLLM], 
     conversations: List[dict], 
-    llm_config: dict
+    llm_config: dict    
 ) -> Generator[Any, None, None]:
     """
     流式处理并继续生成内容，直到完成。

autocoder/dispacher/actions/action.py

@@ -29,6 +29,7 @@ from autocoder.common.printer import Printer
 from autocoder.utils.llms import get_llm_names
 from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.common import SourceCodeList
+from autocoder.common.global_cancel import global_cancel
 
 
 class BaseAction:    
@@ -106,6 +107,10 @@ class ActionTSProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )                
 
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+                             
         if args.execute:             
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -145,8 +150,14 @@ class ActionTSProject(BaseAction):
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
+            
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")
@@ -206,6 +217,10 @@ class ActionPyScriptProject(BaseAction):
 
     def process_content(self, source_code_list: SourceCodeList):
         args = self.args
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+        
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -245,8 +260,14 @@ class ActionPyScriptProject(BaseAction):
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
+
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")
@@ -329,6 +350,10 @@ class ActionPyProject(BaseAction):
                 content_length=content_length,
                 max_length=self.args.model_max_input_length
             )
+        
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
 
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
@@ -370,8 +395,14 @@ class ActionPyProject(BaseAction):
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
+
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")
@@ -446,6 +477,10 @@ class ActionSuffixProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )                
 
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
@@ -485,8 +520,14 @@ class ActionSuffixProject(BaseAction):
             input_cost=input_tokens_cost,
             output_cost=generated_tokens_cost,
             speed=round(speed, 2),
-            model_names=model_names
+            model_names=model_names,
+            sampling_count=len(generate_result.contents)
         )
+        
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")                    )
+        
         merge_result = None
         if args.execute and args.auto_merge:
             self.printer.print_in_terminal("code_merge_start")

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -16,6 +16,7 @@ from autocoder.common.printer import Printer
 import time
 from autocoder.utils.llms import get_llm_names
 from autocoder.common import SourceCodeList
+from autocoder.common.global_cancel import global_cancel
 from loguru import logger
 class ActionRegexProject:
     def __init__(
@@ -61,6 +62,11 @@ class ActionRegexProject:
                 content = content[: self.args.model_max_input_length]
 
         start_time = time.time()
+        
+        if global_cancel.requested:
+            printer = Printer()            
+            raise Exception(printer.get_message_from_key("generation_cancelled")) 
+        
         if args.execute:
             self.printer.print_in_terminal("code_generation_start")
             
@@ -100,8 +106,14 @@ class ActionRegexProject:
                 input_cost=input_tokens_cost,
                 output_cost=generated_tokens_cost,
                 speed=round(speed, 2),
-                model_names=model_names
+                model_names=model_names,
+                sampling_count=len(generate_result.contents)
             )
+
+            if global_cancel.requested:
+                printer = Printer()            
+                raise Exception(printer.get_message_from_key("generation_cancelled")) 
+            
             merge_result = None
             if args.execute and args.auto_merge:
                 self.printer.print_in_terminal("code_merge_start")

autocoder/index/filter/quick_filter.py

@@ -19,6 +19,7 @@ from concurrent.futures import ThreadPoolExecutor
 from byzerllm import MetaHolder
 
 from autocoder.utils.llms import get_llm_names, get_model_info
+from loguru import logger
 
 
 def get_file_path(file_path):
@@ -229,7 +230,8 @@ class QuickFilter():
         {{ content }}
         </index>
 
-        索引文件包含文件序号(##[]括起来的部分)，文件路径，文件符号信息等。
+        索引文件包含文件序号(##[]括起来的部分)，文件路径，文件符号信息等。            
+
         下面是用户的查询需求：
 
         <query>
@@ -248,16 +250,18 @@ class QuickFilter():
         }
         ```
 
-        特别注意
-        1. 如果用户的query里 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回，并且查看他们依赖的文件是否相关。        
+        特别注意    
+        1. 如果用户的query里 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回，并且尝试通过索引文件诸如导入语句等信息找到这些文件依赖的其他文件，再分析这些文件是否需要提供才能满足后续编码。
         2. 如果 query 里是一段历史对话，那么对话里的内容提及的文件路径必须要返回。
-        3. json格式数据不允许有注释        
+        3. 想想，如果是你需要修改代码，然后满足这个需求，根据索引文件，你希望查看哪些文件，修改哪些文件，然后返回这些文件。
+        4. 返回的 json格式数据不允许有注释
         '''
+
         file_meta_str = "\n".join(
             [f"##[{index}]{item.module_name}\n{item.symbols}" for index, item in enumerate(file_meta_list)])
         context = {
             "content": file_meta_str,
-            "query": query
+            "query": query            
         }
         return context
 
@@ -308,13 +312,22 @@ class QuickFilter():
                 {}
             )
 
+            def extract_file_number_list(content: str) -> str:
+                try:
+                    v = to_model(content, FileNumberList)
+                    return "\n".join([index_items[file_number].module_name for file_number in v.file_list])
+                except Exception as e:
+                    logger.error(f"Error extracting file number list: {e}")
+                    return content
+
             # 获取完整响应
             full_response, last_meta = stream_out(
                 stream_generator,
                 model_name=model_name,
                 title=self.printer.get_message_from_key_with_format(
                     "quick_filter_title", model_name=model_name),
-                args=self.args
+                args=self.args,
+                display_func=extract_file_number_list
             )
             # 解析结果
             file_number_list = to_model(full_response, FileNumberList)
@@ -335,6 +348,7 @@ class QuickFilter():
             # 四舍五入到4位小数
             total_input_cost = round(total_input_cost, 4)
             total_output_cost = round(total_output_cost, 4)
+            speed = last_meta.generated_tokens_count / (end_time - start_time)
 
             # 打印 token 统计信息和成本
             self.printer.print_in_terminal(
@@ -345,7 +359,8 @@ class QuickFilter():
                 output_tokens=last_meta.generated_tokens_count,
                 input_cost=total_input_cost,
                 output_cost=total_output_cost,
-                model_names=model_name
+                model_names=model_name,
+                speed=f"{speed:.2f}"
             )
 
         except Exception as e:

autocoder/utils/auto_coder_utils/chat_stream_out.py

@@ -6,7 +6,7 @@ from rich.markdown import Markdown
 from rich.layout import Layout
 from threading import Thread, Lock
 from queue import Queue, Empty
-from typing import Generator, List, Dict, Any, Optional, Tuple, Literal
+from typing import Generator, List, Dict, Any, Optional, Tuple, Callable
 from autocoder.utils.request_queue import RequestValue, RequestOption, StreamValue
 from autocoder.utils.request_queue import request_queue
 import time
@@ -148,7 +148,9 @@ def stream_out(
     console: Optional[Console] = None,
     model_name: Optional[str] = None,
     title: Optional[str] = None,
-    args: Optional[AutoCoderArgs] = None
+    final_title: Optional[str] = None,
+    args: Optional[AutoCoderArgs] = None,
+    display_func: Optional[Callable] = None
 ) -> Tuple[str, Optional[SingleOutputMeta]]:
     """
     处理流式输出事件并在终端中展示
@@ -179,6 +181,7 @@ def stream_out(
     assistant_response = ""
     last_meta = None
     panel_title = title if title is not None else f"Response[ {model_name} ]"  
+    final_panel_title = final_title if final_title is not None else title
     first_token_time = 0.0
     first_token_time_start = time.time()
     try:        
@@ -250,8 +253,8 @@ def stream_out(
                             value=StreamValue(value=[content]),
                             status=RequestOption.RUNNING,
                         ),
-                    )
-                    
+                    )                
+                
                 live.update(
                     Panel(
                         Markdown(display_content),
@@ -266,10 +269,14 @@ def stream_out(
                 lines_buffer.append(current_line)
             
             # 最终显示结果
+            final_display_content = assistant_response
+            if display_func:
+                final_display_content = display_func(assistant_response)
+
             live.update(
                 Panel(
-                    Markdown(assistant_response),
-                    title=f"Final {panel_title}",
+                    Markdown(final_display_content),
+                    title=f"{final_panel_title}",
                     border_style="blue"
                 )
             )            

autocoder/utils/project_structure.py

@@ -0,0 +1,15 @@
+from autocoder.pyproject import PyProject
+from autocoder.tsproject import TSProject
+from autocoder.suffixproject import SuffixProject
+from autocoder.common import AutoCoderArgs
+import byzerllm
+from typing import Union
+
+def get_project_structure(args:AutoCoderArgs, llm:Union[byzerllm.ByzerLLM, byzerllm.SimpleByzerLLM]):
+    if args.project_type == "ts":
+        pp = TSProject(args=args, llm=llm)
+    elif args.project_type == "py":
+        pp = PyProject(args=args, llm=llm)
+    else:
+        pp = SuffixProject(args=args, llm=llm, file_filter=None)
+    return pp.get_tree_like_directory_structure()

autocoder/utils/thread_utils.py

@@ -176,6 +176,7 @@ def run_in_raw_thread():
             exception = []            
             def worker():            
                 try:
+                    # global_cancel.reset()
                     ret = func(*args, **kwargs)
                     result.append(ret)
                     global_cancel.reset()                
@@ -196,6 +197,9 @@ def run_in_raw_thread():
             except KeyboardInterrupt:  
                 global_cancel.set()                              
                 raise KeyboardInterrupt("Task was cancelled by user")
+            except Exception as e:
+                global_cancel.reset()
+                raise
                 
         return wrapper
     return decorator    

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.259"
+__version__ = "0.1.261"