wcgw 2.4.3__tar.gz → 2.5.0__tar.gz

wcgw-2.5.0/LICENSE

@@ -0,0 +1,243 @@
+The majority of this software is licensed under the MIT License.
+Portions of this software include code licensed under the Apache License, Version 2.0.
+
+--------------------------------------------------------------------------------
+MIT License (Primary License)
+--------------------------------------------------------------------------------
+
+Copyright (c) 2024 arusia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--------------------------------------------------------------------------------
+Third Party Components
+--------------------------------------------------------------------------------
+
+This project includes components from the following third-party projects:
+
+1. The file at src/wcgw/client/diff-instructions.txt is substantially modified from Aider
+   Source: https://github.com/Aider-AI/aider
+   Original Copyright (c) 2023 Aider-AI
+   Licensed under the Apache License, Version 2.0
+   Modified version Copyright (c) 2024 arusia
+
+The full text of the Apache License 2.0 follows:
+
+--------------------------------------------------------------------------------
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

{wcgw-2.4.3 → wcgw-2.5.0}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 2.4.3
+Version: 2.5.0
 Summary: Shell and coding agent on claude and chatgpt
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>
+License-File: LICENSE
 Requires-Python: <3.13,>=3.11
 Requires-Dist: anthropic>=0.39.0
 Requires-Dist: fastapi>=0.115.0
-Requires-Dist: humanize>=4.11.0
 Requires-Dist: openai>=1.46.0
 Requires-Dist: petname>=2.6
 Requires-Dist: pexpect>=4.9.0
@@ -18,7 +18,7 @@ Requires-Dist: rich>=13.8.1
 Requires-Dist: semantic-version>=2.10.0
 Requires-Dist: shell>=1.0.1
 Requires-Dist: syntax-checker==0.2.10
-Requires-Dist: tiktoken==0.7.0
+Requires-Dist: tokenizers>=0.21.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: typer>=0.12.5
 Requires-Dist: types-pexpect>=4.9.0.20240806

{wcgw-2.4.3 → wcgw-2.5.0}/gpt_action_json_schema.json

@@ -6,7 +6,7 @@
   },
   "servers": [
     {
-      "url": "https://a0e8-125-99-67-222.ngrok-free.app"
+      "url": "https://04df-103-212-152-58.ngrok-free.app"
     }
   ],
   "paths": {
@@ -297,9 +297,6 @@
         "properties": {
           "type": {
             "type": "string",
-            "enum": [
-              "BashInteraction"
-            ],
             "const": "BashInteraction",
             "title": "Type"
           },
@@ -352,6 +349,17 @@
             ],
             "title": "Send Ascii"
           },
+          "wait_for_seconds": {
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Wait For Seconds"
+          },
           "user_id": {
             "type": "string",
             "format": "uuid",
@@ -384,30 +392,6 @@
         ],
         "title": "CommandWithUUID"
       },
