wcgw 1.2.2__tar.gz → 1.3.0__tar.gz

{wcgw-1.2.2 → wcgw-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcgw
-Version: 1.2.2
+Version: 1.3.0
 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.2 → wcgw-1.3.0}/gpt_action_json_schema.json

@@ -249,6 +249,46 @@
           }
         }
       }
+    },
+    "/v1/initialize": {
+      "post": {
+        "x-openai-isConsequential": false,
+        "summary": "Initialize",
+        "operationId": "initialize_v1_initialize_post",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/InitializeWithUUID"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "title": "Response Initialize V1 Initialize Post"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HTTPValidationError"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -320,8 +360,8 @@
         },
         "type": "object",
         "required": [
-          "user_id",
-          "type"
+          "type",
+          "user_id"
         ],
         "title": "BashInteractionWithUUID"
       },
@@ -405,6 +445,29 @@
         "type": "object",
         "title": "HTTPValidationError"
       },
+      "InitializeWithUUID": {
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "Initialize"
+            ],
+            "const": "Initialize",
+            "title": "Type"
+          },
+          "user_id": {
+            "type": "string",
+            "format": "uuid",
+            "title": "User Id"
+          }
+        },
+        "type": "object",
+        "required": [
+          "type",
+          "user_id"
+        ],
+        "title": "InitializeWithUUID"
+      },
       "ReadFileWithUUID": {
         "properties": {
           "file_path": {
@@ -441,8 +504,7 @@
               true
             ],
             "const": true,
-            "title": "Should Reset",
-            "default": true
+            "title": "Should Reset"
           },
           "user_id": {
             "type": "string",
@@ -452,8 +514,8 @@
         },
         "type": "object",
         "required": [
-          "user_id",
-          "should_reset"
+          "should_reset",
+          "user_id"
         ],
         "title": "ResetShellWithUUID"
       },

{wcgw-1.2.2 → wcgw-1.3.0}/gpt_instructions.txt

@@ -1,12 +1,14 @@
 You're an expert software engineer with shell and code knowledge.
 
 Instructions:
-
+   
     - 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.
 
+Instructions for `Initialize`:
+    - Always call this at the start of the conversation.
 
 Instructions for `BashCommand`:
 - Execute a bash command. This is stateful (beware with subsequent calls).
@@ -14,6 +16,7 @@ Instructions for `BashCommand`:
 - Status of the command and the current working directory will always be returned at the end.
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
 - The first line might be `(...truncated)` if the output is too long.
+- The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 
 Instructions for `Read File`
 - Read full content of a file.
@@ -80,7 +83,7 @@ def call_hello_renamed():
         4. The lines to replace into the source code
         5. The end of the replace block: >>>>>>> REPLACE
 
-        Every "<<<<<<< SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
+        Every "<<<<<<< SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, whitespaces etc.
 
         *SEARCH/REPLACE* blocks will *only* replace the first match occurrence.
         Including multiple unique *SEARCH/REPLACE* blocks if needed.
@@ -91,9 +94,12 @@ def call_hello_renamed():
         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.
 
+        Preserve leading spaces and indentations in both SEARCH and REPLACE blocks.
+
 ---
 Always run `pwd` if you get any file or directory not found error to make sure you're not lost, or to get absolute cwd.
 
 Always write production ready, syntactically correct code.
 ---
-Ask the user for the user_id `UUID` if they haven't provided in the first message.
+- Ask the user for the user_id `UUID` if they haven't provided in the first message. 
+- Call "Initialize" as soon as you get the UUID.

