cua-computer 0.4.7__py3-none-any.whl → 0.4.8__py3-none-any.whl

computer/providers/docker/provider.py

@@ -36,7 +36,7 @@ class DockerProvider(BaseVMProvider):
     """
     
     def __init__(
-        self, 
+        self,
         port: Optional[int] = 8000,
         host: str = "localhost",
         storage: Optional[str] = None,
@@ -47,13 +47,16 @@ class DockerProvider(BaseVMProvider):
         vnc_port: Optional[int] = 6901,
     ):
         """Initialize the Docker VM Provider.
-        
+
         Args:
             port: Currently unused (VM provider port)
             host: Hostname for the API server (default: localhost)
             storage: Path for persistent VM storage
             shared_path: Path for shared folder between host and container
             image: Docker image to use (default: "trycua/cua-ubuntu:latest")
+                   Supported images:
+                   - "trycua/cua-ubuntu:latest" (Kasm-based)
+                   - "trycua/cua-docker-xfce:latest" (vanilla XFCE)
             verbose: Enable verbose logging
             ephemeral: Use ephemeral (temporary) storage
             vnc_port: Port for VNC interface (default: 6901)
@@ -62,19 +65,35 @@ class DockerProvider(BaseVMProvider):
         self.api_port = 8000
         self.vnc_port = vnc_port
         self.ephemeral = ephemeral
-        
+
         # Handle ephemeral storage (temporary directory)
         if ephemeral:
             self.storage = "ephemeral"
         else:
             self.storage = storage
-            
+
         self.shared_path = shared_path
         self.image = image
         self.verbose = verbose
         self._container_id = None
         self._running_containers = {}  # Track running containers by name
+
+        # Detect image type and configure user directory accordingly
+        self._detect_image_config()
         
+    def _detect_image_config(self):
+        """Detect image type and configure paths accordingly."""
+        # Detect if this is a docker-xfce image or Kasm image
+        if "docker-xfce" in self.image.lower() or "xfce" in self.image.lower():
+            self._home_dir = "/home/cua"
+            self._image_type = "docker-xfce"
+            logger.info(f"Detected docker-xfce image: using {self._home_dir}")
+        else:
+            # Default to Kasm configuration
+            self._home_dir = "/home/kasm-user"
+            self._image_type = "kasm"
+            logger.info(f"Detected Kasm image: using {self._home_dir}")
+
     @property
     def provider_type(self) -> VMProviderType:
         """Return the provider type."""
@@ -277,12 +296,13 @@ class DockerProvider(BaseVMProvider):
             # Add volume mounts if storage is specified
             storage_path = storage or self.storage
             if storage_path and storage_path != "ephemeral":
-                # Mount storage directory
-                cmd.extend(["-v", f"{storage_path}:/home/kasm-user/storage"])
-            
+                # Mount storage directory using detected home directory
+                cmd.extend(["-v", f"{storage_path}:{self._home_dir}/storage"])
+
             # Add shared path if specified
             if self.shared_path:
-                cmd.extend(["-v", f"{self.shared_path}:/home/kasm-user/shared"])
+                # Mount shared directory using detected home directory
+                cmd.extend(["-v", f"{self.shared_path}:{self._home_dir}/shared"])
             
             # Add environment variables
             cmd.extend(["-e", "VNC_PW=password"])  # Set VNC password

{cua_computer-0.4.7.dist-info → cua_computer-0.4.8.dist-info}/METADATA

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

{cua_computer-0.4.7.dist-info → cua_computer-0.4.8.dist-info}/RECORD

@@ -17,7 +17,7 @@ computer/providers/base.py,sha256=GB_TBuetNlp2vDkFYr3IUg5bQsHWHDv0g8BlSjsnFXQ,36
 computer/providers/cloud/__init__.py,sha256=SDAcfhI2BlmVBrBZOHxQd3i1bJZjMIfl7QgmqjXa4z8,144
 computer/providers/cloud/provider.py,sha256=XEdCrnZzRwvvkPHIwfhfJl3xB6W7tZKdBI0duKEXLw4,2930
 computer/providers/docker/__init__.py,sha256=Sv_78qeNyx1i7YySDHUL9trgkGv3eZXrf2BwqxFCUws,386
-computer/providers/docker/provider.py,sha256=_wgMhQVgxe0A984Chpb27Fu_deVy4tWuzyEmnyQ081A,20062
+computer/providers/docker/provider.py,sha256=YDk4uQAu2rtr_D8PtfyxKOpYzEWDd1LLHXlWT16AVv0,21020
 computer/providers/factory.py,sha256=8TmwktXpNBsIur8XdE4HC1B21pLARpAIABSRig_8vW4,6727
 computer/providers/lume/__init__.py,sha256=E6hTbVQF5lLZD8JyG4rTwUnCBO4q9K8UkYNQ31R0h7c,193
 computer/providers/lume/provider.py,sha256=grLZeXd4Y8iYsNq2gfNGcQq1bnTcNYNepEv-mxmROG4,20562
@@ -32,7 +32,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=_V6FI-g0GJGMEk-C2iPFtxPO1Gn0juCaeCrWsBtjC4E,70395
 computer/utils.py,sha256=zY50NXB7r51GNLQ6l7lhG_qv0_ufpQ8n0-SDhCei8m4,2838
-cua_computer-0.4.7.dist-info/METADATA,sha256=SWQCKzu495JnTmbXHCk_cvktFnYfP2touK6ZPSw7YmQ,3776
-cua_computer-0.4.7.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-cua_computer-0.4.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-cua_computer-0.4.7.dist-info/RECORD,,
+cua_computer-0.4.8.dist-info/METADATA,sha256=kGvzQGh2TSpsfoTj1DQSK6aNy96OqLaYnNaEADDquiQ,3776
+cua_computer-0.4.8.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+cua_computer-0.4.8.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+cua_computer-0.4.8.dist-info/RECORD,,