auto-coder 0.1.359__tar.gz → 0.1.360__tar.gz

{auto_coder-0.1.359 → auto_coder-0.1.360}/PKG-INFO

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

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/auto_coder.egg-info/PKG-INFO

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

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/auto_coder.egg-info/SOURCES.txt

@@ -111,6 +111,9 @@ src/autocoder/common/conversations/__init__.py
 src/autocoder/common/conversations/compatibility.py
 src/autocoder/common/conversations/conversation_manager.py
 src/autocoder/common/conversations/example.py
+src/autocoder/common/directory_cache/__init__.py
+src/autocoder/common/directory_cache/cache.py
+src/autocoder/common/directory_cache/test_cache.py
 src/autocoder/common/file_monitor/__init__.py
 src/autocoder/common/file_monitor/monitor.py
 src/autocoder/common/ignorefiles/__init__.py

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/autocoder/agent/auto_review_commit.py

@@ -47,7 +47,7 @@ class AutoReviewCommit:
     @byzerllm.prompt()
     def review(self, querie_with_urls_and_changes: List[Tuple[str, List[str], Dict[str, Tuple[str, str]]]], query: str) -> Generator[str,None,None]:
         """
-        如果前面我们对话提供了文档，请参考上面的文档对提交的代码变更进行审查，提供改进建议。
+        如果前面我们对话提供了文档，请参考上面的文档对提交的代码变更进行审查，提供改进建议，你所有的输出都要以markdown语法输出。
 
         下面包含最新一次提交的信息：        
         <commit>
@@ -96,7 +96,7 @@ class AutoReviewCommit:
            - 依赖关系：组件耦合是否合理
            - 复用性：是否有重复代码
 
-        评审结果包含以下内容（以美观易于阅读的Markdown格式输出）：
+        评审结果包含以下内容
         1. issues: 发现的具体问题列表        
         3. severity: 问题的严重程度(low/medium/high)，从高到底进行描述。
         4. suggestions: 对应的改进建议列表
@@ -115,7 +115,9 @@ class AutoReviewCommit:
         1. 评审意见应该具体且可操作，而不是泛泛而谈
         2. 对于每个问题都应该提供明确的改进建议
         3. 严重程度的判断要考虑问题对系统的潜在影响
-        4. 建议应该符合项目的技术栈和开发规范        
+        4. 建议应该符合项目的技术栈和开发规范     
+
+        注意，请以「纯 Markdown」输出，不要出现 <markdown>、</markdown> 之类标签。   
         """
         return {}
 

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/autocoder/common/code_auto_generate.py

