auto-coder 0.1.197__py3-none-any.whl → 0.1.199__py3-none-any.whl

autocoder/command_args.py

@@ -102,6 +102,7 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
         "--print_request", action="store_true", help=desc["print_request"]
     )
     parser.add_argument("--code_model", default="", help=desc["code_model"])
+    parser.add_argument("--system_prompt", default="", help=desc["system_prompt"])
     parser.add_argument("--planner_model", default="",
                         help=desc["planner_model"])
     parser.add_argument(

autocoder/common/__init__.py

@@ -98,6 +98,9 @@ class EnvInfo(pydantic.BaseModel):
     conda_env: Optional[str]
     virtualenv: Optional[str]
     has_bash: bool
+    default_shell: Optional[str]
+    home_dir: Optional[str]
+    cwd: Optional[str]
 
 
 def has_sufficient_content(file_content, min_line_count=10):
@@ -155,8 +158,19 @@ def detect_env() -> EnvInfo:
     )
 
     conda_env = os.environ.get("CONDA_DEFAULT_ENV")
-
     virtualenv = os.environ.get("VIRTUAL_ENV")
+    
+    # Get default shell
+    if os_name == "win32":
+        default_shell = os.environ.get("COMSPEC", "cmd.exe")
+    else:
+        default_shell = os.environ.get("SHELL", "/bin/sh")
+
+    # Get home directory
+    home_dir = os.path.expanduser("~")
+    
+    # Get current working directory
+    cwd = os.getcwd()
 
     has_bash = True
     try:
@@ -171,6 +185,9 @@ def detect_env() -> EnvInfo:
         conda_env=conda_env,
         virtualenv=virtualenv,
         has_bash=has_bash,
+        default_shell=default_shell,
+        home_dir=home_dir,
+        cwd=cwd,
     )
 
 
@@ -231,6 +248,7 @@ class AutoCoderArgs(pydantic.BaseModel):
     sd_model: Optional[str] = ""
     emb_model: Optional[str] = ""
     code_model: Optional[str] = ""
+    system_prompt: Optional[str] = ""
     text2voice_model: Optional[str] = ""
     voice2text_model: Optional[str] = ""
     

autocoder/common/code_auto_generate.py

@@ -2,6 +2,8 @@ from typing import List, Dict, Tuple
 from autocoder.common.types import Mode
 from autocoder.common import AutoCoderArgs
 import byzerllm
+from autocoder.utils.queue_communicate import queue_communicate, CommunicateEvent, CommunicateEventType
+from autocoder.common import sys_prompt
 
 
 class CodeAutoGenerate:
@@ -146,6 +148,15 @@ class CodeAutoGenerate:
     ) -> Tuple[str, Dict[str, str]]:
         llm_config = {"human_as_model": self.args.human_as_model}
 
+        if self.args.request_id and not self.args.skip_events:
+            queue_communicate.send_event_no_wait(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
+                    data=query,
+                ),
+            )
+
         if self.args.template == "common":
             init_prompt = self.single_round_instruction.prompt(
                 instruction=query, content=source_content, context=self.args.context
@@ -158,10 +169,28 @@ class CodeAutoGenerate:
         with open(self.args.target_file, "w") as file:
             file.write(init_prompt)
 
-        conversations = [{"role": "user", "content": init_prompt}]
+        conversations = []
+
+        if self.args.system_prompt and self.args.system_prompt.strip() == "claude":
+            conversations.append({"role": "system", "content": sys_prompt.prompt()})
+        elif self.args.system_prompt:
+            conversations.append({"role": "system", "content": self.args.system_prompt})
+        
+        conversations.append({"role": "user", "content": init_prompt})
+
 
         t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
         conversations.append({"role": "assistant", "content": t[0].output})
+
+        if self.args.request_id and not self.args.skip_events:
+            queue_communicate.send_event_no_wait(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_END.value,
+                    data="",
+                ),
+            )
+
         return [t[0].output], conversations
 
     def multi_round_run(

autocoder/common/code_auto_generate_diff.py

@@ -2,7 +2,8 @@ from typing import List, Dict, Tuple
 from autocoder.common.types import Mode
 from autocoder.common import AutoCoderArgs
 import byzerllm
-
+from autocoder.utils.queue_communicate import queue_communicate, CommunicateEvent, CommunicateEventType
+from autocoder.common import sys_prompt
 
 class CodeAutoGenerateDiff:
     def __init__(
@@ -289,6 +290,15 @@ class CodeAutoGenerateDiff:
     ) -> Tuple[str, Dict[str, str]]:
         llm_config = {"human_as_model": self.args.human_as_model}
 
+        if self.args.request_id and not self.args.skip_events:
+            queue_communicate.send_event_no_wait(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
+                    data=query,
+                ),
+            )
+
         init_prompt = self.single_round_instruction.prompt(
             instruction=query, content=source_content, context=self.args.context
         )
@@ -296,10 +306,24 @@ class CodeAutoGenerateDiff:
         with open(self.args.target_file, "w") as file:
             file.write(init_prompt)
 
-        conversations = [{"role": "user", "content": init_prompt}]
+        conversations = []
+        if self.args.system_prompt and self.args.system_prompt.strip() == "claude":
+            conversations.append({"role": "system", "content": sys_prompt.prompt()})
+        else:
+            conversations.append({"role": "user", "content": init_prompt})
 
         t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
         conversations.append({"role": "assistant", "content": t[0].output})
+
+        if self.args.request_id and not self.args.skip_events:
+            queue_communicate.send_event_no_wait(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_END.value,
+                    data="",
+                ),
+            )
+
         return [t[0].output], conversations
 
     def multi_round_run(

autocoder/common/code_auto_generate_editblock.py

@@ -3,6 +3,12 @@ from autocoder.common.types import Mode
 from autocoder.common import AutoCoderArgs
 import byzerllm
 from autocoder.common import sys_prompt
+from autocoder.utils.queue_communicate import (
+    queue_communicate,
+    CommunicateEvent,
+    CommunicateEventType,
+)
+import json
 
 
 class CodeAutoGenerateEditBlock:
@@ -44,7 +50,7 @@ class CodeAutoGenerateEditBlock:
         """
 
     @byzerllm.prompt(llm=lambda self: self.llm)
-    def multi_round_instruction(self, instruction: str, content: str,context:str="") -> str:
+    def multi_round_instruction(self, instruction: str, content: str, context: str = "") -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
 
@@ -141,7 +147,7 @@ class CodeAutoGenerateEditBlock:
 
         Here are the *SEARCH/REPLACE* blocks:
 
-        
+
         {{ fence_0 }}python
         ##File: /tmp/projects/mathweb/hello.py
         <<<<<<< SEARCH
@@ -152,7 +158,7 @@ class CodeAutoGenerateEditBlock:
             print("hello")
         >>>>>>> REPLACE
         {{ fence_1 }}
-        
+
         {{ fence_0 }}python
         ##File: /tmp/projects/mathweb/main.py
         <<<<<<< SEARCH
@@ -206,7 +212,7 @@ class CodeAutoGenerateEditBlock:
         }
 
     @byzerllm.prompt(llm=lambda self: self.llm)
-    def single_round_instruction(self, instruction: str, content: str, context:str="") -> str:
+    def single_round_instruction(self, instruction: str, content: str, context: str = "") -> str:
         """
         如果你需要生成代码，对于每个需要更改的文件,你需要按 *SEARCH/REPLACE block* 的格式进行生成。
 
@@ -302,7 +308,7 @@ class CodeAutoGenerateEditBlock:
         2. Remove hello() from main.py and replace it with an import.
 
         Here are the *SEARCH/REPLACE* blocks:
-        
+
         {{ fence_0 }}python
         ##File: /tmp/projects/mathweb/hello.py
         <<<<<<< SEARCH
@@ -313,7 +319,7 @@ class CodeAutoGenerateEditBlock:
             print("hello")
         >>>>>>> REPLACE
         {{ fence_1 }}
-        
+
         {{ fence_0 }}python
         ##File: /tmp/projects/mathweb/main.py
         <<<<<<< SEARCH
@@ -353,7 +359,7 @@ class CodeAutoGenerateEditBlock:
                 "fence_0": self.fence_0,
                 "fence_1": self.fence_1,
             }
