Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions haystack/components/converters/msg.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ def run(

merged_metadata = {**bytestream.meta, **metadata}

if not self.store_full_path and "file_path" in bytestream.meta:
merged_metadata["file_path"] = os.path.basename(bytestream.meta["file_path"])
if not self.store_full_path and (file_path := bytestream.meta.get("file_path")):
merged_metadata["file_path"] = os.path.basename(file_path)

documents.append(Document(content=text, meta=merged_metadata))
for attachment in attachments:
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/msg-null-file-path-4e1b8c2d7a9f3e60.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
fixes:
- |
Fix ``MSGToDocument`` raising ``TypeError`` when a source ``ByteStream``
has ``file_path=None`` in its metadata. The ``None`` value is now kept in the document metadata.
22 changes: 15 additions & 7 deletions test/components/converters/test_msg_to_document.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,27 @@


class TestMSGToDocument:
def test_run_bytestream_without_file_path(self, test_files_path):
"""A bare ByteStream source (no 'file_path' in its meta) must not raise a KeyError."""
converter = MSGToDocument(store_full_path=True)
@pytest.mark.parametrize(
("bytestream_meta", "expected_parent_meta"),
[({}, {}), ({"file_path": None}, {"parent_file_path": None})],
ids=["no_file_path", "null_file_path"],
)
def test_run_bytestream_without_file_path(self, test_files_path, bytestream_meta, expected_parent_meta):
"""A ByteStream source without a usable 'file_path' in its meta must not raise."""
converter = MSGToDocument()
data = (test_files_path / "msg" / "sample.msg").read_bytes()
bytestream = ByteStream(data=data)
bytestream = ByteStream(data=data, meta=bytestream_meta)

result = converter.run(sources=[bytestream], meta={"date_added": "2021-09-01T00:00:00"})

assert len(result["documents"]) == 1
assert result["documents"][0].meta == {"date_added": "2021-09-01T00:00:00"}
assert result["documents"][0].meta == {**bytestream_meta, "date_added": "2021-09-01T00:00:00"}
assert len(result["attachments"]) == 1
assert result["attachments"][0].meta == {"date_added": "2021-09-01T00:00:00", "file_path": "sample_pdf_1.pdf"}
assert "parent_file_path" not in result["attachments"][0].meta
assert result["attachments"][0].meta == {
"date_added": "2021-09-01T00:00:00",
"file_path": "sample_pdf_1.pdf",
**expected_parent_meta,
}

def test_run(self, test_files_path):
converter = MSGToDocument(store_full_path=True)
Expand Down
Loading