autocoder-nano 0.1.37__py3-none-any.whl → 0.1.38__py3-none-any.whl

autocoder_nano/auto_coder_nano.py

@@ -11,16 +11,13 @@ import uuid
 from autocoder_nano.agent.agentic_edit import AgenticEdit
 from autocoder_nano.agent.agentic_edit_types import AgenticEditRequest
 from autocoder_nano.chat import stream_chat_display
-from autocoder_nano.edit import Dispacher
+from autocoder_nano.edit import coding
 from autocoder_nano.helper import show_help
 from autocoder_nano.project import project_source
 from autocoder_nano.index import (index_export, index_import, index_build,
                                   index_build_and_filter, extract_symbols)
-# from autocoder_nano.index.entry import build_index_and_filter_files
-# from autocoder_nano.index.index_manager import IndexManager
-# from autocoder_nano.index.symbols_utils import extract_symbols
+from autocoder_nano.rules import rules_from_active_files, rules_from_commit_changes, get_rules_context
 from autocoder_nano.llm_client import AutoLLM
-from autocoder_nano.rules.rules_learn import AutoRulesLearn
 from autocoder_nano.utils.completer_utils import CommandCompleter
 from autocoder_nano.version import __version__
 from autocoder_nano.llm_types import *
@@ -29,7 +26,6 @@ from autocoder_nano.templates import create_actions
 from autocoder_nano.git_utils import (repo_init, commit_changes, revert_changes,
                                       get_uncommitted_changes, generate_commit_message)
 from autocoder_nano.sys_utils import default_exclude_dirs, detect_env
-# from autocoder_nano.project import PyProject, SuffixProject, project_source
 from autocoder_nano.utils.printer_utils import Printer
 
 import yaml
@@ -52,11 +48,12 @@ from rich.text import Text
 
 printer = Printer()
 console = printer.get_console()
-# console = Console()
+
+
 project_root = os.getcwd()
 base_persist_dir = os.path.join(project_root, ".auto-coder", "plugins", "chat-auto-coder")
