move classmethod to BinaryContent

Author: dsfaccini

pydantic_ai_slim/pydantic_ai/messages.py

@@ -532,6 +532,25 @@ def from_data_uri(cls, data_uri: str) -> BinaryContent:
         media_type, data = data_uri[len(prefix) :].split(';base64,', 1)
         return cls.narrow_type(cls(data=base64.b64decode(data), media_type=media_type))
 
+    @classmethod
+    def from_path(cls, path: PathLike[str]) -> BinaryContent:
+        """Create a `BinaryContent` from a path.
+
+        Defaults to 'application/octet-stream' if the media type cannot be inferred.
+
+        Raises:
+            FileNotFoundError: if the file does not exist.
+            PermissionError: if the file cannot be read.
+        """
+        path = Path(path)
+        if not path.exists():
+            raise FileNotFoundError(f'File not found: {path}')
+        media_type, _ = guess_type(path.as_posix())
+        if media_type is None:
+            media_type = 'application/octet-stream'
+
+        return cls(data=path.read_bytes(), media_type=media_type)
+
     @pydantic.computed_field
     @property
     def identifier(self) -> str:
@@ -1074,26 +1093,6 @@ def has_content(self) -> bool:
         """Return `True` if the file content is non-empty."""
         return bool(self.content.data)
 
-    @classmethod
-    def from_path(cls, path: PathLike[str]) -> FilePart:
-        """Create a `BinaryContent` from a path.
-
-        Defaults to 'application/octet-stream' if the media type cannot be inferred.
-
-        Raises:
-            FileNotFoundError: if the file does not exist.
-            PermissionError: if the file cannot be read.
-        """
-        path = Path(path)
-        if not path.exists():
-            raise FileNotFoundError(f'File not found: {path}')
-        media_type, _ = guess_type(path.as_posix())
-        if media_type is None:
-            media_type = 'application/octet-stream'
-
-        binary_content = BinaryContent(data=path.read_bytes(), media_type=media_type)
-        return cls(content=binary_content)
-
     __repr__ = _utils.dataclasses_no_defaults_repr
 
 

tests/test_messages.py

@@ -619,20 +619,16 @@ def test_file_part_from_path(tmp_path: Path):
     # test normal file
     test_xml_file = tmp_path / 'test.xml'
     test_xml_file.write_text('<think>about trains</think>', encoding='utf-8')
-    file_part = FilePart.from_path(test_xml_file)
-    assert file_part == snapshot(
-        FilePart(content=BinaryContent(data=b'<think>about trains</think>', media_type='application/xml'))
-    )
+    binary_content = BinaryContent.from_path(test_xml_file)
+    assert binary_content == snapshot(BinaryContent(data=b'<think>about trains</think>', media_type='application/xml'))
 
     # test non-existent file
     non_existent_file = tmp_path / 'non-existent.txt'
     with pytest.raises(FileNotFoundError, match='File not found:'):
-        FilePart.from_path(non_existent_file)
+        BinaryContent.from_path(non_existent_file)
 
     # test file with unknown media type
     test_unknown_file = tmp_path / 'test.unknownext'
     test_unknown_file.write_text('some content', encoding='utf-8')
-    file_part = FilePart.from_path(test_unknown_file)
-    assert file_part == snapshot(
-        FilePart(content=BinaryContent(data=b'some content', media_type='application/octet-stream'))
-    )
+    binary_content = BinaryContent.from_path(test_unknown_file)
+    assert binary_content == snapshot(BinaryContent(data=b'some content', media_type='application/octet-stream'))