Skip to content

Commit 805b3c2

Browse files
committed
refactor(zarr-metadata): model casts that only restated a type are gone
`must_understand_subset` widened its argument, then cast its result back to the declared type. The extension fields each `from_json` collects, and the consolidated metadata `to_json` writes, were cast to what pyright already infers, since every member of those documents is a `JSONValue`. `consolidated_raw` and `arrays_to_tuples`' returns restated `object`. Assisted-by: ClaudeCode:claude-opus-5-5
1 parent 5a27243 commit 805b3c2

3 files changed

Lines changed: 17 additions & 38 deletions

File tree

‎packages/zarr-metadata/src/zarr_metadata/model/_array.py‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,11 @@ def must_understand_subset(
115115
runtime isinstance check defends against values looser than the declared
116116
`ZarrV3ExtensionField`).
117117
"""
118-
fields = cast("Mapping[str, object]", extra_fields)
119-
return cast(
120-
"dict[str, ZarrV3ExtensionField]",
121-
{
122-
name: value
123-
for name, value in fields.items()
124-
if not (
125-
isinstance(value, Mapping)
126-
and cast("Mapping[str, object]", value).get("must_understand") is False
127-
)
128-
},
129-
)
118+
return {
119+
name: value
120+
for name, value in extra_fields.items()
121+
if not (isinstance(value, Mapping) and value.get("must_understand") is False)
122+
}
130123

131124

132125
class ZarrV3ArrayMetadataPartial(TypedDict, total=False):
@@ -284,13 +277,9 @@ def to_json(self) -> ZarrV3ArrayMetadataJSON:
284277
def from_json(cls, data: object) -> ZarrV3ArrayMetadata:
285278
# A read model shares no mutable state with what it read.
286279
parsed = copy.deepcopy(parse_array_metadata_v3(data))
287-
# Sound cast: the TypedDict types all non-standard keys as its
288-
# `extra_items` (`ZarrV3ExtensionField`); the comprehension's inferred value
289-
# type is the union over ALL keys because the key filter cannot narrow it.
290-
extra_fields = cast(
291-
"dict[str, ZarrV3ExtensionField]",
292-
{k: v for k, v in parsed.items() if k not in ARRAY_METADATA_STANDARD_KEYS_V3},
293-
)
280+
extra_fields: dict[str, ZarrV3ExtensionField] = {
281+
k: v for k, v in parsed.items() if k not in ARRAY_METADATA_STANDARD_KEYS_V3
282+
}
294283
return cls(
295284
shape=parsed["shape"],
296285
fill_value=parsed["fill_value"],

‎packages/zarr-metadata/src/zarr_metadata/model/_group.py‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ def to_json(self) -> ZarrV3GroupMetadataJSON:
127127
out["attributes"] = copy.deepcopy(self.attributes)
128128
if self.consolidated_metadata is not UNSET:
129129
# Consolidated metadata is a known non-core top-level JSON field.
130-
out[ZARR_V3_CONSOLIDATED_METADATA_KEY] = cast(
131-
"ZarrV3ExtensionField", self.consolidated_metadata.to_json()
132-
)
130+
out[ZARR_V3_CONSOLIDATED_METADATA_KEY] = self.consolidated_metadata.to_json()
133131
for key, value in self.extra_fields.items():
134132
out[key] = copy.deepcopy(value)
135133
return out
@@ -138,8 +136,7 @@ def to_json(self) -> ZarrV3GroupMetadataJSON:
138136
def from_json(cls, data: object) -> ZarrV3GroupMetadata:
139137
# A read model shares no mutable state with what it read.
140138
parsed = copy.deepcopy(parse_group_metadata_v3(data))
141-
# Cast for narrowing across standard and arbitrary extra TypedDict items.
142-
consolidated_raw = cast("object", parsed.get(ZARR_V3_CONSOLIDATED_METADATA_KEY, UNSET))
139+
consolidated_raw: object = parsed.get(ZARR_V3_CONSOLIDATED_METADATA_KEY, UNSET)
143140
consolidated: ZarrV3ConsolidatedMetadata | UNSET
144141
if consolidated_raw is UNSET or consolidated_raw is None:
145142
# consolidated_metadata: null was written by a historical
@@ -148,18 +145,11 @@ def from_json(cls, data: object) -> ZarrV3GroupMetadata:
148145
consolidated = UNSET
149146
else:
150147
consolidated = ZarrV3ConsolidatedMetadata.from_json(consolidated_raw)
151-
# Sound cast: the TypedDict types all non-standard keys as its
152-
# `extra_items` (`ZarrV3ExtensionField`); the comprehension's inferred value
153-
# type is the union over ALL keys because the key filter cannot narrow it.
154-
extra_fields = cast(
155-
"dict[str, ZarrV3ExtensionField]",
156-
{
157-
k: v
158-
for k, v in parsed.items()
159-
if k not in GROUP_METADATA_STANDARD_KEYS_V3
160-
and k != ZARR_V3_CONSOLIDATED_METADATA_KEY
161-
},
162-
)
148+
extra_fields: dict[str, ZarrV3ExtensionField] = {
149+
k: v
150+
for k, v in parsed.items()
151+
if k not in GROUP_METADATA_STANDARD_KEYS_V3 and k != ZARR_V3_CONSOLIDATED_METADATA_KEY
152+
}
163153
return cls(
164154
attributes=dict(parsed.get("attributes", {})),
165155
consolidated_metadata=consolidated,

‎packages/zarr-metadata/src/zarr_metadata/model/_validation.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -979,14 +979,14 @@ def arrays_to_tuples(obj: object) -> object:
979979
converted is original
980980
for converted, original in zip(converted_sequence, sequence, strict=True)
981981
):
982-
return cast("tuple[object, ...]", obj)
982+
return sequence
983983
return converted_sequence
984984
if isinstance(obj, Mapping):
985985
mapping = cast("Mapping[object, object]", obj)
986986
converted: dict[object, object] = {
987987
key: arrays_to_tuples(value) for key, value in mapping.items()
988988
}
989989
if isinstance(obj, dict) and all(converted[key] is value for key, value in mapping.items()):
990-
return cast("object", obj)
990+
return mapping
991991
return converted
992992
return obj

0 commit comments

Comments
 (0)