wcgw 2.8.10__py3-none-any.whl → 3.0.1rc1__py3-none-any.whl

wcgw/relay/client.py

@@ -0,0 +1,95 @@
+import importlib.metadata
+import os
+import time
+import traceback
+import uuid
+from typing import Optional
+
+import rich
+import typer
+import websockets
+from typer import Typer
+from websockets.sync.client import connect as syncconnect
+
+from ..client.bash_state.bash_state import BashState
+from ..client.tools import Context, curr_cost, default_enc, get_tool_output
+from ..types_ import Mdata
+
+
+def register_client(server_url: str, client_uuid: str = "") -> None:
+    global default_enc, curr_cost
+    # Generate a unique UUID for this client
+    if not client_uuid:
+        client_uuid = str(uuid.uuid4())
+
+    # Create the WebSocket connection and context
+    the_console = rich.console.Console(style="magenta", highlight=False, markup=False)
+    with BashState(
+        the_console, os.getcwd(), None, None, None, None, False, None
+    ) as bash_state:
+        context = Context(bash_state=bash_state, console=the_console)
+
+        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}")
+                while True:
+                    # Wait to receive data from the server
+                    message = websocket.recv()
+                    mdata = Mdata.model_validate_json(message)
+                    if isinstance(mdata.data, str):
+                        raise Exception(mdata)
+                    try:
+                        outputs, cost = get_tool_output(
+                            context,
+                            mdata.data,
+                            default_enc,
+                            0.0,
+                            lambda x, y: ("", 0),
+                            8000,
+                        )
+                        output = outputs[0]
+                        curr_cost += cost
+                        print(f"{curr_cost=}")
+                    except Exception as e:
+                        output = f"GOT EXCEPTION while calling tool. Error: {e}"
+                        context.console.print(traceback.format_exc())
+                    assert isinstance(output, str)
+                    websocket.send(output)
+
+        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)
+
+
+@run.command()
+def app(
+    server_url: str = "",
+    client_uuid: Optional[str] = None,
+    version: bool = typer.Option(False, "--version", "-v"),
+) -> None:
+    if version:
+        version_ = importlib.metadata.version("wcgw")
+        print(f"wcgw version: {version_}")
+        exit()
+    if not server_url:
+        server_url = os.environ.get("WCGW_RELAY_SERVER", "")
+        if not server_url:
+            print(
+                "Error: Please provide relay server url using --server_url or WCGW_RELAY_SERVER environment variable"
+            )
+            print(
+                "\tNOTE: you need to run a relay server first, author doesn't host a relay server anymore."
+            )
+            print("\thttps://github.com/rusiaaman/wcgw/blob/main/openai.md")
+            print("\tExample `--server-url=ws://localhost:8000/v1/register`")
+            raise typer.Exit(1)
+    register_client(server_url, client_uuid or "")

wcgw/relay/serve.py

@@ -15,13 +15,11 @@ from pydantic import BaseModel
 
 from ..types_ import (
     BashCommand,
-    BashInteraction,
     ContextSave,
     FileEdit,
-    FileEditFindReplace,
     Initialize,
     ReadFiles,
-    ResetShell,
+    ResetWcgw,
     WriteIfEmpty,
 )
 
@@ -29,10 +27,8 @@ from ..types_ import (
 class Mdata(BaseModel):
     data: (
         BashCommand
-        | BashInteraction
         | WriteIfEmpty
-        | ResetShell
-        | FileEditFindReplace
+        | ResetWcgw
         | FileEdit
         | ReadFiles
         | Initialize
@@ -164,13 +160,13 @@ async def file_edit_find_replace(
     raise fastapi.HTTPException(status_code=500, detail="Timeout error")
 
 
-class ResetShellWithUUID(ResetShell):
+class ResetWcgwWithUUID(ResetWcgw):
     user_id: UUID
 
 
-@app.post("/v1/reset_shell")
-async def reset_shell(reset_shell: ResetShellWithUUID) -> str:
-    user_id = reset_shell.user_id
+@app.post("/v1/reset_wcgw")
+async def reset_wcgw(reset_wcgw: ResetWcgwWithUUID) -> str:
+    user_id = reset_wcgw.user_id
     if user_id not in clients:
         return "Failure: id not found, ask the user to check it."
 
@@ -182,7 +178,7 @@ async def reset_shell(reset_shell: ResetShellWithUUID) -> str:
 
     gpts[user_id] = put_results
 
-    await clients[user_id](Mdata(data=reset_shell, user_id=user_id))
+    await clients[user_id](Mdata(data=reset_wcgw, user_id=user_id))
 
     start_time = time.time()
     while time.time() - start_time < 30:
@@ -193,8 +189,7 @@ async def reset_shell(reset_shell: ResetShellWithUUID) -> str:
     raise fastapi.HTTPException(status_code=500, detail="Timeout error")
 
 
-class CommandWithUUID(BaseModel):
-    command: str
+class CommandWithUUID(BashCommand):
     user_id: UUID
 
 
@@ -212,40 +207,11 @@ async def bash_command(command: CommandWithUUID) -> str:
 
     gpts[user_id] = put_results
 
-    await clients[user_id](
-        Mdata(data=BashCommand(command=command.command), 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 BashInteractionWithUUID(BashInteraction):
-    user_id: UUID
-
-
-@app.post("/v1/bash_interaction")
-async def bash_interaction(bash_interaction: BashInteractionWithUUID) -> str:
-    user_id = bash_interaction.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=bash_interaction,
+            data=BashCommand(
+                action=command.action, wait_for_seconds=command.wait_for_seconds
+            ),
             user_id=user_id,
         )
     )

wcgw/types_.py

@@ -1,6 +1,6 @@
 import os
 from enum import Enum
-from typing import Any, Literal, Optional, Sequence, Union
+from typing import Any, Literal, Optional, Protocol, Sequence, Union
 
 from pydantic import BaseModel as PydanticBaseModel
 
@@ -44,9 +44,9 @@ class Initialize(BaseModel):
 
     def model_post_init(self, __context: Any) -> None:
         if self.mode_name == "code_writer":
-            assert (
-                self.code_writer_config is not None
-            ), "code_writer_config can't be null when the mode is code_writer"
+            assert self.code_writer_config is not None, (
+                "code_writer_config can't be null when the mode is code_writer"
+            )
         return super().model_post_init(__context)
 
     @property
@@ -55,27 +55,40 @@ class Initialize(BaseModel):
             return "wcgw"
         if self.mode_name == "architect":
             return "architect"
-        assert (
-            self.code_writer_config is not None
-        ), "code_writer_config can't be null when the mode is code_writer"
+        assert self.code_writer_config is not None, (
+            "code_writer_config can't be null when the mode is code_writer"
+        )
         return self.code_writer_config
 
 
-class BashCommand(BaseModel):
+class Command(BaseModel):
     command: str
-    wait_for_seconds: Optional[int] = None
+
+
+class StatusCheck(BaseModel):
+    status_check: Literal[True]
+
+
+class SendText(BaseModel):
+    send_text: str
 
 
 Specials = Literal[
-    "Key-up", "Key-down", "Key-left", "Key-right", "Enter", "Ctrl-c", "Ctrl-d", "Ctrl-z"
+    "Enter", "Key-up", "Key-down", "Key-left", "Key-right", "Ctrl-c", "Ctrl-d", "Ctrl-z"
 ]
 
 
-class BashInteraction(BaseModel):
-    send_text: Optional[str] = None
-    send_specials: Optional[Sequence[Specials]] = None
-    send_ascii: Optional[Sequence[int]] = None
-    wait_for_seconds: Optional[int] = None
+class SendSpecials(BaseModel):
+    send_specials: Sequence[Specials]
+
+
+class SendAscii(BaseModel):
+    send_ascii: Sequence[int]
+
+
+class BashCommand(BaseModel):
+    action: Command | StatusCheck | SendText | SendSpecials | SendAscii
+    wait_for_seconds: Optional[float] = None
 
 
 class ReadImage(BaseModel):
@@ -91,14 +104,11 @@ class ReadFiles(BaseModel):
     file_paths: list[str]
 
 
-class FileEditFindReplace(BaseModel):
-    file_path: str
-    find_lines: str
-    replace_with_lines: str
-
-
-class ResetShell(BaseModel):
+class ResetWcgw(BaseModel):
     should_reset: Literal[True]
+    change_mode: Optional[Literal["wcgw", "architect", "code_writer"]]
+    code_writer_config: Optional[CodeWriterMode] = None
+    starting_directory: str
 
 
 class FileEdit(BaseModel):
@@ -106,47 +116,27 @@ class FileEdit(BaseModel):
     file_edit_using_search_replace_blocks: str
 
 
-class GetScreenInfo(BaseModel):
-    docker_image_id: str
-
-
-class ScreenShot(BaseModel):
-    take_after_delay_seconds: int
-
-
-class MouseMove(BaseModel):
-    x: int
-    y: int
-    do_left_click_on_move: bool
-
-
-class LeftClickDrag(BaseModel):
-    x: int
-    y: int
-
-
-class MouseButton(BaseModel):
-    button_type: Literal[
-        "left_click",
-        "right_click",
-        "middle_click",
-        "double_click",
-        "scroll_up",
-        "scroll_down",
-    ]
-
-
-class Mouse(BaseModel):
-    action: MouseButton | LeftClickDrag | MouseMove
-
-
-class Keyboard(BaseModel):
-    action: Literal["key", "type"]
-    text: str
-
-
 class ContextSave(BaseModel):
     id: str
     project_root_path: str
     description: str
     relevant_file_globs: list[str]
+
+
+class Console(Protocol):
+    def print(self, msg: str, *args: Any, **kwargs: Any) -> None: ...
+
+    def log(self, msg: str, *args: Any, **kwargs: Any) -> None: ...
+
+
+class Mdata(PydanticBaseModel):
+    data: (
+        BashCommand
+        | WriteIfEmpty
+        | ResetWcgw
+        | FileEdit
+        | str
+        | ReadFiles
+        | Initialize
+        | ContextSave
+    )

{wcgw-2.8.10.dist-info → wcgw-3.0.1rc1.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 2.8.10
+Version: 3.0.1rc1
 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-Python: >=3.11
 Requires-Dist: anthropic>=0.39.0
 Requires-Dist: fastapi>=0.115.0
 Requires-Dist: openai>=1.46.0
@@ -22,7 +22,6 @@ Requires-Dist: syntax-checker>=0.3.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
 Requires-Dist: uvicorn>=0.31.0
 Requires-Dist: websockets>=13.1
 Description-Content-Type: text/markdown

{wcgw-2.8.10.dist-info → wcgw-3.0.1rc1.dist-info}/RECORD

@@ -1,30 +1,33 @@
-wcgw/__init__.py,sha256=sQZHC74HPFyE9XqWZDCVmgdBXVK1xkHrMtMSLBZ5BOY,90
-wcgw/types_.py,sha256=D3518a2azSKeW3D-ACYWJwsaqo7Oj-8BRRR2IhCUtNU,3414
+wcgw/__init__.py,sha256=qUofQOAXCGcWr2u_B8U-MIMhhYaBUpUwNDcscvRmYfo,90
+wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wcgw/types_.py,sha256=_r4H9Kebu22nSxD8wvtGhAOGlJheshLBggI2IE9F7tY,3355
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/common.py,sha256=OCH7Tx64jojz3M3iONUrGMadE07W21DiZs5sOxWX1Qc,1456
-wcgw/client/computer_use.py,sha256=35NKAlMrxwD0TBlMMRnbCwz4g8TBRGOlcy-cmS-yJ_A,15247
 wcgw/client/diff-instructions.txt,sha256=tmJ9Fu9XdO_72lYXQQNY9RZyx91bjxrXJf9d_KBz57k,1611
 wcgw/client/memory.py,sha256=8LdYsOhvCOoC1kfvDr85kNy07WnhPMvE6B2FRM2w85Y,2902
-wcgw/client/modes.py,sha256=FkDJIgjKrlJEufLq3abWfqV25BdF2pH-HnoHafy9LrA,10484
-wcgw/client/sys_utils.py,sha256=GajPntKhaTUMn6EOmopENWZNR2G_BJyuVbuot0x6veI,1376
-wcgw/client/tools.py,sha256=c-LipooLb6XBF9l-qwJlzBLzznlqQQuCXRB9HSZJFT0,53450
+wcgw/client/modes.py,sha256=dBkiMNQevTFNkhplrDsDuSIyeU-wLmAIfAa9Dqowvk8,10387
+wcgw/client/tool_prompts.py,sha256=j82aYnlr1pcinsOYitSrlyYz4-9K3KcqnAfGqot21NQ,4158
+wcgw/client/tools.py,sha256=djXlF83gp07nFl-jmYaufrxiSVCI1aoEyGLs9RBgRRs,22622
+wcgw/client/bash_state/bash_state.py,sha256=IG2IdGhMEYyDsH7MUhu4pvlfWtIDAeXv4yuAs-CZ1GY,26184
+wcgw/client/encoder/__init__.py,sha256=Y-8f43I6gMssUCWpX5rLYiAFv3D-JPRs4uNEejPlke8,1514
 wcgw/client/file_ops/diff_edit.py,sha256=OlJCpPSE_3T41q9H0yDORm6trjm3w6zh1EkuPTxik2A,16832
 wcgw/client/file_ops/search_replace.py,sha256=Napa7IWaYPGMNdttunKyRDkb90elZE7r23B_o_htRxo,5585
-wcgw/client/mcp_server/Readme.md,sha256=I8N4dHkTUVGNQ63BQkBMBhCCBTgqGOSF_pUR6iOEiUk,2495
-wcgw/client/mcp_server/__init__.py,sha256=hyPPwO9cabAJsOMWhKyat9yl7OlSmIobaoAZKHu3DMc,381
-wcgw/client/mcp_server/server.py,sha256=zMVa2nR2hapQZAtR34POch3VLVEEnJ6SQ8iWYLDxJrU,13199
-wcgw/client/repo_ops/display_tree.py,sha256=5FD4hfMkM2cIZnXlu7WfJswJLthj0SkuHlkGH6dpWQU,4632
+wcgw/client/mcp_server/Readme.md,sha256=2Z88jj1mf9daYGW1CWaldcJ0moy8owDumhR2glBY3A8,109
+wcgw/client/mcp_server/__init__.py,sha256=mm7xhBIPwJpRT3u-Qsj4cKVMpVyucJoKRlbMP_gRRB0,343
+wcgw/client/mcp_server/server.py,sha256=3IEZqKNCiJl8J7Ibcksy4nlwW7yNtCnRK6RyE-jPuTo,5372
+wcgw/client/repo_ops/display_tree.py,sha256=E5q9mrGBb57NyvudSmRIG-fj4FUqupbzjmARpX8X0XY,4166
 wcgw/client/repo_ops/path_prob.py,sha256=SWf0CDn37rtlsYRQ51ufSxay-heaQoVIhr1alB9tZ4M,2144
 wcgw/client/repo_ops/paths_model.vocab,sha256=M1pXycYDQehMXtpp-qAgU7rtzeBbCOiJo4qcYFY0kqk,315087
 wcgw/client/repo_ops/paths_tokens.model,sha256=jiwwE4ae8ADKuTZISutXuM5Wfyc_FBmN5rxTjoNnCos,1569052
 wcgw/client/repo_ops/repo_context.py,sha256=5NqRxBY0K-SBFXJ0Ybt7llzYOBD8pRkTpruMMJHWxv4,4336
-wcgw/relay/serve.py,sha256=Z5EwtaCAtKFBSnUw4mPYw0sze3Coc4Fa8gObRRG_bT0,9525
+wcgw/relay/client.py,sha256=HU3gzVaYRRiCZedQTEtV-iN8JI--A_St2hTbeOYOFOw,3619
+wcgw/relay/serve.py,sha256=Ofq6PjW3zVVA2-9MVviGRiUESTD3sXb-482Q4RV13q8,8664
 wcgw/relay/static/privacy.txt,sha256=s9qBdbx2SexCpC_z33sg16TptmAwDEehMCLz4L50JLc,529
 wcgw_cli/__init__.py,sha256=TNxXsTPgb52OhakIda9wTRh91cqoBqgQRx5TxjzQQFU,21
 wcgw_cli/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
-wcgw_cli/anthropic_client.py,sha256=ZMFHD6g6h_PAReL8tubI8LnxVeRA3hcFLGNitjt9XhQ,24047
-wcgw_cli/cli.py,sha256=GEje9ZBIaD5_-HK3zxZCGYaeDF8bfFxImloOR3O66Fw,1019
-wcgw_cli/openai_client.py,sha256=wp4XDf3t3W6XG5LHgr6bFckePyty24BGtsOEjOrIrk0,17955
+wcgw_cli/anthropic_client.py,sha256=sRpu9L9yhYgk-XPkiUDPkxUqeB5jX28qBQPQ6o5YSaQ,18968
+wcgw_cli/cli.py,sha256=-7FBe_lahKyUOhf65iurTA1M1gXXXAiT0OVKQVcZKKo,948
+wcgw_cli/openai_client.py,sha256=sVIJ0VEe--TTV3M2uoWMMJVZltiXCXxJaQD6AF0OraM,15996
 wcgw_cli/openai_utils.py,sha256=xGOb3W5ALrIozV7oszfGYztpj0FnXdD7jAxm5lEIVKY,2439
 mcp_wcgw/__init__.py,sha256=fKCgOdN7cn7gR3YGFaGyV5Goe8A2sEyllLcsRkN0i-g,2601
 mcp_wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,8 +51,8 @@ mcp_wcgw/shared/memory.py,sha256=dBsOghxHz8-tycdSVo9kSujbsC8xb_tYsGmuJobuZnw,281
 mcp_wcgw/shared/progress.py,sha256=ymxOsb8XO5Mhlop7fRfdbmvPodANj7oq6O4dD0iUcnw,1048
 mcp_wcgw/shared/session.py,sha256=e44a0LQOW8gwdLs9_DE9oDsxqW2U8mXG3d5KT95bn5o,10393
 mcp_wcgw/shared/version.py,sha256=d2LZii-mgsPIxpshjkXnOTUmk98i0DT4ff8VpA_kAvE,111
-wcgw-2.8.10.dist-info/METADATA,sha256=-bjtkmro5UQVMBYYzxbakEIADO-VOpONetLtwxb1vX4,13054
-wcgw-2.8.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wcgw-2.8.10.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
-wcgw-2.8.10.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
-wcgw-2.8.10.dist-info/RECORD,,
+wcgw-3.0.1rc1.dist-info/METADATA,sha256=G7TKicqyb4Lo8_djHNi9Fm2PQ1w_DYBDY3BvrIazTvY,13005
+wcgw-3.0.1rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-3.0.1rc1.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
+wcgw-3.0.1rc1.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
+wcgw-3.0.1rc1.dist-info/RECORD,,