Use fspath-derived paths in upload normalization errors

Co-authored-by: Shri Sukhani <shrisukhani@users.noreply.github.com>

Author: cursoragent

hyperbrowser/client/managers/async_manager/session.py

@@ -164,11 +164,7 @@ async def get_downloads_url(self, id: str) -> GetSessionDownloadsUrlResponse:
     async def upload_file(
         self, id: str, file_input: Union[str, PathLike[str], IO]
     ) -> UploadFileResponse:
-        file_path, file_obj = normalize_upload_file_input(
-            file_input,
-            missing_file_message=f"Upload file not found at path: {file_input}",
-            not_file_message=f"Upload file path must point to a file: {file_input}",
-        )
+        file_path, file_obj = normalize_upload_file_input(file_input)
         if file_path is not None:
             try:
                 with open(file_path, "rb") as file_obj:

hyperbrowser/client/managers/session_upload_utils.py

@@ -10,9 +10,6 @@
 
 def normalize_upload_file_input(
     file_input: Union[str, PathLike[str], IO],
-    *,
-    missing_file_message: str,
-    not_file_message: str,
 ) -> Tuple[Optional[str], Optional[IO]]:
     if is_plain_string(file_input) or isinstance(file_input, PathLike):
         try:
@@ -26,8 +23,8 @@ def normalize_upload_file_input(
             ) from exc
         file_path = ensure_existing_file_path(
             raw_file_path,
-            missing_file_message=missing_file_message,
-            not_file_message=not_file_message,
+            missing_file_message=f"Upload file not found at path: {raw_file_path}",
+            not_file_message=f"Upload file path must point to a file: {raw_file_path}",
         )
         return file_path, None
 

hyperbrowser/client/managers/sync_manager/session.py

@@ -156,11 +156,7 @@ def get_downloads_url(self, id: str) -> GetSessionDownloadsUrlResponse:
     def upload_file(
         self, id: str, file_input: Union[str, PathLike[str], IO]
     ) -> UploadFileResponse:
-        file_path, file_obj = normalize_upload_file_input(
-            file_input,
-            missing_file_message=f"Upload file not found at path: {file_input}",
-            not_file_message=f"Upload file path must point to a file: {file_input}",
-        )
+        file_path, file_obj = normalize_upload_file_input(file_input)
         if file_path is not None:
             try:
                 with open(file_path, "rb") as file_obj:

tests/test_session_upload_utils.py

@@ -14,11 +14,7 @@ def test_normalize_upload_file_input_returns_path_for_plain_string(tmp_path: Pat
     file_path = tmp_path / "file.txt"
     file_path.write_text("content")
 
-    normalized_path, file_obj = normalize_upload_file_input(
-        str(file_path),
-        missing_file_message=f"Upload file not found at path: {file_path}",
-        not_file_message=f"Upload file path must point to a file: {file_path}",
-    )
+    normalized_path, file_obj = normalize_upload_file_input(str(file_path))
 
     assert normalized_path == str(file_path)
     assert file_obj is None
@@ -28,11 +24,7 @@ def test_normalize_upload_file_input_returns_path_for_pathlike(tmp_path: Path):
     file_path = tmp_path / "file.txt"
     file_path.write_text("content")
 
-    normalized_path, file_obj = normalize_upload_file_input(
-        file_path,
-        missing_file_message=f"Upload file not found at path: {file_path}",
-        not_file_message=f"Upload file path must point to a file: {file_path}",
-    )
+    normalized_path, file_obj = normalize_upload_file_input(file_path)
 
     assert normalized_path == str(file_path)
     assert file_obj is None
@@ -45,11 +37,7 @@ class _PathString(str):
     with pytest.raises(
         HyperbrowserError, match="file_input path must be a plain string path"
     ) as exc_info:
-        normalize_upload_file_input(
-            _PathString("/tmp/file.txt"),  # type: ignore[arg-type]
-            missing_file_message="Upload file not found at path: /tmp/file.txt",
-            not_file_message="Upload file path must point to a file: /tmp/file.txt",
-        )
+        normalize_upload_file_input(_PathString("/tmp/file.txt"))  # type: ignore[arg-type]
 
     assert exc_info.value.original_error is None
 
@@ -62,23 +50,29 @@ def __fspath__(self) -> str:
     with pytest.raises(
         HyperbrowserError, match="file_input path is invalid"
     ) as exc_info:
-        normalize_upload_file_input(
-            _BrokenPathLike(),
-            missing_file_message="Upload file not found",
-            not_file_message="Upload file path must point to a file",
-        )
+        normalize_upload_file_input(_BrokenPathLike())
 
     assert isinstance(exc_info.value.original_error, RuntimeError)
 
 
+def test_normalize_upload_file_input_uses_fspath_path_in_missing_file_errors():
+    class _StringifyFailingPathLike(PathLike[str]):
+        def __fspath__(self) -> str:
+            return "/tmp/nonexistent-path-for-upload-utils-test"
+
+        def __str__(self) -> str:
+            raise RuntimeError("broken stringify")
+
+    with pytest.raises(HyperbrowserError, match="Upload file not found at path: /tmp/nonexistent-path-for-upload-utils-test") as exc_info:
+        normalize_upload_file_input(_StringifyFailingPathLike())
+
+    assert exc_info.value.original_error is None
+
+
 def test_normalize_upload_file_input_returns_open_file_like_object():
     file_obj = io.BytesIO(b"content")
 
-    normalized_path, normalized_file_obj = normalize_upload_file_input(
-        file_obj,
-        missing_file_message="Upload file not found",
-        not_file_message="Upload file path must point to a file",
-    )
+    normalized_path, normalized_file_obj = normalize_upload_file_input(file_obj)
 
     assert normalized_path is None
     assert normalized_file_obj is file_obj
@@ -89,19 +83,11 @@ def test_normalize_upload_file_input_rejects_closed_file_like_object():
     file_obj.close()
 
     with pytest.raises(HyperbrowserError, match="file-like object must be open"):
-        normalize_upload_file_input(
-            file_obj,
-            missing_file_message="Upload file not found",
-            not_file_message="Upload file path must point to a file",
-        )
+        normalize_upload_file_input(file_obj)
 
 
 def test_normalize_upload_file_input_rejects_non_callable_read_attribute():
     fake_file = type("FakeFile", (), {"read": "not-callable"})()
 
     with pytest.raises(HyperbrowserError, match="file_input must be a file path"):
-        normalize_upload_file_input(
-            fake_file,  # type: ignore[arg-type]
-            missing_file_message="Upload file not found",
-            not_file_message="Upload file path must point to a file",
-        )
+        normalize_upload_file_input(fake_file)  # type: ignore[arg-type]