auto-coder 0.1.207__py3-none-any.whl → 0.1.208__py3-none-any.whl

autocoder/dispacher/actions/action.py

@@ -97,38 +97,48 @@ class ActionTSProject:
             else:
                 generate = CodeAutoGenerate(llm=self.llm, args=self.args, action=self)
             if self.args.enable_multi_round_generate:
-                result, conversations = generate.multi_round_run(
+                generate_result = generate.multi_round_run(
                     query=args.query, source_content=content
                 )
             else:
-                result, conversations = generate.single_round_run(
+                generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
-            content = "\n\n".join(result)
-
-            store_code_model_conversation(
-                args=self.args,
-                instruction=self.args.query,
-                conversations=conversations,
-                model=self.llm.default_model_name,
-            )
-        with open(args.target_file, "w") as file:
-            file.write(content)
-
-        if args.execute and args.auto_merge:
-            logger.info("Auto merge the code...")
-            if args.auto_merge == "diff":
-                code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "strict_diff":
-                code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "editblock":
-                code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            else:
-                code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+            merge_result = None
+            if args.execute and args.auto_merge:
+                logger.info("Auto merge the code...")
+                if args.auto_merge == "diff":
+                    code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "strict_diff":
+                    code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "editblock":
+                    code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                else:
+                    code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+
+                if merge_result is not None:
+                    content = merge_result.contents[0]
+                    store_code_model_conversation(
+                        args=self.args,
+                        instruction=self.args.query,
+                        conversations=merge_result.conversations[0],
+                        model=self.llm.default_model_name,
+                    )
+                else:
+                    content = generate_result.contents[0]
+                    store_code_model_conversation(
+                        args=self.args,
+                        instruction=self.args.query,
+                        conversations=generate_result.conversations[0],
+                        model=self.llm.default_model_name,
+                    )
+
+                with open(args.target_file, "w") as file:
+                    file.write(content)
 
 
 class ActionPyScriptProject:
@@ -167,38 +177,49 @@ class ActionPyScriptProject:
             else:
                 generate = CodeAutoGenerate(llm=self.llm, args=self.args, action=self)
             if self.args.enable_multi_round_generate:
-                result, conversations = generate.multi_round_run(
+                generate_result = generate.multi_round_run(
                     query=args.query, source_content=content
                 )
             else:
-                result, conversations = generate.single_round_run(
+                generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
-            content = "\n\n".join(result)
+            merge_result = None
+            if args.execute and args.auto_merge:
+                logger.info("Auto merge the code...")
+                if args.auto_merge == "diff":
+                    code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "strict_diff":
+                    code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "editblock":
+                    code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                else:
+                    code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+
+                content = merge_result.contents[0]
+
+                store_code_model_conversation(
+                    args=self.args,
+                    instruction=self.args.query,
+                    conversations=merge_result.conversations[0],
+                    model=self.llm.default_model_name,
+                )
+            else:
+                content = generate_result.contents[0]
 
-            store_code_model_conversation(
-                args=self.args,
-                instruction=self.args.query,
-                conversations=conversations,
-                model=self.llm.default_model_name,
-            )
-        with open(self.args.target_file, "w") as file:
-            file.write(content)
+                store_code_model_conversation(
+                    args=self.args,
+                    instruction=self.args.query,
+                    conversations=generate_result.conversations[0],
+                    model=self.llm.default_model_name,
+                )
 
-        if args.execute and args.auto_merge:
-            logger.info("Auto merge the code...")
-            if args.auto_merge == "diff":
-                code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "strict_diff":
-                code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "editblock":
-                code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            else:
-                code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+            with open(self.args.target_file, "w") as file:
+                file.write(content)
 
 
 class ActionPyProject:
@@ -255,39 +276,50 @@ class ActionPyProject:
 
 
             if self.args.enable_multi_round_generate:
-                result, conversations = generate.multi_round_run(
+                generate_result = generate.multi_round_run(
                     query=args.query, source_content=content
                 )
             else:
-                result, conversations = generate.single_round_run(
+                generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
                
-            content = "\n\n".join(result)
+            merge_result = None
+            if args.execute and args.auto_merge:
+                logger.info("Auto merge the code...")
+                if args.auto_merge == "diff":
+                    code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "strict_diff":
+                    code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "editblock":
+                    code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                else:
+                    code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+
+                content = merge_result.contents[0]
+
+                store_code_model_conversation(
+                    args=self.args,
+                    instruction=self.args.query,
+                    conversations=merge_result.conversations[0],
+                    model=self.llm.default_model_name,
+                )
+            else:
+                content = generate_result.contents[0]
 
-            store_code_model_conversation(
-                args=self.args,
-                instruction=self.args.query,
-                conversations=conversations,
-                model=self.llm.default_model_name,
-            )
-        with open(args.target_file, "w") as file:
-            file.write(content)
+                store_code_model_conversation(
+                    args=self.args,
+                    instruction=self.args.query,
+                    conversations=generate_result.conversations[0],
+                    model=self.llm.default_model_name,
+                )
 
-        if args.execute and args.auto_merge:
-            logger.info("Auto merge the code...")
-            if args.auto_merge == "diff":
-                code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "strict_diff":
-                code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "editblock":
-                code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            else:
-                code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+            with open(args.target_file, "w") as file:
+                file.write(content)
 
 
 class ActionSuffixProject:
@@ -337,36 +369,51 @@ class ActionSuffixProject:
             else:
                 generate = CodeAutoGenerate(llm=self.llm, args=self.args, action=self)
             if self.args.enable_multi_round_generate:
-                result, conversations = generate.multi_round_run(
+                generate_result = generate.multi_round_run(
                     query=args.query, source_content=content
                 )
             else:
-                result, conversations = generate.single_round_run(
+                generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
-            content = "\n\n".join(result)
-
-            store_code_model_conversation(
-                args=self.args,
-                instruction=self.args.query,
-                conversations=conversations,
-                model=self.llm.default_model_name,
-            )
-
-        with open(args.target_file, "w") as file:
-            file.write(content)
+              
 
+        merge_result = None
         if args.execute and args.auto_merge:
             logger.info("Auto merge the code...")
             if args.auto_merge == "diff":
                 code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+                merge_result = code_merge.merge_code(generate_result=generate_result)
             elif args.auto_merge == "strict_diff":
                 code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+                merge_result = code_merge.merge_code(generate_result=generate_result)
             elif args.auto_merge == "editblock":
                 code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+                merge_result = code_merge.merge_code(generate_result=generate_result)
             else:
                 code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+                merge_result = code_merge.merge_code(generate_result=generate_result)
+
+        if merge_result is not None:
+            content = merge_result.contents[0]
+            store_code_model_conversation(
+                args=self.args,
+                instruction=self.args.query,
+                conversations=merge_result.conversations[0],
+                model=self.llm.default_model_name,
+            )
+            with open(args.target_file, "w") as file:
+                file.write(content)
+        else:
+            content = generate_result.contents[0]
+
+            store_code_model_conversation(
+                args=self.args,
+                instruction=self.args.query,
+                conversations=generate_result.conversations[0],
+                model=self.llm.default_model_name,
+            )
+
+            with open(args.target_file, "w") as file:
+                file.write(content)
+

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -68,35 +68,45 @@ class ActionRegexProject:
             else:
                 generate = CodeAutoGenerate(llm=self.llm, args=self.args, action=self)
             if self.args.enable_multi_round_generate:
-                result, conversations = generate.multi_round_run(
+                generate_result = generate.multi_round_run(
                     query=args.query, source_content=content
                 )
             else:
-                result, conversations = generate.single_round_run(
+                generate_result = generate.single_round_run(
                     query=args.query, source_content=content
                 )
-            content = "\n\n".join(result)
+            merge_result = None
+            if args.execute and args.auto_merge:
+                logger.info("Auto merge the code...")
+                if args.auto_merge == "diff":
+                    code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "strict_diff":
+                    code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                elif args.auto_merge == "editblock":
+                    code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
+                else:
+                    code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
+                    merge_result = code_merge.merge_code(generate_result=generate_result)
 
-            store_code_model_conversation(
-                args=self.args,
-                instruction=self.args.query,
-                conversations=conversations,
-                model=self.llm.default_model_name,
-            )
-        with open(args.target_file, "w") as file:
-            file.write(content)
-
-        if args.execute and args.auto_merge:
-            logger.info("Auto merge the code...")
-            if args.auto_merge == "diff":
-                code_merge = CodeAutoMergeDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "strict_diff":
-                code_merge = CodeAutoMergeStrictDiff(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
-            elif args.auto_merge == "editblock":
-                code_merge = CodeAutoMergeEditBlock(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+            if merge_result is not None:
+                content = merge_result.contents[0]
+                store_code_model_conversation(
+                    args=self.args,
+                    instruction=self.args.query,
+                    conversations=merge_result.conversations[0],
+                    model=self.llm.default_model_name,
+                )
             else:
-                code_merge = CodeAutoMerge(llm=self.llm, args=self.args)
-                code_merge.merge_code(content=content)
+                content = generate_result.contents[0]
+                store_code_model_conversation(
+                    args=self.args,
+                    instruction=self.args.query,
+                    conversations=generate_result.conversations[0],
+                    model=self.llm.default_model_name,
+                )
+
+            with open(args.target_file, "w") as file:
+                file.write(content)

autocoder/lang.py

@@ -21,6 +21,7 @@ lang_desc = {
         "cmd_args_title": "Command Line Arguments:",
         "py_packages": "The Python packages added to context, only works for py project type. Default is empty.",
         "human_as_model": "Use human as model or not. Default is False",
+        "human_model_num": "Number of human models to use. Default is 1",
         "urls": "The urls to crawl and extract text from, separated by comma",
         "search_engine": "The search engine to use. Supported engines: bing, google. Default is empty",
         "search_engine_token": "The token for the search engine API. Default is empty",
@@ -62,6 +63,8 @@ lang_desc = {
         "screenshot_url": "The URL of the webpage to capture",
         "screenshot_output": "The directory to save the screenshots",
         "code_model": "The name of the code model to use. Default is empty",
+        "generate_rerank_model": "The name of the generate rerank model to use. Default is empty",
+        "inference_model": "The name of the inference model to use. Default is empty",
         "system_prompt": "The system prompt for the model. Default is empty",
         "planner_model": "The name of the planner model to use. Default is empty",
         "designer_model": "The name of the designer model to use. Default is empty",
@@ -78,6 +81,7 @@ lang_desc = {
         "rag_token": "The token for the RAG service. Default is empty",
         "rag_type": "RAG type (simple/storage), default is storage",
         "rag_params_max_tokens": "The maximum number of tokens for RAG parameters. Default is 4096",
+        "generate_times_same_model": "Number of times to generate using the same model. Default is 1",
     },
     "zh": {
         "request_id": "Request ID",
@@ -101,6 +105,7 @@ lang_desc = {
         "cmd_args_title": "命令行参数:", 
         "py_packages": "添加到上下文的Python包,仅适用于py项目类型。默认为空。",
         "human_as_model": "是否使用人工作为模型。默认为False",
+        "human_model_num": "使用的人工模型数量。默认为1",
         "urls": "要爬取并提取文本的URL,多个URL以逗号分隔",
         "search_engine": "要使用的搜索引擎。支持的引擎:bing、google。默认为空",
         "search_engine_token": "搜索引擎API的令牌。默认为空",
@@ -142,6 +147,8 @@ lang_desc = {
         "screenshot_url": "要捕获的网页的URL",
         "screenshot_output": "保存截图的目录",
         "code_model": "要使用的代码模型的名称。默认为空",
+        "generate_rerank_model": "要使用的生成重排序模型的名称。默认为空",
+        "inference_model": "要使用的推理模型的名称。默认为空",
         "system_prompt": "模型使用的系统提示词。默认为空",
         "next_desc": "基于上一个action文件创建一个新的action文件",
         "planner_model": "要使用的规划模型的名称。默认为空",
@@ -157,6 +164,7 @@ lang_desc = {
          "rag_url": "RAG服务的URL",
         "rag_token": "RAG服务的令牌",
         "rag_type": "RAG类型(simple/storage),默认是storage",
-        "rag_params_max_tokens": "RAG参数的最大token数。默认为4096",    
+        "rag_params_max_tokens": "RAG参数的最大token数。默认为4096",  
+        "generate_times_same_model": "使用相同模型生成的次数。默认为1",
     }
 }

autocoder/pyproject/__init__.py

@@ -114,6 +114,10 @@ class PyProject:
             "dist",
             "__pycache__",
             "node_modules",
+            ".auto-coder",
+            "actions",
+            ".vscode",
+            ".idea",
         ]
 
     @byzerllm.prompt()

autocoder/rag/long_context_rag.py

@@ -395,6 +395,7 @@ class LongContextRAG:
                     inference_deep_thought=self.args.inference_deep_thought,
                     inference_slow_without_deep_thought=self.args.inference_slow_without_deep_thought,                    
                     precision=self.args.inference_compute_precision,
+                    data_cells_max_num=self.args.data_cells_max_num,
                 )
                 conversations = conversations[:-1]
                 new_conversations = llm_compute_engine.process_conversation(
@@ -576,6 +577,7 @@ class LongContextRAG:
                     inference_enhance=not self.args.disable_inference_enhance,
                     inference_deep_thought=self.args.inference_deep_thought,
                     precision=self.args.inference_compute_precision,
+                    data_cells_max_num=self.args.data_cells_max_num,
                     debug=False,
                 )
                 new_conversations = llm_compute_engine.process_conversation(

autocoder/rag/rag_entry.py

@@ -1,4 +1,4 @@
-from typing import List, Dict, Any, Optional
+from typing import List, Dict, Any, Optional,Union
 from autocoder.common import AutoCoderArgs, SourceCode
 from byzerllm import ByzerLLM
 from .simple_rag import SimpleRAG
@@ -7,7 +7,7 @@ class RAGFactory:
     
     
     @staticmethod
-    def get_rag(llm: ByzerLLM, args: AutoCoderArgs, path: str,**kargs) -> SimpleRAG | LongContextRAG:
+    def get_rag(llm: ByzerLLM, args: AutoCoderArgs, path: str,**kargs) -> Union[SimpleRAG, LongContextRAG]:
         """
         Factory method to get the appropriate RAG implementation based on arguments.
         

autocoder/suffixproject/__init__.py

@@ -55,6 +55,8 @@ class SuffixProject:
             "node_modules",
             ".auto-coder",
             ".vscode",
+            "actions",
+            ".idea",
         ]
 
     @byzerllm.prompt()

autocoder/tsproject/__init__.py

@@ -43,6 +43,10 @@ class TSProject:
             "dist",
             "__pycache__",
             "node_modules",
+            ".auto-coder",
+            "actions",
+            ".vscode",
+            ".idea",
         ]
 
     @byzerllm.prompt()

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.207"
+__version__ = "0.1.208"