cua-computer 0.3.6__py3-none-any.whl → 0.3.7__py3-none-any.whl

computer/interface/generic.py

@@ -28,7 +28,7 @@ class GenericComputerInterface(BaseComputerInterface):
         self._max_reconnect_delay = 30  # Maximum delay between reconnection attempts
         self._log_connection_attempts = True  # Flag to control connection attempt logging
         self._authenticated = False  # Track authentication status
-        self._command_lock = asyncio.Lock()  # Lock to ensure only one command at a time
+        self._recv_lock = asyncio.Lock()  # Lock to ensure only one recv at a time
 
         # Set logger name for the interface
         self.logger = Logger(logger_name, LogLevel.NORMAL)
@@ -245,7 +245,7 @@ class GenericComputerInterface(BaseComputerInterface):
         """
         result = await self._send_command("screenshot")
         if not result.get("image_data"):
-            raise RuntimeError("Failed to take screenshot")
+            raise RuntimeError("Failed to take screenshot, no image data received from server")
 
         screenshot = decode_base64_image(result["image_data"])
 
@@ -578,7 +578,8 @@ class GenericComputerInterface(BaseComputerInterface):
                             await self._ws.send(json.dumps(auth_message))
                             
                             # Wait for authentication response
-                            auth_response = await asyncio.wait_for(self._ws.recv(), timeout=10)
+                            async with self._recv_lock:
+                                auth_response = await asyncio.wait_for(self._ws.recv(), timeout=10)
                             auth_result = json.loads(auth_response)
                             
                             if not auth_result.get("success"):
@@ -696,38 +697,38 @@ class GenericComputerInterface(BaseComputerInterface):
         last_error = None
 
         # Acquire lock to ensure only one command is processed at a time
-        async with self._command_lock:
-            self.logger.debug(f"Acquired lock for command: {command}")
-            while retry_count < max_retries:
-                try:
-                    await self._ensure_connection()
-                    if not self._ws:
-                        raise ConnectionError("WebSocket connection is not established")
+        self.logger.debug(f"Acquired lock for command: {command}")
+        while retry_count < max_retries:
+            try:
+                await self._ensure_connection()
+                if not self._ws:
+                    raise ConnectionError("WebSocket connection is not established")
 
-                    message = {"command": command, "params": params or {}}
-                    await self._ws.send(json.dumps(message))
+                message = {"command": command, "params": params or {}}
+                await self._ws.send(json.dumps(message))
+                async with self._recv_lock:
                     response = await asyncio.wait_for(self._ws.recv(), timeout=120)
-                    self.logger.debug(f"Completed command: {command}")
-                    return json.loads(response)
-                except Exception as e:
-                    last_error = e
-                    retry_count += 1
-                    if retry_count < max_retries:
-                        # Only log at debug level for intermediate retries
-                        self.logger.debug(
-                            f"Command '{command}' failed (attempt {retry_count}/{max_retries}): {e}"
-                        )
-                        await asyncio.sleep(1)
-                        continue
-                    else:
-                        # Only log at error level for the final failure
-                        self.logger.error(
-                            f"Failed to send command '{command}' after {max_retries} retries"
-                        )
-                        self.logger.debug(f"Command failure details: {e}")
-                        raise
+                self.logger.debug(f"Completed command: {command}")
+                return json.loads(response)
+            except Exception as e:
+                last_error = e
+                retry_count += 1
+                if retry_count < max_retries:
+                    # Only log at debug level for intermediate retries
+                    self.logger.debug(
+                        f"Command '{command}' failed (attempt {retry_count}/{max_retries}): {e}"
+                    )
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    # Only log at error level for the final failure
+                    self.logger.error(
+                        f"Failed to send command '{command}' after {max_retries} retries"
+                    )
+                    self.logger.debug(f"Command failure details: {e}")
+                    raise
 
-            raise last_error if last_error else RuntimeError("Failed to send command")
+        raise last_error if last_error else RuntimeError("Failed to send command")
 
     async def _send_command_rest(self, command: str, params: Optional[Dict] = None) -> Dict[str, Any]:
         """Send command through REST API without retries or connection management."""

{cua_computer-0.3.6.dist-info → cua_computer-0.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cua-computer
-Version: 0.3.6
+Version: 0.3.7
 Summary: Computer-Use Interface (CUI) framework powering Cua
 Author-Email: TryCua <gh@trycua.com>
 Requires-Python: >=3.11

{cua_computer-0.3.6.dist-info → cua_computer-0.3.7.dist-info}/RECORD

@@ -5,7 +5,7 @@ computer/helpers.py,sha256=iHkO2WhuCLc15g67kfMnpQWxfNRlz2YeJNEvYaL9jlM,1826
 computer/interface/__init__.py,sha256=xQvYjq5PMn9ZJOmRR5mWtONTl_0HVd8ACvW6AQnzDdw,262
 computer/interface/base.py,sha256=1beR4T0z5anb9NaNgKJrMJTF0BFIKyiHlokMLesOV5Q,15131
 computer/interface/factory.py,sha256=Eas5u9sOZ8FegwX51dP9M37oZBjy2EiVcmhTPc98L3Y,1639
-computer/interface/generic.py,sha256=gSy-99kq3dhOuNfKDLEKpWpRHTLQgSX3VXpvPKlJTYY,43058
+computer/interface/generic.py,sha256=XV6TmAyUK075JteCDt1FM57nTSbvrJEZId2BvTLZthI,43041
 computer/interface/linux.py,sha256=fDm2OwqfeeO72HwctboPEE5AwPTo2XBRDyYkwQxMyt0,417
 computer/interface/macos.py,sha256=m1aRn3BCbA95gPoO-WSP9NPwruT4BT5DZzxY10UuBI0,675
 computer/interface/models.py,sha256=kPpmoO-TSxSr95f5ELuTpobY-SckG1Sn9pE8zz1t008,3605
@@ -31,7 +31,7 @@ computer/ui/__main__.py,sha256=Jwy2oC_mGZLN0fX7WLqpjaQkbXMeM3ISrUc8WSRUG0c,284
 computer/ui/gradio/__init__.py,sha256=5_KimixM48-X74FCsLw7LbSt39MQfUMEL8-M9amK3Cw,117
 computer/ui/gradio/app.py,sha256=5_AG2dQR9RtFrGQNonScAw64rlswclKW26tYlFBdXtM,70396
 computer/utils.py,sha256=zY50NXB7r51GNLQ6l7lhG_qv0_ufpQ8n0-SDhCei8m4,2838
-cua_computer-0.3.6.dist-info/METADATA,sha256=GEXmO2WaZ-QIiekgu4AD7NLWaIdVhiv8v3B-duoJoGI,5802
-cua_computer-0.3.6.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-cua_computer-0.3.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-cua_computer-0.3.6.dist-info/RECORD,,
+cua_computer-0.3.7.dist-info/METADATA,sha256=rQMBHkhy4HsHzWgZ_1kH81IHmtvERSH3690tWrLgX_0,5802
+cua_computer-0.3.7.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+cua_computer-0.3.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+cua_computer-0.3.7.dist-info/RECORD,,