xedocs 0.2.38__py3-none-any.whl → 0.2.40__py3-none-any.whl

xedocs/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """Yossi Mosbacher"""
 __email__ = "joe.mosbacher@gmail.com"
-__version__ = "0.2.38"
+__version__ = "0.2.40"
 
 
 import logging

xedocs/utils.py

@@ -135,20 +135,37 @@ class LazyFileAccessor(DataAccessor):
         for path in self.urlpaths:
             glob_patttern = self.format_to_glob(path)
             fs, _, fpaths = fsspec.get_fs_token_paths(glob_patttern, storage_options=self.storage_options)
-            # force the protocol to be file
-            fs.protocol = "file"
-            pattern = path.replace(f"{fs.protocol}://", "")
+
+            # Always define original_protocol
+            original_protocol = fs.protocol if fs.protocol else 'file'
+            if isinstance(original_protocol, tuple):
+                original_protocol = original_protocol[0]
+            else:
+                original_protocol = original_protocol
+
+            # Debug prints
+            # print(f"\n[DEBUG]")
+            # print(f"Processing path: {path}")
+            # print(f"fs.protocol: {fs.protocol}")
+            # print(f"Original protocol: {original_protocol}")
+            # print(f"Glob pattern: {glob_patttern}")
+            # print(f"File paths: {fpaths}")
+    
+            pattern = path.replace(f"{original_protocol}://", "")
             pattern = parse.compile(self.glob_to_format(pattern))
+    
+            # More debug prints
+            # print(f"Parse pattern: {pattern}")
+    
             loaded = set(ignore_paths)
-
+    
             for fpath in fpaths:
                 if fpath in loaded:
                     continue
                 r = pattern.parse(fpath)
                 if r is None:
                     continue
-                for k,vs in labels.items():
-                    
+                for k, vs in labels.items():
                     if vs is None:
                         continue
                     if not isinstance(vs, list):
@@ -165,10 +182,11 @@ class LazyFileAccessor(DataAccessor):
                     if label not in vs:
                         break
                 else:
-                    records = read_files(fpath, protocol=fs.protocol, **fs.storage_options)
+                    records = read_files(fpath, protocol=original_protocol, **fs.storage_options)
                     yield fpath, records
                     self.loaded.add(fpath)
 
+
     def load_files(self, **labels):
         index_fields = list(self.schema.get_index_fields())
         if len(index_fields) == 1:

{xedocs-0.2.38.dist-info → xedocs-0.2.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xedocs
-Version: 0.2.38
+Version: 0.2.40
 Summary: Top-level package for xedocs.
 Author: Yossi Mosbacher
 Author-email: joe.mosbacher@gmail.com

{xedocs-0.2.38.dist-info → xedocs-0.2.40.dist-info}/RECORD

@@ -1,4 +1,4 @@
-xedocs/__init__.py,sha256=cqFTez1iXXbMv5BGcterddpCbVXAC-4D-r3D2x1rWaw,1054
+xedocs/__init__.py,sha256=HDkUXIoZjRx_ewsKLZj4S9ahhAndgS36xXZBkKNr-MI,1054
 xedocs/_settings.py,sha256=_Fjj5XJBHBrN6N1Dqs_JzovbEcF6--5BGnAggK1ksck,4199
 xedocs/_straxen_plugin.py,sha256=bxKWkVDNCS0Mah_GGNEvE8TCk-ibrY8xJbO0UMvfajM,1904
 xedocs/cli.py,sha256=1oZXa4Iqs-ANRTABZP8K6e3oSIatKnJNhQ1DZ4rsNrc,3493
@@ -78,12 +78,12 @@ xedocs/schemas/pmt_data/pmt_installs.py,sha256=zVz04RbVvS9DpnM6kp8Ql14g1aOtRsqWA
 xedocs/schemas/pmt_data/pmts.py,sha256=VTDpDPz0HdTlfkPypN6CFjmuxEUNJj0-cC6uqRRuXZs,271
 xedocs/schemas/pmt_data/voltage_changes.py,sha256=ieTNCSoE4A3VHrWZ3Hk5HN_q5Nrwu04jwqji7bgbJto,428
 xedocs/schemas/pmt_data/voltage_settings.py,sha256=L2cScDQNviWgAlWvMRjnIEgsP0urVg0gYWAxK3FrFPc,428
-xedocs/utils.py,sha256=z7RnC2X7RAQNwW5BOAxWxE-Di9ydjNOMPMpNhc7OaaE,8424
+xedocs/utils.py,sha256=e0Y57LrjbQ7qbWChyQgX2QV5TJZ276u8Ne7Clzg7Hl4,9063
 xedocs/widgets.py,sha256=l2pgQaWqycZQF5pF6eEeLuHdqjVBkJ8OB-o-mcivMl4,28810
 xedocs/xedocs.py,sha256=Dk-ld5X6qB6hrp40svDkJX_9K0MKkZTxal-fLVQpIz8,6949
 xedocs/xenon_config.py,sha256=QQlg2icofZWq_UAh5kDSuViai0uP_3ClozNNv6mpx3s,2674
-xedocs-0.2.38.dist-info/AUTHORS.rst,sha256=7XNtvXT_irnC5nzau-Al_VVmmhk8EgW811pPs8OXgBo,164
-xedocs-0.2.38.dist-info/METADATA,sha256=hOF1kJDVmEiXuwp83yE1s4kW2cDRucg4dvCFCquUF2Q,5827
-xedocs-0.2.38.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-xedocs-0.2.38.dist-info/entry_points.txt,sha256=AfKuejqaCB-nA4rYbuWtMcR0d-t4nNzrM3s8V_e7YSk,92
-xedocs-0.2.38.dist-info/RECORD,,
+xedocs-0.2.40.dist-info/AUTHORS.rst,sha256=7XNtvXT_irnC5nzau-Al_VVmmhk8EgW811pPs8OXgBo,164
+xedocs-0.2.40.dist-info/METADATA,sha256=SHSsonvUHfrRJqoiv7xsDuvQnAqaqaRYeD2cpbOGFPI,5827
+xedocs-0.2.40.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+xedocs-0.2.40.dist-info/entry_points.txt,sha256=AfKuejqaCB-nA4rYbuWtMcR0d-t4nNzrM3s8V_e7YSk,92
+xedocs-0.2.40.dist-info/RECORD,,