openhands-workspace 1.8.1__py3-none-any.whl → 1.9.0__py3-none-any.whl

openhands/workspace/apptainer/workspace.py

@@ -102,25 +102,25 @@ class ApptainerWorkspace(RemoteWorkspace):
             "Set to False if fakeroot is not supported in your environment."
         ),
     )
-    disable_mount_hostfs: bool = Field(
-        default=True,
-        description=(
-            "Whether to over-ride the `mount hostfs = yes` setting in apptainer.conf"
-            "Set to False if you want to disable --no-mount hostfs"
-        ),
-    )
-    disable_mount_bind_path: bool = Field(
+
+    enable_docker_compat: bool = Field(
         default=True,
         description=(
-            "Whether to ignore the custom bind path entries in apptainer.conf"
-            "Set to False if you want to disable --no-mount bind-paths"
+            "Whether to use --compat for maximum Docker compatibility. "
+            "Check this URL for documentation: "
+            "https://apptainer.org/docs/user/main/docker_and_oci.html#docker-like-compat-flag"
+            " Set to False if you want custom Apptainer behavior."
         ),
     )
-    enable_containall: bool = Field(
-        default=True,
+
+    disable_mount_locations: list[str] = Field(
+        default=["hostfs", "bind-paths"],
         description=(
-            "Whether to use --containall for maximum container isolation."
-            "Set to False if you do not want to start the apptainer with --containall"
+            "List of locations to disable mounting for. "
+            "Helpful for disabling system-level mounts/binds from apptainer.conf. "
+            "Check this URL for documentation: "
+            "https://apptainer.org/docs/user/main/bind_paths_and_mounts.html. "
+            "Specify locations to disable mounts for custom Apptainer behavior."
         ),
     )
 
@@ -252,23 +252,19 @@ class ApptainerWorkspace(RemoteWorkspace):
             )
 
         # Build container options
-        container_opts: list[str] = [
-            "--writable-tmpfs",
-            "--cleanenv",  # Prevent host environment leakage
-            "--no-home",  # Don't mount host home directory
-            "--no-mount",
-            "tmp",  # Don't bind host /tmp (avoids tmux socket conflicts)
-        ]
+        container_opts: list[str] = []
 
         # Add fakeroot for consistent file ownership (user appears as root)
         if self.use_fakeroot:
             container_opts.append("--fakeroot")
-        if self.disable_mount_hostfs:
-            container_opts += ["--no-mount", "hostfs"]  # Disable hostfs mount
-        if self.disable_mount_bind_path:
-            container_opts += ["--no-mount", "bind-paths"]  # Disable custom bind paths
-        if self.enable_containall:
-            container_opts.append("--containall")  # Maximum isolation
+        if self.enable_docker_compat:
+            container_opts.append("--compat")
+        if self.disable_mount_locations:
+            for loc in self.disable_mount_locations:
+                container_opts += [
+                    "--no-mount",
+                    loc,
+                ]  # Disable specified mount locations
 
         # Run the agent server using apptainer run to respect the image's entrypoint
         # This works with both 'source' and 'binary' build targets

openhands/workspace/docker/workspace.py

@@ -13,6 +13,7 @@ from pydantic import Field, PrivateAttr, model_validator
 
 from openhands.sdk.logger import get_logger
 from openhands.sdk.utils.command import execute_command
+from openhands.sdk.utils.deprecation import warn_deprecated
 from openhands.sdk.workspace import PlatformType, RemoteWorkspace
 
 
@@ -79,7 +80,7 @@ class DockerWorkspace(RemoteWorkspace):
 
     # Docker-specific configuration
     server_image: str | None = Field(
-        default=None,
+        default="ghcr.io/openhands/agent-server:latest-python",
         description="Pre-built agent server image to use.",
     )
     host_port: int | None = Field(
@@ -94,6 +95,10 @@ class DockerWorkspace(RemoteWorkspace):
         default=None,
         description="Optional host directory to mount into the container.",
     )
+    volumes: list[str] = Field(
+        default_factory=list,
+        description="Additional volume mounts for the Docker container.",
+    )
     detach_logs: bool = Field(
         default=True, description="Whether to stream Docker logs in background."
     )
@@ -125,6 +130,18 @@ class DockerWorkspace(RemoteWorkspace):
             raise ValueError("server_image must be provided")
         return self
 
+    @model_validator(mode="after")
+    def _validate_mount_dir(self):
+        if self.mount_dir:
+            warn_deprecated(
+                "DockerWorkspace.mount_dir",
+                deprecated_in="1.10.0",
+                removed_in=None,
+                details="Use DockerWorkspace.volumes instead",
+            )
+            self.volumes.append(f"{self.mount_dir}:/workspace")
+        return self
+
     def model_post_init(self, context: Any) -> None:
         """Set up the Docker container and initialize the remote workspace."""
         # Subclasses should call get_image() to get the image to use
@@ -192,12 +209,9 @@ class DockerWorkspace(RemoteWorkspace):
             if key in os.environ:
                 flags += ["-e", f"{key}={os.environ[key]}"]
 
-        if self.mount_dir:
-            mount_path = "/workspace"
-            flags += ["-v", f"{self.mount_dir}:{mount_path}"]
-            logger.info(
-                f"Mounting host dir {self.mount_dir} to container path {mount_path}"
-            )
+        for volume in self.volumes:
+            flags += ["-v", volume]
+            logger.info(f"Adding volume mount: {volume}")
 
         ports = ["-p", f"{self.host_port}:8000"]
         if self.extra_ports:

openhands/workspace/remote_api/workspace.py

@@ -64,6 +64,11 @@ class APIRemoteWorkspace(RemoteWorkspace):
     init_timeout: float = Field(
         default=300.0, description="Runtime init timeout (seconds)"
     )
+    startup_wait_timeout: float = Field(
+        default=300.0,
+        description="Max seconds to wait for runtime to become ready",
+        gt=0,
+    )
     api_timeout: float = Field(
         default=60.0, description="API request timeout (seconds)"
     )
@@ -275,14 +280,20 @@ class APIRemoteWorkspace(RemoteWorkspace):
         if not self._runtime_id or not self._runtime_url:
             raise ValueError(f"Invalid runtime response: {data}")
 
-    @tenacity.retry(
-        stop=tenacity.stop_after_delay(300),
-        wait=tenacity.wait_exponential(multiplier=1, min=2, max=10),
-        retry=tenacity.retry_if_exception_type(RuntimeError),
-        reraise=True,
-    )
     def _wait_until_runtime_alive(self) -> None:
         """Wait until the runtime becomes alive and responsive."""
+        retryer = tenacity.Retrying(
+            stop=tenacity.stop_after_delay(self.startup_wait_timeout),
+            wait=tenacity.wait_exponential(multiplier=1, min=2, max=10),
+            retry=tenacity.retry_if_exception_type(RuntimeError),
+            reraise=True,
+        )
+        for attempt in retryer:
+            with attempt:
+                self._wait_until_runtime_alive_once()
+
+    def _wait_until_runtime_alive_once(self) -> None:
+        """Single attempt to check runtime readiness."""
         logger.info("Waiting for runtime to become alive...")
 
         resp = self._send_api_request(

openhands_workspace-1.9.0.dist-info/METADATA

@@ -0,0 +1,12 @@
+Metadata-Version: 2.4
+Name: openhands-workspace
+Version: 1.9.0
+Summary: OpenHands Workspace - Docker and container-based workspace implementations
+Project-URL: Source, https://github.com/OpenHands/software-agent-sdk
+Project-URL: Homepage, https://github.com/OpenHands/software-agent-sdk
+Project-URL: Documentation, https://docs.openhands.dev/sdk
+Project-URL: Bug Tracker, https://github.com/OpenHands/software-agent-sdk/issues
+Requires-Python: >=3.12
+Requires-Dist: openhands-sdk
+Requires-Dist: openhands-agent-server
+Requires-Dist: pydantic>=2.11.7

{openhands_workspace-1.8.1.dist-info → openhands_workspace-1.9.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 openhands/workspace/__init__.py,sha256=zH8byAoOm-gyoBCi3H33c-qKk9KvTa2KxEMDbfOZogg,887
 openhands/workspace/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openhands/workspace/apptainer/__init__.py,sha256=jYRsgL9z3m2wwj7ztWsFCDz44TYk9dtoD34QNzYpvUw,120
-openhands/workspace/apptainer/workspace.py,sha256=iF96fqUrrSdYkApR4b4VZEAqqkhJwTDk34eC3SXaGbg,14170
+openhands/workspace/apptainer/workspace.py,sha256=QI2mI29VIB8KykTrfy-gtNSID5pwpXUoEcbOUArYU0M,13981
 openhands/workspace/cloud/__init__.py,sha256=Ck8mDOf1YF4M1vn-vNkqxqGaEgB1qsQ7lLT9lTaS6gM,136
 openhands/workspace/cloud/workspace.py,sha256=1_9pMiTn1SjcwDSaPxY_g6Z7uGt1c1ASO4_2CWx_tTc,12891
 openhands/workspace/docker/__init__.py,sha256=vhMjEqbG5NmwL2UINxtAZj_y5lKlaLlqUNz2f3owJVQ,539
 openhands/workspace/docker/dev_workspace.py,sha256=5HZFXhtP9UZRST76E705TmYtVJcYbJIyq38GQFxiefE,3993
-openhands/workspace/docker/workspace.py,sha256=ZXxmVzRTa0pmZ_FZYQIFIZcSFoEOfjx5lWGoXjm8m9M,13931
+openhands/workspace/docker/workspace.py,sha256=2j14G3lOYNvm0Jc7agUUi9Nvr80ee_WYfXlfYjVsP98,14460
 openhands/workspace/remote_api/__init__.py,sha256=RxDLFcveTGG-uLm-PInfxFnYwYPdehRmLf1r0_KTaP4,122
-openhands/workspace/remote_api/workspace.py,sha256=0ph92TJHS819VQuItLOyydvxeC3tC53f1CPP0AlqaBg,15194
-openhands_workspace-1.8.1.dist-info/METADATA,sha256=4xkZFzZFpk_qGxl02wMENauk_gyedhSNZdIDKzUqDxM,270
-openhands_workspace-1.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-openhands_workspace-1.8.1.dist-info/top_level.txt,sha256=jHgVu9I0Blam8BXFgedoGKfglPF8XvW1TsJFIjcgP4E,10
-openhands_workspace-1.8.1.dist-info/RECORD,,
+openhands/workspace/remote_api/workspace.py,sha256=178lzpm_8p3lJCWpNUNrswHTf9jdJ4AeNeeiC7o2k_s,15631
+openhands_workspace-1.9.0.dist-info/METADATA,sha256=ovrSeBXs3OF8O-pDLl1m9IXqEtbPO59LOMH9C-HNgfI,550
+openhands_workspace-1.9.0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+openhands_workspace-1.9.0.dist-info/top_level.txt,sha256=jHgVu9I0Blam8BXFgedoGKfglPF8XvW1TsJFIjcgP4E,10
+openhands_workspace-1.9.0.dist-info/RECORD,,

{openhands_workspace-1.8.1.dist-info → openhands_workspace-1.9.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

openhands_workspace-1.8.1.dist-info/METADATA

@@ -1,8 +0,0 @@
-Metadata-Version: 2.4
-Name: openhands-workspace
-Version: 1.8.1
-Summary: OpenHands Workspace - Docker and container-based workspace implementations
-Requires-Python: >=3.12
-Requires-Dist: openhands-sdk
-Requires-Dist: openhands-agent-server
-Requires-Dist: pydantic>=2.11.7