@@ -59,16 +59,19 @@ class CodeAutoGenerate:
     ) -> str:
         """
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
 
         {{ content }}
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -76,9 +79,27 @@ class CodeAutoGenerate:
         {%- endif %}
 
         {%- if context %}
+        ====
         {{ context }}
         {%- 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() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/autocoder/common/code_auto_generate_diff.py

@@ -16,6 +16,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 
 class CodeAutoGenerateDiff:
     def __init__(
@@ -135,10 +136,12 @@ class CodeAutoGenerateDiff:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -146,6 +149,7 @@ class CodeAutoGenerateDiff:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -153,11 +157,29 @@ class CodeAutoGenerateDiff:
         {%- endif %}
 
         {%- if context %}
+        ====
         <extra_context>
         {{ context }}
         </extra_context>
         {%- 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() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}
@@ -169,13 +191,15 @@ class CodeAutoGenerateDiff:
             return {
                 "structure": ""
             }
-
+        
+        extra_docs = get_rules()
         return {
             "structure": (
                 self.action.pp.get_tree_like_directory_structure()
                 if self.action
                 else ""
-            )
+            ),
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/autocoder/common/code_auto_generate_editblock.py

@@ -20,6 +20,7 @@ from autocoder.rag.token_counter import count_tokens
 from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
 
 
 
@@ -188,10 +189,12 @@ class CodeAutoGenerateEditBlock:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -199,6 +202,7 @@ class CodeAutoGenerateEditBlock:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -206,11 +210,29 @@ class CodeAutoGenerateEditBlock:
         {%- endif %}     
 
         {%- if context %}
+        ====
         <extra_context>
         {{ context }}
         </extra_context>
         {%- 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() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}
@@ -224,6 +246,8 @@ class CodeAutoGenerateEditBlock:
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
             }
+        
+        extra_docs = get_rules()
 
         return {
             "structure": (
@@ -233,6 +257,7 @@ class CodeAutoGenerateEditBlock:
             ),
             "fence_0": self.fence_0,
             "fence_1": self.fence_1,
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt()

{auto_coder-0.1.359 → auto_coder-0.1.360}/src/autocoder/common/code_auto_generate_strict_diff.py

@@ -16,6 +16,8 @@ from autocoder.utils import llms as llm_utils
 from autocoder.common import SourceCodeList
 from autocoder.privacy.model_filter import ModelPathFilter
 from autocoder.memory.active_context_manager import ActiveContextManager
+from autocoder.common.rulefiles.autocoderrules_utils import get_rules
+
 class CodeAutoGenerateStrictDiff:
     def __init__(
         self, llm: byzerllm.ByzerLLM, args: AutoCoderArgs, action=None
@@ -118,10 +120,12 @@ class CodeAutoGenerateStrictDiff:
         现在让我们开始一个新的任务:
 
         {%- if structure %}
+        ====
         {{ structure }}
         {%- endif %}
 
         {%- if content %}
+        ====
         下面是一些文件路径以及每个文件对应的源码：
         <files>
         {{ content }}
@@ -129,6 +133,7 @@ class CodeAutoGenerateStrictDiff:
         {%- endif %}
 
         {%- if package_context %}
+        ====
         下面是上面文件的一些信息（包括最近的变更情况）：
         <package_context>
         {{ package_context }}
@@ -141,6 +146,23 @@ class CodeAutoGenerateStrictDiff:
         </extra_context>
         {%- 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() %}
+        <user_rule>
+        ##File: {{ key }}
+        {{ value }}
+        </user_rule>
+        {% endfor %}        
+        {% endif %}
+
+        ====
+
         下面是用户的需求：
 
         {{ instruction }}
@@ -152,13 +174,16 @@ class CodeAutoGenerateStrictDiff:
             return {
                 "structure": "",                
             }
+        
+        extra_docs = get_rules()
 
         return {
             "structure": (
                 self.action.pp.get_tree_like_directory_structure()
                 if self.action
                 else ""
-            )
+            ),
+            "extra_docs": extra_docs,
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)

auto_coder-0.1.360/src/autocoder/common/directory_cache/__init__.py

@@ -0,0 +1 @@
+

auto_coder-0.1.360/src/autocoder/common/directory_cache/cache.py

@@ -0,0 +1,192 @@
+from __future__ import annotations
+import os, fnmatch, asyncio
+from watchfiles import Change
+from autocoder.common.ignorefiles.ignore_file_utils import should_ignore
+from autocoder.common.file_monitor.monitor import get_file_monitor
+import logging
+import functools
+
+logger = logging.getLogger(__name__)
+
+class DirectoryCache:
+    _instance: "DirectoryCache|None" = None
+
+    def __init__(self, root: str):
+        self.root = os.path.abspath(root)
+        self.files_set: set[str] = set()
+        self.lock = asyncio.Lock()
+        self._main_loop = asyncio.get_event_loop()  # 保存主事件循环引用
+        logger.info(f"Initializing DirectoryCache for root: {self.root}")
+
+    # ---------- 单例获取 ----------
+    @classmethod
+    def get_instance(cls, root: str | None = None) -> "DirectoryCache":
+        if cls._instance is None:
+            if root is None:
+                raise ValueError("root is required when initializing DirectoryCache for the first time")
+            logger.info("Creating new DirectoryCache instance.")
+            cls._instance = cls(root)
+            cls._instance._build()      # 同步首扫
+            cls._instance._register_monitor()
+        elif root is not None and os.path.abspath(root) != cls._instance.root:
+             # 如果请求的 root 与已存在的实例 root 不同，可以选择抛出错误或重新初始化
+             logger.warning(f"Requested root {os.path.abspath(root)} differs from existing instance root {cls._instance.root}. Re-initializing cache.")
+             cls._instance = cls(root)
+             cls._instance._build()
+             cls._instance._register_monitor()
+
+        return cls._instance
+
+    # ---------- 构建 ----------
+    def _build(self) -> None:
+        logger.info(f"Building initial file cache for {self.root}...")
+        count = 0
+        for r, ds, fs in os.walk(self.root, followlinks=True):
+            # 过滤掉需要忽略的目录
+            ds[:] = [d for d in ds if not should_ignore(os.path.join(r, d))]
+            for f in fs:
+                fp = os.path.join(r, f)
+                abs_fp = os.path.abspath(fp)
+                if not should_ignore(abs_fp):
+                    self.files_set.add(abs_fp)
+                    count += 1
+        logger.info(f"Initial cache build complete. Found {count} files.")
+
+
+    # ---------- 监控回调 ----------
+    def _register_monitor(self) -> None:
+        try:
+            logger.info(f"Registering file monitor for {self.root}")
+            mon = get_file_monitor(self.root)
+            # 使用 functools.partial 包装异步回调
+            async_callback_wrapper = functools.partial(self._on_change_wrapper)
+            mon.register("**/*", async_callback_wrapper) # 监听所有文件变化
+            if not mon.is_running():
+                logger.info("Starting file monitor...")
+                mon.start()
+            logger.info("File monitor registered and running.")
+        except Exception as e:
+            logger.error(f"Failed to register or start file monitor: {e}", exc_info=True)
+
+    # Wrapper to run the async callback in the event loop
+    def _on_change_wrapper(self, change: Change, path: str):
+        try:
+            # 使用run_coroutine_threadsafe在主事件循环中运行协程
+            # 注意：主事件循环必须在其他地方运行，如主线程中
+            asyncio.run_coroutine_threadsafe(self._on_change(change, path), self._main_loop)
+        except Exception as e:
+            logger.error(f"Error executing _on_change_wrapper: {e}", exc_info=True)
+            # 如果run_coroutine_threadsafe失败，可以考虑一个同步的备用处理方法
+            try:
+                # 同步备份处理
+                ap = os.path.abspath(path)
+                if should_ignore(ap):
+                    return
+                
+                if change is Change.added:
+                    self.files_set.add(ap)
+                elif change is Change.deleted:
+                    self.files_set.discard(ap)
+                # Change.modified不需要更新集合
+            except Exception as backup_error:
+                logger.error(f"Backup handler also failed: {backup_error}", exc_info=True)
+
+
+    async def _on_change(self, change: Change, path: str) -> None:
+        ap = os.path.abspath(path)
+        # Check ignore status again, as gitignore might change
+        if should_ignore(ap):
+            # If a previously tracked file becomes ignored, remove it
+            async with self.lock:
+                if ap in self.files_set:
+                    logger.debug(f"File became ignored, removing from cache: {ap}")
+                    self.files_set.discard(ap)
+            return
+
+        async with self.lock:
+            if change is Change.added:
+                logger.debug(f"File added, adding to cache: {ap}")
+                self.files_set.add(ap)
+            elif change is Change.deleted:
+                logger.debug(f"File deleted, removing from cache: {ap}")
+                self.files_set.discard(ap)
+            elif change is Change.modified:
+                 # Modification doesn't change existence, but we might want to log or handle metadata updates if needed
+                 logger.debug(f"File modified: {ap} (ignored in cache set)")
+                 pass # No change needed for the set itself
+
+    # ---------- 查询 ----------
+    async def query(self, patterns: list[str]) -> list[str]:
+        logger.debug(f"Querying cache with patterns: {patterns}")
+        async with self.lock:
+            # Make a copy to avoid issues if the set is modified during iteration (though lock prevents this here)
+            current_files = list(self.files_set)
+
+        if not patterns or patterns == [""] or patterns == ["*"]:
+             logger.debug(f"Returning all {len(current_files)} cached files.")
+             return current_files
+
+        out: set[str] = set()
+
+        for p in patterns:
+            pattern_abs = os.path.abspath(os.path.join(self.root, p)) if not os.path.isabs(p) else p
+            is_glob = "*" in p or "?" in p or "[" in p # More robust glob check
+
+            try:
+                if is_glob:
+                    # fnmatch expects relative paths for matching within a root usually,
+                    # but here we match against absolute paths in files_set.
+                    # We need a pattern that works with absolute paths.
+                    # If pattern 'p' is like '*.py', we need to match '/path/to/root/**/*.py'
+                    # Let's adjust the pattern logic or filtering logic.
+
+                    # Option 1: Match relative paths within the root
+                    # Convert absolute paths in files_set to relative for matching
+                    # relative_files = [os.path.relpath(f, self.root) for f in current_files]
+                    # matched_relative = fnmatch.filter(relative_files, p)
+                    # out.update(os.path.join(self.root, rel_f) for rel_f in matched_relative)
+
+                    # Option 2: Match absolute paths directly (might need careful pattern construction)
+                    # If p is relative, make it absolute based on root for matching
+                    # Example: p = "src/*.py" -> effective_pattern = "/path/to/root/src/*.py"
+                    # This requires fnmatch to handle absolute paths correctly or custom logic.
+
+                    # Option 3: Simplified wildcard matching on absolute paths
+                    # Treat '*' as a general wildcard anywhere in the path.
+                    # fnmatch.filter might work if the pattern is constructed like `*pattern*`
+                    # Let's stick to the user's original logic first, assuming it worked for their case
+                    # The original `*{p}*` suggests substring matching with wildcards? Let's refine.
+
+                    # Refined Glob Matching:
+                    # If p contains wildcards, assume it's a glob pattern relative to root.
+                    # Convert files_set paths to relative for matching.
+                    for f_abs in current_files:
+                        f_rel = os.path.relpath(f_abs, self.root)
+                        if fnmatch.fnmatch(f_rel, p) or fnmatch.fnmatch(os.path.basename(f_abs), p):
+                             out.add(f_abs)
+
+                else:
+                    # Exact or substring matching for non-glob patterns
+                    # Match against filename or full path segment
+                    p_lower = p.lower()
+                    for f_abs in current_files:
+                        if p_lower in os.path.basename(f_abs).lower() or p_lower in f_abs.lower():
+                             out.add(f_abs)
+
+            except Exception as e:
+                logger.error(f"Error during pattern matching for '{p}': {e}", exc_info=True)
+
+
+        result = sorted(list(out)) # Sort for consistent output
+        logger.debug(f"Query returned {len(result)} files.")
+        return result
+
+# Helper function (optional, could be integrated into get_instance)
+def initialize_cache(root_path: str):
+    """Initializes the DirectoryCache singleton."""
+    try:
+        DirectoryCache.get_instance(root_path)
+        logger.info("DirectoryCache initialized successfully.")
+    except Exception as e:
+        logger.error(f"Failed to initialize DirectoryCache: {e}", exc_info=True)
+