wcgw 1.1.0__tar.gz → 1.1.2__tar.gz

{wcgw-1.1.0 → wcgw-1.1.2}/PKG-INFO

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

{wcgw-1.1.0 → wcgw-1.1.2}/pyproject.toml

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

{wcgw-1.1.0 → wcgw-1.1.2}/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,
@@ -744,6 +745,7 @@ class Mdata(BaseModel):
         | ResetShell
         | FileEditFindReplace
         | FullFileEdit
+        | str
     )
 
 
@@ -754,20 +756,22 @@ 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()
                 mdata = Mdata.model_validate_json(message)
+                if isinstance(mdata.data, str):
+                    raise Exception(mdata)
                 try:
                     output, cost = get_tool_output(
                         mdata.data, default_enc, 0.0, lambda x, y: ("", 0), None
@@ -780,9 +784,10 @@ def register_client(server_url: str, client_uuid: str = "") -> None:
                 assert isinstance(output, str)
                 websocket.send(output)
 
-        except (websockets.ConnectionClosed, ConnectionError):
-            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)

{wcgw-1.1.0 → wcgw-1.1.2}/src/wcgw/relay/serve.py

@@ -35,6 +35,7 @@ class Mdata(BaseModel):
         | ResetShell
         | FileEditFindReplace
         | FullFileEdit
+        | str
     )
     user_id: UUID
 
@@ -48,7 +49,7 @@ gpts: dict[UUID, Callable[[str], None]] = {}
 images: DefaultDict[UUID, dict[str, dict[str, Any]]] = DefaultDict(dict)
 
 
-CLIENT_VERSION_MINIMUM = "1.0.0"
+CLIENT_VERSION_MINIMUM = "1.1.0"
 
 
 @app.websocket("/v1/register/{uuid}")
@@ -65,7 +66,10 @@ async def register_websocket(websocket: WebSocket, uuid: UUID) -> None:
     sem_version_server = semantic_version.Version.coerce(CLIENT_VERSION_MINIMUM)
     if sem_version_client < sem_version_server:
         await websocket.send_text(
-            f"Client version {client_version} is outdated. Please upgrade to {CLIENT_VERSION_MINIMUM} or higher."
+            Mdata(
+                user_id=uuid,
+                data=f"Client version {client_version} is outdated. Please upgrade to {CLIENT_VERSION_MINIMUM} or higher.",
+            ).model_dump_json()
         )
         await websocket.close(
             reason="Client version outdated. Please upgrade to the latest version.",