FlowerPower 0.11.5__py3-none-any.whl → 0.11.5.2__py3-none-any.whl

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/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]:

{flowerpower-0.11.5.dist-info → flowerpower-0.11.5.2.dist-info}/METADATA

@@ -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.dist-info → flowerpower-0.11.5.2.dist-info}/RECORD

@@ -17,7 +17,7 @@ flowerpower/cli/mqtt.py,sha256=GM5d6bzG01THZd7SwXFAC3j0cait642eXT50P3R22vk,6281
 flowerpower/cli/pipeline.py,sha256=60P6u_QOSgp0jJXEMxazEEo5Sh7-SWFo-Kkuaz21YuI,37845
 flowerpower/cli/utils.py,sha256=nDSSj_1nlYlMmj252kRZeohhFqHv9yvdgDEduQCyWOc,5152
 flowerpower/fs/__init__.py,sha256=uZaPXErEfQqQRbKRIjkB9yiygd45X5_psYn9-VVrBTQ,910
-flowerpower/fs/base.py,sha256=bWfY_xPPZ9DhSpSGMC2SV6OdbYp5XyDrjxLYhTjJlqo,22352
+flowerpower/fs/base.py,sha256=KR0SCNe1hLgibkXZuwlvbYr0K_i947B8kNVCTsUXpXg,22760
 flowerpower/fs/ext.py,sha256=gsCJ87VxVdy22oVtNRaN4M-SLO8WORVf5JRyDeQjjEs,63834
 flowerpower/fs/storage_options.py,sha256=msq5TpxAU8tcE_Bxjw6SyxaFa75UjdYnR4-O9U2wmbk,48034
 flowerpower/job_queue/__init__.py,sha256=a25hIqv2xoFKb4JZlyUukS0ppZ9-2sJKH3XAvbk3rlk,10788
@@ -44,7 +44,7 @@ flowerpower/pipeline/manager.py,sha256=KVpOclUEUAETUNJamJJGuKt3oxCaLitQgxWxkE1q0
 flowerpower/pipeline/registry.py,sha256=WWQoaxtgnlntFEIPQzYM1gk0zUXwrH2PmDLGbTzhrZs,18991
 flowerpower/pipeline/runner.py,sha256=dsSVYixFXqlxFk8EJfT4wV_7IwgkXq0ErwH_yf_NGS8,25654
 flowerpower/pipeline/visualizer.py,sha256=amjMrl5NetErE198HzZBPWVZBi_t5jj9ydxWpuNLoTI,5013
-flowerpower/plugins/io/base.py,sha256=Plr0v2y0MMf3azxqz7rIc2wk6CXFzpPczW6p5Qb9jiI,79464
+flowerpower/plugins/io/base.py,sha256=wKTHR4qR3iLAlgcj2zorIf8pAQtFD2L0xBi9BO_S99U,79406
 flowerpower/plugins/io/metadata.py,sha256=31FoVyRz6zdWMWda0f1GHq0xMokVB3SVYrLT2TejOH8,7271
 flowerpower/plugins/io/helpers/datetime.py,sha256=1WBUg2ywcsodJQwoF6JiIGc9yhVobvE2IErWp4i95m4,10649
 flowerpower/plugins/io/helpers/polars.py,sha256=VuksokWrsKk57-s5JkpsmzWCkaOIEiI4ONeAIO9LAdw,18071
@@ -93,9 +93,9 @@ flowerpower/utils/monkey.py,sha256=VPl3yimoWhwD9kI05BFsjNvtyQiDyLfY4Q85Bb6Ma0w,2
 flowerpower/utils/open_telemetry.py,sha256=fQWJWbIQFtKIxMBjAWeF12NGnqT0isO3A3j-DSOv_vE,949
 flowerpower/utils/scheduler.py,sha256=2zJ_xmLXpvXUQNF1XS2Gqm3Ogo907ctZ50GtvQB_rhE,9354
 flowerpower/utils/templates.py,sha256=ouyEeSDqa9PjW8c32fGpcINlpC0WToawRFZkMPtwsLE,1591
-flowerpower-0.11.5.dist-info/licenses/LICENSE,sha256=9AkLexxrmr0aBgSHiqxpJk9wgazpP1CTJyiDyr56J9k,1063
-flowerpower-0.11.5.dist-info/METADATA,sha256=Cmyl1IhcjYUTdIrKw_VSGtjclhFUHzIcWlM7yknDL3I,21610
-flowerpower-0.11.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flowerpower-0.11.5.dist-info/entry_points.txt,sha256=61X11i5a2IwC9LBiP20XCDl5zMOigGCjMCx17B7bDbQ,52
-flowerpower-0.11.5.dist-info/top_level.txt,sha256=VraH4WtEUfSxs5L-rXwDQhzQb9eLHTUtgvmFZ2dAYnA,12
-flowerpower-0.11.5.dist-info/RECORD,,
+flowerpower-0.11.5.2.dist-info/licenses/LICENSE,sha256=9AkLexxrmr0aBgSHiqxpJk9wgazpP1CTJyiDyr56J9k,1063
+flowerpower-0.11.5.2.dist-info/METADATA,sha256=9O2rh6Vp0FxRnGRjArwhESKWxLVo4DeBPBchlb9GlV0,21612
+flowerpower-0.11.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flowerpower-0.11.5.2.dist-info/entry_points.txt,sha256=61X11i5a2IwC9LBiP20XCDl5zMOigGCjMCx17B7bDbQ,52
+flowerpower-0.11.5.2.dist-info/top_level.txt,sha256=VraH4WtEUfSxs5L-rXwDQhzQb9eLHTUtgvmFZ2dAYnA,12
+flowerpower-0.11.5.2.dist-info/RECORD,,