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

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,
     )
 
 

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/version.py

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