auto-coder 0.1.273__tar.gz → 0.1.275__tar.gz

{auto_coder-0.1.273 → auto_coder-0.1.275}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.273
+Version: 0.1.275
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/auto_coder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.273
+Version: 0.1.275
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/auto_coder_rag.py

@@ -17,6 +17,7 @@ import shlex
 from rich.console import Console
 from rich.table import Table
 import os
+import hashlib
 from loguru import logger
 import asyncio
 from datetime import datetime
@@ -32,6 +33,21 @@ if platform.system() == "Windows":
     init()
 
 
+def generate_unique_name_from_path(path: str) -> str:
+    """
+    Generate a unique name (MD5 hash) from a path after normalizing it.
+    For Linux/Unix systems, trailing path separators are removed.
+    """
+    if not path:
+        return ""
+    
+    # Normalize the path (resolve absolute path and remove trailing separators)
+    normalized_path = os.path.normpath(os.path.abspath(path))
+    
+    # Generate MD5 hash from the normalized path
+    return hashlib.md5(normalized_path.encode("utf-8")).hexdigest()
+
+
 def initialize_system(args):
     if args.product_mode == "lite":
         return
@@ -491,6 +507,10 @@ def main(input_args: Optional[List[str]] = None):
             }
         )
 
+        # Generate unique name for RAG build if doc_dir exists
+        if server_args.doc_dir:
+            auto_coder_args.rag_build_name = generate_unique_name_from_path(server_args.doc_dir)
+            logger.info(f"Generated RAG build name: {auto_coder_args.rag_build_name}")
 
         if auto_coder_args.enable_hybrid_index and args.product_mode == "lite":
             raise Exception("Hybrid index is not supported in lite mode")
@@ -500,7 +520,7 @@ def main(input_args: Optional[List[str]] = None):
             try:
                 from byzerllm.apps.byzer_storage.simple_api import ByzerStorage
 
