Merge pull request #32 from BigRoy/bugfix/collect_render_resolution_from_tool

Collect render instance resolution from the tool in comp instead of from comp frame format prefs

Author: BigRoy

client/ayon_fusion/api/lib.py

@@ -405,3 +405,72 @@ def prompt_reset_context():
         update_content_on_context_change()
 
     dialog.deleteLater()
+    
+    
+@contextlib.contextmanager
+def temp_expression(attribute, frame, expression):
+    """Temporarily set an expression on an attribute during context"""
+    # Save old comment
+    old_comment = ""
+    has_expression = False
+
+    if attribute[frame] not in ["", None]:
+        if attribute.GetExpression() is not None:
+            has_expression = True
+            old_comment = attribute.GetExpression()
+            attribute.SetExpression(None)
+        else:
+            old_comment = attribute[frame]
+            attribute[frame] = ""
+
+    try:
+        attribute.SetExpression(expression)
+        yield
+    finally:
+        # Reset old comment
+        attribute.SetExpression(None)
+        if has_expression:
+            attribute.SetExpression(old_comment)
+        else:
+            attribute[frame] = old_comment
+
+
+def get_tool_resolution(tool, frame):
+    """Return the 2D input resolution to a Fusion tool
+
+    If the current tool hasn't been rendered its input resolution
+    hasn't been saved. To combat this, add an expression in
+    the comments field to read the resolution
+
+    Args
+        tool (Fusion Tool): The tool to query input resolution
+        frame (int): The frame to query the resolution on.
+
+    Returns:
+        tuple: width, height as 2-tuple of integers
+
+    Raises:
+        ValueError: Unable to retrieve comp resolution.
+
+    """
+    comp = tool.Composition
+    attribute = tool["Comments"]
+
+    # False undo removes the undo-stack from the undo list
+    with comp_lock_and_undo_chunk(comp, "Read resolution", False):
+
+        # Get width
+        with temp_expression(attribute, frame, "self.Input.OriginalWidth"):
+            value = attribute[frame]
+            if value is None:
+                raise ValueError("Failed to read input width")
+            width = int(value)
+
+        # Get height
+        with temp_expression(attribute, frame, "self.Input.OriginalHeight"):
+            value = attribute[frame]
+            if value is None:
+                raise ValueError("Failed to read input height")
+            height = int(value)
+
+        return width, height

client/ayon_fusion/plugins/publish/collect_render.py

@@ -4,7 +4,7 @@
 
 from ayon_core.pipeline import publish
 from ayon_core.pipeline.publish import RenderInstance
-from ayon_fusion.api.lib import get_frame_path
+from ayon_fusion.api.lib import get_frame_path, get_tool_resolution
 
 
 @attr.s
@@ -50,6 +50,19 @@ def get_instances(self, context):
             if product_type not in ["render", "image"]:
                 continue
 
+            # Get resolution from tool if we can
+            tool = inst.data["transientData"]["tool"]
+            try:
+                width, height = get_tool_resolution(
+                    tool, frame=inst.data["frameStart"])
+            except ValueError:
+                self.log.debug(
+                    f"Unable to get resolution from tool: {tool}. "
+                    "Falling back to comp frame format resolution "
+                    "preferences.")
+                width = comp_frame_format_prefs.get("Width")
+                height = comp_frame_format_prefs.get("Height")
+
             instance_families = inst.data.get("families", [])
             product_name = inst.data["productName"]
             instance = FusionRenderInstance(
@@ -69,8 +82,8 @@ def get_instances(self, context):
                 setMembers='',
                 publish=True,
                 name=product_name,
-                resolutionWidth=comp_frame_format_prefs.get("Width"),
-                resolutionHeight=comp_frame_format_prefs.get("Height"),
+                resolutionWidth=width,
+                resolutionHeight=height,
                 pixelAspect=aspect_x / aspect_y,
                 tileRendering=False,
                 tilesX=0,

client/ayon_fusion/plugins/publish/validate_saver_resolution.py

@@ -5,7 +5,7 @@
 )
 
 from ayon_fusion.api.action import SelectInvalidAction
-from ayon_fusion.api import comp_lock_and_undo_chunk
+from ayon_fusion.api.lib import get_tool_resolution
 
 
 class ValidateSaverResolution(
@@ -51,7 +51,16 @@ def get_invalid(cls, instance):
     def get_resolution(cls, instance):
         saver = instance.data["tool"]
         first_frame = instance.data["frameStartHandle"]
-        return cls.get_tool_resolution(saver, frame=first_frame)
+
+        try:
+            return get_tool_resolution(saver, frame=first_frame)
+        except ValueError:
+            raise PublishValidationError(
+                "Cannot get resolution info for frame '{}'.\n\n "
+                "Please check that saver has connected input.".format(
+                    first_frame
+                )
+            )
 
     @classmethod
     def get_expected_resolution(cls, instance):
@@ -65,60 +74,3 @@ def get_expected_resolution(cls, instance):
 
         attributes = entity["attrib"]
         return attributes["resolutionWidth"], attributes["resolutionHeight"]
-
-    @classmethod
-    def get_tool_resolution(cls, tool, frame):
-        """Return the 2D input resolution to a Fusion tool
-
-        If the current tool hasn't been rendered its input resolution
-        hasn't been saved. To combat this, add an expression in
-        the comments field to read the resolution
-
-        Args
-            tool (Fusion Tool): The tool to query input resolution
-            frame (int): The frame to query the resolution on.
-
-        Returns:
-            tuple: width, height as 2-tuple of integers
-
-        """
-        comp = tool.Composition
-
-        # False undo removes the undo-stack from the undo list
-        with comp_lock_and_undo_chunk(comp, "Read resolution", False):
-            # Save old comment
-            old_comment = ""
-            has_expression = False
-
-            if tool["Comments"][frame] not in ["", None]:
-                if tool["Comments"].GetExpression() is not None:
-                    has_expression = True
-                    old_comment = tool["Comments"].GetExpression()
-                    tool["Comments"].SetExpression(None)
-                else:
-                    old_comment = tool["Comments"][frame]
-                    tool["Comments"][frame] = ""
-            # Get input width
-            tool["Comments"].SetExpression("self.Input.OriginalWidth")
-            if tool["Comments"][frame] is None:
-                raise PublishValidationError(
-                    "Cannot get resolution info for frame '{}'.\n\n "
-                    "Please check that saver has connected input.".format(
-                        frame
-                    )
-                )
-
-            width = int(tool["Comments"][frame])
-
-            # Get input height
-            tool["Comments"].SetExpression("self.Input.OriginalHeight")
-            height = int(tool["Comments"][frame])
-
-            # Reset old comment
-            tool["Comments"].SetExpression(None)
-            if has_expression:
-                tool["Comments"].SetExpression(old_comment)
-            else:
-                tool["Comments"][frame] = old_comment
-
-            return width, height