FlowerPower 0.11.5__tar.gz → 0.11.5.2__tar.gz

{flowerpower-0.11.5/src/FlowerPower.egg-info → flowerpower-0.11.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FlowerPower
-Version: 0.11.5
+Version: 0.11.5.2
 Summary: A simple workflow framework. Hamilton + APScheduler = FlowerPower
 Author-email: "Volker L." <ligno.blades@gmail.com>
 Project-URL: Homepage, https://github.com/legout/flowerpower

{flowerpower-0.11.5 → flowerpower-0.11.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ description = "A simple workflow framework. Hamilton + APScheduler = FlowerPower
 authors = [{ name = "Volker L.", email = "ligno.blades@gmail.com" }]
 readme = "README.md"
 requires-python = ">= 3.11"
-version = "0.11.5"
+version = "0.11.5.2"
 keywords = [
   "hamilton",
   "workflow",

{flowerpower-0.11.5 → flowerpower-0.11.5.2/src/FlowerPower.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: FlowerPower
-Version: 0.11.5
+Version: 0.11.5.2
 Summary: A simple workflow framework. Hamilton + APScheduler = FlowerPower
 Author-email: "Volker L." <ligno.blades@gmail.com>
 Project-URL: Homepage, https://github.com/legout/flowerpower

{flowerpower-0.11.5 → flowerpower-0.11.5.2}/src/flowerpower/fs/base.py

@@ -597,15 +597,24 @@ def get_filesystem(
         ... )
     """
     if fs is not None:
+        if dirfs:
+            base_path = path.split("://")[1]
+            if fs.protocol == "dir":
+                if base_path != fs.path:
+                    fs = DirFileSystem(
+                        path=posixpath.join(
+                            fs.path, base_path.replace(fs.path, "").lstrip("/")
+                        ),
+                        fs=fs.fs,
+                    )
+            else:
+                fs = DirFileSystem(path=base_path, fs=fs)
         if cached:
             if fs.is_cache_fs:
                 return fs
-            return MonitoredSimpleCacheFileSystem(fs=fs, cache_storage=cache_storage)
+            fs = MonitoredSimpleCacheFileSystem(fs=fs, cache_storage=cache_storage)
 
-        if dirfs:
-            if fs.protocol == "dir":
-                return fs
-            return DirFileSystem(path=path, fs=fs)
+        return fs
 
     pp = infer_storage_options(str(path) if isinstance(path, Path) else path)
     protocol = (
@@ -630,6 +639,8 @@ def get_filesystem(
     path = pp.get("path", "").lstrip("/")
     if len(host) and host not in path:
         path = posixpath.join(host, path)
+    if "." in path:
+        path = posixpath.dirname(path)
 
     if isinstance(storage_options, dict):
         storage_options = storage_options_from_dict(protocol, storage_options)

{flowerpower-0.11.5 → flowerpower-0.11.5.2}/src/flowerpower/plugins/io/base.py

@@ -15,7 +15,6 @@ import pandas as pd
 import pyarrow as pa
 import pyarrow.dataset as pds
 from fsspec import AbstractFileSystem
-from fsspec.utils import get_protocol
 from msgspec import field
 from pydala.dataset import ParquetDataset
 from sqlalchemy import create_engine, text
@@ -93,6 +92,7 @@ class BaseFileIO(msgspec.Struct, gc=False):
                 fs=self.fs,
                 dirfs=True,
             )
+
         self.storage_options = (
             self.storage_options or self.fs.storage_options
             if self.protocol != "dir"
@@ -120,11 +120,9 @@ class BaseFileIO(msgspec.Struct, gc=False):
     @property
     def _base_path(self) -> str:
         """Get the base path for the filesystem."""
-
-        path = (
+        return (
             self.path if isinstance(self.path, str) else os.path.commonpath(self.path)
         )
-        return path
 
     @property
     def _path(self) -> str | list[str]: