wcgw 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

wcgw/client/anthropic_client.py

@@ -223,9 +223,10 @@ You're a cli assistant.
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective.
-    - First understand about the project by understanding the folder structure (ignoring node_modules or venv, etc.)
-    - Always read relevant files before making any changes.
+    - You should use the provided bash execution, reading and writing file tools to complete objective.
+    - First understand about the project by getting the folder structure (ignoring .git, node_modules, venv, etc.)
+    - Always read relevant files before editing.
+    - Do not provide code snippets unless asked by the user, instead directly edit the code.
     
 System information:
     - System: {uname_sysname}

wcgw/client/diff-instructions.txt

@@ -1,5 +1,7 @@
 
-Instructions for 
+Instructions for editing files.
+
+
 Only edit the files using the following SEARCH/REPLACE blocks.
 ```
 <<<<<<< SEARCH
@@ -8,7 +10,27 @@ def hello():
 
     print("hello")
 =======
-from hello import hello
+from hello import hello as hello_renamed
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+def call_hello():
+    "call hello"
+
+    hello()
+=======
+def call_hello_renamed():
+    "call hello renamed"
+
+    hello_renamed()
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+    impl1()
+    hello()
+    impl2()
+=======
+    impl1()
+    hello_renamed()
+    impl2()
 >>>>>>> REPLACE
 ```
 
@@ -31,5 +53,3 @@ Keep *SEARCH/REPLACE* blocks concise.
 Break large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.
 Include just the changing lines, and a few surrounding lines if needed for uniqueness.
 Do not include long runs of unchanging lines in *SEARCH/REPLACE* blocks.
-
-Include context lines before and after the code to edit for better matching in "<<<<<<< SEARCH". Recommended to add 3 lines on each side.

wcgw/client/openai_client.py

