auto-coder 0.1.371__tar.gz → 0.1.373__tar.gz

{auto_coder-0.1.371 → auto_coder-0.1.373}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.371
+Version: 0.1.373
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.182
+Requires-Dist: byzerllm[saas]>=0.1.184
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.371
+Version: 0.1.373
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10
@@ -28,7 +28,7 @@ Requires-Dist: prompt-toolkit
 Requires-Dist: tokenizers
 Requires-Dist: aiofiles
 Requires-Dist: readerwriterlock
-Requires-Dist: byzerllm[saas]>=0.1.182
+Requires-Dist: byzerllm[saas]>=0.1.184
 Requires-Dist: patch
 Requires-Dist: diff_match_patch
 Requires-Dist: GitPython

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/auto_coder.egg-info/SOURCES.txt

@@ -106,7 +106,6 @@ src/autocoder/common/global_cancel.py
 src/autocoder/common/image_to_page.py
 src/autocoder/common/index_import_export.py
 src/autocoder/common/interpreter.py
-src/autocoder/common/llm_rerank.py
 src/autocoder/common/mcp_hub.py
 src/autocoder/common/mcp_server.py
 src/autocoder/common/mcp_server_install.py
@@ -279,8 +278,6 @@ src/autocoder/rag/rag_entry.py
 src/autocoder/rag/raw_rag.py
 src/autocoder/rag/relevant_utils.py
 src/autocoder/rag/searchable.py
-src/autocoder/rag/simple_directory_reader.py
-src/autocoder/rag/simple_rag.py
 src/autocoder/rag/test_doc_filter.py
 src/autocoder/rag/test_long_context_rag.py
 src/autocoder/rag/test_token_limiter.py
@@ -333,7 +330,6 @@ src/autocoder/utils/request_event_queue.py
 src/autocoder/utils/request_queue.py
 src/autocoder/utils/rest.py
 src/autocoder/utils/stream_thinking.py
-src/autocoder/utils/tests.py
 src/autocoder/utils/thread_utils.py
 src/autocoder/utils/types.py
 src/autocoder/utils/auto_coder_utils/__init__.py

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/auto_coder.egg-info/requires.txt

@@ -18,7 +18,7 @@ prompt-toolkit
 tokenizers
 aiofiles
 readerwriterlock
-byzerllm[saas]>=0.1.182
+byzerllm[saas]>=0.1.184
 patch
 diff_match_patch
 GitPython

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/agent/auto_tool.py

@@ -1,5 +1,3 @@
-from llama_index.core.agent import ReActAgent
-from llama_index.core.tools import FunctionTool
 from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
 from autocoder.suffixproject import SuffixProject
@@ -7,7 +5,6 @@ from autocoder.common import AutoCoderArgs
 from autocoder.common.interpreter import Interpreter
 from autocoder.common import ExecuteSteps, ExecuteStep, detect_env
 from autocoder.common import code_auto_execute
-from byzerllm.apps.llama_index.byzerai import ByzerAI
 from loguru import logger
 import os
 import io
@@ -252,6 +249,8 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
         
         console.print("[bold red]达到最大尝试次数，任务未能完成。[/bold red]")
         return result
