autocoder-nano 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

autocoder_nano/auto_coder_nano.py

@@ -10,6 +10,7 @@ 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.helper import show_help
 from autocoder_nano.index.entry import build_index_and_filter_files
@@ -75,7 +76,7 @@ memory = {
 }
 
 
-args: AutoCoderArgs = AutoCoderArgs()
+# args: AutoCoderArgs = AutoCoderArgs()
 
 
 def get_all_file_names_in_project() -> List[str]:
@@ -215,6 +216,40 @@ completer = CommandCompleter(
 )
 
 
+def get_final_config(query: str, delete_execute_file: bool = False) -> AutoCoderArgs | None:
+    conf = memory.get("conf", {})
+    yaml_config = {
+        "include_file": ["./base/base.yml"],
+        "skip_build_index": conf.get("skip_build_index", "true") == "true",
+        "skip_confirm": conf.get("skip_confirm", "true") == "true",
+        "chat_model": conf.get("chat_model", ""),
+        "code_model": conf.get("code_model", ""),
+        "auto_merge": conf.get("auto_merge", "editblock"),
+        "exclude_files": memory.get("exclude_files", [])
+    }
+    current_files = memory["current_files"]["files"]
+    yaml_config["urls"] = current_files
+    yaml_config["query"] = query
+
+    # 如果 conf 中有设置, 则以 conf 配置为主
+    for key, value in conf.items():
+        converted_value = convert_config_value(key, value)
+        if converted_value is not None:
+            yaml_config[key] = converted_value
+
+    execute_file = os.path.join(project_root, "actions", f"{uuid.uuid4()}.yml")
+    try:
+        yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
+        with open(os.path.join(execute_file), "w") as f:  # 保存此次查询的细节
+            f.write(yaml_content)
+        args = convert_yaml_to_config(execute_file)  # 更新到args
+    finally:
+        if delete_execute_file:
+            if os.path.exists(execute_file):
+                os.remove(execute_file)
+    return args
+
+
 def exclude_dirs(dir_names: List[str]):
     new_dirs = dir_names
     existing_dirs = memory.get("exclude_dirs", [])
@@ -281,7 +316,7 @@ def exclude_files(query: str):
 
 
 def index_command(llm):
-    update_config_to_args(query="", delete_execute_file=True)
+    args = get_final_config(query="", delete_execute_file=True)
 
     source_dir = os.path.abspath(args.source_dir)
     printer.print_text(f"开始对目录 {source_dir} 中的源代码进行索引", style="green")
@@ -359,7 +394,7 @@ def index_import(import_path: str):
 
 
 def index_query_command(query: str, llm: AutoLLM):
-    update_config_to_args(query=query, delete_execute_file=True)
+    args = get_final_config(query=query, delete_execute_file=True)
 
     # args.query = query
     if args.project_type == "py":
@@ -389,12 +424,6 @@ def index_query_command(query: str, llm: AutoLLM):
         panel=True
     )
 
-    # headers = TargetFile.model_fields.keys()
-    # table_data = wrap_text_in_table(
-    #     [[getattr(file_item, name) for name in headers] for file_item in all_results]
-    # )
-    # table_output = tabulate.tabulate(table_data, headers, tablefmt="grid")
-    # print(table_output, flush=True)
     printer.print_table_compact(
         headers=["文件路径", "原因"],
         data=[[_target_file.file_path, _target_file.reason] for _target_file in all_results],
@@ -415,7 +444,8 @@ def convert_yaml_config_to_str(yaml_config):
 
 
 def convert_yaml_to_config(yaml_file: str | dict | AutoCoderArgs):
-    global args
+    # global args
+    args = AutoCoderArgs()
     config = {}
     if isinstance(yaml_file, str):
         args.file = yaml_file
@@ -452,42 +482,6 @@ def convert_config_value(key, value):
         return None
 
 
-def update_config_to_args(query, delete_execute_file: bool = False):
-    conf = memory.get("conf", {})
-
-    # 默认 chat 配置
-    yaml_config = {
-        "include_file": ["./base/base.yml"],
-        "skip_build_index": conf.get("skip_build_index", "true") == "true",
-        "skip_confirm": conf.get("skip_confirm", "true") == "true",
-        "chat_model": conf.get("chat_model", ""),
-        "code_model": conf.get("code_model", ""),
-        "auto_merge": conf.get("auto_merge", "editblock"),
-        "exclude_files": memory.get("exclude_files", [])
-    }
-    current_files = memory["current_files"]["files"]
-    yaml_config["urls"] = current_files
-    yaml_config["query"] = query
-
-    # 如果 conf 中有设置, 则以 conf 配置为主
-    for key, value in conf.items():
-        converted_value = convert_config_value(key, value)
-        if converted_value is not None:
-            yaml_config[key] = converted_value
-
-    yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
-    execute_file = os.path.join(args.source_dir, "actions", f"{uuid.uuid4()}.yml")
-
-    with open(os.path.join(execute_file), "w") as f:  # 保存此次查询的细节
-        f.write(yaml_content)
-
-    convert_yaml_to_config(execute_file)  # 更新到args
-
-    if delete_execute_file:
-        if os.path.exists(execute_file):
-            os.remove(execute_file)
-
-
 def print_chat_history(history, max_entries=5):
     recent_history = history[-max_entries:]
     data_list = []
@@ -519,7 +513,7 @@ def code_review(query: str) -> str:
 
 
 def chat(query: str, llm: AutoLLM):
-    update_config_to_args(query)
+    args = get_final_config(query)
 
     is_history = query.strip().startswith("/history")
     is_new = "/new" in query
@@ -610,50 +604,52 @@ def chat(query: str, llm: AutoLLM):
 
     loaded_conversations = pre_conversations + chat_history["ask_conversation"]
 
-    v = chat_llm.stream_chat_ai(conversations=loaded_conversations, model=args.chat_model)
-
-    MAX_HISTORY_LINES = 15  # 最大保留历史行数
-    lines_buffer = []
-    current_line = ""
-    assistant_response = ""
-
-    try:
-        with Live(Panel("", title="Response", style="cyan"), refresh_per_second=12) as live:
-            for chunk in v:
-                if chunk.choices and chunk.choices[0].delta.content:
-                    content = chunk.choices[0].delta.content
-                    assistant_response += content
-
-                    # 处理换行符分割
-                    parts = (current_line + content).split('\n')
-
-                    # 最后一部分是未完成的新行
-                    if len(parts) > 1:
-                        # 将完整行加入缓冲区
-                        lines_buffer.extend(parts[:-1])
-                        # 保留最近N行历史
-                        if len(lines_buffer) > MAX_HISTORY_LINES:
-                            del lines_buffer[0: len(lines_buffer) - MAX_HISTORY_LINES]
-                    # 更新当前行（最后未完成的部分）
-                    current_line = parts[-1]
-                    # 构建显示内容 = 历史行 + 当前行
-                    display_content = '\n'.join(lines_buffer[-MAX_HISTORY_LINES:] + [current_line])
-
-                    live.update(
-                        Panel(Markdown(display_content), title="模型返回", border_style="cyan",
-                              height=min(25, live.console.height - 4))
-                    )
-
-            # 处理最后未换行的内容
-            if current_line:
-                lines_buffer.append(current_line)
-
-            # 最终完整渲染
-            live.update(
-                Panel(Markdown(assistant_response), title="模型返回", border_style="dim blue")
-            )
-    except Exception as e:
-        printer.print_panel(Text(f"{str(e)}", style="red"), title="模型返回", center=True)
+    assistant_response = stream_chat_display(chat_llm=llm, args=args, conversations=loaded_conversations)
+
+    # v = chat_llm.stream_chat_ai(conversations=loaded_conversations, model=args.chat_model)
+    #
+    # MAX_HISTORY_LINES = 15  # 最大保留历史行数
+    # lines_buffer = []
+    # current_line = ""
+    # assistant_response = ""
+    #
+    # try:
+    #     with Live(Panel("", title="Response", style="cyan"), refresh_per_second=12) as live:
+    #         for chunk in v:
+    #             if chunk.choices and chunk.choices[0].delta.content:
+    #                 content = chunk.choices[0].delta.content
+    #                 assistant_response += content
+    #
+    #                 # 处理换行符分割
+    #                 parts = (current_line + content).split('\n')
+    #
+    #                 # 最后一部分是未完成的新行
+    #                 if len(parts) > 1:
+    #                     # 将完整行加入缓冲区
+    #                     lines_buffer.extend(parts[:-1])
+    #                     # 保留最近N行历史
+    #                     if len(lines_buffer) > MAX_HISTORY_LINES:
+    #                         del lines_buffer[0: len(lines_buffer) - MAX_HISTORY_LINES]
+    #                 # 更新当前行（最后未完成的部分）
+    #                 current_line = parts[-1]
+    #                 # 构建显示内容 = 历史行 + 当前行
+    #                 display_content = '\n'.join(lines_buffer[-MAX_HISTORY_LINES:] + [current_line])
+    #
+    #                 live.update(
+    #                     Panel(Markdown(display_content), title="模型返回", border_style="cyan",
+    #                           height=min(25, live.console.height - 4))
+    #                 )
+    #
+    #         # 处理最后未换行的内容
+    #         if current_line:
+    #             lines_buffer.append(current_line)
+    #
+    #         # 最终完整渲染
+    #         live.update(
+    #             Panel(Markdown(assistant_response), title="模型返回", border_style="dim blue")
+    #         )
+    # except Exception as e:
+    #     printer.print_panel(Text(f"{str(e)}", style="red"), title="模型返回", center=True)
 
     chat_history["ask_conversation"].append({"role": "assistant", "content": assistant_response})
 
@@ -664,19 +660,19 @@ def chat(query: str, llm: AutoLLM):
     return
 
 
-def init_project():
-    if not args.project_type:
+def init_project(project_type):
+    if not project_type:
         printer.print_text(
             f"请指定项目类型。可选的项目类型包括：py|ts| 或文件扩展名(例如:.java,.scala), 多个扩展名逗号分隔.", style="green"
         )
         return
-    os.makedirs(os.path.join(args.source_dir, "actions"), exist_ok=True)
-    os.makedirs(os.path.join(args.source_dir, ".auto-coder"), exist_ok=True)
-    os.makedirs(os.path.join(args.source_dir, ".auto-coder", "autocoderrules"), exist_ok=True)
-    source_dir = os.path.abspath(args.source_dir)
+    os.makedirs(os.path.join(project_root, "actions"), exist_ok=True)
+    os.makedirs(os.path.join(project_root, ".auto-coder"), exist_ok=True)
+    os.makedirs(os.path.join(project_root, ".auto-coder", "autocoderrules"), exist_ok=True)
+    source_dir = os.path.abspath(project_root)
     create_actions(
         source_dir=source_dir,
-        params={"project_type": args.project_type,
+        params={"project_type": project_type,
                 "source_dir": source_dir},
     )
 
@@ -686,7 +682,7 @@ def init_project():
         f.write("\nactions/")
         f.write("\noutput.txt")
 
-    printer.print_text(f"已在 {os.path.abspath(args.source_dir)} 成功初始化 autocoder-nano 项目", style="green")
+    printer.print_text(f"已在 {os.path.abspath(project_root)} 成功初始化 autocoder-nano 项目", style="green")
     return
 
 
@@ -739,7 +735,7 @@ def load_include_files(config, base_path, max_depth=10, current_depth=0):
 
 def prepare_chat_yaml():
     # auto_coder_main(["next", "chat_action"]) 准备聊天 yaml 文件
-    actions_dir = os.path.join(args.source_dir, "actions")
+    actions_dir = os.path.join(project_root, "actions")
     if not os.path.exists(actions_dir):
         printer.print_text("当前目录中未找到 actions 目录。请执行初始化 AutoCoder Nano", style="yellow")
         return
@@ -786,7 +782,7 @@ def coding(query: str, llm: AutoLLM):
     current_files = memory["current_files"]["files"]
 
     prepare_chat_yaml()  # 复制上一个序号的 yaml 文件, 生成一个新的聊天 yaml 文件
-    latest_yaml_file = get_last_yaml_file(os.path.join(args.source_dir, "actions"))
+    latest_yaml_file = get_last_yaml_file(os.path.join(project_root, "actions"))
 
     if latest_yaml_file:
         yaml_config = {
@@ -808,7 +804,7 @@ def coding(query: str, llm: AutoLLM):
         yaml_config["query"] = query
 
         if is_apply:
-            memory_dir = os.path.join(args.source_dir, ".auto-coder", "memory")
+            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")
 
@@ -837,25 +833,26 @@ def coding(query: str, llm: AutoLLM):
                     yaml_config["context"] += f"你: {conv['content']}\n"
             yaml_config["context"] += "</history>\n"
 
-        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"
+        # 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"
 
         yaml_config["file"] = latest_yaml_file
         yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
-        execute_file = os.path.join(args.source_dir, "actions", latest_yaml_file)
+        execute_file = os.path.join(project_root, "actions", latest_yaml_file)
         with open(os.path.join(execute_file), "w") as f:
             f.write(yaml_content)
-        convert_yaml_to_config(execute_file)
+        args = convert_yaml_to_config(execute_file)
 
         dispacher = Dispacher(args=args, llm=llm)
         dispacher.dispach()
@@ -866,7 +863,7 @@ def coding(query: str, llm: AutoLLM):
     completer.refresh_files()
 
 
-def execute_revert():
+def execute_revert(args: AutoCoderArgs):
     repo_path = args.source_dir
 
     file_content = open(args.file).read()
@@ -883,11 +880,11 @@ def execute_revert():
 
 
 def revert():
-    last_yaml_file = get_last_yaml_file(os.path.join(args.source_dir, "actions"))
+    last_yaml_file = get_last_yaml_file(os.path.join(project_root, "actions"))
     if last_yaml_file:
-        file_path = os.path.join(args.source_dir, "actions", last_yaml_file)
-        convert_yaml_to_config(file_path)
-        execute_revert()
+        file_path = os.path.join(project_root, "actions", last_yaml_file)
+        args = convert_yaml_to_config(file_path)
+        execute_revert(args)
     else:
         printer.print_text(f"No previous chat action found to revert.", style="yellow")
 
@@ -910,15 +907,15 @@ def print_commit_info(commit_result: CommitResult):
 
 
 def commit_info(query: str, llm: AutoLLM):
-    repo_path = args.source_dir
+    repo_path = project_root
     prepare_chat_yaml()  # 复制上一个序号的 yaml 文件, 生成一个新的聊天 yaml 文件
 
-    latest_yaml_file = get_last_yaml_file(os.path.join(args.source_dir, "actions"))
+    latest_yaml_file = get_last_yaml_file(os.path.join(project_root, "actions"))
     execute_file = None
 
     if latest_yaml_file:
         try:
-            execute_file = os.path.join(args.source_dir, "actions", latest_yaml_file)
+            execute_file = os.path.join(project_root, "actions", latest_yaml_file)
             conf = memory.get("conf", {})
             yaml_config = {
                 "include_file": ["./base/base.yml"],
@@ -937,11 +934,11 @@ def commit_info(query: str, llm: AutoLLM):
             yaml_config["urls"] = current_files
 
             # 临时保存yaml文件，然后读取yaml文件，更新args
-            temp_yaml = os.path.join(args.source_dir, "actions", f"{uuid.uuid4()}.yml")
+            temp_yaml = os.path.join(project_root, "actions", f"{uuid.uuid4()}.yml")
             try:
                 with open(temp_yaml, "w", encoding="utf-8") as f:
                     f.write(convert_yaml_config_to_str(yaml_config=yaml_config))
-                convert_yaml_to_config(temp_yaml)
+                args = convert_yaml_to_config(temp_yaml)
             finally:
                 if os.path.exists(temp_yaml):
                     os.remove(temp_yaml)
@@ -982,7 +979,7 @@ def commit_info(query: str, llm: AutoLLM):
 
 
 def agentic_edit(query: str, llm: AutoLLM):
-    update_config_to_args(query=query, delete_execute_file=True)
+    args = get_final_config(query=query, delete_execute_file=True)
 
     sources = SourceCodeList([])
     agentic_editor = AgenticEdit(
@@ -1032,7 +1029,7 @@ def _generate_shell_script(user_input: str) -> str:
 
 
 def generate_shell_command(input_text: str, llm: AutoLLM) -> str | None:
-    update_config_to_args(query=input_text, delete_execute_file=True)
+    args = get_final_config(query=input_text, delete_execute_file=True)
 
     try:
         printer.print_panel(
@@ -1274,13 +1271,18 @@ def initialize_system():
 
     def _init_project():
         first_time = False
-        if not os.path.exists(os.path.join(args.source_dir, ".auto-coder")):
+        if not os.path.exists(os.path.join(project_root, ".auto-coder")):
             first_time = True
             printer.print_text("当前目录未初始化为auto-coder项目.", style="yellow")
             init_choice = input(f"  是否现在初始化项目？(y/n): ").strip().lower()
             if init_choice == "y":
                 try:
-                    init_project()
+                    if first_time:  # 首次启动,配置项目类型
+                        if not os.path.exists(base_persist_dir):
+                            os.makedirs(base_persist_dir, exist_ok=True)
+                            printer.print_text("创建目录：{}".format(base_persist_dir), style="green")
+                        project_type = configure_project_type()
+                        init_project(project_type)
                     printer.print_text("项目初始化成功.", style="green")
                 except Exception as e:
                     printer.print_text(f"项目初始化失败, {str(e)}.", style="red")
@@ -1289,12 +1291,12 @@ def initialize_system():
                 printer.print_text("退出而不初始化.", style="yellow")
                 exit(1)
 
-        if not os.path.exists(base_persist_dir):
-            os.makedirs(base_persist_dir, exist_ok=True)
-            printer.print_text("创建目录：{}".format(base_persist_dir), style="green")
+        # if not os.path.exists(base_persist_dir):
+        #     os.makedirs(base_persist_dir, exist_ok=True)
+        #     printer.print_text("创建目录：{}".format(base_persist_dir), style="green")
 
-        if first_time:  # 首次启动,配置项目类型
-            configure_project_type()
+        # if first_time:  # 首次启动,配置项目类型
+        #     project_type = configure_project_type()
 
         printer.print_text("项目初始化完成.", style="green")
 
@@ -1656,7 +1658,7 @@ def rules(query_args: List[str], llm: AutoLLM):
     /rules /analyze         - 分析当前文件，可选提供查询内容
     /rules /commit <提交ID>  - 分析特定提交，必须提供提交ID和查询内容
     """
-    update_config_to_args(query="", delete_execute_file=True)
+    args = get_final_config(query="", delete_execute_file=True)
     rules_dir_path = os.path.join(project_root, ".auto-coder", "autocoderrules")
     if query_args[0] == "/list":
         printer.print_table_compact(
@@ -1806,20 +1808,11 @@ def main():
             memory["mode"] = "normal"
         event.app.invalidate()
 
-    def _update_bottom_toolbar(toolbar_arg):
-        if toolbar_arg in memory['conf']:
-            return memory['conf'][toolbar_arg]
-        return args.model_dump()[toolbar_arg]
-
     def get_bottom_toolbar():
         if "mode" not in memory:
             memory["mode"] = "normal"
         mode = memory["mode"]
-        skip_build_toolbar = _update_bottom_toolbar('skip_build_index')
-        skip_filter_toolbar = _update_bottom_toolbar('skip_filter_index')
-        index_filter_toolbar = _update_bottom_toolbar('index_filter_level')
-        return (f" 当前模式: {MODES[mode]} (ctl+k 切换模式) | 跳过索引: {skip_build_toolbar} "
-                f"| 跳过过滤: {skip_filter_toolbar} | 过滤等级: {index_filter_toolbar}")
+        return f" 当前模式: {MODES[mode]} (ctl+k 切换模式) | 当前项目: {project_root}"
 
     session = PromptSession(
         history=InMemoryHistory(),

autocoder_nano/chat/__init__.py

@@ -0,0 +1,64 @@
+from rich.live import Live
+from rich.panel import Panel
+from rich.markdown import Markdown
+from rich.text import Text
+
+from autocoder_nano.llm_client import AutoLLM
+from autocoder_nano.llm_types import AutoCoderArgs
+from autocoder_nano.utils.printer_utils import Printer
+
+
+printer = Printer
+
+
+def stream_chat_display(
+        chat_llm: AutoLLM, args: AutoCoderArgs, conversations: list[dict], max_history_lines: int = 15, max_height: int = 25
+) -> str:
+    v = chat_llm.stream_chat_ai(conversations=conversations, model=args.chat_model)
+
+    lines_buffer = []
+    assistant_response = ""
+    current_line = ""
+
+    try:
+        with Live(Panel("", title="Response", style="cyan"), refresh_per_second=12) as live:
+            for chunk in v:
+                if chunk.choices and chunk.choices[0].delta.content:
+                    content = chunk.choices[0].delta.content
+                    assistant_response += content
+
+                    # 处理换行符分割
+                    parts = (current_line + content).split('\n')
+
+                    # 最后一部分是未完成的新行
+                    if len(parts) > 1:
+                        # 将完整行加入缓冲区
+                        lines_buffer.extend(parts[:-1])
+                        # 保留最近N行历史
+                        if len(lines_buffer) > max_history_lines:
+                            del lines_buffer[0: len(lines_buffer) - max_history_lines]
+                    # 更新当前行（最后未完成的部分）
+                    current_line = parts[-1]
+                    # 构建显示内容 = 历史行 + 当前行
+                    display_content = '\n'.join(lines_buffer[-max_history_lines:] + [current_line])
+
+                    live.update(
+                        Panel(Markdown(display_content), title="模型返回", border_style="cyan",
+                              height=min(max_height, live.console.height - 4))
+                    )
+
+            # 处理最后未换行的内容
+            if current_line:
+                lines_buffer.append(current_line)
+
+            # 最终完整渲染
+            live.update(
+                Panel(Markdown(assistant_response), title="模型返回", border_style="dim blue")
+            )
+    except Exception as e:
+        printer.print_panel(Text(f"{str(e)}", style="red"), title="模型返回", center=True)
+
+    return assistant_response
+
+
+__all__ = ["stream_chat_display"]

autocoder_nano/index/__init__.py

@@ -0,0 +1,4 @@
+from autocoder_nano.index.entry import build_index_and_filter_files
+
+
+__all__ = ["build_index_and_filter_files"]

autocoder_nano/llm_client.py

@@ -41,10 +41,8 @@ class AutoLLM:
             model = self.default_model_name
 
         model_name = self.sub_clients[model]["model_name"]
-        printer.print_card(
-            title="模型调用",
-            content=f"调用函数: stream_chat_ai\n使用模型: {model}\n模型名称: {model_name}",
-            width=60
+        printer.print_key_value(
+            {"调用函数": "stream_chat_ai", "使用模型": f"{model}", "模型名称": f"{model_name}"}, title="模型调用"
         )
         request = LLMRequest(
             model=model_name,
@@ -65,6 +63,10 @@ class AutoLLM:
         client: OpenAI = self.sub_clients[model]["client"]
         model_name = self.sub_clients[model]["model_name"]
 
+        printer.print_key_value(
+            {"调用函数": "stream_chat_ai_ex", "使用模型": f"{model}", "模型名称": f"{model_name}"}, title="模型调用"
+        )
+
         request = LLMRequest(
             model=model_name,
             messages=conversations,
@@ -185,10 +187,8 @@ class AutoLLM:
             conversations = [{"role": "user", "content": conversations}]
 
         model_name = self.sub_clients[model]["model_name"]
-        printer.print_card(
-            title="模型调用",
-            content=f"调用函数: chat_ai\n使用模型: {model}\n模型名称: {model_name}",
-            width=60
+        printer.print_key_value(
+            {"调用函数": "chat_ai", "使用模型": f"{model}", "模型名称": f"{model_name}"}, title="模型调用"
         )
         request = LLMRequest(
             model=model_name,
@@ -230,11 +230,9 @@ class AutoLLM:
             model = self.default_model_name
 
         model_name = self.sub_clients[model]["model_name"]
-        printer.print_card(
-            title="模型调用",
-            content=f"调用函数: embedding\n使用模型: {model}\n模型名称: {model_name}",
-            width=60
-        )
+        # printer.print_key_value(
+        #     {"调用函数": "embedding", "使用模型": f"{model}", "模型名称": f"{model_name}"}, title="模型调用"
+        # )
 
         res = self.sub_clients[model]["client"].embeddings.create(
             model=model_name,

autocoder_nano/utils/config_utils.py

@@ -0,0 +1,131 @@
+import os
+import uuid
+
+import yaml
+from jinja2 import Template
+
+from autocoder_nano.llm_types import AutoCoderArgs
+from autocoder_nano.utils.printer_utils import Printer
+
+
+printer = Printer()
+
+
+def convert_yaml_config_to_str(yaml_config):
+    yaml_content = yaml.safe_dump(
+        yaml_config,
+        allow_unicode=True,
+        default_flow_style=False,
+        default_style=None,
+    )
+    return yaml_content
+
+
+def convert_config_value(key, value):
+    field_info = AutoCoderArgs.model_fields.get(key)
+    if field_info:
+        if value.lower() in ["true", "false"]:
+            return value.lower() == "true"
+        elif "int" in str(field_info.annotation):
+            return int(value)
+        elif "float" in str(field_info.annotation):
+            return float(value)
+        else:
+            return value
+    else:
+        printer.print_text(f"无效的配置项: {key}", style="red")
+        return None
+
+
+def resolve_include_path(base_path, include_path):
+    if include_path.startswith(".") or include_path.startswith(".."):
+        full_base_path = os.path.abspath(base_path)
+        parent_dir = os.path.dirname(full_base_path)
+        return os.path.abspath(os.path.join(parent_dir, include_path))
+    else:
+        return include_path
+
+
+def load_include_files(config, base_path, max_depth=10, current_depth=0):
+    if current_depth >= max_depth:
+        raise ValueError(
+            f"Exceeded maximum include depth of {max_depth},you may have a circular dependency in your include files."
+        )
+    if "include_file" in config:
+        include_files = config["include_file"]
+        if not isinstance(include_files, list):
+            include_files = [include_files]
+
+        for include_file in include_files:
+            abs_include_path = resolve_include_path(base_path, include_file)
+            # printer.print_text(f"正在加载 Include file: {abs_include_path}", style="green")
+            with open(abs_include_path, "r") as f:
+                include_config = yaml.safe_load(f)
+                if not include_config:
+                    printer.print_text(f"Include file {abs_include_path} 为空，跳过处理.", style="green")
+                    continue
+                config.update(
+                    {
+                        **load_include_files(include_config, abs_include_path, max_depth, current_depth + 1),
+                        **config,
+                    }
+                )
+        del config["include_file"]
+    return config
+
+
+def convert_yaml_to_config(yaml_file: str | dict | AutoCoderArgs):
+    # global args
+    args = AutoCoderArgs()
+    config = {}
+    if isinstance(yaml_file, str):
+        args.file = yaml_file
+        with open(yaml_file, "r") as f:
+            config = yaml.safe_load(f)
+            config = load_include_files(config, yaml_file)
+    if isinstance(yaml_file, dict):
+        config = yaml_file
+    if isinstance(yaml_file, AutoCoderArgs):
+        config = yaml_file.model_dump()
+    for key, value in config.items():
+        if key != "file":  # 排除 --file 参数本身
+            # key: ENV {{VARIABLE_NAME}}
+            if isinstance(value, str) and value.startswith("ENV"):
+                template = Template(value.removeprefix("ENV").strip())
+                value = template.render(os.environ)
+            setattr(args, key, value)
+    return args
+
+
+def get_final_config(project_root: str, memory: dict, query: str, delete_execute_file: bool = False) -> AutoCoderArgs:
+    conf = memory.get("conf", {})
+    yaml_config = {
+        "include_file": ["./base/base.yml"],
+        "skip_build_index": conf.get("skip_build_index", "true") == "true",
+        "skip_confirm": conf.get("skip_confirm", "true") == "true",
+        "chat_model": conf.get("chat_model", ""),
+        "code_model": conf.get("code_model", ""),
+        "auto_merge": conf.get("auto_merge", "editblock"),
+        "exclude_files": memory.get("exclude_files", [])
+    }
+    current_files = memory["current_files"]["files"]
+    yaml_config["urls"] = current_files
+    yaml_config["query"] = query
+
+    # 如果 conf 中有设置, 则以 conf 配置为主
+    for key, value in conf.items():
+        converted_value = convert_config_value(key, value)
+        if converted_value is not None:
+            yaml_config[key] = converted_value
+
+    execute_file = os.path.join(project_root, "actions", f"{uuid.uuid4()}.yml")
+    try:
+        yaml_content = convert_yaml_config_to_str(yaml_config=yaml_config)
+        with open(os.path.join(execute_file), "w") as f:  # 保存此次查询的细节
+            f.write(yaml_content)
+        args = convert_yaml_to_config(execute_file)  # 更新到args
+    finally:
+        if delete_execute_file:
+            if os.path.exists(execute_file):
+                os.remove(execute_file)
+    return args

autocoder_nano/version.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.34"
+__version__ = "0.1.36"
 __author__ = "moofs"
 __license__ = "Apache License 2.0"

{autocoder_nano-0.1.34.dist-info → autocoder_nano-0.1.36.dist-info}/METADATA

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

{autocoder_nano-0.1.34.dist-info → autocoder_nano-0.1.36.dist-info}/RECORD

@@ -1,16 +1,16 @@
 autocoder_nano/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder_nano/auto_coder_nano.py,sha256=sLMu8QPfdGehTNs5-538PLst-OuheA3VT2WovbShZeA,80482
+autocoder_nano/auto_coder_nano.py,sha256=75BNVyuktY2gdH8dXKBGMa-DVePWORf_5kgN5OvBODc,80571
 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
 autocoder_nano/git_utils.py,sha256=zAhXi5WFHklpkoPH04kkXpQjQJv1CEHbXE-O3tqyNlA,23194
 autocoder_nano/helper.py,sha256=LbieDBKp408x9g4GHCvcujUgMgxDTV9owGHIBYpT1ww,6643
-autocoder_nano/llm_client.py,sha256=aB6ZCZnMF28RvoPuqORZAneMpvIy16mPrB7-1vVKTao,11207
+autocoder_nano/llm_client.py,sha256=pJkEpAaPJgz7Yzzr1h-YUveiVidH8YNpLmdfwuM5t_I,11318
 autocoder_nano/llm_prompt.py,sha256=ViWUfCZp0gDESAAPHBhZc2WhHiFUHIxK6a2xbFu0sjU,10864
 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=5nUcgFDfoA9a2PSTl0F1jjOQAPSbI7_EyL0XXwMNT-k,79
+autocoder_nano/version.py,sha256=w6lOdNu-e-YHiAO2e5DN0oFTe4239b-ik57CnftvY_w,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
@@ -48,6 +48,7 @@ autocoder_nano/app/templates/partials/examples.html,sha256=_i7TfpcRqW-IvI69vVXYe
 autocoder_nano/app/templates/partials/header.html,sha256=txCMUmFFWSEDz5xxQwt8oBko8Y_b1bSsVASVOMCsILo,300
 autocoder_nano/app/templates/partials/input.html,sha256=8CY3JcHaA4nPZ2Vu4ragdYZzzodvF0isQiOGHtdQs6k,1956
 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/actions.py,sha256=N4qzSIE7Ifm7r6Sk-HbgWmbDqMP6jfrpByfpV7rbEo8,6480
@@ -56,7 +57,7 @@ autocoder_nano/edit/code/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 autocoder_nano/edit/code/generate_editblock.py,sha256=s-VTZK0G1OhjEyZXqyjj4sY48fOo02EvHhaxTIw4ytY,13110
 autocoder_nano/edit/code/merge_editblock.py,sha256=Vk-FOVvaEzKcSRDMyMyR_M77kqj-s5-zejChn4QwLAY,17557
 autocoder_nano/edit/code/modification_ranker.py,sha256=hnF1acqAzPYKm9hEFxobJHfGGDdM-GclZLxvtt83lGA,3431
-autocoder_nano/index/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+autocoder_nano/index/__init__.py,sha256=r8HvwfyKJxnXMtAuxXIdbU0CWBGwJNlxIB4VZaUlBbo,112
 autocoder_nano/index/entry.py,sha256=S71dfnYC201eQLXwqNCo_Y83ImI1ZxuJ0_m2hz5nCJc,7729
 autocoder_nano/index/index_manager.py,sha256=ek7AqU8M-Snl5qZYhO_U0SEK3-y1u5OOxD9z-LdDesE,15619
 autocoder_nano/index/symbols_utils.py,sha256=z_16X6BozTfmric1uU-r2GqzDabJ5ChfAOB4lo7i-_8,1450
@@ -86,12 +87,13 @@ autocoder_nano/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 autocoder_nano/tools/http_tools.py,sha256=04Tmg8BTwfsw7_-fKBDHv787XU4yQ5UtQSDj0zJBIUc,3189
 autocoder_nano/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder_nano/utils/completer_utils.py,sha256=MGA3r5pAvDhp1vNGGCyjHWDtqXnd-CF4zPw7uawSzNM,25556
+autocoder_nano/utils/config_utils.py,sha256=r5n0De4mz5sL_nj-CeT_F5TxtgWQIN5vv0Z5FiP8GXA,4800
 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.34.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-autocoder_nano-0.1.34.dist-info/METADATA,sha256=aQAlr7vwMo7UlMq5cQ79wZwAwLiSpFlMKQQUiKfP6ic,13591
-autocoder_nano-0.1.34.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autocoder_nano-0.1.34.dist-info/entry_points.txt,sha256=Dj8gGZ_AgLy8ANqr2do_DJjpsR3JMh-ztsrUXo4Vn5Q,194
-autocoder_nano-0.1.34.dist-info/top_level.txt,sha256=D7s34cwIs1F4EAjRRDvO_zTHtUz1Z7UVccFUNlJn7HI,15
-autocoder_nano-0.1.34.dist-info/RECORD,,
+autocoder_nano-0.1.36.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+autocoder_nano-0.1.36.dist-info/METADATA,sha256=7-k89fLfFGXd67c6xAaIvmZV2Q1vix4B5YecTSn6Qcw,13591
+autocoder_nano-0.1.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autocoder_nano-0.1.36.dist-info/entry_points.txt,sha256=Dj8gGZ_AgLy8ANqr2do_DJjpsR3JMh-ztsrUXo4Vn5Q,194
+autocoder_nano-0.1.36.dist-info/top_level.txt,sha256=D7s34cwIs1F4EAjRRDvO_zTHtUz1Z7UVccFUNlJn7HI,15
+autocoder_nano-0.1.36.dist-info/RECORD,,