wcgw 1.1.1__tar.gz → 1.2.0__tar.gz

{wcgw-1.1.1 → wcgw-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcgw
-Version: 1.1.1
+Version: 1.2.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.1.1 → wcgw-1.2.0}/gpt_action_json_schema.json

@@ -6,7 +6,7 @@
   },
   "servers": [
     {
-      "url": "https://7d75-103-212-152-58.ngrok-free.app"
+      "url": "https://a0e8-125-99-67-222.ngrok-free.app"
     }
   ],
   "paths": {
@@ -59,7 +59,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/FullFileEditWithUUID"
+                "$ref": "#/components/schemas/FileEditWithUUID"
               }
             }
           },
@@ -209,6 +209,46 @@
           }
         }
       }
+    },
+    "/v1/read_file": {
+      "post": {
+        "x-openai-isConsequential": false,
+        "summary": "Read File Endpoint",
+        "operationId": "read_file_endpoint_v1_read_file_post",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ReadFileWithUUID"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Successful Response",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string",
+                  "title": "Response Read File Endpoint V1 Read File Post"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Validation Error",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/HTTPValidationError"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "components": {
@@ -319,15 +359,15 @@
         ],
         "title": "CreateFileNewWithUUID"
       },
-      "FullFileEditWithUUID": {
+      "FileEditWithUUID": {
         "properties": {
           "file_path": {
             "type": "string",
             "title": "File Path"
           },
-          "file_edit_using_searh_replace_blocks": {
+          "file_edit_using_search_replace_blocks": {
             "type": "string",
-            "title": "File Edit Using Searh Replace Blocks"
+            "title": "File Edit Using Search Replace Blocks"
           },
           "user_id": {
             "type": "string",
@@ -338,10 +378,10 @@
         "type": "object",
         "required": [
           "file_path",
-          "file_edit_using_searh_replace_blocks",
+          "file_edit_using_search_replace_blocks",
           "user_id"
         ],
-        "title": "FullFileEditWithUUID"
+        "title": "FileEditWithUUID"
       },
       "HTTPValidationError": {
         "properties": {
@@ -356,6 +396,34 @@
         "type": "object",
         "title": "HTTPValidationError"
       },
+      "ReadFileWithUUID": {
+        "properties": {
+          "file_path": {
+            "type": "string",
+            "title": "File Path"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "ReadFile"
+            ],
+            "const": "ReadFile",
+            "title": "Type"
+          },
+          "user_id": {
+            "type": "string",
+            "format": "uuid",
+            "title": "User Id"
+          }
+        },
+        "type": "object",
+        "required": [
+          "file_path",
+          "type",
+          "user_id"
+        ],
+        "title": "ReadFileWithUUID"
+      },
       "ResetShellWithUUID": {
         "properties": {
           "should_reset": {

{wcgw-1.1.1 → wcgw-1.2.0}/gpt_instructions.txt

@@ -1,14 +1,13 @@
-You're a cli assistant.
+You're an expert software engineer with shell and code knowledge.
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective. 
-    - Do not use sudo. Do not use interactive commands. 
-    - Ask user for confirmation before running anything major
+    - 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.
 
 
-To execute bash commands OR write files use the provided api.
-
 Instructions for `BashCommand`:
 - Execute a bash command. This is stateful (beware with subsequent calls).
 - Do not use interactive commands like nano. Prefer writing simpler commands.
@@ -16,11 +15,15 @@ Instructions for `BashCommand`:
 - 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.
 
+Instructions for `Read File`
+- Read full content of a file.
+- Provide absolute file path only.
+
 Instructions for `Create File New`
 - 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 FullFileEdit.
+- For editing existing files, use FileEdit.
 
 Instructions for `BashInteraction`
 - Interact with running program using this tool
@@ -31,42 +34,33 @@ Instructions for `BashInteraction`
 Instructions for `ResetShell`
 - Resets the shell. Use only if all interrupts and prompt reset attempts have failed repeatedly.
 
-Instructions for `FullFileEdit`:
+Instructions for `FileEdit`:
     - Use absolute file path only.
     - Use SEARCH/REPLACE blocks to edit the file.
         Only edit the files using the following SEARCH/REPLACE blocks.
-        ```
-        <<<<<<< SEARCH
-        =======
-        def hello():
-            "print a greeting"
-
-            print("hello")
-        >>>>>>> REPLACE
-
-        <<<<<<< SEARCH
-        def hello():
-            "print a greeting"
-
-            print("hello")
-        =======
-        from hello import hello
-        >>>>>>> REPLACE
-        ```
+```
+<<<<<<< SEARCH
+// Original code
+=======
+// New code
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+// Original code further down in the file
+=======
+// New code to replace
+>>>>>>> REPLACE
+```
 
         # *SEARCH/REPLACE block* Rules:
 
         Every *SEARCH/REPLACE block* must use this format:
-        1. The start of search block: <<<<<<< SEARCH
-        2. A contiguous chunk of lines to search for in the existing source code
+        1. The start of match block: <<<<<<< SEARCH
+        2. A contiguous chunk of lines to do exact match for in the existing source code
         3. The dividing line: =======
         4. The lines to replace into the source code
         5. The end of the replace block: >>>>>>> REPLACE
 
-        Use the *FULL* file path, as shown to you by the user.
-
-        Every *SEARCH* section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
-        If the file contains code or other data wrapped/escaped in json/xml/quotes or other containers, you need to propose edits to the literal contents of the file, including the container markup.
+        Every "<<<<<<< SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
 
         *SEARCH/REPLACE* blocks will *only* replace the first match occurrence.
         Including multiple unique *SEARCH/REPLACE* blocks if needed.
@@ -77,10 +71,11 @@ Instructions for `FullFileEdit`:
         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" and ">>>>>>> REPLACE". Recommended to add 3 lines on each side.
+
 ---
 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 critically think and debate with yourself to solve the problem. Understand the context and the code by reading as much resources as possible before writing a single piece of code.
-
+Always write production ready, syntactically correct code.
 ---
 Ask the user for the user_id `UUID` if they haven't provided in the first message.

{wcgw-1.1.1 → wcgw-1.2.0}/pyproject.toml

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

{wcgw-1.1.1 → wcgw-1.2.0}/src/wcgw/client/anthropic_client.py

@@ -26,7 +26,8 @@ from ..types_ import (
     BashInteraction,
     CreateFileNew,
     FileEditFindReplace,
-    FullFileEdit,
+    FileEdit,
+    ReadFile,
     ReadImage,
     Writefile,
     ResetShell,
@@ -175,6 +176,14 @@ def loop(
 - 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.
+""",
+        ),
+        ToolParam(
+            input_schema=ReadFile.model_json_schema(),
+            name="ReadFile",
+            description="""
+- Read full file content
+- Provide absolute file path only
 """,
         ),
         ToolParam(
@@ -184,7 +193,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 FullFileEdit.
+- For editing existing files, use FileEdit.
 """,
         ),
         ToolParam(
@@ -198,8 +207,8 @@ def loop(
             description="Resets the shell. Use only if all interrupts and prompt reset attempts have failed repeatedly.",
         ),
         ToolParam(
-            input_schema=FullFileEdit.model_json_schema(),
-            name="FullFileEdit",
+            input_schema=FileEdit.model_json_schema(),
+            name="FileEdit",
             description="""
 - Use absolute file path only.
 - Use SEARCH/REPLACE blocks to edit the file.
@@ -214,9 +223,9 @@ You're a cli assistant.
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective. 
-    - Do not use sudo. Do not use interactive commands. 
-    - Ask user for confirmation before running anything major
+    - 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.
     
 System information:
     - System: {uname_sysname}

{wcgw-1.1.1 → wcgw-1.2.0}/src/wcgw/client/diff-instructions.txt

@@ -2,14 +2,6 @@
 Instructions for 
 Only edit the files using the following SEARCH/REPLACE blocks.
 ```
-<<<<<<< SEARCH
-=======
-def hello():
-    "print a greeting"
-
-    print("hello")
->>>>>>> REPLACE
-
 <<<<<<< SEARCH
 def hello():
     "print a greeting"
@@ -23,16 +15,13 @@ from hello import hello
 # *SEARCH/REPLACE block* Rules:
 
 Every *SEARCH/REPLACE block* must use this format:
-1. The start of search block: <<<<<<< SEARCH
-2. A contiguous chunk of lines to search for in the existing source code
+1. The start of match block: <<<<<<< SEARCH
+2. A contiguous chunk of lines to do exact match for in the existing source code
 3. The dividing line: =======
 4. The lines to replace into the source code
 5. The end of the replace block: >>>>>>> REPLACE
 
-Use the *FULL* file path, as shown to you by the user.
-
-Every *SEARCH* section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
-If the file contains code or other data wrapped/escaped in json/xml/quotes or other containers, you need to propose edits to the literal contents of the file, including the container markup.
+Every "<<<<<<< SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
 
 *SEARCH/REPLACE* blocks will *only* replace the first match occurrence.
 Including multiple unique *SEARCH/REPLACE* blocks if needed.
@@ -41,4 +30,6 @@ Include enough lines in each SEARCH section to uniquely match each set of lines
 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.
+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-1.1.1 → wcgw-1.2.0}/src/wcgw/client/openai_client.py

@@ -24,8 +24,9 @@ from ..types_ import (
     BashCommand,
     BashInteraction,
     CreateFileNew,
-    FullFileEdit,
+    FileEdit,
     ReadImage,
+    ReadFile,
     Writefile,
     ResetShell,
 )
@@ -58,7 +59,6 @@ from dotenv import load_dotenv
 
 class Config(BaseModel):
     model: Models
-    secondary_model: Models
     cost_limit: float
     cost_file: dict[Models, CostData]
     cost_unit: str = "$"
@@ -146,10 +146,18 @@ def loop(
         waiting_for_assistant = history[-1]["role"] != "assistant"
 
     my_dir = os.path.dirname(__file__)
-    config_file = os.path.join(my_dir, "..", "..", "..", "config.toml")
-    with open(config_file) as f:
-        config_json = toml.load(f)
-        config = Config.model_validate(config_json)
+
+    config = Config(
+        model=cast(
+            Models, os.getenv("OPENAI_MODEL", "gpt-4o-2024-08-06").lower()),
+        cost_limit=0.1,
+        cost_unit="$",
+        cost_file={
+            "gpt-4o-2024-08-06": CostData(
+                cost_per_1m_input_tokens=5, cost_per_1m_output_tokens=15
+            ),
+        },
+    )
 
     if limit is not None:
         config.cost_limit = limit
@@ -178,6 +186,13 @@ def loop(
 - Special keys like arrows, interrupts, enter, etc.
 - Send text input to the running program.
 - Only one of send_text, send_specials, send_ascii should be provided.""",
+        ),
+        openai.pydantic_function_tool(
+            ReadFile,
+            description="""
+- Read full file content
+- Provide absolute file path only
+""",
         ),
         openai.pydantic_function_tool(
             CreateFileNew,
@@ -185,14 +200,14 @@ 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 FullFileEdit.""",
+- For editing existing files, use FileEdit.""",
         ),
         openai.pydantic_function_tool(
-            FullFileEdit,
+            FileEdit,
             description="""
 - Use absolute file path only.
 - Use ONLY SEARCH/REPLACE blocks to edit the file.
-- file_edit_using_searh_replace_blocks should start with <<<<<<< SEARCH
+- file_edit_using_search_replace_blocks should start with <<<<<<< SEARCH
 """,
         ),
         openai.pydantic_function_tool(
@@ -211,9 +226,9 @@ You're a cli assistant.
 
 Instructions:
 
-    - You should use the provided bash execution tool to run script to complete objective. 
-    - Do not use sudo. Do not use interactive commands. 
-    - Ask user for confirmation before running anything major
+    - 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.
     
 System information:
     - System: {uname_sysname}

{wcgw-1.1.1 → wcgw-1.2.0}/src/wcgw/client/tools.py

@@ -9,6 +9,7 @@ import re
 import sys
 import threading
 import importlib.metadata
+import time
 import traceback
 from typing import (
     Callable,
@@ -47,19 +48,17 @@ from openai.types.chat import (
 from nltk.metrics.distance import edit_distance
 
 from ..types_ import (
+    BashCommand,
+    BashInteraction,
     CreateFileNew,
     FileEditFindReplace,
-    FullFileEdit,
+    FileEdit,
+    ReadFile,
+    ReadImage,
     ResetShell,
     Writefile,
 )
 
-from ..types_ import BashCommand
-
-from ..types_ import BashInteraction
-
-from ..types_ import ReadImage
-
 from .common import CostData, Models, discard_input
 
 from .openai_utils import get_input_cost, get_output_cost
@@ -319,7 +318,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 = (
@@ -346,7 +345,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()
@@ -426,7 +425,7 @@ def read_image_from_shell(file_path: str) -> ImageData:
 
 def write_file(writefile: Writefile | CreateFileNew, error_on_exist: bool) -> str:
     if not os.path.isabs(writefile.file_path):
-        return "Failure: file_path should be absolute path"
+        return f"Failure: file_path should be absolute path, current working directory is {CWD}"
     else:
         path_ = writefile.file_path
 
@@ -465,12 +464,14 @@ 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
-            min_edit_distance_lines = orig_content_lines[i : i + len(find_lines)]
+            min_edit_distance_lines = orig_content_lines[i: i + len(
+                find_lines)]
     return "\n".join(min_edit_distance_lines), min_edit_distance
 
 
@@ -494,11 +495,12 @@ def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
     return content
 
 
-def do_diff_edit(fedit: FullFileEdit) -> str:
+def do_diff_edit(fedit: FileEdit) -> str:
     console.log(f"Editing file: {fedit.file_path}")
 
     if not os.path.isabs(fedit.file_path):
-        raise Exception("Failure: file_path should be absolute path")
+        raise Exception(
+            f"Failure: file_path should be absolute path, current working directory is {CWD}")
     else:
         path_ = fedit.file_path
 
@@ -508,9 +510,10 @@ def do_diff_edit(fedit: FullFileEdit) -> str:
     with open(path_) as f:
         apply_diff_to = f.read()
 
-    lines = fedit.file_edit_using_searh_replace_blocks.split("\n")
+    lines = fedit.file_edit_using_search_replace_blocks.split("\n")
     n_lines = len(lines)
     i = 0
+    replacement_count = 0
     while i < n_lines:
         if re.match(r"^<<<<<<+\s*SEARCH\s*$", lines[i]):
             search_block = []
@@ -534,10 +537,17 @@ def do_diff_edit(fedit: FullFileEdit) -> str:
             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
 
+    if replacement_count == 0:
+        raise Exception(
+            "Error: no valid search-replace blocks found, please check your syntax for FileEdit"
+        )
+
     with open(path_, "w") as f:
         f.write(apply_diff_to)
 
@@ -546,7 +556,8 @@ def do_diff_edit(fedit: FullFileEdit) -> str:
 
 def file_edit(fedit: FileEditFindReplace) -> str:
     if not os.path.isabs(fedit.file_path):
-        raise Exception("Failure: file_path should be absolute path")
+        raise Exception(
+            f"Failure: file_path should be absolute path, current working directory is {CWD}")
     else:
         path_ = fedit.file_path
 
@@ -556,14 +567,17 @@ 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)
@@ -603,10 +617,11 @@ TOOLS = (
     | Writefile
     | CreateFileNew
     | FileEditFindReplace
-    | FullFileEdit
+    | FileEdit
     | AIAssistant
     | DoneFlag
     | ReadImage
+    | ReadFile
 )
 
 
@@ -630,14 +645,16 @@ def which_tool_name(name: str) -> Type[TOOLS]:
         return CreateFileNew
     elif name == "FileEditFindReplace":
         return FileEditFindReplace
-    elif name == "FullFileEdit":
-        return FullFileEdit
+    elif name == "FileEdit":
+        return FileEdit
     elif name == "AIAssistant":
         return AIAssistant
     elif name == "DoneFlag":
         return DoneFlag
     elif name == "ReadImage":
         return ReadImage
+    elif name == "ReadFile":
+        return ReadFile
     else:
         raise ValueError(f"Unknown tool name: {name}")
 
@@ -651,10 +668,11 @@ def get_tool_output(
     | Writefile
     | CreateFileNew
     | FileEditFindReplace
-    | FullFileEdit
+    | FileEdit
     | AIAssistant
     | DoneFlag
-    | ReadImage,
+    | ReadImage
+    | ReadFile,
     enc: tiktoken.Encoding,
     limit: float,
     loop_call: Callable[[str, float], tuple[str, float]],
@@ -669,10 +687,11 @@ def get_tool_output(
             | Writefile
             | CreateFileNew
             | FileEditFindReplace
-            | FullFileEdit
+            | FileEdit
             | AIAssistant
             | DoneFlag
             | ReadImage
+            | ReadFile
         ](
             Confirmation
             | BashCommand
@@ -681,10 +700,11 @@ def get_tool_output(
             | Writefile
             | CreateFileNew
             | FileEditFindReplace
-            | FullFileEdit
+            | FileEdit
             | AIAssistant
             | DoneFlag
             | ReadImage
+            | ReadFile
         )
         arg = adapter.validate_python(args)
     else:
@@ -705,7 +725,7 @@ def get_tool_output(
     elif isinstance(arg, FileEditFindReplace):
         console.print("Calling file edit tool")
         output = file_edit(arg), 0.0
-    elif isinstance(arg, FullFileEdit):
+    elif isinstance(arg, FileEdit):
         console.print("Calling full file edit tool")
         output = do_diff_edit(arg), 0.0
     elif isinstance(arg, DoneFlag):
@@ -717,6 +737,9 @@ def get_tool_output(
     elif isinstance(arg, ReadImage):
         console.print("Calling read image tool")
         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
     elif isinstance(arg, ResetShell):
         console.print("Calling reset shell tool")
         output = reset_shell(), 0.0
@@ -731,7 +754,8 @@ 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
 
 
@@ -743,8 +767,9 @@ class Mdata(BaseModel):
         | CreateFileNew
         | ResetShell
         | FileEditFindReplace
-        | FullFileEdit
+        | FileEdit
         | str
+        | ReadFile
     )
 
 
@@ -755,16 +780,16 @@ def register_client(server_url: str, client_uuid: str = "") -> None:
         client_uuid = str(uuid.uuid4())
 
     # Create the WebSocket connection
-    with syncconnect(f"{server_url}/{client_uuid}") as websocket:
-        server_version = str(websocket.recv())
-        print(f"Server version: {server_version}")
-        client_version = importlib.metadata.version("wcgw")
-        websocket.send(client_version)
-
-        print(
-            f"Connected. Share this user id with the chatbot: {client_uuid} \nLink: https://chatgpt.com/g/g-Us0AAXkRh-wcgw-giving-shell-access"
-        )
-        try:
+    try:
+        with syncconnect(f"{server_url}/{client_uuid}") as websocket:
+            server_version = str(websocket.recv())
+            print(f"Server version: {server_version}")
+            client_version = importlib.metadata.version("wcgw")
+            websocket.send(client_version)
+
+            print(
+                f"Connected. Share this user id with the chatbot: {client_uuid} \nLink: https://chatgpt.com/g/g-Us0AAXkRh-wcgw-giving-shell-access"
+            )
             while True:
                 # Wait to receive data from the server
                 message = websocket.recv()
@@ -773,7 +798,8 @@ 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), None
                     )
                     curr_cost += cost
                     print(f"{curr_cost=}")
@@ -783,9 +809,10 @@ def register_client(server_url: str, client_uuid: str = "") -> None:
                 assert isinstance(output, str)
                 websocket.send(output)
 
-        except (websockets.ConnectionClosed, ConnectionError, OSError):
-            print(f"Connection closed for UUID: {client_uuid}, retrying")
-            register_client(server_url, client_uuid)
+    except (websockets.ConnectionClosed, ConnectionError, OSError):
+        print(f"Connection closed for UUID: {client_uuid}, retrying")
+        time.sleep(0.5)
+        register_client(server_url, client_uuid)
 
 
 run = Typer(pretty_exceptions_show_locals=False, no_args_is_help=True)
@@ -803,3 +830,19 @@ def app(
         exit()
 
     register_client(server_url, client_uuid or "")
+
+
+def read_file(readfile: ReadFile) -> str:
+
+    console.print(f"Reading file: {readfile.file_path}")
+
+    if not os.path.isabs(readfile.file_path):
+        return f"Failure: file_path should be absolute path, current working directory is {CWD}"
+
+    path = Path(readfile.file_path)
+    if not path.exists():
+        return f"Error: file {readfile.file_path} does not exist"
+
+    with path.open("r") as f:
+        content = f.read()
+    return content

{wcgw-1.1.1 → wcgw-1.2.0}/src/wcgw/relay/serve.py

@@ -19,7 +19,8 @@ from ..types_ import (
     BashInteraction,
     CreateFileNew,
     FileEditFindReplace,
-    FullFileEdit,
+    FileEdit,
+    ReadFile,
     ResetShell,
     Writefile,
     Specials,
@@ -34,7 +35,8 @@ class Mdata(BaseModel):
         | CreateFileNew
         | ResetShell
         | FileEditFindReplace
-        | FullFileEdit
+        | FileEdit
+        | ReadFile
         | str
     )
     user_id: UUID
@@ -49,7 +51,7 @@ gpts: dict[UUID, Callable[[str], None]] = {}
 images: DefaultDict[UUID, dict[str, dict[str, Any]]] = DefaultDict(dict)
 
 
-CLIENT_VERSION_MINIMUM = "1.1.0"
+CLIENT_VERSION_MINIMUM = "1.2.0"
 
 
 @app.websocket("/v1/register/{uuid}")
@@ -63,12 +65,14 @@ async def register_websocket(websocket: WebSocket, uuid: UUID) -> None:
     # receive client version
     client_version = await websocket.receive_text()
     sem_version_client = semantic_version.Version.coerce(client_version)
-    sem_version_server = semantic_version.Version.coerce(CLIENT_VERSION_MINIMUM)
+    sem_version_server = semantic_version.Version.coerce(
+        CLIENT_VERSION_MINIMUM)
     if sem_version_client < sem_version_server:
         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(
@@ -88,7 +92,8 @@ async def register_websocket(websocket: WebSocket, uuid: UUID) -> None:
         while True:
             received_data = await websocket.receive_text()
             if uuid not in gpts:
-                raise fastapi.HTTPException(status_code=400, detail="No call made")
+                raise fastapi.HTTPException(
+                    status_code=400, detail="No call made")
             gpts[uuid](received_data)
     except WebSocketDisconnect:
         # Remove the client if the WebSocket is disconnected
@@ -126,13 +131,13 @@ async def create_file(write_file_data: CreateFileNewWithUUID) -> str:
     raise fastapi.HTTPException(status_code=500, detail="Timeout error")
 
 
-class FullFileEditWithUUID(FullFileEdit):
+class FileEditWithUUID(FileEdit):
     user_id: UUID
 
 
 @app.post("/v1/full_file_edit")
 async def file_edit_find_replace(
-    file_edit_find_replace: FullFileEditWithUUID,
+    file_edit_find_replace: FileEditWithUUID,
 ) -> str:
     user_id = file_edit_find_replace.user_id
     if user_id not in clients:
@@ -257,6 +262,39 @@ async def bash_interaction(bash_interaction: BashInteractionWithUUID) -> str:
     raise fastapi.HTTPException(status_code=500, detail="Timeout error")
 
 
+class ReadFileWithUUID(ReadFile):
+    user_id: UUID
+
+
+@app.post("/v1/read_file")
+async def read_file_endpoint(read_file_data: ReadFileWithUUID) -> str:
+    user_id = read_file_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=ReadFile(file_path=read_file_data.file_path,
+                            type=read_file_data.type
+                            ), 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")
+
+
 app.mount("/static", StaticFiles(directory="static"), name="static")
 
 

{wcgw-1.1.1 → wcgw-1.2.0}/src/wcgw/types_.py

@@ -1,3 +1,4 @@
+import re
 from typing import Literal, Optional, Sequence
 from pydantic import BaseModel
 
@@ -35,7 +36,7 @@ class BashInteraction(BaseModel):
 
 class ReadImage(BaseModel):
     file_path: str
-    type: Literal["ReadImage"] = "ReadImage"
+    type: Literal["ReadImage"]
 
 
 class Writefile(BaseModel):
@@ -48,6 +49,11 @@ class CreateFileNew(BaseModel):
     file_content: str
 
 
+class ReadFile(BaseModel):
+    file_path: str  # The path to the file to read
+    type: Literal["ReadFile"]
+
+
 class FileEditFindReplace(BaseModel):
     file_path: str
     find_lines: str
@@ -58,6 +64,13 @@ class ResetShell(BaseModel):
     should_reset: Literal[True] = True
 
 
-class FullFileEdit(BaseModel):
+class FileEdit(BaseModel):
     file_path: str
-    file_edit_using_searh_replace_blocks: 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.1.1 → wcgw-1.2.0}/uv.lock

@@ -948,7 +948,7 @@ wheels = [
 
 [[package]]
 name = "wcgw"
-version = "1.1.0"
+version = "1.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },

wcgw-1.1.1/config.toml

@@ -1,11 +0,0 @@
-model = "gpt-4o-2024-08-06"
-secondary_model = 'gpt-4o-2024-08-06'
-cost_limit = 0.1
-
-[cost_file.gpt-4o-2024-08-06]
-cost_per_1m_input_tokens = 5
-cost_per_1m_output_tokens = 15
-
-[cost_file.gpt-4o-mini]
-cost_per_1m_input_tokens = 0.15
-cost_per_1m_output_tokens = 0.6