Merge pull request #550 from ynput/bugfix/add_deadline_to_prerender

Deadline: run deadline collectors on preprender

server_addon/deadline/client/ayon_deadline/lib.py

@@ -0,0 +1,10 @@
+# describes list of product typed used for plugin filtering for farm publishing
+FARM_FAMILIES = [
+    "render", "render.farm", "render.frames_farm",
+    "prerender", "prerender.farm", "prerender.frames_farm",
+    "renderlayer", "imagesequence", "image",
+    "vrayscene", "maxrender",
+    "arnold_rop", "mantra_rop",
+    "karma_rop", "vray_rop", "redshift_rop",
+    "renderFarm", "usrender", "publish.hou"
+]

server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py

@@ -8,6 +8,8 @@ attribute or using default server if that attribute doesn't exists.
 import pyblish.api
 from ayon_core.pipeline.publish import KnownPublishError
 
+from ayon_deadline.lib import FARM_FAMILIES
+
 
 class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     """Collect Deadline Webservice URL from instance."""
@@ -16,20 +18,8 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder + 0.225
     label = "Deadline Webservice from the Instance"
     targets = ["local"]
-    families = ["render",
-                "rendering",
-                "render.farm",
-                "renderFarm",
-                "renderlayer",
-                "maxrender",
-                "usdrender",
-                "redshift_rop",
-                "arnold_rop",
-                "mantra_rop",
-                "karma_rop",
-                "vray_rop",
-                "publish.hou",
-                "image"]  # for Fusion
+
+    families = FARM_FAMILIES
 
     def process(self, instance):
         if not instance.data.get("farm"):

server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py

@@ -3,6 +3,8 @@ import pyblish.api
 from ayon_core.lib import TextDef
 from ayon_core.pipeline.publish import AYONPyblishPluginMixin
 
+from ayon_deadline.lib import FARM_FAMILIES
+
 
 class CollectDeadlinePools(pyblish.api.InstancePlugin,
                            AYONPyblishPluginMixin):
@@ -36,22 +38,7 @@ class CollectDeadlinePools(pyblish.api.InstancePlugin,
         "nuke",
     ]
 
-    families = [
-        "render",
-        "prerender",
-        "rendering",
-        "render.farm",
-        "renderFarm",
-        "renderlayer",
-        "maxrender",
-        "usdrender",
-        "redshift_rop",
-        "arnold_rop",
-        "mantra_rop",
-        "karma_rop",
-        "vray_rop",
-        "publish.hou",
-    ]
+    families = FARM_FAMILIES
 
     primary_pool = None
     secondary_pool = None

server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py

@@ -14,6 +14,8 @@ import pyblish.api
 
 from ayon_api import get_server_api_connection
 
+from ayon_deadline.lib import FARM_FAMILIES
+
 
 class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
     """Collects user name and password for artist if DL requires authentication
@@ -31,19 +33,7 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
              "max",
              "houdini"]
 
-    families = ["render",
-                "rendering",
-                "render.farm",
-                "renderFarm",
-                "renderlayer",
-                "maxrender",
-                "usdrender",
-                "redshift_rop",
-                "arnold_rop",
-                "mantra_rop",
-                "karma_rop",
-                "vray_rop",
-                "publish.hou"]
+    families = FARM_FAMILIES
 
     def process(self, instance):
         if not instance.data.get("farm"):