From a6e482484eb8c633caf26e93ebb0774ffe98eac7 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Fri, 26 May 2023 11:30:40 +0100
Subject: [PATCH 01/80] Allow for knob values to be validated against multiple
 values.

---
 .../plugins/publish/validate_write_nodes.py   | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py b/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py
index aeecea655f..2a925fbeff 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py
@@ -1,3 +1,5 @@
+from collections import defaultdict
+
 import pyblish.api
 from openpype.pipeline.publish import get_errored_instances_from_context
 from openpype.hosts.nuke.api.lib import (
@@ -87,6 +89,11 @@ class ValidateNukeWriteNode(
             correct_data
         ))
 
+        # Collect key values of same type in a list.
+        values_by_name = defaultdict(list)
+        for knob_data in correct_data["knobs"]:
+            values_by_name[knob_data["name"]].append(knob_data["value"])
+
         for knob_data in correct_data["knobs"]:
             knob_type = knob_data["type"]
             self.log.debug("__ knob_type: {}".format(
@@ -105,28 +112,33 @@ class ValidateNukeWriteNode(
                 )
 
             key = knob_data["name"]
-            value = knob_data["value"]
+            values = values_by_name[key]
             node_value = write_node[key].value()
 
             # fix type differences
-            if type(node_value) in (int, float):
-                try:
-                    if isinstance(value, list):
-                        value = color_gui_to_int(value)
-                    else:
-                        value = float(value)
-                        node_value = float(node_value)
-                except ValueError:
-                    value = str(value)
-            else:
-                value = str(value)
-                node_value = str(node_value)
+            fixed_values = []
+            for value in values:
+                if type(node_value) in (int, float):
+                    try:
 
-            self.log.debug("__ key: {} | value: {}".format(
-                key, value
+                        if isinstance(value, list):
+                            value = color_gui_to_int(value)
+                        else:
+                            value = float(value)
+                            node_value = float(node_value)
+                    except ValueError:
+                        value = str(value)
+                else:
+                    value = str(value)
+                    node_value = str(node_value)
+
+                fixed_values.append(value)
+
+            self.log.debug("__ key: {} | values: {}".format(
+                key, fixed_values
             ))
             if (
-                node_value != value
+                node_value not in fixed_values
                 and key != "file"
                 and key != "tile_color"
             ):

From a216087608ea12c2920b6220102f0c77a8312702 Mon Sep 17 00:00:00 2001
From: Fabia Serra Arrizabalaga <fabia.serra92@gmail.com>
Date: Mon, 26 Jun 2023 10:16:51 -0500
Subject: [PATCH 02/80] Fix typos

---
 openpype/hosts/nuke/plugins/publish/extract_camera.py | 4 ++--
 openpype/hosts/nuke/plugins/publish/extract_model.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/extract_camera.py b/openpype/hosts/nuke/plugins/publish/extract_camera.py
index 4286f71e83..33df6258ae 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_camera.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_camera.py
@@ -11,9 +11,9 @@ from openpype.hosts.nuke.api.lib import maintained_selection
 
 
 class ExtractCamera(publish.Extractor):
-    """ 3D camera exctractor
+    """ 3D camera extractor
     """
-    label = 'Exctract Camera'
+    label = 'Extract Camera'
     order = pyblish.api.ExtractorOrder
     families = ["camera"]
     hosts = ["nuke"]
diff --git a/openpype/hosts/nuke/plugins/publish/extract_model.py b/openpype/hosts/nuke/plugins/publish/extract_model.py
index 814d404137..00462f8035 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_model.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_model.py
@@ -11,9 +11,9 @@ from openpype.hosts.nuke.api.lib import (
 
 
 class ExtractModel(publish.Extractor):
-    """ 3D model exctractor
+    """ 3D model extractor
     """
-    label = 'Exctract Model'
+    label = 'Extract Model'
     order = pyblish.api.ExtractorOrder
     families = ["model"]
     hosts = ["nuke"]

From b4ae58634d3697c7ccf72ba58fd93d5afa3af24e Mon Sep 17 00:00:00 2001
From: Fabia Serra Arrizabalaga <fabia.serra92@gmail.com>
Date: Mon, 26 Jun 2023 10:19:02 -0500
Subject: [PATCH 03/80] Nuke: Add support to submit existing frames to the farm

---
 openpype/hosts/nuke/api/plugin.py             |  3 ++-
 .../nuke/plugins/publish/collect_writes.py    | 21 ++++++++++++++++++-
 .../plugins/publish/submit_nuke_deadline.py   |  2 +-
 .../plugins/publish/submit_publish_job.py     | 16 +++++++++-----
 .../validate_expected_and_rendered_files.py   |  4 ++++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py
index 7035da2bb5..b82ed0a1e3 100644
--- a/openpype/hosts/nuke/api/plugin.py
+++ b/openpype/hosts/nuke/api/plugin.py
@@ -311,6 +311,7 @@ class NukeWriteCreator(NukeCreator):
         }
         if ("farm_rendering" in self.instance_attributes):
             rendering_targets["farm"] = "Farm rendering"
+            rendering_targets["farm_frames"] = "Existing frames farm rendering"
 
         return EnumDef(
             "render_target",
@@ -669,7 +670,7 @@ class ExporterReviewLut(ExporterReview):
         self.ext = ext or "cube"
         self.cube_size = cube_size or 32
         self.lut_size = lut_size or 1024
-        self.lut_style = lut_style or "linear"
+        self.lut_style = lut_style or "scene_linear"
 
         # set frame start / end and file name to self
         self.get_file_info()
diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 2d1caacdc3..0b6fe392d8 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -29,6 +29,9 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
         instance.data["families"].append(
             "{}.{}".format(family, render_target)
         )
+        self.log.debug("Appending render target to families: {}.{}".format(
+            family, render_target)
+        )
         if instance.data.get("review"):
             instance.data["families"].append("review")
 
@@ -73,7 +76,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
 
         self.log.debug('output dir: {}'.format(output_dir))
 
-        if render_target == "frames":
+        if render_target in ["frames", "farm_frames"]:
             representation = {
                 'name': ext,
                 'ext': ext,
@@ -142,6 +145,22 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             instance.data["representations"].append(representation)
             self.log.info("Publishing rendered frames ...")
 
+            if render_target == "farm_frames":
+                # Farm rendering
+                instance.data["toBeRenderedOn"] = "deadline"
+                instance.data["transfer"] = False
+                instance.data["farm"] = True # to skip integrate
+                self.log.info("Farm rendering ON ...")
+
+                self.log.info(
+                    "Adding collected files %s to expectedFiles instance.data",
+                    collected_frames
+                )
+                if "expectedFiles" not in instance.data:
+                    instance.data["expectedFiles"] = list()
+                    for source_file in collected_frames:
+                        instance.data["expectedFiles"].append(os.path.join(output_dir, source_file))
+
         elif render_target == "farm":
             farm_keys = ["farm_chunk", "farm_priority", "farm_concurrency"]
             for key in farm_keys:
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 4900231783..34e335e442 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -32,7 +32,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
     label = "Submit Nuke to Deadline"
     order = pyblish.api.IntegratorOrder + 0.1
     hosts = ["nuke"]
-    families = ["render", "prerender"]
+    families = ["render.farm", "prerender.farm"]
     optional = True
     targets = ["local"]
 
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 69e9fb6449..677d322a19 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -17,6 +17,7 @@ from openpype.client import (
 from openpype.pipeline import (
     get_representation_path,
     legacy_io,
+    publish,
 )
 from openpype.tests.lib import is_in_tests
 from openpype.pipeline.farm.patterning import match_aov_pattern
@@ -123,7 +124,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
     hosts = ["fusion", "max", "maya", "nuke", "houdini",
              "celaction", "aftereffects", "harmony"]
 
-    families = ["render.farm", "prerender.farm",
+    families = ["render.farm", "render.farm_frames",
+                "prerender.farm", "prerender.farm_frames",
                 "renderlayer", "imagesequence",
                 "vrayscene", "maxrender",
                 "arnold_rop", "mantra_rop",
@@ -334,7 +336,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             for assembly_id in instance.data["bakingSubmissionJobs"]:
                 payload["JobInfo"]["JobDependency{}".format(job_index)] = assembly_id  # noqa: E501
                 job_index += 1
-        else:
+        elif job.get("_id"):
             payload["JobInfo"]["JobDependency0"] = job["_id"]
 
         if instance.data.get("suspend_publish"):
@@ -870,6 +872,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             "multipartExr": data.get("multipartExr", False),
             "jobBatchName": data.get("jobBatchName", ""),
             "useSequenceForReview": data.get("useSequenceForReview", True),
+            "colorspace": data.get("colorspace"),
             # map inputVersions `ObjectId` -> `str` so json supports it
             "inputVersions": list(map(str, data.get("inputVersions", []))),
             "colorspace": instance.data.get("colorspace")
@@ -883,6 +886,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         # transfer specific families from original instance to new render
         for item in self.families_transfer:
             if item in instance.data.get("families", []):
+                self.log.debug("Transfering '%s' family to instance.", item)
                 instance_skeleton_data["families"] += [item]
 
         # transfer specific properties from original instance based on
@@ -890,6 +894,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         for key, values in self.instance_transfer.items():
             if key in instance.data.get("families", []):
                 for v in values:
+                    self.log.debug("Transfering '%s' property to instance.", v)
                     instance_skeleton_data[v] = instance.data.get(v)
 
         # look into instance data if representations are not having any
@@ -912,7 +917,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
                     repre["stagingDir"] = staging_dir
 
             if "publish_on_farm" in repre.get("tags"):
-                # create representations attribute of not there
+                # create representations attribute if not there
                 if "representations" not in instance_skeleton_data.keys():
                     instance_skeleton_data["representations"] = []
 
@@ -1095,6 +1100,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
                 "FTRACK_SERVER": os.environ.get("FTRACK_SERVER"),
             }
 
+        deadline_publish_job_id = None
         if submission_type == "deadline":
             # get default deadline webservice url from deadline module
             self.deadline_url = instance.context.data["defaultDeadline"]
@@ -1118,7 +1124,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             "fps": context.data.get("fps", None),
             "source": source,
             "user": context.data["user"],
-            "version": context.data["version"],  # this is workfile version
+            "version": context.data.get("version"),  # this is workfile version
             "intent": context.data.get("intent"),
             "comment": context.data.get("comment"),
             "job": render_job or None,
@@ -1151,7 +1157,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             json.dump(publish_job, f, indent=4, sort_keys=True)
 
     def _extend_frames(self, asset, subset, start, end):
-        """Get latest version of asset nad update frame range.
+        """Get latest version of asset and update frame range.
 
         Based on minimum and maximuma values.
 
diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index ff4be677e7..6fbaa0d7b5 100644
--- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -21,6 +21,10 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         self.instance = instance
+        # TODO: Find a better way to check whether a job has been submitted with
+        # existing frames
+        if not instance.data["render_job_id"]:
+            return
         frame_list = self._get_frame_list(instance.data["render_job_id"])
 
         for repre in instance.data["representations"]:

From 12ea12c2dedb232bae3b134142e124bc45605837 Mon Sep 17 00:00:00 2001
From: Fabia Serra Arrizabalaga <fabia.serra92@gmail.com>
Date: Mon, 26 Jun 2023 10:46:21 -0500
Subject: [PATCH 04/80] Shush the hound

---
 openpype/hosts/nuke/plugins/publish/collect_writes.py       | 6 ++++--
 .../modules/deadline/plugins/publish/submit_publish_job.py  | 3 ---
 .../plugins/publish/validate_expected_and_rendered_files.py | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 0b6fe392d8..83ad90135f 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -149,7 +149,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
                 # Farm rendering
                 instance.data["toBeRenderedOn"] = "deadline"
                 instance.data["transfer"] = False
-                instance.data["farm"] = True # to skip integrate
+                instance.data["farm"] = True  # to skip integrate
                 self.log.info("Farm rendering ON ...")
 
                 self.log.info(
@@ -159,7 +159,9 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
                 if "expectedFiles" not in instance.data:
                     instance.data["expectedFiles"] = list()
                     for source_file in collected_frames:
-                        instance.data["expectedFiles"].append(os.path.join(output_dir, source_file))
+                        instance.data["expectedFiles"].append(
+                            os.path.join(output_dir, source_file)
+                        )
 
         elif render_target == "farm":
             farm_keys = ["farm_chunk", "farm_priority", "farm_concurrency"]
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 677d322a19..b271f849ba 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -872,7 +872,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             "multipartExr": data.get("multipartExr", False),
             "jobBatchName": data.get("jobBatchName", ""),
             "useSequenceForReview": data.get("useSequenceForReview", True),
-            "colorspace": data.get("colorspace"),
             # map inputVersions `ObjectId` -> `str` so json supports it
             "inputVersions": list(map(str, data.get("inputVersions", []))),
             "colorspace": instance.data.get("colorspace")
@@ -886,7 +885,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         # transfer specific families from original instance to new render
         for item in self.families_transfer:
             if item in instance.data.get("families", []):
-                self.log.debug("Transfering '%s' family to instance.", item)
                 instance_skeleton_data["families"] += [item]
 
         # transfer specific properties from original instance based on
@@ -894,7 +892,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         for key, values in self.instance_transfer.items():
             if key in instance.data.get("families", []):
                 for v in values:
-                    self.log.debug("Transfering '%s' property to instance.", v)
                     instance_skeleton_data[v] = instance.data.get(v)
 
         # look into instance data if representations are not having any
diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index 6fbaa0d7b5..198db7872d 100644
--- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -21,8 +21,8 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         self.instance = instance
-        # TODO: Find a better way to check whether a job has been submitted with
-        # existing frames
+        # TODO: Find a better way to check whether a job has been submitted
+        # with existing frames
         if not instance.data["render_job_id"]:
             return
         frame_list = self._get_frame_list(instance.data["render_job_id"])

From 5c0e02f889da4792a80edb745d5e7a7608f9eca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A0=20Serra=20Arrizabalaga?=
 <fabia.serra92@gmail.com>
Date: Mon, 3 Jul 2023 20:57:33 +0200
Subject: [PATCH 05/80] Reverting colorspace fallback

---
 openpype/hosts/nuke/api/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py
index b82ed0a1e3..be5230d1c1 100644
--- a/openpype/hosts/nuke/api/plugin.py
+++ b/openpype/hosts/nuke/api/plugin.py
@@ -670,7 +670,7 @@ class ExporterReviewLut(ExporterReview):
         self.ext = ext or "cube"
         self.cube_size = cube_size or 32
         self.lut_size = lut_size or 1024
-        self.lut_style = lut_style or "scene_linear"
+        self.lut_style = lut_style or "linear"
 
         # set frame start / end and file name to self
         self.get_file_info()

From 494e662582011ab5e62fc5e814d48a62ef3747f0 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 13 Jul 2023 15:13:53 +0800
Subject: [PATCH 06/80] add optional viewport camera validator for validation
 of renderable camera

---
 .../publish/validate_no_max_content.py        |  1 -
 .../publish/validate_viewport_camera.py       | 43 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 openpype/hosts/max/plugins/publish/validate_viewport_camera.py

diff --git a/openpype/hosts/max/plugins/publish/validate_no_max_content.py b/openpype/hosts/max/plugins/publish/validate_no_max_content.py
index c6a27dace3..73e12e75c9 100644
--- a/openpype/hosts/max/plugins/publish/validate_no_max_content.py
+++ b/openpype/hosts/max/plugins/publish/validate_no_max_content.py
@@ -13,7 +13,6 @@ class ValidateMaxContents(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder
     families = ["camera",
                 "maxScene",
-                "maxrender",
                 "review"]
     hosts = ["max"]
     label = "Max Scene Contents"
diff --git a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
new file mode 100644
index 0000000000..a52b7e0212
--- /dev/null
+++ b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+import pyblish.api
+from openpype.pipeline import (
+    PublishValidationError,
+    OptionalPyblishPluginMixin)
+from openpype.pipeline.publish import RepairAction
+
+from pymxs import runtime as rt
+
+
+class ValidateViewportCamera(pyblish.api.InstancePlugin,
+                             OptionalPyblishPluginMixin):
+    """Validates Viewport Camera
+
+    Check if the renderable camera in scene used as viewport
+    camera for rendering
+    """
+
+    order = pyblish.api.ValidatorOrder
+    families = ["maxrender"]
+    hosts = ["max"]
+    label = "Viewport Camera"
+    optional = True
+    actions = [RepairAction]
+
+    def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+        cameras_in_scene = [c for c in rt.Objects
+                            if rt.classOf(c) in rt.Camera.Classes]
+        if rt.viewport.getCamera() not in cameras_in_scene:
+            raise PublishValidationError(
+                "Cameras in Scene not used as viewport camera"
+            )
+
+    @classmethod
+    def repair(cls, instance):
+        # Get all cameras in the scene
+        cameras_in_scene = [c for c in rt.Objects
+                            if rt.classOf(c) in rt.Camera.Classes]
+        # Set the first camera as viewport camera for rendering
+        if cameras_in_scene:
+            rt.viewport.setCamera(cameras_in_scene[0])
\ No newline at end of file

From ceaffbbfa92f50d2da009b3be30c5df94d015eed Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 13 Jul 2023 15:26:32 +0800
Subject: [PATCH 07/80] add log for repair action

---
 .../hosts/max/plugins/publish/validate_viewport_camera.py   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
index a52b7e0212..d5cf85eb69 100644
--- a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
+++ b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
@@ -36,8 +36,10 @@ class ValidateViewportCamera(pyblish.api.InstancePlugin,
     @classmethod
     def repair(cls, instance):
         # Get all cameras in the scene
-        cameras_in_scene = [c for c in rt.Objects
+        cameras_in_scene = [c.name for c in rt.Objects
                             if rt.classOf(c) in rt.Camera.Classes]
         # Set the first camera as viewport camera for rendering
         if cameras_in_scene:
-            rt.viewport.setCamera(cameras_in_scene[0])
\ No newline at end of file
+            camera = rt.getNodeByName(cameras_in_scene[0])
+            rt.viewport.setCamera(camera)
+            cls.log.info(f"Camera {camera} set as viewport camera")

From 697c126ccee9daa204feb2dfb01b433f24ba8064 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 4 Aug 2023 11:29:28 +0200
Subject: [PATCH 08/80] refactor expected files validator

---
 .../validate_expected_and_rendered_files.py   | 67 ++++++++++++++-----
 1 file changed, 52 insertions(+), 15 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index ff4be677e7..9f1f7bc518 100644
--- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -20,8 +20,19 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
     allow_user_override = True
 
     def process(self, instance):
-        self.instance = instance
-        frame_list = self._get_frame_list(instance.data["render_job_id"])
+        """Process all the nodes in the instance"""
+
+        # get dependency jobs ids for retrieving frame list
+        dependent_job_ids = self._get_dependent_job_ids(instance)
+
+        if not dependent_job_ids:
+            self.log.warning("No dependent jobs found for instance: {}"
+                             "".format(instance))
+            return
+
+        # get list of frames from dependent jobs
+        frame_list = self._get_dependent_jobs_frames(
+            instance, dependent_job_ids)
 
         for repre in instance.data["representations"]:
             expected_files = self._get_expected_files(repre)
@@ -78,26 +89,45 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
                     )
                 )
 
-    def _get_frame_list(self, original_job_id):
+    def _get_dependent_job_ids(self, instance):
+        """Returns list of dependent job ids from instance metadata.json
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+
+        Returns:
+            (list): list of dependent job ids
+
+        """
+        dependent_job_ids = []
+
+        # job_id collected from metadata.json
+        original_job_id = instance.data["render_job_id"]
+
+        dependent_job_ids_env = os.environ.get("RENDER_JOB_IDS")
+        if dependent_job_ids_env:
+            dependent_job_ids = dependent_job_ids_env.split(',')
+        elif original_job_id:
+            dependent_job_ids = [original_job_id]
+
+        return dependent_job_ids
+
+    def _get_dependent_jobs_frames(self, instance, dependent_job_ids):
         """Returns list of frame ranges from all render job.
 
         Render job might be re-submitted so job_id in metadata.json could be
         invalid. GlobalJobPreload injects current job id to RENDER_JOB_IDS.
 
         Args:
-            original_job_id (str)
+            instance (pyblish.api.Instance): pyblish instance
+            dependent_job_ids (list): list of dependent job ids
         Returns:
             (list)
         """
         all_frame_lists = []
-        render_job_ids = os.environ.get("RENDER_JOB_IDS")
-        if render_job_ids:
-            render_job_ids = render_job_ids.split(',')
-        else:  # fallback
-            render_job_ids = [original_job_id]
 
-        for job_id in render_job_ids:
-            job_info = self._get_job_info(job_id)
+        for job_id in dependent_job_ids:
+            job_info = self._get_job_info(instance, job_id)
             frame_list = job_info["Props"].get("Frames")
             if frame_list:
                 all_frame_lists.extend(frame_list.split(','))
@@ -152,18 +182,25 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
 
         return file_name_template, frame_placeholder
 
-    def _get_job_info(self, job_id):
+    def _get_job_info(self, instance, job_id):
         """Calls DL for actual job info for 'job_id'
 
         Might be different than job info saved in metadata.json if user
         manually changes job pre/during rendering.
 
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            job_id (str): Deadline job id
+
+        Returns:
+            (dict): Job info from Deadline
+
         """
         # get default deadline webservice url from deadline module
-        deadline_url = self.instance.context.data["defaultDeadline"]
+        deadline_url = instance.context.data["defaultDeadline"]
         # if custom one is set in instance, use that
-        if self.instance.data.get("deadlineUrl"):
-            deadline_url = self.instance.data.get("deadlineUrl")
+        if instance.data.get("deadlineUrl"):
+            deadline_url = instance.data.get("deadlineUrl")
         assert deadline_url, "Requires Deadline Webservice URL"
 
         url = "{}/api/jobs?JobID={}".format(deadline_url, job_id)

From ff77dc067834197e70e53ee6e56da2b2ee93a103 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 4 Aug 2023 11:49:53 +0200
Subject: [PATCH 09/80] renaming target and its label to make it better sorted
 in ui

---
 openpype/hosts/nuke/api/plugin.py                             | 2 +-
 openpype/hosts/nuke/plugins/publish/collect_writes.py         | 4 ++--
 .../modules/deadline/plugins/publish/submit_publish_job.py    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/nuke/api/plugin.py b/openpype/hosts/nuke/api/plugin.py
index 1843134b9e..6d48c09d60 100644
--- a/openpype/hosts/nuke/api/plugin.py
+++ b/openpype/hosts/nuke/api/plugin.py
@@ -327,8 +327,8 @@ class NukeWriteCreator(NukeCreator):
             "frames": "Use existing frames"
         }
         if ("farm_rendering" in self.instance_attributes):
+            rendering_targets["frames_farm"] = "Use existing frames - farm"
             rendering_targets["farm"] = "Farm rendering"
-            rendering_targets["farm_frames"] = "Existing frames farm rendering"
 
         return EnumDef(
             "render_target",
diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 53827b19e9..0d552b7381 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -76,7 +76,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
 
         self.log.debug('output dir: {}'.format(output_dir))
 
-        if render_target in ["frames", "farm_frames"]:
+        if render_target in ["frames", "frames_farm"]:
             representation = {
                 'name': ext,
                 'ext': ext,
@@ -145,7 +145,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             instance.data["representations"].append(representation)
             self.log.info("Publishing rendered frames ...")
 
-            if render_target == "farm_frames":
+            if render_target == "frames_farm":
                 # Farm rendering
                 instance.data["toBeRenderedOn"] = "deadline"
                 instance.data["transfer"] = False
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 62ac36ecf1..b326f181dc 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -97,8 +97,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
     hosts = ["fusion", "max", "maya", "nuke", "houdini",
              "celaction", "aftereffects", "harmony"]
 
-    families = ["render.farm", "render.farm_frames",
-                "prerender.farm", "prerender.farm_frames",
+    families = ["render.farm", "render.frames_farm",
+                "prerender.farm", "prerender.frames_farm",
                 "renderlayer", "imagesequence",
                 "vrayscene", "maxrender",
                 "arnold_rop", "mantra_rop",

From a39626d71040afb30182a3c5c0e45e5c931bb49c Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 4 Aug 2023 14:57:20 +0200
Subject: [PATCH 10/80] refactor collect_writes

- also update exctract slates so it expect updated data
- and move some data to collect instance data
- also renaming collect instance data to host related name
---
 ..._data.py => collect_nuke_instance_data.py} |  17 +-
 .../nuke/plugins/publish/collect_writes.py    | 412 ++++++++++++------
 .../plugins/publish/extract_slate_frame.py    |   2 +-
 3 files changed, 297 insertions(+), 134 deletions(-)
 rename openpype/hosts/nuke/plugins/publish/{collect_instance_data.py => collect_nuke_instance_data.py} (71%)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_instance_data.py b/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
similarity index 71%
rename from openpype/hosts/nuke/plugins/publish/collect_instance_data.py
rename to openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
index 3908aef4bc..ffcf49d697 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_instance_data.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
@@ -2,11 +2,13 @@ import nuke
 import pyblish.api
 
 
-class CollectInstanceData(pyblish.api.InstancePlugin):
-    """Collect all nodes with Avalon knob."""
+class CollectNukeInstanceData(pyblish.api.InstancePlugin):
+    """Collect Nuke instance data
+
+    """
 
     order = pyblish.api.CollectorOrder - 0.49
-    label = "Collect Instance Data"
+    label = "Collect Nuke Instance Data"
     hosts = ["nuke", "nukeassist"]
 
     # presets
@@ -40,5 +42,14 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
             "pixelAspect": pixel_aspect
 
         })
+
+        # add review family if review activated on instance
+        if instance.data.get("review"):
+            instance.data["families"].append("review")
+
+        # add creator attributes to instance
+        creator_attributes = instance.data["creator_attributes"]
+        instance.data.update(creator_attributes)
+
         self.log.debug("Collected instance: {}".format(
             instance.data))
diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 0d552b7381..307d323908 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -1,5 +1,4 @@
 import os
-from pprint import pformat
 import nuke
 import pyblish.api
 from openpype.hosts.nuke import api as napi
@@ -15,33 +14,16 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
     hosts = ["nuke", "nukeassist"]
     families = ["render", "prerender", "image"]
 
+    # cashing
+    _write_nodes = {}
+    _frame_ranges = {}
+
     def process(self, instance):
-        self.log.debug(pformat(instance.data))
-        creator_attributes = instance.data["creator_attributes"]
-        instance.data.update(creator_attributes)
 
         group_node = instance.data["transientData"]["node"]
         render_target = instance.data["render_target"]
-        family = instance.data["family"]
-        families = instance.data["families"]
 
-        # add targeted family to families
-        instance.data["families"].append(
-            "{}.{}".format(family, render_target)
-        )
-        self.log.debug("Appending render target to families: {}.{}".format(
-            family, render_target)
-        )
-        if instance.data.get("review"):
-            instance.data["families"].append("review")
-
-        child_nodes = napi.get_instance_group_node_childs(instance)
-        instance.data["transientData"]["childNodes"] = child_nodes
-
-        write_node = None
-        for x in child_nodes:
-            if x.Class() == "Write":
-                write_node = x
+        write_node = self._write_node_helper(instance)
 
         if write_node is None:
             self.log.warning(
@@ -51,131 +33,134 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             )
             return
 
-        instance.data["writeNode"] = write_node
-        self.log.debug("checking instance: {}".format(instance))
+        # get colorspace and add to version data
+        colorspace = napi.get_colorspace_from_node(write_node)
 
-        # Determine defined file type
-        ext = write_node["file_type"].value()
+        if render_target == "frames":
+            self._set_existing_files_data(instance, colorspace)
 
-        # Get frame range
-        handle_start = instance.context.data["handleStart"]
-        handle_end = instance.context.data["handleEnd"]
-        first_frame = int(nuke.root()["first_frame"].getValue())
-        last_frame = int(nuke.root()["last_frame"].getValue())
-        frame_length = int(last_frame - first_frame + 1)
+        elif render_target == "frames_farm":
+            collected_frames = self._set_existing_files_data(
+                instance, colorspace)
 
-        if write_node["use_limit"].getValue():
-            first_frame = int(write_node["first"].getValue())
-            last_frame = int(write_node["last"].getValue())
+            self._set_expected_files(instance, collected_frames)
+
+            self._add_farm_instance_data(instance)
+
+        elif render_target == "farm":
+            self._add_farm_instance_data(instance)
+
+        # set additional instance data
+        self._set_additional_instance_data(instance, render_target, colorspace)
+
+    def _set_existing_files_data(self, instance, colorspace):
+        """Set existing files data to instance data.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            colorspace (str): colorspace
+
+        Returns:
+            list: collected frames
+        """
+        collected_frames = self._get_collected_frames(instance)
+
+        representation = self._get_existing_frames_representation(
+            instance, collected_frames
+        )
+
+        # inject colorspace data
+        self.set_representation_colorspace(
+            representation, instance.context,
+            colorspace=colorspace
+        )
+
+        instance.data["representations"].append(representation)
+
+        return collected_frames
+
+    def _set_expected_files(self, instance, collected_frames):
+        """Set expected files to instance data.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            collected_frames (list): collected frames
+        """
+        write_node = self._write_node_helper(instance)
 
         write_file_path = nuke.filename(write_node)
         output_dir = os.path.dirname(write_file_path)
 
-        # get colorspace and add to version data
-        colorspace = napi.get_colorspace_from_node(write_node)
+        instance.data["expectedFiles"] = [
+            os.path.join(output_dir, source_file)
+            for source_file in collected_frames
+        ]
 
-        self.log.debug('output dir: {}'.format(output_dir))
+    def _get_frame_range_data(self, instance):
+        """Get frame range data from instance.
 
-        if render_target in ["frames", "frames_farm"]:
-            representation = {
-                'name': ext,
-                'ext': ext,
-                "stagingDir": output_dir,
-                "tags": []
-            }
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
 
-            # get file path knob
-            node_file_knob = write_node["file"]
-            # list file paths based on input frames
-            expected_paths = list(sorted({
-                node_file_knob.evaluate(frame)
-                for frame in range(first_frame, last_frame + 1)
-            }))
+        Returns:
+            tuple: first_frame, last_frame
+        """
 
-            # convert only to base names
-            expected_filenames = [
-                os.path.basename(filepath)
-                for filepath in expected_paths
-            ]
+        instance_name = instance.data["name"]
 
-            # make sure files are existing at folder
-            collected_frames = [
-                filename
-                for filename in os.listdir(output_dir)
-                if filename in expected_filenames
-            ]
+        if self._frame_ranges.get(instance_name):
+            # return cashed write node
+            return self._frame_ranges[instance_name]
 
-            if collected_frames:
-                collected_frames_len = len(collected_frames)
-                frame_start_str = "%0{}d".format(
-                    len(str(last_frame))) % first_frame
-                representation['frameStart'] = frame_start_str
+        write_node = self._write_node_helper(instance)
 
-                # in case slate is expected and not yet rendered
-                self.log.debug("_ frame_length: {}".format(frame_length))
-                self.log.debug("_ collected_frames_len: {}".format(
-                    collected_frames_len))
+        # Get frame range from workfile
+        first_frame = int(nuke.root()["first_frame"].getValue())
+        last_frame = int(nuke.root()["last_frame"].getValue())
 
-                # this will only run if slate frame is not already
-                # rendered from previews publishes
-                if (
-                    "slate" in families
-                    and frame_length == collected_frames_len
-                    and family == "render"
-                ):
-                    frame_slate_str = (
-                        "{{:0{}d}}".format(len(str(last_frame)))
-                    ).format(first_frame - 1)
+        # Get frame range from write node if activated
+        if write_node["use_limit"].getValue():
+            first_frame = int(write_node["first"].getValue())
+            last_frame = int(write_node["last"].getValue())
 
-                    slate_frame = collected_frames[0].replace(
-                        frame_start_str, frame_slate_str)
-                    collected_frames.insert(0, slate_frame)
+        # add to cache
+        self._frame_ranges[instance_name] = (first_frame, last_frame)
 
-                if collected_frames_len == 1:
-                    representation['files'] = collected_frames.pop()
-                else:
-                    representation['files'] = collected_frames
+        return first_frame, last_frame
 
-                # inject colorspace data
-                self.set_representation_colorspace(
-                    representation, instance.context,
-                    colorspace=colorspace
-                )
+    def _set_additional_instance_data(
+        self, instance, render_target, colorspace
+    ):
+        """Set additional instance data.
 
-            instance.data["representations"].append(representation)
-            self.log.info("Publishing rendered frames ...")
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            render_target (str): render target
+            colorspace (str): colorspace
+        """
+        family = instance.data["family"]
 
-            if render_target == "frames_farm":
-                # Farm rendering
-                instance.data["toBeRenderedOn"] = "deadline"
-                instance.data["transfer"] = False
-                instance.data["farm"] = True  # to skip integrate
-                self.log.info("Farm rendering ON ...")
+        # add targeted family to families
+        instance.data["families"].append(
+            "{}.{}".format(family, render_target)
+        )
+        self.log.info("Appending render target to families: {}.{}".format(
+            family, render_target)
+        )
 
-                self.log.info(
-                    "Adding collected files %s to expectedFiles instance.data",
-                    collected_frames
-                )
-                if "expectedFiles" not in instance.data:
-                    instance.data["expectedFiles"] = list()
-                    for source_file in collected_frames:
-                        instance.data["expectedFiles"].append(
-                            os.path.join(output_dir, source_file)
-                        )
+        write_node = self._write_node_helper(instance)
 
-        elif render_target == "farm":
-            farm_keys = ["farm_chunk", "farm_priority", "farm_concurrency"]
-            for key in farm_keys:
-                # Skip if key is not in creator attributes
-                if key not in creator_attributes:
-                    continue
-                # Add farm attributes to instance
-                instance.data[key] = creator_attributes[key]
+        # Determine defined file type
+        ext = write_node["file_type"].value()
 
-            # Farm rendering
-            instance.data["transfer"] = False
-            instance.data["farm"] = True
-            self.log.info("Farm rendering ON ...")
+        # get frame range data
+        handle_start = instance.context.data["handleStart"]
+        handle_end = instance.context.data["handleEnd"]
+        first_frame, last_frame = self._get_frame_range_data(instance)
+
+        # get output paths
+        write_file_path = nuke.filename(write_node)
+        output_dir = os.path.dirname(write_file_path)
 
         # TODO: remove this when we have proper colorspace support
         version_data = {
@@ -209,10 +194,6 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
                 "frameEndHandle": last_frame,
             })
 
-        # make sure rendered sequence on farm will
-        # be used for extract review
-        if not instance.data.get("review"):
-            instance.data["useSequenceForReview"] = False
 
         # TODO temporarily set stagingDir as persistent for backward
         # compatibility. This is mainly focused on `renders`folders which
@@ -220,4 +201,175 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
         # this logic should be removed and replaced with custom staging dir
         instance.data["stagingDir_persistent"] = True
 
-        self.log.debug("instance.data: {}".format(pformat(instance.data)))
+    def _write_node_helper(self, instance):
+        """Helper function to get write node from instance.
+
+        Also sets instance transient data with child nodes.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+
+        Returns:
+            nuke.Node: write node
+        """
+        instance_name = instance.data["name"]
+
+        if self._write_nodes.get(instance_name):
+            # return cashed write node
+            return self._write_nodes[instance_name]
+
+        # get all child nodes from group node
+        child_nodes = napi.get_instance_group_node_childs(instance)
+
+        # set child nodes to instance transient data
+        instance.data["transientData"]["childNodes"] = child_nodes
+
+        write_node = None
+        for node_ in child_nodes:
+            if node_.Class() == "Write":
+                write_node = node_
+
+        if write_node:
+            # for slate frame extraction
+            instance.data["transientData"]["writeNode"] = write_node
+            # add to cache
+            self._write_nodes[instance_name] = write_node
+
+            return self._write_nodes[instance_name]
+
+    def _get_existing_frames_representation(
+        self,
+        instance,
+        collected_frames
+    ):
+        """Get existing frames representation.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            collected_frames (list): collected frames
+
+        Returns:
+            dict: representation
+        """
+
+        first_frame, last_frame = self._get_frame_range_data(instance)
+
+        write_node = self._write_node_helper(instance)
+
+        write_file_path = nuke.filename(write_node)
+        output_dir = os.path.dirname(write_file_path)
+
+        # Determine defined file type
+        ext = write_node["file_type"].value()
+
+        representation = {
+            "name": ext,
+            "ext": ext,
+            "stagingDir": output_dir,
+            "tags": []
+        }
+
+        frame_start_str = "%0{}d".format(
+            len(str(last_frame))) % first_frame
+        representation['frameStart'] = frame_start_str
+
+        # set slate frame
+        collected_frames = self._add_slate_frame_to_collected_frames(
+            instance,
+            collected_frames,
+            frame_start_str,
+            first_frame,
+            last_frame
+        )
+
+        if len(collected_frames) == 1:
+            representation['files'] = collected_frames.pop()
+        else:
+            representation['files'] = collected_frames
+
+        return representation
+
+    def _add_slate_frame_to_collected_frames(
+        self,
+        instance,
+        collected_frames,
+        frame_start_str,
+        first_frame,
+        last_frame
+    ):
+        """Set slate frame."""
+        frame_length = int(last_frame - first_frame + 1)
+
+        # this will only run if slate frame is not already
+        # rendered from previews publishes
+        if (
+            "slate" in instance.data["families"]
+            and frame_length == len(collected_frames)
+            and instance.data["family"] == "render"
+        ):
+            frame_slate_str = (
+                "{{:0{}d}}".format(len(str(last_frame)))
+            ).format(first_frame - 1)
+
+        slate_frame = collected_frames[0].replace(
+            frame_start_str, frame_slate_str)
+        collected_frames.insert(0, slate_frame)
+
+        return collected_frames
+
+    def _add_farm_instance_data(self, instance):
+        """Add farm publishing related instance data.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+        """
+
+        # make sure rendered sequence on farm will
+        # be used for extract review
+        if not instance.data.get("review"):
+            instance.data["useSequenceForReview"] = False
+
+        # Farm rendering
+        instance.data["transfer"] = False
+        instance.data["farm"] = True
+        self.log.info("Farm rendering ON ...")
+
+    def _get_collected_frames(self, instance):
+        """Get collected frames.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+
+        Returns:
+            list: collected frames
+        """
+
+        first_frame, last_frame = self._get_frame_range_data(instance)
+
+        write_node = self._write_node_helper(instance)
+
+        write_file_path = nuke.filename(write_node)
+        output_dir = os.path.dirname(write_file_path)
+
+        # get file path knob
+        node_file_knob = write_node["file"]
+        # list file paths based on input frames
+        expected_paths = list(sorted({
+            node_file_knob.evaluate(frame)
+            for frame in range(first_frame, last_frame + 1)
+        }))
+
+        # convert only to base names
+        expected_filenames = [
+            os.path.basename(filepath)
+            for filepath in expected_paths
+        ]
+
+        # make sure files are existing at folder
+        collected_frames = [
+            filename
+            for filename in os.listdir(output_dir)
+            if filename in expected_filenames
+        ]
+
+        return collected_frames
diff --git a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
index 06c086b10d..25262a7418 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
@@ -249,7 +249,7 @@ class ExtractSlateFrame(publish.Extractor):
 
         # Add file to representation files
         # - get write node
-        write_node = instance.data["writeNode"]
+        write_node = instance.data["transientData"]["writeNode"]
         # - evaluate filepaths for first frame and slate frame
         first_filename = os.path.basename(
             write_node["file"].evaluate(first_frame))

From 8fc7d6c57d65e601fd2effa31695b03a53e84373 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 4 Aug 2023 14:59:40 +0200
Subject: [PATCH 11/80] pr suggestions

---
 openpype/hosts/nuke/plugins/publish/collect_writes.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 307d323908..fce2e571a0 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -330,8 +330,10 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             instance.data["useSequenceForReview"] = False
 
         # Farm rendering
-        instance.data["transfer"] = False
-        instance.data["farm"] = True
+        instance.data.update({
+            "transfer": False,
+            "farm": True  # to skip integrate
+        })
         self.log.info("Farm rendering ON ...")
 
     def _get_collected_frames(self, instance):

From 26851293b4bb26805e2070aacb37741f74f32283 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Mon, 7 Aug 2023 21:48:52 +0200
Subject: [PATCH 12/80] simplification of code

---
 .../nuke/plugins/publish/collect_writes.py    | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index fce2e571a0..d3899e0035 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -269,15 +269,14 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             "tags": []
         }
 
-        frame_start_str = "%0{}d".format(
-            len(str(last_frame))) % first_frame
+        frame_start_str = self._get_frame_start_str(first_frame, last_frame)
+
         representation['frameStart'] = frame_start_str
 
         # set slate frame
         collected_frames = self._add_slate_frame_to_collected_frames(
             instance,
             collected_frames,
-            frame_start_str,
             first_frame,
             last_frame
         )
@@ -289,15 +288,40 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
 
         return representation
 
+    def _get_frame_start_str(self, first_frame, last_frame):
+        """Get frame start string.
+
+        Args:
+            first_frame (int): first frame
+            last_frame (int): last frame
+
+        Returns:
+            str: frame start string
+        """
+        # convert first frame to string with padding
+        return (
+            "{{:0{}d}}".format(len(str(last_frame)))
+        ).format(first_frame)
+
     def _add_slate_frame_to_collected_frames(
         self,
         instance,
         collected_frames,
-        frame_start_str,
         first_frame,
         last_frame
     ):
-        """Set slate frame."""
+        """Add slate frame to collected frames.
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            collected_frames (list): collected frames
+            first_frame (int): first frame
+            last_frame (int): last frame
+
+        Returns:
+            list: collected frames
+        """
+        frame_start_str = self._get_frame_start_str(first_frame, last_frame)
         frame_length = int(last_frame - first_frame + 1)
 
         # this will only run if slate frame is not already
@@ -305,15 +329,15 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
         if (
             "slate" in instance.data["families"]
             and frame_length == len(collected_frames)
-            and instance.data["family"] == "render"
         ):
-            frame_slate_str = (
-                "{{:0{}d}}".format(len(str(last_frame)))
-            ).format(first_frame - 1)
+            frame_slate_str = self._get_frame_start_str(
+                first_frame - 1,
+                last_frame
+            )
 
-        slate_frame = collected_frames[0].replace(
-            frame_start_str, frame_slate_str)
-        collected_frames.insert(0, slate_frame)
+            slate_frame = collected_frames[0].replace(
+                frame_start_str, frame_slate_str)
+            collected_frames.insert(0, slate_frame)
 
         return collected_frames
 

From 97664e1bbd9c71b17deb7dd4e7c40bbc8b2a5648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Mon, 7 Aug 2023 21:50:23 +0200
Subject: [PATCH 13/80] Update
 openpype/hosts/nuke/plugins/publish/collect_writes.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fabià Serra Arrizabalaga <fabia.serra92@gmail.com>
---
 openpype/hosts/nuke/plugins/publish/collect_writes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index d3899e0035..bf9740563c 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -144,7 +144,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
         instance.data["families"].append(
             "{}.{}".format(family, render_target)
         )
-        self.log.info("Appending render target to families: {}.{}".format(
+        self.log.debug("Appending render target to families: {}.{}".format(
             family, render_target)
         )
 

From f4284e5e646d74d29fea23c25b1d86774f4de909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Mon, 7 Aug 2023 21:51:10 +0200
Subject: [PATCH 14/80] Update
 openpype/hosts/nuke/plugins/publish/collect_writes.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/hosts/nuke/plugins/publish/collect_writes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index bf9740563c..f1b36ba886 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -386,10 +386,10 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
         }))
 
         # convert only to base names
-        expected_filenames = [
+        expected_filenames = {
             os.path.basename(filepath)
             for filepath in expected_paths
-        ]
+        }
 
         # make sure files are existing at folder
         collected_frames = [

From 08e86b50795a3b3cd9fbe5d9a8d8984233cce97e Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 9 Aug 2023 15:37:31 +0200
Subject: [PATCH 15/80] nuke: review was not added to families

---
 .../nuke/plugins/publish/collect_nuke_instance_data.py   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py b/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
index ffcf49d697..edd7a5cf27 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
@@ -43,13 +43,14 @@ class CollectNukeInstanceData(pyblish.api.InstancePlugin):
 
         })
 
-        # add review family if review activated on instance
-        if instance.data.get("review"):
-            instance.data["families"].append("review")
-
         # add creator attributes to instance
         creator_attributes = instance.data["creator_attributes"]
         instance.data.update(creator_attributes)
 
+        # add review family if review activated on instance
+        if instance.data.get("review"):
+            instance.data["families"].append("review")
+
+
         self.log.debug("Collected instance: {}".format(
             instance.data))

From 7b3d0b4f6d0686a44231d685da1fa70fe6e123d7 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 9 Aug 2023 15:38:21 +0200
Subject: [PATCH 16/80] deadline validations are activated for nuke render

---
 .../deadline/plugins/publish/validate_deadline_connection.py    | 2 +-
 .../modules/deadline/plugins/publish/validate_deadline_pools.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py b/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
index d5016a4d82..a30401e7dc 100644
--- a/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -10,7 +10,7 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
     label = "Validate Deadline Web Service"
     order = pyblish.api.ValidatorOrder
     hosts = ["maya", "nuke"]
-    families = ["renderlayer"]
+    families = ["renderlayer", "render"]
 
     def process(self, instance):
         # get default deadline webservice url from deadline module
diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
index e1c0595830..594f0ef866 100644
--- a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -19,6 +19,7 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
     order = pyblish.api.ValidatorOrder
     families = ["rendering",
                 "render.farm",
+                "render.frames_farm",
                 "renderFarm",
                 "renderlayer",
                 "maxrender"]

From 84480649c8643589085d900e2f664457adfe2bb8 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 9 Aug 2023 15:45:13 +0200
Subject: [PATCH 17/80] nuke: implementing `frame_farm` target to deadline
 submitter

---
 .../plugins/publish/submit_nuke_deadline.py   | 95 ++++++++++++-------
 1 file changed, 60 insertions(+), 35 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 93c6ad8139..cfdeb4968b 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -90,7 +90,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         if not instance.data.get("farm"):
             self.log.debug("Skipping local instance.")
             return
-
         instance.data["attributeValues"] = self.get_attr_values_from_data(
             instance.data)
 
@@ -123,13 +122,10 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         render_path = instance.data['path']
         script_path = context.data["currentFile"]
 
-        for item in context:
-            if "workfile" in item.data["families"]:
-                msg = "Workfile (scene) must be published along"
-                assert item.data["publish"] is True, msg
-
-                template_data = item.data.get("anatomyData")
-                rep = item.data.get("representations")[0].get("name")
+        for item_ in context:
+            if "workfile" in item_.data["family"]:
+                template_data = item_.data.get("anatomyData")
+                rep = item_.data.get("representations")[0].get("name")
                 template_data["representation"] = rep
                 template_data["ext"] = rep
                 template_data["comment"] = None
@@ -141,19 +137,24 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
                     "Using published scene for render {}".format(script_path)
                 )
 
-        response = self.payload_submit(
-            instance,
-            script_path,
-            render_path,
-            node.name(),
-            submit_frame_start,
-            submit_frame_end
-        )
-        # Store output dir for unified publisher (filesequence)
-        instance.data["deadlineSubmissionJob"] = response.json()
-        instance.data["outputDir"] = os.path.dirname(
-            render_path).replace("\\", "/")
-        instance.data["publishJobState"] = "Suspended"
+        # only add main rendering job if target is not frames_farm
+        r_job_response_json = None
+        if instance.data["render_target"] != "frames_farm":
+            r_job_response = self.payload_submit(
+                instance,
+                script_path,
+                render_path,
+                node.name(),
+                submit_frame_start,
+                submit_frame_end
+            )
+            r_job_response_json = r_job_response.json()
+            instance.data["deadlineSubmissionJob"] = r_job_response_json
+
+            # Store output dir for unified publisher (filesequence)
+            instance.data["outputDir"] = os.path.dirname(
+                render_path).replace("\\", "/")
+            instance.data["publishJobState"] = "Suspended"
 
         if instance.data.get("bakingNukeScripts"):
             for baking_script in instance.data["bakingNukeScripts"]:
@@ -161,18 +162,20 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
                 script_path = baking_script["bakeScriptPath"]
                 exe_node_name = baking_script["bakeWriteNodeName"]
 
-                resp = self.payload_submit(
+                b_job_response = self.payload_submit(
                     instance,
                     script_path,
                     render_path,
                     exe_node_name,
                     submit_frame_start,
                     submit_frame_end,
-                    response.json()
+                    r_job_response_json,
+                    baking_submission=True
                 )
 
                 # Store output dir for unified publisher (filesequence)
-                instance.data["deadlineSubmissionJob"] = resp.json()
+                instance.data["deadlineSubmissionJob"] = b_job_response.json()
+
                 instance.data["publishJobState"] = "Suspended"
 
                 # add to list of job Id
@@ -180,7 +183,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
                     instance.data["bakingSubmissionJobs"] = []
 
                 instance.data["bakingSubmissionJobs"].append(
-                    resp.json()["_id"])
+                    b_job_response.json()["_id"])
 
         # redefinition of families
         if "render" in instance.data["family"]:
@@ -199,15 +202,35 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         exe_node_name,
         start_frame,
         end_frame,
-        response_data=None
+        response_data=None,
+        baking_submission=False,
     ):
+        """Submit payload to Deadline
+
+        Args:
+            instance (pyblish.api.Instance): pyblish instance
+            script_path (str): path to nuke script
+            render_path (str): path to rendered images
+            exe_node_name (str): name of the node to render
+            start_frame (int): start frame
+            end_frame (int): end frame
+            response_data Optional[dict]: response data from
+                                          previous submission
+            baking_submission Optional[bool]: if it's baking submission
+
+        Returns:
+            requests.Response
+        """
         render_dir = os.path.normpath(os.path.dirname(render_path))
-        batch_name = os.path.basename(script_path)
-        jobname = "%s - %s" % (batch_name, instance.name)
+
+        # batch name
+        src_filepath = instance.context.data["currentFile"]
+        batch_name = os.path.basename(src_filepath)
+        job_name = os.path.basename(render_path)
+
         if is_in_tests():
             batch_name += datetime.now().strftime("%d%m%Y%H%M%S")
 
-
         output_filename_0 = self.preview_fname(render_path)
 
         if not response_data:
@@ -228,11 +251,8 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
                 # Top-level group name
                 "BatchName": batch_name,
 
-                # Asset dependency to wait for at least the scene file to sync.
-                # "AssetDependency0": script_path,
-
                 # Job name, as seen in Monitor
-                "Name": jobname,
+                "Name": job_name,
 
                 # Arbitrary username, for visualisation in Monitor
                 "UserName": self._deadline_user,
@@ -294,12 +314,17 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
             "AuxFiles": []
         }
 
-        if response_data.get("_id"):
+        # TODO: rewrite for baking with sequences
+        if baking_submission:
             payload["JobInfo"].update({
                 "JobType": "Normal",
+                "ChunkSize": 99999999
+            })
+
+        if response_data.get("_id"):
+            payload["JobInfo"].update({
                 "BatchName": response_data["Props"]["Batch"],
                 "JobDependency0": response_data["_id"],
-                "ChunkSize": 99999999
             })
 
         # Include critical environment variables with submission

From 42d766ed91f5a82e91d24ae4ca17bd5ed3c4f573 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 9 Aug 2023 16:38:31 +0200
Subject: [PATCH 18/80] nuke: collect slate fixed order

---
 .../nuke/plugins/publish/collect_slate_node.py     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_slate_node.py b/openpype/hosts/nuke/plugins/publish/collect_slate_node.py
index 5701087697..c7d65ffd24 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_slate_node.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_slate_node.py
@@ -5,7 +5,7 @@ import nuke
 class CollectSlate(pyblish.api.InstancePlugin):
     """Check if SLATE node is in scene and connected to rendering tree"""
 
-    order = pyblish.api.CollectorOrder + 0.09
+    order = pyblish.api.CollectorOrder + 0.002
     label = "Collect Slate Node"
     hosts = ["nuke"]
     families = ["render"]
@@ -13,10 +13,14 @@ class CollectSlate(pyblish.api.InstancePlugin):
     def process(self, instance):
         node = instance.data["transientData"]["node"]
 
-        slate = next((n for n in nuke.allNodes()
-                      if "slate" in n.name().lower()
-                      if not n["disable"].getValue()),
-                     None)
+        slate = next(
+            (
+                n_ for n_ in nuke.allNodes()
+                if "slate" in n_.name().lower()
+                if not n_["disable"].getValue()
+            ),
+            None
+        )
 
         if slate:
             # check if slate node is connected to write node tree

From 7b4a59e3338b1f3455e4362a876a3474454cf15b Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 16 Aug 2023 13:42:02 +0200
Subject: [PATCH 19/80] nuke: adding inherited colorspace from instance

---
 openpype/hosts/nuke/plugins/publish/extract_thumbnail.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
index 21eefda249..d57d55f85d 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
@@ -54,6 +54,7 @@ class ExtractThumbnail(publish.Extractor):
     def render_thumbnail(self, instance, output_name=None, **kwargs):
         first_frame = instance.data["frameStartHandle"]
         last_frame = instance.data["frameEndHandle"]
+        colorspace = instance.data["colorspace"]
 
         # find frame range and define middle thumb frame
         mid_frame = int((last_frame - first_frame) / 2)
@@ -112,8 +113,8 @@ class ExtractThumbnail(publish.Extractor):
         if self.use_rendered and os.path.isfile(path_render):
             # check if file exist otherwise connect to write node
             rnode = nuke.createNode("Read")
-
             rnode["file"].setValue(path_render)
+            rnode["colorspace"].setValue(colorspace)
 
             # turn it raw if none of baking is ON
             if all([

From a081f5aed5239bbc88703904a83929530877f031 Mon Sep 17 00:00:00 2001
From: Mustafa-Zarkash <mustafataherzaky@outlook.com>
Date: Wed, 16 Aug 2023 15:26:16 +0300
Subject: [PATCH 20/80] add_kitsu_credentials

---
 .../modules/deadline/plugins/publish/submit_publish_job.py    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 5e8c005d07..76cb357f91 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -121,7 +121,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         "FTRACK_SERVER",
         "AVALON_APP_NAME",
         "OPENPYPE_USERNAME",
-        "OPENPYPE_SG_USER"
+        "OPENPYPE_SG_USER",
+        "KITSU_LOGIN",
+        "KITSU_PWD"
     ]
 
     # custom deadline attributes

From e742dd61fd85c7cac3d5027ae758bef2f7aa5af7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 21 Aug 2023 14:42:02 +0200
Subject: [PATCH 21/80] fill entities and update template data on instances
 during extract AYON hierarchy

---
 .../publish/extract_hierarchy_to_ayon.py      | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/openpype/plugins/publish/extract_hierarchy_to_ayon.py b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
index 915650ae41..de9a70c233 100644
--- a/openpype/plugins/publish/extract_hierarchy_to_ayon.py
+++ b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
@@ -8,6 +8,11 @@ from ayon_api import slugify_string
 from ayon_api.entity_hub import EntityHub
 
 from openpype import AYON_SERVER_ENABLED
+from openpype.client import get_assets
+from openpype.pipeline.template_data import (
+    get_asset_template_data,
+    get_task_template_data,
+)
 
 
 def _default_json_parse(value):
@@ -27,13 +32,48 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
 
         hierarchy_context = context.data.get("hierarchyContext")
         if not hierarchy_context:
-            self.log.info("Skipping")
+            self.log.debug("Skipping")
             return
 
         project_name = context.data["projectName"]
+        self._create_hierarchy(context, project_name)
+        self._fill_instance_entities(context, project_name)
+
+    def _fill_instance_entities(self, context, project_name):
+        instances_by_asset_name = collections.defaultdict(list)
+        for instance in context:
+            instance_entity = instance.data.get("assetEntity")
+            if instance_entity:
+                continue
+
+            # Skip if instance asset does not match
+            instance_asset_name = instance.data.get("asset")
+            instances_by_asset_name[instance_asset_name] = instance
+
+        project_doc = context.data["projectEntity"]
+        asset_docs = get_assets(
+            project_name, asset_names=instances_by_asset_name.keys()
+        )
+        asset_docs_by_name = {
+            asset_doc["name"]: asset_doc
+            for asset_doc in asset_docs
+        }
+        for asset_name, instances in instances_by_asset_name.items():
+            asset_doc = asset_docs_by_name[asset_name]
+            asset_data = get_asset_template_data(asset_doc, project_name)
+            for instance in instances:
+                task_name = instance.data.get("task")
+                template_data = get_task_template_data(
+                    project_doc, asset_doc, task_name)
+                template_data.update(copy.deepcopy(asset_data))
+
+                instance.data["anatomyData"].update(template_data)
+                instance.data["assetEntity"] = asset_doc
+
+    def _create_hierarchy(self, context, project_name):
         hierarchy_context = self._filter_hierarchy(context)
         if not hierarchy_context:
-            self.log.info("All folders were filtered out")
+            self.log.debug("All folders were filtered out")
             return
 
         self.log.debug("Hierarchy_context: {}".format(

From 32b93f998aa95c3647797040b4a73fd1e68a305f Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Tue, 22 Aug 2023 12:47:36 +0800
Subject: [PATCH 22/80] allows the users to choose which camera as repair
 action in validate_viewport_camera

---
 openpype/hosts/max/api/lib_rendersettings.py  |  5 +++--
 .../publish/validate_viewport_camera.py       | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/max/api/lib_rendersettings.py b/openpype/hosts/max/api/lib_rendersettings.py
index 1b62edabee..afde5008d5 100644
--- a/openpype/hosts/max/api/lib_rendersettings.py
+++ b/openpype/hosts/max/api/lib_rendersettings.py
@@ -43,7 +43,7 @@ class RenderSettings(object):
                 rt.viewport.setCamera(sel)
                 break
             if not found:
-                raise RuntimeError("Camera not found")
+                raise RuntimeError("Active Camera not found")
 
     def render_output(self, container):
         folder = rt.maxFilePath
@@ -113,7 +113,8 @@ class RenderSettings(object):
         # for setting up renderable camera
         arv = rt.MAXToAOps.ArnoldRenderView()
         render_camera = rt.viewport.GetCamera()
-        arv.setOption("Camera", str(render_camera))
+        if render_camera:
+            arv.setOption("Camera", str(render_camera))
 
         # TODO: add AOVs and extension
         img_fmt = self._project_settings["max"]["RenderSettings"]["image_format"]   # noqa
diff --git a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
index d5cf85eb69..b35ba482a9 100644
--- a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
+++ b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
@@ -4,6 +4,7 @@ from openpype.pipeline import (
     PublishValidationError,
     OptionalPyblishPluginMixin)
 from openpype.pipeline.publish import RepairAction
+from openpype.hosts.max.api.lib import get_current_renderer
 
 from pymxs import runtime as rt
 
@@ -35,11 +36,13 @@ class ValidateViewportCamera(pyblish.api.InstancePlugin,
 
     @classmethod
     def repair(cls, instance):
-        # Get all cameras in the scene
-        cameras_in_scene = [c.name for c in rt.Objects
-                            if rt.classOf(c) in rt.Camera.Classes]
-        # Set the first camera as viewport camera for rendering
-        if cameras_in_scene:
-            camera = rt.getNodeByName(cameras_in_scene[0])
-            rt.viewport.setCamera(camera)
-            cls.log.info(f"Camera {camera} set as viewport camera")
+
+        rt.viewport.setType(rt.Name("view_camera"))
+        camera = rt.viewport.GetCamera()
+        cls.log.info(f"Camera {camera} set as viewport camera")
+        renderer_class = get_current_renderer()
+        renderer = str(renderer_class).split(":")[0]
+        if renderer == "Arnold":
+            arv = rt.MAXToAOps.ArnoldRenderView()
+            arv.setOption("Camera", str(camera))
+            arv.close()

From ec054ce939383f768fbcc3a7c622088e1fd4c1cb Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Tue, 22 Aug 2023 13:00:36 +0100
Subject: [PATCH 23/80] Fix version 0 when integrating to Ftrack.

---
 openpype/modules/ftrack/plugins/publish/integrate_ftrack_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_api.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_api.py
index 6ca5d1d4ef..4d474fab10 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_api.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_api.py
@@ -353,7 +353,7 @@ class IntegrateFtrackApi(pyblish.api.InstancePlugin):
         status_name = asset_version_data.pop("status_name", None)
 
         # Try query asset version by criteria (asset id and version)
-        version = asset_version_data.get("version") or 0
+        version = asset_version_data.get("version") or "0"
         asset_version_entity = self._query_asset_version(
             session, version, asset_id
         )

From ee31b305d30ff2bb7951af489d6a32ca7ac305e6 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Tue, 22 Aug 2023 14:41:23 +0000
Subject: [PATCH 24/80] [Automated] Release

---
 CHANGELOG.md        | 307 ++++++++++++++++++++++++++++++++++++++++++++
 openpype/version.py |   2 +-
 pyproject.toml      |   2 +-
 3 files changed, 309 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80d6a0d99d..f1948b1a3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,313 @@
 # Changelog
 
 
+## [3.16.4](https://github.com/ynput/OpenPype/tree/3.16.4)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.16.3...3.16.4)
+
+### **🆕 New features**
+
+
+<details>
+<summary>Feature: Download last published workfile specify version <a href="https://github.com/ynput/OpenPype/pull/4998">#4998</a></summary>
+
+Setting `workfile_version` key to hook's `self.launch_context.data` allow you to specify the workfile version you want sync service to download if none is matched locally. This is helpful if the last version hasn't been correctly published/synchronized, and you want to recover the previous one (or some you'd like).Version could be set in two ways:
+- OP's absolute version, matching the `version` index in DB.
+- Relative version in reverse order from the last one: `-2`, `-3`...I don't know where I should write documentation about that.
+
+
+___
+
+</details>
+
+### **🚀 Enhancements**
+
+
+<details>
+<summary>Maya: allow not creation of group for Import loaders <a href="https://github.com/ynput/OpenPype/pull/5427">#5427</a></summary>
+
+This PR enhances previous one. All ReferenceLoaders could not wrap imported products into explicit group.Also `Import` Loaders have same options. Control for this is separate in Settings, eg. Reference might wrap loaded items in group, `Import` might not.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>3dsMax: Settings for Ayon <a href="https://github.com/ynput/OpenPype/pull/5388">#5388</a></summary>
+
+Max Addon Setting for Ayon
+
+
+___
+
+</details>
+
+
+<details>
+<summary>General: Navigation to Folder from Launcher <a href="https://github.com/ynput/OpenPype/pull/5404">#5404</a></summary>
+
+Adds an action in launcher to open the directory of the asset.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Chore: Default variant in create plugin  <a href="https://github.com/ynput/OpenPype/pull/5429">#5429</a></summary>
+
+Attribute `default_variant` on create plugins always returns string and if default variant is not filled other ways how to get one are implemented.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Publisher: Thumbnail widget enhancements <a href="https://github.com/ynput/OpenPype/pull/5439">#5439</a></summary>
+
+Thumbnails widget in Publisher has new 3 options to choose from: Paste (from clipboard), Take screenshot and Browse. Clear button and new options are not visible by default, user must expand options button to show them.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>AYON: Update ayon api to '0.3.5' <a href="https://github.com/ynput/OpenPype/pull/5460">#5460</a></summary>
+
+Updated ayon-python-api to 0.3.5.
+
+
+___
+
+</details>
+
+### **🐛 Bug fixes**
+
+
+<details>
+<summary>AYON: Apply unknown ayon settings first <a href="https://github.com/ynput/OpenPype/pull/5435">#5435</a></summary>
+
+Settings of custom addons are available in converted settings.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Maya: Fix wrong subset name of render family in deadline <a href="https://github.com/ynput/OpenPype/pull/5442">#5442</a></summary>
+
+New Publisher is creating different subset names than previously which resulted in duplication of `render` string in final subset name of `render` family published on Deadline.This PR solves that, it also fixes issues with legacy instances from old publisher, it matches the subset name as was before.This solves same issue in Max implementation.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Maya: Fix setting of version to workfile instance <a href="https://github.com/ynput/OpenPype/pull/5452">#5452</a></summary>
+
+If there are multiple instances of renderlayer published, previous logic resulted in unpredictable rewrite of instance family to 'workfile' if `Sync render version with workfile` was on.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Maya: Context plugin shouldn't be tied to family <a href="https://github.com/ynput/OpenPype/pull/5464">#5464</a></summary>
+
+`Maya Current File` collector was tied to `workfile` unnecessary. It should run even if `workile` instance is not being published.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Unreal: Fix loading hero version for static and skeletal meshes <a href="https://github.com/ynput/OpenPype/pull/5393">#5393</a></summary>
+
+Fixed a problem with loading hero versions for static ans skeletal meshes.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>TVPaint: Fix 'repeat' behavior <a href="https://github.com/ynput/OpenPype/pull/5412">#5412</a></summary>
+
+Calculation of frames for repeat behavior is working correctly.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>AYON: Thumbnails cache and api prep <a href="https://github.com/ynput/OpenPype/pull/5437">#5437</a></summary>
+
+Moved thumbnails cache from ayon python api to OpenPype and prepare AYON thumbnail resolver for new api functions. Current implementation should work with old and new ayon-python-api.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Nuke: Name of the Read Node should be updated correctly when switching versions or assets. <a href="https://github.com/ynput/OpenPype/pull/5444">#5444</a></summary>
+
+Bug fixing of the read node's name not being updated correctly when setting version or switching asset.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Farm publishing: asymmetric handles fixed <a href="https://github.com/ynput/OpenPype/pull/5446">#5446</a></summary>
+
+Handles are now set correctly on farm published product version if asymmetric were set to shot attributes.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Scene Inventory: Provider icons fix <a href="https://github.com/ynput/OpenPype/pull/5450">#5450</a></summary>
+
+Fix how provider icons are accessed in scene inventory.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Fix typo on Deadline OP plugin name <a href="https://github.com/ynput/OpenPype/pull/5453">#5453</a></summary>
+
+Surprised that no one has hit this bug yet... but it seems like there was a typo on the name of the OP Deadline plugin when submitting jobs to it.
+
+
+___
+
+</details>
+
+
+<details>
+<summary>AYON: Fix version attributes update <a href="https://github.com/ynput/OpenPype/pull/5472">#5472</a></summary>
+
+Fixed updates of attribs in AYON mode.
+
+
+___
+
+</details>
+
+### **Merged pull requests**
+
+
+<details>
+<summary>Added missing defaults for import_loader <a href="https://github.com/ynput/OpenPype/pull/5447">#5447</a></summary>
+
+
+___
+
+</details>
+
+
+<details>
+<summary>Bug: Local settings don't open on 3.14.7  <a href="https://github.com/ynput/OpenPype/pull/5220">#5220</a></summary>
+
+### Before posting a new ticket, have you looked through the documentation to find an answer?
+
+Yes I have
+
+### Have you looked through the existing tickets to find any related issues ?
+
+Not yet
+
+### Author of the bug
+
+@FadyFS
+
+### Version
+
+3.15.11-nightly.3
+
+### What platform you are running OpenPype on?
+
+Linux / Centos
+
+### Current Behavior:
+
+the previous behavior (bug) : 
+![image](https://github.com/quadproduction/OpenPype/assets/135602303/09bff9d5-3f8b-4339-a1e5-30c04ade828c)
+
+
+### Expected Behavior:
+
+![image](https://github.com/quadproduction/OpenPype/assets/135602303/c505a103-7965-4796-bcdf-73bcc48a469b)
+
+
+### What type of bug is it ?
+
+Happened only once in a particular configuration
+
+### Which project / workfile / asset / ...
+
+open settings with 3.14.7 
+
+### Steps To Reproduce:
+
+1. Run openpype on the 3.15.11-nightly.3 version 
+2. Open settings in 3.14.7 version
+
+### Relevant log output:
+
+_No response_
+
+### Additional context:
+
+_No response_
+
+___
+
+</details>
+
+
+<details>
+<summary>Tests: Add automated targets for tests <a href="https://github.com/ynput/OpenPype/pull/5443">#5443</a></summary>
+
+Without it plugins with 'automated' targets won't be triggered (eg `CloseAE` etc.)
+
+
+___
+
+</details>
+
+
+
+
 ## [3.16.3](https://github.com/ynput/OpenPype/tree/3.16.3)
 
 
diff --git a/openpype/version.py b/openpype/version.py
index 444721e19c..857a9574d8 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.16.4-nightly.3"
+__version__ = "3.16.4"
diff --git a/pyproject.toml b/pyproject.toml
index 5e7938751e..a07c547123 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.16.3" # OpenPype
+version = "3.16.4" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From ae53caacc057e77271b2fc2389362bb04bb53e14 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Aug 2023 14:42:21 +0000
Subject: [PATCH 25/80] chore(): update bug report / version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 326c9e8c86..5c264e4d98 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.16.4
         - 3.16.4-nightly.3
         - 3.16.4-nightly.2
         - 3.16.4-nightly.1
@@ -134,7 +135,6 @@ body:
         - 3.14.8-nightly.2
         - 3.14.8-nightly.1
         - 3.14.7
-        - 3.14.7-nightly.8
     validations:
       required: true
   - type: dropdown

From cd9ec2b73a269d4973db81622dbadb268ec7a24d Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 22 Aug 2023 17:40:58 +0200
Subject: [PATCH 26/80] OCIO: adding exception for nuke, hiero into hook

---
 openpype/hooks/pre_ocio_hook.py | 3 +++
 openpype/hosts/nuke/api/lib.py  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/openpype/hooks/pre_ocio_hook.py b/openpype/hooks/pre_ocio_hook.py
index 1307ed9f76..add3a0adaf 100644
--- a/openpype/hooks/pre_ocio_hook.py
+++ b/openpype/hooks/pre_ocio_hook.py
@@ -45,6 +45,9 @@ class OCIOEnvHook(PreLaunchHook):
         if config_data:
             ocio_path = config_data["path"]
 
+            if self.host_name in ["nuke", "hiero"]:
+                ocio_path = ocio_path.replace("\\", "/")
+
             self.log.info(
                 f"Setting OCIO environment to config path: {ocio_path}")
 
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 4a1e109b17..2a6c1fb12c 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2177,6 +2177,7 @@ Reopening Nuke should synchronize these paths and resolve any discrepancies.
         """
         # replace path with env var if possible
         ocio_path = self._replace_ocio_path_with_env_var(config_data)
+        ocio_path = ocio_path.replace("\\", "/")
 
         log.info("Setting OCIO config path to: `{}`".format(
             ocio_path))

From 99ceef33e32c14cef403ff3852b0f15f40d7807a Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Wed, 23 Aug 2023 03:24:31 +0000
Subject: [PATCH 27/80] [Automated] Bump version

---
 openpype/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/version.py b/openpype/version.py
index 857a9574d8..f8a49f8466 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.16.4"
+__version__ = "3.16.5-nightly.1"

From 88f1d839f1d2186349b72c12059a51aeb7d7dd3a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 23 Aug 2023 10:07:13 +0200
Subject: [PATCH 28/80] Added super call to init (#5480)

DL 10.3 requires plugin inheriting from DeadlinePlugin to call super's __init__ explicitly.
---
 .../repository/custom/plugins/Ayon/Ayon.py    |  1 +
 .../HarmonyOpenPype/HarmonyOpenPype.py        | 59 ++++++++++---------
 .../custom/plugins/OpenPype/OpenPype.py       |  3 +-
 .../OpenPypeTileAssembler.py                  |  1 +
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py b/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
index 16149d7e20..1544acc2a4 100644
--- a/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
+++ b/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
@@ -38,6 +38,7 @@ class AyonDeadlinePlugin(DeadlinePlugin):
         for publish process.
     """
     def __init__(self):
+        super().__init__()
         self.InitializeProcessCallback += self.InitializeProcess
         self.RenderExecutableCallback += self.RenderExecutable
         self.RenderArgumentCallback += self.RenderArgument
diff --git a/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py b/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py
index 0615af95dd..2f6e9cf379 100644
--- a/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py
+++ b/openpype/modules/deadline/repository/custom/plugins/HarmonyOpenPype/HarmonyOpenPype.py
@@ -8,13 +8,14 @@ from Deadline.Scripting import *
 
 def GetDeadlinePlugin():
     return HarmonyOpenPypePlugin()
-    
+
 def CleanupDeadlinePlugin( deadlinePlugin ):
     deadlinePlugin.Cleanup()
-    
+
 class HarmonyOpenPypePlugin( DeadlinePlugin ):
 
     def __init__( self ):
+        super().__init__()
         self.InitializeProcessCallback += self.InitializeProcess
         self.RenderExecutableCallback += self.RenderExecutable
         self.RenderArgumentCallback += self.RenderArgument
@@ -24,11 +25,11 @@ class HarmonyOpenPypePlugin( DeadlinePlugin ):
         print("Cleanup")
         for stdoutHandler in self.StdoutHandlers:
             del stdoutHandler.HandleCallback
-        
+
         del self.InitializeProcessCallback
         del self.RenderExecutableCallback
         del self.RenderArgumentCallback
-        
+
     def CheckExitCode( self, exitCode ):
         print("check code")
         if exitCode != 0:
@@ -36,20 +37,20 @@ class HarmonyOpenPypePlugin( DeadlinePlugin ):
                 self.LogInfo( "Renderer reported an error with error code 100. This will be ignored, since the option to ignore it is specified in the Job Properties." )
             else:
                 self.FailRender( "Renderer returned non-zero error code %d. Check the renderer's output." % exitCode )
-    
+
     def InitializeProcess( self ):
         self.PluginType = PluginType.Simple
         self.StdoutHandling = True
         self.PopupHandling = True
-        
+
         self.AddStdoutHandlerCallback( "Rendered frame ([0-9]+)" ).HandleCallback += self.HandleStdoutProgress
-    
+
     def HandleStdoutProgress( self ):
         startFrame = self.GetStartFrame()
         endFrame = self.GetEndFrame()
         if( endFrame - startFrame + 1 != 0 ):
             self.SetProgress( 100 * ( int(self.GetRegexMatch(1)) - startFrame + 1 ) / ( endFrame - startFrame + 1 ) )
-    
+
     def RenderExecutable( self ):
         version = int( self.GetPluginInfoEntry( "Version" ) )
         exe = ""
@@ -58,7 +59,7 @@ class HarmonyOpenPypePlugin( DeadlinePlugin ):
         if( exe == "" ):
             self.FailRender( "Harmony render executable was not found in the configured separated list \"" + exeList + "\". The path to the render executable can be configured from the Plugin Configuration in the Deadline Monitor." )
         return exe
-        
+
     def RenderArgument( self ):
         renderArguments = "-batch"
 
@@ -72,20 +73,20 @@ class HarmonyOpenPypePlugin( DeadlinePlugin ):
             resolutionX = self.GetIntegerPluginInfoEntryWithDefault( "ResolutionX", -1 )
             resolutionY = self.GetIntegerPluginInfoEntryWithDefault( "ResolutionY", -1 )
             fov = self.GetFloatPluginInfoEntryWithDefault( "FieldOfView", -1 )
-        
+
             if resolutionX > 0 and resolutionY > 0 and fov > 0:
                 renderArguments += " -res " + str( resolutionX ) + " " + str( resolutionY ) + " " + str( fov )
-        
+
         camera = self.GetPluginInfoEntryWithDefault( "Camera", "" )
-        
+
         if not camera == "":
             renderArguments += " -camera " + camera
-        
+
         startFrame = str( self.GetStartFrame() )
         endFrame = str( self.GetEndFrame() )
-                
+
         renderArguments += " -frames " + startFrame + " " + endFrame
-        
+
         if not self.GetBooleanPluginInfoEntryWithDefault( "IsDatabase", False ):
             sceneFilename = self.GetPluginInfoEntryWithDefault( "SceneFile", self.GetDataFilename() )
             sceneFilename = RepositoryUtils.CheckPathMapping( sceneFilename )
@@ -99,12 +100,12 @@ class HarmonyOpenPypePlugin( DeadlinePlugin ):
             renderArguments += " -scene " + scene
             version = self.GetPluginInfoEntryWithDefault( "SceneVersion", "" )
             renderArguments += " -version " + version
-        
+
         #tempSceneDirectory = self.CreateTempDirectory( "thread" + str(self.GetThreadNumber()) )
-        #preRenderScript = 
+        #preRenderScript =
         rendernodeNum = 0
         scriptBuilder = StringBuilder()
-        
+
         while True:
             nodeName = self.GetPluginInfoEntryWithDefault( "Output" + str( rendernodeNum ) + "Node", "" )
             if nodeName == "":
@@ -115,35 +116,35 @@ class HarmonyOpenPypePlugin( DeadlinePlugin ):
                 nodeLeadingZero = self.GetPluginInfoEntryWithDefault( "Output" + str( rendernodeNum ) + "LeadingZero", "" )
                 nodeFormat = self.GetPluginInfoEntryWithDefault( "Output" + str( rendernodeNum ) + "Format", "" )
                 nodeStartFrame = self.GetPluginInfoEntryWithDefault( "Output" + str( rendernodeNum ) + "StartFrame", "" )
-                
+
                 if not nodePath == "":
                     scriptBuilder.AppendLine("node.setTextAttr( \"" + nodeName + "\", \"drawingName\", 1, \"" + nodePath + "\" );")
-                    
+
                 if not nodeLeadingZero == "":
                     scriptBuilder.AppendLine("node.setTextAttr( \"" + nodeName + "\", \"leadingZeros\", 1, \"" + nodeLeadingZero + "\" );")
-                
+
                 if not nodeFormat == "":
                     scriptBuilder.AppendLine("node.setTextAttr( \"" + nodeName + "\", \"drawingType\", 1, \"" + nodeFormat + "\" );")
-                    
+
                 if not nodeStartFrame == "":
                     scriptBuilder.AppendLine("node.setTextAttr( \"" + nodeName + "\", \"start\", 1, \"" + nodeStartFrame + "\" );")
-            
+
             if nodeType == "Movie":
                 nodePath = self.GetPluginInfoEntryWithDefault( "Output" + str( rendernodeNum ) + "Path", "" )
                 if not nodePath == "":
                     scriptBuilder.AppendLine("node.setTextAttr( \"" + nodeName + "\", \"moviePath\", 1, \"" + nodePath + "\" );")
-            
+
             rendernodeNum += 1
-        
+
         tempDirectory = self.CreateTempDirectory( "thread" + str(self.GetThreadNumber()) )
         preRenderScriptName = Path.Combine( tempDirectory, "preRenderScript.txt" )
-        
+
         File.WriteAllText( preRenderScriptName, scriptBuilder.ToString() )
-        
+
         preRenderInlineScript = self.GetPluginInfoEntryWithDefault( "PreRenderInlineScript", "" )
         if preRenderInlineScript:
             renderArguments += " -preRenderInlineScript \"" + preRenderInlineScript +"\""
-        
+
         renderArguments += " -preRenderScript \"" + preRenderScriptName +"\""
-        
+
         return renderArguments
diff --git a/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py
index 6e1b973fb9..004c58d346 100644
--- a/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py
+++ b/openpype/modules/deadline/repository/custom/plugins/OpenPype/OpenPype.py
@@ -38,6 +38,7 @@ class OpenPypeDeadlinePlugin(DeadlinePlugin):
         for publish process.
     """
     def __init__(self):
+        super().__init__()
         self.InitializeProcessCallback += self.InitializeProcess
         self.RenderExecutableCallback += self.RenderExecutable
         self.RenderArgumentCallback += self.RenderArgument
@@ -107,7 +108,7 @@ class OpenPypeDeadlinePlugin(DeadlinePlugin):
                 "Scanning for compatible requested "
                 f"version {requested_version}"))
             dir_list = self.GetConfigEntry("OpenPypeInstallationDirs")
-            
+
             # clean '\ ' for MacOS pasting
             if platform.system().lower() == "darwin":
                 dir_list = dir_list.replace("\\ ", " ")
diff --git a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
index b51daffbc8..9641c16d20 100644
--- a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
+++ b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
@@ -249,6 +249,7 @@ class OpenPypeTileAssembler(DeadlinePlugin):
 
     def __init__(self):
         """Init."""
+        super().__init__()
         self.InitializeProcessCallback += self.initialize_process
         self.RenderExecutableCallback += self.render_executable
         self.RenderArgumentCallback += self.render_argument

From 83508a93eadb1387a49dca465d68bcf0d96badc6 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 23 Aug 2023 13:45:20 +0200
Subject: [PATCH 29/80] nuke: fixing thumbnail and monitor out root attributes

---
 openpype/hosts/nuke/api/lib.py | 54 +++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 4a1e109b17..cedbe6d5e6 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2041,6 +2041,7 @@ class WorkfileSettings(object):
         )
 
         workfile_settings = imageio_host["workfile"]
+        viewer_process_settings = imageio_host["viewer"]["viewerProcess"]
 
         if not config_data:
             # TODO: backward compatibility for old projects - remove later
@@ -2091,6 +2092,31 @@ class WorkfileSettings(object):
         workfile_settings.pop("colorManagement", None)
         workfile_settings.pop("OCIO_config", None)
 
+        # treat monitor lut separately
+        monitor_lut = workfile_settings.pop("monitorLut", None)
+        m_display, m_viewer = get_viewer_config_from_string(monitor_lut)
+        v_display, v_viewer = get_viewer_config_from_string(
+            viewer_process_settings
+        )
+
+        # set monitor lut differently for nuke version 14
+        if nuke.NUKE_VERSION_MAJOR >= 14:
+            workfile_settings["monitorOutLUT"] = create_viewer_profile_string(
+                m_viewer, m_display, path_like=False)
+            # monitorLut=thumbnails - viewerProcess makes more sense
+            workfile_settings["monitorLut"] = create_viewer_profile_string(
+                v_viewer, v_display, path_like=False)
+
+        if nuke.NUKE_VERSION_MAJOR == 13:
+            workfile_settings["monitorOutLUT"] = create_viewer_profile_string(
+                m_viewer, m_display, path_like=False)
+            # monitorLut=thumbnails - viewerProcess makes more sense
+            workfile_settings["monitorLut"] = create_viewer_profile_string(
+                v_viewer, v_display, path_like=True)
+        if nuke.NUKE_VERSION_MAJOR <= 12:
+            workfile_settings["monitorLut"] = create_viewer_profile_string(
+                m_viewer, m_display, path_like=True)
+
         # then set the rest
         for knob, value_ in workfile_settings.items():
             # skip unfilled ocio config path
@@ -3320,11 +3346,11 @@ def get_viewer_config_from_string(input_string):
         display = split[0]
     elif "(" in viewer:
         pattern = r"([\w\d\s\.\-]+).*[(](.*)[)]"
-        result = re.findall(pattern, viewer)
+        result_ = re.findall(pattern, viewer)
         try:
-            result = result.pop()
-            display = str(result[1]).rstrip()
-            viewer = str(result[0]).rstrip()
+            result_ = result_.pop()
+            display = str(result_[1]).rstrip()
+            viewer = str(result_[0]).rstrip()
         except IndexError:
             raise IndexError((
                 "Viewer Input string is not correct. "
@@ -3332,3 +3358,23 @@ def get_viewer_config_from_string(input_string):
             ).format(input_string))
 
     return (display, viewer)
+
+
+def create_viewer_profile_string(viewer, display=None, path_like=False):
+    """Convert viewer and display to string
+
+    Args:
+        viewer (str): viewer name
+        display (Optional[str]): display name
+        path_like (Optional[bool]): if True, return path like string
+
+    Returns:
+        str: viewer config string
+    """
+    if display:
+        if path_like:
+            return "{}/{}".format(display, viewer)
+        else:
+            return "{} ({})".format(viewer, display)
+    else:
+        return viewer

From 0f8cc0301fd2e44259c524eefe39b7db733fecaa Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 23 Aug 2023 14:47:10 +0200
Subject: [PATCH 30/80] Nuke: fixing missing `instance_id`

---
 openpype/hosts/nuke/api/pipeline.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 65b4b91323..a1d290646c 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -543,6 +543,9 @@ def list_instances(creator_id=None):
 
     For SubsetManager
 
+    Args:
+        creator_id (Optional[str]): creator identifier
+
     Returns:
         (list) of dictionaries matching instances format
     """
@@ -575,10 +578,13 @@ def list_instances(creator_id=None):
         if creator_id and instance_data["creator_identifier"] != creator_id:
             continue
 
-        if instance_data["instance_id"] in instance_ids:
+        instance_id = instance_data.get("instance_id")
+        if not instance_id:
+            pass
+        elif instance_id in instance_ids:
             instance_data.pop("instance_id")
         else:
-            instance_ids.add(instance_data["instance_id"])
+            instance_ids.add(instance_id)
 
         # node name could change, so update subset name data
         _update_subset_name_data(instance_data, node)

From 3603fdfe0012f905634d1786275a2f72b4ca2203 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 23 Aug 2023 15:11:26 +0200
Subject: [PATCH 31/80] Nuke: existing frames validator is repairing render
 target

---
 .../publish/validate_rendered_frames.py       | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py b/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
index 45c20412c8..ef3d4d0bb5 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
@@ -14,19 +14,28 @@ class RepairActionBase(pyblish.api.Action):
         # Get the errored instances
         return get_errored_instances_from_context(context, plugin=plugin)
 
-    def repair_knob(self, instances, state):
+    def repair_knob(self, context, instances, state):
+        create_context = context.data["create_context"]
         for instance in instances:
-            node = instance.data["transientData"]["node"]
-            files_remove = [os.path.join(instance.data["outputDir"], f)
-                            for r in instance.data.get("representations", [])
-                            for f in r.get("files", [])
-                            ]
+            files_remove = [
+                os.path.join(instance.data["outputDir"], f_)
+                for r_ in instance.data.get("representations", [])
+                for f_ in r_.get("files", [])
+            ]
             self.log.info("Files to be removed: {}".format(files_remove))
-            for f in files_remove:
-                os.remove(f)
-                self.log.debug("removing file: {}".format(f))
-            node["render"].setValue(state)
+            for f_ in files_remove:
+                os.remove(f_)
+                self.log.debug("removing file: {}".format(f_))
+
+            # Reset the render knob
+            instance_id = instance.data["instance_id"]
+            created_instance = create_context.get_instance_by_id(
+                instance_id
+            )
+            created_instance.creator_attributes["render_target"] = state
+
             self.log.info("Rendering toggled to `{}`".format(state))
+        create_context.save_changes()
 
 
 class RepairCollectionActionToLocal(RepairActionBase):
@@ -34,7 +43,7 @@ class RepairCollectionActionToLocal(RepairActionBase):
 
     def process(self, context, plugin):
         instances = self.get_instance(context, plugin)
-        self.repair_knob(instances, "Local")
+        self.repair_knob(context, instances, "local")
 
 
 class RepairCollectionActionToFarm(RepairActionBase):
@@ -42,7 +51,7 @@ class RepairCollectionActionToFarm(RepairActionBase):
 
     def process(self, context, plugin):
         instances = self.get_instance(context, plugin)
-        self.repair_knob(instances, "On farm")
+        self.repair_knob(context, instances, "farm")
 
 
 class ValidateRenderedFrames(pyblish.api.InstancePlugin):

From ed5c299c515b46bd0efc1da705bb484746688370 Mon Sep 17 00:00:00 2001
From: Libor Batek <lbatek@gmail.com>
Date: Wed, 23 Aug 2023 15:59:45 +0200
Subject: [PATCH 32/80] added UE to extract burnins families

---
 openpype/plugins/publish/extract_burnin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py
index 4a64711bfd..e5b37ee3b4 100644
--- a/openpype/plugins/publish/extract_burnin.py
+++ b/openpype/plugins/publish/extract_burnin.py
@@ -53,8 +53,8 @@ class ExtractBurnin(publish.Extractor):
         "flame",
         "houdini",
         "max",
-        "blender"
-        # "resolve"
+        "blender",
+        "unreal"
     ]
 
     optional = True

From 6021a43ab0255d6410d9c307f1507c166d81aa9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Wed, 23 Aug 2023 16:39:21 +0200
Subject: [PATCH 33/80] Update
 openpype/hosts/nuke/plugins/publish/collect_writes.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/hosts/nuke/plugins/publish/collect_writes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index f1b36ba886..6f9245f5b9 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -14,7 +14,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
     hosts = ["nuke", "nukeassist"]
     families = ["render", "prerender", "image"]
 
-    # cashing
+    # cache
     _write_nodes = {}
     _frame_ranges = {}
 

From fd2ba5a07fca076ecf6b2b6793b0f266ce9e4f47 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 23 Aug 2023 16:48:51 +0200
Subject: [PATCH 34/80] empty line

---
 .../hosts/nuke/plugins/publish/collect_nuke_instance_data.py     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py b/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
index edd7a5cf27..b0f69e8ab8 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
@@ -51,6 +51,5 @@ class CollectNukeInstanceData(pyblish.api.InstancePlugin):
         if instance.data.get("review"):
             instance.data["families"].append("review")
 
-
         self.log.debug("Collected instance: {}".format(
             instance.data))

From fe5dc20877355a8b23a54c359dedca7111e6a00e Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 23 Aug 2023 17:31:46 +0200
Subject: [PATCH 35/80] traypublisher: adding preset for audio product

---
 .../project_settings/traypublisher.json         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index dda958ebcd..7f7b7d1452 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -256,6 +256,23 @@
             "allow_multiple_items": true,
             "allow_version_control": false,
             "extensions": []
+        },
+        {
+            "family": "audio",
+            "identifier": "",
+            "label": "Audio ",
+            "icon": "fa5s.file-audio",
+            "default_variants": [
+                "Main"
+            ],
+            "description": "Audio product",
+            "detailed_description": "Audio files for review or final delivery",
+            "allow_sequences": false,
+            "allow_multiple_items": false,
+            "allow_version_control": false,
+            "extensions": [
+                ".wav"
+            ]
         }
     ],
     "editorial_creators": {

From 93f897c780d5b6bda9ee56e013b12ee7b0ba6952 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 24 Aug 2023 13:59:34 +0200
Subject: [PATCH 36/80] deadline: adding collect farm target and removing
 redundant key

---
 .../plugins/publish/collect_render.py         |  1 -
 .../fusion/plugins/publish/collect_render.py  |  1 -
 .../plugins/publish/collect_farm_render.py    |  1 -
 .../plugins/publish/submit_maya_muster.py     |  1 -
 .../publish/submit_celaction_deadline.py      |  2 +-
 .../publish/submit_houdini_render_deadline.py |  1 -
 .../plugins/publish/submit_max_deadline.py    |  1 -
 .../plugins/publish/submit_maya_deadline.py   |  1 -
 .../plugins/publish/submit_nuke_deadline.py   |  1 -
 .../publish/abstract_collect_render.py        |  1 -
 .../plugins/publish/collect_farm_target.py    | 45 +++++++++++++++++++
 11 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 openpype/plugins/publish/collect_farm_target.py

diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index aa46461915..49874d6cff 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -138,7 +138,6 @@ class CollectAERender(publish.AbstractCollectRender):
                 fam = "render.farm"
                 if fam not in instance.families:
                     instance.families.append(fam)
-                instance.toBeRenderedOn = "deadline"
                 instance.renderer = "aerender"
                 instance.farm = True  # to skip integrate
                 if "review" in instance.families:
diff --git a/openpype/hosts/fusion/plugins/publish/collect_render.py b/openpype/hosts/fusion/plugins/publish/collect_render.py
index a20a142701..341f3f191a 100644
--- a/openpype/hosts/fusion/plugins/publish/collect_render.py
+++ b/openpype/hosts/fusion/plugins/publish/collect_render.py
@@ -108,7 +108,6 @@ class CollectFusionRender(
                 fam = "render.farm"
                 if fam not in instance.families:
                     instance.families.append(fam)
-                instance.toBeRenderedOn = "deadline"
                 instance.farm = True  # to skip integrate
                 if "review" in instance.families:
                     # to skip ExtractReview locally
diff --git a/openpype/hosts/harmony/plugins/publish/collect_farm_render.py b/openpype/hosts/harmony/plugins/publish/collect_farm_render.py
index 5e9b9094a7..5daa93cddb 100644
--- a/openpype/hosts/harmony/plugins/publish/collect_farm_render.py
+++ b/openpype/hosts/harmony/plugins/publish/collect_farm_render.py
@@ -174,7 +174,6 @@ class CollectFarmRender(publish.AbstractCollectRender):
                 outputFormat=info[1],
                 outputStartFrame=info[3],
                 leadingZeros=info[2],
-                toBeRenderedOn='deadline',
                 ignoreFrameHandleCheck=True
 
             )
diff --git a/openpype/hosts/maya/plugins/publish/submit_maya_muster.py b/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
index 8e219eae85..b79c9ed140 100644
--- a/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
+++ b/openpype/hosts/maya/plugins/publish/submit_maya_muster.py
@@ -249,7 +249,6 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
         Authenticate with Muster, collect all data, prepare path for post
         render publish job and submit job to farm.
         """
-        instance.data["toBeRenderedOn"] = "muster"
         # setup muster environment
         self.MUSTER_REST_URL = os.environ.get("MUSTER_REST_URL")
 
diff --git a/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py b/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py
index ee28612b44..4aef914023 100644
--- a/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_celaction_deadline.py
@@ -27,7 +27,7 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
     deadline_job_delay = "00:00:08:00"
 
     def process(self, instance):
-        instance.data["toBeRenderedOn"] = "deadline"
+
         context = instance.context
 
         # get default deadline webservice url from deadline module
diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index 108c377078..8f21a920be 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -141,4 +141,3 @@ class HoudiniSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
         # Store output dir for unified publisher (filesequence)
         output_dir = os.path.dirname(instance.data["files"][0])
         instance.data["outputDir"] = output_dir
-        instance.data["toBeRenderedOn"] = "deadline"
diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
index 8e05582962..5d38903770 100644
--- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -174,7 +174,6 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         first_file = next(self._iter_expected_files(files))
         output_dir = os.path.dirname(first_file)
         instance.data["outputDir"] = output_dir
-        instance.data["toBeRenderedOn"] = "deadline"
 
         filename = os.path.basename(filepath)
 
diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 75d24b28f0..34f3905a17 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -300,7 +300,6 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         first_file = next(iter_expected_files(expected_files))
         output_dir = os.path.dirname(first_file)
         instance.data["outputDir"] = output_dir
-        instance.data["toBeRenderedOn"] = "deadline"
 
         # Patch workfile (only when use_published is enabled)
         if self.use_published:
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index cfdeb4968b..ded5cd179f 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -97,7 +97,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         instance.data["suspend_publish"] = instance.data["attributeValues"][
             "suspend_publish"]
 
-        instance.data["toBeRenderedOn"] = "deadline"
         families = instance.data["families"]
 
         node = instance.data["transientData"]["node"]
diff --git a/openpype/pipeline/publish/abstract_collect_render.py b/openpype/pipeline/publish/abstract_collect_render.py
index 6877d556c3..8a26402bd8 100644
--- a/openpype/pipeline/publish/abstract_collect_render.py
+++ b/openpype/pipeline/publish/abstract_collect_render.py
@@ -75,7 +75,6 @@ class RenderInstance(object):
     tilesY = attr.ib(default=0)  # number of tiles in Y
 
     # submit_publish_job
-    toBeRenderedOn = attr.ib(default=None)
     deadlineSubmissionJob = attr.ib(default=None)
     anatomyData = attr.ib(default=None)
     outputDir = attr.ib(default=None)
diff --git a/openpype/plugins/publish/collect_farm_target.py b/openpype/plugins/publish/collect_farm_target.py
new file mode 100644
index 0000000000..78410835dd
--- /dev/null
+++ b/openpype/plugins/publish/collect_farm_target.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+import pyblish.api
+
+
+class CollectFarmTarget(pyblish.api.InstancePlugin):
+    """Collects the render target for the instance
+    """
+
+    order = pyblish.api.CollectorOrder + 0.499
+    label = "Collect Farm Target"
+    targets = ["local"]
+
+    def process(self, instance):
+        if not instance.data.get("farm"):
+            return
+
+        context = instance.context
+        try:
+            deadline_module = context.data.get("openPypeModules")["deadline"]
+            if deadline_module.enabled:
+                instance.data["toBeRenderedOn"] = "deadline"
+                self.log.debug("Collected render target: deadline")
+        except AttributeError:
+            self.log.error("Cannot get OpenPype Deadline module.")
+            raise AssertionError("OpenPype Deadline module not found.")
+
+        try:
+            royalrender_module = \
+                context.data.get("openPypeModules")["royalrender"]
+            if royalrender_module.enabled:
+                instance.data["toBeRenderedOn"] = "royalrender"
+                self.log.debug("Collected render target: royalrender")
+
+        except AttributeError:
+            self.log.error("Cannot get OpenPype RoyalRender module.")
+            raise AssertionError("OpenPype RoyalRender module not found.")
+
+        try:
+            muster_module = context.data.get("openPypeModules")["muster"]
+            if muster_module.enabled:
+                instance.data["toBeRenderedOn"] = "muster"
+                self.log.debug("Collected render target: muster")
+        except AttributeError:
+            self.log.error("Cannot get OpenPype Muster module.")
+            raise AssertionError("OpenPype Muster module not found.")

From e9952b5d53421794b58b278d015412f368baf88e Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 25 Aug 2023 11:26:03 +0200
Subject: [PATCH 37/80] global: avoiding cleanup of flagged representation

---
 openpype/pipeline/publish/lib.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py
index ada12800a9..08ce8c2c9d 100644
--- a/openpype/pipeline/publish/lib.py
+++ b/openpype/pipeline/publish/lib.py
@@ -953,6 +953,7 @@ def replace_with_published_scene_path(instance, replace_in_path=True):
 
     return file_path
 
+
 def add_repre_files_for_cleanup(instance, repre):
     """ Explicitly mark repre files to be deleted.
 
@@ -961,7 +962,16 @@ def add_repre_files_for_cleanup(instance, repre):
     """
     files = repre["files"]
     staging_dir = repre.get("stagingDir")
-    if not staging_dir or instance.data.get("stagingDir_persistent"):
+
+    # first make sure representation level is not persistent
+    if (
+        not staging_dir
+        or repre.get("stagingDir_persistent")
+    ):
+        return
+
+    # then look into instance level if it's not persistent
+    if instance.data.get("stagingDir_persistent"):
         return
 
     if isinstance(files, str):

From 2477287095d1d3e517d15c609a3796901043f0e2 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 25 Aug 2023 16:19:49 +0200
Subject: [PATCH 38/80] Publisher: Avoid warnings on thumbnails if source image
 also has alpha channel (#5510)

* Avoid warnings if source image also has alpha channel

* Fix logging typo
---
 openpype/plugins/publish/extract_thumbnail_from_source.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/plugins/publish/extract_thumbnail_from_source.py b/openpype/plugins/publish/extract_thumbnail_from_source.py
index 54622bb84e..1b9f0a8bae 100644
--- a/openpype/plugins/publish/extract_thumbnail_from_source.py
+++ b/openpype/plugins/publish/extract_thumbnail_from_source.py
@@ -128,7 +128,7 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
         if thumbnail_created:
             return full_output_path
 
-        self.log.warning("Thumbanil has not been created.")
+        self.log.warning("Thumbnail has not been created.")
 
     def _instance_has_thumbnail(self, instance):
         if "representations" not in instance.data:
@@ -147,6 +147,7 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
         oiio_cmd = get_oiio_tool_args(
             "oiiotool",
             "-a", src_path,
+            "--ch", "R,G,B",
             "-o", dst_path
         )
         self.log.info("Running: {}".format(" ".join(oiio_cmd)))

From 39f8e65177c9ea941a345e9c3bcafe9b2edfad0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Fri, 25 Aug 2023 16:20:20 +0200
Subject: [PATCH 39/80] if no Tag in representation avoiding raise (#5511)

---
 openpype/pipeline/farm/pyblish_functions.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/pipeline/farm/pyblish_functions.py b/openpype/pipeline/farm/pyblish_functions.py
index 288602b77c..fe3ab97de8 100644
--- a/openpype/pipeline/farm/pyblish_functions.py
+++ b/openpype/pipeline/farm/pyblish_functions.py
@@ -139,7 +139,7 @@ def get_transferable_representations(instance):
     to_transfer = []
 
     for representation in instance.data.get("representations", []):
-        if "publish_on_farm" not in representation.get("tags"):
+        if "publish_on_farm" not in representation.get("tags", []):
             continue
 
         trans_rep = representation.copy()
@@ -265,8 +265,7 @@ def create_skeleton_instance(
                 instance_skeleton_data[v] = instance.data.get(v)
 
     representations = get_transferable_representations(instance)
-    instance_skeleton_data["representations"] = []
-    instance_skeleton_data["representations"] += representations
+    instance_skeleton_data["representations"] = representations
 
     persistent = instance.data.get("stagingDir_persistent") is True
     instance_skeleton_data["stagingDir_persistent"] = persistent

From 5ed243e36ef098209c968f119366683d18c4fb5d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 25 Aug 2023 17:08:34 +0200
Subject: [PATCH 40/80] Publisher: Fix multiselection value (#5505)

* fix change of value on multiselection

* fix create - publish page change
---
 openpype/tools/attribute_defs/widgets.py            | 8 ++++++++
 openpype/tools/publisher/widgets/overview_widget.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openpype/tools/attribute_defs/widgets.py b/openpype/tools/attribute_defs/widgets.py
index d46c238da1..7967416e9f 100644
--- a/openpype/tools/attribute_defs/widgets.py
+++ b/openpype/tools/attribute_defs/widgets.py
@@ -343,6 +343,7 @@ class TextAttrWidget(_BaseAttrDefWidget):
         return self._input_widget.text()
 
     def set_value(self, value, multivalue=False):
+        block_signals = False
         if multivalue:
             set_value = set(value)
             if None in set_value:
@@ -352,13 +353,18 @@ class TextAttrWidget(_BaseAttrDefWidget):
             if len(set_value) == 1:
                 value = tuple(set_value)[0]
             else:
+                block_signals = True
                 value = "< Multiselection >"
 
         if value != self.current_value():
+            if block_signals:
+                self._input_widget.blockSignals(True)
             if self.multiline:
                 self._input_widget.setPlainText(value)
             else:
                 self._input_widget.setText(value)
+            if block_signals:
+                self._input_widget.blockSignals(False)
 
 
 class BoolAttrWidget(_BaseAttrDefWidget):
@@ -391,7 +397,9 @@ class BoolAttrWidget(_BaseAttrDefWidget):
                 set_value.add(self.attr_def.default)
 
             if len(set_value) > 1:
+                self._input_widget.blockSignals(True)
                 self._input_widget.setCheckState(QtCore.Qt.PartiallyChecked)
+                self._input_widget.blockSignals(False)
                 return
             value = tuple(set_value)[0]
 
diff --git a/openpype/tools/publisher/widgets/overview_widget.py b/openpype/tools/publisher/widgets/overview_widget.py
index 470645b9ee..778aa1139f 100644
--- a/openpype/tools/publisher/widgets/overview_widget.py
+++ b/openpype/tools/publisher/widgets/overview_widget.py
@@ -168,7 +168,7 @@ class OverviewWidget(QtWidgets.QFrame):
     def make_sure_animation_is_finished(self):
         if self._change_anim.state() == QtCore.QAbstractAnimation.Running:
             self._change_anim.stop()
-            self._on_change_anim_finished()
+        self._on_change_anim_finished()
 
     def set_state(self, new_state, animate):
         if new_state == self._current_state:

From f38f1b451d6af4f65933a544a8a62b7998bc15d9 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Sat, 26 Aug 2023 03:25:15 +0000
Subject: [PATCH 41/80] [Automated] Bump version

---
 openpype/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/version.py b/openpype/version.py
index f8a49f8466..6d89e1eeae 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.16.5-nightly.1"
+__version__ = "3.16.5-nightly.2"

From 437f483bc48c8f8cdb38b181d9a1c6ec305388aa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 26 Aug 2023 03:25:53 +0000
Subject: [PATCH 42/80] chore(): update bug report / version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5c264e4d98..d7e49de5cb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,8 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.16.5-nightly.2
+        - 3.16.5-nightly.1
         - 3.16.4
         - 3.16.4-nightly.3
         - 3.16.4-nightly.2
@@ -133,8 +135,6 @@ body:
         - 3.14.8-nightly.4
         - 3.14.8-nightly.3
         - 3.14.8-nightly.2
-        - 3.14.8-nightly.1
-        - 3.14.7
     validations:
       required: true
   - type: dropdown

From 3f1fb736a60d5ae88e4a425b2d2ce75f3554dae4 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 28 Aug 2023 18:45:43 +0800
Subject: [PATCH 43/80] make sure arnold and other renderers not fallbacking to
 workfile

---
 .../deadline/plugins/publish/submit_max_deadline.py   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
index 8e05582962..f1127f60f2 100644
--- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -12,7 +12,9 @@ from openpype.pipeline import (
     legacy_io,
     OpenPypePyblishPluginMixin
 )
-from openpype.settings import get_project_settings
+from openpype.pipeline.publish.lib import (
+    replace_with_published_scene_path
+)
 from openpype.hosts.max.api.lib import (
     get_current_renderer,
     get_multipass_setting
@@ -247,7 +249,12 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         if instance.data["renderer"] == "Redshift_Renderer":
             self.log.debug("Using Redshift...published scene wont be used..")
             replace_in_path = False
-            return replace_in_path
+            return replace_with_published_scene_path(
+                instance, replace_in_path)
+        else:
+            return replace_with_published_scene_path(
+                instance, replace_in_path)
+
 
     @staticmethod
     def _iter_expected_files(exp):

From 6e50d1a814c3765352038c5bf640bd9bc5409f43 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 28 Aug 2023 12:47:43 +0200
Subject: [PATCH 44/80] Fix log message - actually provide plugin name after
 "Plugin"

---
 openpype/pipeline/publish/lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py
index ada12800a9..810e1dd342 100644
--- a/openpype/pipeline/publish/lib.py
+++ b/openpype/pipeline/publish/lib.py
@@ -465,7 +465,7 @@ def apply_plugin_settings_automatically(plugin, settings, logger=None):
     for option, value in settings.items():
         if logger:
             logger.debug("Plugin {} - Attr: {} -> {}".format(
-                option, value, plugin.__name__
+                plugin.__name__, option, value
             ))
         setattr(plugin, option, value)
 

From a59de7db311bfeca3114c51920eed9f6098dbc2c Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 28 Aug 2023 18:50:20 +0800
Subject: [PATCH 45/80] clean up

---
 .../deadline/plugins/publish/submit_max_deadline.py       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
index f1127f60f2..d8725e853c 100644
--- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -249,12 +249,8 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         if instance.data["renderer"] == "Redshift_Renderer":
             self.log.debug("Using Redshift...published scene wont be used..")
             replace_in_path = False
-            return replace_with_published_scene_path(
-                instance, replace_in_path)
-        else:
-            return replace_with_published_scene_path(
-                instance, replace_in_path)
-
+        return replace_with_published_scene_path(
+            instance, replace_in_path)
 
     @staticmethod
     def _iter_expected_files(exp):

From f95c4f27cee49f2281e427a6b855ca3364c99291 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 28 Aug 2023 13:48:20 +0200
Subject: [PATCH 46/80] Use `logging` module style formatting

---
 openpype/pipeline/publish/lib.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py
index 810e1dd342..815761cd0f 100644
--- a/openpype/pipeline/publish/lib.py
+++ b/openpype/pipeline/publish/lib.py
@@ -464,9 +464,8 @@ def apply_plugin_settings_automatically(plugin, settings, logger=None):
 
     for option, value in settings.items():
         if logger:
-            logger.debug("Plugin {} - Attr: {} -> {}".format(
-                plugin.__name__, option, value
-            ))
+            logger.debug("Plugin %s - Attr: %s -> %s",
+                         plugin.__name__, option, value)
         setattr(plugin, option, value)
 
 

From e6bbb0c038abb0476d66cbc1277dd170343f684b Mon Sep 17 00:00:00 2001
From: Mustafa-Zarkash <mustafataherzaky@outlook.com>
Date: Mon, 28 Aug 2023 22:47:18 +0300
Subject: [PATCH 47/80] add reset fbs to reset framerange

---
 openpype/hosts/houdini/api/lib.py      | 5 +++++
 openpype/hosts/houdini/api/pipeline.py | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/houdini/api/lib.py b/openpype/hosts/houdini/api/lib.py
index b03f8c8fc1..55f4fd6197 100644
--- a/openpype/hosts/houdini/api/lib.py
+++ b/openpype/hosts/houdini/api/lib.py
@@ -474,6 +474,11 @@ def maintained_selection():
 def reset_framerange():
     """Set frame range to current asset"""
 
+    # Set new scene fps
+    fps = get_asset_fps()
+    print("Setting scene FPS to {}".format(int(fps)))
+    set_scene_fps(fps)
+
     project_name = get_current_project_name()
     asset_name = get_current_asset_name()
     # Get the asset ID from the database for the asset of current context
diff --git a/openpype/hosts/houdini/api/pipeline.py b/openpype/hosts/houdini/api/pipeline.py
index 8a26bbb504..3c325edfa7 100644
--- a/openpype/hosts/houdini/api/pipeline.py
+++ b/openpype/hosts/houdini/api/pipeline.py
@@ -25,7 +25,6 @@ from openpype.lib import (
     emit_event,
 )
 
-from .lib import get_asset_fps
 
 log = logging.getLogger("openpype.hosts.houdini")
 
@@ -385,11 +384,6 @@ def _set_context_settings():
         None
     """
 
-    # Set new scene fps
-    fps = get_asset_fps()
-    print("Setting scene FPS to %i" % fps)
-    lib.set_scene_fps(fps)
-
     lib.reset_framerange()
 
 

From 3eb2cc21b2ae34405f6eda2539c73384e2e948b4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 29 Aug 2023 12:01:29 +0200
Subject: [PATCH 48/80] Update ayon-python-api (#5512)

* query asset only if asset id is available

* updated ayon api

* fix subsets arguments
---
 openpype/client/server/entities.py            |   8 +-
 openpype/tools/utils/tasks_widget.py          |   2 +-
 .../vendor/python/common/ayon_api/__init__.py |  10 +
 .../vendor/python/common/ayon_api/_api.py     |  20 ++
 .../python/common/ayon_api/constants.py       |   7 +-
 .../python/common/ayon_api/graphql_queries.py |   6 +-
 .../python/common/ayon_api/server_api.py      | 236 +++++++++++++++---
 .../vendor/python/common/ayon_api/version.py  |   2 +-
 8 files changed, 248 insertions(+), 43 deletions(-)

diff --git a/openpype/client/server/entities.py b/openpype/client/server/entities.py
index 9579f13add..39322627bb 100644
--- a/openpype/client/server/entities.py
+++ b/openpype/client/server/entities.py
@@ -83,10 +83,10 @@ def _get_subsets(
         project_name,
         subset_ids,
         subset_names,
-        folder_ids,
-        names_by_folder_ids,
-        active,
-        fields
+        folder_ids=folder_ids,
+        names_by_folder_ids=names_by_folder_ids,
+        active=active,
+        fields=fields,
     ):
         yield convert_v4_subset_to_v3(subset)
 
diff --git a/openpype/tools/utils/tasks_widget.py b/openpype/tools/utils/tasks_widget.py
index 8c0505223e..b554ed50d3 100644
--- a/openpype/tools/utils/tasks_widget.py
+++ b/openpype/tools/utils/tasks_widget.py
@@ -75,7 +75,7 @@ class TasksModel(QtGui.QStandardItemModel):
 
     def set_asset_id(self, asset_id):
         asset_doc = None
-        if self._context_is_valid():
+        if asset_id and self._context_is_valid():
             project_name = self._get_current_project()
             asset_doc = get_asset_by_id(
                 project_name, asset_id, fields=["data.tasks"]
diff --git a/openpype/vendor/python/common/ayon_api/__init__.py b/openpype/vendor/python/common/ayon_api/__init__.py
index 027e7a3da2..dc3d361f46 100644
--- a/openpype/vendor/python/common/ayon_api/__init__.py
+++ b/openpype/vendor/python/common/ayon_api/__init__.py
@@ -48,6 +48,11 @@ from ._api import (
     patch,
     delete,
 
+    get_timeout,
+    set_timeout,
+    get_max_retries,
+    set_max_retries,
+
     get_event,
     get_events,
     dispatch_event,
@@ -245,6 +250,11 @@ __all__ = (
     "patch",
     "delete",
 
+    "get_timeout",
+    "set_timeout",
+    "get_max_retries",
+    "set_max_retries",
+
     "get_event",
     "get_events",
     "dispatch_event",
diff --git a/openpype/vendor/python/common/ayon_api/_api.py b/openpype/vendor/python/common/ayon_api/_api.py
index 1d7b1837f1..22e137d6e5 100644
--- a/openpype/vendor/python/common/ayon_api/_api.py
+++ b/openpype/vendor/python/common/ayon_api/_api.py
@@ -474,6 +474,26 @@ def delete(*args, **kwargs):
     return con.delete(*args, **kwargs)
 
 
+def get_timeout(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_timeout(*args, **kwargs)
+
+
+def set_timeout(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.set_timeout(*args, **kwargs)
+
+
+def get_max_retries(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.get_max_retries(*args, **kwargs)
+
+
+def set_max_retries(*args, **kwargs):
+    con = get_server_api_connection()
+    return con.set_max_retries(*args, **kwargs)
+
+
 def get_event(*args, **kwargs):
     con = get_server_api_connection()
     return con.get_event(*args, **kwargs)
diff --git a/openpype/vendor/python/common/ayon_api/constants.py b/openpype/vendor/python/common/ayon_api/constants.py
index eb1ace0590..eaeb77b607 100644
--- a/openpype/vendor/python/common/ayon_api/constants.py
+++ b/openpype/vendor/python/common/ayon_api/constants.py
@@ -1,18 +1,21 @@
 # Environments where server url and api key are stored for global connection
 SERVER_URL_ENV_KEY = "AYON_SERVER_URL"
 SERVER_API_ENV_KEY = "AYON_API_KEY"
+SERVER_TIMEOUT_ENV_KEY = "AYON_SERVER_TIMEOUT"
+SERVER_RETRIES_ENV_KEY = "AYON_SERVER_RETRIES"
+
 # Backwards compatibility
 SERVER_TOKEN_ENV_KEY = SERVER_API_ENV_KEY
 
 # --- User ---
 DEFAULT_USER_FIELDS = {
-    "roles",
+    "accessGroups",
+    "defaultAccessGroups",
     "name",
     "isService",
     "isManager",
     "isGuest",
     "isAdmin",
-    "defaultRoles",
     "createdAt",
     "active",
     "hasPassword",
diff --git a/openpype/vendor/python/common/ayon_api/graphql_queries.py b/openpype/vendor/python/common/ayon_api/graphql_queries.py
index f31134a04d..2435fc8a17 100644
--- a/openpype/vendor/python/common/ayon_api/graphql_queries.py
+++ b/openpype/vendor/python/common/ayon_api/graphql_queries.py
@@ -247,9 +247,11 @@ def products_graphql_query(fields):
     query = GraphQlQuery("ProductsQuery")
 
     project_name_var = query.add_variable("projectName", "String!")
-    folder_ids_var = query.add_variable("folderIds", "[String!]")
     product_ids_var = query.add_variable("productIds", "[String!]")
     product_names_var = query.add_variable("productNames", "[String!]")
+    folder_ids_var = query.add_variable("folderIds", "[String!]")
+    product_types_var = query.add_variable("productTypes", "[String!]")
+    statuses_var = query.add_variable("statuses", "[String!]")
 
     project_field = query.add_field("project")
     project_field.set_filter("name", project_name_var)
@@ -258,6 +260,8 @@ def products_graphql_query(fields):
     products_field.set_filter("ids", product_ids_var)
     products_field.set_filter("names", product_names_var)
     products_field.set_filter("folderIds", folder_ids_var)
+    products_field.set_filter("productTypes", product_types_var)
+    products_field.set_filter("statuses", statuses_var)
 
     nested_fields = fields_to_dict(set(fields))
     add_links_fields(products_field, nested_fields)
diff --git a/openpype/vendor/python/common/ayon_api/server_api.py b/openpype/vendor/python/common/ayon_api/server_api.py
index f2689e88dc..511a239a83 100644
--- a/openpype/vendor/python/common/ayon_api/server_api.py
+++ b/openpype/vendor/python/common/ayon_api/server_api.py
@@ -2,6 +2,7 @@ import os
 import re
 import io
 import json
+import time
 import logging
 import collections
 import platform
@@ -26,6 +27,8 @@ except ImportError:
         from json import JSONDecodeError as RequestsJSONDecodeError
 
 from .constants import (
+    SERVER_TIMEOUT_ENV_KEY,
+    SERVER_RETRIES_ENV_KEY,
     DEFAULT_PRODUCT_TYPE_FIELDS,
     DEFAULT_PROJECT_FIELDS,
     DEFAULT_FOLDER_FIELDS,
@@ -127,6 +130,8 @@ class RestApiResponse(object):
 
     @property
     def text(self):
+        if self._response is None:
+            return self.detail
         return self._response.text
 
     @property
@@ -135,6 +140,8 @@ class RestApiResponse(object):
 
     @property
     def headers(self):
+        if self._response is None:
+            return {}
         return self._response.headers
 
     @property
@@ -148,6 +155,8 @@ class RestApiResponse(object):
 
     @property
     def content(self):
+        if self._response is None:
+            return b""
         return self._response.content
 
     @property
@@ -339,7 +348,11 @@ class ServerAPI(object):
             variable value 'AYON_CERT_FILE' by default.
         create_session (Optional[bool]): Create session for connection if
             token is available. Default is True.
+        timeout (Optional[float]): Timeout for requests.
+        max_retries (Optional[int]): Number of retries for requests.
     """
+    _default_timeout = 10.0
+    _default_max_retries = 3
 
     def __init__(
         self,
@@ -352,6 +365,8 @@ class ServerAPI(object):
         ssl_verify=None,
         cert=None,
         create_session=True,
+        timeout=None,
+        max_retries=None,
     ):
         if not base_url:
             raise ValueError("Invalid server URL {}".format(str(base_url)))
@@ -370,6 +385,13 @@ class ServerAPI(object):
         )
         self._sender = sender
 
+        self._timeout = None
+        self._max_retries = None
+
+        # Set timeout and max retries based on passed values
+        self.set_timeout(timeout)
+        self.set_max_retries(max_retries)
+
         if ssl_verify is None:
             # Custom AYON env variable for CA file or 'True'
             # - that should cover most default behaviors in 'requests'
@@ -474,6 +496,87 @@ class ServerAPI(object):
     ssl_verify = property(get_ssl_verify, set_ssl_verify)
     cert = property(get_cert, set_cert)
 
+    @classmethod
+    def get_default_timeout(cls):
+        """Default value for requests timeout.
+
+        First looks for environment variable SERVER_TIMEOUT_ENV_KEY which
+        can affect timeout value. If not available then use class
+        attribute '_default_timeout'.
+
+        Returns:
+            float: Timeout value in seconds.
+        """
+
+        try:
+            return float(os.environ.get(SERVER_TIMEOUT_ENV_KEY))
+        except (ValueError, TypeError):
+            pass
+
+        return cls._default_timeout
+
+    @classmethod
+    def get_default_max_retries(cls):
+        """Default value for requests max retries.
+
+        First looks for environment variable SERVER_RETRIES_ENV_KEY, which
+        can affect max retries value. If not available then use class
+        attribute '_default_max_retries'.
+
+        Returns:
+            int: Max retries value.
+        """
+
+        try:
+            return int(os.environ.get(SERVER_RETRIES_ENV_KEY))
+        except (ValueError, TypeError):
+            pass
+
+        return cls._default_max_retries
+
+    def get_timeout(self):
+        """Current value for requests timeout.
+
+        Returns:
+            float: Timeout value in seconds.
+        """
+
+        return self._timeout
+
+    def set_timeout(self, timeout):
+        """Change timeout value for requests.
+
+        Args:
+            timeout (Union[float, None]): Timeout value in seconds.
+        """
+
+        if timeout is None:
+            timeout = self.get_default_timeout()
+        self._timeout = float(timeout)
+
+    def get_max_retries(self):
+        """Current value for requests max retries.
+
+        Returns:
+            int: Max retries value.
+        """
+
+        return self._max_retries
+
+    def set_max_retries(self, max_retries):
+        """Change max retries value for requests.
+
+        Args:
+            max_retries (Union[int, None]): Max retries value.
+        """
+
+        if max_retries is None:
+            max_retries = self.get_default_max_retries()
+        self._max_retries = int(max_retries)
+
+    timeout = property(get_timeout, set_timeout)
+    max_retries = property(get_max_retries, set_max_retries)
+
     @property
     def access_token(self):
         """Access token used for authorization to server.
@@ -890,9 +993,17 @@ class ServerAPI(object):
         for attr, filter_value in filters.items():
             query.set_variable_value(attr, filter_value)
 
+        # Backwards compatibility for server 0.3.x
+        #   - will be removed in future releases
+        major, minor, _, _, _ = self.server_version_tuple
+        access_groups_field = "accessGroups"
+        if major == 0 and minor <= 3:
+            access_groups_field = "roles"
+
         for parsed_data in query.continuous_query(self):
             for user in parsed_data["users"]:
-                user["roles"] = json.loads(user["roles"])
+                user[access_groups_field] = json.loads(
+                    user[access_groups_field])
                 yield user
 
     def get_user(self, username=None):
@@ -1004,6 +1115,10 @@ class ServerAPI(object):
         logout_from_server(self._base_url, self._access_token)
 
     def _do_rest_request(self, function, url, **kwargs):
+        kwargs.setdefault("timeout", self.timeout)
+        max_retries = kwargs.get("max_retries", self.max_retries)
+        if max_retries < 1:
+            max_retries = 1
         if self._session is None:
             # Validate token if was not yet validated
             #    - ignore validation if we're in middle of
@@ -1023,38 +1138,54 @@ class ServerAPI(object):
         elif isinstance(function, RequestType):
             function = self._session_functions_mapping[function]
 
-        try:
-            response = function(url, **kwargs)
+        response = None
+        new_response = None
+        for _ in range(max_retries):
+            try:
+                response = function(url, **kwargs)
+                break
+
+            except ConnectionRefusedError:
+                # Server may be restarting
+                new_response = RestApiResponse(
+                    None,
+                    {"detail": "Unable to connect the server. Connection refused"}
+                )
+            except requests.exceptions.Timeout:
+                # Connection timed out
+                new_response = RestApiResponse(
+                    None,
+                    {"detail": "Connection timed out."}
+                )
+            except requests.exceptions.ConnectionError:
+                # Other connection error (ssl, etc) - does not make sense to
+                #   try call server again
+                new_response = RestApiResponse(
+                    None,
+                    {"detail": "Unable to connect the server. Connection error"}
+                )
+                break
+
+            time.sleep(0.1)
+
+        if new_response is not None:
+            return new_response
+
+        content_type = response.headers.get("Content-Type")
+        if content_type == "application/json":
+            try:
+                new_response = RestApiResponse(response)
+            except JSONDecodeError:
+                new_response = RestApiResponse(
+                    None,
+                    {
+                        "detail": "The response is not a JSON: {}".format(
+                            response.text)
+                    }
+                )
 
-        except ConnectionRefusedError:
-            new_response = RestApiResponse(
-                None,
-                {"detail": "Unable to connect the server. Connection refused"}
-            )
-        except requests.exceptions.ConnectionError:
-            new_response = RestApiResponse(
-                None,
-                {"detail": "Unable to connect the server. Connection error"}
-            )
         else:
-            content_type = response.headers.get("Content-Type")
-            if content_type == "application/json":
-                try:
-                    new_response = RestApiResponse(response)
-                except JSONDecodeError:
-                    new_response = RestApiResponse(
-                        None,
-                        {
-                            "detail": "The response is not a JSON: {}".format(
-                                response.text)
-                        }
-                    )
-
-            elif content_type in ("image/jpeg", "image/png"):
-                new_response = RestApiResponse(response)
-
-            else:
-                new_response = RestApiResponse(response)
+            new_response = RestApiResponse(response)
 
         self.log.debug("Response {}".format(str(new_response)))
         return new_response
@@ -1747,7 +1878,15 @@ class ServerAPI(object):
             entity_type_defaults = DEFAULT_WORKFILE_INFO_FIELDS
 
         elif entity_type == "user":
-            entity_type_defaults = DEFAULT_USER_FIELDS
+            entity_type_defaults = set(DEFAULT_USER_FIELDS)
+            # Backwards compatibility for server 0.3.x
+            #   - will be removed in future releases
+            major, minor, _, _, _ = self.server_version_tuple
+            if major == 0 and minor <= 3:
+                entity_type_defaults.discard("accessGroups")
+                entity_type_defaults.discard("defaultAccessGroups")
+                entity_type_defaults.add("roles")
+                entity_type_defaults.add("defaultRoles")
 
         else:
             raise ValueError("Unknown entity type \"{}\"".format(entity_type))
@@ -2124,7 +2263,12 @@ class ServerAPI(object):
                 server.
         """
 
-        result = self.get("desktop/dependency_packages")
+        endpoint = "desktop/dependencyPackages"
+        major, minor, _, _, _ = self.server_version_tuple
+        if major == 0 and minor <= 3:
+            endpoint = "desktop/dependency_packages"
+
+        result = self.get(endpoint)
         result.raise_for_status()
         return result.data
 
@@ -3810,6 +3954,8 @@ class ServerAPI(object):
         product_ids=None,
         product_names=None,
         folder_ids=None,
+        product_types=None,
+        statuses=None,
         names_by_folder_ids=None,
         active=True,
         fields=None,
@@ -3828,6 +3974,10 @@ class ServerAPI(object):
                 filtering.
             folder_ids (Optional[Iterable[str]]): Ids of task parents.
                 Use 'None' if folder is direct child of project.
+            product_types (Optional[Iterable[str]]): Product types used for
+                filtering.
+            statuses (Optional[Iterable[str]]): Product statuses used for
+                filtering.
             names_by_folder_ids (Optional[dict[str, Iterable[str]]]): Product
                 name filtering by folder id.
             active (Optional[bool]): Filter active/inactive products.
@@ -3862,6 +4012,18 @@ class ServerAPI(object):
             if not filter_folder_ids:
                 return
 
+        filter_product_types = None
+        if product_types is not None:
+            filter_product_types = set(product_types)
+            if not filter_product_types:
+                return
+
+        filter_statuses = None
+        if statuses is not None:
+            filter_statuses = set(statuses)
+            if not filter_statuses:
+                return
+
         # This will disable 'folder_ids' and 'product_names' filters
         #   - maybe could be enhanced in future?
         if names_by_folder_ids is not None:
@@ -3881,7 +4043,7 @@ class ServerAPI(object):
             fields = set(fields) | {"id"}
             if "attrib" in fields:
                 fields.remove("attrib")
-                fields |= self.get_attributes_fields_for_type("folder")
+                fields |= self.get_attributes_fields_for_type("product")
         else:
             fields = self.get_default_fields_for_type("product")
 
@@ -3908,6 +4070,12 @@ class ServerAPI(object):
         if filter_folder_ids:
             filters["folderIds"] = list(filter_folder_ids)
 
+        if filter_product_types:
+            filters["productTypes"] = list(filter_product_types)
+
+        if filter_statuses:
+            filters["statuses"] = list(filter_statuses)
+
         if product_ids:
             filters["productIds"] = list(product_ids)
 
diff --git a/openpype/vendor/python/common/ayon_api/version.py b/openpype/vendor/python/common/ayon_api/version.py
index df841e0829..f3826a6407 100644
--- a/openpype/vendor/python/common/ayon_api/version.py
+++ b/openpype/vendor/python/common/ayon_api/version.py
@@ -1,2 +1,2 @@
 """Package declaring Python API for Ayon server."""
-__version__ = "0.3.5"
+__version__ = "0.4.1"

From 61a8ff26f0d42577d4f19346242270ab56a75505 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 29 Aug 2023 15:06:52 +0200
Subject: [PATCH 49/80] General: Fix Validate Publish Dir Validator (#5534)

* Fix using wrong key

* Update docstrings
---
 openpype/plugins/publish/validate_publish_dir.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/openpype/plugins/publish/validate_publish_dir.py b/openpype/plugins/publish/validate_publish_dir.py
index 2f41127548..ad5fd34434 100644
--- a/openpype/plugins/publish/validate_publish_dir.py
+++ b/openpype/plugins/publish/validate_publish_dir.py
@@ -7,12 +7,12 @@ from openpype.pipeline.publish import (
 
 
 class ValidatePublishDir(pyblish.api.InstancePlugin):
-    """Validates if 'publishDir' is a project directory
+    """Validates if files are being published into a project directory
 
-    'publishDir' is collected based on publish templates. In specific cases
-    ('source' template) source folder of items is used as a 'publishDir', this
-    validates if it is inside any project dir for the project.
-    (eg. files are not published from local folder, unaccessible for studio'
+    In specific cases ('source' template - in place publishing) source folder
+    of published items is used as a regular `publish` dir.
+    This validates if it is inside any project dir for the project.
+    (eg. files are not published from local folder, inaccessible for studio')
 
     """
 
@@ -44,6 +44,8 @@ class ValidatePublishDir(pyblish.api.InstancePlugin):
 
         anatomy = instance.context.data["anatomy"]
 
+        # original_dirname must be convertable to rootless path
+        # in other case it is path inside of root folder for the project
         success, _ = anatomy.find_root_template_from_path(original_dirname)
 
         formatting_data = {
@@ -56,11 +58,12 @@ class ValidatePublishDir(pyblish.api.InstancePlugin):
                                             formatting_data=formatting_data)
 
     def _get_template_name_from_instance(self, instance):
+        """Find template which will be used during integration."""
         project_name = instance.context.data["projectName"]
         host_name = instance.context.data["hostName"]
         anatomy_data = instance.data["anatomyData"]
         family = anatomy_data["family"]
-        family = self.family_mapping.get("family") or family
+        family = self.family_mapping.get(family) or family
         task_info = anatomy_data.get("task") or {}
 
         return get_publish_template_name(

From 9f31075acd53bc378cf4c347a1802f06cb4167d1 Mon Sep 17 00:00:00 2001
From: Mustafa-Zarkash <mustafataherzaky@outlook.com>
Date: Tue, 29 Aug 2023 16:41:09 +0300
Subject: [PATCH 50/80] resolve BigRoy's conversation

---
 openpype/hosts/houdini/api/lib.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/houdini/api/lib.py b/openpype/hosts/houdini/api/lib.py
index 55f4fd6197..28805dc015 100644
--- a/openpype/hosts/houdini/api/lib.py
+++ b/openpype/hosts/houdini/api/lib.py
@@ -22,9 +22,12 @@ log = logging.getLogger(__name__)
 JSON_PREFIX = "JSON:::"
 
 
-def get_asset_fps():
+def get_asset_fps(asset_doc=None):
     """Return current asset fps."""
-    return get_current_project_asset()["data"].get("fps")
+
+    if asset_doc is None:
+        asset_doc = get_current_project_asset(fields=["data.fps"])
+    return asset_doc["data"].get("fps")
 
 
 def set_id(node, unique_id, overwrite=False):
@@ -472,19 +475,19 @@ def maintained_selection():
 
 
 def reset_framerange():
-    """Set frame range to current asset"""
-
-    # Set new scene fps
-    fps = get_asset_fps()
-    print("Setting scene FPS to {}".format(int(fps)))
-    set_scene_fps(fps)
+    """Set frame range and FPS to current asset"""
 
+    # Get asset data
     project_name = get_current_project_name()
     asset_name = get_current_asset_name()
     # Get the asset ID from the database for the asset of current context
     asset_doc = get_asset_by_name(project_name, asset_name)
     asset_data = asset_doc["data"]
 
+    # Get FPS
+    fps = get_asset_fps(asset_doc)
+
+    # Get Start and End Frames
     frame_start = asset_data.get("frameStart")
     frame_end = asset_data.get("frameEnd")
 
@@ -498,8 +501,12 @@ def reset_framerange():
     frame_start -= int(handle_start)
     frame_end += int(handle_end)
 
+    # Set frame range and FPS
+    print("Setting scene FPS to {}".format(int(fps)))
+    set_scene_fps(fps)
     hou.playbar.setFrameRange(frame_start, frame_end)
     hou.playbar.setPlaybackRange(frame_start, frame_end)
+    print("Setting current frame to {}".format(frame_start))
     hou.setFrame(frame_start)
 
 

From c64e6c1fca25f096b0827d7c2418d2e67ebd1c91 Mon Sep 17 00:00:00 2001
From: Mustafa Zarkash <mustafataherzaky@outlook.com>
Date: Tue, 29 Aug 2023 16:52:23 +0300
Subject: [PATCH 51/80] Update get_asset_fps

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/hosts/houdini/api/lib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/houdini/api/lib.py b/openpype/hosts/houdini/api/lib.py
index 28805dc015..975f4e531e 100644
--- a/openpype/hosts/houdini/api/lib.py
+++ b/openpype/hosts/houdini/api/lib.py
@@ -27,7 +27,7 @@ def get_asset_fps(asset_doc=None):
 
     if asset_doc is None:
         asset_doc = get_current_project_asset(fields=["data.fps"])
-    return asset_doc["data"].get("fps")
+    return asset_doc["data"]["fps"]
 
 
 def set_id(node, unique_id, overwrite=False):

From 44df6d69a6ffbe9a73dc38849251dc95ad025528 Mon Sep 17 00:00:00 2001
From: Mustafa Zarkash <mustafataherzaky@outlook.com>
Date: Tue, 29 Aug 2023 16:55:24 +0300
Subject: [PATCH 52/80] Delete print statment

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/hosts/houdini/api/lib.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/hosts/houdini/api/lib.py b/openpype/hosts/houdini/api/lib.py
index 975f4e531e..75c7ff9fee 100644
--- a/openpype/hosts/houdini/api/lib.py
+++ b/openpype/hosts/houdini/api/lib.py
@@ -506,7 +506,6 @@ def reset_framerange():
     set_scene_fps(fps)
     hou.playbar.setFrameRange(frame_start, frame_end)
     hou.playbar.setPlaybackRange(frame_start, frame_end)
-    print("Setting current frame to {}".format(frame_start))
     hou.setFrame(frame_start)
 
 

From 6014cc6549d4869c81ff8cbe1acacfb30332db3a Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 29 Aug 2023 16:16:31 +0200
Subject: [PATCH 53/80] Enhancement: Deadline plugins optimize, cleanup and fix
 optional support for validate deadline pools (#5531)

* Fix optional support

* Query deadline only once per url

* Report both pools if both are invalid instead of only primary pool

* Fix formatting in UI

* Re-use existing implementation of `requests_get`

* Cosmetics

* Cache deadline url responses to avoid the need of request per instance

* Only format error message when needed + convert to `KnownPublishError`

* Allow deadline url per instance, similar to `ValidateDeadlineConnections`

* Tweak grammar/readability

* Fix title

* Remove instance data from right side in Publish report since it's available in logs
---
 .../collect_deadline_server_from_instance.py  | 14 +++--
 .../publish/help/validate_deadline_pools.xml  | 30 ++++-----
 .../publish/validate_deadline_connection.py   | 34 ++++------
 .../publish/validate_deadline_pools.py        | 63 +++++++++++++------
 4 files changed, 79 insertions(+), 62 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index eadfc3c83e..8a408d7f4f 100644
--- a/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -8,6 +8,7 @@ attribute or using default server if that attribute doesn't exists.
 from maya import cmds
 
 import pyblish.api
+from openpype.pipeline.publish import KnownPublishError
 
 
 class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
@@ -81,13 +82,14 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
             if k in default_servers
         }
 
-        msg = (
-            "\"{}\" server on instance is not enabled in project settings."
-            " Enabled project servers:\n{}".format(
-                instance_server, project_enabled_servers
+        if instance_server not in project_enabled_servers:
+            msg = (
+                "\"{}\" server on instance is not enabled in project settings."
+                " Enabled project servers:\n{}".format(
+                    instance_server, project_enabled_servers
+                )
             )
-        )
-        assert instance_server in project_enabled_servers, msg
+            raise KnownPublishError(msg)
 
         self.log.debug("Using project approved server.")
         return project_enabled_servers[instance_server]
diff --git a/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml b/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml
index 0e7d72910e..aa21df3734 100644
--- a/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml
+++ b/openpype/modules/deadline/plugins/publish/help/validate_deadline_pools.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
     <error id="main">
-        <title>Scene setting</title>
+        <title>Deadline Pools</title>
         <description>
-            ## Invalid Deadline pools found
+## Invalid Deadline pools found
 
-            Configured pools don't match what is set in Deadline.
+Configured pools don't match available pools in Deadline.
 
-            {invalid_value_str}
+### How to repair?
 
-            ### How to repair?
+If your instance had deadline pools set on creation, remove or
+change them.
 
-            If your instance had deadline pools set on creation, remove or
-            change them.
+In other cases inform admin to change them in Settings.
 
-        In other cases inform admin to change them in Settings.
+Available deadline pools:
+
+{pools_str}
 
-        Available deadline pools {pools_str}.
         </description>
         <detail>
-            ### __Detailed Info__
+### __Detailed Info__
 
-            This error is shown when deadline pool is not on Deadline anymore. It
-            could happen in case of republish old workfile which was created with
-            previous deadline pools,
-            or someone changed pools on Deadline side, but didn't modify Openpype
-            Settings.
+This error is shown when a configured pool is not available on Deadline. It
+can happen when publishing old workfiles which were created with previous
+deadline pools, or someone changed the available pools in Deadline,
+but didn't modify Openpype Settings to match the changes.
         </detail>
     </error>
 </root>
\ No newline at end of file
diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py b/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
index a30401e7dc..a7b300beff 100644
--- a/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -1,8 +1,7 @@
-import os
-import requests
-
 import pyblish.api
 
+from openpype_modules.deadline.abstract_submit_deadline import requests_get
+
 
 class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
     """Validate Deadline Web Service is running"""
@@ -12,34 +11,25 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
     hosts = ["maya", "nuke"]
     families = ["renderlayer", "render"]
 
+    # cache
+    responses = {}
+
     def process(self, instance):
         # get default deadline webservice url from deadline module
         deadline_url = instance.context.data["defaultDeadline"]
         # if custom one is set in instance, use that
         if instance.data.get("deadlineUrl"):
             deadline_url = instance.data.get("deadlineUrl")
-            self.log.info(
-                "We have deadline URL on instance {}".format(
-                    deadline_url))
+            self.log.debug(
+                "We have deadline URL on instance {}".format(deadline_url)
+            )
         assert deadline_url, "Requires Deadline Webservice URL"
 
-        # Check response
-        response = self._requests_get(deadline_url)
+        if deadline_url not in self.responses:
+            self.responses[deadline_url] = requests_get(deadline_url)
+
+        response = self.responses[deadline_url]
         assert response.ok, "Response must be ok"
         assert response.text.startswith("Deadline Web Service "), (
             "Web service did not respond with 'Deadline Web Service'"
         )
-
-    def _requests_get(self, *args, **kwargs):
-        """ Wrapper for requests, disabling SSL certificate validation if
-            DONT_VERIFY_SSL environment variable is found. This is useful when
-            Deadline or Muster server are running with self-signed certificates
-            and their certificate is not added to trusted certificates on
-            client machines.
-
-            WARNING: disabling SSL certificate validation is defeating one line
-            of defense SSL is providing and it is not recommended.
-        """
-        if 'verify' not in kwargs:
-            kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL", True) else True  # noqa
-        return requests.get(*args, **kwargs)
diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
index 594f0ef866..949caff7d8 100644
--- a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -25,33 +25,58 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
                 "maxrender"]
     optional = True
 
+    # cache
+    pools_per_url = {}
+
     def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
         if not instance.data.get("farm"):
             self.log.debug("Skipping local instance.")
             return
 
-        # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
-        self.log.info("deadline_url::{}".format(deadline_url))
-        pools = DeadlineModule.get_deadline_pools(deadline_url, log=self.log)
-        self.log.info("pools::{}".format(pools))
-
-        formatting_data = {
-            "pools_str": ",".join(pools)
-        }
+        deadline_url = self.get_deadline_url(instance)
+        pools = self.get_pools(deadline_url)
 
+        invalid_pools = {}
         primary_pool = instance.data.get("primaryPool")
         if primary_pool and primary_pool not in pools:
-            msg = "Configured primary '{}' not present on Deadline".format(
-                instance.data["primaryPool"])
-            formatting_data["invalid_value_str"] = msg
-            raise PublishXmlValidationError(self, msg,
-                                            formatting_data=formatting_data)
+            invalid_pools["primary"] = primary_pool
 
         secondary_pool = instance.data.get("secondaryPool")
         if secondary_pool and secondary_pool not in pools:
-            msg = "Configured secondary '{}' not present on Deadline".format(
-                instance.data["secondaryPool"])
-            formatting_data["invalid_value_str"] = msg
-            raise PublishXmlValidationError(self, msg,
-                                            formatting_data=formatting_data)
+            invalid_pools["secondary"] = secondary_pool
+
+        if invalid_pools:
+            message = "\n".join(
+                "{} pool '{}' not available on Deadline".format(key.title(),
+                                                                pool)
+                for key, pool in invalid_pools.items()
+            )
+            raise PublishXmlValidationError(
+                plugin=self,
+                message=message,
+                formatting_data={"pools_str": ", ".join(pools)}
+            )
+
+    def get_deadline_url(self, instance):
+        # get default deadline webservice url from deadline module
+        deadline_url = instance.context.data["defaultDeadline"]
+        if instance.data.get("deadlineUrl"):
+            # if custom one is set in instance, use that
+            deadline_url = instance.data.get("deadlineUrl")
+        return deadline_url
+
+    def get_pools(self, deadline_url):
+        if deadline_url not in self.pools_per_url:
+            self.log.debug(
+                "Querying available pools for Deadline url: {}".format(
+                    deadline_url)
+            )
+            pools = DeadlineModule.get_deadline_pools(deadline_url,
+                                                      log=self.log)
+            self.log.info("Available pools: {}".format(pools))
+            self.pools_per_url[deadline_url] = pools
+
+        return self.pools_per_url[deadline_url]

From c157f74b498eb5ace1822792b5813e964ac79ebc Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 29 Aug 2023 16:45:09 +0200
Subject: [PATCH 54/80] Fix double spaces in message (#5190)

---
 openpype/plugins/publish/validate_version.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/plugins/publish/validate_version.py b/openpype/plugins/publish/validate_version.py
index 2b919a3119..84d52fab73 100644
--- a/openpype/plugins/publish/validate_version.py
+++ b/openpype/plugins/publish/validate_version.py
@@ -25,16 +25,16 @@ class ValidateVersion(pyblish.api.InstancePlugin):
             # TODO: Remove full non-html version upon drop of old publisher
             msg = (
                 "Version '{0}' from instance '{1}' that you are "
-                " trying to publish is lower or equal to an existing version "
-                " in the database. Version in database: '{2}'."
+                "trying to publish is lower or equal to an existing version "
+                "in the database. Version in database: '{2}'."
                 "Please version up your workfile to a higher version number "
                 "than: '{2}'."
             ).format(version, instance.data["name"], latest_version)
 
             msg_html = (
                 "Version <b>{0}</b> from instance <b>{1}</b> that you are "
-                " trying to publish is lower or equal to an existing version "
-                " in the database. Version in database: <b>{2}</b>.<br><br>"
+                "trying to publish is lower or equal to an existing version "
+                "in the database. Version in database: <b>{2}</b>.<br><br>"
                 "Please version up your workfile to a higher version number "
                 "than: <b>{2}</b>."
             ).format(version, instance.data["name"], latest_version)

From e56d3530cb7668bf92b78a61be61508b23ee89fb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:31:49 +0200
Subject: [PATCH 55/80] Chore: Queued event system (#5514)

* implemented queued event system

* implemented basic tests
---
 openpype/lib/events.py                       | 90 +++++++++++++++++++-
 tests/unit/openpype/lib/test_event_system.py | 83 ++++++++++++++++++
 2 files changed, 171 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/openpype/lib/test_event_system.py

diff --git a/openpype/lib/events.py b/openpype/lib/events.py
index dca58fcf93..496b765a05 100644
--- a/openpype/lib/events.py
+++ b/openpype/lib/events.py
@@ -3,6 +3,7 @@ import os
 import re
 import copy
 import inspect
+import collections
 import logging
 import weakref
 from uuid import uuid4
@@ -340,8 +341,8 @@ class EventSystem(object):
         event.emit()
         return event
 
-    def emit_event(self, event):
-        """Emit event object.
+    def _process_event(self, event):
+        """Process event topic and trigger callbacks.
 
         Args:
             event (Event): Prepared event with topic and data.
@@ -356,6 +357,91 @@ class EventSystem(object):
         for callback in invalid_callbacks:
             self._registered_callbacks.remove(callback)
 
+    def emit_event(self, event):
+        """Emit event object.
+
+        Args:
+            event (Event): Prepared event with topic and data.
+        """
+
+        self._process_event(event)
+
+
+class QueuedEventSystem(EventSystem):
+    """Events are automatically processed in queue.
+
+    If callback triggers another event, the event is not processed until
+    all callbacks of previous event are processed.
+
+    Allows to implement custom event process loop by changing 'auto_execute'.
+
+    Note:
+        This probably should be default behavior of 'EventSystem'. Changing it
+            now could cause problems in existing code.
+
+    Args:
+        auto_execute (Optional[bool]): If 'True', events are processed
+            automatically. Custom loop calling 'process_next_event'
+            must be implemented when set to 'False'.
+    """
+
+    def __init__(self, auto_execute=True):
+        super(QueuedEventSystem, self).__init__()
+        self._event_queue = collections.deque()
+        self._current_event = None
+        self._auto_execute = auto_execute
+
+    def __len__(self):
+        return self.count()
+
+    def count(self):
+        """Get number of events in queue.
+
+        Returns:
+            int: Number of events in queue.
+        """
+
+        return len(self._event_queue)
+
+    def process_next_event(self):
+        """Process next event in queue.
+
+        Should be used only if 'auto_execute' is set to 'False'. Only single
+            event is processed.
+
+        Returns:
+            Union[Event, None]: Processed event.
+        """
+
+        if self._current_event is not None:
+            raise ValueError("An event is already in progress.")
+
+        if not self._event_queue:
+            return None
+        event = self._event_queue.popleft()
+        self._current_event = event
+        self._process_event(event)
+        self._current_event = None
+        return event
+
+    def emit_event(self, event):
+        """Emit event object.
+
+        Args:
+           event (Event): Prepared event with topic and data.
+        """
+
+        if not self._auto_execute or self._current_event is not None:
+            self._event_queue.append(event)
+            return
+
+        self._event_queue.append(event)
+        while self._event_queue:
+            event = self._event_queue.popleft()
+            self._current_event = event
+            self._process_event(event)
+        self._current_event = None
+
 
 class GlobalEventSystem:
     """Event system living in global scope of process.
diff --git a/tests/unit/openpype/lib/test_event_system.py b/tests/unit/openpype/lib/test_event_system.py
new file mode 100644
index 0000000000..aa3f929065
--- /dev/null
+++ b/tests/unit/openpype/lib/test_event_system.py
@@ -0,0 +1,83 @@
+from openpype.lib.events import EventSystem, QueuedEventSystem
+
+
+def test_default_event_system():
+    output = []
+    expected_output = [3, 2, 1]
+    event_system = EventSystem()
+
+    def callback_1():
+        event_system.emit("topic.2", {}, None)
+        output.append(1)
+
+    def callback_2():
+        event_system.emit("topic.3", {}, None)
+        output.append(2)
+
+    def callback_3():
+        output.append(3)
+
+    event_system.add_callback("topic.1", callback_1)
+    event_system.add_callback("topic.2", callback_2)
+    event_system.add_callback("topic.3", callback_3)
+
+    event_system.emit("topic.1", {}, None)
+
+    assert output == expected_output, (
+        "Callbacks were not called in correct order")
+
+
+def test_base_event_system_queue():
+    output = []
+    expected_output = [1, 2, 3]
+    event_system = QueuedEventSystem()
+
+    def callback_1():
+        event_system.emit("topic.2", {}, None)
+        output.append(1)
+
+    def callback_2():
+        event_system.emit("topic.3", {}, None)
+        output.append(2)
+
+    def callback_3():
+        output.append(3)
+
+    event_system.add_callback("topic.1", callback_1)
+    event_system.add_callback("topic.2", callback_2)
+    event_system.add_callback("topic.3", callback_3)
+
+    event_system.emit("topic.1", {}, None)
+
+    assert output == expected_output, (
+        "Callbacks were not called in correct order")
+
+
+def test_manual_event_system_queue():
+    output = []
+    expected_output = [1, 2, 3]
+    event_system = QueuedEventSystem(auto_execute=False)
+
+    def callback_1():
+        event_system.emit("topic.2", {}, None)
+        output.append(1)
+
+    def callback_2():
+        event_system.emit("topic.3", {}, None)
+        output.append(2)
+
+    def callback_3():
+        output.append(3)
+
+    event_system.add_callback("topic.1", callback_1)
+    event_system.add_callback("topic.2", callback_2)
+    event_system.add_callback("topic.3", callback_3)
+
+    event_system.emit("topic.1", {}, None)
+
+    while True:
+        if event_system.process_next_event() is None:
+            break
+
+    assert output == expected_output, (
+        "Callbacks were not called in correct order")

From 04145020f6c41014697ec171d9ede8a389506dce Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 29 Aug 2023 17:35:48 +0200
Subject: [PATCH 56/80] Tests: fix unit tests (#5533)

* Changed test zip file location

* Updated tests and updated Unreal plugin

Unreal plugin was previously ejected into general one, which was later removed as unnecessary. In Unreal plugin were kept fixed bugs from general one (slate issue, better name pattern for clique)

* Updated raised exception type
---
 .../publish/validate_sequence_frames.py       | 20 ++++++-
 .../publish/test_validate_sequence_frames.py  | 53 +++++--------------
 tests/unit/openpype/lib/test_delivery.py      |  3 +-
 .../sync_server/test_site_operations.py       |  9 ++--
 4 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py b/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py
index 76bb25fac3..96485d5a2d 100644
--- a/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py
+++ b/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py
@@ -1,4 +1,6 @@
 import clique
+import os
+import re
 
 import pyblish.api
 
@@ -21,7 +23,19 @@ class ValidateSequenceFrames(pyblish.api.InstancePlugin):
         representations = instance.data.get("representations")
         for repr in representations:
             data = instance.data.get("assetEntity", {}).get("data", {})
-            patterns = [clique.PATTERNS["frames"]]
+            repr_files = repr["files"]
+            if isinstance(repr_files, str):
+                continue
+
+            ext = repr.get("ext")
+            if not ext:
+                _, ext = os.path.splitext(repr_files[0])
+            elif not ext.startswith("."):
+                ext = ".{}".format(ext)
+            pattern = r"\D?(?P<index>(?P<padding>0*)\d+){}$".format(
+                re.escape(ext))
+            patterns = [pattern]
+
             collections, remainder = clique.assemble(
                 repr["files"], minimum_items=1, patterns=patterns)
 
@@ -30,6 +44,10 @@ class ValidateSequenceFrames(pyblish.api.InstancePlugin):
             collection = collections[0]
             frames = list(collection.indexes)
 
+            if instance.data.get("slate"):
+                # Slate is not part of the frame range
+                frames = frames[1:]
+
             current_range = (frames[0], frames[-1])
             required_range = (data["clipIn"],
                               data["clipOut"])
diff --git a/tests/unit/openpype/hosts/unreal/plugins/publish/test_validate_sequence_frames.py b/tests/unit/openpype/hosts/unreal/plugins/publish/test_validate_sequence_frames.py
index 17e47c9f64..f472b8052a 100644
--- a/tests/unit/openpype/hosts/unreal/plugins/publish/test_validate_sequence_frames.py
+++ b/tests/unit/openpype/hosts/unreal/plugins/publish/test_validate_sequence_frames.py
@@ -19,7 +19,7 @@ import logging
 from pyblish.api import Instance as PyblishInstance
 
 from tests.lib.testing_classes import BaseTest
-from openpype.plugins.publish.validate_sequence_frames import (
+from openpype.hosts.unreal.plugins.publish.validate_sequence_frames import (
     ValidateSequenceFrames
 )
 
@@ -38,7 +38,13 @@ class TestValidateSequenceFrames(BaseTest):
             data = {
                 "frameStart": 1001,
                 "frameEnd": 1002,
-                "representations": []
+                "representations": [],
+                "assetEntity": {
+                    "data": {
+                        "clipIn": 1001,
+                        "clipOut": 1002,
+                    }
+                }
             }
         yield Instance
 
@@ -58,6 +64,7 @@ class TestValidateSequenceFrames(BaseTest):
         ]
         instance.data["representations"] = representations
         instance.data["frameEnd"] = 1001
+        instance.data["assetEntity"]["data"]["clipOut"] = 1001
 
         plugin.process(instance)
 
@@ -84,49 +91,11 @@ class TestValidateSequenceFrames(BaseTest):
 
         plugin.process(instance)
 
-    @pytest.mark.parametrize("files",
-                             [["Main_beauty.1001.v001.exr",
-                               "Main_beauty.1002.v001.exr"]])
-    def test_validate_sequence_frames_wrong_name(self, instance,
-                                                 plugin, files):
-        # tests for names with number inside, caused clique failure before
-        representations = [
-            {
-                "ext": "exr",
-                "files": files,
-            }
-        ]
-        instance.data["representations"] = representations
-
-        with pytest.raises(AssertionError) as excinfo:
-            plugin.process(instance)
-        assert ("Must detect single collection" in
-                str(excinfo.value))
-
-    @pytest.mark.parametrize("files",
-                             [["Main_beauty.v001.1001.ass.gz",
-                               "Main_beauty.v001.1002.ass.gz"]])
-    def test_validate_sequence_frames_possible_wrong_name(
-            self, instance, plugin, files):
-        # currently pattern fails on extensions with dots
-        representations = [
-            {
-                "files": files,
-            }
-        ]
-        instance.data["representations"] = representations
-
-        with pytest.raises(AssertionError) as excinfo:
-            plugin.process(instance)
-        assert ("Must not have remainder" in
-                str(excinfo.value))
-
     @pytest.mark.parametrize("files",
                              [["Main_beauty.v001.1001.ass.gz",
                                "Main_beauty.v001.1002.ass.gz"]])
     def test_validate_sequence_frames__correct_ext(
             self, instance, plugin, files):
-        # currently pattern fails on extensions with dots
         representations = [
             {
                 "ext": "ass.gz",
@@ -147,6 +116,7 @@ class TestValidateSequenceFrames(BaseTest):
         ]
         instance.data["representations"] = representations
         instance.data["frameEnd"] = 1003
+        instance.data["assetEntity"]["data"]["clipOut"] = 1003
 
         plugin.process(instance)
 
@@ -160,6 +130,7 @@ class TestValidateSequenceFrames(BaseTest):
         ]
         instance.data["representations"] = representations
         instance.data["frameEnd"] = 1003
+        instance.data["assetEntity"]["data"]["clipOut"] = 1003
 
         with pytest.raises(ValueError) as excinfo:
             plugin.process(instance)
@@ -175,6 +146,7 @@ class TestValidateSequenceFrames(BaseTest):
         ]
         instance.data["representations"] = representations
         instance.data["frameEnd"] = 1003
+        instance.data["assetEntity"]["data"]["clipOut"] = 1003
 
         with pytest.raises(AssertionError) as excinfo:
             plugin.process(instance)
@@ -195,6 +167,7 @@ class TestValidateSequenceFrames(BaseTest):
         instance.data["slate"] = True
         instance.data["representations"] = representations
         instance.data["frameEnd"] = 1003
+        instance.data["assetEntity"]["data"]["clipOut"] = 1003
 
         plugin.process(instance)
 
diff --git a/tests/unit/openpype/lib/test_delivery.py b/tests/unit/openpype/lib/test_delivery.py
index 04a71655e3..f1e435f3f8 100644
--- a/tests/unit/openpype/lib/test_delivery.py
+++ b/tests/unit/openpype/lib/test_delivery.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Test suite for delivery functions."""
-from openpype.lib.delivery import collect_frames
+from openpype.lib import collect_frames
 
 
 def test_collect_frames_multi_sequence():
@@ -153,4 +153,3 @@ def test_collect_frames_single_file():
 
     print(ret)
     assert ret == expected, "Not matching"
-
diff --git a/tests/unit/openpype/modules/sync_server/test_site_operations.py b/tests/unit/openpype/modules/sync_server/test_site_operations.py
index 6a861100a4..c4a83e33a6 100644
--- a/tests/unit/openpype/modules/sync_server/test_site_operations.py
+++ b/tests/unit/openpype/modules/sync_server/test_site_operations.py
@@ -12,16 +12,19 @@
         removes temporary databases (?)
 """
 import pytest
+from bson.objectid import ObjectId
 
 from tests.lib.testing_classes import ModuleUnitTest
-from bson.objectid import ObjectId
+
+from openpype.modules.sync_server.utils import SiteAlreadyPresentError
+
 
 
 class TestSiteOperation(ModuleUnitTest):
 
     REPRESENTATION_ID = "60e578d0c987036c6a7b741d"
 
-    TEST_FILES = [("1eCwPljuJeOI8A3aisfOIBKKjcmIycTEt",
+    TEST_FILES = [("1FHE70Hi7y05LLT_1O3Y6jGxwZGXKV9zX",
                    "test_site_operations.zip", '')]
 
     @pytest.fixture(scope="module")
@@ -71,7 +74,7 @@ class TestSiteOperation(ModuleUnitTest):
     @pytest.mark.usefixtures("setup_sync_server_module")
     def test_add_site_again(self, dbcon, setup_sync_server_module):
         """Depends on test_add_site, must throw exception."""
-        with pytest.raises(ValueError):
+        with pytest.raises(SiteAlreadyPresentError):
             setup_sync_server_module.add_site(self.TEST_PROJECT_NAME,
                                               self.REPRESENTATION_ID,
                                               site_name='test_site')

From ed53ef12d5befa621965847016c375033e1b24b6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:48:33 +0200
Subject: [PATCH 57/80] Chore: PowerShell script for docker build (#5535)

* added powershell script to build using docker

* fix empty variant

* make sure build folder exists

* added docker_build.ps1 to readme

* Tweaked readme to include reason for docker_build.ps1

---------

Co-authored-by: Petr Kalis <petr.kalis@gmail.com>
---
 README.md              |  4 ++
 tools/docker_build.ps1 | 98 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 tools/docker_build.ps1

diff --git a/README.md b/README.md
index 6caed8061c..92f1cb62dc 100644
--- a/README.md
+++ b/README.md
@@ -144,6 +144,10 @@ sudo ./tools/docker_build.sh centos7
 
 If all is successful, you'll find built OpenPype in `./build/` folder.
 
+Docker build can be also started from Windows machine, just use `./tools/docker_build.ps1` instead of shell script.
+
+This could be used even for building linux build (with argument `centos7` or `debian`)
+
 #### Manual build
 You will need [Python >= 3.9](https://www.python.org/downloads/) and [git](https://git-scm.com/downloads). You'll also need [curl](https://curl.se) on systems that doesn't have one preinstalled.
 
diff --git a/tools/docker_build.ps1 b/tools/docker_build.ps1
new file mode 100644
index 0000000000..392165288c
--- /dev/null
+++ b/tools/docker_build.ps1
@@ -0,0 +1,98 @@
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$repo_root = (Get-Item $script_dir).parent.FullName
+
+$env:PSModulePath = $env:PSModulePath + ";$($repo_root)\tools\modules\powershell"
+
+function Exit-WithCode($exitcode) {
+   # Only exit this host process if it's a child of another PowerShell parent process...
+   $parentPID = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$PID" | Select-Object -Property ParentProcessId).ParentProcessId
+   $parentProcName = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$parentPID" | Select-Object -Property Name).Name
+   if ('powershell.exe' -eq $parentProcName) { $host.SetShouldExit($exitcode) }
+
+   exit $exitcode
+}
+
+function Restore-Cwd() {
+    $tmp_current_dir = Get-Location
+    if ("$tmp_current_dir" -ne "$current_dir") {
+        Write-Color -Text ">>> ", "Restoring current directory" -Color Green, Gray
+        Set-Location -Path $current_dir
+    }
+}
+
+function Get-Container {
+    if (-not (Test-Path -PathType Leaf -Path "$($repo_root)\build\docker-image.id")) {
+        Write-Color -Text "!!! ", "Docker command failed, cannot find image id." -Color Red, Yellow
+        Restore-Cwd
+        Exit-WithCode 1
+    }
+    $id = Get-Content "$($repo_root)\build\docker-image.id"
+    Write-Color -Text ">>> ", "Creating container from image id ", "[", $id, "]" -Color Green, Gray, White, Cyan, White
+    $cid = docker create $id bash
+    if ($LASTEXITCODE -ne 0) {
+        Write-Color -Text "!!! ", "Cannot create container." -Color Red, Yellow
+        Restore-Cwd
+        Exit-WithCode 1
+    }
+    return $cid
+}
+
+function Change-Cwd() {
+    Set-Location -Path $repo_root
+}
+
+function New-DockerBuild {
+    $version_file = Get-Content -Path "$($repo_root)\openpype\version.py"
+    $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
+    $openpype_version = $result[0].Groups['version'].Value
+    $startTime = [int][double]::Parse((Get-Date -UFormat %s))
+    Write-Color -Text ">>> ", "Building OpenPype using Docker ..." -Color Green, Gray, White
+    $variant = $args[0]
+    if ($variant.Length -eq 0) {
+        $dockerfile = "$($repo_root)\Dockerfile"
+    } else {
+        $dockerfile = "$( $repo_root )\Dockerfile.$variant"
+    }
+    if (-not (Test-Path -PathType Leaf -Path $dockerfile)) {
+        Write-Color -Text "!!! ", "Dockerfile for specifed platform ", "[", $variant, "]", "doesn't exist." -Color Red, Yellow, Cyan, White, Cyan, Yellow
+        Restore-Cwd
+        Exit-WithCode 1
+    }
+    Write-Color -Text ">>> ", "Using Dockerfile for ", "[ ", $variant, " ]" -Color Green, Gray, White, Cyan, White
+
+    $build_dir = "$($repo_root)\build"
+    if (-not(Test-Path $build_dir)) {
+        New-Item -ItemType Directory -Path $build_dir
+    }
+    Write-Color -Text "--- ", "Cleaning build directory ..." -Color Yellow, Gray
+    try {
+        Remove-Item -Recurse -Force "$($build_dir)\*"
+    } catch {
+        Write-Color -Text "!!! ", "Cannot clean build directory, possibly because process is using it." -Color Red, Gray
+        Write-Color -Text $_.Exception.Message -Color Red
+        Exit-WithCode 1
+    }
+
+    Write-Color -Text ">>> ", "Running Docker build ..." -Color Green, Gray, White
+    docker build --pull --iidfile $repo_root/build/docker-image.id --build-arg BUILD_DATE=$(Get-Date -UFormat %Y-%m-%dT%H:%M:%SZ) --build-arg VERSION=$openpype_version -t pypeclub/openpype:$openpype_version -f $dockerfile .
+    if ($LASTEXITCODE -ne 0) {
+        Write-Color -Text "!!! ", "Docker command failed.", $LASTEXITCODE -Color Red, Yellow, Red
+        Restore-Cwd
+        Exit-WithCode 1
+    }
+    Write-Color -Text ">>> ", "Copying build from container ..." -Color Green, Gray, White
+    $cid = Get-Container
+
+    docker cp "$($cid):/opt/openpype/build/exe.linux-x86_64-3.9" "$($repo_root)/build"
+    docker cp "$($cid):/opt/openpype/build/build.log" "$($repo_root)/build"
+
+    $endTime = [int][double]::Parse((Get-Date -UFormat %s))
+    try {
+        New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done in $( $endTime - $startTime ) secs. You will find OpenPype and build log in build directory."
+    } catch {}
+    Write-Color -Text "*** ", "All done in ", $($endTime - $startTime), " secs. You will find OpenPype and build log in ", "'.\build'", " directory." -Color Green, Gray, White, Gray, White, Gray
+}
+
+Change-Cwd
+New-DockerBuild $ARGS

From 65bd128d510598b00b9b51f48a7eddc9ad519abc Mon Sep 17 00:00:00 2001
From: Mustafa Zarkash <mustafataherzaky@outlook.com>
Date: Tue, 29 Aug 2023 19:03:58 +0300
Subject: [PATCH 58/80] Enhancement: Update houdini main menu (#5527)

* update houdini main menu

* add separator
---
 openpype/hosts/houdini/startup/MainMenuCommon.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/houdini/startup/MainMenuCommon.xml b/openpype/hosts/houdini/startup/MainMenuCommon.xml
index 47a4653d5d..5818a117eb 100644
--- a/openpype/hosts/houdini/startup/MainMenuCommon.xml
+++ b/openpype/hosts/houdini/startup/MainMenuCommon.xml
@@ -2,7 +2,19 @@
 <mainMenu>
     <menuBar>
         <subMenu id="openpype_menu">
-            <label>OpenPype</label>
+            <labelExpression><![CDATA[
+import os
+return os.environ.get("AVALON_LABEL") or "OpenPype"
+]]></labelExpression>
+            <actionItem id="asset_name">
+                    <labelExpression><![CDATA[
+from openpype.pipeline import get_current_asset_name, get_current_task_name
+label = "{}, {}".format(get_current_asset_name(), get_current_task_name())
+return label
+]]></labelExpression>
+            </actionItem>
+
+            <separatorItem/>
 
             <scriptItem id="openpype_create">
                 <label>Create...</label>

From 948687e7a236a3767b07c78eba07a13663234be0 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Wed, 30 Aug 2023 03:24:53 +0000
Subject: [PATCH 59/80] [Automated] Bump version

---
 openpype/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/version.py b/openpype/version.py
index 6d89e1eeae..12f797228b 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.16.5-nightly.2"
+__version__ = "3.16.5-nightly.3"

From e426aca7213a32fcde9ca5b7e923444e29a54049 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Aug 2023 03:25:28 +0000
Subject: [PATCH 60/80] chore(): update bug report / version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d7e49de5cb..669bf391cd 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.16.5-nightly.3
         - 3.16.5-nightly.2
         - 3.16.5-nightly.1
         - 3.16.4
@@ -134,7 +135,6 @@ body:
         - 3.14.8
         - 3.14.8-nightly.4
         - 3.14.8-nightly.3
-        - 3.14.8-nightly.2
     validations:
       required: true
   - type: dropdown

From b83a40931385b0688cad416a7a998fb9b3f6f7c1 Mon Sep 17 00:00:00 2001
From: sjt-rvx <72554834+sjt-rvx@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:12:03 +0000
Subject: [PATCH 61/80] have the addons loading respect a custom
 AYON_ADDONS_DIR (#5539)

* have the addons loading respect a custom AYON_ADDONS_DIR

* Update openpype/modules/base.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>

---------

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 openpype/modules/base.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/openpype/modules/base.py b/openpype/modules/base.py
index 9b3637c48a..84e213288c 100644
--- a/openpype/modules/base.py
+++ b/openpype/modules/base.py
@@ -373,10 +373,12 @@ def _load_ayon_addons(openpype_modules, modules_key, log):
     addons_info = _get_ayon_addons_information()
     if not addons_info:
         return v3_addons_to_skip
-    addons_dir = os.path.join(
-        appdirs.user_data_dir("AYON", "Ynput"),
-        "addons"
-    )
+    addons_dir = os.environ.get("AYON_ADDONS_DIR")
+    if not addons_dir:
+        addons_dir = os.path.join(
+            appdirs.user_data_dir("AYON", "Ynput"),
+            "addons"
+        )
     if not os.path.exists(addons_dir):
         log.warning("Addons directory does not exists. Path \"{}\"".format(
             addons_dir

From 3c3438532018c6360b77a2b5c86959638e73d86f Mon Sep 17 00:00:00 2001
From: Mustafa Zarkash <mustafataherzaky@outlook.com>
Date: Wed, 30 Aug 2023 16:35:09 +0300
Subject: [PATCH 62/80] Houdini: Improve VDB Selection (#5523)

* improve sop selection

* resolve hound conversations

* resolve BigRoy's comments
---
 .../plugins/create/create_vbd_cache.py        | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/houdini/plugins/create/create_vbd_cache.py b/openpype/hosts/houdini/plugins/create/create_vbd_cache.py
index c015cebd49..9c96e48e3a 100644
--- a/openpype/hosts/houdini/plugins/create/create_vbd_cache.py
+++ b/openpype/hosts/houdini/plugins/create/create_vbd_cache.py
@@ -33,7 +33,7 @@ class CreateVDBCache(plugin.HoudiniCreator):
         }
 
         if self.selected_nodes:
-            parms["soppath"] = self.selected_nodes[0].path()
+            parms["soppath"] = self.get_sop_node_path(self.selected_nodes[0])
 
         instance_node.setParms(parms)
 
@@ -42,3 +42,63 @@ class CreateVDBCache(plugin.HoudiniCreator):
             hou.ropNodeTypeCategory(),
             hou.sopNodeTypeCategory()
         ]
+
+    def get_sop_node_path(self, selected_node):
+        """Get Sop Path of the selected node.
+
+        Although Houdini allows ObjNode path on `sop_path` for the
+        the ROP node, we prefer it set to the SopNode path explicitly.
+        """
+
+        # Allow sop level paths (e.g. /obj/geo1/box1)
+        if isinstance(selected_node, hou.SopNode):
+            self.log.debug(
+                "Valid SopNode selection, 'SOP Path' in ROP will"
+                " be set to '%s'.", selected_node.path()
+            )
+            return selected_node.path()
+
+        # Allow object level paths to Geometry nodes (e.g. /obj/geo1)
+        # but do not allow other object level nodes types like cameras, etc.
+        elif isinstance(selected_node, hou.ObjNode) and \
+                selected_node.type().name() == "geo":
+
+            # Try to find output node.
+            sop_node = self.get_obj_output(selected_node)
+            if sop_node:
+                self.log.debug(
+                    "Valid ObjNode selection, 'SOP Path' in ROP will "
+                    "be set to the child path '%s'.", sop_node.path()
+                )
+                return sop_node.path()
+
+        self.log.debug(
+            "Selection isn't valid. 'SOP Path' in ROP will be empty."
+        )
+        return ""
+
+    def get_obj_output(self, obj_node):
+        """Try to find output node.
+
+        If any output nodes are present, return the output node with
+          the minimum 'outputidx'
+        If no output nodes are present, return the node with display flag
+        If no nodes are present at all, return None
+        """
+
+        outputs = obj_node.subnetOutputs()
+
+        # if obj_node is empty
+        if not outputs:
+            return
+
+        # if obj_node has one output child whether its
+        # sop output node or a node with the render flag
+        elif len(outputs) == 1:
+            return outputs[0]
+
+        # if there are more than one, then it has multiple output nodes
+        # return the one with the minimum 'outputidx'
+        else:
+            return min(outputs,
+                       key=lambda node: node.evalParm('outputidx'))

From a60c3d7ce304f648e13c6ab712a9a558b2186a65 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 30 Aug 2023 16:36:42 +0200
Subject: [PATCH 63/80] use correct git url in README (#5542)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 92f1cb62dc..ce98f845e6 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ development tools like [CMake](https://cmake.org/) and [Visual Studio](https://v
 
 #### Clone repository:
 ```sh
-git clone --recurse-submodules git@github.com:Pypeclub/OpenPype.git
+git clone --recurse-submodules git@github.com:ynput/OpenPype.git
 ```
 
 #### To build OpenPype:

From 74d612208ec4dc0e3a31891ce93dfca5a02d4d48 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 30 Aug 2023 17:47:03 +0200
Subject: [PATCH 64/80] AYON: Deadline expand userpaths in executables list
 (#5540)

* expand userpaths set in executables list

* Update logic for searching executable with expanduser

---------

Co-authored-by: Petr Kalis <petr.kalis@gmail.com>
---
 .../deadline/repository/custom/plugins/Ayon/Ayon.py      | 8 +++++++-
 .../repository/custom/plugins/GlobalJobPreLoad.py        | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py b/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
index 1544acc2a4..a29acf9823 100644
--- a/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
+++ b/openpype/modules/deadline/repository/custom/plugins/Ayon/Ayon.py
@@ -91,7 +91,13 @@ class AyonDeadlinePlugin(DeadlinePlugin):
         # clean '\ ' for MacOS pasting
         if platform.system().lower() == "darwin":
             exe_list = exe_list.replace("\\ ", " ")
-        exe = FileUtils.SearchFileList(exe_list)
+
+        expanded_paths = []
+        for path in exe_list.split(";"):
+            if path.startswith("~"):
+                path = os.path.expanduser(path)
+                expanded_paths.append(path)
+        exe = FileUtils.SearchFileList(";".join(expanded_paths))
 
         if exe == "":
             self.FailRender(
diff --git a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
index 5f7e1f1032..97875215ae 100644
--- a/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
+++ b/openpype/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
@@ -547,7 +547,14 @@ def get_ayon_executable():
     # clean '\ ' for MacOS pasting
     if platform.system().lower() == "darwin":
         exe_list = exe_list.replace("\\ ", " ")
-    return exe_list
+
+    # Expand user paths
+    expanded_paths = []
+    for path in exe_list.split(";"):
+        if path.startswith("~"):
+            path = os.path.expanduser(path)
+        expanded_paths.append(path)
+    return ";".join(expanded_paths)
 
 
 def inject_render_job_id(deadlinePlugin):

From 055e8250007731c3ac516ae7dbee7736629d393b Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 31 Aug 2023 15:41:33 +0800
Subject: [PATCH 65/80] bigroy comment on the camera setup on validation

---
 openpype/hosts/max/plugins/publish/collect_render.py |  3 +++
 .../max/plugins/publish/validate_viewport_camera.py  | 12 +++++-------
 .../deadline/plugins/publish/submit_max_deadline.py  |  8 ++++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py
index db5c84fad9..7df71799d3 100644
--- a/openpype/hosts/max/plugins/publish/collect_render.py
+++ b/openpype/hosts/max/plugins/publish/collect_render.py
@@ -34,6 +34,9 @@ class CollectRender(pyblish.api.InstancePlugin):
         aovs = RenderProducts().get_aovs(instance.name)
         files_by_aov.update(aovs)
 
+        camera = rt.viewport.GetCamera()
+        instance.data["cameras"] = [camera.name] or None
+
         if "expectedFiles" not in instance.data:
             instance.data["expectedFiles"] = list()
             instance.data["files"] = list()
diff --git a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
index b35ba482a9..533b55f969 100644
--- a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
+++ b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
@@ -13,8 +13,7 @@ class ValidateViewportCamera(pyblish.api.InstancePlugin,
                              OptionalPyblishPluginMixin):
     """Validates Viewport Camera
 
-    Check if the renderable camera in scene used as viewport
-    camera for rendering
+    Check if the renderable camera used for rendering
     """
 
     order = pyblish.api.ValidatorOrder
@@ -27,11 +26,9 @@ class ValidateViewportCamera(pyblish.api.InstancePlugin,
     def process(self, instance):
         if not self.is_active(instance.data):
             return
-        cameras_in_scene = [c for c in rt.Objects
-                            if rt.classOf(c) in rt.Camera.Classes]
-        if rt.viewport.getCamera() not in cameras_in_scene:
+        if not instance.data["cameras"]:
             raise PublishValidationError(
-                "Cameras in Scene not used as viewport camera"
+                "No renderable Camera found in scene."
             )
 
     @classmethod
@@ -39,10 +36,11 @@ class ValidateViewportCamera(pyblish.api.InstancePlugin,
 
         rt.viewport.setType(rt.Name("view_camera"))
         camera = rt.viewport.GetCamera()
-        cls.log.info(f"Camera {camera} set as viewport camera")
+        cls.log.info(f"Camera {camera} set as renderable camera")
         renderer_class = get_current_renderer()
         renderer = str(renderer_class).split(":")[0]
         if renderer == "Arnold":
             arv = rt.MAXToAOps.ArnoldRenderView()
             arv.setOption("Camera", str(camera))
             arv.close()
+        instance.data["cameras"] = [camera.name]
diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
index d8725e853c..6b42270d05 100644
--- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -31,6 +31,7 @@ class MaxPluginInfo(object):
     Version = attr.ib(default=None)  # Mandatory for Deadline
     SaveFile = attr.ib(default=True)
     IgnoreInputs = attr.ib(default=True)
+    Camera = attr.ib(default=None)
 
 
 class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
@@ -154,7 +155,8 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             SceneFile=self.scene_path,
             Version=instance.data["maxversion"],
             SaveFile=True,
-            IgnoreInputs=True
+            IgnoreInputs=True,
+            Camera=instance.data["cameras"][0]
         )
 
         plugin_payload = attr.asdict(plugin_info)
@@ -238,7 +240,9 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         if renderer == "Redshift_Renderer":
             plugin_data["redshift_SeparateAovFiles"] = instance.data.get(
                 "separateAovFiles")
-
+        if instance.data["cameras"]:
+            plugin_info["Camera0"] = None
+            plugin_info["Camera1"] = instance.data["cameras"][0]
         self.log.debug("plugin data:{}".format(plugin_data))
         plugin_info.update(plugin_data)
 

From 72d7a9191baca344498f6c686c44adaf0d570f26 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 31 Aug 2023 16:00:22 +0800
Subject: [PATCH 66/80] bug fix the camera instance data collection

---
 openpype/hosts/max/plugins/publish/collect_render.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py
index 7df71799d3..e7730369b6 100644
--- a/openpype/hosts/max/plugins/publish/collect_render.py
+++ b/openpype/hosts/max/plugins/publish/collect_render.py
@@ -35,7 +35,9 @@ class CollectRender(pyblish.api.InstancePlugin):
         files_by_aov.update(aovs)
 
         camera = rt.viewport.GetCamera()
-        instance.data["cameras"] = [camera.name] or None
+        instance.data["cameras"] = None
+        if camera:
+            instance.data["cameras"] = [camera.name]
 
         if "expectedFiles" not in instance.data:
             instance.data["expectedFiles"] = list()

From b9fb4ce9e9669cfd6773fde30139243e77981a3c Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 31 Aug 2023 16:05:02 +0800
Subject: [PATCH 67/80] rename the validator

---
 .../publish/validate_renderable_camera.py     | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 openpype/hosts/max/plugins/publish/validate_renderable_camera.py

diff --git a/openpype/hosts/max/plugins/publish/validate_renderable_camera.py b/openpype/hosts/max/plugins/publish/validate_renderable_camera.py
new file mode 100644
index 0000000000..61321661b5
--- /dev/null
+++ b/openpype/hosts/max/plugins/publish/validate_renderable_camera.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+import pyblish.api
+from openpype.pipeline import (
+    PublishValidationError,
+    OptionalPyblishPluginMixin)
+from openpype.pipeline.publish import RepairAction
+from openpype.hosts.max.api.lib import get_current_renderer
+
+from pymxs import runtime as rt
+
+
+class ValidateRenderableCamera(pyblish.api.InstancePlugin,
+                               OptionalPyblishPluginMixin):
+    """Validates Renderable Camera
+
+    Check if the renderable camera used for rendering
+    """
+
+    order = pyblish.api.ValidatorOrder
+    families = ["maxrender"]
+    hosts = ["max"]
+    label = "Renderable Camera"
+    optional = True
+    actions = [RepairAction]
+
+    def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+        if not instance.data["cameras"]:
+            raise PublishValidationError(
+                "No renderable Camera found in scene."
+            )
+
+    @classmethod
+    def repair(cls, instance):
+
+        rt.viewport.setType(rt.Name("view_camera"))
+        camera = rt.viewport.GetCamera()
+        cls.log.info(f"Camera {camera} set as renderable camera")
+        renderer_class = get_current_renderer()
+        renderer = str(renderer_class).split(":")[0]
+        if renderer == "Arnold":
+            arv = rt.MAXToAOps.ArnoldRenderView()
+            arv.setOption("Camera", str(camera))
+            arv.close()
+        instance.data["cameras"] = [camera.name]

From 4e88f705ee67af7ba1c0a6e920288759be006fd5 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 31 Aug 2023 16:12:36 +0800
Subject: [PATCH 68/80] remove the duplicated validator

---
 .../publish/validate_viewport_camera.py       | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 openpype/hosts/max/plugins/publish/validate_viewport_camera.py

diff --git a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py b/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
deleted file mode 100644
index 533b55f969..0000000000
--- a/openpype/hosts/max/plugins/publish/validate_viewport_camera.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-import pyblish.api
-from openpype.pipeline import (
-    PublishValidationError,
-    OptionalPyblishPluginMixin)
-from openpype.pipeline.publish import RepairAction
-from openpype.hosts.max.api.lib import get_current_renderer
-
-from pymxs import runtime as rt
-
-
-class ValidateViewportCamera(pyblish.api.InstancePlugin,
-                             OptionalPyblishPluginMixin):
-    """Validates Viewport Camera
-
-    Check if the renderable camera used for rendering
-    """
-
-    order = pyblish.api.ValidatorOrder
-    families = ["maxrender"]
-    hosts = ["max"]
-    label = "Viewport Camera"
-    optional = True
-    actions = [RepairAction]
-
-    def process(self, instance):
-        if not self.is_active(instance.data):
-            return
-        if not instance.data["cameras"]:
-            raise PublishValidationError(
-                "No renderable Camera found in scene."
-            )
-
-    @classmethod
-    def repair(cls, instance):
-
-        rt.viewport.setType(rt.Name("view_camera"))
-        camera = rt.viewport.GetCamera()
-        cls.log.info(f"Camera {camera} set as renderable camera")
-        renderer_class = get_current_renderer()
-        renderer = str(renderer_class).split(":")[0]
-        if renderer == "Arnold":
-            arv = rt.MAXToAOps.ArnoldRenderView()
-            arv.setOption("Camera", str(camera))
-            arv.close()
-        instance.data["cameras"] = [camera.name]

From 5685e2a1681d2ea74ac481bfa31de6f0a370d55f Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 31 Aug 2023 16:48:52 +0800
Subject: [PATCH 69/80] introduce imprint function for correct version in hda
 loader

---
 openpype/hosts/houdini/plugins/load/load_hda.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openpype/hosts/houdini/plugins/load/load_hda.py b/openpype/hosts/houdini/plugins/load/load_hda.py
index 57edc341a3..9630716253 100644
--- a/openpype/hosts/houdini/plugins/load/load_hda.py
+++ b/openpype/hosts/houdini/plugins/load/load_hda.py
@@ -59,6 +59,9 @@ class HdaLoader(load.LoaderPlugin):
         def_paths = [d.libraryFilePath() for d in defs]
         new = def_paths.index(file_path)
         defs[new].setIsPreferred(True)
+        hda_node.setParms({
+            "representation": str(representation["_id"])
+        })
 
     def remove(self, container):
         node = container["node"]

From 84e89aa422728daaac3f2550358cdc18d97a89f7 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 31 Aug 2023 11:39:07 +0200
Subject: [PATCH 70/80] Webpublisher: better encode list values for click
 (#5546)

* Fix - list of arguments must be provided differently

Targets could be a list, original implementation pushed it as a comma separated, it must be separated by space for click to understand.

* Fix - split by space

targets might come as a tuple from command line

* Fix - better providing of arguments

* Revert "Fix - split by space"

This reverts commit 23884ac1c544e2d8003d82423a0da8b83821d426.
---
 .../webserver_service/webpublish_routes.py        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/webpublisher/webserver_service/webpublish_routes.py b/openpype/hosts/webpublisher/webserver_service/webpublish_routes.py
index e56f245d27..20d585e906 100644
--- a/openpype/hosts/webpublisher/webserver_service/webpublish_routes.py
+++ b/openpype/hosts/webpublisher/webserver_service/webpublish_routes.py
@@ -280,13 +280,14 @@ class BatchPublishEndpoint(WebpublishApiEndpoint):
 
         for key, value in add_args.items():
             # Skip key values where value is None
-            if value is not None:
-                args.append("--{}".format(key))
-                # Extend list into arguments (targets can be a list)
-                if isinstance(value, (tuple, list)):
-                    args.extend(value)
-                else:
-                    args.append(value)
+            if value is None:
+                continue
+            arg_key = "--{}".format(key)
+            if not isinstance(value, (tuple, list)):
+                value = [value]
+
+            for item in value:
+                args += [arg_key, item]
 
         log.info("args:: {}".format(args))
         if add_to_queue:

From d3c1b84835aed4579ef7909e52631ab0732d6796 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 12:07:23 +0200
Subject: [PATCH 71/80] fixing paths slashes in nuke api

---
 openpype/hosts/nuke/api/lib.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 2a6c1fb12c..d6a5e67ba0 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2107,8 +2107,9 @@ class WorkfileSettings(object):
 
         # set ocio config path
         if config_data:
+            config_path = config_data["path"].replace("\\", "/")
             log.info("OCIO config path found: `{}`".format(
-                config_data["path"]))
+                config_path))
 
             # check if there's a mismatch between environment and settings
             correct_settings = self._is_settings_matching_environment(
@@ -2233,7 +2234,7 @@ Reopening Nuke should synchronize these paths and resolve any discrepancies.
         Returns:
             str: OCIO config path with environment variable TCL expression
         """
-        config_path = config_data["path"]
+        config_path = config_data["path"].replace("\\", "/")
         config_template = config_data["template"]
 
         included_vars = self._get_included_vars(config_template)

From e9c3a84916a87ef8df717b4f75b698f55b7cd5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 12:11:22 +0200
Subject: [PATCH 72/80] Update openpype/hosts/nuke/api/lib.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 openpype/hosts/nuke/api/lib.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index cedbe6d5e6..157300d150 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -3371,10 +3371,9 @@ def create_viewer_profile_string(viewer, display=None, path_like=False):
     Returns:
         str: viewer config string
     """
-    if display:
-        if path_like:
-            return "{}/{}".format(display, viewer)
-        else:
-            return "{} ({})".format(viewer, display)
-    else:
+    if not display:
         return viewer
+
+    if path_like:
+        return "{}/{}".format(display, viewer)
+    return "{} ({})".format(viewer, display)

From 33e18661241a59a612a06558fbc19f5de264220b Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 13:30:33 +0200
Subject: [PATCH 73/80] separating code into own function for monitor lut
 settings

---
 openpype/hosts/nuke/api/lib.py | 64 ++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 157300d150..95e945057c 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2092,30 +2092,14 @@ class WorkfileSettings(object):
         workfile_settings.pop("colorManagement", None)
         workfile_settings.pop("OCIO_config", None)
 
-        # treat monitor lut separately
+        # get monitor lut from settings respecting Nuke version differences
         monitor_lut = workfile_settings.pop("monitorLut", None)
-        m_display, m_viewer = get_viewer_config_from_string(monitor_lut)
-        v_display, v_viewer = get_viewer_config_from_string(
-            viewer_process_settings
-        )
+        monitor_lut_data = self._get_monitor_settings(
+            viewer_process_settings, monitor_lut)
 
-        # set monitor lut differently for nuke version 14
-        if nuke.NUKE_VERSION_MAJOR >= 14:
-            workfile_settings["monitorOutLUT"] = create_viewer_profile_string(
-                m_viewer, m_display, path_like=False)
-            # monitorLut=thumbnails - viewerProcess makes more sense
-            workfile_settings["monitorLut"] = create_viewer_profile_string(
-                v_viewer, v_display, path_like=False)
-
-        if nuke.NUKE_VERSION_MAJOR == 13:
-            workfile_settings["monitorOutLUT"] = create_viewer_profile_string(
-                m_viewer, m_display, path_like=False)
-            # monitorLut=thumbnails - viewerProcess makes more sense
-            workfile_settings["monitorLut"] = create_viewer_profile_string(
-                v_viewer, v_display, path_like=True)
-        if nuke.NUKE_VERSION_MAJOR <= 12:
-            workfile_settings["monitorLut"] = create_viewer_profile_string(
-                m_viewer, m_display, path_like=True)
+        # set monitor related knobs luts (MonitorOut, Thumbnails)
+        for knob, value_ in monitor_lut_data.items():
+            workfile_settings[knob] = value_
 
         # then set the rest
         for knob, value_ in workfile_settings.items():
@@ -2144,6 +2128,42 @@ class WorkfileSettings(object):
             if correct_settings:
                 self._set_ocio_config_path_to_workfile(config_data)
 
+    def _get_monitor_settings(self, viewer_lut, monitor_lut):
+        """ Get monitor settings from viewer and monitor lut
+
+        Args:
+            viewer_lut (str): viewer lut string
+            monitor_lut (str): monitor lut string
+
+        Returns:
+            dict: monitor settings
+        """
+        output_data = {}
+        m_display, m_viewer = get_viewer_config_from_string(monitor_lut)
+        v_display, v_viewer = get_viewer_config_from_string(
+            viewer_lut
+        )
+
+        # set monitor lut differently for nuke version 14
+        if nuke.NUKE_VERSION_MAJOR >= 14:
+            output_data["monitorOutLUT"] = create_viewer_profile_string(
+                m_viewer, m_display, path_like=False)
+            # monitorLut=thumbnails - viewerProcess makes more sense
+            output_data["monitorLut"] = create_viewer_profile_string(
+                v_viewer, v_display, path_like=False)
+
+        if nuke.NUKE_VERSION_MAJOR == 13:
+            output_data["monitorOutLUT"] = create_viewer_profile_string(
+                m_viewer, m_display, path_like=False)
+            # monitorLut=thumbnails - viewerProcess makes more sense
+            output_data["monitorLut"] = create_viewer_profile_string(
+                v_viewer, v_display, path_like=True)
+        if nuke.NUKE_VERSION_MAJOR <= 12:
+            output_data["monitorLut"] = create_viewer_profile_string(
+                m_viewer, m_display, path_like=True)
+
+        return output_data
+
     def _is_settings_matching_environment(self, config_data):
         """ Check if OCIO config path is different from environment
 

From 82b50dcfc2698e60b1ffb45723a4112a0865f8e4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 14:00:13 +0200
Subject: [PATCH 74/80] adding comments

---
 .../plugins/publish/validate_rendered_frames.py     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py b/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
index ef3d4d0bb5..e316c6ff6e 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
@@ -17,18 +17,23 @@ class RepairActionBase(pyblish.api.Action):
     def repair_knob(self, context, instances, state):
         create_context = context.data["create_context"]
         for instance in instances:
-            files_remove = [
+            files_to_remove = [
+                # create full path to file
                 os.path.join(instance.data["outputDir"], f_)
+                # iterate representations from instance data
                 for r_ in instance.data.get("representations", [])
+                # make sure that the representation has files in list
+                if r_.get("files") and isinstance(r_.get("files"), list)
+                # iterate files from representation files list
                 for f_ in r_.get("files", [])
             ]
-            self.log.info("Files to be removed: {}".format(files_remove))
-            for f_ in files_remove:
+            self.log.info("Files to be removed: {}".format(files_to_remove))
+            for f_ in files_to_remove:
                 os.remove(f_)
                 self.log.debug("removing file: {}".format(f_))
 
             # Reset the render knob
-            instance_id = instance.data["instance_id"]
+            instance_id = instance.data.get("instance_id")
             created_instance = create_context.get_instance_by_id(
                 instance_id
             )

From 4d94bec464349db6e5277ae9d9615f15bf73e991 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 31 Aug 2023 22:55:59 +0800
Subject: [PATCH 75/80] oscar's comment on cameras implemenetation

---
 openpype/hosts/max/plugins/publish/collect_render.py         | 4 +---
 .../modules/deadline/plugins/publish/submit_max_deadline.py  | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/max/plugins/publish/collect_render.py b/openpype/hosts/max/plugins/publish/collect_render.py
index e7730369b6..8ee2f43103 100644
--- a/openpype/hosts/max/plugins/publish/collect_render.py
+++ b/openpype/hosts/max/plugins/publish/collect_render.py
@@ -35,9 +35,7 @@ class CollectRender(pyblish.api.InstancePlugin):
         files_by_aov.update(aovs)
 
         camera = rt.viewport.GetCamera()
-        instance.data["cameras"] = None
-        if camera:
-            instance.data["cameras"] = [camera.name]
+        instance.data["cameras"] = [camera.name] if camera else None        # noqa
 
         if "expectedFiles" not in instance.data:
             instance.data["expectedFiles"] = list()
diff --git a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
index 6b42270d05..01132662d4 100644
--- a/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -31,7 +31,6 @@ class MaxPluginInfo(object):
     Version = attr.ib(default=None)  # Mandatory for Deadline
     SaveFile = attr.ib(default=True)
     IgnoreInputs = attr.ib(default=True)
-    Camera = attr.ib(default=None)
 
 
 class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
@@ -155,8 +154,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             SceneFile=self.scene_path,
             Version=instance.data["maxversion"],
             SaveFile=True,
-            IgnoreInputs=True,
-            Camera=instance.data["cameras"][0]
+            IgnoreInputs=True
         )
 
         plugin_payload = attr.asdict(plugin_info)
@@ -242,6 +240,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
                 "separateAovFiles")
         if instance.data["cameras"]:
             plugin_info["Camera0"] = None
+            plugin_info["Camera"] = instance.data["cameras"][0]
             plugin_info["Camera1"] = instance.data["cameras"][0]
         self.log.debug("plugin data:{}".format(plugin_data))
         plugin_info.update(plugin_data)

From e2e3bb3a68309c13e9f53fb5713baea6df6704dd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Aug 2023 17:23:38 +0200
Subject: [PATCH 76/80] AYON: Fill entities during editorial (2) (#5549)

* fix appending of instances by asset name

* skip disabled instances

* formatting fix
---
 openpype/plugins/publish/extract_hierarchy_to_ayon.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/plugins/publish/extract_hierarchy_to_ayon.py b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
index de9a70c233..36a7042ba5 100644
--- a/openpype/plugins/publish/extract_hierarchy_to_ayon.py
+++ b/openpype/plugins/publish/extract_hierarchy_to_ayon.py
@@ -42,13 +42,16 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
     def _fill_instance_entities(self, context, project_name):
         instances_by_asset_name = collections.defaultdict(list)
         for instance in context:
+            if instance.data.get("publish") is False:
+                continue
+
             instance_entity = instance.data.get("assetEntity")
             if instance_entity:
                 continue
 
             # Skip if instance asset does not match
             instance_asset_name = instance.data.get("asset")
-            instances_by_asset_name[instance_asset_name] = instance
+            instances_by_asset_name[instance_asset_name].append(instance)
 
         project_doc = context.data["projectEntity"]
         asset_docs = get_assets(

From cf8919dbc5336e29e121020a7506d70277386834 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Aug 2023 17:24:52 +0200
Subject: [PATCH 77/80] AYON: Update settings (#5544)

* added 3dsmax settings conversion

* added conversion of reposition knobs

* fixed matching defaults

* updated core settings

* updated aftereffects settings model
---
 openpype/settings/ayon_settings.py            | 29 ++++++++++
 .../server/settings/creator_plugins.py        |  2 +-
 .../aftereffects/server/settings/main.py      |  2 +-
 server_addon/aftereffects/server/version.py   |  2 +-
 server_addon/core/server/settings/main.py     | 53 +++++++++++++++++--
 server_addon/core/server/version.py           |  2 +-
 .../max/server/settings/render_settings.py    |  2 +-
 server_addon/maya/server/settings/creators.py |  4 +-
 .../server/settings/simple_creators.py        | 17 ++++++
 9 files changed, 104 insertions(+), 9 deletions(-)

diff --git a/openpype/settings/ayon_settings.py b/openpype/settings/ayon_settings.py
index 50abfe4839..9a4f0607e0 100644
--- a/openpype/settings/ayon_settings.py
+++ b/openpype/settings/ayon_settings.py
@@ -616,6 +616,23 @@ def _convert_maya_project_settings(ayon_settings, output):
     output["maya"] = ayon_maya
 
 
+def _convert_3dsmax_project_settings(ayon_settings, output):
+    if "max" not in ayon_settings:
+        return
+
+    ayon_max = ayon_settings["max"]
+    _convert_host_imageio(ayon_max)
+    if "PointCloud" in ayon_max:
+        point_cloud_attribute = ayon_max["PointCloud"]["attribute"]
+        new_point_cloud_attribute = {
+            item["name"]: item["value"]
+            for item in point_cloud_attribute
+        }
+        ayon_max["PointCloud"]["attribute"] = new_point_cloud_attribute
+
+    output["max"] = ayon_max
+
+
 def _convert_nuke_knobs(knobs):
     new_knobs = []
     for knob in knobs:
@@ -737,6 +754,17 @@ def _convert_nuke_project_settings(ayon_settings, output):
             item_filter["subsets"] = item_filter.pop("product_names")
             item_filter["families"] = item_filter.pop("product_types")
 
+        reformat_nodes_config = item.get("reformat_nodes_config") or {}
+        reposition_nodes = reformat_nodes_config.get(
+            "reposition_nodes") or []
+
+        for reposition_node in reposition_nodes:
+            if "knobs" not in reposition_node:
+                continue
+            reposition_node["knobs"] = _convert_nuke_knobs(
+                reposition_node["knobs"]
+            )
+
         name = item.pop("name")
         new_review_data_outputs[name] = item
     ayon_publish["ExtractReviewDataMov"]["outputs"] = new_review_data_outputs
@@ -1261,6 +1289,7 @@ def convert_project_settings(ayon_settings, default_settings):
     _convert_flame_project_settings(ayon_settings, output)
     _convert_fusion_project_settings(ayon_settings, output)
     _convert_maya_project_settings(ayon_settings, output)
+    _convert_3dsmax_project_settings(ayon_settings, output)
     _convert_nuke_project_settings(ayon_settings, output)
     _convert_hiero_project_settings(ayon_settings, output)
     _convert_photoshop_project_settings(ayon_settings, output)
diff --git a/server_addon/aftereffects/server/settings/creator_plugins.py b/server_addon/aftereffects/server/settings/creator_plugins.py
index ee52fadd40..9cb03b0b26 100644
--- a/server_addon/aftereffects/server/settings/creator_plugins.py
+++ b/server_addon/aftereffects/server/settings/creator_plugins.py
@@ -5,7 +5,7 @@ from ayon_server.settings import BaseSettingsModel
 
 class CreateRenderPlugin(BaseSettingsModel):
     mark_for_review: bool = Field(True, title="Review")
-    defaults: list[str] = Field(
+    default_variants: list[str] = Field(
         default_factory=list,
         title="Default Variants"
     )
diff --git a/server_addon/aftereffects/server/settings/main.py b/server_addon/aftereffects/server/settings/main.py
index 04d2e51cc9..4edc46d259 100644
--- a/server_addon/aftereffects/server/settings/main.py
+++ b/server_addon/aftereffects/server/settings/main.py
@@ -40,7 +40,7 @@ DEFAULT_AFTEREFFECTS_SETTING = {
     "create": {
         "RenderCreator": {
             "mark_for_review": True,
-            "defaults": [
+            "default_variants": [
                 "Main"
             ]
         }
diff --git a/server_addon/aftereffects/server/version.py b/server_addon/aftereffects/server/version.py
index a242f0e757..df0c92f1e2 100644
--- a/server_addon/aftereffects/server/version.py
+++ b/server_addon/aftereffects/server/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.1"
+__version__ = "0.1.2"
diff --git a/server_addon/core/server/settings/main.py b/server_addon/core/server/settings/main.py
index d19d732e71..ca8f7e63ed 100644
--- a/server_addon/core/server/settings/main.py
+++ b/server_addon/core/server/settings/main.py
@@ -4,6 +4,7 @@ from ayon_server.settings import (
     BaseSettingsModel,
     MultiplatformPathListModel,
     ensure_unique_names,
+    task_types_enum,
 )
 from ayon_server.exceptions import BadRequestException
 
@@ -38,13 +39,52 @@ class CoreImageIOConfigModel(BaseSettingsModel):
 class CoreImageIOBaseModel(BaseSettingsModel):
     activate_global_color_management: bool = Field(
         False,
-        title="Override global OCIO config"
+        title="Enable Color Management"
     )
     ocio_config: CoreImageIOConfigModel = Field(
-        default_factory=CoreImageIOConfigModel, title="OCIO config"
+        default_factory=CoreImageIOConfigModel,
+        title="OCIO config"
     )
     file_rules: CoreImageIOFileRulesModel = Field(
-        default_factory=CoreImageIOFileRulesModel, title="File Rules"
+        default_factory=CoreImageIOFileRulesModel,
+        title="File Rules"
+    )
+
+
+class VersionStartCategoryProfileModel(BaseSettingsModel):
+    _layout = "expanded"
+    host_names: list[str] = Field(
+        default_factory=list,
+        title="Host names"
+    )
+    task_types: list[str] = Field(
+        default_factory=list,
+        title="Task types",
+        enum_resolver=task_types_enum
+    )
+    task_names: list[str] = Field(
+        default_factory=list,
+        title="Task names"
+    )
+    product_types: list[str] = Field(
+        default_factory=list,
+        title="Product types"
+    )
+    product_names: list[str] = Field(
+        default_factory=list,
+        title="Product names"
+    )
+    version_start: int = Field(
+        1,
+        title="Version Start",
+        ge=0
+    )
+
+
+class VersionStartCategoryModel(BaseSettingsModel):
+    profiles: list[VersionStartCategoryProfileModel] = Field(
+        default_factory=list,
+        title="Profiles"
     )
 
 
@@ -61,6 +101,10 @@ class CoreSettings(BaseSettingsModel):
         default_factory=GlobalToolsModel,
         title="Tools"
     )
+    version_start_category: VersionStartCategoryModel = Field(
+        default_factory=VersionStartCategoryModel,
+        title="Version start"
+    )
     imageio: CoreImageIOBaseModel = Field(
         default_factory=CoreImageIOBaseModel,
         title="Color Management (ImageIO)"
@@ -131,6 +175,9 @@ DEFAULT_VALUES = {
     "studio_code": "",
     "environments": "{}",
     "tools": DEFAULT_TOOLS_VALUES,
+    "version_start_category": {
+        "profiles": []
+    },
     "publish": DEFAULT_PUBLISH_VALUES,
     "project_folder_structure": json.dumps({
         "__project_root__": {
diff --git a/server_addon/core/server/version.py b/server_addon/core/server/version.py
index 485f44ac21..b3f4756216 100644
--- a/server_addon/core/server/version.py
+++ b/server_addon/core/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"
diff --git a/server_addon/max/server/settings/render_settings.py b/server_addon/max/server/settings/render_settings.py
index 6c236d9f12..c00cb5e436 100644
--- a/server_addon/max/server/settings/render_settings.py
+++ b/server_addon/max/server/settings/render_settings.py
@@ -44,6 +44,6 @@ class RenderSettingsModel(BaseSettingsModel):
 DEFAULT_RENDER_SETTINGS = {
     "default_render_image_folder": "renders/3dsmax",
     "aov_separator": "underscore",
-    "image_format": "png",
+    "image_format": "exr",
     "multipass": True
 }
diff --git a/server_addon/maya/server/settings/creators.py b/server_addon/maya/server/settings/creators.py
index 9b97b92e59..11e2b8a36c 100644
--- a/server_addon/maya/server/settings/creators.py
+++ b/server_addon/maya/server/settings/creators.py
@@ -252,7 +252,9 @@ DEFAULT_CREATORS_SETTINGS = {
     },
     "CreateUnrealSkeletalMesh": {
         "enabled": True,
-        "default_variants": [],
+        "default_variants": [
+            "Main",
+        ],
         "joint_hints": "jnt_org"
     },
     "CreateMultiverseLook": {
diff --git a/server_addon/traypublisher/server/settings/simple_creators.py b/server_addon/traypublisher/server/settings/simple_creators.py
index 94d6602738..8335b9d34e 100644
--- a/server_addon/traypublisher/server/settings/simple_creators.py
+++ b/server_addon/traypublisher/server/settings/simple_creators.py
@@ -288,5 +288,22 @@ DEFAULT_SIMPLE_CREATORS = [
         "allow_multiple_items": True,
         "allow_version_control": False,
         "extensions": []
+    },
+    {
+        "product_type": "audio",
+        "identifier": "",
+        "label": "Audio ",
+        "icon": "fa5s.file-audio",
+        "default_variants": [
+            "Main"
+        ],
+        "description": "Audio product",
+        "detailed_description": "Audio files for review or final delivery",
+        "allow_sequences": False,
+        "allow_multiple_items": False,
+        "allow_version_control": False,
+        "extensions": [
+            ".wav"
+        ]
     }
 ]

From 13d1b407199e7012aa309a6072a405a2d35cf657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 17:38:47 +0200
Subject: [PATCH 78/80] Update openpype/hosts/nuke/api/lib.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/hosts/nuke/api/lib.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 95e945057c..91a9294740 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2140,9 +2140,7 @@ class WorkfileSettings(object):
         """
         output_data = {}
         m_display, m_viewer = get_viewer_config_from_string(monitor_lut)
-        v_display, v_viewer = get_viewer_config_from_string(
-            viewer_lut
-        )
+        v_display, v_viewer = get_viewer_config_from_string(viewer_lut)
 
         # set monitor lut differently for nuke version 14
         if nuke.NUKE_VERSION_MAJOR >= 14:

From 24cbaefe953589b39f681bf4b93cc992cbb9fa19 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 22:29:18 +0200
Subject: [PATCH 79/80] removing redundant action

it was residual approach from old workflow
---
 .../plugins/publish/validate_rendered_frames.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py b/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
index e316c6ff6e..9a35b61a0e 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_rendered_frames.py
@@ -17,29 +17,14 @@ class RepairActionBase(pyblish.api.Action):
     def repair_knob(self, context, instances, state):
         create_context = context.data["create_context"]
         for instance in instances:
-            files_to_remove = [
-                # create full path to file
-                os.path.join(instance.data["outputDir"], f_)
-                # iterate representations from instance data
-                for r_ in instance.data.get("representations", [])
-                # make sure that the representation has files in list
-                if r_.get("files") and isinstance(r_.get("files"), list)
-                # iterate files from representation files list
-                for f_ in r_.get("files", [])
-            ]
-            self.log.info("Files to be removed: {}".format(files_to_remove))
-            for f_ in files_to_remove:
-                os.remove(f_)
-                self.log.debug("removing file: {}".format(f_))
-
             # Reset the render knob
             instance_id = instance.data.get("instance_id")
             created_instance = create_context.get_instance_by_id(
                 instance_id
             )
             created_instance.creator_attributes["render_target"] = state
-
             self.log.info("Rendering toggled to `{}`".format(state))
+
         create_context.save_changes()
 
 

From ec8a0f49480c8359f6b501f73626d770c12fe931 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 31 Aug 2023 22:44:36 +0200
Subject: [PATCH 80/80] simplification of spaghetti code and improving logic

---
 .../plugins/publish/collect_farm_target.py    | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/openpype/plugins/publish/collect_farm_target.py b/openpype/plugins/publish/collect_farm_target.py
index 78410835dd..adcd842b48 100644
--- a/openpype/plugins/publish/collect_farm_target.py
+++ b/openpype/plugins/publish/collect_farm_target.py
@@ -15,31 +15,21 @@ class CollectFarmTarget(pyblish.api.InstancePlugin):
             return
 
         context = instance.context
-        try:
-            deadline_module = context.data.get("openPypeModules")["deadline"]
-            if deadline_module.enabled:
-                instance.data["toBeRenderedOn"] = "deadline"
-                self.log.debug("Collected render target: deadline")
-        except AttributeError:
-            self.log.error("Cannot get OpenPype Deadline module.")
-            raise AssertionError("OpenPype Deadline module not found.")
 
-        try:
-            royalrender_module = \
-                context.data.get("openPypeModules")["royalrender"]
-            if royalrender_module.enabled:
-                instance.data["toBeRenderedOn"] = "royalrender"
-                self.log.debug("Collected render target: royalrender")
+        farm_name = ""
+        op_modules = context.data.get("openPypeModules")
 
-        except AttributeError:
-            self.log.error("Cannot get OpenPype RoyalRender module.")
-            raise AssertionError("OpenPype RoyalRender module not found.")
+        for farm_renderer in ["deadline", "royalrender", "muster"]:
+            op_module = op_modules.get(farm_renderer, False)
 
-        try:
-            muster_module = context.data.get("openPypeModules")["muster"]
-            if muster_module.enabled:
-                instance.data["toBeRenderedOn"] = "muster"
-                self.log.debug("Collected render target: muster")
-        except AttributeError:
-            self.log.error("Cannot get OpenPype Muster module.")
-            raise AssertionError("OpenPype Muster module not found.")
+            if op_module and op_module.enabled:
+                farm_name = farm_renderer
+            elif not op_module:
+                self.log.error("Cannot get OpenPype {0} module.".format(
+                    farm_renderer))
+
+        if farm_name:
+            self.log.debug("Collected render target: {0}".format(farm_name))
+            instance.data["toBeRenderedOn"] = farm_name
+        else:
+            AssertionError("No OpenPype renderer module found")