-      "WriteIfEmptyWithUUID": {
-        "properties": {
-          "file_path": {
-            "type": "string",
-            "title": "File Path"
-          },
-          "file_content": {
-            "type": "string",
-            "title": "File Content"
-          },
-          "user_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "User Id"
-          }
-        },
-        "type": "object",
-        "required": [
-          "file_path",
-          "file_content",
-          "user_id"
-        ],
-        "title": "WriteIfEmptyWithUUID"
-      },
       "FileEditWithUUID": {
         "properties": {
           "file_path": {
@@ -449,9 +433,6 @@
         "properties": {
           "type": {
             "type": "string",
-            "enum": [
-              "Initialize"
-            ],
             "const": "Initialize",
             "title": "Type"
           },
@@ -470,16 +451,16 @@
       },
       "ReadFileWithUUID": {
         "properties": {
-          "file_path": {
-            "type": "string",
-            "title": "File Path"
+          "file_paths": {
+            "items": {
+              "type": "string"
+            },
+            "type": "array",
+            "title": "File Paths"
           },
           "type": {
             "type": "string",
-            "enum": [
-              "ReadFile"
-            ],
-            "const": "ReadFile",
+            "const": "ReadFiles",
             "title": "Type"
           },
           "user_id": {
@@ -490,7 +471,7 @@
         },
         "type": "object",
         "required": [
-          "file_path",
+          "file_paths",
           "type",
           "user_id"
         ],
@@ -500,9 +481,6 @@
         "properties": {
           "should_reset": {
             "type": "boolean",
-            "enum": [
-              true
-            ],
             "const": true,
             "title": "Should Reset"
           },
@@ -551,6 +529,30 @@
           "type"
         ],
         "title": "ValidationError"
+      },
+      "WriteIfEmptyWithUUID": {
+        "properties": {
+          "file_path": {
+            "type": "string",
+            "title": "File Path"
+          },
+          "file_content": {
+            "type": "string",
+            "title": "File Content"
+          },
+          "user_id": {
+            "type": "string",
+            "format": "uuid",
+            "title": "User Id"
+          }
+        },
+        "type": "object",
+        "required": [
+          "file_path",
+          "file_content",
+          "user_id"
+        ],
+        "title": "WriteIfEmptyWithUUID"
       }
     }
   }

{wcgw-2.4.3 → wcgw-2.5.0}/gpt_instructions.txt

@@ -20,10 +20,9 @@ Instructions for `BashCommand`:
 - 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.
 - Run long running commands in background using screen instead of "&".
 
-Instructions for `Read File`
-- Read full content of a file.
-- Provide absolute file path only.
-- Use this instead of 'cat' from BashCommand
+Instructions for `Read Files`
+- Read full file content of one or more files.
+- Provide absolute file paths only
 
 Instructions for `Write if Empty`
 - Write content to an empty or non-existent file. Provide file path and content. Use this instead of BashCommand for writing new files.

{wcgw-2.4.3 → wcgw-2.5.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "2.4.3"
+version = "2.5.0"
 description = "Shell and coding agent on claude and chatgpt"
 readme = "README.md"
 requires-python = ">=3.11, <3.13"
@@ -10,7 +10,6 @@ dependencies = [
     "typer>=0.12.5",
     "rich>=13.8.1",
     "python-dotenv>=1.0.1",
-    "tiktoken==0.7.0",
     "pexpect>=4.9.0",
     "shell>=1.0.1",
     "types-pexpect>=4.9.0.20240806",
@@ -23,8 +22,8 @@ dependencies = [
     "pydantic>=2.9.2",
     "semantic-version>=2.10.0",
     "anthropic>=0.39.0",
-    "humanize>=4.11.0",
     "syntax-checker==0.2.10",
+    "tokenizers>=0.21.0",
 ]
 
 [project.urls]

{wcgw-2.4.3 → wcgw-2.5.0}/src/wcgw/client/anthropic_client.py

@@ -29,7 +29,7 @@ from ..types_ import (
     FileEdit,
     Keyboard,
     Mouse,
-    ReadFile,
+    ReadFiles,
     ReadImage,
     ResetShell,
     ScreenShot,
@@ -41,12 +41,7 @@ from .common import CostData
 from .tools import ImageData
 from .computer_use import Computer
 
-from .tools import (
-    DoneFlag,
-    get_tool_output,
-    which_tool_name,
-)
-import tiktoken
+from .tools import DoneFlag, get_tool_output, which_tool_name, default_enc
 
 from urllib import parse
 import subprocess
@@ -156,10 +151,6 @@ def loop(
 
     limit = 1
 
-    enc = tiktoken.encoding_for_model(
-        "gpt-4o-2024-08-06",
-    )
-
     tools = [
         ToolParam(
             input_schema=BashCommand.model_json_schema(),
@@ -192,12 +183,11 @@ def loop(
 """,
         ),
         ToolParam(
-            input_schema=ReadFile.model_json_schema(),
-            name="ReadFile",
+            input_schema=ReadFiles.model_json_schema(),
+            name="ReadFiles",
             description="""
-- Read full file content
-- Provide absolute file path only
-- Use this instead of 'cat' from BashCommand
+- Read full file content of one or more files.
+- Provide absolute file paths only
 """,
         ),
         ToolParam(
@@ -451,7 +441,7 @@ System information:
                             try:
                                 output_or_dones, _ = get_tool_output(
                                     tool_parsed,
-                                    enc,
+                                    default_enc,
                                     limit - cost,
                                     loop,
                                     max_tokens=8000,

{wcgw-2.4.3 → wcgw-2.5.0}/src/wcgw/client/common.py

@@ -38,7 +38,9 @@ def discard_input() -> None:
             while True:
                 # Check if there is input to be read
                 if sys.stdin in select.select([sys.stdin], [], [], 0)[0]:
-                    sys.stdin.read(1)  # Read one character at a time to flush the input buffer
+                    sys.stdin.read(
+                        1
+                    )  # Read one character at a time to flush the input buffer
                 else:
                     break
         finally:

{wcgw-2.4.3 → wcgw-2.5.0}/src/wcgw/client/mcp_server/server.py

@@ -21,7 +21,7 @@ from ...types_ import (
     FileEdit,
     Keyboard,
     Mouse,
-    ReadFile,
+    ReadFiles,
     ReadImage,
     ResetShell,
     Initialize,
@@ -76,7 +76,7 @@ async def handle_list_tools() -> list[types.Tool]:
             inputSchema=Initialize.model_json_schema(),
             name="Initialize",
             description="""
-- Always call this at the start of the conversation before anything else.
+- Always call this at the start of the conversation before using any of the shell tools from wcgw.
 """,
         ),
         ToolParam(
@@ -92,6 +92,7 @@ async def handle_list_tools() -> list[types.Tool]:
 - The control will return to you in {SLEEP_TIME_MAX_S} seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 - Run long running commands in background using screen instead of "&".
 - Use longer wait_for_seconds if the command is expected to run for a long time.
+- Do not use 'cat' to read files, use ReadFiles tool instead.
 """,
         ),
         ToolParam(
@@ -110,12 +111,11 @@ async def handle_list_tools() -> list[types.Tool]:
 """,
         ),
         ToolParam(
-            inputSchema=ReadFile.model_json_schema(),
-            name="ReadFile",
+            inputSchema=ReadFiles.model_json_schema(),
+            name="ReadFiles",
             description="""
-- Read full file content
-- Provide absolute file path only
-- Use this instead of 'cat' from BashCommand
+- Read full file content of one or more files.
+- Provide absolute file paths only
 """,
         ),
         ToolParam(

{wcgw-2.4.3 → wcgw-2.5.0}/src/wcgw/client/openai_client.py

@@ -17,6 +17,7 @@ from openai.types.chat import (
 )
 import rich
 import petname  # type: ignore[import-untyped]
+import tokenizers  # type: ignore[import-untyped]
 from typer import Typer
 import uuid
 
@@ -26,7 +27,7 @@ from ..types_ import (
     WriteIfEmpty,
     FileEdit,
     ReadImage,
-    ReadFile,
+    ReadFiles,
     ResetShell,
 )
 
@@ -40,7 +41,6 @@ from .tools import (
     get_tool_output,
     which_tool,
 )
-import tiktoken
 
 from urllib import parse
 import subprocess
@@ -160,9 +160,7 @@ def loop(
         config.cost_limit = limit
     limit = config.cost_limit
 
-    enc = tiktoken.encoding_for_model(
-        config.model if not config.model.startswith("o1") else "gpt-4o"
-    )
+    enc = tokenizers.Tokenizer.from_pretrained("Xenova/gpt-4o")
 
     tools = [
         openai.pydantic_function_tool(
@@ -188,11 +186,10 @@ def loop(
 - Only one of send_text, send_specials, send_ascii should be provided.""",
         ),
         openai.pydantic_function_tool(
-            ReadFile,
+            ReadFiles,
             description="""
-- Read full file content
-- Provide absolute file path only
-- Use this instead of 'cat' from BashCommand
+- Read full file content of one or more files.
+- Provide absolute file paths only
 """,
         ),
         openai.pydantic_function_tool(

{wcgw-2.4.3 → wcgw-2.5.0}/src/wcgw/client/openai_utils.py

@@ -15,7 +15,7 @@ from openai.types.chat import (
     ParsedChatCompletionMessage,
 )
 import rich
-import tiktoken
+from tokenizers import Tokenizer  # type: ignore[import-untyped]
 from typer import Typer
 import uuid
 
@@ -23,7 +23,7 @@ from .common import CostData, History
 
 
 def get_input_cost(
-    cost_map: CostData, enc: tiktoken.Encoding, history: History
+    cost_map: CostData, enc: Tokenizer, history: History
 ) -> tuple[float, int]:
     input_tokens = 0
     for msg in history:
@@ -31,8 +31,8 @@ def get_input_cost(
         refusal = msg.get("refusal")
         if isinstance(content, list):
             for part in content:
-                if 'text' in part:
-                    input_tokens += len(enc.encode(part['text']))
+                if "text" in part:
+                    input_tokens += len(enc.encode(part["text"]))
         elif content is None:
             if refusal is None:
                 raise ValueError("Expected content or refusal to be present")
@@ -47,7 +47,7 @@ def get_input_cost(
 
 def get_output_cost(
     cost_map: CostData,
-    enc: tiktoken.Encoding,
+    enc: Tokenizer,
     item: ChatCompletionMessage | ChatCompletionMessageParam,
 ) -> tuple[float, int]:
     if isinstance(item, ChatCompletionMessage):