@@ -51,29 +51,29 @@ class ArraySpec:
51
51
dims : Dims = ()
52
52
"""Dimensions of the array."""
53
53
54
- type : Optional [AnyDType ] = None
54
+ dtype : Optional [AnyDType ] = None
55
55
"""Data type of the array."""
56
56
57
57
origin : Optional [Type [DataClass [Any ]]] = None
58
- """Dataclass as origins of name, dims, and type ."""
58
+ """Dataclass as origins of name, dims, and dtype ."""
59
59
60
60
def __post_init__ (self ) -> None :
61
- """Update name, dims, and type if origin exists."""
61
+ """Update name, dims, and dtype if origin exists."""
62
62
if self .origin is None :
63
63
return
64
64
65
65
dataspec = DataSpec .from_dataclass (self .origin )
66
66
setattr = object .__setattr__
67
67
68
- for spec in dataspec .specs .of_data .values ():
69
- setattr (self , "dims" , spec .dims )
70
- setattr (self , "type" , spec .type )
71
- break
72
-
73
68
for spec in dataspec .specs .of_name .values ():
74
69
setattr (self , "name" , spec .default )
75
70
break
76
71
72
+ for spec in dataspec .specs .of_data .values ():
73
+ setattr (self , "dims" , spec .dims )
74
+ setattr (self , "dtype" , spec .dtype )
75
+ break
76
+
77
77
78
78
@dataclass (frozen = True )
79
79
class ScalarSpec :
@@ -88,7 +88,7 @@ class ScalarSpec:
88
88
default : Any
89
89
"""Default value of the scalar."""
90
90
91
- type : Any
91
+ dtype : Any
92
92
"""Data type of the scalar."""
93
93
94
94
@@ -183,13 +183,13 @@ def get_spec(field: AnyField) -> Optional[AnySpec]:
183
183
role = role .value ,
184
184
default = field .default ,
185
185
dims = get_dims (field .type ),
186
- type = get_dtype (field .type ),
186
+ dtype = get_dtype (field .type ),
187
187
)
188
188
189
189
if role is Role .ATTR or role is Role .NAME :
190
190
return ScalarSpec (
191
191
name = name ,
192
192
role = role .value ,
193
193
default = field .default ,
194
- type = get_annotated (field .type ),
194
+ dtype = get_annotated (field .type ),
195
195
)
0 commit comments