diff --git a/libs/community/tests/unit_tests/test_imports.py b/libs/community/tests/unit_tests/test_imports.py index bbcf12a1079..8567ff3a245 100644 --- a/libs/community/tests/unit_tests/test_imports.py +++ b/libs/community/tests/unit_tests/test_imports.py @@ -1,10 +1,11 @@ import glob import importlib +from pathlib import Path def test_importable_all() -> None: for path in glob.glob("../community/langchain_community/*"): - relative_path = path.split("/")[-1] + relative_path = Path(path).parts[-1] if relative_path.endswith(".typed"): continue module_name = relative_path.split(".")[0] diff --git a/libs/community/tests/unit_tests/tools/file_management/test_utils.py b/libs/community/tests/unit_tests/tools/file_management/test_utils.py index cf99b559fb9..9b3fca19bfd 100644 --- a/libs/community/tests/unit_tests/tools/file_management/test_utils.py +++ b/libs/community/tests/unit_tests/tools/file_management/test_utils.py @@ -1,6 +1,6 @@ """Test the File Management utils.""" - +import re from pathlib import Path from tempfile import TemporaryDirectory @@ -16,8 +16,8 @@ def test_get_validated_relative_path_errs_on_absolute() -> None: """Safely resolve a path.""" root = Path(__file__).parent user_path = "/bin/bash" - matches = f"Path {user_path} is outside of the allowed directory {root}" - with pytest.raises(FileValidationError, match=matches): + match = re.escape(f"Path {user_path} is outside of the allowed directory {root}") + with pytest.raises(FileValidationError, match=match): get_validated_relative_path(root, user_path) @@ -25,8 +25,8 @@ def test_get_validated_relative_path_errs_on_parent_dir() -> None: """Safely resolve a path.""" root = Path(__file__).parent user_path = "data/sub/../../../sibling" - matches = f"Path {user_path} is outside of the allowed directory {root}" - with pytest.raises(FileValidationError, match=matches): + match = re.escape(f"Path {user_path} is outside of the allowed directory {root}") + with pytest.raises(FileValidationError, match=match): get_validated_relative_path(root, user_path) @@ -49,10 +49,10 @@ def test_get_validated_relative_path_errs_for_symlink_outside_root() -> None: symlink_path = root / user_path symlink_path.symlink_to(outside_path) - matches = ( + match = re.escape( f"Path {user_path} is outside of the allowed directory {root.resolve()}" ) - with pytest.raises(FileValidationError, match=matches): + with pytest.raises(FileValidationError, match=match): get_validated_relative_path(root, user_path) symlink_path.unlink() diff --git a/libs/core/tests/unit_tests/test_imports.py b/libs/core/tests/unit_tests/test_imports.py index 745a9eb8672..d4b49d2392b 100644 --- a/libs/core/tests/unit_tests/test_imports.py +++ b/libs/core/tests/unit_tests/test_imports.py @@ -1,10 +1,11 @@ import glob import importlib +from pathlib import Path def test_importable_all() -> None: for path in glob.glob("../core/langchain_core/*"): - relative_path = path.split("/")[-1] + relative_path = Path(path).parts[-1] if relative_path.endswith(".typed"): continue module_name = relative_path.split(".")[0] diff --git a/libs/experimental/tests/unit_tests/test_imports.py b/libs/experimental/tests/unit_tests/test_imports.py index 8f729672cdd..8db98f5c2de 100644 --- a/libs/experimental/tests/unit_tests/test_imports.py +++ b/libs/experimental/tests/unit_tests/test_imports.py @@ -1,10 +1,11 @@ import glob import importlib +from pathlib import Path def test_importable_all() -> None: for path in glob.glob("../experimental/langchain_experimental/*"): - relative_path = path.split("/")[-1] + relative_path = Path(path).parts[-1] if relative_path.endswith(".typed"): continue module_name = relative_path.split(".")[0] diff --git a/libs/langchain/tests/unit_tests/storage/test_filesystem.py b/libs/langchain/tests/unit_tests/storage/test_filesystem.py index 25ba3866bf3..76991eb2948 100644 --- a/libs/langchain/tests/unit_tests/storage/test_filesystem.py +++ b/libs/langchain/tests/unit_tests/storage/test_filesystem.py @@ -1,3 +1,4 @@ +import os import tempfile from typing import Generator @@ -74,5 +75,5 @@ def test_yield_keys(file_store: LocalFileStore) -> None: keys = list(file_store.yield_keys()) # Assert that the yielded keys match the expected keys - expected_keys = ["key1", "subdir/key2"] + expected_keys = ["key1", os.path.join("subdir", "key2")] assert keys == expected_keys diff --git a/libs/langchain/tests/unit_tests/test_imports.py b/libs/langchain/tests/unit_tests/test_imports.py index 3c0845d488b..5f93441efe5 100644 --- a/libs/langchain/tests/unit_tests/test_imports.py +++ b/libs/langchain/tests/unit_tests/test_imports.py @@ -1,10 +1,11 @@ import glob import importlib +from pathlib import Path def test_importable_all() -> None: for path in glob.glob("../langchain/langchain/*"): - relative_path = path.split("/")[-1] + relative_path = Path(path).parts[-1] if relative_path.endswith(".typed"): continue module_name = relative_path.split(".")[0]