auto-coder 0.1.233__py3-none-any.whl → 0.1.237__py3-none-any.whl

autocoder/common/printer.py

@@ -0,0 +1,49 @@
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+from typing import Optional,Dict,Any
+from byzerllm.utils import format_str_jinja2
+from autocoder.common.auto_coder_lang import get_message
+from autocoder.chat_auto_coder_lang import get_message as get_chat_message
+class Printer:
+    def __init__(self,console:Optional[Console]=None):
+        if console is None:
+            self.console = Console()
+        else:
+            self.console = console
+
+    def get_message_from_key(self, msg_key: str):
+        try:
+            return get_message(msg_key)
+        except Exception as e:
+            return get_chat_message(msg_key)
+
+    def get_message_from_key_with_format(self, msg_key: str, **kwargs):
+        try:
+            return format_str_jinja2(self.get_message_from_key(msg_key), **kwargs)
+        except Exception as e:
+            return format_str_jinja2(self.get_chat_message_from_key(msg_key), **kwargs)
+
+    def print_in_terminal(self, msg_key: str, style: str = None,**kwargs):     
+        try:
+            if style:
+                self.console.print(format_str_jinja2(self.get_message_from_key(msg_key),**kwargs), style=style)
+            else:
+                self.console.print(format_str_jinja2(self.get_message_from_key(msg_key),**kwargs))
+        except Exception as e:
+            print(self.get_message_from_key(msg_key))
+
+    
+    def print_str_in_terminal(self, content: str, style: str = None):     
+        try:
+            if style:
+                self.console.print(content, style=style)
+            else:
+                self.console.print(content)
+        except Exception as e:
+            print(content)   
+
+    def print_panel(self, content: str, text_options:Dict[str,Any], panel_options:Dict[str,Any]):
+        panel = Panel(Text(content, **text_options), **panel_options)
+        self.console.print(panel)    
+                 

autocoder/dispacher/actions/action.py

@@ -25,9 +25,10 @@ from autocoder.common.image_to_page import ImageToPage, ImageToPageDirectly
 from autocoder.utils.conversation_store import store_code_model_conversation
 from loguru import logger
 import time
+from autocoder.common.printer import Printer
 
 
-class BaseAction:
+class BaseAction:    
     def _get_content_length(self, content: str) -> int:
         try:
             tokenizer = BuildinTokenizer()
@@ -43,6 +44,7 @@ class ActionTSProject(BaseAction):
         self.args = args
         self.llm = llm
         self.pp = None
+        self.printer = Printer()
 
     def run(self):
         args = self.args
@@ -54,9 +56,14 @@ class ActionTSProject(BaseAction):
 
         source_code = pp.output()
         if self.llm:
+            if args.in_code_apply:
+                old_query = args.query
+                args.query = (args.context or "") + "\n\n" + args.query
             source_code = build_index_and_filter_files(
                 llm=self.llm, args=args, sources=pp.sources
             )
+            if args.in_code_apply:
+                args.query = old_query
 
         if args.image_file:
             if args.image_mode == "iterative":
@@ -91,8 +98,8 @@ 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 args.execute:            
-            logger.info("Auto generate the code...")
+        if args.execute:             
+            self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
             if args.auto_merge == "diff":
                 generate = CodeAutoGenerateDiff(
@@ -116,10 +123,15 @@ class ActionTSProject(BaseAction):
                 generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
-            logger.info(f"Code generation completed in {time.time() - start_time:.2f} seconds, input_tokens_count: {generate_result.metadata.get('input_tokens_count', 0)}, generated_tokens_count: {generate_result.metadata.get('generated_tokens_count', 0)}")    
+            self.printer.print_in_terminal(
+                "code_generation_complete",
+                duration=time.time() - start_time,
+                input_tokens=generate_result.metadata.get('input_tokens_count', 0),
+                output_tokens=generate_result.metadata.get('generated_tokens_count', 0)
+            )
             merge_result = None
             if args.execute and args.auto_merge:
-                logger.info("Auto merge the code...")
+                self.printer.print_in_terminal("code_merge_start")
                 if args.auto_merge == "diff":
                     code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
                     merge_result = code_merge.merge_code(generate_result=generate_result)
@@ -160,6 +172,7 @@ class ActionPyScriptProject(BaseAction):
     ) -> None:
         self.args = args
         self.llm = llm
