Add *AMF* component IDs to *Look* and *ViewTransform*.

Signed-off-by: Thomas Mansencal <thomas.mansencal@gmail.com>

Author: KelSolaar

opencolorio_config_aces/config/generation/factories.py

@@ -383,6 +383,7 @@ def view_transform_factory(
     from_reference: Mapping[str, Any] | ocio.Transform | None = None,
     reference_space: str | int | None = None,
     base_view_transform: Mapping[str, Any] | ocio.ViewTransform | None = None,
+    interchange_mapping: dict[str, str] | None = None,
     **kwargs: Any,
 ) -> ocio.ViewTransform:
     """
@@ -463,6 +464,10 @@ def view_transform_factory(
     if description is not None:
         view_transform.setDescription(description)  # pyright: ignore
 
+    if interchange_mapping is not None:
+        for key, value in interchange_mapping.items():
+            view_transform.setInterchangeAttribute(key, value)  # pyright: ignore
+
     return view_transform
 
 
@@ -473,6 +478,7 @@ def look_factory(
     forward_transform: Mapping[str, Any] | ocio.Transform | None = None,
     inverse_transform: Mapping[str, Any] | ocio.Transform | None = None,
     base_look: Mapping[str, Any] | ocio.Look | None = None,
+    interchange_mapping: dict[str, str] | None = None,
     **kwargs: Any,
 ) -> ocio.Look:
     """
@@ -534,6 +540,10 @@ def look_factory(
     if description is not None:
         look.setDescription(description)  # pyright: ignore
 
+    if interchange_mapping is not None:
+        for key, value in interchange_mapping.items():
+            look.setInterchangeAttribute(key, value)  # pyright: ignore
+
     return look
 
 

opencolorio_config_aces/config/reference/discover/classify.py

@@ -1561,19 +1561,19 @@ def filter_amf_components(
     ...     "DISPLAY - CIE-XYZ-D65_to_sRGB - MIRROR NEGS",
     ...     filterers_all
     ... )  # doctest: +ELLIPSIS
-    ['urn:ampas:aces:transformId:v2.0:Output.Academy.\
+    ['urn:ampas:aces:transformId:v2.0:InvOutput.Academy.\
 Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1', \
-'urn:ampas:aces:transformId:v2.0:InvOutput.Academy.\
+'urn:ampas:aces:transformId:v2.0:Output.Academy.\
 Rec709-D65_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1']
     >>> filterers_all = [lambda x: "-D60_" in x['transform_id']]
     >>> filter_amf_components(
     ...     amf_components,
     ...     "DISPLAY - CIE-XYZ-D65_to_sRGB - MIRROR NEGS",
     ...     filterers_all
     ... )  # doctest: +ELLIPSIS
-    ['urn:ampas:aces:transformId:v2.0:Output.Academy.\
+    ['urn:ampas:aces:transformId:v2.0:InvOutput.Academy.\
 Rec709-D60_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1', \
-'urn:ampas:aces:transformId:v2.0:InvOutput.Academy.\
+'urn:ampas:aces:transformId:v2.0:Output.Academy.\
 Rec709-D60_100nit_in_Rec709-D65_sRGB-Piecewise.a2.v1']
     """
 
@@ -1599,7 +1599,7 @@ def filter_amf_components(
             for filtered_amf_components_dict in filtered_amf_components_dicts
         ]
 
-    return filtered_amf_components
+    return sorted(filtered_amf_components)
 
 
 if __name__ == "__main__":

opencolorio_config_aces/config/reference/generate/config.py

@@ -967,6 +967,20 @@ def generate_config_aces(
                     )
                     continue
 
+                # Extending the "AMF" relations.
+                if not amf_components.get(style):
+                    amf_components[style] = []
+
+                if (
+                    aces_transform_id := transform_data.get("aces_transform_id")
+                ) is not None:
+                    amf_components[style].extend(
+                        {
+                            aces_transform_id,
+                            *amf_components.get(aces_transform_id, []),
+                        }
+                    )
+
             # Checking whether the linked "DisplayColorspace"
             # "BuiltinTransform" style exists.
             style = transform_data["linked_display_colorspace_style"]
@@ -1100,6 +1114,11 @@ def generate_config_aces(
                 describe,
                 signature_only=True,
                 scheme=scheme,
+                interchange_mapping={
+                    "amf_transform_ids": "\n".join(
+                        filter_amf_components(amf_components, style)
+                    )
+                },
             )
             view_transform["transforms_data"] = [transform_data]
             view_transforms.append(view_transform)
@@ -1110,13 +1129,6 @@ def generate_config_aces(
 
             display_style = transform_data["linked_display_colorspace_style"]
 
-            filtered_amf_components = filter_amf_components(
-                amf_components,
-                display_style,
-                additional_filterers["any"].get("amf_component_display_filterers"),
-                additional_filterers["all"].get("amf_component_display_filterers"),
-            )
-
             display = style_to_display_colorspace(
                 display_style,
                 describe,
@@ -1126,11 +1138,20 @@ def generate_config_aces(
                 categories=transform_data.get("categories"),
                 aliases=transform_data_aliases(transform_data),
                 interop_id=transform_data.get("interop_id"),
-                interchange_mapping=(
-                    None
-                    if filtered_amf_components is None
-                    else {"amf_transform_ids": "\n".join(filtered_amf_components)}
-                ),
+                interchange_mapping={
+                    "amf_transform_ids": "\n".join(
+                        filter_amf_components(
+                            amf_components,
+                            display_style,
+                            additional_filterers["any"].get(
+                                "amf_component_display_filterers"
+                            ),
+                            additional_filterers["all"].get(
+                                "amf_component_display_filterers"
+                            ),
+                        )
+                    )
+                },
             )
             display["transforms_data"] = [transform_data]
             display_name = display["name"]
@@ -1170,6 +1191,11 @@ def generate_config_aces(
                     "style": style,
                 },
                 process_space=scene_reference_colorspace["name"],
+                interchange_mapping={
+                    "amf_transform_ids": "\n".join(
+                        filter_amf_components(amf_components, style)
+                    )
+                },
             )
             look["transforms_data"] = [transform_data]
             if look not in looks:
@@ -1180,10 +1206,6 @@ def generate_config_aces(
                 style,
             )
 
-            filtered_amf_components = filter_amf_components(
-                amf_components, ctl_transform.aces_transform_id.aces_transform_id
-            )
-
             colorspace = ctl_transform_to_colorspace(
                 ctl_transform,
                 describe,
@@ -1198,11 +1220,14 @@ def generate_config_aces(
                 categories=transform_data.get("categories"),
                 aliases=transform_data_aliases(transform_data),
                 interop_id=transform_data.get("interop_id"),
-                interchange_mapping=(
-                    None
-                    if filtered_amf_components is None
-                    else {"amf_transform_ids": "\n".join(filtered_amf_components)}
-                ),
+                interchange_mapping={
+                    "amf_transform_ids": "\n".join(
+                        filter_amf_components(
+                            amf_components,
+                            ctl_transform.aces_transform_id.aces_transform_id,
+                        )
+                    )
+                },
             )
             colorspace["transforms_data"] = [transform_data]
             if colorspace not in colorspaces: