kaparoo-python 0.1.6__tar.gz → 0.1.8__tar.gz

{kaparoo_python-0.1.6 → kaparoo_python-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaparoo-python
-Version: 0.1.6
+Version: 0.1.8
 Summary: Personally common and useful Python features
 Project-URL: GitHub, https://www.github.com/kaparoo/kaparoo-python
 Author-email: Jaewoo Park <kaparoo2001@gmail.com>
@@ -37,11 +37,11 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Provides-Extra: dev
-Requires-Dist: hatch>=1.9.1; extra == 'dev'
+Requires-Dist: hatch>=1.9.3; extra == 'dev'
 Requires-Dist: mypy>=1.8.0; extra == 'dev'
 Requires-Dist: pytest-order>=1.2.0; extra == 'dev'
-Requires-Dist: pytest>=7.4.4; extra == 'dev'
-Requires-Dist: ruff>=0.1.13; extra == 'dev'
+Requires-Dist: pytest>=8.0.0; extra == 'dev'
+Requires-Dist: ruff>=0.2.1; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # **kaparoo-python**

kaparoo_python-0.1.8/kaparoo/__about__.py

@@ -0,0 +1 @@
+__version__ = "0.1.8"

{kaparoo_python-0.1.6 → kaparoo_python-0.1.8}/kaparoo/filesystem/__init__.py

@@ -1,10 +1,4 @@
 __all__ = (
-    # exceptions
-    "DirectoryNotFoundError",
-    "NotAFileError",
-    # types
-    "StrPath",
-    "StrPaths",
     # utils
     "prepend_path",
     "prepend_paths",
@@ -30,11 +24,8 @@ __all__ = (
     "get_files",
     "get_paths",
     "make_dirs",
-    # collections
-    "DataFolder",
 )
 
-from kaparoo.filesystem.collections import DataFolder
 from kaparoo.filesystem.directory import (
     dir_empty,
     dirs_empty,
@@ -43,10 +34,6 @@ from kaparoo.filesystem.directory import (
     get_paths,
     make_dirs,
 )
-from kaparoo.filesystem.exceptions import (
-    DirectoryNotFoundError,
-    NotAFileError,
-)
 from kaparoo.filesystem.existence import (
     dir_exists,
     dirs_exist,
@@ -61,7 +48,6 @@ from kaparoo.filesystem.existence import (
     path_exists,
     paths_exist,
 )
-from kaparoo.filesystem.types import StrPath, StrPaths
 from kaparoo.filesystem.utils import (
     prepend_path,
     prepend_paths,

kaparoo_python-0.1.8/kaparoo/filesystem/collections.py

@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+__all__ = ("DataSequence", "DataFilesFolder", "UnifiedDataFile", "UnifiedDataFolder")
+
+from abc import abstractmethod
+from collections.abc import Sequence
+from typing import TYPE_CHECKING, overload
+
+from kaparoo.filesystem.existence import ensure_dir_exists, ensure_file_exists
+from kaparoo.utils.types import T_co
+
+if TYPE_CHECKING:
+    from typing import Any, Self
+
+    from kaparoo.filesystem.types import StrPath, StrPaths
+
+
+class DataSequence(Sequence[T_co]):
+    @abstractmethod
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        raise NotImplementedError
+
+    @abstractmethod
+    def __len__(self: Self) -> int:
+        raise NotImplementedError
+
+    @overload
+    def __getitem__(self: Self, index: int, /) -> T_co:
+        pass
+
+    @overload
+    def __getitem__(self: Self, index: slice, /) -> Sequence[T_co]:
+        pass
+
+    def __getitem__(self: Self, index: int | slice, /) -> T_co | Sequence[T_co]:
+        if isinstance(index, slice):
+            start, stop, step = index.indices(len(self))
+            return self.by_indices(range(start, stop, step))
+        return self.by_index(index)
+
+    @abstractmethod
+    def by_index(self: Self, index: int) -> T_co:
+        raise NotImplementedError
+
+    def by_indices(self: Self, indices: Sequence[int]) -> Sequence[T_co]:
+        return [self.by_index(index) for index in indices]
+
+
+class DataFilesFolder(DataSequence[T_co]):
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        self.path = ensure_dir_exists(path)
+        self.files = self.list_files(*args, **kwargs)
+
+    def __len__(self: Self) -> int:
+        return len(self.files)
+
+    @classmethod
+    @abstractmethod
+    def list_files(cls: type[Self], *args: Any, **kwargs: Any) -> StrPaths:
+        raise NotImplementedError
+
+
+class UnifiedDataFile(DataSequence[T_co]):
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        self.path = ensure_file_exists(path)
+
+
+class UnifiedDataFolder(DataFilesFolder[T_co]):
+    def __init__(self: Self, path: StrPath, *args: Any, **kwargs: Any) -> None:
+        self.path = ensure_dir_exists(path)

{kaparoo_python-0.1.6 → kaparoo_python-0.1.8}/kaparoo/filesystem/directory.py

@@ -213,18 +213,12 @@ def get_paths(
 
     paths = list(root.rglob(pattern) if recursive else root.glob(pattern))
 
-    if root in paths:
-        paths.remove(root)
-
-    if not excludes:
-        excludes = []
-
-    for exclude in excludes:
-        path_exclude = Path(exclude)
-        if not path_exclude.is_relative_to(root):
-            path_exclude = root / path_exclude
-        if path_exclude in paths:
-            paths.remove(path_exclude)
+    excludes_set = {root}
+    if excludes:
+        resolve = lambda p: p if p.is_relative_to(root) else root / p  # noqa: E731
+        excludes_set.update(resolve(Path(e)) for e in excludes)
+
+    paths = [p for p in paths if p not in excludes_set]
 
     if callable(condition):
         paths = [p for p in paths if condition(p)]

{kaparoo_python-0.1.6 → kaparoo_python-0.1.8}/pyproject.toml

@@ -34,10 +34,10 @@ classifiers = [
 
 [project.optional-dependencies]
 dev = [
-    "hatch>=1.9.1",
-    "ruff>=0.1.13",
+    "hatch>=1.9.3",
+    "ruff>=0.2.1",
     "mypy>=1.8.0",
-    "pytest>=7.4.4",
+    "pytest>=8.0.0",
     "pytest-order>=1.2.0",
 ]
 

kaparoo_python-0.1.6/kaparoo/__about__.py

@@ -1 +0,0 @@
-__version__ = "0.1.6"

kaparoo_python-0.1.6/kaparoo/filesystem/collections.py

@@ -1,54 +0,0 @@
-from __future__ import annotations
-
-__all__ = ("DataFolder",)
-
-from abc import abstractmethod
-from collections.abc import Sequence
-from typing import TYPE_CHECKING, overload
-
-from kaparoo.filesystem.existence import ensure_dir_exists
-from kaparoo.utils.types import T_co
-
-if TYPE_CHECKING:
-    from typing import Self
-
-    from kaparoo.filesystem.types import StrPath, StrPaths
-
-
-class DataFolder(Sequence[T_co]):
-    def __init__(self: Self, path: StrPath) -> None:
-        self.path = ensure_dir_exists(path)
-        self.files = self.list_files(self.path)
-
-    def __len__(self: Self) -> int:
-        return len(self.files)
-
-    @overload
-    def __getitem__(self: Self, index: int, /) -> T_co:
-        pass
-
-    @overload
-    def __getitem__(self: Self, index: slice, /) -> Sequence[T_co]:
-        pass
-
-    def __getitem__(self: Self, index: int | slice, /) -> T_co | Sequence[T_co]:
-        if isinstance(index, slice):
-            start, stop, step = index.indices(len(self))
-            return self.parse_files(range(start, stop, step))
-        return self.parse_file(index)
-
-    @abstractmethod
-    def parse_file(self: Self, index: int) -> T_co:
-        raise NotImplementedError
-
-    def parse_files(self: Self, indices: Sequence[int]) -> Sequence[T_co]:
-        return [self.parse_file(i) for i in indices]
-
-    @classmethod
-    @abstractmethod
-    def list_files(cls: type[Self], path: StrPath) -> StrPaths:
-        raise NotImplementedError
-
-    def refresh(self: Self) -> None:
-        """Refresh the list of files."""
-        self.files = self.list_files(self.path)