+        self.printer = Printer()
 
     def run(self) -> bool:
         args = self.args
@@ -175,7 +188,7 @@ class ActionPyScriptProject(BaseAction):
     def process_content(self, content: str):
         args = self.args
         if args.execute:
-            logger.info("Auto generate the code...")
+            self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
             if args.auto_merge == "diff":
                 generate = CodeAutoGenerateDiff(
@@ -200,10 +213,15 @@ class ActionPyScriptProject(BaseAction):
                     query=args.query, source_content=content
                 )
 
-            logger.info(f"Code generation completed in {time.time() - start_time:.2f} seconds, input_tokens_count: {generate_result.metadata.get('input_tokens_count', 0)}, generated_tokens_count: {generate_result.metadata.get('generated_tokens_count', 0)}")    
+            self.printer.print_in_terminal(
+                "code_generation_complete",
+                duration=time.time() - start_time,
+                input_tokens=generate_result.metadata.get('input_tokens_count', 0),
+                output_tokens=generate_result.metadata.get('generated_tokens_count', 0)
+            )
             merge_result = None
             if args.execute and args.auto_merge:
-                logger.info("Auto merge the code...")
+                self.printer.print_in_terminal("code_merge_start")
                 if args.auto_merge == "diff":
                     code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
                     merge_result = code_merge.merge_code(generate_result=generate_result)
@@ -236,7 +254,12 @@ class ActionPyScriptProject(BaseAction):
                 )
 
             end_time = time.time()
-            logger.info(f"Code generation completed in {end_time - start_time:.2f} seconds")
+            self.printer.print_in_terminal(
+                "code_generation_complete",
+                duration=end_time - start_time,
+                input_tokens=generate_result.metadata.get('input_tokens_count', 0),
+                output_tokens=generate_result.metadata.get('generated_tokens_count', 0)
+            )
             with open(self.args.target_file, "w") as file:
                 file.write(content)
 
@@ -248,6 +271,7 @@ class ActionPyProject(BaseAction):
         self.args = args
         self.llm = llm
         self.pp = None
+        self.printer = Printer()
 
     def run(self):
         args = self.args
@@ -256,11 +280,17 @@ class ActionPyProject(BaseAction):
         pp = PyProject(args=self.args, llm=self.llm)
         self.pp = pp
         pp.run(packages=args.py_packages.split(",") if args.py_packages else [])            
-        source_code = pp.output()
+        source_code = pp.output()                
+
         if self.llm:
+            old_query = args.query
+            if args.in_code_apply:
+                args.query = (args.context or "") + "\n\n" + args.query
             source_code = build_index_and_filter_files(
                 llm=self.llm, args=args, sources=pp.sources
             )
+            if args.in_code_apply:
+                args.query = old_query
 
         self.process_content(source_code)
         return True
@@ -271,12 +301,15 @@ class ActionPyProject(BaseAction):
         if args.execute and self.llm and not args.human_as_model:
             content_length = self._get_content_length(content)
             if content_length > self.args.model_max_input_length:
-                logger.warning(
-                    f'''Content(send to model) is {content_length} tokens (you may collect too much files), which is larger than the maximum input length {self.args.model_max_input_length}'''
-                )
+                self.printer.print_in_terminal(
+                "code_execution_warning",
+                style="yellow",
+                content_length=content_length,
+                max_length=self.args.model_max_input_length
+            )
 
         if args.execute:
-            logger.info("Auto generate the code...")
+            self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
             if args.auto_merge == "diff":
                 generate = CodeAutoGenerateDiff(
@@ -302,10 +335,15 @@ class ActionPyProject(BaseAction):
                 generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
-            logger.info(f"Code generation completed in {time.time() - start_time:.2f} seconds, input_tokens_count: {generate_result.metadata.get('input_tokens_count', 0)}, generated_tokens_count: {generate_result.metadata.get('generated_tokens_count', 0)}")    
+            self.printer.print_in_terminal(
+                "code_generation_complete",
+                duration=time.time() - start_time,
+                input_tokens=generate_result.metadata.get('input_tokens_count', 0),
+                output_tokens=generate_result.metadata.get('generated_tokens_count', 0)
+            )
             merge_result = None
             if args.execute and args.auto_merge:
-                logger.info("Auto merge the code...")
+                self.printer.print_in_terminal("code_merge_start")
                 if args.auto_merge == "diff":
                     code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
                     merge_result = code_merge.merge_code(generate_result=generate_result)
@@ -347,6 +385,7 @@ class ActionSuffixProject(BaseAction):
         self.args = args
         self.llm = llm
         self.pp = None
+        self.printer = Printer()
 
     def run(self):
         args = self.args
@@ -355,9 +394,14 @@ class ActionSuffixProject(BaseAction):
         pp.run()
         source_code = pp.output()
         if self.llm:
+            if args.in_code_apply:
+                old_query = args.query
+                args.query = (args.context or "") + "\n\n" + args.query
             source_code = build_index_and_filter_files(
                 llm=self.llm, args=args, sources=pp.sources
             )
+            if args.in_code_apply:
+                args.query = old_query
         self.process_content(source_code)
 
     def process_content(self, content: str):
@@ -371,7 +415,7 @@ class ActionSuffixProject(BaseAction):
                 )                
 
         if args.execute:
-            logger.info("Auto generate the code...")
+            self.printer.print_in_terminal("code_generation_start")
             start_time = time.time()
             if args.auto_merge == "diff":
                 generate = CodeAutoGenerateDiff(
@@ -396,10 +440,15 @@ class ActionSuffixProject(BaseAction):
                     query=args.query, source_content=content
                 )
               
-        logger.info(f"Code generation completed in {time.time() - start_time:.2f} seconds, input_tokens_count: {generate_result.metadata.get('input_tokens_count', 0)}, generated_tokens_count: {generate_result.metadata.get('generated_tokens_count', 0)}")
+        self.printer.print_in_terminal(
+            "code_generation_complete",
+            duration=time.time() - start_time,
+            input_tokens=generate_result.metadata.get('input_tokens_count', 0),
+            output_tokens=generate_result.metadata.get('generated_tokens_count', 0)
+        )
         merge_result = None
         if args.execute and args.auto_merge:
-            logger.info("Auto merge the code...")
+            self.printer.print_in_terminal("code_merge_start")
             if args.auto_merge == "diff":
                 code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
                 merge_result = code_merge.merge_code(generate_result=generate_result)

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -36,9 +36,14 @@ class ActionRegexProject:
         pp.run()
         source_code = pp.output()
         if self.llm:
+            if args.in_code_apply:
+                old_query = args.query
+                args.query = (args.context or "") + "\n\n" + args.query
             source_code = build_index_and_filter_files(
                 llm=self.llm, args=args, sources=pp.sources
             )
+            if args.in_code_apply:
+                args.query = old_query
         self.process_content(source_code)
 
     def process_content(self, content: str):

autocoder/index/entry.py

@@ -9,7 +9,7 @@ from rich.console import Console
 from rich.table import Table
 from rich.panel import Panel
 