+        
+    from llama_index.core.tools import FunctionTool
 
     tools = [
         FunctionTool.from_defaults(run_python_code),
@@ -284,6 +283,8 @@ class AutoTool:
         return self.pp.get_tree_like_directory_structure.prompt()
 
     def run(self, query: str, max_iterations: int = 20):
+        from byzerllm.apps.llama_index.byzerai import ByzerAI
+        from llama_index.core.agent import ReActAgent
         agent = ReActAgent.from_tools(
             tools=self.tools,
             llm=ByzerAI(llm=self.code_model),

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/agent/planner.py

@@ -1,5 +1,3 @@
-from llama_index.core.agent import ReActAgent
-from llama_index.core.tools import FunctionTool
 from autocoder.index.index import IndexManager
 from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
@@ -182,7 +180,8 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
         args.collections = old_collections
 
         return "\n".join([sc.source_code for sc in source_codes])
-
+        
+    from llama_index.core.tools import FunctionTool
     tools = [
         FunctionTool.from_defaults(get_project_related_files),
         FunctionTool.from_defaults(generate_auto_coder_yaml),
@@ -202,6 +201,7 @@ class Planner:
 
     def run(self, query: str, max_iterations: int = 10):
         from byzerllm.apps.llama_index.byzerai import ByzerAI
+        from llama_index.core.agent import ReActAgent
         agent = ReActAgent.from_tools(
             tools=self.tools,
             llm=ByzerAI(llm=self.llm),

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/agent/project_reader.py

@@ -1,5 +1,3 @@
-from llama_index.core.agent import ReActAgent
-from llama_index.core.tools import FunctionTool
 from autocoder.index.index import IndexManager
 from autocoder.pyproject import PyProject
 from autocoder.tsproject import TSProject
@@ -176,7 +174,7 @@ def detect_rm_command(command: str) -> Bool:
 
 
 def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
-
+    
     def ask_user(question:str) -> str:
         '''
         如果你对用户的问题有什么疑问，或者你想从用户收集一些额外信息，可以调用
@@ -404,7 +402,8 @@ def get_tools(args: AutoCoderArgs, llm: byzerllm.ByzerLLM):
                     pass
 
         return ",".join(matched_files)
-
+    
+    from llama_index.core.tools import FunctionTool
     tools = [
         # FunctionTool.from_defaults(get_project_related_files),
         FunctionTool.from_defaults(get_related_files_by_symbols),
@@ -440,6 +439,7 @@ class ProjectReader:
 
     def run(self, query: str, max_iterations: int = 20):
         from byzerllm.apps.llama_index.byzerai import ByzerAI
+        from llama_index.core.agent import ReActAgent
         agent = ReActAgent.from_tools(
             tools=self.tools,
             llm=ByzerAI(llm=self.llm),

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/chat_auto_coder.py

@@ -19,12 +19,11 @@ from autocoder.events.event_manager_singleton import gengerate_event_file_path
 from autocoder.common.global_cancel import global_cancel
 from autocoder.chat.models_command import handle_models_command
 from autocoder.auto_coder_runner import (
-    auto_command,
-    load_memory,
-    save_memory,
+    auto_command,    
     configure, # Keep configure if it's used elsewhere or by handle_conf_command internally (though we adapted handle_conf_command not to)
     # manage_models, # Removed
     # print_conf, # Removed
+    save_memory,
     exclude_dirs,
     exclude_files,
     ask,
@@ -122,10 +121,7 @@ def show_help():
     )
     print(
         f"  \033[94m/coding\033[0m \033[93m<query>\033[0m - \033[92m{get_message('coding_desc')}\033[0m"
-    )
-    print(
-        f"  \033[94m/ask\033[0m \033[93m<query>\033[0m - \033[92m{get_message('ask_desc')}\033[0m"
-    )
+    )    
     print(
         f"  \033[94m/summon\033[0m \033[93m<query>\033[0m - \033[92m{get_message('summon_desc')}\033[0m"
     )
@@ -302,7 +298,6 @@ def main():
     # 加载保存的运行时配置
     plugin_manager.load_runtime_cfg()
 
-    load_memory()
     memory = get_memory()
 
     configure(f"product_mode:{ARGS.product_mode}")
@@ -345,7 +340,8 @@ def main():
             memory["mode"] = "voice_input"
         else:  # voice_input
             memory["mode"] = "normal"
-
+        
+        save_memory()
         event.app.invalidate()
 
     @kb.add("c-n")
@@ -467,8 +463,8 @@ def main():
             else:
                 user_input = session.prompt(FormattedText(prompt_message), style=style)
             new_prompt = ""
-
-            if "mode" not in memory:
+            
+            if "mode" not in memory:                
                 memory["mode"] = "auto_detect"
 
             # 处理 user_input 的空格
@@ -545,9 +541,11 @@ def main():
                     print(memory["mode"])
                 else:
                     memory["mode"] = conf
+                    save_memory()
 
             elif user_input.startswith("/conf/export"):
                 from autocoder.common.conf_import_export import export_conf
+                export_conf(os.getcwd(), user_input[len("/conf/export") :].strip() or ".")
 
             elif user_input.startswith("/plugins"):
                 # 提取命令参数并交由 plugin_manager 处理
@@ -580,14 +578,7 @@ def main():
 
             elif user_input.startswith("/exclude_files"):
                 query = user_input[len("/exclude_files") :].strip()
-                exclude_files(query)
-
-            elif user_input.startswith("/ask"):
-                query = user_input[len("/ask") :].strip()
-                if not query:
-                    print("Please enter your question.")
-                else:
-                    ask(query)
+                exclude_files(query)           
 
             elif user_input.startswith("/exit"):
                 raise EOFError()

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -850,7 +850,8 @@ class AgenticEdit:
                 
         iteration_count = 0
         tool_executed = False 
-        completion_event_already_yielded = False       
+        should_yield_completion_event = False   
+        completion_event = None    
 
         while True:
             iteration_count += 1            
@@ -859,12 +860,14 @@ class AgenticEdit:
             last_message = conversations[-1]
             if last_message["role"] == "assistant":
                 logger.info(f"Last message is assistant, skipping LLM interaction cycle")
-                if not completion_event_already_yielded:
-                    yield CompletionEvent(completion=AttemptCompletionTool(
-                        result=last_message["content"],
-                        command=""
-                    ), completion_xml="")
-                    completion_event_already_yielded = True
+                if should_yield_completion_event:
+                    if completion_event is None:
+                        yield CompletionEvent(completion=AttemptCompletionTool(
+                            result=last_message["content"],
+                            command=""
+                        ), completion_xml="")  
+                    else:
+                        yield completion_event                     
                 break
             logger.info(
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
@@ -936,11 +939,12 @@ class AgenticEdit:
                         logger.info(
                             "AttemptCompletionTool received. Finalizing session.")
                         logger.info(f"Completion result: {tool_obj.result[:50]}...")
-                        yield CompletionEvent(completion=tool_obj, completion_xml=tool_xml)
+                        completion_event = CompletionEvent(completion=tool_obj, completion_xml=tool_xml)
                         logger.info(
                             "AgenticEdit analyze loop finished due to AttemptCompletion.")
                         save_formatted_log(self.args.source_dir, json.dumps(conversations, ensure_ascii=False), "agentic_conversation")        
                         mark_event_should_finish = True
+                        should_yield_completion_event = True
                         continue
 
                     if isinstance(tool_obj, PlanModeRespondTool):

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py

@@ -13,7 +13,7 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
 from autocoder.common.result_manager import ResultManager
-
+from autocoder.common.printer import Printer
 if typing.TYPE_CHECKING:
     from autocoder.common.v2.agent.agentic_edit import AgenticEdit
 
@@ -22,6 +22,7 @@ class AskFollowupQuestionToolResolver(BaseToolResolver):
         super().__init__(agent, tool, args)
         self.tool: AskFollowupQuestionTool = tool # For type hinting
         self.result_manager = ResultManager()
+        self.printer = Printer()
 
     def resolve(self) -> ToolResult:
         """

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/rag/llm_wrapper.py

@@ -7,7 +7,6 @@ import pydantic
 from byzerllm import ByzerLLM
 from byzerllm.utils.client import LLMResponse
 from byzerllm.utils.types import SingleOutputMeta
-from autocoder.rag.simple_rag import SimpleRAG
 from autocoder.rag.long_context_rag import LongContextRAG
 from loguru import logger
 from byzerllm.utils.langutil import asyncfy_with_semaphore
@@ -15,7 +14,7 @@ from byzerllm.utils.langutil import asyncfy_with_semaphore
 
 class LLWrapper:
 
-    def __init__(self, llm: ByzerLLM, rag: Union[SimpleRAG, LongContextRAG]):
+    def __init__(self, llm: ByzerLLM, rag: Union[LongContextRAG]):
         self.llm = llm
         self.rag = rag
 

{auto_coder-0.1.371 → auto_coder-0.1.373}/src/autocoder/rag/rag_entry.py

@@ -1,13 +1,12 @@
 from typing import List, Dict, Any, Optional,Union
 from autocoder.common import AutoCoderArgs, SourceCode
 from byzerllm import ByzerLLM
-from .simple_rag import SimpleRAG
 from .long_context_rag import LongContextRAG
 class RAGFactory:
     
     
     @staticmethod
-    def get_rag(llm: ByzerLLM, args: AutoCoderArgs, path: str,**kargs) -> Union[SimpleRAG, LongContextRAG]:
+    def get_rag(llm: ByzerLLM, args: AutoCoderArgs, path: str,**kargs) -> Union[LongContextRAG]:
         """
         Factory method to get the appropriate RAG implementation based on arguments.
         
@@ -19,10 +18,7 @@ class RAGFactory:
         Returns:
             SimpleRAG or LongContextRAG: The appropriate RAG implementation.
         """
-        if args.rag_type == "simple":
-            return LongContextRAG(llm, args, path,**kargs)
-        else:
-            return SimpleRAG(llm, args, path)
+        return LongContextRAG(llm, args, path,**kargs)
 
 class RAGManager:
     def __init__(self, llm: ByzerLLM, args: AutoCoderArgs, path: str):

auto_coder-0.1.373/src/autocoder/version.py

@@ -0,0 +1,2 @@
+
+__version__ = "0.1.373"

auto_coder-0.1.371/src/autocoder/common/llm_rerank.py

@@ -1,84 +0,0 @@
-import byzerllm
-from typing import Union,List
-from loguru import logger
-from llama_index.core.schema import QueryBundle,NodeWithScore
-
-class LLMRerank():
-    def __init__(self,llm:byzerllm.ByzerLLM):
-        self.llm = llm        
-
-    @byzerllm.prompt(llm=lambda self: self.llm)
-    def rereank(self,context_str:str, query_str:str)->str:
-        '''
-        以下显示了一份文档列表。每个文档旁边都有一个编号以及该文档的摘要。还提供了一个问题。
-        回答问题时，请按照相关性顺序列出你应该参考的文档的编号，并给出相关性评分。相关性评分是一个1-10的数字，基于你认为该文档与问题的相关程度。
-        不要包括任何与问题无关的文档。
-        示例格式：
-        文档1：
-        <文档1的摘要>
-
-        文档2：
-        <文档2的摘要>
-
-        ...
-
-        文档10：
-        <文档10的摘要>
-
-        问题：<问题>
-        回答：
-        文档：9，相关性：7
-        文档：3，相关性：4
-        文档：7，相关性：3
-
-        现在让我们试一试：
-
-        {{ context_str }}
-
-        问题：{{ query_str }}
-        回答：
-        '''
-
-    def postprocess_nodes(self,
-                          nodes:List[NodeWithScore], 
-                          query_bundle:Union[str,QueryBundle],
-                          choice_batch_size:int=5, top_n:int=1,verbose:bool=False)->List[NodeWithScore]:                          
-        if isinstance(query_bundle, str):
-            query_bundle = QueryBundle(query_str=query_bundle)
-
-        # 给每个节点添加全局索引
-        indexed_nodes = list(enumerate(nodes))
-
-        # 按 choice_batch_size 切分 nodes
-        node_batches = [indexed_nodes[i:i+choice_batch_size] for i in range(0, len(indexed_nodes), choice_batch_size)]
-
-        # 合并排序后的结果
-        sorted_nodes = []
-        for batch in node_batches:
-            context_str = "\n\n".join([f"文档{idx}:\n{node.node.get_text()}" for idx, node in batch])            
-            rerank_output = self.rereank(context_str, query_bundle.query_str)
-            if verbose:
-                logger.info(self.rereank.prompt(context_str, query_bundle.query_str))
-                logger.info(rerank_output)
-
-            # 解析 rerank 的输出
-            rerank_result = []
-            for line in rerank_output.split("\n"):
-                if line.startswith("文档："):
-                    parts = line.split("，")
-                    if len(parts) == 2:
-                        try:
-                            doc_idx = int(parts[0].split("：")[1])
-                            relevance = float(parts[1].split("：")[1])
-                            rerank_result.append((doc_idx, relevance))
-                        except:
-                            logger.warning(f"Failed to parse line: {line}")
-                            pass
-
-            # 更新 batch 中节点的分数
-            for doc_idx, relevance in rerank_result:                  
-                indexed_nodes[doc_idx][1].score = relevance
-
-        sorted_nodes.extend([node for _, node in sorted(indexed_nodes, key=lambda x: x[1].score, reverse=True)])
-
-        return sorted_nodes[:top_n]