auto-coder 0.1.345__tar.gz → 0.1.346__tar.gz

{auto_coder-0.1.345 → auto_coder-0.1.346}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.345
+Version: 0.1.346
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.345 → auto_coder-0.1.346}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.345
+Version: 0.1.346
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.345 → auto_coder-0.1.346}/src/autocoder/auto_coder_runner.py

@@ -40,7 +40,7 @@ from rich.markdown import Markdown
 from byzerllm.utils.nontext import Image
 import git
 from autocoder.common import git_utils
-from autocoder.chat_auto_coder_lang import get_message
+from autocoder.chat_auto_coder_lang import get_message,get_message_with_format
 from autocoder.agent.auto_guess_query import AutoGuessQuery
 from autocoder.common.mcp_server import get_mcp_server
 from autocoder.common.mcp_server_types import (
@@ -273,8 +273,8 @@ def initialize_system(args:InitializeSystemRequest):
         else:
             print(f"  {message}")
 
-    def init_project():        
-        if not os.path.exists(".auto-coder"):
+    def init_project():           
+        if not os.path.exists(".auto-coder") or not os.path.exists("actions"):
             first_time[0] = True
             print_status(get_message("not_initialized"), "warning")
             init_choice = input(
@@ -295,8 +295,7 @@ def initialize_system(args:InitializeSystemRequest):
 
         if not os.path.exists(base_persist_dir):
             os.makedirs(base_persist_dir, exist_ok=True)
-            print_status(get_message("created_dir").format(
-                base_persist_dir), "success")
+            print_status(get_message_with_format("created_dir",path=base_persist_dir), "success")
 
         if first_time[0]:
             configure_project_type()

{auto_coder-0.1.345 → auto_coder-0.1.346}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -221,7 +221,7 @@ class AgenticEdit:
         {{files}}
         </files>
 
-        ====
+        ====        
 
         TOOL USE
 
@@ -667,7 +667,35 @@ class AgenticEdit:
         You can use the tool  `read_file` to read these description files, which helps you decide exactly which files need detailed attention. Note that the `active.md` file does not contain information about all files within the directory—it only includes information 
         about the files that were recently changed.
         {% endif %}
+
+        {% if extra_docs %}
+        ====
+        
+        RULES PROVIDED BY USER
+
+        The following rules are provided by the user, and you must follow them strictly.
+
+        {% for key, value in extra_docs.items() %}
+        ### {{ key }}
+        {{ value }}
+        {% endfor %}        
+        {% endif %}
         """
+        import os
+        extra_docs = {}
+        rules_dir = os.path.join(self.args.source_dir,".auto-coder", "autocoderrules")
+        if os.path.isdir(rules_dir):
+            for fname in os.listdir(rules_dir):
+                if fname.endswith(".md"):
+                    fpath = os.path.join(rules_dir, fname)
+                    try:
+                        with open(fpath, "r", encoding="utf-8") as f:
+                            content = f.read()
+                            key = os.path.splitext(fname)[0]
+                            extra_docs[key] = content
+                    except Exception:
+                        continue
+
         env_info = detect_env()
         shell_type = "bash"
         if shells.is_running_in_cmd():
@@ -687,6 +715,7 @@ class AgenticEdit:
             "files": self.files.to_str(),
             "mcp_server_info": self.mcp_server_info,
             "enable_active_context": self.args.enable_active_context,
+            "extra_docs": extra_docs,
         }
 
     # Removed _execute_command_result and execute_auto_command methods
@@ -971,6 +1000,7 @@ class AgenticEdit:
             global_cancel.check_and_raise()
 
             meta_holder.meta = metadata
+            logger.info(f"metadata: {metadata.input_tokens_count}")
             if not content_chunk:
                 continue
             buffer += content_chunk

{auto_coder-0.1.345 → auto_coder-0.1.346}/src/autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py

@@ -29,12 +29,12 @@ class AskFollowupQuestionToolResolver(BaseToolResolver):
         This resolver doesn't directly ask the user but prepares the data for it.
         """
         question = self.tool.question
-        options = self.tool.options
+        options = self.tool.options or []
         options_text = "\n".join([f"{i+1}. {option}" for i, option in enumerate(options)])
         if get_run_context().is_web():
             answer = get_event_manager(
                 self.args.event_file).ask_user(prompt=question)
-            self.result_manager.append(content=answer + "\n" + options_text, meta={
+            self.result_manager.append(content=answer + ("\n" + options_text if options_text else ""), meta={
                 "action": "ask_user",
                 "input": {
                     "question": question

{auto_coder-0.1.345 → auto_coder-0.1.346}/src/autocoder/rag/long_context_rag.py

@@ -841,8 +841,7 @@ class LongContextRAG:
                 self._print_rag_stats(rag_stat)
             else:
 
-                qa_strategy = get_qa_strategy(
-                    self.args.rag_qa_conversation_strategy)
+                qa_strategy = get_qa_strategy(self.args)
                 new_conversations = qa_strategy.create_conversation(
                     documents=[doc.source_code for doc in relevant_docs],
                     conversations=conversations, local_image_host=self.args.local_image_host

auto_coder-0.1.346/src/autocoder/rag/qa_conversation_strategy.py

@@ -0,0 +1,295 @@
+from abc import ABC, abstractmethod
+from typing import List, Dict, Any, Generator
+import byzerllm
+from autocoder.common import AutoCoderArgs
+
+class QAConversationStrategy(ABC):
+    """
+    Abstract base class for conversation strategies.
+    Different strategies organize documents and conversations differently.
+    """
+    @abstractmethod
+    def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
+        """
+        Create a conversation structure based on documents and history
+        
+        Args:
+            documents: List of retrieved documents
+            conversations: conversation turns
+            
+        Returns:
+            List of message dictionaries representing the conversation to send to the model
+        """
+        pass
+
+class MultiRoundStrategy(QAConversationStrategy):
+    """
+    Multi-round strategy: First let the model read documents, then do Q&A.
+    Creates multiple conversation turns.
+    """
+    def __init__(self, args: AutoCoderArgs):
+        self.args = args
+
+    def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
+        messages = []    
+        messages.extend([
+            {"role": "user", "content": self._read_docs_prompt.prompt(documents, local_image_host)},
+            {"role": "assistant", "content": "好的"}
+        ]) 
+        messages.extend(conversations)
+        return messages
+    
+    @byzerllm.prompt()
+    def _read_docs_prompt_old(
+        self, relevant_docs: List[str], local_image_host: str
+    ) -> Generator[str, None, None]:
+        """        
+        请阅读以下：
+        <documents>
+        {% for doc in relevant_docs %}
+        {{ doc }}
+        {% endfor %}
+        </documents>
+
+        阅读完成后，使用以上文档来回答用户的问题。回答要求：
+
+        1. 严格基于文档内容回答        
+        - 如果文档提供的信息无法回答问题,请明确回复:"抱歉,文档中没有足够的信息来回答这个问题。" 
+        - 不要添加、推测或扩展文档未提及的信息
+
+        2. 格式如 ![image](/path/to/images/path.png) 的 Markdown 图片处理
+        - 根据Markdown 图片前后文本内容推测改图片与问题的相关性，有相关性则在回答中输出该Markdown图片路径
+        - 根据相关图片在文档中的位置，自然融入答复内容,保持上下文连贯
+        - 完整保留原始图片路径,不省略任何部分
+
+        3. 回答格式要求
+        - 使用markdown格式提升可读性        
+        {% if local_image_host %}
+        4. 图片路径处理
+        - 图片地址需返回绝对路径, 
+        - 对于Windows风格的路径，需要转换为Linux风格， 例如：C:\\Users\\user\\Desktop\\image.png 转换为 C:/Users/user/Desktop/image.png
+        - 为请求图片资源 需增加 http://{{ local_image_host }}/static/ 作为前缀
+        例如：/path/to/images/image.png， 返回 http://{{ local_image_host }}/static/path/to/images/image.png
+        {% endif %}
+        """
+    
+    @byzerllm.prompt()
+    def _read_docs_prompt(
+        self, relevant_docs: List[str], local_image_host: str
+    ) -> Generator[str, None, None]:
+        """
+        You are a knowledgeable assistant capable of answering any user question strictly based on the retrieved documents.
+
+        ====
+
+        FILES CONTEXT
+
+        The following files are provided to you as context for the user's task. Use these files to understand the project and answer questions strictly based on their content.
+
+        <documents>
+        {% for doc in relevant_docs %}
+        {{ doc }}
+        {% endfor %}
+        </documents>
+
+        ====
+        
+        {% if extra_docs %}
+        AUTO EXTENSION DOCS
+
+        The following extension documents are loaded dynamically to enhance your understanding or provide special instructions, rules, or context.
+
+        {% for key, value in extra_docs.items() %}
+        ### {{ key }}
+        {{ value }}
+        {% endfor %}
+
+        ====
+        {% endif %}
+
+        INSTRUCTIONS
+
+        - Use ONLY the information from the provided documents and extension docs.
+        - If the documents do not contain enough information to answer, reply: "抱歉,文档中没有足够的信息来回答这个问题。"
+        - Do NOT invent, guess, or add information beyond what is provided.
+
+        - For Markdown images like ![image](/path/to/image.png):
+          - Analyze surrounding text to determine relevance.
+          - Include relevant images naturally in your answer, preserving image paths.
+          - Convert Windows paths to Linux style (e.g., C:\\path\\to\\img.png -> C:/path/to/img.png)
+          {% if local_image_host %}
+          - Prefix image URLs with http://{{ local_image_host }}/static/
+          {% endif %}
+
+        - Format your answer with Markdown for readability.                
+        - Always use the language used by the user in their question.
+
+        """
+
+        import os
+        extra_docs = {}
+        rules_dir = os.path.join(self.args.source_dir, ".autocoderrules")
+        if os.path.isdir(rules_dir):
+            for fname in os.listdir(rules_dir):
+                if fname.endswith(".md"):
+                    fpath = os.path.join(rules_dir, fname)
+                    try:
+                        with open(fpath, "r", encoding="utf-8") as f:
+                            content = f.read()
+                            key = os.path.splitext(fname)[0]
+                            extra_docs[key] = content
+                    except Exception:
+                        continue
+        return {"extra_docs": extra_docs}
+
+class SingleRoundStrategy(QAConversationStrategy):
+    """
+    Single-round strategy: Put documents and conversation history in a single round.
+    """
+    def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
+        messages = []                
+        messages.extend([
+            {"role": "user", "content": self._single_round_answer_question.prompt(documents, conversations, local_image_host)}
+        ])         
+        return messages
+    
+    @byzerllm.prompt()
+    def _single_round_answer_question_old(
+        self, relevant_docs: List[str], conversations: List[Dict[str, str]], local_image_host: str
+    ) -> Generator[str, None, None]:
+        """        
+        文档：
+        <documents>
+        {% for doc in relevant_docs %}
+        {{ doc }}
+        {% endfor %}
+        </documents>
+
+        用户历史对话：
+        <conversations>
+        {% for msg in conversations %}
+        <{{ msg.role }}>: {{ msg.content }}
+        {% endfor %}
+        </conversations>
+
+        使用以上文档来回答用户最后的问题。回答要求：
+
+        1. 严格基于文档内容回答        
+        - 如果文档提供的信息无法回答问题,请明确回复:"抱歉,文档中没有足够的信息来回答这个问题。" 
+        - 不要添加、推测或扩展文档未提及的信息
+
+        2. 格式如 ![image](/path/to/images/path.png) 的 Markdown 图片处理
+        - 根据Markdown 图片前后文本内容推测改图片与问题的相关性，有相关性则在回答中输出该Markdown图片路径
+        - 根据相关图片在文档中的位置，自然融入答复内容,保持上下文连贯
+        - 完整保留原始图片路径,不省略任何部分
+
+        3. 回答格式要求
+        - 使用markdown格式提升可读性
+        {% if local_image_host %}
+        4. 图片路径处理
+        - 图片地址需返回绝对路径, 
+        - 对于Windows风格的路径，需要转换为Linux风格， 例如：C:\\Users\\user\\Desktop\\image.png 转换为 C:/Users/user/Desktop/image.png
+        - 为请求图片资源 需增加 http://{{ local_image_host }}/static/ 作为前缀
+        例如：/path/to/images/image.png， 返回 http://{{ local_image_host }}/static/path/to/images/image.png
+        {% endif %}
+        """
+    
+    @byzerllm.prompt()
+    def _single_round_answer_question(
+        self, relevant_docs: List[str], conversations: List[Dict[str, str]], local_image_host: str
+    ) -> Generator[str, None, None]:
+        """
+        You are a knowledgeable assistant capable of answering any user question strictly based on the retrieved documents.
+
+        ====
+
+        FILES CONTEXT
+
+        The following files are provided to you as context for the user's task. Use these files to understand the project and answer questions strictly based on their content.
+
+        <documents>
+        {% for doc in relevant_docs %}
+        {{ doc }}
+        {% endfor %}
+        </documents>
+
+        ====
+        {% if extra_docs %}
+        AUTO EXTENSION DOCS
+
+        The following extension documents are loaded dynamically to enhance your understanding or provide special instructions, rules, or context.
+
+        {% for key, value in extra_docs.items() %}
+        ### {{ key }}
+        {{ value }}
+        {% endfor %}
+
+        ====
+        {% endif %}
+
+        USER CONVERSATION HISTORY
+
+        {% for msg in conversations %}
+        <{{ msg.role }}>: {{ msg.content }}
+        {% endfor %}
+
+        ====
+
+        INSTRUCTIONS
+
+        - Use ONLY the information from the provided documents and extension docs.
+        - If the documents do not contain enough information to answer, reply: "抱歉,文档中没有足够的信息来回答这个问题。"
+        - Do NOT invent, guess, or add information beyond what is provided.
+
+        - For Markdown images like ![image](/path/to/image.png):
+          - Analyze surrounding text to determine relevance.
+          - Include relevant images naturally in your answer, preserving image paths.
+          - Convert Windows paths to Linux style (e.g., C:\\path\\to\\img.png -> C:/path/to/img.png)
+          {% if local_image_host %}
+          - Prefix image URLs with http://{{ local_image_host }}/static/
+          {% endif %}
+
+        - Format your answer with Markdown for readability.        
+        - Always use the language used by the user in their question.
+
+        """
+        import os
+        extra_docs = {}
+        rules_dir = os.path.join(getattr(self, 'args', None).source_dir if getattr(self, 'args', None) else ".", ".autocoderrules")
+        if os.path.isdir(rules_dir):
+            for fname in os.listdir(rules_dir):
+                if fname.endswith(".md"):
+                    fpath = os.path.join(rules_dir, fname)
+                    try:
+                        with open(fpath, "r", encoding="utf-8") as f:
+                            content = f.read()
+                            key = os.path.splitext(fname)[0]
+                            extra_docs[key] = content
+                    except Exception:
+                        continue
+        return {"extra_docs": extra_docs}
+
+def get_qa_strategy(args: AutoCoderArgs) -> QAConversationStrategy:
+    """
+    Factory method to get the appropriate conversation strategy based on AutoCoderArgs
+
+    Args:
+        args: AutoCoderArgs instance containing configuration, including strategy name in `rag_qa_conversation_strategy`
+
+    Returns:
+        An instance of the requested strategy
+
+    Raises:
+        ValueError: If the requested strategy doesn't exist
+    """
+    strategy_name = getattr(args, 'rag_qa_conversation_strategy', None) or "multi_round"
+
+    strategies = {
+        "multi_round": MultiRoundStrategy,
+        "single_round": SingleRoundStrategy,
+    }
+
+    if strategy_name not in strategies:
+        raise ValueError(f"Unknown strategy: {strategy_name}. Available strategies: {list(strategies.keys())}")
+
+    return strategies[strategy_name]()

auto_coder-0.1.346/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.346"

auto_coder-0.1.345/src/autocoder/rag/qa_conversation_strategy.py

@@ -1,145 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import List, Dict, Any,Generator
-import byzerllm
-
-class QAConversationStrategy(ABC):
-    """
-    Abstract base class for conversation strategies.
-    Different strategies organize documents and conversations differently.
-    """
-    @abstractmethod
-    def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
-        """
-        Create a conversation structure based on documents and history
-        
-        Args:
-            documents: List of retrieved documents
-            conversations: conversation turns
-            
-        Returns:
-            List of message dictionaries representing the conversation to send to the model
-        """
-        pass
-
-class MultiRoundStrategy(QAConversationStrategy):
-    """
-    Multi-round strategy: First let the model read documents, then do Q&A.
-    Creates multiple conversation turns.
-    """
-    def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
-        messages = []    
-        messages.extend([
-            {"role": "user", "content": self._read_docs_prompt.prompt(documents, local_image_host)},
-            {"role": "assistant", "content": "好的"}
-        ]) 
-        messages.extend(conversations)
-        return messages
-    
-    @byzerllm.prompt()
-    def _read_docs_prompt(
-        self, relevant_docs: List[str], local_image_host: str
-    ) -> Generator[str, None, None]:
-        """        
-        请阅读以下：
-        <documents>
-        {% for doc in relevant_docs %}
-        {{ doc }}
-        {% endfor %}
-        </documents>
-
-        阅读完成后，使用以上文档来回答用户的问题。回答要求：
-
-        1. 严格基于文档内容回答        
-        - 如果文档提供的信息无法回答问题,请明确回复:"抱歉,文档中没有足够的信息来回答这个问题。" 
-        - 不要添加、推测或扩展文档未提及的信息
-
-        2. 格式如 ![image](/path/to/images/path.png) 的 Markdown 图片处理
-        - 根据Markdown 图片前后文本内容推测改图片与问题的相关性，有相关性则在回答中输出该Markdown图片路径
-        - 根据相关图片在文档中的位置，自然融入答复内容,保持上下文连贯
-        - 完整保留原始图片路径,不省略任何部分
-
-        3. 回答格式要求
-        - 使用markdown格式提升可读性        
-        {% if local_image_host %}
-        4. 图片路径处理
-        - 图片地址需返回绝对路径, 
-        - 对于Windows风格的路径，需要转换为Linux风格， 例如：C:\\Users\\user\\Desktop\\image.png 转换为 C:/Users/user/Desktop/image.png
-        - 为请求图片资源 需增加 http://{{ local_image_host }}/static/ 作为前缀
-        例如：/path/to/images/image.png， 返回 http://{{ local_image_host }}/static/path/to/images/image.png
-        {% endif %}
-        """
-
-class SingleRoundStrategy(QAConversationStrategy):
-    """
-    Single-round strategy: Put documents and conversation history in a single round.
-    """
-    def create_conversation(self, documents: List[Any], conversations: List[Dict[str,str]], local_image_host: str) -> List[Dict]:
-        messages = []                
-        messages.extend([
-            {"role": "user", "content": self._single_round_answer_question.prompt(documents, conversations, local_image_host)}
-        ])         
-        return messages
-    
-    @byzerllm.prompt()
-    def _single_round_answer_question(
-        self, relevant_docs: List[str], conversations: List[Dict[str, str]], local_image_host: str
-    ) -> Generator[str, None, None]:
-        """        
-        文档：
-        <documents>
-        {% for doc in relevant_docs %}
-        {{ doc }}
-        {% endfor %}
-        </documents>
-
-        用户历史对话：
-        <conversations>
-        {% for msg in conversations %}
-        <{{ msg.role }}>: {{ msg.content }}
-        {% endfor %}
-        </conversations>
-
-        使用以上文档来回答用户最后的问题。回答要求：
-
-        1. 严格基于文档内容回答        
-        - 如果文档提供的信息无法回答问题,请明确回复:"抱歉,文档中没有足够的信息来回答这个问题。" 
-        - 不要添加、推测或扩展文档未提及的信息
-
-        2. 格式如 ![image](/path/to/images/path.png) 的 Markdown 图片处理
-        - 根据Markdown 图片前后文本内容推测改图片与问题的相关性，有相关性则在回答中输出该Markdown图片路径
-        - 根据相关图片在文档中的位置，自然融入答复内容,保持上下文连贯
-        - 完整保留原始图片路径,不省略任何部分
-
-        3. 回答格式要求
-        - 使用markdown格式提升可读性
-        {% if local_image_host %}
-        4. 图片路径处理
-        - 图片地址需返回绝对路径, 
-        - 对于Windows风格的路径，需要转换为Linux风格， 例如：C:\\Users\\user\\Desktop\\image.png 转换为 C:/Users/user/Desktop/image.png
-        - 为请求图片资源 需增加 http://{{ local_image_host }}/static/ 作为前缀
-        例如：/path/to/images/image.png， 返回 http://{{ local_image_host }}/static/path/to/images/image.png
-        {% endif %}
-        """
-
-def get_qa_strategy(strategy_name: str) -> QAConversationStrategy:
-    """
-    Factory method to get the appropriate conversation strategy
-    
-    Args:
-        strategy_name: Name of the strategy to use
-        
-    Returns:
-        An instance of the requested strategy
-        
-    Raises:
-        ValueError: If the requested strategy doesn't exist
-    """
-    strategies = {
-        "multi_round": MultiRoundStrategy,
-        "single_round": SingleRoundStrategy,
-    }
-    
-    if strategy_name not in strategies:
-        raise ValueError(f"Unknown strategy: {strategy_name}. Available strategies: {list(strategies.keys())}")
-    
-    return strategies[strategy_name]()

auto_coder-0.1.345/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.345"