axio-tools-docker 0.9.0__tar.gz → 0.9.1__tar.gz

{axio_tools_docker-0.9.0 → axio_tools_docker-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axio-tools-docker
-Version: 0.9.0
+Version: 0.9.1
 Summary: Docker sandbox tools for Axio
 Project-URL: Homepage, https://github.com/mosquito/axio-agent
 Project-URL: Repository, https://github.com/mosquito/axio-agent
@@ -115,9 +115,10 @@ The running container's ID is available as `sandbox.container_id` inside the
 
 ## Named containers and reuse
 
-Pass `name=` to give the container a fixed name. If a running container with
-that name already exists, the sandbox attaches to it instead of creating a new
-one, and never removes it on exit - regardless of `remove`:
+Pass `name=` to give the container a fixed name. If a container with that name
+already exists, the sandbox starts it if needed and attaches instead of creating
+a new one. Attached containers are never removed on exit - regardless of
+`remove`:
 
 ```python
 import asyncio

{axio_tools_docker-0.9.0 → axio_tools_docker-0.9.1}/README.md

@@ -101,9 +101,10 @@ The running container's ID is available as `sandbox.container_id` inside the
 
 ## Named containers and reuse
 
-Pass `name=` to give the container a fixed name. If a running container with
-that name already exists, the sandbox attaches to it instead of creating a new
-one, and never removes it on exit - regardless of `remove`:
+Pass `name=` to give the container a fixed name. If a container with that name
+already exists, the sandbox starts it if needed and attaches instead of creating
+a new one. Attached containers are never removed on exit - regardless of
+`remove`:
 
 ```python
 import asyncio

{axio_tools_docker-0.9.0 → axio_tools_docker-0.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "axio-tools-docker"
-version = "0.9.0"
+version = "0.9.1"
 description = "Docker sandbox tools for Axio"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -24,6 +24,7 @@ testpaths = ["tests", "README.md"]
 
 [tool.ruff]
 line-length = 119
+output-format = "concise"
 target-version = "py312"
 
 [tool.ruff.lint]
@@ -33,6 +34,10 @@ select = ["E", "F", "I", "UP"]
 strict = true
 python_version = "3.12"
 
+[[tool.mypy.overrides]]
+module = "aiodocker.*"
+follow_imports = "skip"
+
 [dependency-groups]
 dev = [
     "pytest>=8",
@@ -43,4 +48,3 @@ dev = [
     "markdown-pytest>=0.6.0",
     "aiodocker>=0.26",
 ]
-

{axio_tools_docker-0.9.0 → axio_tools_docker-0.9.1}/src/axio_tools_docker/sandbox.py

@@ -12,7 +12,7 @@ import stat as stat_module
 import tarfile
 import uuid
 from datetime import datetime
-from typing import Any
+from typing import Any, cast
 
 import aiodocker
 from axio.tool import CONTEXT, Tool
@@ -324,6 +324,9 @@ class DockerSandbox:
         if self.name:
             try:
                 self._container = await self._client.containers.get(self.name)
+                info = await self._container.show()
+                if not info.get("State", {}).get("Running", False):
+                    await self._container.start()
                 self._attached = True
                 logger.info("Attached to existing container (name=%s)", self.name)
             except aiodocker.exceptions.DockerError:
@@ -420,7 +423,7 @@ class DockerSandbox:
             if self.named_volumes and self.volumes_remove and not was_attached:
                 for vol_name in self.named_volumes.values():
                     with contextlib.suppress(Exception):
-                        vol = await self._client.volumes.get(vol_name)  # type: ignore[no-untyped-call]
+                        vol = await self._client.volumes.get(vol_name)
                         await vol.delete()
                 logger.info("Removed %d named volume(s)", len(self.named_volumes))
             await self._client.close()
@@ -439,7 +442,7 @@ class DockerSandbox:
         """Return the ID of the running container. Only valid inside `async with`."""
         if self._container is None:
             raise RuntimeError("DockerSandbox must be used as an async context manager")
-        return self._container.id
+        return str(self._container.id)
 
     async def _ensure_image(self) -> None:
         """Pull the image if it is not present locally."""
@@ -514,7 +517,7 @@ class DockerSandbox:
             tar.addfile(info, io.BytesIO(data))
         parent = os.path.dirname(path) or "/"
         await self.exec(f"mkdir -p {shlex.quote(parent)}")
-        await self._container.put_archive(  # type: ignore[no-untyped-call]
+        await self._container.put_archive(
             path=parent,
             data=buf.getvalue(),
         )
@@ -523,7 +526,7 @@ class DockerSandbox:
     async def get_archive(self, path: str) -> tarfile.TarFile:
         """Fetch a path from the container as a TarFile object."""
         assert self._container is not None
-        return await self._container.get_archive(path=path)
+        return cast(tarfile.TarFile, await self._container.get_archive(path=path))
 
     async def read_file_bytes(self, path: str) -> bytes:
         """Read a file from inside the container and return raw bytes."""

{axio_tools_docker-0.9.0 → axio_tools_docker-0.9.1}/tests/test_integration.py

@@ -360,7 +360,7 @@ async def test_named_volume_persists_across_containers(docker: str, image: str)
     finally:
         async with aiodocker.Docker(url=docker) as client:
             with contextlib.suppress(Exception):
-                vol = await client.volumes.get(vol_name)  # type: ignore[no-untyped-call]
+                vol = await client.volumes.get(vol_name)
                 await vol.delete()
 
 
@@ -378,4 +378,4 @@ async def test_volumes_remove_cleans_up(docker: str, image: str) -> None:
 
     async with aiodocker.Docker(url=docker) as client:
         with pytest.raises(aiodocker.exceptions.DockerError):
-            await client.volumes.get(vol_name)  # type: ignore[no-untyped-call]
+            await client.volumes.get(vol_name)

{axio_tools_docker-0.9.0 → axio_tools_docker-0.9.1}/tests/test_sandbox.py

@@ -63,6 +63,7 @@ def mock_docker_factory(
     mock_container.start = AsyncMock()
     mock_container.delete = AsyncMock()
     mock_container.exec = AsyncMock(return_value=mock_exec)
+    mock_container.show = AsyncMock(return_value={"State": {"Running": True}})
     mock_container.put_archive = AsyncMock()
     mock_container.get_archive = AsyncMock(
         return_value=archive_content if archive_content is not None else make_tar_file("file.txt", b"content")
@@ -166,6 +167,16 @@ async def test_named_existing_container_attaches() -> None:
     container.start.assert_not_awaited()
 
 
+async def test_named_existing_stopped_container_starts_before_attach() -> None:
+    cls, client, container = mock_docker_factory()
+    client.containers.get = AsyncMock(return_value=container)
+    container.show = AsyncMock(return_value={"State": {"Running": False}})
+    with patch("axio_tools_docker.sandbox.aiodocker.Docker", cls):
+        async with DockerSandbox(name="my-sandbox"):
+            pass
+    container.start.assert_awaited_once()
+
+
 async def test_named_existing_container_not_deleted() -> None:
     """Attached container is never removed even with remove=True."""
     cls, client, container = mock_docker_factory()