-from loguru import logger
+from autocoder.common.printer import Printer
 from autocoder.utils.queue_communicate import (
     queue_communicate,
     CommunicateEvent,
@@ -22,6 +22,7 @@ from autocoder.index.types import (
 from autocoder.index.filter.quick_filter import QuickFilter
 from autocoder.index.filter.normal_filter import NormalFilter
 from autocoder.index.index import IndexManager
+from loguru import logger
 
 def build_index_and_filter_files(
     llm, args: AutoCoderArgs, sources: List[SourceCode]
@@ -58,7 +59,8 @@ def build_index_and_filter_files(
     final_files: Dict[str, TargetFile] = {}
 
     # Phase 1: Process REST/RAG/Search sources
-    logger.info("Phase 1: Processing REST/RAG/Search sources...")
+    printer = Printer()
+    printer.print_in_terminal("phase1_processing_sources")
     phase_start = time.monotonic()
     for source in sources:
         if source.tag in ["REST", "RAG", "SEARCH"]:
@@ -79,7 +81,7 @@ def build_index_and_filter_files(
                 )
             )
 
-        logger.info("Phase 2: Building index for all files...")
+        printer.print_in_terminal("phase2_building_index")
         phase_start = time.monotonic()
         index_manager = IndexManager(llm=llm, sources=sources, args=args)
         index_data = index_manager.build_index()
@@ -98,11 +100,14 @@ def build_index_and_filter_files(
                     })
                 )
             )
-
-        quick_filter = QuickFilter(index_manager,stats,sources)
+        
+        #MARK
+        printer.print_in_terminal("quick_filter_start", style="blue")
+        quick_filter = QuickFilter(index_manager,stats,sources)        
         final_files = quick_filter.filter(index_manager.read_index(),args.query)
         
         if not final_files:
+            printer.print_in_terminal("normal_filter_start", style="blue")
             normal_filter = NormalFilter(index_manager,stats,sources)
             final_files = normal_filter.filter(index_manager.read_index(),args.query)
         
