code-sandboxes 1.9.32__tar.gz → 1.9.33__tar.gz

{code_sandboxes-1.9.32 → code_sandboxes-1.9.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: code_sandboxes
-Version: 1.9.32
+Version: 1.9.33
 Project-URL: Home, https://github.com/datalayer/code-sandboxes
 Author-email: Datalayer <info@datalayer.io>
 License: BSD 3-Clause License

{code_sandboxes-1.9.32 → code_sandboxes-1.9.33}/code_sandboxes/__version__.py

@@ -3,4 +3,4 @@
 
 """Code Sandboxes."""
 
-__version__ = "1.9.32"
+__version__ = "1.9.33"

{code_sandboxes-1.9.32 → code_sandboxes-1.9.33}/code_sandboxes/environments/adapters/daytona.py

@@ -82,6 +82,7 @@ requires of every GPU sandbox (`DaytonaSandbox` reads the snapshot's `gpu`).
 
 from __future__ import annotations
 
+import contextlib
 import shlex
 import tempfile
 import uuid
@@ -163,6 +164,11 @@ def daytona_gpu(accelerator_type: str) -> str | None:
     return name if name in DAYTONA_GPUS else None
 
 
+def _snapshot_name(request: BuildRequest) -> str:
+    """The name a build gives its snapshot, unique to the build (its uid is in it)."""
+    return f"dl-{request.environment.metadata.name}-v{request.version}-{request.build_uid}"
+
+
 def _pip_lock_command(*, authored: bool) -> str:
     """Install the pip lock: `sync` to it, or `install` it over an authored Dockerfile.
 
@@ -245,6 +251,9 @@ class Builder(ManagedBuilder):
         self._daytona_sdk = daytona_sdk or _daytona_sdk
         self._registry_sdk = registry_sdk or _daytona_registry_sdk
         self._client_instance: Any = None
+        #: The builds `cancel` was asked to stop: one whose snapshot is only
+        #: finished after the cancel deletes it itself (E2-18).
+        self._cancelled: set[str] = set()
 
     def _provider_secrets(self) -> dict[str, str]:
         """The owner's Daytona secrets the build credential carries (D-8, E2-01).
@@ -339,7 +348,7 @@ class Builder(ManagedBuilder):
         spec = request.environment.spec
         sdk = self._daytona_sdk()
         client = self._client(sdk)
-        name = f"dl-{request.environment.metadata.name}-v{request.version}-{request.build_uid}"
+        name = _snapshot_name(request)
 
         registry_id = self._register_base_pull(client, request.resolved_base)
         try:
@@ -469,6 +478,17 @@ class Builder(ManagedBuilder):
             # not control, whether the build above succeeded or not (D-18).
             self._unregister_base_pull(client, registry_id)
 
+        if request.build_uid in self._cancelled:
+            # Finished after the build was cancelled: nothing will record it,
+            # so it goes now rather than wait in the account for nobody.
+            self._log(f"The build was cancelled: deleting the snapshot {snapshot.id} it made")
+            with contextlib.suppress(EnvironmentsError):
+                self._delete_by_id(sdk, client, snapshot.id)
+            raise EnvironmentsError(
+                BUILD_FAILED,
+                "The build was cancelled, and the snapshot it made was deleted",
+                detail={"variant": self.variant, "name": name},
+            )
         return ArtifactReference(
             variant=self.variant,
             immutable_reference=snapshot.id,
@@ -635,8 +655,11 @@ class Builder(ManagedBuilder):
         a later build's snapshot that inherited it.
         """
         sdk = self._daytona_sdk()
-        client = self._client(sdk)
-        snapshot = artifact.provider_artifact_id or artifact.immutable_reference
+        self._delete_by_id(
+            sdk, self._client(sdk), artifact.provider_artifact_id or artifact.immutable_reference
+        )
+
+    def _delete_by_id(self, sdk: Any, client: Any, snapshot: str) -> None:
         try:
             client.snapshot.delete(snapshot)
         except sdk.DaytonaNotFoundError:
@@ -646,6 +669,26 @@ class Builder(ManagedBuilder):
             raise self._provider_error("delete the snapshot", error) from error
         self._log(f"Deleted the Daytona snapshot {snapshot}")
 
+    def cancel(self, request: BuildRequest) -> None:
+        """Stop a build: delete the snapshot it is making, now or once it is made (E2-18).
+
+        The build step calls this when the build is cancelled, and then lets
+        the build's own thread finish unheard, so a snapshot Daytona goes on
+        building is recorded by nobody. It is found by the name this build
+        gave it, which is unique to the build (the build uid is in it), and
+        deleted by its id. One not made yet is deleted by `build` itself, the
+        moment Daytona hands it back.
+        """
+        self._cancelled.add(request.build_uid)
+        sdk = self._daytona_sdk()
+        client = self._client(sdk)
+        try:
+            snapshot = client.snapshot.get(_snapshot_name(request))
+        except Exception:
+            return
+        self._log(f"The build was cancelled: deleting the snapshot {snapshot.id} it was making")
+        self._delete_by_id(sdk, client, snapshot.id)
+
     def smoke_test(
         self,
         artifact: ArtifactReference,

{code_sandboxes-1.9.32 → code_sandboxes-1.9.33}/tests/test_environment_daytona_builder.py

@@ -912,6 +912,50 @@ class TestReadingTheRegistry:
         assert len(daytona.daytona_calls) == 1
 
 
+class TestCancellingABuild:
+    """E2-18: the build step lets a cancelled build's thread finish unheard, so
+    a snapshot Daytona goes on building would be recorded by nobody. Found by
+    E2-14's drill on 2026-09-18: `dl-backfill-drill-v2-…` kept building after
+    its build was cancelled."""
+
+    NAME = "dl-geospatial-analysis-v3-bld-1"
+
+    def test_a_snapshot_being_made_is_deleted_by_id(self) -> None:
+        service = FakeSnapshotService(
+            get_results={
+                self.NAME: FakeSnapshot(id="snp-9", name=self.NAME),
+                "snp-9": FakeSnapshot(id="snp-9", name=self.NAME),
+            }
+        )
+        builder = a_builder(
+            daytona=FakeDaytonaModule(client=FakeDaytonaClient(snapshot_service=service))
+        )
+        builder.cancel(a_request())
+        assert [call.args for call in service.get_calls] == [(self.NAME,)]
+        assert [call.args for call in service.delete_calls] == [("snp-9",)]
+
+    def test_one_made_after_the_cancel_is_deleted_by_the_build(self) -> None:
+        """Not made yet when the cancel came: the build deletes it the moment
+        Daytona hands it back, and does not answer with it."""
+        made = FakeSnapshot(id="snp-late", name=self.NAME)
+        service = FakeSnapshotService(create_result=made, get_results={"snp-late": made})
+        builder = a_builder(
+            daytona=FakeDaytonaModule(client=FakeDaytonaClient(snapshot_service=service))
+        )
+        builder.cancel(a_request())
+        assert service.delete_calls == []
+        with pytest.raises(EnvironmentsError) as raised:
+            builder.build(a_request())
+        assert raised.value.code.code == BUILD_FAILED.code
+        assert "cancelled" in raised.value.message
+        assert [call.args for call in service.delete_calls] == [("snp-late",)]
+
+    def test_another_build_of_the_same_builder_is_not_touched(self) -> None:
+        builder = a_builder()
+        builder.cancel(a_request(build_uid="bld-other"))
+        assert builder.build(a_request()).provider_artifact_id
+
+
 class TestDeletingASnapshot:
     """E2-18: retention and a failed build both need a snapshot to go."""