-        
+
         return {
             "structure": (
                 self.action.pp.get_tree_like_directory_structure()
@@ -371,7 +377,7 @@ class CodeAutoGenerateEditBlock:
 
         if self.args.template == "common":
             init_prompt = self.single_round_instruction.prompt(
-                instruction=query, content=source_content,context=self.args.context
+                instruction=query, content=source_content, context=self.args.context
             )
         elif self.args.template == "auto_implement":
             init_prompt = self.auto_implement_function.prompt(
@@ -380,15 +386,42 @@ class CodeAutoGenerateEditBlock:
 
         with open(self.args.target_file, "w") as file:
             file.write(init_prompt)
-        
 
         conversations = []
-        # conversations.append({"role": "system", "content": sys_prompt.prompt()})
+        
+        if self.args.system_prompt and self.args.system_prompt.strip() == "claude":
+            conversations.append({"role": "system", "content": sys_prompt.prompt()})
+        elif self.args.system_prompt:
+            conversations.append({"role": "system", "content": self.args.system_prompt})
+        
         conversations.append({"role": "user", "content": init_prompt})
 
-        t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
-        conversations.append({"role": "assistant", "content": t[0].output})
-        return [t[0].output], conversations
+        if self.args.request_id and not self.args.skip_events:
+            _ = queue_communicate.send_event(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
+                    data=json.dumps({}, ensure_ascii=False),
+                ),
+            )
+            
+            t = self.llm.chat_oai(
+                conversations=conversations, llm_config=llm_config)
+            conversations.append({"role": "assistant", "content": t[0].output})
+            
+            _ = queue_communicate.send_event(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_END.value,
+                    data=json.dumps({}, ensure_ascii=False),
+                ),
+            )
+            return [t[0].output], conversations
+        else:
+            t = self.llm.chat_oai(
+                conversations=conversations, llm_config=llm_config)
+            conversations.append({"role": "assistant", "content": t[0].output})
+            return [t[0].output], conversations
 
     def multi_round_run(
         self, query: str, source_content: str, max_steps: int = 10
@@ -398,7 +431,7 @@ class CodeAutoGenerateEditBlock:
 
         if self.args.template == "common":
             init_prompt = self.multi_round_instruction.prompt(
-                instruction=query, content=source_content,context=self.args.context
+                instruction=query, content=source_content, context=self.args.context
             )
         elif self.args.template == "auto_implement":
             init_prompt = self.auto_implement_function.prompt(
@@ -412,7 +445,8 @@ class CodeAutoGenerateEditBlock:
         with open(self.args.target_file, "w") as file:
             file.write(init_prompt)
 
-        t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
+        t = self.llm.chat_oai(conversations=conversations,
+                              llm_config=llm_config)
 
         result.append(t[0].output)
 
@@ -430,7 +464,8 @@ class CodeAutoGenerateEditBlock:
             with open(self.args.target_file, "w") as file:
                 file.write("继续")
 
-            t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
+            t = self.llm.chat_oai(
+                conversations=conversations, llm_config=llm_config)
 
             result.append(t[0].output)
             conversations.append({"role": "assistant", "content": t[0].output})

autocoder/common/code_auto_generate_strict_diff.py

@@ -2,7 +2,8 @@ from typing import List, Dict, Tuple
 from autocoder.common.types import Mode
 from autocoder.common import AutoCoderArgs
 import byzerllm
-
+from autocoder.utils.queue_communicate import queue_communicate, CommunicateEvent, CommunicateEventType
+from autocoder.common import sys_prompt
 
 class CodeAutoGenerateStrictDiff:
     def __init__(
@@ -260,6 +261,15 @@ class CodeAutoGenerateStrictDiff:
     ) -> Tuple[str, Dict[str, str]]:
         llm_config = {"human_as_model": self.args.human_as_model}
 
+        if self.args.request_id and not self.args.skip_events:
+            queue_communicate.send_event_no_wait(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_START.value,
+                    data=query,
+                ),
+            )
+
         init_prompt = self.single_round_instruction.prompt(
             instruction=query, content=source_content, context=self.args.context
         )
@@ -267,10 +277,26 @@ class CodeAutoGenerateStrictDiff:
         with open(self.args.target_file, "w") as file:
             file.write(init_prompt)
 
-        conversations = [{"role": "user", "content": init_prompt}]
+        conversations = []
+        if self.args.system_prompt and self.args.system_prompt.strip() == "claude":
+            conversations.append({"role": "system", "content": sys_prompt.prompt()})
+        elif self.args.system_prompt:
+            conversations.append({"role": "system", "content": self.args.system_prompt})
+        
+        conversations.append({"role": "user", "content": init_prompt})
 
         t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
         conversations.append({"role": "assistant", "content": t[0].output})
+
+        if self.args.request_id and not self.args.skip_events:
+            queue_communicate.send_event_no_wait(
+                request_id=self.args.request_id,
+                event=CommunicateEvent(
+                    event_type=CommunicateEventType.CODE_GENERATE_END.value,
+                    data="",
+                ),
+            )
+
         return [t[0].output], conversations
 
     def multi_round_run(

autocoder/common/code_auto_merge_editblock.py

@@ -207,15 +207,17 @@ class CodeAutoMergeEditBlock:
         codes = self.get_edits(content)
         changes_to_make = []
         changes_made = False
-        unmerged_blocks = []
+        unmerged_blocks = []  
+        merged_blocks = []      
 
         # First, check if there are any changes to be made
         file_content_mapping = {}
         for block in codes:
             file_path, head, update = block
             if not os.path.exists(file_path):
-                changes_to_make.append((file_path, None, update))
+                changes_to_make.append((file_path, None, update))                
                 file_content_mapping[file_path] = update
+                merged_blocks.append((file_path, "", update, 1))
                 changes_made = True
             else:
                 if file_path not in file_content_mapping:
@@ -232,7 +234,8 @@ class CodeAutoMergeEditBlock:
                     changes_to_make.append(
                         (file_path, existing_content, new_content))
                     file_content_mapping[file_path] = new_content
-                    changes_made = True
+                    merged_blocks.append((file_path, head, update, 1))
+                    changes_made = True                    
                 else:
                     # If the SEARCH BLOCK is not found exactly, then try to use
                     # the similarity ratio to find the best matching block
@@ -247,7 +250,8 @@ class CodeAutoMergeEditBlock:
                                 (file_path, existing_content, new_content)
                             )
                             file_content_mapping[file_path] = new_content
-                            changes_made = True
+                            merged_blocks.append((file_path, head, update, similarity))
+                            changes_made = True                            
                     else:
                         unmerged_blocks.append(
                             (file_path, head, update, similarity))
@@ -309,12 +313,14 @@ class CodeAutoMergeEditBlock:
         if self.args.request_id and not self.args.skip_events:
             # collect modified files
             event_data = []
-            for file_path, old_block, new_block in changes_to_make:
+            for code in merged_blocks:
+                file_path, head, update, similarity = code
                 event_data.append(
                     {
-                        "file_path": file_path,
-                        "old_block": old_block,
-                        "new_block": new_block,
+                            "file_path": file_path,
+                            "head": head,
+                            "update": update,
+                            "similarity": similarity,
                     }
                 )
 

autocoder/common/sys_prompt.py

@@ -2,11 +2,11 @@ import byzerllm
 import datetime
 
 @byzerllm.prompt()
-def sys_prompt():
+def claude_sys_prompt():
     '''
     The assistant is Claude, created by Anthropic.
 
-    The current date is {{currentDateTime}}.    
+    The current date is {{ currentDateTime }}.    
 
     Claude’s knowledge base was last updated in April 2024. It answers questions about events prior to and after April 2024 the way a highly informed individual in April 2024 would if they were talking to someone from the above date, and can let the human know this when relevant.
 

autocoder/lang.py

@@ -61,7 +61,8 @@ lang_desc = {
         "screenshot_desc": "Generate screenshots of a webpage",
         "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",        
+        "code_model": "The name of the code 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",
         "query_prefix": "The query prefix",
@@ -141,6 +142,7 @@ lang_desc = {
         "screenshot_url": "要捕获的网页的URL",
         "screenshot_output": "保存截图的目录",
         "code_model": "要使用的代码模型的名称。默认为空",
+        "system_prompt": "模型使用的系统提示词。默认为空",
         "next_desc": "基于上一个action文件创建一个新的action文件",
         "planner_model": "要使用的规划模型的名称。默认为空",
         "designer_model": "要使用的设计模型的名称。默认为空",

autocoder/utils/queue_communicate.py

@@ -14,6 +14,8 @@ class CommunicateEventType(Enum):
     CODE_UNMERGE_RESULT = "code_unmerge_result"
     CODE_START = "code_start"
     CODE_END = "code_end"
+    CODE_GENERATE_START = "code_generate_start"
+    CODE_GENERATE_END = "code_generate_end"
     CODE_HUMAN_AS_MODEL = "code_human_as_model"
     ASK_HUMAN = "ask_human"
     CODE_ERROR = "code_error"

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.197"
+__version__ = "0.1.199"