-                storage = ByzerStorage("byzerai_store", "rag", "files")
+                storage = ByzerStorage("byzerai_store", "rag", auto_coder_args.rag_build_name)
                 storage.retrieval.cluster_info("byzerai_store")
             except Exception as e:
                 logger.error(
@@ -611,6 +631,7 @@ def main(input_args: Optional[List[str]] = None):
 
         if server_args.doc_dir:
             auto_coder_args.rag_type = "simple"
+            auto_coder_args.rag_build_name = generate_unique_name_from_path(server_args.doc_dir)
             rag = RAGFactory.get_rag(
                 llm=llm,
                 args=auto_coder_args,
@@ -618,6 +639,7 @@ def main(input_args: Optional[List[str]] = None):
                 tokenizer_path=server_args.tokenizer_path,
             )
         else:
+            auto_coder_args.rag_build_name = generate_unique_name_from_path("")
             rag = RAGFactory.get_rag(llm=llm, args=auto_coder_args, path="")
 
         llm_wrapper = LLWrapper(llm=llm, rag=rag)
@@ -636,10 +658,7 @@ def main(input_args: Optional[List[str]] = None):
             logger.warning(f"Failed to save service info: {str(e)}")
         
         serve(llm=llm_wrapper, args=server_args)
-    elif args.command == "build_hybrid_index":
-        if not args.quick:
-            initialize_system()
-
+    elif args.command == "build_hybrid_index":        
         auto_coder_args = AutoCoderArgs(
             **{
                 arg: getattr(args, arg)
@@ -648,6 +667,11 @@ def main(input_args: Optional[List[str]] = None):
             }
         )
 
+        # Generate unique name for RAG build if doc_dir exists
+        if args.doc_dir:
+            auto_coder_args.rag_build_name = generate_unique_name_from_path(args.doc_dir)
+            logger.info(f"Generated RAG build name: {auto_coder_args.rag_build_name}")
+
         auto_coder_args.enable_hybrid_index = True
         auto_coder_args.rag_type = "simple"
 
@@ -675,6 +699,7 @@ def main(input_args: Optional[List[str]] = None):
                 return
             llm.setup_default_emb_model_name("emb")
 
+        auto_coder_args.rag_build_name = generate_unique_name_from_path(args.doc_dir)
         rag = RAGFactory.get_rag(
             llm=llm,
             args=auto_coder_args,

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/auto_coder_runner.py

@@ -1384,7 +1384,7 @@ def commit(query: str):
             md5 = hashlib.md5(file_content.encode("utf-8")).hexdigest()
             file_name = os.path.basename(execute_file)
             commit_result = git_utils.commit_changes(
-                ".", f"auto_coder_{file_name}_{md5}\n{commit_message}"
+                ".", f"{commit_message}\nauto_coder_{file_name}_{md5}"
             )
             git_utils.print_commit_info(commit_result=commit_result)
             if commit_message:

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/chat_auto_coder.py

@@ -309,6 +309,9 @@ def main():
                 text = voice_input()
                 new_prompt = "/coding " + text
 
+            elif user_input.startswith("/clear") or user_input.startswith("/cls"):
+                print("\033c")                
+
             elif user_input.startswith("/add_files"):
                 args = user_input[len("/add_files"):].strip().split()
                 add_files(args)

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/commands/auto_command.py

@@ -175,6 +175,7 @@ class CommandAutoTuner:
         Python版本: {{ env_info.python_version }}
         终端类型: {{ env_info.shell_type }}
         终端编码: {{ env_info.shell_encoding }}
+        当前用户: {{ current_user }}
         
         {%- if shell_type %}
         脚本类型：{{ shell_type }}
@@ -284,7 +285,8 @@ class CommandAutoTuner:
             "shell_type": shell_type,
             "shell_encoding": shells.get_terminal_encoding(),
             "conversation_safe_zone_tokens": self.args.conversation_prune_safe_zone_tokens,
-            "os_distribution": shells.get_os_distribution()
+            "os_distribution": shells.get_os_distribution(),
+            "current_user": shells.get_current_username()
         }
     
     @byzerllm.prompt()

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/__init__.py

@@ -320,6 +320,7 @@ class AutoCoderArgs(pydantic.BaseModel):
 
     monitor_mode: bool = False
     enable_hybrid_index: bool = False
+    rag_build_name: Optional[str] = None
     disable_auto_window: bool = False
     filter_batch_size: Optional[int] = 5
     disable_segment_reorder: bool = False

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/code_auto_merge.py

@@ -1,4 +1,3 @@
-
 import os
 from byzerllm.utils.client import code_utils
 from autocoder.common import AutoCoderArgs, git_utils
@@ -197,5 +196,5 @@ class CodeAutoMerge:
 
         self.printer.print_in_terminal("files_merged", total=total)
         if not force_skip_git and not self.args.skip_commit:
-            commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
+            commit_result = git_utils.commit_changes(self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}")
             git_utils.print_commit_info(commit_result=commit_result)

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/code_auto_merge_diff.py

@@ -579,7 +579,7 @@ class CodeAutoMergeDiff:
 
         self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git and not self.args.skip_commit:
-            commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
+            commit_result = git_utils.commit_changes(self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}")
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print edits for review

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/code_auto_merge_editblock.py

@@ -425,7 +425,8 @@ class CodeAutoMergeEditBlock:
             if not force_skip_git and not self.args.skip_commit:
                 try:
                     commit_result = git_utils.commit_changes(
-                        self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}"
+                        self.args.source_dir,
+                        f"{self.args.query}\nauto_coder_{file_name}_{md5}",
                     )
                     git_utils.print_commit_info(commit_result=commit_result)
                 except Exception as e:

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/code_auto_merge_strict_diff.py

@@ -285,7 +285,9 @@ class CodeAutoMergeStrictDiff:
                             
         self.printer.print_in_terminal("files_merged_total", total=total)
         if not force_skip_git and not self.args.skip_commit:
-            commit_result = git_utils.commit_changes(self.args.source_dir, f"auto_coder_{file_name}_{md5}\n{self.args.query}")
+            commit_result = git_utils.commit_changes(
+                self.args.source_dir, f"{self.args.query}\nauto_coder_{file_name}_{md5}"
+            )
             git_utils.print_commit_info(commit_result=commit_result)
         else:
             # Print diff blocks for review

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/command_generator.py

@@ -16,6 +16,7 @@ def _generate_shell_script(user_input: str) -> str:
     Python版本: {{ env_info.python_version }}
     终端类型: {{ env_info.shell_type }}
     终端编码: {{ env_info.shell_encoding }}
