Minor updates

Author: dwest77a

XarrayActive/__init__.py

@@ -1,4 +1,4 @@
-from .active_xarray import ActiveDataset    # Used by CFAPyX 
-from .active_dask import DaskActiveArray    # Used by CFAPyX
-from .active_chunk import ActiveChunk       # Used by CFAPyX
-from .backend import ActiveBackendEntrypoint
+from XarrayActive.active_xarray import ActiveDataset    # Used by CFAPyX 
+from XarrayActive.active_dask import DaskActiveArray    # Used by CFAPyX
+from XarrayActive.active_chunk import ActiveChunk       # Used by CFAPyX
+from XarrayActive.backend import ActiveBackendEntrypoint

XarrayActive/__pycache__/__init__.cpython-312.pyc

@@ -23,7 +23,8 @@ def active_options(self, value):
 
     def _set_active_options(self, chunks={}, chunk_limits=True):
 
-        if chunks == {}:
+
+        if chunks == {} and False: # Remove for testing
             raise NotImplementedError(
                 'Default chunking is not implemented, please provide a chunk scheme '
                 ' - active_options = {"chunks": {}}'
@@ -106,13 +107,18 @@ def active_method(self, method, axis=None, skipna=None, **kwargs):
 
         if not ret:
 
+            # Create Active client
             active = Active(self.filename, self.address)
             active.method = method
+
+            # Fetch extent for this chunk instance.
             extent = tuple(self.get_extent())
 
+            # Properly format the 'axis' kwarg.
             if axis == None:
                 axis = tuple([i for i in range(self.ndim)])
 
+            # Determine reduction parameter for combining chunk results for dask.
             n = self._numel(method, axes=axis)
 
             if len(axis) == self.ndim:

XarrayActive/__pycache__/active_chunk.cpython-312.pyc

@@ -6,7 +6,8 @@
     get_chunk_positions,
     get_chunk_extent,
     get_dask_chunks,
-    combine_slices
+    combine_slices,
+    normalize_partition_chunks
 )
 from .active_chunk import (
     ActiveChunk, 
@@ -64,6 +65,12 @@ def __init__(
 
         super().__init__(shape, units=units, dtype=dtype)
 
+        self._active_chunks = normalize_partition_chunks(
+            self._active_chunks,
+            self.shape,
+            self.dtype,
+            self.named_dims)
+
         self.chunk_shape = get_chunk_shape(
             self._active_chunks,
             self.shape,
@@ -141,4 +148,4 @@ def __array__(self, *args, **kwargs):
                 explicit_shapes=None
             )
 
-            return DaskActiveArray(dsk, array_name[0], chunks=dask_chunks, dtype=self.dtype)
+            return DaskActiveArray(dsk, array_name[0], chunks=dask_chunks, dtype=self.dtype)

XarrayActive/__pycache__/active_dask.cpython-312.pyc

@@ -16,4 +16,4 @@ authors = [{name = "Daniel Westwood", email = "daniel.westwood@stfc.ac.uk"}]
 packages = ["XarrayActive"]
 
 [project.entry-points."xarray.backends"]
-Active = "XarrayActive:ActiveBackendEntrypoint"
+Active = "XarrayActive.backend:ActiveBackendEntrypoint"

XarrayActive/__pycache__/active_xarray.cpython-312.pyc

@@ -8,4 +8,4 @@ dask==2024.7.0
 cftime==1.6.4
 cfunits==3.3.7
 pytest==7.2.0
-ArrayPartition==1.0
+ArrayPartition==1.0.1