mirror of
https://github.com/hwchase17/langchain.git
synced 2025-07-18 10:43:36 +00:00
Add path validation to DirectoryLoader (#5327)
# Add path validation to DirectoryLoader This PR introduces a minor adjustment to the DirectoryLoader by adding validation for the path argument. Previously, if the provided path didn't exist or wasn't a directory, DirectoryLoader would return an empty document list due to the behavior of the `glob` method. This could potentially cause confusion for users, as they might expect a file-loading error instead. So, I've added two validations to the load method of the DirectoryLoader: - Raise a FileNotFoundError if the provided path does not exist - Raise a ValueError if the provided path is not a directory Due to the relatively small scope of these changes, a new issue was not created. ## Before submitting <!-- If you're adding a new integration, please include: 1. a test for the integration - favor unit tests that does not rely on network access. 2. an example notebook showing its use See contribution guidelines for more information on how to write tests, lint etc: https://github.com/hwchase17/langchain/blob/master/.github/CONTRIBUTING.md --> ## Who can review? Community members can review the PR once tests pass. Tag maintainers/contributors who might be interested: @eyurtsev
This commit is contained in:
parent
ad7f4c0317
commit
1366d070fc
@ -74,6 +74,11 @@ class DirectoryLoader(BaseLoader):
|
||||
def load(self) -> List[Document]:
|
||||
"""Load documents."""
|
||||
p = Path(self.path)
|
||||
if not p.exists():
|
||||
raise FileNotFoundError(f"Directory not found: '{self.path}'")
|
||||
if not p.is_dir():
|
||||
raise ValueError(f"Expected directory, got file: '{self.path}'")
|
||||
|
||||
docs: List[Document] = []
|
||||
items = list(p.rglob(self.glob) if self.recursive else p.glob(self.glob))
|
||||
|
||||
|
19
tests/unit_tests/document_loaders/test_directory.py
Normal file
19
tests/unit_tests/document_loaders/test_directory.py
Normal file
@ -0,0 +1,19 @@
|
||||
import pytest
|
||||
|
||||
from langchain.document_loaders import DirectoryLoader
|
||||
|
||||
|
||||
def test_raise_error_if_path_not_exist() -> None:
|
||||
loader = DirectoryLoader("./not_exist_directory")
|
||||
with pytest.raises(FileNotFoundError) as e:
|
||||
loader.load()
|
||||
|
||||
assert str(e.value) == "Directory not found: './not_exist_directory'"
|
||||
|
||||
|
||||
def test_raise_error_if_path_is_not_directory() -> None:
|
||||
loader = DirectoryLoader(__file__)
|
||||
with pytest.raises(ValueError) as e:
|
||||
loader.load()
|
||||
|
||||
assert str(e.value) == f"Expected directory, got file: '{__file__}'"
|
Loading…
Reference in New Issue
Block a user