@@ -133,19 +138,48 @@ def build_index_and_filter_files(
 
         return [file for file in result] if result else []
 
+    def shorten_path(path: str, keep_levels: int = 3) -> str:
+        """
+        优化长路径显示，保留最后指定层级
+        示例：/a/b/c/d/e/f.py -> .../c/d/e/f.py
+        """
+        parts = path.split(os.sep)
+        if len(parts) > keep_levels:
+            return ".../" + os.sep.join(parts[-keep_levels:])
+        return path
+
     def print_selected(data):
         console = Console()
+        
+        # 获取终端宽度
+        console_width = console.width
 
         table = Table(
             title="Files Used as Context",
             show_header=True,
             header_style="bold magenta",
+            # 设置表格最大宽度为终端宽度（留 10 字符边距）
+            width=min(console_width - 10, 120),
+            expand=True
         )
-        table.add_column("File Path", style="cyan", no_wrap=True)
-        table.add_column("Reason", style="green")
+        
+        # 优化列配置
+        table.add_column("File Path", 
+                        style="cyan", 
+                        width=int((console_width - 10) * 0.6),  # 分配 60% 宽度给文件路径
+                        overflow="fold",  # 自动折叠过长的路径
+                        no_wrap=False)  # 允许换行
+        
+        table.add_column("Reason", 
+                        style="green", 
+                        width=int((console_width - 10) * 0.4),  # 分配 40% 宽度给原因
+                        no_wrap=False)
 
+        # 添加处理过的文件路径
         for file, reason in data:
-            table.add_row(file, reason)
+            # 路径截取优化：保留最后 3 级路径
+            processed_path = shorten_path(file, keep_levels=3)
+            table.add_row(processed_path, reason)
 
         panel = Panel(
             table,
@@ -157,7 +191,7 @@ def build_index_and_filter_files(
         console.print(panel)
 
     # Phase 6: File selection and limitation
-    logger.info("Phase 6: Processing file selection and limits...")
+    printer.print_in_terminal("phase6_file_selection")
     phase_start = time.monotonic()
 
     if args.index_filter_file_num > 0:
@@ -188,7 +222,7 @@ def build_index_and_filter_files(
     stats["timings"]["file_selection"] = phase_end - phase_start
 
     # Phase 7: Display results and prepare output
-    logger.info("Phase 7: Preparing final output...")
+    printer.print_in_terminal("phase7_preparing_output")
     phase_start = time.monotonic()    
     try:
         print_selected(
@@ -249,7 +283,7 @@ def build_index_and_filter_files(
 
     # Print final statistics in a more structured way
     summary = f"""
-=== Indexing and Filtering Summary ===
+=== File Stat ===    
 • Total files scanned: {stats['total_files']}
 • Files indexed: {stats['indexed_files']}
 • Files filtered:
@@ -258,7 +292,7 @@ def build_index_and_filter_files(
   - Relevance verified: {stats.get('verified_files', 0)}
 • Final files selected: {stats['final_files']}
 
-=== Time Breakdown ===
+=== Time Stat ===
 • Index build: {stats['timings'].get('build_index', 0):.2f}s
 • Quick filter: {stats['timings'].get('quick_filter', 0):.2f}s
 • Normal filter: 
@@ -267,9 +301,18 @@ def build_index_and_filter_files(
     - Relevance check: {stats['timings']["normal_filter"].get('relevance_verification', 0):.2f}s
 • File selection: {stats['timings'].get('file_selection', 0):.2f}s
 • Total time: {total_time:.2f}s
-====================================
+
 """
-    logger.info(summary)
+    printer.print_panel(
+        summary,
+        text_options={"justify": "left", "style": "bold white"},
+        panel_options={
+            "title": "Indexing and Filtering Summary", 
+            "border_style": "bold blue",
+            "padding": (1, 2),
+            "expand": False
+        }
+    )
 
     if args.request_id and not args.skip_events:
         queue_communicate.send_event(

autocoder/index/filter/quick_filter.py

@@ -55,7 +55,10 @@ class QuickFilter():
         }
         ```
 
-        特别注意,如果用户的query里 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回，并且查看他们依赖的文件是否相关。        
+        特别注意
+        1. 如果用户的query里 @文件 或者 @@符号，那么被@的文件或者@@的符号必须要返回，并且查看他们依赖的文件是否相关。        
+        2. 如果 query 里是一段历史对话，那么对话里的内容提及的文件路径必须要返回。
+        3. json格式数据不允许有注释        
         '''
         file_meta_str = "\n".join([f"##[{index}]{item.module_name}\n{item.symbols}" for index,item in enumerate(file_meta_list)])
         context = {
@@ -66,15 +69,13 @@ class QuickFilter():
 
     def filter(self, index_items: List[IndexItem], query: str) -> Dict[str, TargetFile]:
         final_files: Dict[str, TargetFile] = {}
-        if not self.args.skip_filter_index and self.args.index_filter_model:
+        if not self.args.skip_filter_index and self.index_manager.llm.get_sub_client("index_filter_model"):
             start_time = time.monotonic()
             index_items = self.index_manager.read_index()
 
-            prompt_str = self.quick_filter_files.prompt(index_items,query)
-
-            print(prompt_str)
+            prompt_str = self.quick_filter_files.prompt(index_items,query)            
             
-            tokens_len = count_tokens(prompt_str)
+            tokens_len = count_tokens(prompt_str)            
             
             if tokens_len > 55*1024:
                 logger.warning(f"Quick filter prompt is too long, tokens_len: {tokens_len}/{55*1024} fallback to normal filter")

autocoder/index/index.py

@@ -15,7 +15,8 @@ import threading
 import byzerllm
 import hashlib
 
-from loguru import logger
+from autocoder.common.printer import Printer
+from autocoder.common.auto_coder_lang import get_message
 from autocoder.index.types import (
     IndexItem,
     TargetFile,
@@ -48,6 +49,7 @@ class IndexManager:
         self.max_input_length = (
             args.index_model_max_input_length or args.model_max_input_length
         )
+        self.printer = Printer()
 
         # 如果索引目录不存在,则创建它
         if not os.path.exists(self.index_dir):
@@ -206,8 +208,12 @@ class IndexManager:
             start_time = time.monotonic()
             source_code = source.source_code
             if len(source.source_code) > self.max_input_length:
-                logger.warning(
-                    f"Warning[Build Index]: The length of source code({source.module_name}) is too long ({len(source.source_code)}) > model_max_input_length({self.max_input_length}), splitting into chunks..."
+                self.printer.print_in_terminal(
+                    "index_file_too_large",
+                    style="yellow",
+                    file_path=source.module_name,
+                    file_size=len(source.source_code),
+                    max_length=self.max_input_length
                 )
                 chunks = self.split_text_into_chunks(
                     source_code, self.max_input_length - 1000
@@ -224,12 +230,23 @@ class IndexManager:
                     self.index_llm).run(source.module_name, source_code)
                 time.sleep(self.anti_quota_limit)
 
-            logger.info(
-                f"Parse and update index for {file_path} md5: {md5} took {time.monotonic() - start_time:.2f}s"
+            self.printer.print_in_terminal(
+                "index_update_success",
+                style="green",
+                file_path=file_path,
+                md5=md5,
+                duration=time.monotonic() - start_time
             )
 
         except Exception as e:
-            logger.warning(f"Error: {e}")
+            # import traceback
+            # traceback.print_exc()
+            self.printer.print_in_terminal(
+                "index_build_error",
+                style="red",
+                file_path=file_path,
+                error=str(e)
+            )
             return None
 
         return {
@@ -255,8 +272,11 @@ class IndexManager:
 
         for item in index_data.keys():
             if not item.startswith(self.source_dir):
-                logger.warning(
-                    error_message(source_dir=self.source_dir, file_path=item)
+                self.printer.print_in_terminal(
+                    "index_source_dir_mismatch",
+                    style="yellow",
+                    source_dir=self.source_dir,
+                    file_path=item
                 )
                 break
 
@@ -291,8 +311,12 @@ class IndexManager:
             counter = 0
             num_files = len(wait_to_build_files)
             total_files = len(self.sources)
-            logger.info(
-                f"Total Files: {total_files}, Need to Build Index: {num_files}")
+            self.printer.print_in_terminal(
+                "index_build_summary",
+                style="bold blue",
+                total_files=total_files,
+                num_files=num_files
+            )
 
             futures = [
                 executor.submit(self.build_index_for_single_source, source)
@@ -302,7 +326,12 @@ class IndexManager:
                 result = future.result()
                 if result is not None:
                     counter += 1
-                    logger.info(f"Building Index:{counter}/{num_files}...")
+                    self.printer.print_in_terminal(
+                        "building_index_progress",
+                        style="blue",
+                        counter=counter,
+                        num_files=num_files
+                    )
                     module_name = result["module_name"]
                     index_data[module_name] = result
                     updated_sources.append(module_name)
@@ -404,8 +433,10 @@ class IndexManager:
                 with lock:
                     all_results.extend(result.file_list)
             else:
-                logger.warning(
-                    f"Fail to find related files for chunk {chunk_count}. This may be caused by the model limit or the query not being suitable for the files."
+                self.printer.print_in_terminal(
+                    "index_related_files_fail",
+                    style="yellow",
+                    chunk_count=chunk_count
                 )
             time.sleep(self.args.anti_quota_limit)
 
@@ -442,8 +473,10 @@ class IndexManager:
                     all_results.extend(result.file_list)
                     completed_threads += 1
             else:
-                logger.warning(
-                    f"Fail to find target files for chunk. This is caused by the model response not being in JSON format or the JSON being empty."
+                self.printer.print_in_terminal(
+                    "index_related_files_fail",
+                    style="yellow",
+                    chunk_count="unknown"
                 )
             time.sleep(self.args.anti_quota_limit)
 
@@ -457,7 +490,12 @@ class IndexManager:
             for future in as_completed(futures):
                 future.result()
 
-        logger.info(f"Completed {completed_threads}/{total_threads} threads")
+        self.printer.print_in_terminal(
+            "index_threads_completed",
+            style="green",
+            completed_threads=completed_threads,
+            total_threads=total_threads
+        )
         return all_results, total_threads, completed_threads
 
     def get_target_files_by_query(self, query: str) -> FileList:

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.233"
+__version__ = "0.1.237"