#135 Preferentially use data options if they are given in asdata* functions

Author: astropenguin

xarray_dataclasses/dataarray.py

@@ -29,10 +29,6 @@
 from .typing import DataClass, DataClassFields, DataType, Order, Shape, Sizes
 
 
-# constants
-DEFAULT_OPTIONS = DataOptions(xr.DataArray)
-
-
 # type hints
 P = ParamSpec("P")
 TDataArray = TypeVar("TDataArray", bound=xr.DataArray)
@@ -53,7 +49,25 @@ def __init__(self, *args: P.args, **kwargs: P.kwargs) -> None:
 def asdataarray(
     dataclass: OptionedClass[P, TDataArray],
     reference: Optional[DataType] = None,
-    dataoptions: DataOptions[Any] = DEFAULT_OPTIONS,
+    dataoptions: None = None,
+) -> TDataArray:
+    ...
+
+
+@overload
+def asdataarray(
+    dataclass: DataClass[P],
+    reference: Optional[DataType] = None,
+    dataoptions: None = None,
+) -> xr.DataArray:
+    ...
+
+
+@overload
+def asdataarray(
+    dataclass: OptionedClass[P, Any],
+    reference: Optional[DataType] = None,
+    dataoptions: Optional[DataOptions[TDataArray]] = None,
 ) -> TDataArray:
     ...
 
@@ -62,15 +76,15 @@ def asdataarray(
 def asdataarray(
     dataclass: DataClass[P],
     reference: Optional[DataType] = None,
-    dataoptions: DataOptions[TDataArray] = DEFAULT_OPTIONS,
+    dataoptions: Optional[DataOptions[TDataArray]] = None,
 ) -> TDataArray:
     ...
 
 
 def asdataarray(
     dataclass: Any,
     reference: Optional[DataType] = None,
-    dataoptions: DataOptions[Any] = DEFAULT_OPTIONS,
+    dataoptions: Any = None,
 ) -> Any:
     """Create a DataArray object from a dataclass object.
 
@@ -83,10 +97,11 @@ def asdataarray(
         DataArray object created from the dataclass object.
 
     """
-    try:
-        dataoptions = dataclass.__dataoptions__
-    except AttributeError:
-        pass
+    if dataoptions is None:
+        try:
+            dataoptions = dataclass.__dataoptions__
+        except AttributeError:
+            dataoptions = DataOptions(xr.DataArray)
 
     model = DataModel.from_dataclass(dataclass)
     item = next(iter(model.data.values()))

xarray_dataclasses/dataset.py

@@ -20,10 +20,6 @@
 from .typing import DataClass, DataClassFields, DataType, Order, Shape, Sizes
 
 
-# constants
-DEFAULT_OPTIONS = DataOptions(xr.Dataset)
-
-
 # type hints
 P = ParamSpec("P")
 TDataset = TypeVar("TDataset", bound=xr.Dataset)
@@ -44,7 +40,25 @@ def __init__(self, *args: P.args, **kwargs: P.kwargs) -> None:
 def asdataset(
     dataclass: OptionedClass[P, TDataset],
     reference: Optional[DataType] = None,
-    dataoptions: DataOptions[Any] = DEFAULT_OPTIONS,
+    dataoptions: None = None,
+) -> TDataset:
+    ...
+
+
+@overload
+def asdataset(
+    dataclass: DataClass[P],
+    reference: Optional[DataType] = None,
+    dataoptions: None = None,
+) -> xr.Dataset:
+    ...
+
+
+@overload
+def asdataset(
+    dataclass: OptionedClass[P, Any],
+    reference: Optional[DataType] = None,
+    dataoptions: Optional[DataOptions[TDataset]] = None,
 ) -> TDataset:
     ...
 
@@ -53,15 +67,15 @@ def asdataset(
 def asdataset(
     dataclass: DataClass[P],
     reference: Optional[DataType] = None,
-    dataoptions: DataOptions[TDataset] = DEFAULT_OPTIONS,
+    dataoptions: Optional[DataOptions[TDataset]] = None,
 ) -> TDataset:
     ...
 
 
 def asdataset(
     dataclass: Any,
     reference: Optional[DataType] = None,
-    dataoptions: DataOptions[Any] = DEFAULT_OPTIONS,
+    dataoptions: Any = None,
 ) -> Any:
     """Create a Dataset object from a dataclass object.
 
@@ -74,10 +88,11 @@ def asdataset(
         Dataset object created from the dataclass object.
 
     """
-    try:
-        dataoptions = dataclass.__dataoptions__
-    except AttributeError:
-        pass
+    if dataoptions is None:
+        try:
+            dataoptions = dataclass.__dataoptions__
+        except AttributeError:
+            dataoptions = DataOptions(xr.Dataset)
 
     model = DataModel.from_dataclass(dataclass)
     dataset = dataoptions.factory()