fix(core): kill sandbox timeout and set id to none

Author: gusye1234

src/server/core/acontext_core/schema/orm/sandbox_log.py

@@ -26,7 +26,9 @@ class SandboxLog(CommonMixin):
             )
         }
     )
-    backend_sandbox_id: str = field(metadata={"db": Column(String, nullable=False)})
+    backend_sandbox_id: str | None = field(
+        metadata={"db": Column(String, nullable=True)}
+    )
     backend_type: str = field(metadata={"db": Column(String, nullable=False)})
 
     history_commands: dict = field(metadata={"db": Column(JSONB, nullable=False)})

src/server/core/acontext_core/service/data/sandbox.py

@@ -51,7 +51,7 @@ async def _get_backend_sandbox_id(
     result = await db_session.execute(stmt)
     backend_id = result.scalar_one_or_none()
     if backend_id is None:
-        return Result.reject(f"Sandbox {sandbox_id} not found")
+        return Result.reject(f"Sandbox {sandbox_id} not found or was killed.")
     return Result.resolve(backend_id)
 
 
@@ -124,7 +124,18 @@ async def kill_sandbox(db_session: AsyncSession, sandbox_id: asUUID) -> Result[b
         backend = SANDBOX_CLIENT.use_backend()
         success = await backend.kill_sandbox(backend_sandbox_id)
 
+        # Set backend_sandbox_id to None to indicate the sandbox is killed
+        stmt = (
+            update(SandboxLog)
+            .where(SandboxLog.id == sandbox_id)
+            .values(backend_sandbox_id=None)
+        )
+        await db_session.execute(stmt)
+
         LOG.info(f"Killed sandbox {sandbox_id} (backend: {backend_sandbox_id})")
+        await _update_will_total_alive_seconds(
+            db_session, sandbox_id, reset_alive_seconds=0
+        )
         return Result.resolve(success)
     except ValueError as e:
         return Result.reject(f"Sandbox backend not available: {e}")
@@ -295,9 +306,7 @@ async def download_file(
         if success:
             # Append to generated_files using PostgreSQL JSONB || operator
             # Use COALESCE to handle NULL values
-            new_entry = [
-                {"sandbox_path": from_sandbox_file, "s3_path": download_to_s3_key}
-            ]
+            new_entry = [{"sandbox_path": from_sandbox_file}]
             stmt = (
                 update(SandboxLog)
                 .where(SandboxLog.id == sandbox_id)

src/server/core/tests/service/test_sandbox.py

@@ -296,9 +296,7 @@ async def test_download_file_logs_to_generated_files(self, mock_sandbox_backend)
             files = sandbox_log.data.generated_files
             assert len(files) == 2
             assert files[0]["sandbox_path"] == "/app/output.txt"
-            assert files[0]["s3_path"] == "project/outputs/output.txt"
             assert files[1]["sandbox_path"] == "/app/report.pdf"
-            assert files[1]["s3_path"] == "project/reports/report.pdf"
 
             # Clean up
             await session.delete(project)
@@ -362,5 +360,11 @@ async def test_kill_sandbox_success(self, mock_sandbox_backend):
             assert kill_result.ok()
             assert kill_result.data is True
 
+            # Verify backend_sandbox_id is set to None after kill
+            await session.commit()
+            sandbox_log = await session.get(SandboxLog, unified_id)
+            assert sandbox_log is not None
+            assert sandbox_log.backend_sandbox_id is None
+
             # Clean up
             await session.delete(project)