Fixes for the explicit pattern properties change

Author: WilliamJamieson

src/roman_datamodels/_maker_utils/_ref_files.py

@@ -629,9 +629,7 @@ def _mk_phot_table(shape=(4096,), **kwargs):
     """
     Create the phot_table for the photom reference file.
     """
-    return {
-        entry: _mk_phot_table_entry(entry, shape, **kwargs.get(entry, {})) for entry in (*OPT_ELEM, "GRISM_0", "NOT_CONFIGURED")
-    }
+    return {entry: _mk_phot_table_entry(entry, shape, **kwargs.get(entry, {})) for entry in (*OPT_ELEM, "GRISM_0")}
 
 
 def mk_wfi_img_photom(*, shape=(4096,), filepath=None, **kwargs):

src/roman_datamodels/stnode/_schema.py

@@ -11,7 +11,7 @@
 from typing import TYPE_CHECKING
 
 import asdf
-import asdf.schema
+import asdf.treeutil
 from semantic_version import Version
 
 from ._registry import NODE_CLASSES_BY_TAG, SCHEMA_URIS_BY_TAG
@@ -27,6 +27,42 @@
 NOBOOL = False
 
 
+@functools.cache
+def _load_schema(schema_uri: str) -> dict[str, Any]:
+    """
+    Load a schema by URI.
+
+    Parameters
+    ----------
+    uri : str
+        The URI of the schema to load.
+    """
+    # See Issue https://github.com/asdf-format/asdf/issues/1977
+    if Version(asdf.__version__) < Version("5.1.0"):
+        schema = asdf.schema.load_schema(schema_uri, resolve_references=False)
+
+        def resolve_refs(node, json_id):
+            if json_id is None:
+                json_id = schema_uri
+
+            if isinstance(node, dict) and "$ref" in node:
+                suburl_base, suburl_fragment = asdf.schema._safe_resolve(json_id, node["$ref"])
+
+                if suburl_base == schema_uri or suburl_base == schema.get("id"):
+                    # This is a local ref, which we'll resolve in both cases.
+                    subschema = schema
+                else:
+                    subschema = asdf.schema.load_schema(suburl_base, True)
+
+                return asdf.treeutil.walk_and_modify(asdf.reference.resolve_fragment(subschema, suburl_fragment), resolve_refs)
+
+            return node
+
+        return asdf.treeutil.walk_and_modify(schema, resolve_refs)  # type: ignore[no-any-return]
+
+    return asdf.schema.load_schema(schema_uri, resolve_references=True)  # type: ignore[no-any-return]
+
+
 @functools.cache
 def get_latest_schema(uri: str) -> tuple[str, dict[str, Any]]:
     """
@@ -51,7 +87,7 @@ def get_latest_schema(uri: str) -> tuple[str, dict[str, Any]]:
     if latest_uri is None:
         raise ValueError(f"No schema found for {uri}")
 
-    return latest_uri, asdf.schema.load_schema(latest_uri, resolve_references=True)
+    return latest_uri, _load_schema(latest_uri)
 
 
 @functools.cache
@@ -66,7 +102,7 @@ def _get_schema_from_tag(tag):
     """
     schema_uri = SCHEMA_URIS_BY_TAG[tag]
 
-    return asdf.schema.load_schema(schema_uri, resolve_references=True)
+    return _load_schema(schema_uri)
 
 
 class _MissingKeywordType: