#162 Merge pull request from astropenguin/astropenguin/issue147

Author: astropenguin

tests/test_typing.py

@@ -19,6 +19,7 @@
     get_dims,
     get_dtype,
     get_ftype,
+    get_name,
 )
 
 
@@ -71,6 +72,24 @@
     (Union[Ann[Any, "other"], Ann[Any, "any"]], FType.OTHER),
 ]
 
+testdata_name = [
+    (Attr[Any], None),
+    (Data[Any, Any], None),
+    (Coord[Any, Any], None),
+    (Name[Any], None),
+    (Any, None),
+    (Ann[Attr[Any], "attr"], "attr"),
+    (Ann[Data[Any, Any], "data"], "data"),
+    (Ann[Coord[Any, Any], "coord"], "coord"),
+    (Ann[Name[Any], "name"], "name"),
+    (Ann[Any, "other"], None),
+    (Union[Ann[Attr[Any], "attr"], Ann[Any, "any"]], "attr"),
+    (Union[Ann[Data[Any, Any], "data"], Ann[Any, "any"]], "data"),
+    (Union[Ann[Coord[Any, Any], "coord"], Ann[Any, "any"]], "coord"),
+    (Union[Ann[Name[Any], "name"], Ann[Any, "any"]], "name"),
+    (Union[Ann[Any, "other"], Ann[Any, "any"]], None),
+]
+
 
 # test functions
 @mark.parametrize("tp, dims", testdata_dims)
@@ -86,3 +105,8 @@ def test_get_dtype(tp: Any, dtype: Any) -> None:
 @mark.parametrize("tp, ftype", testdata_ftype)
 def test_get_ftype(tp: Any, ftype: Any) -> None:
     assert get_ftype(tp) == ftype
+
+
+@mark.parametrize("tp, name", testdata_name)
+def test_get_name(tp: Any, name: Any) -> None:
+    assert get_name(tp) == name

xarray_dataclasses/datamodel.py

@@ -26,6 +26,7 @@
     get_dims,
     get_dtype,
     get_ftype,
+    get_name,
 )
 
 
@@ -209,10 +210,11 @@ def eval_dataclass(dataclass: AnyDataClass[PInit]) -> None:
 def get_entry(field: AnyField, value: Any) -> Optional[AnyEntry]:
     """Create an entry from a field and its value."""
     ftype = get_ftype(field.type)
+    name = get_name(field.type, field.name)
 
     if ftype is FType.ATTR or ftype is FType.NAME:
         return AttrEntry(
-            name=field.name,
+            name=name,
             tag=ftype.value,
             value=value,
             type=get_annotated(field.type),
@@ -221,14 +223,14 @@ def get_entry(field: AnyField, value: Any) -> Optional[AnyEntry]:
     if ftype is FType.COORD or ftype is FType.DATA:
         try:
             return DataEntry(
-                name=field.name,
+                name=name,
                 tag=ftype.value,
                 base=get_dataclass(field.type),
                 value=value,
             )
         except TypeError:
             return DataEntry(
-                name=field.name,
+                name=name,
                 tag=ftype.value,
                 dims=get_dims(field.type),
                 dtype=get_dtype(field.type),

xarray_dataclasses/typing.py

@@ -347,3 +347,17 @@ def get_ftype(tp: Any, default: FType = FType.OTHER) -> FType:
         return get_annotations(tp)[0]
     except TypeError:
         return default
+
+
+def get_name(tp: Any, default: Hashable = None) -> Hashable:
+    """Extract a name if found or return given default."""
+    try:
+        annotations = get_annotations(tp)[1:]
+    except TypeError:
+        return default
+
+    for annotation in annotations:
+        if isinstance(annotation, Hashable):
+            return annotation
+
+    return default