auto-coder 0.1.345__py3-none-any.whl → 0.1.346__py3-none-any.whl

{auto_coder-0.1.345.dist-info → auto_coder-0.1.346.dist-info}/METADATA

@@ -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.dist-info → auto_coder-0.1.346.dist-info}/RECORD

@@ -4,7 +4,7 @@ autocoder/auto_coder_lang.py,sha256=Rtupq6N3_HT7JRhDKdgCBcwRaiAnyCOR_Gsp4jUomrI,
 autocoder/auto_coder_rag.py,sha256=NesRm7sIJrRQL1xxm_lbMtM7gi-KrYv9f26RfBuloZE,35386
 autocoder/auto_coder_rag_client_mcp.py,sha256=QRxUbjc6A8UmDMQ8lXgZkjgqtq3lgKYeatJbDY6rSo0,6270
 autocoder/auto_coder_rag_mcp.py,sha256=-RrjNwFaS2e5v8XDIrKR-zlUNUE8UBaeOtojffBrvJo,8521
-autocoder/auto_coder_runner.py,sha256=-6s6wLoiedOjcUPP-658jovP08frJ4csJk3QP8ssvGo,111781
+autocoder/auto_coder_runner.py,sha256=2hI2095L5GWP1J04Lr7xBBTDOcNq_l4-HctcJ8bVaFE,111833
 autocoder/auto_coder_server.py,sha256=bLORGEclcVdbBVfM140JCI8WtdrU0jbgqdJIVVupiEU,20578
 autocoder/benchmark.py,sha256=Ypomkdzd1T3GE6dRICY3Hj547dZ6_inqJbBJIp5QMco,4423
 autocoder/chat_auto_coder.py,sha256=CthuvdjVjTQOVv-zREsl8OCsZHPSP9OQcIgHULrW2Ro,25842
@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=PFtATuOhHRnfpqHQkXr6p4C893JvpsgwTMif3l-GEi0,14321
 autocoder/models.py,sha256=_SCar82QIeBFTZZBdM2jPS6atKVhHnvE0gX3V0CsxD4,11590
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=eIxV5f6b3So1kdcvglpjpAxjsitG6MNkwtws5Kg5FXM,23
+autocoder/version.py,sha256=FUAij2FADNMtAmQCx7M7pqiOpTP65zxKY6khe4EGQUs,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/agentic_edit.py,sha256=XsfePZ-t6M-uBSdG1VLZXk1goqXk2HPeJ_A8IYyBuWQ,58896
 autocoder/agent/agentic_edit_types.py,sha256=oFcDd_cxJ2yH9Ed1uTpD3BipudgoIEWDMPb5pAkq4gI,3288
@@ -126,13 +126,13 @@ autocoder/common/v2/code_editblock_manager.py,sha256=G0CIuV9Ki0FqMLnpA8nBT4pnkCN
 autocoder/common/v2/code_manager.py,sha256=C403bS-f6urixwitlKHcml-J03hci-UyNwHJOqBiY6Q,9182
 autocoder/common/v2/code_strict_diff_manager.py,sha256=v-J1kDyLg7tLGg_6_lbO9S4fNkx7M_L8Xr2G7fPptiU,9347
 autocoder/common/v2/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/common/v2/agent/agentic_edit.py,sha256=LLRJmJs0wcB-N5_zZInV_SqlXC2SKgcXqSn5L_mHZck,91526
+autocoder/common/v2/agent/agentic_edit.py,sha256=Ghx6HTCdjIYj96zoB5xkL6aGLizftgCmy5ZcUSaFXtQ,92599
 autocoder/common/v2/agent/agentic_edit_conversation.py,sha256=qLLhTegH619JQTp3s1bj5FVn2hAcoV-DlhGO3UyIOMc,7338
 autocoder/common/v2/agent/agentic_edit_types.py,sha256=6qBLLmvdlcsbzrpMHsYQVIHqbOWubMXOnmkqTs1pBWQ,4629
 autocoder/common/v2/agent/agentic_tool_display.py,sha256=WKirt-2V346KLnbHgH3NVJiK3xvriD9oaCWj2IdvzLU,7309
 autocoder/common/v2/agent/ignore_utils.py,sha256=gnUchRzKMLbUm_jvnKL-r-K9MWKPtt-6iiuzijY7Es0,1717
 autocoder/common/v2/agent/agentic_edit_tools/__init__.py,sha256=wGICCc1dYh07osB21j62zOQ9Ws0PyyOQ12UYRHmHrtI,1229
-autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py,sha256=YktmocUR0ygth8CVq9gXdUzIhX3FicULhwmnA_DTfik,3099
+autocoder/common/v2/agent/agentic_edit_tools/ask_followup_question_tool_resolver.py,sha256=bwtf4m9N82TCP3piK5UglJk1FVFFm7ZX59XerA2qxko,3131
 autocoder/common/v2/agent/agentic_edit_tools/attempt_completion_tool_resolver.py,sha256=82ZGKeRBSDKeead_XVBW4FxpiE-5dS7tBOk_3RZ6B5s,1511
 autocoder/common/v2/agent/agentic_edit_tools/base_tool_resolver.py,sha256=Zid2m1uZd-2wVFGc_n_KAViXZyNjbdLSpI5n7ut1RUQ,1036
 autocoder/common/v2/agent/agentic_edit_tools/execute_command_tool_resolver.py,sha256=GueQfIY2hVu2R5j9R5rBtn2znl5MlmEdGtsa6snsMHs,4112
@@ -214,8 +214,8 @@ autocoder/rag/doc_filter.py,sha256=UduVO2mlrngwJICrefjDJTYfdmQ4GcRXrfWDQ7xXksk,1
 autocoder/rag/document_retriever.py,sha256=5BDqKVJqLPScEnua5S5suXhWuCaALIfPf5obXeJoWfs,8461
 autocoder/rag/lang.py,sha256=HvcMeu6jReEJOGxyLMn4rwBoD-myFwmykS3VLceBJLs,3364
 autocoder/rag/llm_wrapper.py,sha256=Ht5GF5yJtrztoliujsZzx_ooWZmHkd5xLZKcGEiicZw,4303
-autocoder/rag/long_context_rag.py,sha256=bZy428EYnsh6ke4zNuxI6rP5k-m7Whel6GgLu98boQA,42239
-autocoder/rag/qa_conversation_strategy.py,sha256=1AcHV0MU00yTls20LlCPO-Un_OhSrr_p-H5lxLleAq4,6060
+autocoder/rag/long_context_rag.py,sha256=84haMjfbPd2Rw_8Zdj-Azf_v9tbYST_OUPW0NZlmeJY,42189
+autocoder/rag/qa_conversation_strategy.py,sha256=vv62JhmdZvLJ3U1gG4ZZ3m9thIlGvU1H0RXHtrRTJ6s,11788
 autocoder/rag/rag_config.py,sha256=8LwFcTd8OJWWwi1_WY4IzjqgtT6RyE2j4PjxS5cCTDE,802
 autocoder/rag/rag_entry.py,sha256=6TKtErZ0Us9XSV6HgRKXA6yR3SiZGPHpynOKSaR1wgE,2463
 autocoder/rag/raw_rag.py,sha256=BOr0YGf3umjqXOIDVO1LXQ0bIHx8hzBdiubND2ezyxc,2946
@@ -277,9 +277,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=KW0mlmcHlStXi8-_6fXZ2-ifeJ5mgP0OV7DQFzCtIsw,14008
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.345.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.345.dist-info/METADATA,sha256=TzDlQ_--wVXbK1CZmNIKGlHH8obbgYOLGZl8gRYrSSM,2728
-auto_coder-0.1.345.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.345.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.345.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.345.dist-info/RECORD,,
+auto_coder-0.1.346.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.346.dist-info/METADATA,sha256=pXxlRR0gvLNboAcWQtU9VzpKpiaCTj4evVC9Ztas7R4,2728
+auto_coder-0.1.346.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.346.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.346.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.346.dist-info/RECORD,,

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()

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

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

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

autocoder/rag/qa_conversation_strategy.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
-from typing import List, Dict, Any,Generator
+from typing import List, Dict, Any, Generator
 import byzerllm
+from autocoder.common import AutoCoderArgs
 
 class QAConversationStrategy(ABC):
     """
@@ -26,6 +27,9 @@ 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([
@@ -36,7 +40,7 @@ class MultiRoundStrategy(QAConversationStrategy):
         return messages
     
     @byzerllm.prompt()
-    def _read_docs_prompt(
+    def _read_docs_prompt_old(
         self, relevant_docs: List[str], local_image_host: str
     ) -> Generator[str, None, None]:
         """        
@@ -68,6 +72,75 @@ class MultiRoundStrategy(QAConversationStrategy):
         例如：/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):
     """
@@ -81,7 +154,7 @@ class SingleRoundStrategy(QAConversationStrategy):
         return messages
     
     @byzerllm.prompt()
-    def _single_round_answer_question(
+    def _single_round_answer_question_old(
         self, relevant_docs: List[str], conversations: List[Dict[str, str]], local_image_host: str
     ) -> Generator[str, None, None]:
         """        
@@ -120,26 +193,103 @@ class SingleRoundStrategy(QAConversationStrategy):
         例如：/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(strategy_name: str) -> QAConversationStrategy:
+def get_qa_strategy(args: AutoCoderArgs) -> QAConversationStrategy:
     """
-    Factory method to get the appropriate conversation strategy
-    
+    Factory method to get the appropriate conversation strategy based on AutoCoderArgs
+
     Args:
-        strategy_name: Name of the strategy to use
-        
+        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]()

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.345"
+__version__ = "0.1.346"