@@ -185,6 +185,7 @@ def loop(
 - Interact with running program using this tool
 - Special keys like arrows, interrupts, enter, etc.
 - Send text input to the running program.
+- Send send_specials=["Enter"] to recheck status of a running program.
 - Only one of send_text, send_specials, send_ascii should be provided.""",
         ),
         openai.pydantic_function_tool(
@@ -226,10 +227,11 @@ You're a cli assistant.
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective.
-    - First understand about the project by understanding the folder structure (ignoring node_modules or venv, etc.)
-    - Always read relevant files before making any changes.
-    
+    - You should use the provided bash execution, reading and writing file tools to complete objective.
+    - First understand about the project by getting the folder structure (ignoring .git, node_modules, venv, etc.)
+    - Always read relevant files before editing.
+    - Do not provide code snippets unless asked by the user, instead directly edit the code.
+
 System information:
     - System: {uname_sysname}
     - Machine: {uname_machine}

wcgw/client/tools.py

@@ -251,55 +251,71 @@ def execute_bash(
                 )
 
             SHELL.sendline(command)
-        elif bash_arg.send_specials:
-            console.print(f"Sending special sequence: {bash_arg.send_specials}")
-            for char in bash_arg.send_specials:
-                if char == "Key-up":
-                    SHELL.send("\033[A")
-                elif char == "Key-down":
-                    SHELL.send("\033[B")
-                elif char == "Key-left":
-                    SHELL.send("\033[D")
-                elif char == "Key-right":
-                    SHELL.send("\033[C")
-                elif char == "Enter":
-                    SHELL.send("\n")
-                elif char == "Ctrl-c":
-                    SHELL.sendintr()
-                    is_interrupt = True
-                elif char == "Ctrl-d":
-                    SHELL.sendintr()
-                    is_interrupt = True
-                elif char == "Ctrl-z":
-                    SHELL.send("\x1a")
-                else:
-                    raise Exception(f"Unknown special character: {char}")
-        elif bash_arg.send_ascii:
-            console.print(f"Sending ASCII sequence: {bash_arg.send_ascii}")
-            for ascii_char in bash_arg.send_ascii:
-                SHELL.send(chr(ascii_char))
-                if ascii_char == 3:
-                    is_interrupt = True
+
         else:
-            if bash_arg.send_text is None:
+            if (
+                sum(
+                    [
+                        int(bool(bash_arg.send_text)),
+                        int(bool(bash_arg.send_specials)),
+                        int(bool(bash_arg.send_ascii)),
+                    ]
+                )
+                != 1
+            ):
                 return (
-                    "Failure: at least one of send_text, send_specials or send_ascii should be provided",
+                    "Failure: exactly one of send_text, send_specials or send_ascii should be provided",
                     0.0,
                 )
+            if bash_arg.send_specials:
+                console.print(f"Sending special sequence: {bash_arg.send_specials}")
+                for char in bash_arg.send_specials:
+                    if char == "Key-up":
+                        SHELL.send("\033[A")
+                    elif char == "Key-down":
+                        SHELL.send("\033[B")
+                    elif char == "Key-left":
+                        SHELL.send("\033[D")
+                    elif char == "Key-right":
+                        SHELL.send("\033[C")
+                    elif char == "Enter":
+                        SHELL.send("\n")
+                    elif char == "Ctrl-c":
+                        SHELL.sendintr()
+                        is_interrupt = True
+                    elif char == "Ctrl-d":
+                        SHELL.sendintr()
+                        is_interrupt = True
+                    elif char == "Ctrl-z":
+                        SHELL.send("\x1a")
+                    else:
+                        raise Exception(f"Unknown special character: {char}")
+            elif bash_arg.send_ascii:
+                console.print(f"Sending ASCII sequence: {bash_arg.send_ascii}")
+                for ascii_char in bash_arg.send_ascii:
+                    SHELL.send(chr(ascii_char))
+                    if ascii_char == 3:
+                        is_interrupt = True
+            else:
+                if bash_arg.send_text is None:
+                    return (
+                        "Failure: at least one of send_text, send_specials or send_ascii should be provided",
+                        0.0,
+                    )
 
-            updated_repl_mode = update_repl_prompt(bash_arg.send_text)
-            if updated_repl_mode:
-                BASH_STATE = "repl"
-                response = (
-                    "Prompt updated, you can execute REPL lines using BashCommand now"
-                )
-                console.print(response)
-                return (
-                    response,
-                    0,
-                )
-            console.print(f"Interact text: {bash_arg.send_text}")
-            SHELL.sendline(bash_arg.send_text)
+                updated_repl_mode = update_repl_prompt(bash_arg.send_text)
+                if updated_repl_mode:
+                    BASH_STATE = "repl"
+                    response = (
+                        "Prompt updated, you can execute REPL lines using BashCommand now"
+                    )
+                    console.print(response)
+                    return (
+                        response,
+                        0,
+                    )
+                console.print(f"Interact text: {bash_arg.send_text}")
+                SHELL.sendline(bash_arg.send_text)
 
         BASH_STATE = "repl"
 
@@ -453,6 +469,14 @@ def find_least_edit_distance_substring(
     content_lines = [
         line.strip() for line in orig_content_lines
     ]  # Remove trailing and leading space for calculating edit distance
+    new_to_original_indices = {}
+    new_content_lines = []
+    for i in range(len(content_lines)):
+        if not content_lines[i]:
+            continue
+        new_content_lines.append(content_lines[i])
+        new_to_original_indices[len(new_content_lines) - 1] = i
+    content_lines = new_content_lines
     find_lines = find_str.split("\n")
     find_lines = [
         line.strip() for line in find_lines
@@ -470,8 +494,9 @@ def find_least_edit_distance_substring(
                 edit_distance_sum += len(find_lines[j])
         if edit_distance_sum < min_edit_distance:
             min_edit_distance = edit_distance_sum
-            min_edit_distance_lines = orig_content_lines[i: i + len(
-                find_lines)]
+            orig_start_index = new_to_original_indices[i]
+            orig_end_index = new_to_original_indices.get(i + len(find_lines) - 1, len(orig_content_lines) - 1) + 1
+            min_edit_distance_lines = orig_content_lines[orig_start_index:orig_end_index]
     return "\n".join(min_edit_distance_lines), min_edit_distance
 
 
@@ -481,12 +506,12 @@ def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
         closest_match, min_edit_distance = find_least_edit_distance_substring(
             content, find_lines
         )
-        print(
-            f"Exact match not found, found with whitespace removed edit distance: {min_edit_distance}"
-        )
-        if min_edit_distance / len(find_lines) < 1 / 100:
-            print("Editing file with closest match")
+        if min_edit_distance == 0:
             return edit_content(content, closest_match, replace_with_lines)
+        else:
+            print(
+                f"Exact match not found, found with whitespace removed edit distance: {min_edit_distance}"
+            )
         raise Exception(
             f"Error: no match found for the provided `find_lines` in the file. Closest match:\n---\n{closest_match}\n---\nFile not edited"
         )
@@ -511,6 +536,12 @@ def do_diff_edit(fedit: FileEdit) -> str:
         apply_diff_to = f.read()
 
     lines = fedit.file_edit_using_search_replace_blocks.split("\n")
+
+    if not lines or not re.match(r"^<<<<<<+\s*SEARCH\s*$", lines[0]):
+        raise Exception(
+            "Error: first line should be `<<<<<< SEARCH` to start a search-replace block"
+        )
+    
     n_lines = len(lines)
     i = 0
     replacement_count = 0

wcgw/types_.py

@@ -13,26 +13,11 @@ Specials = Literal[
 
 
 class BashInteraction(BaseModel):
+    type: Literal["BashInteraction"]
     send_text: Optional[str] = None
     send_specials: Optional[Sequence[Specials]] = None
     send_ascii: Optional[Sequence[int]] = None
 
-    def model_post_init(self, __context: object) -> None:
-        # Ensure only one of the fields is set
-        if (
-            sum(
-                [
-                    int(bool(self.send_text)),
-                    int(bool(self.send_specials)),
-                    int(bool(self.send_ascii)),
-                ]
-            )
-            != 1
-        ):
-            raise ValueError(
-                "Exactly one of 'send_text', 'send_specials', or 'send_ascii' must be set"
-            )
-
 
 class ReadImage(BaseModel):
     file_path: str
@@ -61,16 +46,9 @@ class FileEditFindReplace(BaseModel):
 
 
 class ResetShell(BaseModel):
-    should_reset: Literal[True] = True
+    should_reset: Literal[True]
 
 
 class FileEdit(BaseModel):
     file_path: str
     file_edit_using_search_replace_blocks: str
-
-    def model_post_init(self, __context: object) -> None:
-        # Ensure first line is "<<<<<<< SEARCH"
-
-        if not re.match(r"^<<<<<<+\s*SEARCH\s*$", self.file_edit_using_search_replace_blocks.split("\n")[0]):
-
-            raise ValueError("First line of file_edit_using_search_replace_blocks must be '<<<<<<< SEARCH'")

{wcgw-1.2.0.dist-info → wcgw-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcgw
-Version: 1.2.0
+Version: 1.2.2
 Summary: What could go wrong giving full shell access to chatgpt?
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>

{wcgw-1.2.0.dist-info → wcgw-1.2.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 wcgw/__init__.py,sha256=PNWvBvjUKA3aj4bHOtIqBKCAtOW88pr0hAXZ7RylVr8,68
-wcgw/types_.py,sha256=a0sE4hPj4qylQFqMJwysLYy_FVYsueJTjq5fmHmNWGo,1855
+wcgw/types_.py,sha256=HND4V3KruqkAhzzEf2ve7HhF8y_o5w11Fu784U8xN_I,1062
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/__main__.py,sha256=ngI_vBcLAv7fJgmS4w4U7tuWtalGB8c7W5qebuT6Z6o,30
-wcgw/client/anthropic_client.py,sha256=g5dj7tP_wkLMjQawil4PxhrEemlrIKYttWUXBI5SZ4Q,15260
+wcgw/client/anthropic_client.py,sha256=YQ2puVKlrgbI6QvV_DQjWkvq2qw6KhPPrivm0OGfRsc,15353
 wcgw/client/cli.py,sha256=Oja42CHkVO8puqOXflko9NeephYCMa85aBmQTEjBZtI,932
 wcgw/client/common.py,sha256=grH-yV_4tnTQZ29xExn4YicGLxEq98z-HkEZwH0ReSg,1410
-wcgw/client/diff-instructions.txt,sha256=I_qroE6_aMpWtOeywPSDCTxmz-P6VPopdp1kR2r0D8w,1375
-wcgw/client/openai_client.py,sha256=Vsj8TzYj22fawU1LagAU7bn21Va50KXwpYZpGZ0BUZ0,17310
+wcgw/client/diff-instructions.txt,sha256=Fy6op3wkr5gYgMHCRcitG4804zLrTxMbs-VSMB1oIzA,1548
+wcgw/client/openai_client.py,sha256=v6ZBW4oh1CJpyWLTt16S-7ew8Gmq6YrJzaTux2ffywI,17470
 wcgw/client/openai_utils.py,sha256=YNwCsA-Wqq7jWrxP0rfQmBTb1dI0s7dWXzQqyTzOZT4,2629
-wcgw/client/tools.py,sha256=NeGIZ8AJ9-XAiW6gUXf7GWs1UJjw8f7ecxUBBEAtyEI,25994
+wcgw/client/tools.py,sha256=zeUOemmFwReY1jEJnnAkhPbBwkL4pjZvQ6G5BWPux4c,27301
 wcgw/relay/serve.py,sha256=sMbERQTM1GhpnPWLzdtpcb23TIsgbP-ZuqVj-vjp5Rw,8186
 wcgw/relay/static/privacy.txt,sha256=s9qBdbx2SexCpC_z33sg16TptmAwDEehMCLz4L50JLc,529
-wcgw-1.2.0.dist-info/METADATA,sha256=1AJa0M-m_tvHNpANqak4-q7bKTgg07_qgjddGwQaOhs,5255
-wcgw-1.2.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-wcgw-1.2.0.dist-info/entry_points.txt,sha256=WlIB825-Vm9ZtNzgENQsbHj4DRMkbpVR7uSkQyBlaPA,93
-wcgw-1.2.0.dist-info/RECORD,,
+wcgw-1.2.2.dist-info/METADATA,sha256=0zQpOcQD8eRiQMVibiksflPhrngU49FSgpEHAmXQ_DA,5255
+wcgw-1.2.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+wcgw-1.2.2.dist-info/entry_points.txt,sha256=WlIB825-Vm9ZtNzgENQsbHj4DRMkbpVR7uSkQyBlaPA,93
+wcgw-1.2.2.dist-info/RECORD,,