Harden metadata prefix fallback for file path messages

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

Author: cursoragent

hyperbrowser/client/managers/extension_create_utils.py

@@ -32,10 +32,12 @@ def normalize_extension_create_input(params: Any) -> Tuple[str, Dict[str, Any]]:
         missing_file_message=build_file_path_error_message(
             raw_file_path,
             prefix=EXTENSION_OPERATION_METADATA.missing_file_message_prefix,
+            default_prefix="Extension file not found at path",
         ),
         not_file_message=build_file_path_error_message(
             raw_file_path,
             prefix=EXTENSION_OPERATION_METADATA.not_file_message_prefix,
+            default_prefix="Extension file path must point to a file",
         ),
     )
     return file_path, payload

hyperbrowser/client/managers/session_upload_utils.py

@@ -33,10 +33,12 @@ def normalize_upload_file_input(
             missing_file_message=build_file_path_error_message(
                 raw_file_path,
                 prefix=SESSION_OPERATION_METADATA.upload_missing_file_message_prefix,
+                default_prefix="Upload file not found at path",
             ),
             not_file_message=build_file_path_error_message(
                 raw_file_path,
                 prefix=SESSION_OPERATION_METADATA.upload_not_file_message_prefix,
+                default_prefix="Upload file path must point to a file",
             ),
         )
         return file_path, None

tests/test_extension_create_metadata_usage.py

@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 
 import pytest
@@ -14,5 +15,17 @@ def test_extension_create_helper_uses_shared_operation_metadata_prefixes():
     assert "extension_operation_metadata import" in module_text
     assert "EXTENSION_OPERATION_METADATA.missing_file_message_prefix" in module_text
     assert "EXTENSION_OPERATION_METADATA.not_file_message_prefix" in module_text
-    assert 'prefix="Extension file not found at path"' not in module_text
-    assert 'prefix="Extension file path must point to a file"' not in module_text
+    assert (
+        re.search(
+            r'(?<!default_)prefix="Extension file not found at path"',
+            module_text,
+        )
+        is None
+    )
+    assert (
+        re.search(
+            r'(?<!default_)prefix="Extension file path must point to a file"',
+            module_text,
+        )
+        is None
+    )

tests/test_extension_create_utils.py

@@ -142,6 +142,29 @@ def test_normalize_extension_create_input_uses_metadata_missing_prefix(
     assert exc_info.value.original_error is None
 
 
+def test_normalize_extension_create_input_uses_default_missing_prefix_when_metadata_invalid(
+    tmp_path, monkeypatch: pytest.MonkeyPatch
+):
+    missing_path = tmp_path / "missing-extension.zip"
+    params = CreateExtensionParams(name="missing-extension", file_path=missing_path)
+    monkeypatch.setattr(
+        extension_create_utils,
+        "EXTENSION_OPERATION_METADATA",
+        SimpleNamespace(
+            missing_file_message_prefix=123,
+            not_file_message_prefix="Custom extension not-file prefix",
+        ),
+    )
+
+    with pytest.raises(
+        HyperbrowserError,
+        match="Extension file not found at path:",
+    ) as exc_info:
+        normalize_extension_create_input(params)
+
+    assert exc_info.value.original_error is None
+
+
 def test_normalize_extension_create_input_uses_metadata_not_file_prefix(
     tmp_path, monkeypatch: pytest.MonkeyPatch
 ):

tests/test_session_upload_metadata_usage.py

@@ -1,3 +1,4 @@
+import re
 from pathlib import Path
 
 import pytest
@@ -15,6 +16,24 @@ def test_session_upload_helper_uses_shared_operation_metadata_prefixes():
     assert "SESSION_OPERATION_METADATA.upload_missing_file_message_prefix" in module_text
     assert "SESSION_OPERATION_METADATA.upload_not_file_message_prefix" in module_text
     assert "SESSION_OPERATION_METADATA.upload_open_file_error_prefix" in module_text
-    assert 'prefix="Upload file not found at path"' not in module_text
-    assert 'prefix="Upload file path must point to a file"' not in module_text
-    assert 'prefix="Failed to open upload file at path"' not in module_text
+    assert (
+        re.search(
+            r'(?<!default_)prefix="Upload file not found at path"',
+            module_text,
+        )
+        is None
+    )
+    assert (
+        re.search(
+            r'(?<!default_)prefix="Upload file path must point to a file"',
+            module_text,
+        )
+        is None
+    )
+    assert (
+        re.search(
+            r'(?<!default_)prefix="Failed to open upload file at path"',
+            module_text,
+        )
+        is None
+    )

tests/test_session_upload_utils.py

@@ -123,6 +123,32 @@ def test_normalize_upload_file_input_uses_metadata_missing_prefix(
     assert exc_info.value.original_error is None
 
 
+def test_normalize_upload_file_input_uses_default_missing_prefix_when_metadata_invalid(
+    monkeypatch: pytest.MonkeyPatch,
+):
+    monkeypatch.setattr(
+        session_upload_utils,
+        "SESSION_OPERATION_METADATA",
+        type(
+            "_Metadata",
+            (),
+            {
+                "upload_missing_file_message_prefix": 123,
+                "upload_not_file_message_prefix": "Custom not-file prefix",
+                "upload_open_file_error_prefix": "Custom open prefix",
+            },
+        )(),
+    )
+
+    with pytest.raises(
+        HyperbrowserError,
+        match="Upload file not found at path:",
+    ) as exc_info:
+        normalize_upload_file_input("/tmp/nonexistent-upload-default-prefix-test.txt")
+
+    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")