-# defaut_exclude_dirs = [".git", ".svn", "node_modules", "dist", "build", "__pycache__", ".auto-coder", "actions",
-#                        ".vscode", ".idea", ".hg"]
+
+
 commands = [
     "/add_files", "/remove_files", "/list_files", "/conf", "/coding", "/chat", "/revert", "/index/query",
     "/index/build", "/exclude_dirs", "/exclude_files", "/help", "/shell", "/exit", "/mode", "/models", "/commit",
@@ -68,8 +65,6 @@ memory = {
     "current_files": {"files": [], "groups": {}},
     "conf": {
         "auto_merge": "editblock",
-        # "current_chat_model": "",
-        # "current_code_model": "",
         "chat_model": "",
         "code_model": "",
     },
@@ -622,14 +617,46 @@ def prepare_chat_yaml():
     return
 
 
-def coding(query: str, llm: AutoLLM):
+def get_conversation_history() -> str:
+    memory_dir = os.path.join(project_root, ".auto-coder", "memory")
+    os.makedirs(memory_dir, exist_ok=True)
+    memory_file = os.path.join(memory_dir, "chat_history.json")
+
+    def error_message():
+        printer.print_panel(Text("未找到可应用聊天记录.", style="yellow"), title="Chat History", center=True)
+
+    if not os.path.exists(memory_file):
+        error_message()
+        return ""
+
+    with open(memory_file, "r") as f:
+        chat_history = json.load(f)
+
+    if not chat_history["ask_conversation"]:
+        error_message()
+        return ""
+
+    conversations = chat_history["ask_conversation"]
+
+    context = ""
+    context += f"下面是我们的历史对话，参考我们的历史对话从而更好的理解需求和修改代码。\n\n<history>\n"
+    for conv in conversations:
+        if conv["role"] == "user":
+            context += f"用户: {conv['content']}\n"
+        elif conv["role"] == "assistant":
+            context += f"你: {conv['content']}\n"
+    context += "</history>\n"
+    return context
+
+
+def coding_command(query: str, llm: AutoLLM):
     is_apply = query.strip().startswith("/apply")
     if is_apply:
         query = query.replace("/apply", "", 1).strip()
+    is_rules = False
 
     memory["conversation"].append({"role": "user", "content": query})
     conf = memory.get("conf", {})
-    current_files = memory["current_files"]["files"]
 
     prepare_chat_yaml()  # 复制上一个序号的 yaml 文件, 生成一个新的聊天 yaml 文件
     latest_yaml_file = get_last_yaml_file(os.path.join(project_root, "actions"))
@@ -650,52 +677,14 @@ def coding(query: str, llm: AutoLLM):
             if converted_value is not None:
                 yaml_config[key] = converted_value
 
-        yaml_config["urls"] = current_files
+        yaml_config["urls"] = memory["current_files"]["files"]
         yaml_config["query"] = query
 
         if is_apply:
-            memory_dir = os.path.join(project_root, ".auto-coder", "memory")
-            os.makedirs(memory_dir, exist_ok=True)
-            memory_file = os.path.join(memory_dir, "chat_history.json")
+            yaml_config["context"] += get_conversation_history()
 
-            def error_message():
-                printer.print_panel(
-                    Text("No chat history found to apply.", style="yellow"), title="Chat History", center=True
-                )
-
-            if not os.path.exists(memory_file):
-                error_message()
-                return
-
-            with open(memory_file, "r") as f:
-                chat_history = json.load(f)
-
-            if not chat_history["ask_conversation"]:
-                error_message()
-                return
-            conversations = chat_history["ask_conversation"]
-
-            yaml_config["context"] += f"下面是我们的历史对话，参考我们的历史对话从而更好的理解需求和修改代码。\n\n<history>\n"
-            for conv in conversations:
-                if conv["role"] == "user":
-                    yaml_config["context"] += f"用户: {conv['content']}\n"
-                elif conv["role"] == "assistant":
-                    yaml_config["context"] += f"你: {conv['content']}\n"
-            yaml_config["context"] += "</history>\n"
-
-        # todo:暂时注释,后续通过一个 is_rules 的参数来控制
-        # if args.enable_rules:
-        #     rules_dir_path = os.path.join(project_root, ".auto-coder", "autocoderrules")
-        #     printer.print_text("已开启 Rules 模式", style="green")
-        #     yaml_config["context"] += f"下面是我们对代码进行深入分析,提取具有通用价值的功能模式和设计模式,可在其他需求中复用的Rules\n"
-        #     yaml_config["context"] += "你在编写代码时可以参考以下Rules\n"
-        #     yaml_config["context"] += "<rules>\n"
-        #     for rules_name in os.listdir(rules_dir_path):
-        #         printer.print_text(f"正在加载 Rules:{rules_name}", style="green")
-        #         rules_file_path = os.path.join(rules_dir_path, rules_name)
-        #         with open(rules_file_path, "r") as fp:
-        #             yaml_config["context"] += f"{fp.read()}\n"
-        #     yaml_config["context"] += "</rules>\n"
+        if is_rules:
+            yaml_config["context"] += get_rules_context()
 
         yaml_config["file"] = latest_yaml_file
         yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
@@ -704,8 +693,7 @@ def coding(query: str, llm: AutoLLM):
             f.write(yaml_content)
         args = convert_yaml_to_config(execute_file)
 
-        dispacher = Dispacher(args=args, llm=llm)
-        dispacher.dispach()
+        coding(llm=llm, args=args)
     else:
         printer.print_text(f"创建新的 YAML 文件失败.", style="yellow")
 
@@ -1538,43 +1526,15 @@ def rules(query_args: List[str], llm: AutoLLM):
 
     if query_args[0] == "/commit":
         commit_id = query_args[1].strip()
-        auto_learn = AutoRulesLearn(llm=llm, args=args)
-
-        try:
-            result = auto_learn.analyze_commit_changes(commit_id=commit_id, conversations=[])
-            rules_file = os.path.join(rules_dir_path, f"rules-commit-{uuid.uuid4()}.md")
-            with open(rules_file, "w", encoding="utf-8") as f:
-                f.write(result)
-            printer.print_text(f"代码变更[{commit_id}]生成 Rules 成功", style="green")
-        except Exception as e:
-            printer.print_text(f"代码变更[{commit_id}]生成 Rules 失败: {e}", style="red")
+        rules_from_commit_changes(commit_id=commit_id, llm=llm, args=args)
 
     if query_args[0] == "/analyze":
-        auto_learn = AutoRulesLearn(llm=llm, args=args)
-
         files = memory.get("current_files", {}).get("files", [])
         if not files:
             printer.print_text("当前无活跃文件用于生成 Rules", style="yellow")
             return
 
-        sources = SourceCodeList([])
-        for file in files:
-            try:
-                with open(file, "r", encoding="utf-8") as f:
-                    source_code = f.read()
-                    sources.sources.append(SourceCode(module_name=file, source_code=source_code))
-            except Exception as e:
-                printer.print_text(f"读取文件生成 Rules 失败: {e}", style="yellow")
-                continue
-
-        try:
-            result = auto_learn.analyze_modules(sources=sources, conversations=[])
-            rules_file = os.path.join(rules_dir_path, f"rules-modules-{uuid.uuid4()}.md")
-            with open(rules_file, "w", encoding="utf-8") as f:
-                f.write(result)
-            printer.print_text(f"活跃文件[Files:{len(files)}]生成 Rules 成功", style="green")
-        except Exception as e:
-            printer.print_text(f"活跃文件生成 Rules 失败: {e}", style="red")
+        rules_from_active_files(files=files, llm=llm, args=args)
 
     completer.refresh_files()
 
@@ -1765,7 +1725,7 @@ def main():
                 if not query:
                     printer.print_text("Please enter your request.", style="yellow")
                     continue
-                coding(query=query, llm=auto_llm)
+                coding_command(query=query, llm=auto_llm)
             elif user_input.startswith("/auto"):
                 query = user_input[len("/auto"):].strip()
                 if not query:

autocoder_nano/edit/__init__.py

@@ -17,4 +17,12 @@ class Dispacher:
         ]
         for action in dispacher_actions:
             if action.run():
-                return
+                return
+
+
+def coding(llm: AutoLLM, args: AutoCoderArgs):
+    dispacher = Dispacher(args=args, llm=llm)
+    dispacher.dispach()
+
+
+__all__ = ["coding"]

autocoder_nano/rules/__init__.py

@@ -0,0 +1,67 @@
+import os
+import uuid
+
+from autocoder_nano.llm_client import AutoLLM
+from autocoder_nano.llm_types import AutoCoderArgs, SourceCodeList, SourceCode
+from autocoder_nano.rules.rules_learn import AutoRulesLearn
+from autocoder_nano.utils.printer_utils import Printer
+
+
+printer = Printer()
+
+
+def rules_from_commit_changes(commit_id: str, llm: AutoLLM, args: AutoCoderArgs):
+    rules_dir_path = os.path.join(args.source_dir, ".auto-coder", "autocoderrules")
+    auto_learn = AutoRulesLearn(llm=llm, args=args)
+
+    try:
+        result = auto_learn.analyze_commit_changes(commit_id=commit_id, conversations=[])
+        rules_file = os.path.join(rules_dir_path, f"rules-commit-{uuid.uuid4()}.md")
+        with open(rules_file, "w", encoding="utf-8") as f:
+            f.write(result)
+        printer.print_text(f"代码变更[{commit_id}]生成 Rules 成功", style="green")
+    except Exception as e:
+        printer.print_text(f"代码变更[{commit_id}]生成 Rules 失败: {e}", style="red")
+
+
+def rules_from_active_files(files: list[str], llm: AutoLLM, args: AutoCoderArgs):
+    rules_dir_path = os.path.join(args.source_dir, ".auto-coder", "autocoderrules")
+    auto_learn = AutoRulesLearn(llm=llm, args=args)
+
+    sources = SourceCodeList([])
+    for file in files:
+        try:
+            with open(file, "r", encoding="utf-8") as f:
+                source_code = f.read()
+                sources.sources.append(SourceCode(module_name=file, source_code=source_code))
+        except Exception as e:
+            printer.print_text(f"读取文件生成 Rules 失败: {e}", style="yellow")
+            continue
+
+    try:
+        result = auto_learn.analyze_modules(sources=sources, conversations=[])
+        rules_file = os.path.join(rules_dir_path, f"rules-modules-{uuid.uuid4()}.md")
+        with open(rules_file, "w", encoding="utf-8") as f:
+            f.write(result)
+        printer.print_text(f"活跃文件[Files:{len(files)}]生成 Rules 成功", style="green")
+    except Exception as e:
+        printer.print_text(f"活跃文件生成 Rules 失败: {e}", style="red")
+
+
+def get_rules_context(project_root):
+    rules_dir_path = os.path.join(project_root, ".auto-coder", "autocoderrules")
+    printer.print_text("已开启 Rules 模式", style="green")
+    context = ""
+    context += f"下面是我们对代码进行深入分析,提取具有通用价值的功能模式和设计模式,可在其他需求中复用的Rules\n"
+    context += "你在编写代码时可以参考以下Rules\n"
+    context += "<rules>\n"
+    for rules_name in os.listdir(rules_dir_path):
+        printer.print_text(f"正在加载 Rules:{rules_name}", style="green")
+        rules_file_path = os.path.join(rules_dir_path, rules_name)
+        with open(rules_file_path, "r") as fp:
+            context += f"{fp.read()}\n"
+    context += "</rules>\n"
+    return context
+
+
+__all__ = ["get_rules_context", "rules_from_commit_changes", "rules_from_active_files"]

autocoder_nano/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.37"
+__version__ = "0.1.38"
 __author__ = "moofs"
 __license__ = "Apache License 2.0"

{autocoder_nano-0.1.37.dist-info → autocoder_nano-0.1.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autocoder_nano
-Version: 0.1.37
+Version: 0.1.38
 Summary: AutoCoder Nano
 Author: moofs
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence

{autocoder_nano-0.1.37.dist-info → autocoder_nano-0.1.38.dist-info}/RECORD

@@ -1,5 +1,5 @@
 autocoder_nano/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder_nano/auto_coder_nano.py,sha256=AMJiNqQyEKaU5KqEOo9EzQwQDi5K3lr4YTeuMqdqWSA,74671
+autocoder_nano/auto_coder_nano.py,sha256=rTcAq-GXnGxxmN5pIQfh7siYQAFjyIlZiPLjsaUXI9U,71685
 autocoder_nano/auto_coder_nano_rag.py,sha256=9BtNZ6nC5D5SPTIuziXZOfouCBLOMNzvJMTdDPQEgO8,10436
 autocoder_nano/auto_coder_nano_ui.py,sha256=ZBskcIJMeTJY7_JipGJaee58G9fUJaOv3LV4hptLc6c,12669
 autocoder_nano/file_utils.py,sha256=iGbkbQ191nKL4aNufdexYYYQSDM1XrDC9Uxp_PIbawY,661
@@ -10,7 +10,7 @@ autocoder_nano/llm_prompt.py,sha256=ViWUfCZp0gDESAAPHBhZc2WhHiFUHIxK6a2xbFu0sjU,
 autocoder_nano/llm_types.py,sha256=T0ugeWdwejy6BJaQrAlk8Pk5qweW2xbggxzHaSpTBOg,11588
 autocoder_nano/sys_utils.py,sha256=Sn6kr5diaEkVWbYDBrtenr9zw32jVIWvsAReY7_uEd0,1638
 autocoder_nano/templates.py,sha256=fqlRtnx6HvPE4CbdnPcnLBB-flPwufwcGRpsFD3aW2c,4271
-autocoder_nano/version.py,sha256=zGimidx6OporaPNCY3Rm74IgiKpb8FGFXs-gXvOb2SY,79
+autocoder_nano/version.py,sha256=n-gEsFbSQhkVooPpwNmF2t1Qt1jwBdkbwO_3nOzXhPA,79
 autocoder_nano/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder_nano/agent/agent_base.py,sha256=O5Hq6VnoqrXnBE_oXZHXlbmSRdOEe28H65bJ1WhAQjg,16377
 autocoder_nano/agent/agentic_edit.py,sha256=I1HjRhMabDmtfxcCOKawUJV0wU1GNzKtof19_GNgAjU,88749
@@ -50,7 +50,7 @@ autocoder_nano/app/templates/partials/input.html,sha256=8CY3JcHaA4nPZ2Vu4ragdYZz
 autocoder_nano/app/templates/partials/message.html,sha256=HWEh_j_yJAbP7zFs6jt88BDzkP7dG6VgPUbS2MT5Ax4,1548
 autocoder_nano/chat/__init__.py,sha256=FuXp0tcnegngct9Jp8HbgwFkwnhxMirwNFHtoa_vACw,2441
 autocoder_nano/data/tokenizer.json,sha256=7Lb5_DaYlDRvBRH0B0ynXO5c1fOwbQLxujX805-OEh0,7847602
-autocoder_nano/edit/__init__.py,sha256=QPMuW7tBTUe0Q00gUPJEmdxWqvunqko9_dsim0ncr7c,623
+autocoder_nano/edit/__init__.py,sha256=9_6am33w8U6nh1oMjWF-KmE1VmXe6UTTGd2CxSRaf5A,765
 autocoder_nano/edit/actions.py,sha256=N4qzSIE7Ifm7r6Sk-HbgWmbDqMP6jfrpByfpV7rbEo8,6480
 autocoder_nano/edit/text.py,sha256=nC7VkQYHCDdT3ULpy0DIjkFwB9suhjIxK39AEzXqbno,1150
 autocoder_nano/edit/code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -79,7 +79,7 @@ autocoder_nano/rag/doc_storage.py,sha256=sEfX-2PsRTOk7MiwqtY3u0lzqMBwTsPXeIknkAY
 autocoder_nano/rag/long_context_rag.py,sha256=jpTfJg38pfVgL0FGFwe6nmBgQAMEAYtBw9ZLQQcFfpM,21862
 autocoder_nano/rag/token_counter.py,sha256=tHuht9huViEnpqiUVN_xUcgBOHJ0T-6dmk4IWzc_Cd0,1979
 autocoder_nano/research/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder_nano/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+autocoder_nano/rules/__init__.py,sha256=cNglrWEQ4d-xXhbuS6CCFY6DZHRRWANmUayCNnhYOJY,2941
 autocoder_nano/rules/rules_learn.py,sha256=P65_wwZ1sBxcQPTwdb7roqmkW_bj1SJQaZMLpUkglL4,7297
 autocoder_nano/ss/__init__.py,sha256=jp9Az7c0uafZcC6qfxjyZnSnVLtgA_4UdakSOcp8osE,34
 autocoder_nano/ss/search_engine.py,sha256=4_RcxF1almJX5XlLWB7d9UXM92YDK2bOqoCrkuGg5Mc,3720
@@ -91,9 +91,9 @@ autocoder_nano/utils/config_utils.py,sha256=r5n0De4mz5sL_nj-CeT_F5TxtgWQIN5vv0Z5
 autocoder_nano/utils/formatted_log_utils.py,sha256=1d3xvZ1Bo3-I1wQOMdXpwsMX5cl2FWkmpgHGHvTPEvI,5457
 autocoder_nano/utils/printer_utils.py,sha256=6rGHihCh8DDESWs6qWqwsf3B6qaeM_CNx6crzkl9UCk,15303
 autocoder_nano/utils/shell_utils.py,sha256=llVTrOrmS1RH2ws7W69tofVtf53Kq04uh-sURphejrU,2477
-autocoder_nano-0.1.37.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-autocoder_nano-0.1.37.dist-info/METADATA,sha256=hHgyCckA57oWf1OHZlguJgB9IMxqiolJp-6jyQ3yxvY,13591
-autocoder_nano-0.1.37.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autocoder_nano-0.1.37.dist-info/entry_points.txt,sha256=Dj8gGZ_AgLy8ANqr2do_DJjpsR3JMh-ztsrUXo4Vn5Q,194
-autocoder_nano-0.1.37.dist-info/top_level.txt,sha256=D7s34cwIs1F4EAjRRDvO_zTHtUz1Z7UVccFUNlJn7HI,15
-autocoder_nano-0.1.37.dist-info/RECORD,,
+autocoder_nano-0.1.38.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+autocoder_nano-0.1.38.dist-info/METADATA,sha256=TMDwPdAc0EKiR8VAMbV6z8Xjs6yBnuGpzHR9Q09AmeQ,13591
+autocoder_nano-0.1.38.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autocoder_nano-0.1.38.dist-info/entry_points.txt,sha256=Dj8gGZ_AgLy8ANqr2do_DJjpsR3JMh-ztsrUXo4Vn5Q,194
+autocoder_nano-0.1.38.dist-info/top_level.txt,sha256=D7s34cwIs1F4EAjRRDvO_zTHtUz1Z7UVccFUNlJn7HI,15
+autocoder_nano-0.1.38.dist-info/RECORD,,