+    当前用户: {{ current_user }}
     
     {%- if shell_type %}
     脚本类型：{{ shell_type }}
@@ -51,7 +52,8 @@ def _generate_shell_script(user_input: str) -> str:
         "env_info": env_info,
         "shell_type": shell_type,
         "shell_encoding": shells.get_terminal_encoding(),
-        "os_distribution": shells.get_os_distribution()
+        "os_distribution": shells.get_os_distribution(),
+        "current_user": shells.get_current_username()
     }
 
 

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/git_utils.py

@@ -118,7 +118,8 @@ def revert_changes(repo_path: str, message: str) -> bool:
             return False
 
         # 通过message定位到commit_hash
-        commit = repo.git.log("--all", f"--grep={message}", "--format=%H", "-n", "1")
+        # --grep 默认只搜索第一行 -F 参数将搜索模式视为固定字符串而非正则表达式
+        commit = repo.git.log("--all", f"--grep={message}", "-F", "--format=%H", "-n", "1")
         if not commit:
             logger.warning(f"No commit found with message: {message}")
             return False
@@ -170,7 +171,8 @@ def revert_change(repo_path: str, message: str) -> bool:
     repo = get_repo(repo_path)
     if repo is None:
         return False
-    commit = repo.git.log("--all", f"--grep={message}", "--format=%H", "-n", "1")
+    # --grep 默认只搜索第一行 -F 参数将搜索模式视为固定字符串而非正则表达式
+    commit = repo.git.log("--all", f"--grep={message}", "-F", "--format=%H", "-n", "1")
     if commit:
         repo.git.revert(commit, no_edit=True)
         logger.info(f"Reverted changes with commit message: {message}")
@@ -618,7 +620,9 @@ def generate_commit_message(changes_report: str) -> str:
 def get_commit_by_message(repo_path: str, message: str):
     repo = get_repo(repo_path)
     try:
-        commit_hash = repo.git.log("--all", f"--grep={message}", "--format=%H", "-n", "1")
+        commit_hash = repo.git.log(
+            "--all", f"--grep={message}", "-F", "--format=%H", "-n", "1"
+        )
         if not commit_hash:
             return None
         return repo.commit(commit_hash.strip())

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/common/shells.py

@@ -10,6 +10,7 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
 from rich.live import Live
+import getpass
 
 from autocoder.common.result_manager import ResultManager
 
@@ -547,4 +548,25 @@ set PYTHONIOENCODING=utf-8
             try:
                 os.unlink(temp_file.name)
             except Exception:
-                pass
+                pass
+
+def get_current_username():
+    """
+    Get the current username across different operating systems.
+    
+    Returns:
+        str: The current username.
+    """
+    try:
+        # getpass.getuser() works on Windows, macOS, and Linux
+        username = getpass.getuser()
+        return username
+    except Exception:
+        # Fallback methods if getpass.getuser() fails
+        try:
+            if platform.system() == 'Windows':
+                return os.environ.get('USERNAME', '')
+            else:  # macOS/Linux
+                return os.environ.get('USER', '')
+        except Exception:
+            return ''

{auto_coder-0.1.273 → auto_coder-0.1.275}/src/autocoder/index/index.py

@@ -157,6 +157,78 @@ class IndexManager:
         3. 用途的长度不能超过100字符
         4. 导入语句的分隔符为^^
 
+        一些根据指定条件需要遵守的特殊规则：
+        - 当你遇到文件.jsp文件, 导入语句中需要包含 jsp:include 标签中的文件
+
+        下面是一段示例：
+
+        ## 输入
+        下列是文件 /test.py 的源码：
+
+        import os
+        import time
+        from loguru import logger
+        import byzerllm
+
+        a = ""
+
+        @byzerllm.prompt(render="jinja")
+        def auto_implement_function_template(instruction:str, content:str)->str:
+
+        ## 输出
+        用途：主要用于提供自动实现函数模板的功能。
+        函数：auto_implement_function_template
+        变量：a
+        类：
+        导入语句：import os^^import time^^from loguru import logger^^import byzerllm
+
+        现在，让我们开始一个新的任务:
+
+        ## 输入
+        下列是文件 {{ path }} 的源码：
+
+        {{ code }}
+
+        ## 输出
+        """    
+
+    @byzerllm.prompt()
+    def jsp_get_all_file_symbols(self, path: str, code: str) -> str:
+        """
+        你的目标是从给定的jsp代码中获取代码里的符号，需要获取的符号类型包括：
+
+        1. 函数
+        2. 类
+        3. 变量
+        4. 所有导入语句
+
+        如果没有任何符号,返回空字符串就行。
+        如果有符号，按如下格式返回:
+
+        ```
+        用途：主要用于提供自动实现函数模板的功能。
+        {符号类型}: {符号名称}, {符号名称}, ...
+        ```
+
+        注意：
+        1. 直接输出结果，不要尝试使用任何代码
+        2. 不要分析代码的内容和目的
+        3. 用途的长度不能超过100字符
+        4. 导入语句的分隔符为^^
+        5. 导入语句中需要包含 jsp:include 整个标签，类似 <jsp:include page="/jspf/prelude.jspf" />
+        6. 导入语句中需要包含 form 标签，类似 <form name="ActionPlanLinkedForm" action="/ri/ActionPlanController.do" method="post">
+        7. 导入语句中需要包含 有 src 属性的 script 标签。比如 <script language="script" src="xxx">        
+        8. 导入语句中需要包含 有 src 属性的 link 标签。 比如 <link rel="stylesheet" type="text/css" href="/ri/ui/styles/xptheme.css">
+        9. 导入语句中需要包含 ajax 请求里的url,比如 $.ajax({  
+        type : "post",  
+        url : "admWorkingDay!updateAdmWorkingDayList.action",  中，那么对应的为 <ajax method="post" url="admWorkingDay!updateAdmWorkingDayList.action">
+        10. 导入语句中需要包含超连接，比如 <a href="admRiskLimits!queryAdmRiskLimitsById.action?admRiskLimits.id=${fn:escapeXml(item.id)}">${fn:escapeXml(item.classification)}， 对应的为 <a href="admRiskLimits!queryAdmRiskLimitsById.action"}
+        11. 导入语句中需要包含一些js函数里的值，比如 window.onbeforeunload = function()  {
+	var actionType = document.ap_ActionPlanForm.action.value;
+	if(typeof(window.opener.reloadApCount)!="undefined"&&(actionType&&actionType!='Discard')){
+		}
+}  对应为 <window.onbeforeunload url="from 表单名字为ap_ActionPlanForm的action的值">
+        
         下面是一段示例：
 
         ## 输入
@@ -291,8 +363,15 @@ class IndexManager:
                 symbols = "\n".join(symbols)
             else:
                 meta_holder = byzerllm.MetaHolder()
-                symbols = self.get_all_file_symbols.with_llm(
-                    self.index_llm).with_meta(meta_holder).run(source.module_name, source_code)
+                ext = os.path.splitext(file_path)[1].lower()
+                ## 需要有特殊prompt
+                if ext == ".jsp":
+                    symbols = self.jsp_get_all_file_symbols.with_llm(
+                        self.index_llm).with_meta(meta_holder).run(source.module_name, source_code)
+                else:
+                    symbols = self.get_all_file_symbols.with_llm(
+                        self.index_llm).with_meta(meta_holder).run(source.module_name, source_code)
+                
                 time.sleep(self.anti_quota_limit)
 
                 if meta_holder.get_meta():

auto_coder-0.1.275/src/autocoder/rag/cache/base_cache.py

@@ -0,0 +1,29 @@
+from pydantic import BaseModel
+from typing import List, Tuple,Dict,Optional,Any
+from abc import ABC, abstractmethod
+
+# New model class for file information
+class FileInfo(BaseModel):
+    file_path: str
+    relative_path: str
+    modify_time: float
+    file_md5: str
+
+# New model class for cache items
+class CacheItem(BaseModel):
+    file_path: str
+    relative_path: str
+    content: List[Dict[str, Any]]  # Serialized SourceCode objects
+    modify_time: float
+    md5: str
+
+class DeleteEvent(BaseModel):
+    file_paths: List[str]
+
+class AddOrUpdateEvent(BaseModel):
+    file_infos: List[FileInfo]
+
+class BaseCacheManager(ABC):
+    @abstractmethod
+    def get_cache(self,options:Optional[Dict[str,Any]]=None) -> Dict[str, Dict]:
+        pass