Context Validation Repair Action enhancements

openpype/hosts/maya/api/lib.py

@@ -19,6 +19,7 @@
 from maya import cmds, mel
 from maya.api import OpenMaya
 
+from ayon_api import get_task_by_name
 from openpype.client import (
     get_project,
     get_asset_by_name,
@@ -2614,17 +2615,34 @@ def reset_scene_resolution():
     project_name = get_current_project_name()
     project_doc = get_project(project_name)
     project_data = project_doc["data"]
-    asset_data = get_current_project_asset()["data"]
+    asset_data_root = get_current_project_asset()
+    asset_data = asset_data_root["data"]
+
+    task_name = get_current_task_name()
+    task_entity = get_task_by_name(
+        project_name, asset_data_root["_id"], task_name)
+
 
     # Set project resolution
     width_key = "resolutionWidth"
     height_key = "resolutionHeight"
     pixelAspect_key = "pixelAspect"
 
-    width = asset_data.get(width_key, project_data.get(width_key, 1920))
-    height = asset_data.get(height_key, project_data.get(height_key, 1080))
-    pixelAspect = asset_data.get(pixelAspect_key,
-                                 project_data.get(pixelAspect_key, 1))
+    # Get frame information from task entity
+    # NOTE: If there is no task override then the asset
+    # value is automatically returned instead
+    width = task_entity["attrib"].get(
+        width_key,
+        asset_data.get(
+            width_key, project_data.get(width_key, 1920)))
+    height = task_entity["attrib"].get(
+        height_key,
+        asset_data.get(
+            height_key, project_data.get(height_key, 1080)))
+    pixelAspect = task_entity["attrib"].get(
+        pixelAspect_key,
+        asset_data.get(
+            pixelAspect_key, project_data.get(pixelAspect_key, 1080)))
 
     set_scene_resolution(width, height, pixelAspect)
 

openpype/hosts/maya/plugins/publish/validate_frame_range.py

@@ -53,12 +53,26 @@ def process(self, instance):
             )
             return
 
-        frame_start_handle = int(context.data.get("frameStartHandle"))
-        frame_end_handle = int(context.data.get("frameEndHandle"))
-        handle_start = int(context.data.get("handleStart"))
-        handle_end = int(context.data.get("handleEnd"))
-        frame_start = int(context.data.get("frameStart"))
-        frame_end = int(context.data.get("frameEnd"))
+        # Get frame information from task entity
+        # NOTE: If there is no task override then the asset
+        # value is automatically returned instead
+        task_entity = instance.context.data["taskEntity"]
+        frame_start_handle = task_entity["attrib"]["frameStart"] - \
+            task_entity["attrib"]["handleStart"]
+        frame_end_handle = task_entity["attrib"]["frameEnd"] + \
+            task_entity["attrib"]["handleEnd"]
+        handle_start = task_entity["attrib"]["handleStart"]
+        handle_end = task_entity["attrib"]["handleEnd"]
+        frame_start = task_entity["attrib"]["frameStart"]
+        frame_end = task_entity["attrib"]["frameEnd"]
+
+        # Get frame information from asset context
+        # frame_start_handle = int(context.data.get("frameStartHandle"))
+        # frame_end_handle = int(context.data.get("frameEndHandle"))
+        # handle_start = int(context.data.get("handleStart"))
+        # handle_end = int(context.data.get("handleEnd"))
+        # frame_start = int(context.data.get("frameStart"))
+        # frame_end = int(context.data.get("frameEnd"))
 
         inst_start = int(instance.data.get("frameStartHandle"))
         inst_end = int(instance.data.get("frameEndHandle"))
@@ -117,7 +131,7 @@ def process(self, instance):
     @classmethod
     def repair(cls, instance):
         """
-        Repair instance container to match asset data.
+        Repair instance container to match task / asset data.
         """
 
         if "renderlayer" in instance.data.get("families"):
@@ -128,12 +142,26 @@ def repair(cls, instance):
         node = instance.data["name"]
         context = instance.context
 
-        frame_start_handle = int(context.data.get("frameStartHandle"))
-        frame_end_handle = int(context.data.get("frameEndHandle"))
-        handle_start = int(context.data.get("handleStart"))
-        handle_end = int(context.data.get("handleEnd"))
-        frame_start = int(context.data.get("frameStart"))
-        frame_end = int(context.data.get("frameEnd"))
+        # Get frame information from task entity
+        # NOTE: If there is no task override then the asset
+        # value is automatically returned instead
+        task_entity = instance.context.data["taskEntity"]
+        frame_start_handle = task_entity["attrib"]["frameStart"] - \
+            task_entity["attrib"]["handleStart"]
+        frame_end_handle = task_entity["attrib"]["frameEnd"] + \
+            task_entity["attrib"]["handleEnd"]
+        handle_start = task_entity["attrib"]["handleStart"]
+        handle_end = task_entity["attrib"]["handleEnd"]
+        frame_start = task_entity["attrib"]["frameStart"]
+        frame_end = task_entity["attrib"]["frameEnd"]
+
+        # Get frame information from asset context
+        # frame_start_handle = int(context.data.get("frameStartHandle"))
+        # frame_end_handle = int(context.data.get("frameEndHandle"))
+        # handle_start = int(context.data.get("handleStart"))
+        # handle_end = int(context.data.get("handleEnd"))
+        # frame_start = int(context.data.get("frameStart"))
+        # frame_end = int(context.data.get("frameEnd"))
 
         # Start
         if cmds.attributeQuery("handleStart", node=node, exists=True):

openpype/hosts/maya/plugins/publish/validate_resolution.py

@@ -84,9 +84,13 @@ def get_invalid_resolution(cls, instance):
 
     @classmethod
     def get_db_resolution(cls, instance):
+        task_doc = instance.context.data["taskEntity"]
         asset_doc = instance.data["assetEntity"]
         project_doc = instance.context.data["projectEntity"]
-        for data in [asset_doc["data"], project_doc["data"]]:
+        for data in [
+                task_doc["attrib"],
+                asset_doc["data"],
+                project_doc["data"]]:
             if (
                 "resolutionWidth" in data and
                 "resolutionHeight" in data and

openpype/plugins/publish/collect_context_entities.py

@@ -14,6 +14,8 @@
 
 import pyblish.api
 
+from ayon_api import get_task_by_name
+
 from openpype.client import get_project, get_asset_by_name
 from openpype.pipeline import KnownPublishError
 
@@ -51,6 +53,10 @@ def process(self, context):
 
         context.data["assetEntity"] = asset_entity
 
+        task_entity = get_task_by_name(
+            project_name, asset_entity["_id"], task_name)
+        context.data["taskEntity"] = task_entity
+
         data = asset_entity['data']
 
         # Task type