Updated all code, removed active storage dependencies, attempt poetry 2 upgrade

Author: dwest77a

cfapyx/backend.py

@@ -22,11 +22,13 @@ def open_cfa_dataset(
         decode_coords=None,
         use_cftime=None,
         decode_timedelta=None,
-        cfa_options: dict=None,
+        cfa_options: dict = None,
         group=None,
         ):
     """
-    Top-level function which opens a CFA dataset using Xarray. Creates a CFA Datastore 
+    Top-level function which opens a CFA dataset using Xarray. 
+    
+    Creates a CFA Datastore 
     from the ``filename_or_obj`` provided, then passes this to a CFA StoreBackendEntrypoint
     to create an Xarray Dataset. Most parameters are not handled by CFA, so only the 
     CFA-relevant ones are described here.
@@ -52,11 +54,7 @@ def open_cfa_dataset(
     store = CFADataStore.open(filename_or_obj, group=group)
 
     # Expands cfa_options into individual kwargs for the store.
-    store.cfa_options    = cfa_options
-
-    use_active = False
-    if hasattr(store, 'use_active'):
-        use_active = store.use_active
+    store.cfa_options = cfa_options
 
     # Xarray makes use of StoreBackendEntrypoints to provide the Dataset 'ds'
     store_entrypoint = CFAStoreBackendEntrypoint()
@@ -68,13 +66,13 @@ def open_cfa_dataset(
         decode_coords=decode_coords,
         drop_variables=drop_variables,
         use_cftime=use_cftime,
-        decode_timedelta=decode_timedelta,
-        use_active=use_active
+        decode_timedelta=decode_timedelta
     )
 
     return ds
 
 class CFANetCDFBackendEntrypoint(BackendEntrypoint):
+    """Open CFA-netCDF files (.nca) using 'cfapyx' in Xarray"""
 
     description = 'Open CFA-netCDF files (.nca) using "cfapyx" in Xarray'
     url = "https://cedadev.github.io/CFAPyX/"
@@ -115,6 +113,8 @@ def open_dataset(
             group=group)
 
 class CFAStoreBackendEntrypoint(StoreBackendEntrypoint):
+    """Open CFA-based Abstract Data Store"""
+    
     description = "Open CFA-based Abstract Data Store"
     url = "https://cedadev.github.io/CFAPyX/"
 
@@ -128,7 +128,6 @@ def open_dataset(
         drop_variables=None,
         use_cftime=None,
         decode_timedelta=None,
-        use_active=False,
     ) -> Dataset:
         """
         Takes cfa_xarray_store of type AbstractDataStore and creates an xarray.Dataset object.
@@ -162,18 +161,7 @@ def open_dataset(
         )
 
         # Create the xarray.Dataset object here.
-        if use_active:
-            try:
-                from XarrayActive import ActiveDataset
-
-                ds = ActiveDataset(vars, attrs=attrs)
-            except ImportError:
-                raise ImportError(
-                    '"ActiveDataset" from XarrayActive failed to import - please '
-                    'ensure you have the XarrayActive package installed.'
-                )
-        else:
-            ds = Dataset(vars, attrs=attrs)
+        ds = Dataset(vars, attrs=attrs)
 
         ds = ds.set_coords(coord_names.intersection(vars))
         ds.set_close(cfa_xarray_store.close)

cfapyx/datastore.py

@@ -34,6 +34,8 @@ class CFADataStore(NetCDF4DataStore):
     that may be un-set at time of use.
     """
 
+    wrapper = FragmentArrayWrapper
+
     @property
     def chunks(self):
         if hasattr(self,'_cfa_chunks'):
@@ -55,8 +57,7 @@ def cfa_options(self):
             'substitutions': self._substitutions,
             'decode_cfa': self._decode_cfa,
             'chunks': self.chunks,
-            'chunk_limits': self._chunk_limits,
-            'use_active': self.use_active
+            'chunk_limits': self._chunk_limits
         }
 
     @cfa_options.setter
@@ -69,7 +70,6 @@ def _set_cfa_options(
             decode_cfa=True,
             chunks={},
             chunk_limits=True,
-            use_active=False,
         ):
         """
         Method to set cfa options.
@@ -80,8 +80,6 @@ def _set_cfa_options(
         :param decode_cfa:      (bool) Optional setting to disable CFA decoding 
                                 in some cases, default is True.
 
-        :param use_active:      (bool) Enable for use with XarrayActive.
-
         :param chunks:          (dict) Not implemented in 2024.9.0
 
         :param chunk_limits:    (dict) Not implemented in 2024.9.0
@@ -91,7 +89,6 @@ def _set_cfa_options(
         self._substitutions = substitutions
         self._decode_cfa    = decode_cfa
         self._chunk_limits  = chunk_limits
-        self.use_active     = use_active
 
     def _acquire(self, needs_lock=True):
         """
@@ -360,7 +357,7 @@ def open_variable(self, name: str, var):
         :returns:       The variable object opened as either a standard store variable 
                         or CFA aggregated variable.
         """
-        if type(var) == tuple:
+        if isinstance(var, tuple):
             if var[1] and self._decode_cfa:
                 variable = self.open_cfa_variable(name, var[0])
             else:
@@ -412,7 +409,7 @@ def open_cfa_variable(self, name: str, var):
 
         ## Array-like object 
         data = indexing.LazilyIndexedArray(
-            FragmentArrayWrapper(
+            self.wrapper(
                 fragment_info,
                 fragment_space,
                 shape=array_shape,