Merge pull request #59 from hyperbrowserai/fix-overwrite

fix file overwrite

Author: Dingway98

hyperbrowser/client/managers/async_manager/sandboxes/sandbox_files.py

@@ -18,6 +18,7 @@
     SandboxFileCopyParams,
     SandboxFileDeleteParams,
     SandboxFileInfo,
+    SandboxFileMoveParams,
     SandboxFileReadResult,
     SandboxFileSystemEvent,
     SandboxFileWriteEntry,
@@ -461,14 +462,24 @@ async def mkdir(
     ) -> bool:
         return await self.make_dir(path, parents=parents, mode=mode)
 
-    async def rename(self, old_path: str, new_path: str) -> SandboxFileInfo:
+    async def rename(
+        self,
+        old_path: str,
+        new_path: str,
+        *,
+        overwrite: Optional[bool] = None,
+    ) -> SandboxFileInfo:
+        payload = SandboxFileMoveParams(
+            source=old_path,
+            destination=new_path,
+            overwrite=overwrite,
+        ).model_dump(exclude_none=True)
+        payload["from"] = payload.pop("source")
+        payload["to"] = payload.pop("destination")
         payload = await self._transport.request_json(
             "/sandbox/files/move",
             method="POST",
-            json_body={
-                "from": old_path,
-                "to": new_path,
-            },
+            json_body=payload,
             headers={"content-type": "application/json"},
         )
         return _normalize_file_info(payload["entry"])
@@ -480,7 +491,7 @@ async def move(
         destination: str,
         overwrite: Optional[bool] = None,
     ) -> SandboxFileInfo:
-        return await self.rename(source, destination)
+        return await self.rename(source, destination, overwrite=overwrite)
 
     async def remove(self, path: str, *, recursive: Optional[bool] = None) -> None:
         await self._transport.request_json(

hyperbrowser/client/managers/sync_manager/sandboxes/sandbox_files.py

@@ -17,6 +17,7 @@
     SandboxFileCopyParams,
     SandboxFileDeleteParams,
     SandboxFileInfo,
+    SandboxFileMoveParams,
     SandboxFileReadResult,
     SandboxFileSystemEvent,
     SandboxFileWriteEntry,
@@ -442,14 +443,24 @@ def mkdir(
     ) -> bool:
         return self.make_dir(path, parents=parents, mode=mode)
 
-    def rename(self, old_path: str, new_path: str) -> SandboxFileInfo:
+    def rename(
+        self,
+        old_path: str,
+        new_path: str,
+        *,
+        overwrite: Optional[bool] = None,
+    ) -> SandboxFileInfo:
+        payload = SandboxFileMoveParams(
+            source=old_path,
+            destination=new_path,
+            overwrite=overwrite,
+        ).model_dump(exclude_none=True)
+        payload["from"] = payload.pop("source")
+        payload["to"] = payload.pop("destination")
         payload = self._transport.request_json(
             "/sandbox/files/move",
             method="POST",
-            json_body={
-                "from": old_path,
-                "to": new_path,
-            },
+            json_body=payload,
             headers={"content-type": "application/json"},
         )
         return _normalize_file_info(payload["entry"])
@@ -461,7 +472,7 @@ def move(
         destination: str,
         overwrite: Optional[bool] = None,
     ) -> SandboxFileInfo:
-        return self.rename(source, destination)
+        return self.rename(source, destination, overwrite=overwrite)
 
     def remove(self, path: str, *, recursive: Optional[bool] = None) -> None:
         self._transport.request_json(

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hyperbrowser"
-version = "0.85.0"
+version = "0.86.0"
 description = "Python SDK for hyperbrowser"
 authors = ["Nikhil Shahi <nshahi1998@gmail.com>"]
 license = "MIT"

tests/sandbox/e2e/test_async_files.py

@@ -327,6 +327,35 @@ async def test_async_sandbox_files_e2e():
         assert await sandbox.files.read_text(existing_target) == "existing target"
         assert (await sandbox.files.get_info(destination_link)).symlink_target is None
 
+        move_source = f"{base_dir}/move-overwrite/source.txt"
+        move_existing_target = f"{base_dir}/move-overwrite/existing-target.txt"
+        move_destination_link = f"{base_dir}/move-overwrite/destination-link.txt"
+        await sandbox.files.write_text(move_source, "move source payload")
+        await sandbox.files.write_text(move_existing_target, "move existing target")
+        result = await sandbox.exec(
+            _bash_exec(
+                f'mkdir -p "{base_dir}/move-overwrite" && ln -sfn "{move_existing_target}" "{move_destination_link}"'
+            )
+        )
+        assert result.exit_code == 0
+        await sandbox.files.move(
+            source=move_source,
+            destination=move_destination_link,
+            overwrite=True,
+        )
+        assert (
+            await sandbox.files.read_text(move_destination_link)
+            == "move source payload"
+        )
+        assert (
+            await sandbox.files.read_text(move_existing_target)
+            == "move existing target"
+        )
+        assert (
+            await sandbox.files.get_info(move_destination_link)
+        ).symlink_target is None
+        assert await sandbox.files.exists(move_source) is False
+
         chmod_path = f"{base_dir}/chmod/file.txt"
         await sandbox.files.write_text(chmod_path, "chmod me")
         await sandbox.files.chmod(path=chmod_path, mode="0640")

tests/sandbox/e2e/test_files.py

@@ -294,6 +294,27 @@ def test_sandbox_files_e2e():
         assert sandbox.files.read_text(existing_target) == "existing target"
         assert sandbox.files.get_info(destination_link).symlink_target is None
 
+        move_source = f"{base_dir}/move-overwrite/source.txt"
+        move_existing_target = f"{base_dir}/move-overwrite/existing-target.txt"
+        move_destination_link = f"{base_dir}/move-overwrite/destination-link.txt"
+        sandbox.files.write_text(move_source, "move source payload")
+        sandbox.files.write_text(move_existing_target, "move existing target")
+        result = sandbox.exec(
+            _bash_exec(
+                f'mkdir -p "{base_dir}/move-overwrite" && ln -sfn "{move_existing_target}" "{move_destination_link}"'
+            )
+        )
+        assert result.exit_code == 0
+        sandbox.files.move(
+            source=move_source,
+            destination=move_destination_link,
+            overwrite=True,
+        )
+        assert sandbox.files.read_text(move_destination_link) == "move source payload"
+        assert sandbox.files.read_text(move_existing_target) == "move existing target"
+        assert sandbox.files.get_info(move_destination_link).symlink_target is None
+        assert sandbox.files.exists(move_source) is False
+
         chmod_path = f"{base_dir}/chmod/file.txt"
         sandbox.files.write_text(chmod_path, "chmod me")
         sandbox.files.chmod(path=chmod_path, mode="0640")