{wcgw-1.2.2 → wcgw-1.3.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "1.2.2"
+version = "1.3.0"
 description = "What could go wrong giving full shell access to chatgpt?"
 readme = "README.md"
 requires-python = ">=3.10, <3.13"

{wcgw-1.2.2 → wcgw-1.3.0}/src/wcgw/client/anthropic_client.py

@@ -165,6 +165,7 @@ def loop(
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
 - The first line might be `(...truncated)` if the output is too long.
 - Always run `pwd` if you get any file or directory not found error to make sure you're not lost.
+- The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 """,
         ),
         ToolParam(
@@ -193,7 +194,7 @@ def loop(
 - Write content to a new file. Provide file path and content. Use this instead of BashCommand for writing new files.
 - This doesn't create any directories, please create directories using `mkdir -p` BashCommand.
 - Provide absolute file path only.
-- For editing existing files, use FileEdit.
+- For editing existing files, use FileEdit instead of this tool.
 """,
         ),
         ToolParam(
@@ -219,7 +220,7 @@ def loop(
     uname_machine = os.uname().machine
 
     system = f"""
-You're a cli assistant.
+You're an expert software engineer with shell and code knowledge.
 
 Instructions:
 
@@ -227,10 +228,11 @@ Instructions:
     - 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}
+    - Current directory: {os.getcwd()}
 """
 
     with open(os.path.join(os.path.dirname(__file__), "diff-instructions.txt")) as f:
@@ -361,7 +363,7 @@ System information:
                                     enc,
                                     limit - cost,
                                     loop,
-                                    max_tokens=8096,
+                                    max_tokens=8000,
                                 )
                             except Exception as e:
                                 output_or_done = (

{wcgw-1.2.2 → wcgw-1.3.0}/src/wcgw/client/diff-instructions.txt

@@ -4,6 +4,7 @@ Instructions for editing files.
 
 Only edit the files using the following SEARCH/REPLACE blocks.
 ```
+file_edit_using_search_replace_blocks="""
 <<<<<<< SEARCH
 def hello():
     "print a greeting"
@@ -32,6 +33,7 @@ def call_hello_renamed():
     hello_renamed()
     impl2()
 >>>>>>> REPLACE
+"""
 ```
 
 # *SEARCH/REPLACE block* Rules:
@@ -43,7 +45,7 @@ Every *SEARCH/REPLACE block* must use this format:
 4. The lines to replace into the source code
 5. The end of the replace block: >>>>>>> REPLACE
 
-Every "<<<<<<< SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
+Every "<<<<<<< SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, whitespaces, etc.
 
 *SEARCH/REPLACE* blocks will *only* replace the first match occurrence.
 Including multiple unique *SEARCH/REPLACE* blocks if needed.
@@ -53,3 +55,5 @@ 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.
+
+Preserve leading spaces and indentations in both SEARCH and REPLACE blocks.

{wcgw-1.2.2 → wcgw-1.3.0}/src/wcgw/client/openai_client.py

@@ -148,8 +148,7 @@ def loop(
     my_dir = os.path.dirname(__file__)
 
     config = Config(
-        model=cast(
-            Models, os.getenv("OPENAI_MODEL", "gpt-4o-2024-08-06").lower()),
+        model=cast(Models, os.getenv("OPENAI_MODEL", "gpt-4o-2024-08-06").lower()),
         cost_limit=0.1,
         cost_unit="$",
         cost_file={
@@ -177,6 +176,7 @@ def loop(
 - Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
 - The first line might be `(...truncated)` if the output is too long.
 - Always run `pwd` if you get any file or directory not found error to make sure you're not lost.
+- The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 """,
         ),
         openai.pydantic_function_tool(
@@ -201,7 +201,7 @@ def loop(
 - Write content to a new file. Provide file path and content. Use this instead of BashCommand for writing new files.
 - This doesn't create any directories, please create directories using `mkdir -p` BashCommand.
 - Provide absolute file path only.
-- For editing existing files, use FileEdit.""",
+- For editing existing files, use FileEdit instead of this tool.""",
         ),
         openai.pydantic_function_tool(
             FileEdit,
@@ -223,7 +223,7 @@ def loop(
     uname_machine = os.uname().machine
 
     system = f"""
-You're a cli assistant.
+You're an expert software engineer with shell and code knowledge.
 
 Instructions:
 
@@ -235,6 +235,7 @@ Instructions:
 System information:
     - System: {uname_sysname}
     - Machine: {uname_machine}
+    - Current directory: {os.getcwd()}
 
 """
 
@@ -341,7 +342,7 @@ System information:
                                     enc,
                                     limit - cost,
                                     loop,
-                                    max_tokens=2048,
+                                    max_tokens=8000,
                                 )
                             except Exception as e:
                                 output_or_done = (

{wcgw-1.2.2 → wcgw-1.3.0}/src/wcgw/client/tools.py

@@ -45,7 +45,7 @@ from openai.types.chat import (
     ChatCompletionMessage,
     ParsedChatCompletionMessage,
 )
-from nltk.metrics.distance import edit_distance
+from nltk.metrics.distance import edit_distance  # type: ignore[import-untyped]
 
 from ..types_ import (
     BashCommand,
@@ -53,6 +53,7 @@ from ..types_ import (
     CreateFileNew,
     FileEditFindReplace,
     FileEdit,
+    Initialize,
     ReadFile,
     ReadImage,
     ResetShell,
@@ -155,6 +156,16 @@ BASH_STATE: BASH_CLF_OUTPUT = "repl"
 CWD = os.getcwd()
 
 
+def initial_info() -> str:
+    uname_sysname = os.uname().sysname
+    uname_machine = os.uname().machine
+    return f"""
+System: {uname_sysname}
+Machine: {uname_machine}
+Current working directory: {CWD}
+"""
+
+
 def reset_shell() -> str:
     global SHELL, BASH_STATE, CWD
     SHELL.close(True)
@@ -306,9 +317,7 @@ def execute_bash(
                 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"
-                    )
+                    response = "Prompt updated, you can execute REPL lines using BashCommand now"
                     console.print(response)
                     return (
                         response,
@@ -334,7 +343,7 @@ def execute_bash(
         tokens = enc.encode(text)
 
         if max_tokens and len(tokens) >= max_tokens:
-            text = "...(truncated)\n" + enc.decode(tokens[-(max_tokens - 1):])
+            text = "...(truncated)\n" + enc.decode(tokens[-(max_tokens - 1) :])
 
         if is_interrupt:
             text = (
@@ -361,7 +370,7 @@ Otherwise, you may want to try Ctrl-c again or program specific exit interactive
 
     tokens = enc.encode(output)
     if max_tokens and len(tokens) >= max_tokens:
-        output = "...(truncated)\n" + enc.decode(tokens[-(max_tokens - 1):])
+        output = "...(truncated)\n" + enc.decode(tokens[-(max_tokens - 1) :])
 
     try:
         exit_status = get_status()
@@ -436,7 +445,7 @@ def read_image_from_shell(file_path: str) -> ImageData:
         image_bytes = image_file.read()
         image_b64 = base64.b64encode(image_bytes).decode("utf-8")
         image_type = mimetypes.guess_type(file_path)[0]
-        return ImageData(media_type=image_type, data=image_b64)
+        return ImageData(media_type=image_type, data=image_b64)  # type: ignore
 
 
 def write_file(writefile: Writefile | CreateFileNew, error_on_exist: bool) -> str:
@@ -488,15 +497,21 @@ def find_least_edit_distance_substring(
         edit_distance_sum = 0
         for j in range(len(find_lines)):
             if (i + j) < len(content_lines):
-                edit_distance_sum += edit_distance(
-                    content_lines[i + j], find_lines[j])
+                edit_distance_sum += edit_distance(content_lines[i + j], find_lines[j])
             else:
                 edit_distance_sum += len(find_lines[j])
         if edit_distance_sum < min_edit_distance:
             min_edit_distance = edit_distance_sum
             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]
+            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
 
 
@@ -525,7 +540,8 @@ def do_diff_edit(fedit: FileEdit) -> str:
 
     if not os.path.isabs(fedit.file_path):
         raise Exception(
-            f"Failure: file_path should be absolute path, current working directory is {CWD}")
+            f"Failure: file_path should be absolute path, current working directory is {CWD}"
+        )
     else:
         path_ = fedit.file_path
 
@@ -535,13 +551,16 @@ def do_diff_edit(fedit: FileEdit) -> str:
     with open(path_) as f:
         apply_diff_to = f.read()
 
+    fedit.file_edit_using_search_replace_blocks = (
+        fedit.file_edit_using_search_replace_blocks.strip()
+    )
     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
@@ -561,15 +580,14 @@ def do_diff_edit(fedit: FileEdit) -> str:
 
             for line in search_block:
                 console.log("> " + line)
-            console.log("---")
+            console.log("=======")
             for line in replace_block:
                 console.log("< " + line)
-
+            console.log("\n\n\n\n")
             search_block_ = "\n".join(search_block)
             replace_block_ = "\n".join(replace_block)
 
-            apply_diff_to = edit_content(
-                apply_diff_to, search_block_, replace_block_)
+            apply_diff_to = edit_content(apply_diff_to, search_block_, replace_block_)
             replacement_count += 1
         else:
             i += 1
@@ -588,7 +606,8 @@ def do_diff_edit(fedit: FileEdit) -> str:
 def file_edit(fedit: FileEditFindReplace) -> str:
     if not os.path.isabs(fedit.file_path):
         raise Exception(
-            f"Failure: file_path should be absolute path, current working directory is {CWD}")
+            f"Failure: file_path should be absolute path, current working directory is {CWD}"
+        )
     else:
         path_ = fedit.file_path
 
@@ -598,17 +617,14 @@ def file_edit(fedit: FileEditFindReplace) -> str:
     if not fedit.find_lines:
         raise Exception("Error: `find_lines` cannot be empty")
 
-    out_string = "\n".join(
-        "> " + line for line in fedit.find_lines.split("\n"))
-    in_string = "\n".join(
-        "< " + line for line in fedit.replace_with_lines.split("\n"))
+    out_string = "\n".join("> " + line for line in fedit.find_lines.split("\n"))
+    in_string = "\n".join("< " + line for line in fedit.replace_with_lines.split("\n"))
     console.log(f"Editing file: {path_}\n---\n{out_string}\n---\n{in_string}\n---")
     try:
         with open(path_) as f:
             content = f.read()
 
-        content = edit_content(content, fedit.find_lines,
-                               fedit.replace_with_lines)
+        content = edit_content(content, fedit.find_lines, fedit.replace_with_lines)
 
         with open(path_, "w") as f:
             f.write(content)
@@ -653,6 +669,7 @@ TOOLS = (
     | DoneFlag
     | ReadImage
     | ReadFile
+    | Initialize
 )
 
 
@@ -686,6 +703,8 @@ def which_tool_name(name: str) -> Type[TOOLS]:
         return ReadImage
     elif name == "ReadFile":
         return ReadFile
+    elif name == "Initialize":
+        return Initialize
     else:
         raise ValueError(f"Unknown tool name: {name}")
 
@@ -703,6 +722,7 @@ def get_tool_output(
     | AIAssistant
     | DoneFlag
     | ReadImage
+    | Initialize
     | ReadFile,
     enc: tiktoken.Encoding,
     limit: float,
@@ -723,6 +743,7 @@ def get_tool_output(
             | DoneFlag
             | ReadImage
             | ReadFile
+            | Initialize
         ](
             Confirmation
             | BashCommand
@@ -736,6 +757,7 @@ def get_tool_output(
             | DoneFlag
             | ReadImage
             | ReadFile
+            | Initialize
         )
         arg = adapter.validate_python(args)
     else:
@@ -770,10 +792,13 @@ def get_tool_output(
         output = read_image_from_shell(arg.file_path), 0.0
     elif isinstance(arg, ReadFile):
         console.print("Calling read file tool")
-        output = read_file(arg), 0.0
+        output = read_file(arg, max_tokens), 0.0
     elif isinstance(arg, ResetShell):
         console.print("Calling reset shell tool")
         output = reset_shell(), 0.0
+    elif isinstance(arg, Initialize):
+        console.print("Calling initial info tool")
+        output = initial_info(), 0.0
     else:
         raise ValueError(f"Unknown tool: {arg}")
 
@@ -785,8 +810,7 @@ History = list[ChatCompletionMessageParam]
 
 default_enc = tiktoken.encoding_for_model("gpt-4o")
 default_model: Models = "gpt-4o-2024-08-06"
-default_cost = CostData(cost_per_1m_input_tokens=0.15,
-                        cost_per_1m_output_tokens=0.6)
+default_cost = CostData(cost_per_1m_input_tokens=0.15, cost_per_1m_output_tokens=0.6)
 curr_cost = 0.0
 
 
@@ -801,6 +825,7 @@ class Mdata(BaseModel):
         | FileEdit
         | str
         | ReadFile
+        | Initialize
     )
 
 
@@ -829,8 +854,7 @@ def register_client(server_url: str, client_uuid: str = "") -> None:
                     raise Exception(mdata)
                 try:
                     output, cost = get_tool_output(
-                        mdata.data, default_enc, 0.0, lambda x, y: (
-                            "", 0), None
+                        mdata.data, default_enc, 0.0, lambda x, y: ("", 0), 8000
                     )
                     curr_cost += cost
                     print(f"{curr_cost=}")
@@ -863,8 +887,7 @@ def app(
     register_client(server_url, client_uuid or "")
 
 
-def read_file(readfile: ReadFile) -> str:
-
+def read_file(readfile: ReadFile, max_tokens: Optional[int]) -> str:
     console.print(f"Reading file: {readfile.file_path}")
 
     if not os.path.isabs(readfile.file_path):
@@ -876,4 +899,11 @@ def read_file(readfile: ReadFile) -> str:
 
     with path.open("r") as f:
         content = f.read()
+
+    if max_tokens is not None:
+        tokens = default_enc.encode(content)
+        if len(tokens) > max_tokens:
+            content = default_enc.decode(tokens[: max_tokens - 5])
+            content += "\n...(truncated)"
+
     return content

{wcgw-1.2.2 → wcgw-1.3.0}/src/wcgw/relay/serve.py

@@ -20,6 +20,7 @@ from ..types_ import (
     CreateFileNew,
     FileEditFindReplace,
     FileEdit,
+    Initialize,
     ReadFile,
     ResetShell,
     Writefile,
@@ -37,6 +38,7 @@ class Mdata(BaseModel):
         | FileEditFindReplace
         | FileEdit
         | ReadFile
+        | Initialize
         | str
     )
     user_id: UUID
@@ -51,7 +53,7 @@ gpts: dict[UUID, Callable[[str], None]] = {}
 images: DefaultDict[UUID, dict[str, dict[str, Any]]] = DefaultDict(dict)
 
 
-CLIENT_VERSION_MINIMUM = "1.2.0"
+CLIENT_VERSION_MINIMUM = "1.3.0"
 
 
 @app.websocket("/v1/register/{uuid}")
@@ -71,8 +73,7 @@ async def register_websocket(websocket: WebSocket, uuid: UUID) -> None:
         await websocket.send_text(
             Mdata(
                 user_id=uuid,
-                data=f"Client version {client_version} is outdated. Please upgrade to {
-                    CLIENT_VERSION_MINIMUM} or higher.",
+                data=f"Client version {client_version} is outdated. Please upgrade to {CLIENT_VERSION_MINIMUM} or higher.",
             ).model_dump_json()
         )
         await websocket.close(
@@ -281,9 +282,37 @@ async def read_file_endpoint(read_file_data: ReadFileWithUUID) -> str:
     gpts[user_id] = put_results
 
     await clients[user_id](
-        Mdata(data=ReadFile(file_path=read_file_data.file_path,
-                            type=read_file_data.type
-                            ), user_id=user_id)
+        Mdata(data=read_file_data, user_id=user_id)
+    )
+
+    start_time = time.time()
+    while time.time() - start_time < 30:
+        if results is not None:
+            return results
+        await asyncio.sleep(0.1)
+
+    raise fastapi.HTTPException(status_code=500, detail="Timeout error")
+
+class InitializeWithUUID(Initialize):
+    user_id: UUID
+
+
+@app.post("/v1/initialize")
+async def initialize(initialize_data: InitializeWithUUID) -> str:
+    user_id = initialize_data.user_id
+    if user_id not in clients:
+        return "Failure: id not found, ask the user to check it."
+
+    results: Optional[str] = None
+
+    def put_results(result: str) -> None:
+        nonlocal results
+        results = result
+
+    gpts[user_id] = put_results
+
+    await clients[user_id](
+        Mdata(data=initialize_data, user_id=user_id)
     )
 
     start_time = time.time()

{wcgw-1.2.2 → wcgw-1.3.0}/src/wcgw/types_.py

@@ -52,3 +52,7 @@ class ResetShell(BaseModel):
 class FileEdit(BaseModel):
     file_path: str
     file_edit_using_search_replace_blocks: str
+
+
+class Initialize(BaseModel):
+    type: Literal["Initialize"]