Merge pull request #2915 from pypeclub/bugfix/OP-2165_Maya-Invalid-review-flag-on-rendered-AOVs-

Maya: invalid review flag on rendered AOVs

openpype/modules/deadline/plugins/publish/submit_publish_job.py

@@ -8,6 +8,7 @@ from copy import copy, deepcopy
 import requests
 import clique
 import openpype.api
+from openpype.pipeline.farm.patterning import match_aov_pattern
 
 from avalon import api, io
 
@@ -107,7 +108,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
     families = ["render.farm", "prerender.farm",
                 "renderlayer", "imagesequence", "vrayscene"]
 
-    aov_filter = {"maya": [r".*(?:[\._-])*([Bb]eauty)(?:[\.|_])*.*"],
+    aov_filter = {"maya": [r".*([Bb]eauty).*"],
                   "aftereffects": [r".*"],  # for everything from AE
                   "harmony": [r".*"],  # for everything from AE
                   "celaction": [r".*"]}
@@ -129,7 +130,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         "OPENPYPE_PUBLISH_JOB"
     ]
 
-    # custom deadline atributes
+    # custom deadline attributes
     deadline_department = ""
     deadline_pool = ""
     deadline_pool_secondary = ""
@@ -449,12 +450,15 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             app = os.environ.get("AVALON_APP", "")
 
             preview = False
-            if app in self.aov_filter.keys():
-                for aov_pattern in self.aov_filter[app]:
-                    if re.match(aov_pattern, aov):
-                        preview = True
-                        break
 
+            if isinstance(col, list):
+                render_file_name = os.path.basename(col[0])
+            else:
+                render_file_name = os.path.basename(col)
+            aov_patterns = self.aov_filter
+            preview = match_aov_pattern(app, aov_patterns, render_file_name)
+
+            # toggle preview on if multipart is on
             if instance_data.get("multipartExr"):
                 preview = True
 
@@ -532,22 +536,17 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
             #   should be review made.
             # - "review" tag is never added when is set to 'False'
             if instance["useSequenceForReview"]:
-                # if filtered aov name is found in filename, toggle it for
-                # preview video rendering
-                for app in self.aov_filter.keys():
-                    if os.environ.get("AVALON_APP", "") == app:
-                        # iteratre all aov filters
-                        for aov in self.aov_filter[app]:
-                            if re.match(
-                                aov,
-                                list(collection)[0]
-                            ):
-                                preview = True
-                                break
-
                 # toggle preview on if multipart is on
                 if instance.get("multipartExr", False):
                     preview = True
+                else:
+                    render_file_name = list(collection[0])
+                    host_name = os.environ.get("AVALON_APP", "")
+                    # if filtered aov name is found in filename, toggle it for
+                    # preview video rendering
+                    preview = match_aov_pattern(
+                        host_name, self.aov_filter, render_file_name
+                    )
 
             staging = os.path.dirname(list(collection)[0])
             success, rootless_staging_dir = (

openpype/pipeline/farm/patterning.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+import re
+
+
+def match_aov_pattern(host_name, aov_patterns, render_file_name):
+    """Matching against a `AOV` pattern in the render files.
+
+    In order to match the AOV name we must compare
+    against the render filename string that we are
+    grabbing the render filename string  from the collection
+    that we have grabbed from `exp_files`.
+
+    Args:
+        app (str): Host name.
+        aov_patterns (dict):  AOV patterns from AOV filters.
+        render_file_name (str): Incoming file name to match against.
+
+    Returns:
+        bool: Review state for rendered file (render_file_name).
+    """
+    aov_pattern = aov_patterns.get(host_name, [])
+    if not aov_pattern:
+        return False
+    return any(re.match(p, render_file_name) for p in aov_pattern)

openpype/settings/defaults/project_settings/deadline.json

@@ -83,7 +83,7 @@
             "skip_integration_repre_list": [],
             "aov_filter": {
                 "maya": [
-                    ".+(?:\\.|_)([Bb]eauty)(?:\\.|_).*"
+                    ".*([Bb]eauty).*"
                 ],
                 "nuke": [
                     ".*"
@@ -100,4 +100,4 @@
             }
         }
     }
-}
+}