From 60c42b4bbbcfe1b8ddf9b1e9bfb7262ef9723b62 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 7 Jun 2024 17:07:42 +0200
Subject: [PATCH] Standardize families to submit_publish_job

---
 .../collect_deadline_server_from_instance.py  | 23 +++++++------------
 .../plugins/publish/collect_pools.py          | 21 ++++++-----------
 .../publish/collect_user_credentials.py       | 21 ++++++-----------
 3 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
index 7fe3ceab9d..90776220d3 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -16,21 +16,14 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder + 0.225
     label = "Deadline Webservice from the Instance"
     targets = ["local"]
-    families = ["render",
-                "prerender",
-                "rendering",
-                "render.farm",
-                "renderFarm",
-                "renderlayer",
-                "maxrender",
-                "usdrender",
-                "redshift_rop",
-                "arnold_rop",
-                "mantra_rop",
-                "karma_rop",
-                "vray_rop",
-                "publish.hou",
-                "image"]  # for Fusion
+
+    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"]
 
     def process(self, instance):
         if not instance.data.get("farm"):
diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py
index f2437738ef..b3e0625d3b 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py
@@ -36,20 +36,13 @@ 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 = ["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"]
 
     primary_pool = None
     secondary_pool = None
diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
index da9a95a98c..9732b79f5a 100644
--- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
+++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py
@@ -31,20 +31,13 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
              "max",
              "houdini"]
 
-    families = ["render",
-                "prerender",
-                "rendering",
-                "render.farm",
-                "renderFarm",
-                "renderlayer",
-                "maxrender",
-                "usdrender",
-                "redshift_rop",
-                "arnold_rop",
-                "mantra_rop",
-                "karma_rop",
-                "vray_rop",
-                "publish.hou"]
+    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"]
 
     def process(self, instance):
         if not instance.data.get("farm"):