daplapath 2.0.5__tar.gz → 2.0.7__tar.gz

{daplapath-2.0.5 → daplapath-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: daplapath
-Version: 2.0.5
+Version: 2.0.7
 Summary: A pathlib.Path class for dapla
 License: MIT
 Author: ort

{daplapath-2.0.5 → daplapath-2.0.7}/daplapath/__init__.py

@@ -1,2 +1,3 @@
 from .path import Path
 from .path import PathSeries
+from .path import LocalFileSystem

{daplapath-2.0.5 → daplapath-2.0.7}/daplapath/path.py

@@ -206,16 +206,15 @@ class Path(str, _PathBase):
             .rstrip("/")
         )
 
-    def __new__(cls, gcs_path: str | PurePath | None = None):
+    def __new__(cls, gcs_path: str | PurePath | None = None, file_system=None):
         """Construct Path with '/' as delimiter."""
         gcs_path = cls._standardize_path(gcs_path or "")
         obj = super().__new__(cls, gcs_path)
         obj._path = PurePosixPath(obj)
-        obj._file_system = None
+        obj._file_system = file_system
         return obj
 
-    @property
-    def local_path(self) -> "Path":
+    def buckets_path(self) -> "Path":
         if self.startswith("/buckets"):
             return self
 
@@ -223,9 +222,9 @@ class Path(str, _PathBase):
         bucket = root.split("-data-")[-1].split("-prod")[0]
 
         try:
-            return self.__class__(f"/buckets/{bucket}/{'/'.join(self.parts[1:])}")
+            return self._new(f"/buckets/{bucket}/{'/'.join(self.parts[1:])}")
         except IndexError:
-            return self.__class__(f"/buckets/{bucket}")
+            return self._new(f"/buckets/{bucket}")
 
     def tree(
         self,
@@ -402,7 +401,7 @@ class Path(str, _PathBase):
         'file_v201.parquet'
         """
         version_text = f"{self._version_prefix}{version}" if version is not None else ""
-        return self.__class__(
+        return self._new(
             f"{self.parent}/{self.versionless_stem}{version_text}{self.suffix}"
         )
 
@@ -505,7 +504,7 @@ class Path(str, _PathBase):
 
         parent = f"{self.parent}/" if self.parent != "." else ""
 
-        return self.__class__(
+        return self._new(
             f"{parent}{stem}{period_string}{version_string}{self.suffix}".replace(
                 "".join(self.periods), period_string.strip(self._period_prefix)
             )
@@ -546,17 +545,17 @@ class Path(str, _PathBase):
     @property
     def versionless_stem(self) -> str:
         """Return the file stem before the version pattern."""
-        return self.__class__(re.split(self._version_pattern, self._path.name)[0]).stem
+        return self._new(re.split(self._version_pattern, self._path.name)[0]).stem
 
     @property
     def parent(self) -> "Path":
         """Parent path."""
-        return self.__class__(self._path.parent)
+        return self._new(self._path.parent)
 
     @property
     def parents(self) -> "list[Path]":
         """Parent path."""
-        return [self.__class__(parent) for parent in self._path.parents]
+        return [self._new(parent) for parent in self._path.parents]
 
     @property
     def name(self) -> str:
@@ -606,7 +605,9 @@ class Path(str, _PathBase):
         try:
             with self.open("rb") as file:
                 return get_schema(file)
-        except (PermissionError, FileNotFoundError, TypeError, IsADirectoryError):
+        except (
+            Exception
+        ):  # (PermissionError, FileNotFoundError, TypeError, IsADirectoryError):
             return get_schema(self)
 
     @property
@@ -624,7 +625,9 @@ class Path(str, _PathBase):
         try:
             with self.open("rb") as file:
                 return get_shape(file)
-        except (PermissionError, FileNotFoundError, TypeError, IsADirectoryError):
+        except (
+            Exception
+        ):  # (PermissionError, FileNotFoundError, TypeError, IsADirectoryError):
             return get_shape(self)
 
     @property
@@ -695,13 +698,13 @@ class Path(str, _PathBase):
         return self.isdir()
 
     def with_suffix(self, suffix: str):
-        return self.__class__(self._path.with_suffix(suffix))
+        return self._new(self._path.with_suffix(suffix))
 
     def with_name(self, new_name: str):
-        return self.__class__(self._path.with_name(new_name))
+        return self._new(self._path.with_name(new_name))
 
     def with_stem(self, new_with_stem: str):
-        return self.__class__(self._path.with_stem(new_with_stem))
+        return self._new(self._path.with_stem(new_with_stem))
 
     @property
     def file_system(self):
@@ -729,7 +732,7 @@ class Path(str, _PathBase):
                 "unsupported operand type(s) for /: "
                 f"{self.__class__.__name__} and {other.__class__.__name__}"
             )
-        return self.__class__(f"{self}/{as_str(other)}")
+        return self._new(f"{self}/{as_str(other)}")
 
     def __getattribute__(self, name):
         """stackoverflow hack to ensure we return Path when using string methods.
@@ -777,6 +780,9 @@ class Path(str, _PathBase):
             path._file_system = self._file_system
         return self._iterable_type(series, **kwargs)
 
+    def _new(self, new_path: str | Path) -> "Path":
+        return self.__class__(new_path, self.file_system)
+
 
 class PathSeries(pd.Series, _PathBase):
     """A pandas Series for working with GCS (Google Cloud Storage) paths.
@@ -1508,7 +1514,7 @@ def get_schema(file) -> pyarrow.Schema:
         FileNotFoundError,
         IsADirectoryError,
         OSError,
-    ):
+    ) as e:
         # try:
         #     return ds.dataset(file).schema
         # except (TypeError, FileNotFoundError) as e:

{daplapath-2.0.5 → daplapath-2.0.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "daplapath"
-version = "2.0.5"
+version = "2.0.7"
 description = "A pathlib.Path class for dapla"
 authors = ["ort <ort@ssb.no>"]
 license = "MIT"