From f814db2ce0c4432023b18903c7819729997abfb5 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 6 Jul 2023 10:45:00 +0100
Subject: [PATCH 01/80] Use colorspace data when creating thumbnail.

---
 openpype/lib/transcoding.py                   | 13 +++--
 openpype/plugins/publish/extract_thumbnail.py | 51 ++++++++++++-------
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index de6495900e..771f670f89 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -1056,7 +1056,8 @@ def convert_colorspace(
     view=None,
     display=None,
     additional_command_args=None,
-    logger=None
+    logger=None,
+    input_args=None
 ):
     """Convert source file from one color space to another.
 
@@ -1084,13 +1085,17 @@ def convert_colorspace(
     if logger is None:
         logger = logging.getLogger(__name__)
 
-    oiio_cmd = [
-        get_oiio_tools_path(),
+    oiio_cmd = [get_oiio_tools_path()]
+
+    if input_args:
+        oiio_cmd.extend(input_args)
+
+    oiio_cmd.extend([
         input_path,
         # Don't add any additional attributes
         "--nosoftwareattrib",
         "--colorconfig", config_path
-    ]
+    ])
 
     if all([target_colorspace, view, display]):
         raise ValueError("Colorspace and both screen and display"
diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index b98ab64f56..1d86741470 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -10,6 +10,7 @@ from openpype.lib import (
     run_subprocess,
     path_to_subprocess_arg,
 )
+from openpype.lib.transcoding import convert_colorspace
 
 
 class ExtractThumbnail(pyblish.api.InstancePlugin):
@@ -98,8 +99,18 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
                 self.log.debug("Trying to convert with OIIO")
                 # If the input can read by OIIO then use OIIO method for
                 # conversion otherwise use ffmpeg
+                colorspace_data = repre["colorspaceData"]
+                source_colorspace = colorspace_data["colorspace"]
+                config_path = colorspace_data.get("config", {}).get("path")
+                display = colorspace_data["display"]
+                view = colorspace_data["view"]
                 thumbnail_created = self.create_thumbnail_oiio(
-                    full_input_path, full_output_path
+                    full_input_path,
+                    full_output_path,
+                    config_path,
+                    source_colorspace,
+                    display,
+                    view
                 )
 
             # Try to use FFMPEG if OIIO is not supported or for cases when
@@ -172,24 +183,28 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             filtered_repres.append(repre)
         return filtered_repres
 
-    def create_thumbnail_oiio(self, src_path, dst_path):
+    def create_thumbnail_oiio(
+        self,
+        src_path,
+        dst_path,
+        config_path,
+        source_colorspace,
+        display,
+        view
+    ):
         self.log.info("Extracting thumbnail {}".format(dst_path))
-        oiio_tool_path = get_oiio_tools_path()
-        oiio_cmd = [
-            oiio_tool_path,
-            "-a", src_path,
-            "-o", dst_path
-        ]
-        self.log.debug("running: {}".format(" ".join(oiio_cmd)))
-        try:
-            run_subprocess(oiio_cmd, logger=self.log)
-            return True
-        except Exception:
-            self.log.warning(
-                "Failed to create thumbnail using oiiotool",
-                exc_info=True
-            )
-            return False
+
+        convert_colorspace(
+            src_path,
+            dst_path,
+            config_path,
+            source_colorspace,
+            view=view,
+            display=display,
+            input_args=["-i:ch=R,G,B"]
+        )
+
+        return dst_path
 
     def create_thumbnail_ffmpeg(self, src_path, dst_path):
         self.log.info("outputting {}".format(dst_path))

From 8267736bed9968a314658b45de2cbc904c0f2547 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 2 Oct 2023 16:24:23 +0200
Subject: [PATCH 02/80] Fix Fusion 18.6+ support: Avoid issues with Fusion's
 `BlackmagicFusion.PyRemoteObject` instances being unhashable.

```python
Traceback (most recent call last):
  File "E:\openpype\OpenPype\.venv\lib\site-packages\pyblish\plugin.py", line 527, in __explicit_process
    runner(*args)
  File "E:\openpype\OpenPype\openpype\hosts\fusion\plugins\publish\extract_render_local.py", line 61, in process
    result = self.render(instance)
  File "E:\openpype\OpenPype\openpype\hosts\fusion\plugins\publish\extract_render_local.py", line 118, in render
    with enabled_savers(current_comp, savers_to_render):
  File "C:\Users\User\AppData\Local\Programs\Python\Python39\lib\contextlib.py", line 119, in __enter__
    return next(self.gen)
  File "E:\openpype\OpenPype\openpype\hosts\fusion\plugins\publish\extract_render_local.py", line 33, in enabled_savers
    original_states[saver] = original_state
TypeError: unhashable type: 'BlackmagicFusion.PyRemoteObject'
```
---
 .../hosts/fusion/plugins/publish/extract_render_local.py    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/fusion/plugins/publish/extract_render_local.py b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
index 25c101cf00..e7bf010a9d 100644
--- a/openpype/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
@@ -25,12 +25,13 @@ def enabled_savers(comp, savers):
     """
     passthrough_key = "TOOLB_PassThrough"
     original_states = {}
+    savers_by_name = {saver.Name: saver for saver in savers}
     enabled_save_names = {saver.Name for saver in savers}
     try:
         all_savers = comp.GetToolList(False, "Saver").values()
         for saver in all_savers:
             original_state = saver.GetAttrs()[passthrough_key]
-            original_states[saver] = original_state
+            original_states[saver.Name] = original_state
 
             # The passthrough state we want to set (passthrough != enabled)
             state = saver.Name not in enabled_save_names
@@ -38,7 +39,8 @@ def enabled_savers(comp, savers):
                 saver.SetAttrs({passthrough_key: state})
         yield
     finally:
-        for saver, original_state in original_states.items():
+        for saver_name, original_state in original_states.items():
+            saver = savers_by_name.get(saver_name)
             saver.SetAttrs({"TOOLB_PassThrough": original_state})
 
 

From 74070e0f25d9b53ec16512057e8e08ad228040ae Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 2 Oct 2023 16:28:46 +0200
Subject: [PATCH 03/80] Be more explicit that key should exist

---
 openpype/hosts/fusion/plugins/publish/extract_render_local.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/fusion/plugins/publish/extract_render_local.py b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
index e7bf010a9d..7cc03410c6 100644
--- a/openpype/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
@@ -40,7 +40,7 @@ def enabled_savers(comp, savers):
         yield
     finally:
         for saver_name, original_state in original_states.items():
-            saver = savers_by_name.get(saver_name)
+            saver = savers_by_name[saver_name]
             saver.SetAttrs({"TOOLB_PassThrough": original_state})
 
 

From 33ebd706a9232a3d8b0c34f79eb46474fde2f640 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 2 Oct 2023 16:31:25 +0200
Subject: [PATCH 04/80] Correctly produce the `savers_by_name` dict to include
 all savers

---
 .../fusion/plugins/publish/extract_render_local.py     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/fusion/plugins/publish/extract_render_local.py b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
index 7cc03410c6..08d608139d 100644
--- a/openpype/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
@@ -25,16 +25,18 @@ def enabled_savers(comp, savers):
     """
     passthrough_key = "TOOLB_PassThrough"
     original_states = {}
-    savers_by_name = {saver.Name: saver for saver in savers}
-    enabled_save_names = {saver.Name for saver in savers}
+    enabled_saver_names = {saver.Name for saver in savers}
+
+    all_savers = comp.GetToolList(False, "Saver").values()
+    savers_by_name = {saver.Name: saver for saver in all_savers}
+
     try:
-        all_savers = comp.GetToolList(False, "Saver").values()
         for saver in all_savers:
             original_state = saver.GetAttrs()[passthrough_key]
             original_states[saver.Name] = original_state
 
             # The passthrough state we want to set (passthrough != enabled)
-            state = saver.Name not in enabled_save_names
+            state = saver.Name not in enabled_saver_names
             if state != original_state:
                 saver.SetAttrs({passthrough_key: state})
         yield

From 1f1676f5bb98aea465371641693b63ff2326abbd Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 13 Oct 2023 14:36:36 +0200
Subject: [PATCH 05/80] Refactor to use variable `node_value` instead of
 `value`

- `value` only exists as the last variable value in the `for value in values` loop and might not be declared if `values` is an empty iterable.
---
 openpype/hosts/nuke/plugins/publish/validate_write_nodes.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py b/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py
index 9aae53e59d..b882e240e6 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_write_nodes.py
@@ -111,7 +111,6 @@ class ValidateNukeWriteNode(
             for value in values:
                 if type(node_value) in (int, float):
                     try:
-
                         if isinstance(value, list):
                             value = color_gui_to_int(value)
                         else:
@@ -130,7 +129,7 @@ class ValidateNukeWriteNode(
                 and key != "file"
                 and key != "tile_color"
             ):
-                check.append([key, value, write_node[key].value()])
+                check.append([key, node_value, write_node[key].value()])
 
         if check:
             self._make_error(check)

From 41136557250175dcb829e62b12420b9316f7e2ae Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 17 Oct 2023 17:19:58 +0200
Subject: [PATCH 06/80] updating pr changes to latest changes

---
 openpype/lib/transcoding.py                   | 17 +++-
 openpype/plugins/publish/extract_thumbnail.py | 77 ++++++++++---------
 2 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index 1b75b96525..7cd3671dd1 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -1149,9 +1149,9 @@ def convert_colorspace(
     target_colorspace=None,
     view=None,
     display=None,
+    additional_input_args=None,
     additional_command_args=None,
     logger=None,
-    input_args=None
 ):
     """Convert source file from one color space to another.
 
@@ -1170,6 +1170,8 @@ def convert_colorspace(
         view (str): name for viewer space (ocio valid)
             both 'view' and 'display' must be filled (if 'target_colorspace')
         display (str): name for display-referred reference space (ocio valid)
+            both 'view' and 'display' must be filled (if 'target_colorspace')
+        additional_input_args (list): input arguments for oiiotool
         additional_command_args (list): arguments for oiiotool (like binary
             depth for .dpx)
         logger (logging.Logger): Logger used for logging.
@@ -1179,12 +1181,21 @@ def convert_colorspace(
     if logger is None:
         logger = logging.getLogger(__name__)
 
-    oiio_cmd = get_oiio_tool_args(
-        "oiiotool",
+    # prepare main oiio command args
+    args = [
         input_path,
         # Don't add any additional attributes
         "--nosoftwareattrib",
         "--colorconfig", config_path
+    ]
+
+    # prepand any additional args if available
+    if additional_input_args:
+        args = additional_input_args + args
+
+    oiio_cmd = get_oiio_tool_args(
+        "oiiotool",
+        *args
     )
 
     if all([target_colorspace, view, display]):
diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index ff416ecb23..5b75a374ba 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -5,7 +5,6 @@ import tempfile
 import pyblish.api
 from openpype.lib import (
     get_ffmpeg_tool_args,
-    get_oiio_tool_args,
     is_oiio_supported,
 
     run_subprocess,
@@ -26,7 +25,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
     hosts = ["shell", "fusion", "resolve", "traypublisher", "substancepainter"]
     enabled = False
 
-    # presetable attribute
+    # presentable attribute
     ffmpeg_args = None
 
     def process(self, instance):
@@ -95,27 +94,26 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             filename = os.path.splitext(input_file)[0]
             jpeg_file = filename + "_thumb.jpg"
             full_output_path = os.path.join(dst_staging, jpeg_file)
+            colorspace_data = repre.get("colorspaceData")
 
-            if oiio_supported:
-                self.log.debug("Trying to convert with OIIO")
+            # only use OIIO if it is supported and representation has
+            # colorspace data
+            if oiio_supported and colorspace_data:
+                self.log.debug(
+                    "Trying to convert with OIIO "
+                    "with colorspace data: {}".format(colorspace_data)
+                )
                 # If the input can read by OIIO then use OIIO method for
                 # conversion otherwise use ffmpeg
-                colorspace_data = repre["colorspaceData"]
-                source_colorspace = colorspace_data["colorspace"]
-                config_path = colorspace_data.get("config", {}).get("path")
-                display = colorspace_data["display"]
-                view = colorspace_data["view"]
                 thumbnail_created = self.create_thumbnail_oiio(
                     full_input_path,
                     full_output_path,
-                    config_path,
-                    source_colorspace,
-                    display,
-                    view
+                    colorspace_data
                 )
 
             # Try to use FFMPEG if OIIO is not supported or for cases when
-            #    oiiotool isn't available
+            #   oiiotool isn't available or representation is not having
+            #   colorspace data
             if not thumbnail_created:
                 if oiio_supported:
                     self.log.debug(
@@ -149,7 +147,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             break
 
         if not thumbnail_created:
-            self.log.warning("Thumbanil has not been created.")
+            self.log.warning("Thumbnail has not been created.")
 
     def _is_review_instance(self, instance):
         # TODO: We should probably handle "not creating" of thumbnail
@@ -188,21 +186,36 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         self,
         src_path,
         dst_path,
-        config_path,
-        source_colorspace,
-        display,
-        view
+        colorspace_data,
     ):
+        """Create thumbnail using OIIO tool oiiotool
+
+        Args:
+            src_path (str): path to source file
+            dst_path (str): path to destination file
+            colorspace_data (dict): colorspace data from representation
+                keys:
+                    colorspace (str)
+                    config (dict)
+                    display (Optional[str])
+                    view (Optional[str])
+
+        Returns:
+            str: path to created thumbnail
+        """
         self.log.info("Extracting thumbnail {}".format(dst_path))
-        oiio_cmd = get_oiio_tool_args(
-            "oiiotool",
-            "-a", src_path,
-            "-o", dst_path
-        )
-        self.log.debug("running: {}".format(" ".join(oiio_cmd)))
+
         try:
-            run_subprocess(oiio_cmd, logger=self.log)
-            return True
+            convert_colorspace(
+                src_path,
+                dst_path,
+                colorspace_data["config"]["path"],
+                colorspace_data["colorspace"],
+                display=colorspace_data.get("display"),
+                view=colorspace_data.get("view"),
+                additional_input_args=["-i:ch=R,G,B"],
+                logger=self.log,
+            )
         except Exception:
             self.log.warning(
                 "Failed to create thumbnail using oiiotool",
@@ -210,16 +223,6 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             )
             return False
 
-        convert_colorspace(
-            src_path,
-            dst_path,
-            config_path,
-            source_colorspace,
-            view=view,
-            display=display,
-            input_args=["-i:ch=R,G,B"]
-        )
-
         return dst_path
 
     def create_thumbnail_ffmpeg(self, src_path, dst_path):

From fc900780cd97fc15e4c91d24340dba02dd015aed Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 17 Oct 2023 17:33:38 +0200
Subject: [PATCH 07/80] typo

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

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index 7cd3671dd1..07acc309d2 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -1189,7 +1189,7 @@ def convert_colorspace(
         "--colorconfig", config_path
     ]
 
-    # prepand any additional args if available
+    # prepend any additional args if available
     if additional_input_args:
         args = additional_input_args + args
 

From 246c408ce7036de973b1dc6ba1d918f5670d495c Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 30 Oct 2023 22:21:46 +0100
Subject: [PATCH 08/80] Maya: Remove RenderSetup layer observers that are not
 needed since new publisher

---
 openpype/hosts/maya/api/lib.py      | 153 ----------------------------
 openpype/hosts/maya/api/pipeline.py |  10 --
 2 files changed, 163 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 7c49c837e9..6d785234c5 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -3069,159 +3069,6 @@ def _get_render_instances():
     return instances
 
 
-renderItemObserverList = []
-
-
-class RenderSetupListObserver:
-    """Observer to catch changes in render setup layers."""
-
-    def listItemAdded(self, item):
-        print("--- adding ...")
-        self._add_render_layer(item)
-
-    def listItemRemoved(self, item):
-        print("--- removing ...")
-        self._remove_render_layer(item.name())
-
-    def _add_render_layer(self, item):
-        render_sets = _get_render_instances()
-        layer_name = item.name()
-
-        for render_set in render_sets:
-            members = cmds.sets(render_set, query=True) or []
-
-            namespace_name = "_{}".format(render_set)
-            if not cmds.namespace(exists=namespace_name):
-                index = 1
-                namespace_name = "_{}".format(render_set)
-                try:
-                    cmds.namespace(rm=namespace_name)
-                except RuntimeError:
-                    # namespace is not empty, so we leave it untouched
-                    pass
-                orignal_namespace_name = namespace_name
-                while(cmds.namespace(exists=namespace_name)):
-                    namespace_name = "{}{}".format(
-                        orignal_namespace_name, index)
-                    index += 1
-
-                namespace = cmds.namespace(add=namespace_name)
-
-            if members:
-                # if set already have namespaced members, use the same
-                # namespace as others.
-                namespace = members[0].rpartition(":")[0]
-            else:
-                namespace = namespace_name
-
-            render_layer_set_name = "{}:{}".format(namespace, layer_name)
-            if render_layer_set_name in members:
-                continue
-            print("  - creating set for {}".format(layer_name))
-            maya_set = cmds.sets(n=render_layer_set_name, empty=True)
-            cmds.sets(maya_set, forceElement=render_set)
-            rio = RenderSetupItemObserver(item)
-            print("-   adding observer for {}".format(item.name()))
-            item.addItemObserver(rio.itemChanged)
-            renderItemObserverList.append(rio)
-
-    def _remove_render_layer(self, layer_name):
-        render_sets = _get_render_instances()
-
-        for render_set in render_sets:
-            members = cmds.sets(render_set, query=True)
-            if not members:
-                continue
-
-            # all sets under set should have the same namespace
-            namespace = members[0].rpartition(":")[0]
-            render_layer_set_name = "{}:{}".format(namespace, layer_name)
-
-            if render_layer_set_name in members:
-                print("  - removing set for {}".format(layer_name))
-                cmds.delete(render_layer_set_name)
-
-
-class RenderSetupItemObserver:
-    """Handle changes in render setup items."""
-
-    def __init__(self, item):
-        self.item = item
-        self.original_name = item.name()
-
-    def itemChanged(self, *args, **kwargs):
-        """Item changed callback."""
-        if self.item.name() == self.original_name:
-            return
-
-        render_sets = _get_render_instances()
-
-        for render_set in render_sets:
-            members = cmds.sets(render_set, query=True)
-            if not members:
-                continue
-
-            # all sets under set should have the same namespace
-            namespace = members[0].rpartition(":")[0]
-            render_layer_set_name = "{}:{}".format(
-                namespace, self.original_name)
-
-            if render_layer_set_name in members:
-                print(" <> renaming {} to {}".format(self.original_name,
-                                                     self.item.name()))
-                cmds.rename(render_layer_set_name,
-                            "{}:{}".format(
-                                namespace, self.item.name()))
-            self.original_name = self.item.name()
-
-
-renderListObserver = RenderSetupListObserver()
-
-
-def add_render_layer_change_observer():
-    import maya.app.renderSetup.model.renderSetup as renderSetup
-
-    rs = renderSetup.instance()
-    render_sets = _get_render_instances()
-
-    layers = rs.getRenderLayers()
-    for render_set in render_sets:
-        members = cmds.sets(render_set, query=True)
-        if not members:
-            continue
-        # all sets under set should have the same namespace
-        namespace = members[0].rpartition(":")[0]
-        for layer in layers:
-            render_layer_set_name = "{}:{}".format(namespace, layer.name())
-            if render_layer_set_name not in members:
-                continue
-            rio = RenderSetupItemObserver(layer)
-            print("-   adding observer for {}".format(layer.name()))
-            layer.addItemObserver(rio.itemChanged)
-            renderItemObserverList.append(rio)
-
-
-def add_render_layer_observer():
-    import maya.app.renderSetup.model.renderSetup as renderSetup
-
-    print(">   adding renderSetup observer ...")
-    rs = renderSetup.instance()
-    rs.addListObserver(renderListObserver)
-    pass
-
-
-def remove_render_layer_observer():
-    import maya.app.renderSetup.model.renderSetup as renderSetup
-
-    print("<   removing renderSetup observer ...")
-    rs = renderSetup.instance()
-    try:
-        rs.removeListObserver(renderListObserver)
-    except ValueError:
-        # no observer set yet
-        pass
-
-
 def update_content_on_context_change():
     """
     This will update scene content to match new asset on context change
diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index 6b791c9665..1ecfdfaa40 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -580,20 +580,11 @@ def on_save():
         lib.set_id(node, new_id, overwrite=False)
 
 
-def _update_render_layer_observers():
-    # Helper to trigger update for all renderlayer observer logic
-    lib.remove_render_layer_observer()
-    lib.add_render_layer_observer()
-    lib.add_render_layer_change_observer()
-
-
 def on_open():
     """On scene open let's assume the containers have changed."""
 
     from openpype.widgets import popup
 
-    utils.executeDeferred(_update_render_layer_observers)
-
     # Validate FPS after update_task_from_path to
     # ensure it is using correct FPS for the asset
     lib.validate_fps()
@@ -630,7 +621,6 @@ def on_new():
     with lib.suspended_refresh():
         lib.set_context_settings()
 
-    utils.executeDeferred(_update_render_layer_observers)
     _remove_workfile_lock()
 
 

From 90c8922a8a53f0e2265ca8037d1593d9da6559d3 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 30 Oct 2023 22:54:54 +0100
Subject: [PATCH 09/80] Remove remaining unused function

---
 openpype/hosts/maya/api/lib.py | 37 ----------------------------------
 1 file changed, 37 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 6d785234c5..2d394893cd 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -115,8 +115,6 @@ _alembic_options = {
 INT_FPS = {15, 24, 25, 30, 48, 50, 60, 44100, 48000}
 FLOAT_FPS = {23.98, 23.976, 29.97, 47.952, 59.94}
 
-RENDERLIKE_INSTANCE_FAMILIES = ["rendering", "vrayscene"]
-
 
 DISPLAY_LIGHTS_ENUM = [
     {"label": "Use Project Settings", "value": "project_settings"},
@@ -3034,41 +3032,6 @@ class shelf():
             cmds.shelfLayout(self.name, p="ShelfLayout")
 
 
-def _get_render_instances():
-    """Return all 'render-like' instances.
-
-    This returns list of instance sets that needs to receive information
-    about render layer changes.
-
-    Returns:
-        list: list of instances
-
-    """
-    objectset = cmds.ls("*.id", long=True, exactType="objectSet",
-                        recursive=True, objectsOnly=True)
-
-    instances = []
-    for objset in objectset:
-        if not cmds.attributeQuery("id", node=objset, exists=True):
-            continue
-
-        id_attr = "{}.id".format(objset)
-        if cmds.getAttr(id_attr) != "pyblish.avalon.instance":
-            continue
-
-        has_family = cmds.attributeQuery("family",
-                                         node=objset,
-                                         exists=True)
-        if not has_family:
-            continue
-
-        if cmds.getAttr(
-                "{}.family".format(objset)) in RENDERLIKE_INSTANCE_FAMILIES:
-            instances.append(objset)
-
-    return instances
-
-
 def update_content_on_context_change():
     """
     This will update scene content to match new asset on context change

From d94c19d0ba44a5d48b8964fe3fa6d98a29b3f0da Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 3 Nov 2023 00:59:42 +0100
Subject: [PATCH 10/80] Remove non-working LOPs USD output processors

- These do not show up in recent Houdini versions
- The recent output processor API is very different and processors should be registered differently
- These are non-functional in current OpenPype code
---
 openpype/hosts/houdini/api/pipeline.py        |   4 -
 .../vendor/husdoutputprocessors/__init__.py   |   1 -
 .../avalon_uri_processor.py                   | 152 ------------------
 .../stagingdir_processor.py                   |  90 -----------
 4 files changed, 247 deletions(-)
 delete mode 100644 openpype/hosts/houdini/vendor/husdoutputprocessors/__init__.py
 delete mode 100644 openpype/hosts/houdini/vendor/husdoutputprocessors/avalon_uri_processor.py
 delete mode 100644 openpype/hosts/houdini/vendor/husdoutputprocessors/stagingdir_processor.py

diff --git a/openpype/hosts/houdini/api/pipeline.py b/openpype/hosts/houdini/api/pipeline.py
index f8db45c56b..095004ea6f 100644
--- a/openpype/hosts/houdini/api/pipeline.py
+++ b/openpype/hosts/houdini/api/pipeline.py
@@ -71,10 +71,6 @@ class HoudiniHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         )
 
         self._has_been_setup = True
-        # add houdini vendor packages
-        hou_pythonpath = os.path.join(HOUDINI_HOST_DIR, "vendor")
-
-        sys.path.append(hou_pythonpath)
 
         # Set asset settings for the empty scene directly after launch of
         # Houdini so it initializes into the correct scene FPS,
diff --git a/openpype/hosts/houdini/vendor/husdoutputprocessors/__init__.py b/openpype/hosts/houdini/vendor/husdoutputprocessors/__init__.py
deleted file mode 100644
index 69e3be50da..0000000000
--- a/openpype/hosts/houdini/vendor/husdoutputprocessors/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/openpype/hosts/houdini/vendor/husdoutputprocessors/avalon_uri_processor.py b/openpype/hosts/houdini/vendor/husdoutputprocessors/avalon_uri_processor.py
deleted file mode 100644
index 310d057a11..0000000000
--- a/openpype/hosts/houdini/vendor/husdoutputprocessors/avalon_uri_processor.py
+++ /dev/null
@@ -1,152 +0,0 @@
-import os
-import hou
-import husdoutputprocessors.base as base
-
-import colorbleed.usdlib as usdlib
-
-from openpype.client import get_asset_by_name
-from openpype.pipeline import Anatomy, get_current_project_name
-
-
-class AvalonURIOutputProcessor(base.OutputProcessorBase):
-    """Process Avalon URIs into their full path equivalents.
-
-    """
-
-    _parameters = None
-    _param_prefix = 'avalonurioutputprocessor_'
-    _parms = {
-        "use_publish_paths": _param_prefix + "use_publish_paths"
-    }
-
-    def __init__(self):
-        """ There is only one object of each output processor class that is
-            ever created in a Houdini session. Therefore be very careful
-            about what data gets put in this object.
-        """
-        self._use_publish_paths = False
-        self._cache = dict()
-
-    def displayName(self):
-        return 'Avalon URI Output Processor'
-
-    def parameters(self):
-
-        if not self._parameters:
-            parameters = hou.ParmTemplateGroup()
-            use_publish_path = hou.ToggleParmTemplate(
-                name=self._parms["use_publish_paths"],
-                label='Resolve Reference paths to publish paths',
-                default_value=False,
-                help=("When enabled any paths for Layers, References or "
-                      "Payloads are resolved to published master versions.\n"
-                      "This is usually only used by the publishing pipeline, "
-                      "but can be used for testing too."))
-            parameters.append(use_publish_path)
-            self._parameters = parameters.asDialogScript()
-
-        return self._parameters
-
-    def beginSave(self, config_node, t):
-        parm = self._parms["use_publish_paths"]
-        self._use_publish_paths = config_node.parm(parm).evalAtTime(t)
-        self._cache.clear()
-
-    def endSave(self):
-        self._use_publish_paths = None
-        self._cache.clear()
-
-    def processAsset(self,
-                     asset_path,
-                     asset_path_for_save,
-                     referencing_layer_path,
-                     asset_is_layer,
-                     for_save):
-        """
-        Args:
-            asset_path (str): The incoming file path you want to alter or not.
-            asset_path_for_save (bool): Whether the current path is a
-                referenced path in the USD file. When True, return the path
-                you want inside USD file.
-            referencing_layer_path (str): ???
-            asset_is_layer (bool): Whether this asset is a USD layer file.
-                If this is False, the asset is something else (for example,
-                a texture or volume file).
-            for_save (bool): Whether the asset path is for a file to be saved
-                out. If so, then return actual written filepath.
-
-        Returns:
-            The refactored asset path.
-
-        """
-
-        # Retrieve from cache if this query occurred before (optimization)
-        cache_key = (asset_path, asset_path_for_save, asset_is_layer, for_save)
-        if cache_key in self._cache:
-            return self._cache[cache_key]
-
-        relative_template = "{asset}_{subset}.{ext}"
-        uri_data = usdlib.parse_avalon_uri(asset_path)
-        if uri_data:
-
-            if for_save:
-                # Set save output path to a relative path so other
-                # processors can potentially manage it easily?
-                path = relative_template.format(**uri_data)
-
-                print("Avalon URI Resolver: %s -> %s" % (asset_path, path))
-                self._cache[cache_key] = path
-                return path
-
-            if self._use_publish_paths:
-                # Resolve to an Avalon published asset for embedded paths
-                path = self._get_usd_master_path(**uri_data)
-            else:
-                path = relative_template.format(**uri_data)
-
-            print("Avalon URI Resolver: %s -> %s" % (asset_path, path))
-            self._cache[cache_key] = path
-            return path
-
-        self._cache[cache_key] = asset_path
-        return asset_path
-
-    def _get_usd_master_path(self,
-                             asset,
-                             subset,
-                             ext):
-        """Get the filepath for a .usd file of a subset.
-
-        This will return the path to an unversioned master file generated by
-        `usd_master_file.py`.
-
-        """
-
-        PROJECT = get_current_project_name()
-        anatomy = Anatomy(PROJECT)
-        asset_doc = get_asset_by_name(PROJECT, asset)
-        if not asset_doc:
-            raise RuntimeError("Invalid asset name: '%s'" % asset)
-
-        template_obj = anatomy.templates_obj["publish"]["path"]
-        path = template_obj.format_strict({
-            "project": PROJECT,
-            "asset": asset_doc["name"],
-            "subset": subset,
-            "representation": ext,
-            "version": 0  # stub version zero
-        })
-
-        # Remove the version folder
-        subset_folder = os.path.dirname(os.path.dirname(path))
-        master_folder = os.path.join(subset_folder, "master")
-        fname = "{0}.{1}".format(subset, ext)
-
-        return os.path.join(master_folder, fname).replace("\\", "/")
-
-
-output_processor = AvalonURIOutputProcessor()
-
-
-def usdOutputProcessor():
-    return output_processor
diff --git a/openpype/hosts/houdini/vendor/husdoutputprocessors/stagingdir_processor.py b/openpype/hosts/houdini/vendor/husdoutputprocessors/stagingdir_processor.py
deleted file mode 100644
index d8e36d5aa8..0000000000
--- a/openpype/hosts/houdini/vendor/husdoutputprocessors/stagingdir_processor.py
+++ /dev/null
@@ -1,90 +0,0 @@
-import hou
-import husdoutputprocessors.base as base
-import os
-
-
-class StagingDirOutputProcessor(base.OutputProcessorBase):
-    """Output all USD Rop file nodes into the Staging Directory
-
-    Ignore any folders and paths set in the Configured Layers
-    and USD Rop node, just take the filename and save into a
-    single directory.
-
-    """
-    theParameters = None
-    parameter_prefix = "stagingdiroutputprocessor_"
-    stagingdir_parm_name = parameter_prefix + "stagingDir"
-
-    def __init__(self):
-        self.staging_dir = None
-
-    def displayName(self):
-        return 'StagingDir Output Processor'
-
-    def parameters(self):
-        if not self.theParameters:
-            parameters = hou.ParmTemplateGroup()
-            rootdirparm = hou.StringParmTemplate(
-                self.stagingdir_parm_name,
-                'Staging Directory', 1,
-                string_type=hou.stringParmType.FileReference,
-                file_type=hou.fileType.Directory
-            )
-            parameters.append(rootdirparm)
-            self.theParameters = parameters.asDialogScript()
-        return self.theParameters
-
-    def beginSave(self, config_node, t):
-
-        # Use the Root Directory parameter if it is set.
-        root_dir_parm = config_node.parm(self.stagingdir_parm_name)
-        if root_dir_parm:
-            self.staging_dir = root_dir_parm.evalAtTime(t)
-
-        if not self.staging_dir:
-            out_file_parm = config_node.parm('lopoutput')
-            if out_file_parm:
-                self.staging_dir = out_file_parm.evalAtTime(t)
-            if self.staging_dir:
-                (self.staging_dir, filename) = os.path.split(self.staging_dir)
-
-    def endSave(self):
-        self.staging_dir = None
-
-    def processAsset(self, asset_path,
-            asset_path_for_save,
-            referencing_layer_path,
-            asset_is_layer,
-            for_save):
-        """
-        Args:
-            asset_path (str): The incoming file path you want to alter or not.
-            asset_path_for_save (bool): Whether the current path is a
-                referenced path in the USD file. When True, return the path
-                you want inside USD file.
-            referencing_layer_path (str): ???
-            asset_is_layer (bool): Whether this asset is a USD layer file.
-                If this is False, the asset is something else (for example,
-                a texture or volume file).
-            for_save (bool): Whether the asset path is for a file to be saved
-                out. If so, then return actual written filepath.
-
-        Returns:
-            The refactored asset path.
-
-        """
-
-        # Treat save paths as being relative to the output path.
-        if for_save and self.staging_dir:
-            # Whenever we're processing a Save Path make sure to
-            # resolve it to the Staging Directory
-            filename = os.path.basename(asset_path)
-            return os.path.join(self.staging_dir, filename)
-
-        return asset_path
-
-
-output_processor = StagingDirOutputProcessor()
-def usdOutputProcessor():
-    return output_processor
-

From 382ad931c670adbdd52fdf8996bb1d4115d37744 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 3 Nov 2023 14:13:08 +0100
Subject: [PATCH 11/80] resolve: frame duration and handles operation

---
 openpype/hosts/resolve/api/plugin.py | 53 ++++++++++++++++------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 5c4a92df89..0f6f4d14bd 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -405,26 +405,41 @@ class ClipLoader:
             self.active_bin
         )
         _clip_property = media_pool_item.GetClipProperty
+        source_in = int(_clip_property("Start"))
+        source_out = int(_clip_property("End"))
+        source_duration = int(_clip_property("Frames"))
 
-        # get handles
+        # get version data frame data from db
+        frame_start = self.data["versionData"].get("frameStart")
+        frame_end = self.data["versionData"].get("frameEnd")
         handle_start = self.data["versionData"].get("handleStart")
         handle_end = self.data["versionData"].get("handleEnd")
-        if handle_start is None:
-            handle_start = int(self.data["assetData"]["handleStart"])
-        if handle_end is None:
-            handle_end = int(self.data["assetData"]["handleEnd"])
 
-        # check frame duration from versionData or assetData
-        frame_start = self.data["versionData"].get("frameStart")
-        if frame_start is None:
-            frame_start = self.data["assetData"]["frameStart"]
+        # check if source duration is shorter than db frame duration
+        source_with_handles = True
+        # make sure all frame data is available
+        if (
+            frame_start is None or
+            frame_end is None or
+            handle_start is None or
+            handle_end is None
+        ):
+            # if not then rather assume that source has no handles
+            source_with_handles = False
+        else:
+            # calculate db frame duration
+            db_frame_duration = (
+                # include handles
+                int(handle_start) + int(handle_end) +
+                # include frame duration
+                (int(frame_end) - int(frame_start) + 1)
+            )
 
-        # check frame duration from versionData or assetData
-        frame_end = self.data["versionData"].get("frameEnd")
-        if frame_end is None:
-            frame_end = self.data["assetData"]["frameEnd"]
-
-        db_frame_duration = int(frame_end) - int(frame_start) + 1
+            # compare source duration with db frame duration
+            # and assume that source has no handles if source duration
+            # is shorter than db frame duration
+            if source_duration < db_frame_duration:
+                source_with_handles = False
 
         # get timeline in
         timeline_start = self.active_timeline.GetStartFrame()
@@ -436,14 +451,6 @@ class ClipLoader:
             timeline_in = int(
                 timeline_start + self.data["assetData"]["clipIn"])
 
-        source_in = int(_clip_property("Start"))
-        source_out = int(_clip_property("End"))
-        source_duration = int(_clip_property("Frames"))
-
-        # check if source duration is shorter than db frame duration
-        source_with_handles = True
-        if source_duration < db_frame_duration:
-            source_with_handles = False
 
         # only exclude handles if source has no handles or
         # if user wants to load without handles

From e5e278201b359772e51ae7dafae188753de06a3e Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 3 Nov 2023 16:18:04 +0100
Subject: [PATCH 12/80] better code explanation

---
 openpype/hosts/resolve/api/plugin.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 0f6f4d14bd..09c5a69d73 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -415,6 +415,19 @@ class ClipLoader:
         handle_start = self.data["versionData"].get("handleStart")
         handle_end = self.data["versionData"].get("handleEnd")
 
+        """
+        There are cases where representation could be published without
+        handles if the "Extract review output tags" is set to "no_handles".
+        This would result in a shorter source duration compared to the
+        db frame-range. In such cases, we need to assume that the source
+        has no handles.
+
+        To address this, we should compare the duration of the source
+        frame with the db frame-range. The duration of the db frame-range
+        should be calculated from the version data. If, for any reason,
+        the frame data is missing in the version data, we should again
+        assume that the source has no handles.
+        """
         # check if source duration is shorter than db frame duration
         source_with_handles = True
         # make sure all frame data is available
@@ -771,7 +784,7 @@ class PublishClip:
         # increasing steps by index of rename iteration
         self.count_steps *= self.rename_index
 
-        hierarchy_formatting_data = dict()
+        hierarchy_formatting_data = {}
         _data = self.timeline_item_default_data.copy()
         if self.ui_inputs:
             # adding tag metadata from ui
@@ -867,7 +880,7 @@ class PublishClip:
     def _convert_to_entity(self, key):
         """ Converting input key to key with type. """
         # convert to entity type
-        entity_type = self.types.get(key, None)
+        entity_type = self.types.get(key)
 
         assert entity_type, "Missing entity type for `{}`".format(
             key

From 2c0d1b5c2bd3efb9e0740b0d5324a588533459e1 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 9 Nov 2023 13:56:08 +0100
Subject: [PATCH 13/80] improving the logic for handles operation

---
 openpype/hosts/resolve/api/plugin.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 09c5a69d73..886615c7aa 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -410,10 +410,16 @@ class ClipLoader:
         source_duration = int(_clip_property("Frames"))
 
         # get version data frame data from db
-        frame_start = self.data["versionData"].get("frameStart")
-        frame_end = self.data["versionData"].get("frameEnd")
-        handle_start = self.data["versionData"].get("handleStart")
-        handle_end = self.data["versionData"].get("handleEnd")
+        version_data = self.data["versionData"]
+        frame_start = version_data.get("frameStart")
+        frame_end = version_data.get("frameEnd")
+
+        if self.with_handles:
+            handle_start = version_data.get("handleStart") or 0
+            handle_end = version_data.get("handleEnd") or 0
+        else:
+            handle_start = 0
+            handle_end = 0
 
         """
         There are cases where representation could be published without
@@ -434,8 +440,8 @@ class ClipLoader:
         if (
             frame_start is None or
             frame_end is None or
-            handle_start is None or
-            handle_end is None
+            handle_start is 0 or
+            handle_end is 0
         ):
             # if not then rather assume that source has no handles
             source_with_handles = False
@@ -464,12 +470,11 @@ class ClipLoader:
             timeline_in = int(
                 timeline_start + self.data["assetData"]["clipIn"])
 
-
         # only exclude handles if source has no handles or
         # if user wants to load without handles
         if (
-            not self.with_handles
-            or not source_with_handles
+            not self.with_handles # set by user
+            or not source_with_handles # result of source duration check
         ):
             source_in += handle_start
             source_out -= handle_end

From 6fa92ebc14204c3c723a0b2a1d42ba492d10ff30 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 9 Nov 2023 14:40:33 +0100
Subject: [PATCH 14/80] resolve: clip data should be integer rather then
 timecode

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

diff --git a/openpype/hosts/resolve/api/lib.py b/openpype/hosts/resolve/api/lib.py
index aef9caca78..3866477c77 100644
--- a/openpype/hosts/resolve/api/lib.py
+++ b/openpype/hosts/resolve/api/lib.py
@@ -298,7 +298,7 @@ def create_timeline_item(
         if source_end:
             clip_data["endFrame"] = source_end
         if timecode_in:
-            clip_data["recordFrame"] = timecode_in
+            clip_data["recordFrame"] = timeline_in
 
         # add to timeline
         media_pool.AppendToTimeline([clip_data])

From 85bad0ae3d6f43732b9087583af2e09de55fed40 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 9 Nov 2023 14:42:30 +0100
Subject: [PATCH 15/80] hound

---
 openpype/hosts/resolve/api/plugin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 886615c7aa..7cf5913b67 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -440,8 +440,8 @@ class ClipLoader:
         if (
             frame_start is None or
             frame_end is None or
-            handle_start is 0 or
-            handle_end is 0
+            handle_start == 0 or
+            handle_end == 0
         ):
             # if not then rather assume that source has no handles
             source_with_handles = False
@@ -473,8 +473,8 @@ class ClipLoader:
         # only exclude handles if source has no handles or
         # if user wants to load without handles
         if (
-            not self.with_handles # set by user
-            or not source_with_handles # result of source duration check
+            not self.with_handles  # set by user
+            or not source_with_handles  # result of source duration check
         ):
             source_in += handle_start
             source_out -= handle_end

From c0926104d59104cbc79d19296da70844ccc3fa21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Thu, 16 Nov 2023 18:29:31 +0100
Subject: [PATCH 16/80] :bug: handle empty materials list

---
 openpype/hosts/maya/plugins/publish/collect_look.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/plugins/publish/collect_look.py b/openpype/hosts/maya/plugins/publish/collect_look.py
index db042963c6..16ae20e0ae 100644
--- a/openpype/hosts/maya/plugins/publish/collect_look.py
+++ b/openpype/hosts/maya/plugins/publish/collect_look.py
@@ -367,7 +367,11 @@ class CollectLook(pyblish.api.InstancePlugin):
             self.log.debug("Found the following sets:\n{}".format(look_sets))
             # Get the entire node chain of the look sets
             # history = cmds.listHistory(look_sets, allConnections=True)
-            history = cmds.listHistory(materials, allConnections=True)
+            # if materials list is empty, listHistory() will crash with
+            # RuntimeError
+            history = []
+            if materials:
+                history = cmds.listHistory(materials, allConnections=True)
 
             # Since we retrieved history only of the connected materials
             # connected to the look sets above we now add direct history

From db5d4bd254914b83adce418a741bfa2dfc3d0f80 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Mon, 20 Nov 2023 21:38:08 +0100
Subject: [PATCH 17/80] unreal hash

---
 openpype/hosts/unreal/integration | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/unreal/integration b/openpype/hosts/unreal/integration
index ff15c70077..63266607ce 160000
--- a/openpype/hosts/unreal/integration
+++ b/openpype/hosts/unreal/integration
@@ -1 +1 @@
-Subproject commit ff15c700771e719cc5f3d561ac5d6f7590623986
+Subproject commit 63266607ceb972a61484f046634ddfc9eb0b5757

From 97c10d2555171b457b854d5d11c0e914d18183d4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Mon, 20 Nov 2023 21:45:46 +0100
Subject: [PATCH 18/80] adding oiio defaults from settings

---
 openpype/plugins/publish/extract_thumbnail.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index 5b75a374ba..22c579ab86 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -26,6 +26,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
     enabled = False
 
     # presentable attribute
+    oiiotool_defaults = None
     ffmpeg_args = None
 
     def process(self, instance):
@@ -205,14 +206,26 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         """
         self.log.info("Extracting thumbnail {}".format(dst_path))
 
+        oiio_default_type = None
+        oiio_default_display = None
+        oiio_default_view = None
+        oiio_default_colorspace = None
+        if self.oiiotool_defaults:
+            oiio_default_type = self.oiiotool_defaults["type"]
+            if "colorspace" in oiio_default_type:
+                oiio_default_colorspace = self.oiiotool_defaults["colorspace"]
+            else:
+                oiio_default_display = self.oiiotool_defaults["display"]
+                oiio_default_view = self.oiiotool_defaults["view"]
         try:
             convert_colorspace(
                 src_path,
                 dst_path,
                 colorspace_data["config"]["path"],
                 colorspace_data["colorspace"],
-                display=colorspace_data.get("display"),
-                view=colorspace_data.get("view"),
+                display=colorspace_data.get("display") or oiio_default_display,
+                view=colorspace_data.get("view") or oiio_default_view,
+                target_colorspace=oiio_default_colorspace,
                 additional_input_args=["-i:ch=R,G,B"],
                 logger=self.log,
             )

From 282c75631a63cc47c5622ca9ca01eb3ef1cc7753 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Mon, 20 Nov 2023 21:58:20 +0100
Subject: [PATCH 19/80] adding settings for oiio defaults

---
 .../defaults/project_settings/global.json     |  6 ++++
 .../schemas/schema_global_publish.json        | 32 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index 9ccf5cae05..959faf14fa 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -70,6 +70,12 @@
         },
         "ExtractThumbnail": {
             "enabled": true,
+            "oiiotool_defaults": {
+                "type": "colorspace",
+                "colorspace": "color_picking",
+                "view": "sRGB",
+                "display": "default"
+            },
             "ffmpeg_args": {
                 "input": [
                     "-apply_trc gamma22"
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index c7e91fd22d..a850cb68ed 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -202,6 +202,38 @@
                     "key": "enabled",
                     "label": "Enabled"
                 },
+                {
+                    "type": "dict",
+                    "collapsible": true,
+                    "key": "oiiotool_defaults",
+                    "label": "OIIOtool defaults",
+                    "children": [
+                        {
+                            "type": "enum",
+                            "key": "type",
+                            "label": "Target type",
+                            "enum_items": [
+                                { "colorspace": "Colorspace" },
+                                { "display_and_view": "Display & View" }
+                            ]
+                        },
+                        {
+                            "type": "text",
+                            "key": "colorspace",
+                            "label": "Colorspace"
+                        },
+                        {
+                            "type": "text",
+                            "key": "view",
+                            "label": "View"
+                        },
+                        {
+                            "type": "text",
+                            "key": "display",
+                            "label": "Display"
+                        }
+                    ]
+                },
                 {
                     "type": "dict",
                     "key": "ffmpeg_args",

From 1c6db9d8ae25a61f43c1c89756c93b153f180cee Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 11:45:04 +0100
Subject: [PATCH 20/80] Ftrack: rewriting component creation to support
 multiple thumbnails

---
 .../publish/integrate_ftrack_instances.py     | 405 ++++++++++++------
 1 file changed, 265 insertions(+), 140 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 75f43cb22f..334e70ce0c 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -1,6 +1,7 @@
 import os
 import json
 import copy
+
 import pyblish.api
 
 from openpype.pipeline.publish import get_publish_repre_path
@@ -61,6 +62,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
     additional_metadata_keys = []
 
     def process(self, instance):
+        # QUESTION: should this be operating even for `farm` target?
         self.log.debug("instance {}".format(instance))
 
         instance_repres = instance.data.get("representations")
@@ -143,70 +145,87 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
         unmanaged_location_name = "ftrack.unmanaged"
         ftrack_server_location_name = "ftrack.server"
 
+        # check if any outputName keys are in review_representations
+        # also check if any outputName keys are in thumbnail_representations
+        synced_multiple_output_names = []
+        for review_repre in review_representations:
+            review_output_name = review_repre.get("outputName")
+            if not review_output_name:
+                continue
+            for thumb_repre in thumbnail_representations:
+                thumb_output_name = thumb_repre.get("outputName")
+                if not thumb_output_name:
+                    continue
+                if (
+                    thumb_output_name == review_output_name
+                    # output name can be added also as tags during intermediate
+                    # files creation
+                    or thumb_output_name in review_repre.get("tags", [])
+                ):
+                    synced_multiple_output_names.append(
+                        thumb_repre["outputName"])
+        self.log.debug("Multiple output names: {}".format(
+            synced_multiple_output_names
+        ))
+        multiple_synced_thumbnails = len(thumbnail_representations) > 1
+
         # Components data
         component_list = []
-        # Components that will be duplicated to unmanaged location
-        src_components_to_add = []
+        thumbnail_data_items = []
 
         # Create thumbnail components
-        # TODO what if there is multiple thumbnails?
-        first_thumbnail_component = None
-        first_thumbnail_component_repre = None
-
-        if not review_representations or has_movie_review:
-            for repre in thumbnail_representations:
-                repre_path = get_publish_repre_path(instance, repre, False)
-                if not repre_path:
-                    self.log.warning(
-                        "Published path is not set and source was removed."
-                    )
-                    continue
-
-                # Create copy of base comp item and append it
-                thumbnail_item = copy.deepcopy(base_component_item)
-                thumbnail_item["component_path"] = repre_path
-                thumbnail_item["component_data"] = {
-                    "name": "thumbnail"
-                }
-                thumbnail_item["thumbnail"] = True
-
-                # Create copy of item before setting location
-                if "delete" not in repre.get("tags", []):
-                    src_components_to_add.append(copy.deepcopy(thumbnail_item))
-                # Create copy of first thumbnail
-                if first_thumbnail_component is None:
-                    first_thumbnail_component_repre = repre
-                    first_thumbnail_component = thumbnail_item
-                # Set location
-                thumbnail_item["component_location_name"] = (
-                    ftrack_server_location_name
+        for repre in thumbnail_representations:
+            repre_path = get_publish_repre_path(instance, repre, False)
+            if not repre_path:
+                self.log.warning(
+                    "Published path is not set and source was removed."
                 )
+                continue
 
-                # Add item to component list
-                component_list.append(thumbnail_item)
+            # Create copy of base comp item and append it
+            thumbnail_item = copy.deepcopy(base_component_item)
+            thumbnail_item.update({
+                "component_path": repre_path,
+                "component_data": {
+                    "name": (
+                        "thumbnail" if review_representations
+                        else "ftrackreview-image"
+                    ),
+                    "metadata": self._prepare_image_component_metadata(
+                        repre,
+                        repre_path
+                    )
+                },
+                "thumbnail": True,
+                "component_location_name": ftrack_server_location_name
+            })
 
-        if first_thumbnail_component is not None:
-            metadata = self._prepare_image_component_metadata(
-                first_thumbnail_component_repre,
-                first_thumbnail_component["component_path"]
-            )
+            # add thumbnail to items data for future synchronization
+            current_item = {
+                "sync_key": repre.get("outputName"),
+                "representation": repre,
+                "item": thumbnail_item
+            }
+            # Create copy of item before setting location
+            if "delete" not in repre.get("tags", []):
+                src_comp = self._create_src_components(
+                    instance,
+                    repre,
+                    copy.deepcopy(thumbnail_item),
+                    unmanaged_location_name
+                )
+                component_list.append(src_comp)
 
-            if metadata:
-                component_data = first_thumbnail_component["component_data"]
-                component_data["metadata"] = metadata
+                current_item["src_component"] = src_comp
 
-                if review_representations:
-                    component_data["name"] = "thumbnail"
-                else:
-                    component_data["name"] = "ftrackreview-image"
+            # Add item to component list
+            component_list.append(thumbnail_item)
+            thumbnail_data_items.append(current_item)
 
         # Create review components
         # Change asset name of each new component for review
-        is_first_review_repre = True
-        not_first_components = []
-        extended_asset_name = ""
         multiple_reviewable = len(review_representations) > 1
-        for repre in review_representations:
+        for index, repre in enumerate(review_representations):
             if not self._is_repre_video(repre) and has_movie_review:
                 self.log.debug("Movie repre has priority "
                                "from {}".format(repre))
@@ -222,45 +241,38 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             # Create copy of base comp item and append it
             review_item = copy.deepcopy(base_component_item)
 
-            # get asset name and define extended name variant
-            asset_name = review_item["asset_data"]["name"]
-            extended_asset_name = "_".join(
-                (asset_name, repre["name"])
+            # get first or synchronize thumbnail item
+            sync_thumbnail_item = self._get_matching_thumbnail_item(
+                repre,
+                thumbnail_data_items,
+                multiple_synced_thumbnails
             )
 
-            # reset extended if no need for extended asset name
-            if (
-                self.keep_first_subset_name_for_review
-                and is_first_review_repre
-            ):
-                extended_asset_name = ""
-            else:
-                # only rename if multiple reviewable
-                if multiple_reviewable:
-                    review_item["asset_data"]["name"] = extended_asset_name
-                else:
-                    extended_asset_name = ""
-
-            # rename all already created components
-            # only if first repre and extended name available
-            if is_first_review_repre and extended_asset_name:
-                # and rename all already created components
-                for _ci in component_list:
-                    _ci["asset_data"]["name"] = extended_asset_name
-
-                # and rename all already created src components
-                for _sci in src_components_to_add:
-                    _sci["asset_data"]["name"] = extended_asset_name
-
-                # rename also first thumbnail component if any
-                if first_thumbnail_component is not None:
-                    first_thumbnail_component[
-                        "asset_data"]["name"] = extended_asset_name
-
-            # Change location
-            review_item["component_path"] = repre_path
-            # Change component data
+            """
+            Renaming asset name only to those components which are explicitly
+            allowed in settings. Usually clients wanted to keep first component
+            as untouched product name with version and any other assetVersion
+            to be named with extended form. The renaming will only happen if
+            there is more than one reviewable component and extended name is
+            not empty.
+            """
+            extended_asset_name = self._make_extended_component_name(
+                base_component_item, repre, index)
+            if multiple_reviewable and extended_asset_name:
+                review_item["asset_data"]["name"] = extended_asset_name
+                # rename also thumbnail
+                if sync_thumbnail_item:
+                    sync_thumbnail_item["item"]["asset_data"]["name"] = (
+                        extended_asset_name
+                    )
+                # rename also src_thumbnail
+                if sync_thumbnail_item.get("src_component"):
+                    thumb_src_component = sync_thumbnail_item["src_component"]
+                    thumb_src_component["asset_data"]["name"] = (
+                        extended_asset_name
+                    )
 
+            # add metadata to review component
             if self._is_repre_video(repre):
                 component_name = "ftrackreview-mp4"
                 metadata = self._prepare_video_component_metadata(
@@ -273,28 +285,49 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 )
                 review_item["thumbnail"] = True
 
-            review_item["component_data"] = {
-                # Default component name is "main".
-                "name": component_name,
-                "metadata": metadata
-            }
-
-            if is_first_review_repre:
-                is_first_review_repre = False
-            else:
-                # later detection for thumbnail duplication
-                not_first_components.append(review_item)
+            review_item.update({
+                "component_path": repre_path,
+                "component_data": {
+                    "name": component_name,
+                    "metadata": metadata
+                },
+                "component_location_name": ftrack_server_location_name
+            })
 
             # Create copy of item before setting location
             if "delete" not in repre.get("tags", []):
-                src_components_to_add.append(copy.deepcopy(review_item))
+                src_comp = self._create_src_components(
+                    instance,
+                    repre,
+                    copy.deepcopy(review_item),
+                    unmanaged_location_name
+                )
+                component_list.append(src_comp)
+
+            if index > 0:
+                asset_name = review_item["asset_data"]["name"]
+                # perhaps it might happen that no thumbnail for
+                # current iteration is found in thumbnails list
+                # QUESTION: should this be consider as bug in code?
+                # NOTE: this was inherited from original code, but perhaps it
+                #       should not be included
+                if (
+                    sync_thumbnail_item
+                    and sync_thumbnail_item["item"]["asset_data"]["name"] != asset_name  # noqa
+                ):
+                    new_thumbnail_component = copy.deepcopy(
+                        sync_thumbnail_item["item"]
+                    )
+                    new_thumbnail_component["asset_data"]["name"] = asset_name
+                    new_thumbnail_component["component_location_name"] = (
+                        ftrack_server_location_name
+                    )
+                    component_list.append(new_thumbnail_component)
 
-            # Set location
-            review_item["component_location_name"] = (
-                ftrack_server_location_name
-            )
             # Add item to component list
             component_list.append(review_item)
+
+
             if self.upload_reviewable_with_origin_name:
                 origin_name_component = copy.deepcopy(review_item)
                 filename = os.path.basename(repre_path)
@@ -303,34 +336,6 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 )
                 component_list.append(origin_name_component)
 
-        # Duplicate thumbnail component for all not first reviews
-        if first_thumbnail_component is not None:
-            for component_item in not_first_components:
-                asset_name = component_item["asset_data"]["name"]
-                new_thumbnail_component = copy.deepcopy(
-                    first_thumbnail_component
-                )
-                new_thumbnail_component["asset_data"]["name"] = asset_name
-                new_thumbnail_component["component_location_name"] = (
-                    ftrack_server_location_name
-                )
-                component_list.append(new_thumbnail_component)
-
-        # Add source components for review and thubmnail components
-        for copy_src_item in src_components_to_add:
-            # Make sure thumbnail is disabled
-            copy_src_item["thumbnail"] = False
-            # Set location
-            copy_src_item["component_location_name"] = unmanaged_location_name
-            # Modify name of component to have suffix "_src"
-            component_data = copy_src_item["component_data"]
-            component_name = component_data["name"]
-            component_data["name"] = component_name + "_src"
-            component_data["metadata"] = self._prepare_component_metadata(
-                instance, repre, copy_src_item["component_path"], False
-            )
-            component_list.append(copy_src_item)
-
         # Add others representations as component
         for repre in other_representations:
             published_path = get_publish_repre_path(instance, repre, True)
@@ -346,15 +351,17 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             ):
                 other_item["asset_data"]["name"] = extended_asset_name
 
-            component_data = {
-                "name": repre["name"],
-                "metadata": self._prepare_component_metadata(
-                    instance, repre, published_path, False
-                )
-            }
-            other_item["component_data"] = component_data
-            other_item["component_location_name"] = unmanaged_location_name
-            other_item["component_path"] = published_path
+            other_item.update({
+                "component_path": published_path,
+                "component_data": {
+                    "name": repre["name"],
+                    "metadata": self._prepare_component_metadata(
+                        instance, repre, published_path, False
+                    )
+                },
+                "component_location_name": unmanaged_location_name,
+            })
+
             component_list.append(other_item)
 
         def json_obj_parser(obj):
@@ -370,6 +377,124 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
         ))
         instance.data["ftrackComponentsList"] = component_list
 
+    def _get_matching_thumbnail_item(
+        self,
+        review_representation,
+        thumbnail_data_items,
+        are_multiple_synced_thumbnails
+    ):
+        """Return matching thumbnail item from list of thumbnail items.
+
+        If a thumbnail item already exists, this should return it.
+        The benefit is that if an `outputName` key is found in
+        representation and is also used as a `sync_key`  in a thumbnail
+        data item, it can sync with that item.
+
+        Args:
+            review_representation (dict): Review representation
+            thumbnail_data_items (list): List of thumbnail data items
+            are_multiple_synced_thumbnails (bool): If there are multiple synced
+                thumbnails
+
+        Returns:
+            dict: Thumbnail data item or empty dict
+        """
+        output_name = review_representation.get("outputName")
+        tags = review_representation.get("tags", [])
+        matching_thumbnail_item = {}
+        for thumb_item in thumbnail_data_items:
+            if (
+                are_multiple_synced_thumbnails
+                and (
+                    thumb_item["sync_key"] == output_name
+                    # intermediate files can have preset name in tags
+                    # this is usually aligned with `outputName` distributed
+                    # during thumbnail creation in `need_thumbnail` tagging
+                    # workflow
+                    or thumb_item["sync_key"] in tags
+                )
+            ):
+                # return only synchronized thumbnail if multiple
+                matching_thumbnail_item = thumb_item
+                break
+            elif not are_multiple_synced_thumbnails:
+                # return any first found thumbnail since we need thumbnail
+                # but dont care which one
+                matching_thumbnail_item = thumb_item
+                break
+
+        if not matching_thumbnail_item:
+            # WARNING: this can only happen if multiple thumbnails
+            # workflow is broken, since it found multiple matching outputName
+            # in representation but they do not align with any thumbnail item
+            self.log.warning(
+                "No matching thumbnail item found for output name "
+                "'{}'".format(output_name)
+            )
+            if not thumbnail_data_items:
+                self.log.warning(
+                    "No thumbnail data items found"
+                )
+                return {}
+            # as fallback return first thumbnail item
+            return thumbnail_data_items[0]
+
+
+        return matching_thumbnail_item
+
+    def _make_extended_component_name(self, component_item, repre, iteration_index):
+        """ Returns the extended component name
+
+        Name is based on the asset name and representation name.
+
+        Args:
+            component_item (dict): The component item dictionary.
+            repre (dict): The representation dictionary.
+            iteration_index (int): The index of the iteration.
+
+        Returns:
+            str: The extended component name.
+
+        """
+         # reset extended if no need for extended asset name
+        if self.keep_first_subset_name_for_review and iteration_index == 0:
+            return
+
+        # get asset name and define extended name variant
+        asset_name = component_item["asset_data"]["name"]
+        return "_".join(
+            (asset_name, repre["name"])
+        )
+
+    def _create_src_components(
+            self, instance, repre, component_item, location):
+        """Create src component for thumbnail.
+
+        This will replicate the input component and change its name to
+        have suffix "_src".
+
+        Args:
+            instance (pyblish.api.Instance): Instance
+            repre (dict): Representation
+            component_item (dict): Component item
+            location (str): Location name
+
+        Returns:
+            dict: Component item
+        """
+        # Make sure thumbnail is disabled
+        component_item["thumbnail"] = False
+        # Set location
+        component_item["component_location_name"] = location
+        # Modify name of component to have suffix "_src"
+        component_data = component_item["component_data"]
+        component_name = component_data["name"]
+        component_data["name"] = component_name + "_src"
+        component_data["metadata"] = self._prepare_component_metadata(
+            instance, repre, component_item["component_path"], False
+        )
+        return component_item
+
     def _collect_additional_metadata(self, streams):
         pass
 

From 4ba778e73e6123b5fa6ce43fed2110729740f813 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 13:49:57 +0100
Subject: [PATCH 21/80] fixing duplication of single thumbnail for multiple
 reviewables

---
 .../publish/integrate_ftrack_instances.py     | 46 +++++++------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 334e70ce0c..dcc9d6569a 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -1,7 +1,6 @@
 import os
 import json
 import copy
-
 import pyblish.api
 
 from openpype.pipeline.publish import get_publish_repre_path
@@ -219,7 +218,6 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 current_item["src_component"] = src_comp
 
             # Add item to component list
-            component_list.append(thumbnail_item)
             thumbnail_data_items.append(current_item)
 
         # Create review components
@@ -242,11 +240,16 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             review_item = copy.deepcopy(base_component_item)
 
             # get first or synchronize thumbnail item
-            sync_thumbnail_item = self._get_matching_thumbnail_item(
+            sync_thumbnail_item = None
+            sync_thumbnail_item_src = None
+            sync_thumbnail_data = self._get_matching_thumbnail_item(
                 repre,
                 thumbnail_data_items,
                 multiple_synced_thumbnails
             )
+            if sync_thumbnail_data:
+                sync_thumbnail_item = sync_thumbnail_data.get("item")
+                sync_thumbnail_item_src = sync_thumbnail_data.get("src_component")
 
             """
             Renaming asset name only to those components which are explicitly
@@ -258,20 +261,26 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             """
             extended_asset_name = self._make_extended_component_name(
                 base_component_item, repre, index)
+
             if multiple_reviewable and extended_asset_name:
                 review_item["asset_data"]["name"] = extended_asset_name
                 # rename also thumbnail
                 if sync_thumbnail_item:
-                    sync_thumbnail_item["item"]["asset_data"]["name"] = (
+                    sync_thumbnail_item["asset_data"]["name"] = (
                         extended_asset_name
                     )
                 # rename also src_thumbnail
-                if sync_thumbnail_item.get("src_component"):
-                    thumb_src_component = sync_thumbnail_item["src_component"]
-                    thumb_src_component["asset_data"]["name"] = (
+                if sync_thumbnail_item_src:
+                    sync_thumbnail_item_src["asset_data"]["name"] = (
                         extended_asset_name
                     )
 
+            # adding thumbnail component to component list
+            if sync_thumbnail_item:
+                component_list.append(copy.deepcopy(sync_thumbnail_item))
+            if sync_thumbnail_item_src:
+                component_list.append(copy.deepcopy(sync_thumbnail_item_src))
+
             # add metadata to review component
             if self._is_repre_video(repre):
                 component_name = "ftrackreview-mp4"
@@ -304,26 +313,6 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 )
                 component_list.append(src_comp)
 
-            if index > 0:
-                asset_name = review_item["asset_data"]["name"]
-                # perhaps it might happen that no thumbnail for
-                # current iteration is found in thumbnails list
-                # QUESTION: should this be consider as bug in code?
-                # NOTE: this was inherited from original code, but perhaps it
-                #       should not be included
-                if (
-                    sync_thumbnail_item
-                    and sync_thumbnail_item["item"]["asset_data"]["name"] != asset_name  # noqa
-                ):
-                    new_thumbnail_component = copy.deepcopy(
-                        sync_thumbnail_item["item"]
-                    )
-                    new_thumbnail_component["asset_data"]["name"] = asset_name
-                    new_thumbnail_component["component_location_name"] = (
-                        ftrack_server_location_name
-                    )
-                    component_list.append(new_thumbnail_component)
-
             # Add item to component list
             component_list.append(review_item)
 
@@ -597,9 +586,6 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             stream_width = tmp_width
             stream_height = tmp_height
 
-            self.log.debug("FPS from stream is {} and duration is {}".format(
-                input_framerate, stream_duration
-            ))
             frame_out = float(stream_duration) * stream_fps
             break
 

From 73600fb0a8dbf60175f3d9984e89be95743e5859 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 13:57:13 +0100
Subject: [PATCH 22/80] hound

---
 .../ftrack/plugins/publish/integrate_ftrack_instances.py    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index dcc9d6569a..66d5b73dc6 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -428,10 +428,10 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             # as fallback return first thumbnail item
             return thumbnail_data_items[0]
 
-
         return matching_thumbnail_item
 
-    def _make_extended_component_name(self, component_item, repre, iteration_index):
+    def _make_extended_component_name(
+            self, component_item, repre, iteration_index):
         """ Returns the extended component name
 
         Name is based on the asset name and representation name.
@@ -445,7 +445,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             str: The extended component name.
 
         """
-         # reset extended if no need for extended asset name
+        # reset extended if no need for extended asset name
         if self.keep_first_subset_name_for_review and iteration_index == 0:
             return
 

From e6c050403871e45ccc7c0423ac107e2b8d9a8b02 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 13:59:33 +0100
Subject: [PATCH 23/80] unused variable

comment https://github.com/ynput/OpenPype/pull/5939#discussion_r1400418886
---
 .../ftrack/plugins/publish/integrate_ftrack_instances.py        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index 66d5b73dc6..ffa2672576 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -166,7 +166,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
         self.log.debug("Multiple output names: {}".format(
             synced_multiple_output_names
         ))
-        multiple_synced_thumbnails = len(thumbnail_representations) > 1
+        multiple_synced_thumbnails = len(synced_multiple_output_names) > 1
 
         # Components data
         component_list = []

From 166bfb2f31981647a18c4f381a082b54eead9f6d Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 14:06:33 +0100
Subject: [PATCH 24/80] improving code readability

---
 .../publish/integrate_ftrack_instances.py     | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
index ffa2672576..edad0b0132 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_instances.py
@@ -174,10 +174,17 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
 
         # Create thumbnail components
         for repre in thumbnail_representations:
-            repre_path = get_publish_repre_path(instance, repre, False)
+            # get repre path from representation
+            # and return published_path if available
+            # the path is validated and if it does not exists it returns None
+            repre_path = get_publish_repre_path(
+                instance,
+                repre,
+                only_published=False
+            )
             if not repre_path:
                 self.log.warning(
-                    "Published path is not set and source was removed."
+                    "Published path is not set or source was removed."
                 )
                 continue
 
@@ -199,15 +206,15 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 "component_location_name": ftrack_server_location_name
             })
 
-            # add thumbnail to items data for future synchronization
-            current_item = {
+            # add thumbnail data to items for future synchronization
+            current_item_data = {
                 "sync_key": repre.get("outputName"),
                 "representation": repre,
                 "item": thumbnail_item
             }
             # Create copy of item before setting location
             if "delete" not in repre.get("tags", []):
-                src_comp = self._create_src_components(
+                src_comp = self._create_src_component(
                     instance,
                     repre,
                     copy.deepcopy(thumbnail_item),
@@ -215,10 +222,10 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
                 )
                 component_list.append(src_comp)
 
-                current_item["src_component"] = src_comp
+                current_item_data["src_component"] = src_comp
 
             # Add item to component list
-            thumbnail_data_items.append(current_item)
+            thumbnail_data_items.append(current_item_data)
 
         # Create review components
         # Change asset name of each new component for review
@@ -249,7 +256,8 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             )
             if sync_thumbnail_data:
                 sync_thumbnail_item = sync_thumbnail_data.get("item")
-                sync_thumbnail_item_src = sync_thumbnail_data.get("src_component")
+                sync_thumbnail_item_src = sync_thumbnail_data.get(
+                    "src_component")
 
             """
             Renaming asset name only to those components which are explicitly
@@ -305,7 +313,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
 
             # Create copy of item before setting location
             if "delete" not in repre.get("tags", []):
-                src_comp = self._create_src_components(
+                src_comp = self._create_src_component(
                     instance,
                     repre,
                     copy.deepcopy(review_item),
@@ -455,7 +463,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
             (asset_name, repre["name"])
         )
 
-    def _create_src_components(
+    def _create_src_component(
             self, instance, repre, component_item, location):
         """Create src component for thumbnail.
 

From d3de3fc295ce0cc155be13a16f33ae28ccdf545a Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 17:04:35 +0100
Subject: [PATCH 25/80] removing input arguments

---
 openpype/lib/transcoding.py                   | 112 ++++++++----------
 openpype/plugins/publish/extract_thumbnail.py |   1 -
 2 files changed, 51 insertions(+), 62 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index 07acc309d2..20394c8a5e 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -592,29 +592,7 @@ def convert_for_ffmpeg(
         oiio_cmd.extend(["--compression", compression])
 
     # Collect channels to export
-    channel_names = input_info["channelnames"]
-    review_channels = get_convert_rgb_channels(channel_names)
-    if review_channels is None:
-        raise ValueError(
-            "Couldn't find channels that can be used for conversion."
-        )
-
-    red, green, blue, alpha = review_channels
-    input_channels = [red, green, blue]
-    channels_arg = "R={},G={},B={}".format(red, green, blue)
-    if alpha is not None:
-        channels_arg += ",A={}".format(alpha)
-        input_channels.append(alpha)
-    input_channels_str = ",".join(input_channels)
-
-    subimages = input_info.get("subimages")
-    input_arg = "-i"
-    if subimages is None or subimages == 1:
-        # Tell oiiotool which channels should be loaded
-        # - other channels are not loaded to memory so helps to avoid memory
-        #       leak issues
-        # - this option is crashing if used on multipart/subimages exrs
-        input_arg += ":ch={}".format(input_channels_str)
+    input_arg, channels_arg = get_oiio_input_and_channel_args(input_info)
 
     oiio_cmd.extend([
         input_arg, first_input_path,
@@ -677,6 +655,37 @@ def convert_for_ffmpeg(
     run_subprocess(oiio_cmd, logger=logger)
 
 
+def get_oiio_input_and_channel_args(oiio_input_info):
+    channel_names = oiio_input_info["channelnames"]
+    review_channels = get_convert_rgb_channels(channel_names)
+
+    if review_channels is None:
+        raise ValueError(
+            "Couldn't find channels that can be used for conversion."
+        )
+
+    red, green, blue, alpha = review_channels
+    input_channels = [red, green, blue]
+
+    # TODO find subimage inder where rgba is available for multipart exrs
+    channels_arg = "R={},G={},B={}".format(red, green, blue)
+    if alpha is not None:
+        channels_arg += ",A={}".format(alpha)
+        input_channels.append(alpha)
+
+    input_channels_str = ",".join(input_channels)
+
+    subimages = oiio_input_info.get("subimages")
+    input_arg = "-i"
+    if subimages is None or subimages == 1:
+        # Tell oiiotool which channels should be loaded
+        # - other channels are not loaded to memory so helps to avoid memory
+        #       leak issues
+        # - this option is crashing if used on multipart exrs
+        input_arg += ":ch={}".format(input_channels_str)
+
+    return input_arg, channels_arg
+
 def convert_input_paths_for_ffmpeg(
     input_paths,
     output_dir,
@@ -709,6 +718,7 @@ def convert_input_paths_for_ffmpeg(
 
     first_input_path = input_paths[0]
     ext = os.path.splitext(first_input_path)[1].lower()
+
     if ext != ".exr":
         raise ValueError((
             "Function 'convert_for_ffmpeg' currently support only"
@@ -724,30 +734,7 @@ def convert_input_paths_for_ffmpeg(
         compression = "none"
 
     # Collect channels to export
-    channel_names = input_info["channelnames"]
-    review_channels = get_convert_rgb_channels(channel_names)
-    if review_channels is None:
-        raise ValueError(
-            "Couldn't find channels that can be used for conversion."
-        )
-
-    red, green, blue, alpha = review_channels
-    input_channels = [red, green, blue]
-    # TODO find subimage inder where rgba is available for multipart exrs
-    channels_arg = "R={},G={},B={}".format(red, green, blue)
-    if alpha is not None:
-        channels_arg += ",A={}".format(alpha)
-        input_channels.append(alpha)
-    input_channels_str = ",".join(input_channels)
-
-    subimages = input_info.get("subimages")
-    input_arg = "-i"
-    if subimages is None or subimages == 1:
-        # Tell oiiotool which channels should be loaded
-        # - other channels are not loaded to memory so helps to avoid memory
-        #       leak issues
-        # - this option is crashing if used on multipart exrs
-        input_arg += ":ch={}".format(input_channels_str)
+    input_arg, channels_arg = get_oiio_input_and_channel_args(input_info)
 
     for input_path in input_paths:
         # Prepare subprocess arguments
@@ -1149,7 +1136,6 @@ def convert_colorspace(
     target_colorspace=None,
     view=None,
     display=None,
-    additional_input_args=None,
     additional_command_args=None,
     logger=None,
 ):
@@ -1171,7 +1157,6 @@ def convert_colorspace(
             both 'view' and 'display' must be filled (if 'target_colorspace')
         display (str): name for display-referred reference space (ocio valid)
             both 'view' and 'display' must be filled (if 'target_colorspace')
-        additional_input_args (list): input arguments for oiiotool
         additional_command_args (list): arguments for oiiotool (like binary
             depth for .dpx)
         logger (logging.Logger): Logger used for logging.
@@ -1181,23 +1166,28 @@ def convert_colorspace(
     if logger is None:
         logger = logging.getLogger(__name__)
 
-    # prepare main oiio command args
-    args = [
-        input_path,
+    input_info = get_oiio_info_for_input(input_path, logger=logger)
+
+    # Collect channels to export
+    input_arg, channels_arg = get_oiio_input_and_channel_args(input_info)
+
+    # Prepare subprocess arguments
+    oiio_cmd = get_oiio_tool_args(
+        "oiiotool",
         # Don't add any additional attributes
         "--nosoftwareattrib",
         "--colorconfig", config_path
-    ]
-
-    # prepend any additional args if available
-    if additional_input_args:
-        args = additional_input_args + args
-
-    oiio_cmd = get_oiio_tool_args(
-        "oiiotool",
-        *args
     )
 
+    oiio_cmd.extend([
+        input_arg, input_path,
+        # Tell oiiotool which channels should be put to top stack
+        #   (and output)
+        "--ch", channels_arg,
+        # Use first subimage
+        "--subimage", "0"
+    ])
+
     if all([target_colorspace, view, display]):
         raise ValueError("Colorspace and both screen and display"
                          " cannot be set together."
diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index 22c579ab86..2215c94f42 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -226,7 +226,6 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
                 display=colorspace_data.get("display") or oiio_default_display,
                 view=colorspace_data.get("view") or oiio_default_view,
                 target_colorspace=oiio_default_colorspace,
-                additional_input_args=["-i:ch=R,G,B"],
                 logger=self.log,
             )
         except Exception:

From 50c37b7e110cc0c9e5c6d272dbc7f1d7f19ea87f Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 17:05:06 +0100
Subject: [PATCH 26/80] typos and code style

---
 openpype/lib/transcoding.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/openpype/lib/transcoding.py b/openpype/lib/transcoding.py
index 20394c8a5e..334ea25ea4 100644
--- a/openpype/lib/transcoding.py
+++ b/openpype/lib/transcoding.py
@@ -536,7 +536,7 @@ def convert_for_ffmpeg(
     input_frame_end=None,
     logger=None
 ):
-    """Contert source file to format supported in ffmpeg.
+    """Convert source file to format supported in ffmpeg.
 
     Currently can convert only exrs.
 
@@ -613,7 +613,7 @@ def convert_for_ffmpeg(
             continue
 
         # Remove attributes that have string value longer than allowed length
-        #   for ffmpeg or when contain unallowed symbols
+        #   for ffmpeg or when contain prohibited symbols
         erase_reason = "Missing reason"
         erase_attribute = False
         if len(attr_value) > MAX_FFMPEG_STRING_LEN:
@@ -656,6 +656,15 @@ def convert_for_ffmpeg(
 
 
 def get_oiio_input_and_channel_args(oiio_input_info):
+    """Get input and channel arguments for oiiotool.
+
+    Args:
+        oiio_input_info (dict): Information about input from oiio tool.
+            Should be output of function `get_oiio_info_for_input`.
+
+    Returns:
+        tuple[str, str]: Tuple of input and channel arguments.
+    """
     channel_names = oiio_input_info["channelnames"]
     review_channels = get_convert_rgb_channels(channel_names)
 
@@ -667,7 +676,7 @@ def get_oiio_input_and_channel_args(oiio_input_info):
     red, green, blue, alpha = review_channels
     input_channels = [red, green, blue]
 
-    # TODO find subimage inder where rgba is available for multipart exrs
+    # TODO find subimage where rgba is available for multipart exrs
     channels_arg = "R={},G={},B={}".format(red, green, blue)
     if alpha is not None:
         channels_arg += ",A={}".format(alpha)
@@ -686,6 +695,7 @@ def get_oiio_input_and_channel_args(oiio_input_info):
 
     return input_arg, channels_arg
 
+
 def convert_input_paths_for_ffmpeg(
     input_paths,
     output_dir,
@@ -704,7 +714,7 @@ def convert_input_paths_for_ffmpeg(
 
     Args:
         input_paths (str): Paths that should be converted. It is expected that
-            contains single file or image sequence of samy type.
+            contains single file or image sequence of same type.
         output_dir (str): Path to directory where output will be rendered.
             Must not be same as input's directory.
         logger (logging.Logger): Logger used for logging.
@@ -761,7 +771,7 @@ def convert_input_paths_for_ffmpeg(
                 continue
 
             # Remove attributes that have string value longer than allowed
-            #   length for ffmpeg or when containing unallowed symbols
+            #   length for ffmpeg or when containing prohibited symbols
             erase_reason = "Missing reason"
             erase_attribute = False
             if len(attr_value) > MAX_FFMPEG_STRING_LEN:
@@ -1008,9 +1018,7 @@ def _ffmpeg_h264_codec_args(stream_data, source_ffmpeg_cmd):
     if pix_fmt:
         output.extend(["-pix_fmt", pix_fmt])
 
-    output.extend(["-intra"])
-    output.extend(["-g", "1"])
-
+    output.extend(["-intra", "-g", "1"])
     return output
 
 

From 8914ea0da998074d7cf1709af486e67c2ff8f90a Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 21 Nov 2023 17:09:23 +0100
Subject: [PATCH 27/80] return True if successful oiio conversion

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

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index 2215c94f42..a97ffdf569 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -235,7 +235,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             )
             return False
 
-        return dst_path
+        return True
 
     def create_thumbnail_ffmpeg(self, src_path, dst_path):
         self.log.debug("Extracting thumbnail with FFMPEG: {}".format(dst_path))

From e51ddf8682d3c85baaca89788ccddf796212eba1 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 22 Nov 2023 17:10:13 +0100
Subject: [PATCH 28/80] fixing situation where display and view are in
 representation

---
 openpype/plugins/publish/extract_thumbnail.py | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index a97ffdf569..c2d472b20a 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -206,25 +206,40 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         """
         self.log.info("Extracting thumbnail {}".format(dst_path))
 
+        repre_display = colorspace_data.get("display")
+        repre_view = colorspace_data.get("view")
         oiio_default_type = None
         oiio_default_display = None
         oiio_default_view = None
         oiio_default_colorspace = None
-        if self.oiiotool_defaults:
+        # first look into representation colorspaceData, perhaps it has
+        #   display and view
+        if not all([repre_display, repre_view]):
+            self.log.info(
+                "Using Display & View from "
+                "representation: '{} ({})'".format(
+                    repre_view,
+                    repre_display
+                )
+            )
+        # if representation doesn't have display and view then use
+        #   oiiotool_defaults
+        elif self.oiiotool_defaults:
             oiio_default_type = self.oiiotool_defaults["type"]
             if "colorspace" in oiio_default_type:
                 oiio_default_colorspace = self.oiiotool_defaults["colorspace"]
             else:
                 oiio_default_display = self.oiiotool_defaults["display"]
                 oiio_default_view = self.oiiotool_defaults["view"]
+
         try:
             convert_colorspace(
                 src_path,
                 dst_path,
                 colorspace_data["config"]["path"],
                 colorspace_data["colorspace"],
-                display=colorspace_data.get("display") or oiio_default_display,
-                view=colorspace_data.get("view") or oiio_default_view,
+                display=repre_display or oiio_default_display,
+                view=repre_view or oiio_default_view,
                 target_colorspace=oiio_default_colorspace,
                 logger=self.log,
             )

From 3833819557a768200fe8ffb6620261a0b9ad648b Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 23 Nov 2023 10:10:08 +0100
Subject: [PATCH 29/80] inverting bugged condition

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

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index c2d472b20a..3b829f19bd 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -214,7 +214,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         oiio_default_colorspace = None
         # first look into representation colorspaceData, perhaps it has
         #   display and view
-        if not all([repre_display, repre_view]):
+        if all([repre_display, repre_view]):
             self.log.info(
                 "Using Display & View from "
                 "representation: '{} ({})'".format(

From 44b4d04bbeb12029dd55ebac4c3b7c7e74a73dfb Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 23 Nov 2023 16:24:41 +0000
Subject: [PATCH 30/80] Added attributes to publisher and fixed chunk size

---
 .../publish/submit_blender_deadline.py        | 47 ++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index 094f2b1821..e1bf5c074a 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -6,8 +6,14 @@ import getpass
 import attr
 from datetime import datetime
 
-from openpype.lib import is_running_from_build
+from openpype.lib import (
+    is_running_from_build,
+    BoolDef,
+    NumberDef,
+    TextDef,
+)
 from openpype.pipeline import legacy_io
+from openpype.pipeline.publish import OpenPypePyblishPluginMixin
 from openpype.pipeline.farm.tools import iter_expected_files
 from openpype.tests.lib import is_in_tests
 
@@ -22,7 +28,8 @@ class BlenderPluginInfo():
     SaveFile = attr.ib(default=True)
 
 
-class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
+class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
+                            OpenPypePyblishPluginMixin):
     label = "Submit Render to Deadline"
     hosts = ["blender"]
     families = ["render.farm"]
@@ -67,8 +74,6 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
 
         job_info.Pool = instance.data.get("primaryPool")
         job_info.SecondaryPool = instance.data.get("secondaryPool")
-        job_info.Comment = context.data.get("comment")
-        job_info.Priority = instance.data.get("priority", self.priority)
 
         if self.group != "none" and self.group:
             job_info.Group = self.group
@@ -83,8 +88,9 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                 machine_list_key = "Blacklist"
             render_globals[machine_list_key] = machine_list
 
-        job_info.Priority = attr_values.get("priority")
-        job_info.ChunkSize = attr_values.get("chunkSize")
+        job_info.Comment = context.data.get("comment")
+        job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
+        job_info.Priority = attr_values.get("priority", self.priority)
 
         # Add options from RenderGlobals
         render_globals = instance.data.get("renderGlobals", {})
@@ -180,3 +186,32 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
         the metadata and the rendered files are in the same location.
         """
         return super().from_published_scene(False)
+
+    @classmethod
+    def get_attribute_defs(cls):
+        defs = super(BlenderSubmitDeadline, cls).get_attribute_defs()
+        defs.extend([
+            BoolDef("use_published",
+                    default=cls.use_published,
+                    label="Use Published Scene"),
+
+            NumberDef("priority",
+                      minimum=1,
+                      maximum=250,
+                      decimals=0,
+                      default=cls.priority,
+                      label="Priority"),
+
+            NumberDef("chunkSize",
+                      minimum=1,
+                      maximum=50,
+                      decimals=0,
+                      default=cls.chunk_size,
+                      label="Frame Per Task"),
+
+            TextDef("group",
+                    default=cls.group,
+                    label="Group Name"),
+        ])
+
+        return defs

From ee7bf575953fcfc29bb8bc1f56d2df418918830f Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 23 Nov 2023 16:25:22 +0000
Subject: [PATCH 31/80] Changed family for render

---
 openpype/hosts/blender/plugins/create/create_render.py   | 2 +-
 openpype/hosts/blender/plugins/publish/collect_render.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/blender/plugins/create/create_render.py b/openpype/hosts/blender/plugins/create/create_render.py
index 7fb3e5eb00..a643ccdaa3 100644
--- a/openpype/hosts/blender/plugins/create/create_render.py
+++ b/openpype/hosts/blender/plugins/create/create_render.py
@@ -10,7 +10,7 @@ class CreateRenderlayer(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.render"
     label = "Render"
-    family = "render"
+    family = "render.farm"
     icon = "eye"
 
     def create(
diff --git a/openpype/hosts/blender/plugins/publish/collect_render.py b/openpype/hosts/blender/plugins/publish/collect_render.py
index 00faf85aed..d1b1da5f4e 100644
--- a/openpype/hosts/blender/plugins/publish/collect_render.py
+++ b/openpype/hosts/blender/plugins/publish/collect_render.py
@@ -15,7 +15,7 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
 
     order = pyblish.api.CollectorOrder + 0.01
     hosts = ["blender"]
-    families = ["render"]
+    families = ["render.farm"]
     label = "Collect Render Layers"
     sync_workfile_version = False
 
@@ -101,7 +101,6 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
         expected_files = expected_beauty | expected_aovs
 
         instance.data.update({
-            "family": "render.farm",
             "frameStart": frame_start,
             "frameEnd": frame_end,
             "frameStartHandle": frame_handle_start,

From f40125d7b2a49cf35bc3e165a8c53102eca799eb Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 23 Nov 2023 16:25:57 +0000
Subject: [PATCH 32/80] Fixed problem when preparing rendering

---
 openpype/hosts/blender/api/render_lib.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index d564b5ebcb..646f87f9d7 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -1,4 +1,4 @@
-import os
+from pathlib import Path
 
 import bpy
 
@@ -59,7 +59,7 @@ def get_render_product(output_path, name, aov_sep):
         instance (pyblish.api.Instance): The instance to publish.
         ext (str): The image format to render.
     """
-    filepath = os.path.join(output_path, name)
+    filepath = output_path / name.relative_to(name.anchor)
     render_product = f"{filepath}{aov_sep}beauty.####"
     render_product = render_product.replace("\\", "/")
 
@@ -180,7 +180,7 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
         return []
 
     output.file_slots.clear()
-    output.base_path = output_path
+    output.base_path = str(output_path)
 
     aov_file_products = []
 
@@ -191,8 +191,9 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
 
         output.file_slots.new(filepath)
 
-        aov_file_products.append(
-            (render_pass.name, os.path.join(output_path, filepath)))
+        filename = output_path / filepath.relative_to(filepath.anchor)
+
+        aov_file_products.append((render_pass.name, filename))
 
         node_input = output.inputs[-1]
 
@@ -212,14 +213,13 @@ def imprint_render_settings(node, data):
 
 
 def prepare_rendering(asset_group):
-    name = asset_group.name
+    name = Path(asset_group.name)
 
-    filepath = bpy.data.filepath
+    filepath = Path(bpy.data.filepath)
     assert filepath, "Workfile not saved. Please save the file first."
 
-    file_path = os.path.dirname(filepath)
-    file_name = os.path.basename(filepath)
-    file_name, _ = os.path.splitext(file_name)
+    file_path = filepath.parent
+    file_name = Path(filepath.name).stem
 
     project = get_current_project_name()
     settings = get_project_settings(project)
@@ -232,11 +232,11 @@ def prepare_rendering(asset_group):
     set_render_format(ext, multilayer)
     aov_list, custom_passes = set_render_passes(settings)
 
-    output_path = os.path.join(file_path, render_folder, file_name)
+    output_path = Path.joinpath(file_path, render_folder, file_name)
 
     render_product = get_render_product(output_path, name, aov_sep)
     aov_file_product = set_node_tree(
-        output_path, name, aov_sep, ext, multilayer)
+        output_path, str(name), aov_sep, ext, multilayer)
 
     bpy.context.scene.render.filepath = render_product
 

From 714f66f7643d840f9dab44d49874cd7379cd44ce Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 10:44:10 +0000
Subject: [PATCH 33/80] Fixes and suggestions applied from comments

---
 openpype/hosts/blender/api/render_lib.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 646f87f9d7..22c51d664a 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -191,6 +191,7 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
 
         output.file_slots.new(filepath)
 
+        filepath = Path(filepath)
         filename = output_path / filepath.relative_to(filepath.anchor)
 
         aov_file_products.append((render_pass.name, filename))
@@ -213,12 +214,12 @@ def imprint_render_settings(node, data):
 
 
 def prepare_rendering(asset_group):
-    name = Path(asset_group.name)
+    name = asset_group.name
 
     filepath = Path(bpy.data.filepath)
     assert filepath, "Workfile not saved. Please save the file first."
 
-    file_path = filepath.parent
+    dirpath = filepath.parent
     file_name = Path(filepath.name).stem
 
     project = get_current_project_name()
@@ -232,11 +233,11 @@ def prepare_rendering(asset_group):
     set_render_format(ext, multilayer)
     aov_list, custom_passes = set_render_passes(settings)
 
-    output_path = Path.joinpath(file_path, render_folder, file_name)
+    output_path = Path.joinpath(dirpath, render_folder, file_name)
 
-    render_product = get_render_product(output_path, name, aov_sep)
+    render_product = get_render_product(output_path, Path(name), aov_sep)
     aov_file_product = set_node_tree(
-        output_path, str(name), aov_sep, ext, multilayer)
+        output_path, name, aov_sep, ext, multilayer)
 
     bpy.context.scene.render.filepath = render_product
 

From cc82e645c6b2210dccbc63fc63a6e6a56244bf3d Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 10:54:30 +0000
Subject: [PATCH 34/80] Fixed compatibility with old instances

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

diff --git a/openpype/hosts/blender/plugins/publish/collect_render.py b/openpype/hosts/blender/plugins/publish/collect_render.py
index d1b1da5f4e..4f23f30cc0 100644
--- a/openpype/hosts/blender/plugins/publish/collect_render.py
+++ b/openpype/hosts/blender/plugins/publish/collect_render.py
@@ -15,7 +15,7 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
 
     order = pyblish.api.CollectorOrder + 0.01
     hosts = ["blender"]
-    families = ["render.farm"]
+    families = ["render", "render.farm"]
     label = "Collect Render Layers"
     sync_workfile_version = False
 
@@ -101,6 +101,7 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
         expected_files = expected_beauty | expected_aovs
 
         instance.data.update({
+            "family": "render.farm",
             "frameStart": frame_start,
             "frameEnd": frame_end,
             "frameStartHandle": frame_handle_start,

From 75519b0a959f468d714f53bdcd7db2a57f75bfc1 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 12:19:59 +0000
Subject: [PATCH 35/80] Fix increment workfile for render.farm family

---
 .../hosts/blender/plugins/publish/increment_workfile_version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py
index 7e33fd53fa..9f8d20aedc 100644
--- a/openpype/hosts/blender/plugins/publish/increment_workfile_version.py
+++ b/openpype/hosts/blender/plugins/publish/increment_workfile_version.py
@@ -14,7 +14,7 @@ class IncrementWorkfileVersion(
     optional = True
     hosts = ["blender"]
     families = ["animation", "model", "rig", "action", "layout", "blendScene",
-                "pointcache", "render"]
+                "pointcache", "render.farm"]
 
     def process(self, context):
         if not self.is_active(context.data):

From 5162d8e4074ff46143558984f98283f5208720c4 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 12:20:38 +0000
Subject: [PATCH 36/80] Added Delay option

---
 .../deadline/plugins/publish/submit_blender_deadline.py     | 6 ++++++
 openpype/settings/defaults/project_settings/deadline.json   | 3 ++-
 .../schemas/projects_schema/schema_project_deadline.json    | 5 +++++
 server_addon/deadline/server/settings/publish_plugins.py    | 4 +++-
 server_addon/deadline/server/version.py                     | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index e1bf5c074a..4c04b4a9c4 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -40,6 +40,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
     jobInfo = {}
     pluginInfo = {}
     group = None
+    job_delay = "00:00:00:00"
 
     def get_job_info(self):
         job_info = DeadlineJobInfo(Plugin="Blender")
@@ -91,6 +92,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         job_info.Comment = context.data.get("comment")
         job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
         job_info.Priority = attr_values.get("priority", self.priority)
+        job_info.JobDelay = attr_values.get("job_delay", self.job_delay)
 
         # Add options from RenderGlobals
         render_globals = instance.data.get("renderGlobals", {})
@@ -212,6 +214,10 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             TextDef("group",
                     default=cls.group,
                     label="Group Name"),
+
+            TextDef("job_delay",
+                    default=cls.job_delay,
+                    label="Job Delay"),
         ])
 
         return defs
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index 2c5e0dc65d..50dd5367da 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -107,7 +107,8 @@
             "use_published": true,
             "priority": 50,
             "chunk_size": 10,
-            "group": "none"
+            "group": "none",
+            "job_delay": "00:00:00:00"
         },
         "ProcessSubmittedJobOnFarm": {
             "enabled": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 64db852c89..a3408e9871 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -581,6 +581,11 @@
                             "type": "text",
                             "key": "group",
                             "label": "Group Name"
+                        },
+                        {
+                            "type": "text",
+                            "key": "job_delay",
+                            "label": "Delay job (timecode dd:hh:mm:ss)"
                         }
                     ]
                 },
diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
index 54b7ff57c1..1d8b8c4eb2 100644
--- a/server_addon/deadline/server/settings/publish_plugins.py
+++ b/server_addon/deadline/server/settings/publish_plugins.py
@@ -237,6 +237,7 @@ class BlenderSubmitDeadlineModel(BaseSettingsModel):
     priority: int = Field(title="Priority")
     chunk_size: int = Field(title="Frame per Task")
     group: str = Field("", title="Group Name")
+    job_delay: str = Field("", title="Delay job (timecode dd:hh:mm:ss)")
 
 
 class AOVFilterSubmodel(BaseSettingsModel):
@@ -424,7 +425,8 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
         "use_published": True,
         "priority": 50,
         "chunk_size": 10,
-        "group": "none"
+        "group": "none",
+        "job_delay": "00:00:00:00"
     },
     "ProcessSubmittedJobOnFarm": {
         "enabled": True,
diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
index ae7362549b..bbab0242f6 100644
--- a/server_addon/deadline/server/version.py
+++ b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"

From 862cb05d2f5d358e7c62dde8637553191fbfe431 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 14:47:16 +0000
Subject: [PATCH 37/80] Get comment from instance

---
 .../modules/deadline/plugins/publish/submit_blender_deadline.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index 4c04b4a9c4..c5217b45f1 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -75,6 +75,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
         job_info.Pool = instance.data.get("primaryPool")
         job_info.SecondaryPool = instance.data.get("secondaryPool")
+        job_info.Comment = instance.data.get("comment")
 
         if self.group != "none" and self.group:
             job_info.Group = self.group
@@ -89,7 +90,6 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
                 machine_list_key = "Blacklist"
             render_globals[machine_list_key] = machine_list
 
-        job_info.Comment = context.data.get("comment")
         job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
         job_info.Priority = attr_values.get("priority", self.priority)
         job_info.JobDelay = attr_values.get("job_delay", self.job_delay)

From c3c9a93f50e4583e69bb3a0bd1c8948ebbacb8fd Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 14:54:37 +0000
Subject: [PATCH 38/80] Make clearer some path joins

---
 openpype/hosts/blender/api/render_lib.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 22c51d664a..1ab3b260bb 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -59,7 +59,7 @@ def get_render_product(output_path, name, aov_sep):
         instance (pyblish.api.Instance): The instance to publish.
         ext (str): The image format to render.
     """
-    filepath = output_path / name.relative_to(name.anchor)
+    filepath = output_path / name.lstrip("/")
     render_product = f"{filepath}{aov_sep}beauty.####"
     render_product = render_product.replace("\\", "/")
 
@@ -191,8 +191,7 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
 
         output.file_slots.new(filepath)
 
-        filepath = Path(filepath)
-        filename = output_path / filepath.relative_to(filepath.anchor)
+        filename = output_path / filepath.lstrip("/")
 
         aov_file_products.append((render_pass.name, filename))
 
@@ -235,7 +234,7 @@ def prepare_rendering(asset_group):
 
     output_path = Path.joinpath(dirpath, render_folder, file_name)
 
-    render_product = get_render_product(output_path, Path(name), aov_sep)
+    render_product = get_render_product(output_path, name, aov_sep)
     aov_file_product = set_node_tree(
         output_path, name, aov_sep, ext, multilayer)
 

From a35f9d935ea2de29ae8853006bb569097a3efc6b Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 15:37:27 +0000
Subject: [PATCH 39/80] Reverted family to render and fixed problems with
 family

---
 .../hosts/blender/plugins/create/create_render.py    |  2 +-
 .../hosts/blender/plugins/publish/collect_render.py  | 12 ++++--------
 .../plugins/publish/validate_deadline_publish.py     |  2 +-
 .../plugins/publish/submit_blender_deadline.py       |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/blender/plugins/create/create_render.py b/openpype/hosts/blender/plugins/create/create_render.py
index a643ccdaa3..7fb3e5eb00 100644
--- a/openpype/hosts/blender/plugins/create/create_render.py
+++ b/openpype/hosts/blender/plugins/create/create_render.py
@@ -10,7 +10,7 @@ class CreateRenderlayer(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.render"
     label = "Render"
-    family = "render.farm"
+    family = "render"
     icon = "eye"
 
     def create(
diff --git a/openpype/hosts/blender/plugins/publish/collect_render.py b/openpype/hosts/blender/plugins/publish/collect_render.py
index 4f23f30cc0..da02f99052 100644
--- a/openpype/hosts/blender/plugins/publish/collect_render.py
+++ b/openpype/hosts/blender/plugins/publish/collect_render.py
@@ -11,12 +11,12 @@ import pyblish.api
 
 
 class CollectBlenderRender(pyblish.api.InstancePlugin):
-    """Gather all publishable render layers from renderSetup."""
+    """Gather all publishable render instances."""
 
     order = pyblish.api.CollectorOrder + 0.01
     hosts = ["blender"]
-    families = ["render", "render.farm"]
-    label = "Collect Render Layers"
+    families = ["render"]
+    label = "Collect Render"
     sync_workfile_version = False
 
     @staticmethod
@@ -78,8 +78,6 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
 
         assert render_data, "No render data found."
 
-        self.log.debug(f"render_data: {dict(render_data)}")
-
         render_product = render_data.get("render_product")
         aov_file_product = render_data.get("aov_file_product")
         ext = render_data.get("image_format")
@@ -101,7 +99,7 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
         expected_files = expected_beauty | expected_aovs
 
         instance.data.update({
-            "family": "render.farm",
+            "families": ["render", "render.farm"],
             "frameStart": frame_start,
             "frameEnd": frame_end,
             "frameStartHandle": frame_handle_start,
@@ -120,5 +118,3 @@ class CollectBlenderRender(pyblish.api.InstancePlugin):
             "colorspaceView": "ACES 1.0 SDR-video",
             "renderProducts": colorspace.ARenderProduct(),
         })
-
-        self.log.debug(f"data: {instance.data}")
diff --git a/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py b/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
index d8826adc9c..bb243f08cc 100644
--- a/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
+++ b/openpype/hosts/blender/plugins/publish/validate_deadline_publish.py
@@ -19,7 +19,7 @@ class ValidateDeadlinePublish(pyblish.api.InstancePlugin,
     """
 
     order = ValidateContentsOrder
-    families = ["render.farm"]
+    families = ["render"]
     hosts = ["blender"]
     label = "Validate Render Output for Deadline"
     optional = True
diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index c5217b45f1..52a307646e 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -32,7 +32,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
                             OpenPypePyblishPluginMixin):
     label = "Submit Render to Deadline"
     hosts = ["blender"]
-    families = ["render.farm"]
+    families = ["render"]
 
     use_published = True
     priority = 50

From d1cf2e895fb23b247bb836a9762220af8e43bdcb Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 16:20:33 +0000
Subject: [PATCH 40/80] Fix problem with imprinting of data when saving render
 settings

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

diff --git a/openpype/hosts/blender/api/render_lib.py b/openpype/hosts/blender/api/render_lib.py
index 1ab3b260bb..b437078ad8 100644
--- a/openpype/hosts/blender/api/render_lib.py
+++ b/openpype/hosts/blender/api/render_lib.py
@@ -191,7 +191,7 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
 
         output.file_slots.new(filepath)
 
-        filename = output_path / filepath.lstrip("/")
+        filename = str(output_path / filepath.lstrip("/"))
 
         aov_file_products.append((render_pass.name, filename))
 

From 319109be593940d282d9beb56a26b70e0cd76ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Fri, 24 Nov 2023 17:47:23 +0100
Subject: [PATCH 41/80] :bug: fix issue with render sets collection and
 inventory action

---
 .../plugins/inventory/import_modelrender.py   | 11 ++----
 .../maya/plugins/publish/collect_look.py      | 39 +++++++++++++------
 openpype/pipeline/actions.py                  |  7 ++++
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/openpype/hosts/maya/plugins/inventory/import_modelrender.py b/openpype/hosts/maya/plugins/inventory/import_modelrender.py
index 4db8c4f2f6..3b30695146 100644
--- a/openpype/hosts/maya/plugins/inventory/import_modelrender.py
+++ b/openpype/hosts/maya/plugins/inventory/import_modelrender.py
@@ -33,7 +33,7 @@ class ImportModelRender(InventoryAction):
         )
 
     def process(self, containers):
-        from maya import cmds
+        from maya import cmds  # noqa: F401
 
         project_name = get_current_project_name()
         for container in containers:
@@ -66,7 +66,7 @@ class ImportModelRender(InventoryAction):
             None
         """
 
-        from maya import cmds
+        from maya import cmds  # noqa: F401
 
         project_name = get_current_project_name()
         repre_docs = get_representations(
@@ -85,12 +85,7 @@ class ImportModelRender(InventoryAction):
             if scene_type_regex.fullmatch(repre_name):
                 look_repres.append(repre_doc)
 
-        # QUESTION should we care if there is more then one look
-        #   representation? (since it's based on regex match)
-        look_repre = None
-        if look_repres:
-            look_repre = look_repres[0]
-
+        look_repre = look_repres[0] if look_repres else None
         # QUESTION shouldn't be json representation validated too?
         if not look_repre:
             print("No model render sets for this model version..")
diff --git a/openpype/hosts/maya/plugins/publish/collect_look.py b/openpype/hosts/maya/plugins/publish/collect_look.py
index 16ae20e0ae..a9e967a094 100644
--- a/openpype/hosts/maya/plugins/publish/collect_look.py
+++ b/openpype/hosts/maya/plugins/publish/collect_look.py
@@ -69,9 +69,7 @@ def get_attributes(dictionary, attr, node=None):
     else:
         val = dictionary.get(attr, [])
 
-    if not isinstance(val, list):
-        return [val]
-    return val
+    return val if isinstance(val, list) else [val]
 
 
 def get_look_attrs(node):
@@ -106,7 +104,7 @@ def get_look_attrs(node):
 
 
 def node_uses_image_sequence(node, node_path):
-    # type: (str) -> bool
+    # type: (str, str) -> bool
     """Return whether file node uses an image sequence or single image.
 
     Determine if a node uses an image sequence or just a single image,
@@ -114,6 +112,7 @@ def node_uses_image_sequence(node, node_path):
 
     Args:
         node (str): Name of the Maya node
+        node_path (str): The file path of the node
 
     Returns:
         bool: True if node uses an image sequence
@@ -247,7 +246,7 @@ def get_file_node_files(node):
 
     # For sequences get all files and filter to only existing files
     result = []
-    for index, path in enumerate(paths):
+    for path in paths:
         if node_uses_image_sequence(node, path):
             glob_pattern = seq_to_glob(path)
             result.extend(glob.glob(glob_pattern))
@@ -358,6 +357,11 @@ class CollectLook(pyblish.api.InstancePlugin):
                 for attr in shader_attrs:
                     if cmds.attributeQuery(attr, node=look, exists=True):
                         existing_attrs.append("{}.{}".format(look, attr))
+
+            print("-"*100)
+            print("existing_attrs: {}".format(existing_attrs))
+            print("-"*100)
+
             materials = cmds.listConnections(existing_attrs,
                                              source=True,
                                              destination=False) or []
@@ -377,13 +381,24 @@ class CollectLook(pyblish.api.InstancePlugin):
             # connected to the look sets above we now add direct history
             # for some of the look sets directly
             # handling render attribute sets
-            render_set_types = [
-                "VRayDisplacement",
-                "VRayLightMesh",
-                "VRayObjectProperties",
-                "RedshiftObjectId",
-                "RedshiftMeshParameters",
-            ]
+
+            # this needs to be done like this now, because Maya
+            # (at least 2024) crashes with Warning when render set type
+            # isn't available. cmds.ls() will return empty list
+            render_set_types = []
+            if cmds.pluginInfo("vrayformaya", query=True, loaded=True):
+                render_set_types += [
+                    "VRayDisplacement",
+                    "VRayLightMesh",
+                    "VRayObjectProperties",
+                ]
+
+            if cmds.pluginInfo("redshift4maya", query=True, loaded=True):
+                render_set_types += [
+                    "RedshiftObjectId",
+                    "RedshiftMeshParameters",
+                ]
+
             render_sets = cmds.ls(look_sets, type=render_set_types)
             if render_sets:
                 history.extend(
diff --git a/openpype/pipeline/actions.py b/openpype/pipeline/actions.py
index feb1bd05d2..d89e2096ef 100644
--- a/openpype/pipeline/actions.py
+++ b/openpype/pipeline/actions.py
@@ -7,6 +7,8 @@ from openpype.pipeline.plugin_discover import (
     deregister_plugin_path
 )
 
+from .load.utils import get_representation_path_from_context
+
 
 class LauncherAction(object):
     """A custom action available"""
@@ -100,6 +102,11 @@ class InventoryAction(object):
         """
         return True
 
+    @classmethod
+    def filepath_from_context(cls, context):
+        return get_representation_path_from_context(context)
+
+
 
 # Launcher action
 def discover_launcher_actions():

From 6b4d0487acea25c67c1b4d1d64dfbd2e63fb7308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Fri, 24 Nov 2023 17:48:22 +0100
Subject: [PATCH 42/80] :dog: remove debug prints

---
 openpype/hosts/maya/plugins/publish/collect_look.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/collect_look.py b/openpype/hosts/maya/plugins/publish/collect_look.py
index a9e967a094..11e87a8295 100644
--- a/openpype/hosts/maya/plugins/publish/collect_look.py
+++ b/openpype/hosts/maya/plugins/publish/collect_look.py
@@ -358,10 +358,6 @@ class CollectLook(pyblish.api.InstancePlugin):
                     if cmds.attributeQuery(attr, node=look, exists=True):
                         existing_attrs.append("{}.{}".format(look, attr))
 
-            print("-"*100)
-            print("existing_attrs: {}".format(existing_attrs))
-            print("-"*100)
-
             materials = cmds.listConnections(existing_attrs,
                                              source=True,
                                              destination=False) or []

From 97533ea25a02992ec0e674e3792cf255372b65d1 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Sat, 25 Nov 2023 03:25:28 +0000
Subject: [PATCH 43/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 89067af269..a54f88871a 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.17.7-nightly.2"
+__version__ = "3.17.7-nightly.3"

From ddefee8f0e05320ea9c3d8a5d63d196517db747b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Nov 2023 03:26:09 +0000
Subject: [PATCH 44/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 e2afcdaac7..f59eb1edb1 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.17.7-nightly.3
         - 3.17.7-nightly.2
         - 3.17.7-nightly.1
         - 3.17.6
@@ -134,7 +135,6 @@ body:
         - 3.15.2-nightly.6
         - 3.15.2-nightly.5
         - 3.15.2-nightly.4
-        - 3.15.2-nightly.3
     validations:
       required: true
   - type: dropdown

From 12c8e9852c58011acf86e923276a0b946f14c9ea Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 27 Nov 2023 17:29:10 +0800
Subject: [PATCH 45/80] make sure basename of the filenames for 'files' in
 representation

---
 .../hosts/maya/plugins/publish/extract_redshift_proxy.py     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py b/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
index 3868270b79..d601267802 100644
--- a/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
+++ b/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
@@ -50,11 +50,12 @@ class ExtractRedshiftProxy(publish.Extractor):
             # Padding is taken from number of digits of the end_frame.
             # Not sure where Redshift is taking it.
             repr_files = [
-                "{}.{}{}".format(root, str(frame).rjust(4, "0"), ext)  # noqa: E501
+                "{}.{}{}".format(
+                    os.path.basename(root), str(frame).rjust(4, "0"), ext) # noqa: E501
                 for frame in range(
                     int(start_frame),
                     int(end_frame) + 1,
-                    int(instance.data["step"]),
+                    int(instance.data["step"])
             )]
         # vertex_colors = instance.data.get("vertexColors", False)
 

From 90a62c35dcde56f68a9149d6aae45fde11a998e3 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 27 Nov 2023 17:32:21 +0800
Subject: [PATCH 46/80] hound

---
 openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py b/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
index d601267802..67533cad35 100644
--- a/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
+++ b/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
@@ -50,8 +50,7 @@ class ExtractRedshiftProxy(publish.Extractor):
             # Padding is taken from number of digits of the end_frame.
             # Not sure where Redshift is taking it.
             repr_files = [
-                "{}.{}{}".format(
-                    os.path.basename(root), str(frame).rjust(4, "0"), ext) # noqa: E501
+                "{}.{}{}".format(os.path.basename(root), str(frame).rjust(4, "0"), ext) # noqa: E501
                 for frame in range(
                     int(start_frame),
                     int(end_frame) + 1,

From de572f59f9d67a9c1e4b7407776d088fb15b9a11 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 27 Nov 2023 17:33:28 +0800
Subject: [PATCH 47/80] hound

---
 openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py b/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
index 67533cad35..7fc8760a70 100644
--- a/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
+++ b/openpype/hosts/maya/plugins/publish/extract_redshift_proxy.py
@@ -50,7 +50,7 @@ class ExtractRedshiftProxy(publish.Extractor):
             # Padding is taken from number of digits of the end_frame.
             # Not sure where Redshift is taking it.
             repr_files = [
-                "{}.{}{}".format(os.path.basename(root), str(frame).rjust(4, "0"), ext) # noqa: E501
+                "{}.{}{}".format(os.path.basename(root), str(frame).rjust(4, "0"), ext)     # noqa: E501
                 for frame in range(
                     int(start_frame),
                     int(end_frame) + 1,

From 1d885222870b8ebf1f7f92f3d162ab2d666b1315 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 27 Nov 2023 18:39:09 +0800
Subject: [PATCH 48/80] make sure default shader connection validator not
 checking when the maya version is 2024

---
 .../publish/validate_look_default_shaders_connections.py      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
index 0109f6ebd5..464c3facc2 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
@@ -45,6 +45,10 @@ class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin):
 
         # Process as usual
         invalid = list()
+        if int(cmds.about(version=True)) >= 2024:
+            self.log.debug("IntialShadingGroup no longer connected to the default shader"
+                           " in Maya 2024. Skipping Look Default Shader Connections..")
+            return
         for plug, input_node in self.DEFAULTS:
             inputs = cmds.listConnections(plug,
                                           source=True,

From d0a423423ca8e88a40a1d4b5dfcbbd206cbe9da5 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 27 Nov 2023 18:44:14 +0800
Subject: [PATCH 49/80] hound

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

diff --git a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
index 464c3facc2..69a2081689 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
@@ -46,8 +46,9 @@ class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin):
         # Process as usual
         invalid = list()
         if int(cmds.about(version=True)) >= 2024:
-            self.log.debug("IntialShadingGroup no longer connected to the default shader"
-                           " in Maya 2024. Skipping Look Default Shader Connections..")
+            self.log.debug("IntialShadingGroup no longer "
+                           "connected to the default shader in Maya 2024"
+                           "Skipping Look Default Shader Connections..")
             return
         for plug, input_node in self.DEFAULTS:
             inputs = cmds.listConnections(plug,

From c7529c2b56967bc2c6dc92470224b4bee4952c52 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 27 Nov 2023 21:58:37 +0800
Subject: [PATCH 50/80] get the logic from the colorbleed's branch. thanks for
 @BigRoy contribution

---
 ...lidate_look_default_shaders_connections.py | 83 +++++++++++--------
 1 file changed, 47 insertions(+), 36 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
index 69a2081689..c3edf5f1c3 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py
@@ -3,65 +3,76 @@ from maya import cmds
 import pyblish.api
 from openpype.pipeline.publish import (
     ValidateContentsOrder,
+    RepairContextAction,
     PublishValidationError
 )
 
 
-class ValidateLookDefaultShadersConnections(pyblish.api.InstancePlugin):
+class ValidateLookDefaultShadersConnections(pyblish.api.ContextPlugin):
     """Validate default shaders in the scene have their default connections.
 
-    For example the lambert1 could potentially be disconnected from the
-    initialShadingGroup. As such it's not lambert1 that will be identified
-    as the default shader which can have unpredictable results.
+    For example the standardSurface1 or lambert1 (maya 2023 and before) could
+    potentially be disconnected from the initialShadingGroup. As such it's not
+    lambert1 that will be identified as the default shader which can have
+    unpredictable results.
 
     To fix the default connections need to be made again. See the logs for
     more details on which connections are missing.
 
     """
 
-    order = ValidateContentsOrder
+    order = pyblish.api.ValidatorOrder - 0.4999
     families = ['look']
     hosts = ['maya']
     label = 'Look Default Shader Connections'
+    actions = [RepairContextAction]
 
     # The default connections to check
-    DEFAULTS = [("initialShadingGroup.surfaceShader", "lambert1"),
-                ("initialParticleSE.surfaceShader", "lambert1"),
-                ("initialParticleSE.volumeShader", "particleCloud1")
-                ]
+    DEFAULTS = {
+        "initialShadingGroup.surfaceShader": ["standardSurface1.outColor",
+                                              "lambert1.outColor"],
+        "initialParticleSE.surfaceShader": ["standardSurface1.outColor",
+                                            "lambert1.outColor"],
+        "initialParticleSE.volumeShader": ["particleCloud1.outColor"]
+    }
 
-    def process(self, instance):
+    def process(self, context):
 
-        # Ensure check is run only once. We don't use ContextPlugin because
-        # of a bug where the ContextPlugin will always be visible. Even when
-        # the family is not present in an instance.
-        key = "__validate_look_default_shaders_connections_checked"
-        context = instance.context
-        is_run = context.data.get(key, False)
-        if is_run:
-            return
-        else:
-            context.data[key] = True
+        if self.get_invalid():
+            raise PublishValidationError(
+                "Default shaders in your scene do not have their "
+                "default shader connections. Please repair them to continue."
+            )
+
+    @classmethod
+    def get_invalid(cls):
 
         # Process as usual
         invalid = list()
-        if int(cmds.about(version=True)) >= 2024:
-            self.log.debug("IntialShadingGroup no longer "
-                           "connected to the default shader in Maya 2024"
-                           "Skipping Look Default Shader Connections..")
-            return
-        for plug, input_node in self.DEFAULTS:
+        for plug, valid_inputs in cls.DEFAULTS.items():
             inputs = cmds.listConnections(plug,
                                           source=True,
-                                          destination=False) or None
-
-            if not inputs or inputs[0] != input_node:
-                self.log.error("{0} is not connected to {1}. "
-                               "This can result in unexpected behavior. "
-                               "Please reconnect to continue.".format(
-                                plug,
-                                input_node))
+                                          destination=False,
+                                          plugs=True) or None
+            if not inputs or inputs[0] not in valid_inputs:
+                cls.log.error(
+                    "{0} is not connected to {1}. This can result in "
+                    "unexpected behavior. Please reconnect to continue."
+                    "".format(plug, " or ".join(valid_inputs))
+                )
                 invalid.append(plug)
 
-        if invalid:
-            raise PublishValidationError("Invalid connections.")
+        return invalid
+
+    @classmethod
+    def repair(cls, context):
+        invalid = cls.get_invalid()
+        for plug in invalid:
+            valid_inputs = cls.DEFAULTS[plug]
+            for valid_input in valid_inputs:
+                if cmds.objExists(valid_input):
+                    cls.log.info(
+                        "Connecting {} -> {}".format(valid_input, plug)
+                    )
+                    cmds.connectAttr(valid_input, plug, force=True)
+                    break

From 7146b7b7848c666a69efef2b0c4e164ae9cfde78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Mon, 27 Nov 2023 16:42:31 +0100
Subject: [PATCH 51/80] Update openpype/plugins/publish/extract_thumbnail.py

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

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index 3b829f19bd..c6112b3cdf 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -25,7 +25,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
     hosts = ["shell", "fusion", "resolve", "traypublisher", "substancepainter"]
     enabled = False
 
-    # presentable attribute
+    # attribute presets from settings
     oiiotool_defaults = None
     ffmpeg_args = None
 

From 02342c864ddd62654699ae4351aeb9e76637bdef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Mon, 27 Nov 2023 17:19:09 +0100
Subject: [PATCH 52/80] :recycle: filter render set types

---
 .../maya/plugins/publish/collect_look.py      | 53 +++++++++----------
 openpype/pipeline/actions.py                  |  1 -
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/collect_look.py b/openpype/hosts/maya/plugins/publish/collect_look.py
index 11e87a8295..72682f7800 100644
--- a/openpype/hosts/maya/plugins/publish/collect_look.py
+++ b/openpype/hosts/maya/plugins/publish/collect_look.py
@@ -45,11 +45,23 @@ FILE_NODES = {
     "PxrTexture": "filename"
 }
 
+RENDER_SET_TYPES = [
+    "VRayDisplacement",
+    "VRayLightMesh",
+    "VRayObjectProperties",
+    "RedshiftObjectId",
+    "RedshiftMeshParameters",
+]
+
 # Keep only node types that actually exist
 all_node_types = set(cmds.allNodeTypes())
 for node_type in list(FILE_NODES.keys()):
     if node_type not in all_node_types:
         FILE_NODES.pop(node_type)
+
+for node_type in RENDER_SET_TYPES:
+    if node_type not in all_node_types:
+        RENDER_SET_TYPES.remove(node_type)
 del all_node_types
 
 # Cache pixar dependency node types so we can perform a type lookup against it
@@ -369,43 +381,30 @@ class CollectLook(pyblish.api.InstancePlugin):
             # history = cmds.listHistory(look_sets, allConnections=True)
             # if materials list is empty, listHistory() will crash with
             # RuntimeError
-            history = []
+            history = set()
             if materials:
-                history = cmds.listHistory(materials, allConnections=True)
+                history = set(
+                    cmds.listHistory(materials, allConnections=True))
 
             # Since we retrieved history only of the connected materials
             # connected to the look sets above we now add direct history
             # for some of the look sets directly
             # handling render attribute sets
 
-            # this needs to be done like this now, because Maya
-            # (at least 2024) crashes with Warning when render set type
+            # Maya (at least 2024) crashes with Warning when render set type
             # isn't available. cmds.ls() will return empty list
-            render_set_types = []
-            if cmds.pluginInfo("vrayformaya", query=True, loaded=True):
-                render_set_types += [
-                    "VRayDisplacement",
-                    "VRayLightMesh",
-                    "VRayObjectProperties",
-                ]
-
-            if cmds.pluginInfo("redshift4maya", query=True, loaded=True):
-                render_set_types += [
-                    "RedshiftObjectId",
-                    "RedshiftMeshParameters",
-                ]
-
-            render_sets = cmds.ls(look_sets, type=render_set_types)
-            if render_sets:
-                history.extend(
-                    cmds.listHistory(render_sets,
-                                     future=False,
-                                     pruneDagObjects=True)
-                    or []
-                )
+            if RENDER_SET_TYPES:
+                render_sets = cmds.ls(look_sets, type=RENDER_SET_TYPES)
+                if render_sets:
+                    history.update(
+                        cmds.listHistory(render_sets,
+                                         future=False,
+                                         pruneDagObjects=True)
+                        or []
+                    )
 
             # Ensure unique entries only
-            history = list(set(history))
+            history = list(history)
 
             files = cmds.ls(history,
                             # It's important only node types are passed that
diff --git a/openpype/pipeline/actions.py b/openpype/pipeline/actions.py
index d89e2096ef..68533f7485 100644
--- a/openpype/pipeline/actions.py
+++ b/openpype/pipeline/actions.py
@@ -107,7 +107,6 @@ class InventoryAction(object):
         return get_representation_path_from_context(context)
 
 
-
 # Launcher action
 def discover_launcher_actions():
     return discover(LauncherAction)

From efff32392375e8712ecc7f561e5a59f8893680ef Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 28 Nov 2023 11:02:47 +0100
Subject: [PATCH 53/80] Harmony: Fix local rendering (#5953)

* Fix local rendering

It was throwing licence issue, but didn't produce anything.

* Commenting out proto line

This seems to be more stable in showing Openpype menu.
For unknown reason menu creation started to fail to show up, this line caused crashes when this script was triggered manually inside of Harmony.
---
 openpype/hosts/harmony/api/TB_sceneOpened.js             | 2 +-
 openpype/hosts/harmony/plugins/publish/extract_render.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/harmony/api/TB_sceneOpened.js b/openpype/hosts/harmony/api/TB_sceneOpened.js
index a284a6ec5c..48daf094dd 100644
--- a/openpype/hosts/harmony/api/TB_sceneOpened.js
+++ b/openpype/hosts/harmony/api/TB_sceneOpened.js
@@ -13,7 +13,7 @@ var LD_OPENHARMONY_PATH = System.getenv('LIB_OPENHARMONY_PATH');
 LD_OPENHARMONY_PATH = LD_OPENHARMONY_PATH + '/openHarmony.js';
 LD_OPENHARMONY_PATH = LD_OPENHARMONY_PATH.replace(/\\/g, "/");
 include(LD_OPENHARMONY_PATH);
-this.__proto__['$'] = $;
+//this.__proto__['$'] = $;
 
 function Client() {
     var self = this;
diff --git a/openpype/hosts/harmony/plugins/publish/extract_render.py b/openpype/hosts/harmony/plugins/publish/extract_render.py
index 5825d95a4a..96a375716b 100644
--- a/openpype/hosts/harmony/plugins/publish/extract_render.py
+++ b/openpype/hosts/harmony/plugins/publish/extract_render.py
@@ -59,8 +59,8 @@ class ExtractRender(pyblish.api.InstancePlugin):
 
         args = [application_path, "-batch",
                 "-frames", str(frame_start), str(frame_end),
-                "-scene", scene_path]
-        self.log.info(f"running [ {application_path} {' '.join(args)}")
+                scene_path]
+        self.log.info(f"running: {' '.join(args)}")
         proc = subprocess.Popen(
             args,
             stdout=subprocess.PIPE,

From 74566d8e07a6bfb89042f687b13151e7c47cc810 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Tue, 28 Nov 2023 21:32:37 +0800
Subject: [PATCH 54/80] add label to MayaUSDReferenceLoader

---
 openpype/hosts/maya/plugins/load/load_reference.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/hosts/maya/plugins/load/load_reference.py b/openpype/hosts/maya/plugins/load/load_reference.py
index 0d7f08d3c3..a4ab6c79c1 100644
--- a/openpype/hosts/maya/plugins/load/load_reference.py
+++ b/openpype/hosts/maya/plugins/load/load_reference.py
@@ -265,6 +265,7 @@ class ReferenceLoader(openpype.hosts.maya.api.plugin.ReferenceLoader):
 class MayaUSDReferenceLoader(ReferenceLoader):
     """Reference USD file to native Maya nodes using MayaUSDImport reference"""
 
+    label = "Reference Maya USD"
     families = ["usd"]
     representations = ["usd"]
     extensions = {"usd", "usda", "usdc"}

From 497e3ec9624e3d8090c9fa16caa49b1ab5a8c7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Tue, 28 Nov 2023 21:32:42 +0100
Subject: [PATCH 55/80] Update openpype/hosts/resolve/api/plugin.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 openpype/hosts/resolve/api/plugin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 9f1d8fc1c7..2f1f4d3545 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -439,10 +439,10 @@ class ClipLoader:
         source_with_handles = True
         # make sure all frame data is available
         if (
-            frame_start is None or
-            frame_end is None or
-            handle_start == 0 or
-            handle_end == 0
+            frame_start is None
+            or frame_end is None
+            or handle_start == 0
+            or handle_end == 0
         ):
             # if not then rather assume that source has no handles
             source_with_handles = False

From 7c25e4a664fc062b581ee183329d2811f784ec7c Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 28 Nov 2023 21:49:05 +0100
Subject: [PATCH 56/80] fixing the logic from @bigroy

https://github.com/ynput/OpenPype/pull/5863/files#r1381847587
---
 openpype/hosts/resolve/api/plugin.py | 83 ++++++++++------------------
 1 file changed, 28 insertions(+), 55 deletions(-)

diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 2f1f4d3545..a00933405f 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -410,56 +410,38 @@ class ClipLoader:
         source_out = int(_clip_property("End"))
         source_duration = int(_clip_property("Frames"))
 
-        # get version data frame data from db
-        version_data = self.data["versionData"]
-        frame_start = version_data.get("frameStart")
-        frame_end = version_data.get("frameEnd")
-
-        if self.with_handles:
-            handle_start = version_data.get("handleStart") or 0
-            handle_end = version_data.get("handleEnd") or 0
-        else:
+        if not self.with_handles:
+            # Load file without the handles of the source media
+            # We remove the handles from the source in and source out
+            # so that the handles are excluded in the timeline
             handle_start = 0
             handle_end = 0
 
-        """
-        There are cases where representation could be published without
-        handles if the "Extract review output tags" is set to "no_handles".
-        This would result in a shorter source duration compared to the
-        db frame-range. In such cases, we need to assume that the source
-        has no handles.
+            # get version data frame data from db
+            version_data = self.data["versionData"]
+            frame_start = version_data.get("frameStart")
+            frame_end = version_data.get("frameEnd")
 
-        To address this, we should compare the duration of the source
-        frame with the db frame-range. The duration of the db frame-range
-        should be calculated from the version data. If, for any reason,
-        the frame data is missing in the version data, we should again
-        assume that the source has no handles.
-        """
-        # check if source duration is shorter than db frame duration
-        source_with_handles = True
-        # make sure all frame data is available
-        if (
-            frame_start is None
-            or frame_end is None
-            or handle_start == 0
-            or handle_end == 0
-        ):
-            # if not then rather assume that source has no handles
-            source_with_handles = False
-        else:
-            # calculate db frame duration
-            db_frame_duration = (
-                # include handles
-                int(handle_start) + int(handle_end) +
-                # include frame duration
-                (int(frame_end) - int(frame_start) + 1)
-            )
-
-            # compare source duration with db frame duration
-            # and assume that source has no handles if source duration
-            # is shorter than db frame duration
-            if source_duration < db_frame_duration:
-                source_with_handles = False
+            # The version data usually stored the frame range + handles of the
+            # media however certain representations may be shorter because they
+            # exclude those handles intentionally. Unfortunately the
+            # representation does not store that in the database currently;
+            # so we should compensate for those cases. If the media is shorter
+            # than the frame range specified in the database we assume it is
+            # without handles and thus we do not need to remove the handles
+            # from source and out
+            if frame_start is not None and frame_end is not None:
+                # Version has frame range data, so we can compare media length
+                handle_start = version_data.get("handleStart", 0)
+                handle_end = version_data.get("handleEnd", 0)
+                frame_start_handle = frame_start - handle_start
+                frame_end_handle = frame_start + handle_end
+                database_frame_duration = int(
+                    frame_end_handle - frame_start_handle + 1
+                )
+                if source_duration >= database_frame_duration:
+                    source_in += handle_start
+                    source_out -= handle_end
 
         # get timeline in
         timeline_start = self.active_timeline.GetStartFrame()
@@ -471,15 +453,6 @@ class ClipLoader:
             timeline_in = int(
                 timeline_start + self.data["assetData"]["clipIn"])
 
-        # only exclude handles if source has no handles or
-        # if user wants to load without handles
-        if (
-            not self.with_handles  # set by user
-            or not source_with_handles  # result of source duration check
-        ):
-            source_in += handle_start
-            source_out -= handle_end
-
         # make track item from source in bin as item
         timeline_item = lib.create_timeline_item(
             media_pool_item,

From 6224d01059e549ec0b932546688a4508434a124a Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Wed, 29 Nov 2023 03:25:40 +0000
Subject: [PATCH 57/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 a54f88871a..c1c33c0f65 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.17.7-nightly.3"
+__version__ = "3.17.7-nightly.4"

From 90e75b4d7150ef176bc47b8f0e961731de1a820e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 03:26:15 +0000
Subject: [PATCH 58/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 f59eb1edb1..60ad923546 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.17.7-nightly.4
         - 3.17.7-nightly.3
         - 3.17.7-nightly.2
         - 3.17.7-nightly.1
@@ -134,7 +135,6 @@ body:
         - 3.15.2
         - 3.15.2-nightly.6
         - 3.15.2-nightly.5
-        - 3.15.2-nightly.4
     validations:
       required: true
   - type: dropdown

From d4afd11241583c6e1d7c568c399a0b3ef3c9bd1f Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Wed, 29 Nov 2023 09:48:41 +0100
Subject: [PATCH 59/80] Added placeholder and tooltip for delay attribute

---
 .../deadline/plugins/publish/submit_blender_deadline.py      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index 52a307646e..b5c3944891 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -217,7 +217,10 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
             TextDef("job_delay",
                     default=cls.job_delay,
-                    label="Job Delay"),
+                    label="Job Delay",
+                    placeholder="dd:hh:mm:ss",
+                    tooltip="Delay the job by the specified amount of time. "
+                            "Timecode: dd:hh:mm:ss."),
         ])
 
         return defs

From 1abbee13a00af40e288d4bb0d60e9a6420cd636d Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Wed, 29 Nov 2023 10:40:02 +0100
Subject: [PATCH 60/80] Fix missing ScheduledType

---
 .../modules/deadline/plugins/publish/submit_blender_deadline.py  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index b5c3944891..8f9e9a7425 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -92,6 +92,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
         job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
         job_info.Priority = attr_values.get("priority", self.priority)
+        job_info.ScheduledType = "Once"
         job_info.JobDelay = attr_values.get("job_delay", self.job_delay)
 
         # Add options from RenderGlobals

From 955a6e22538657395b076e3d660b3ae9312b5b99 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 29 Nov 2023 16:48:22 +0100
Subject: [PATCH 61/80] make sure single entity id changes thumbnail id only
 once in operations

---
 .../publish/integrate_thumbnail_ayon.py       | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/openpype/plugins/publish/integrate_thumbnail_ayon.py b/openpype/plugins/publish/integrate_thumbnail_ayon.py
index f9b48eebec..f5a2b3feaa 100644
--- a/openpype/plugins/publish/integrate_thumbnail_ayon.py
+++ b/openpype/plugins/publish/integrate_thumbnail_ayon.py
@@ -157,8 +157,8 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
     ):
         from openpype.client.server.operations import create_thumbnail
 
-        op_session = OperationsSession()
-
+        # Make sure each entity id has defined only one thumbnail id
+        thumbnail_info_by_entity_id = {}
         for instance_item in filtered_instance_items:
             instance, thumbnail_path, version_id = instance_item
             instance_label = self._get_instance_label(instance)
@@ -172,12 +172,10 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
             thumbnail_id = create_thumbnail(project_name, thumbnail_path)
 
             # Set thumbnail id for version
-            op_session.update_entity(
-                project_name,
-                version_doc["type"],
-                version_doc["_id"],
-                {"data.thumbnail_id": thumbnail_id}
-            )
+            thumbnail_info_by_entity_id[version_id] = {
+                "thumbnail_id": thumbnail_id,
+                "entity_type": version_doc["type"],
+            }
             if version_doc["type"] == "hero_version":
                 version_name = "Hero"
             else:
@@ -187,16 +185,23 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
             ))
 
             asset_entity = instance.data["assetEntity"]
-            op_session.update_entity(
-                project_name,
-                asset_entity["type"],
-                asset_entity["_id"],
-                {"data.thumbnail_id": thumbnail_id}
-            )
+            thumbnail_info_by_entity_id[asset_entity["_id"]] = {
+                "thumbnail_id": thumbnail_id,
+                "entity_type": "asset",
+            }
             self.log.debug("Setting thumbnail for asset \"{}\" <{}>".format(
                 asset_entity["name"], version_id
             ))
 
+        op_session = OperationsSession()
+        for entity_id, thumbnail_info in thumbnail_info_by_entity_id.items():
+            thumbnail_id = thumbnail_info["thumbnail_id"]
+            op_session.update_entity(
+                project_name,
+                thumbnail_info["entity_type"],
+                entity_id,
+                {"data.thumbnail_id": thumbnail_id}
+            )
         op_session.commit()
 
     def _get_instance_label(self, instance):

From e6d3e888c68dfe13ef11a1ef48a3267716260749 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 30 Nov 2023 18:06:33 +0800
Subject: [PATCH 62/80] make sure the menu is named AYON when AYON launches

---
 openpype/hosts/max/api/menu.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/max/api/menu.py b/openpype/hosts/max/api/menu.py
index 364f9cd5c5..7869433148 100644
--- a/openpype/hosts/max/api/menu.py
+++ b/openpype/hosts/max/api/menu.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-"""3dsmax menu definition of OpenPype."""
+"""3dsmax menu definition of OpenPype/AYON."""
+import os
 from qtpy import QtWidgets, QtCore
 from pymxs import runtime as rt
 
@@ -8,7 +9,7 @@ from openpype.hosts.max.api import lib
 
 
 class OpenPypeMenu(object):
-    """Object representing OpenPype menu.
+    """Object representing OpenPype/AYON menu.
 
     This is using "hack" to inject itself before "Help" menu of 3dsmax.
     For some reason `postLoadingMenus` event doesn't fire, and main menu
@@ -50,17 +51,17 @@ class OpenPypeMenu(object):
         return list(self.main_widget.findChildren(QtWidgets.QMenuBar))[0]
 
     def get_or_create_openpype_menu(
-            self, name: str = "&OpenPype",
+            self, name: str = "&Openpype",
             before: str = "&Help") -> QtWidgets.QAction:
-        """Create OpenPype menu.
+        """Create AYON menu.
 
         Args:
-            name (str, Optional): OpenPypep menu name.
+            name (str, Optional): Openpype/AYON menu name.
             before (str, Optional): Name of the 3dsmax main menu item to
-                add OpenPype menu before.
+                add Openpype/AYON menu before.
 
         Returns:
-            QtWidgets.QAction: OpenPype menu action.
+            QtWidgets.QAction: Openpype/AYON menu action.
 
         """
         if self.menu is not None:
@@ -77,15 +78,15 @@ class OpenPypeMenu(object):
 
             if before in item.title():
                 help_action = item.menuAction()
-
-        op_menu = QtWidgets.QMenu("&OpenPype")
+        tab_menu_label = os.environ.get("AVALON_LABEL") or "AYON"
+        op_menu = QtWidgets.QMenu("&{}".format(tab_menu_label))
         menu_bar.insertMenu(help_action, op_menu)
 
         self.menu = op_menu
         return op_menu
 
     def build_openpype_menu(self) -> QtWidgets.QAction:
-        """Build items in OpenPype menu."""
+        """Build items in AYON menu."""
         openpype_menu = self.get_or_create_openpype_menu()
         load_action = QtWidgets.QAction("Load...", openpype_menu)
         load_action.triggered.connect(self.load_callback)

From fd82f858bdd16a76d3922f231eb47076c1e05602 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 30 Nov 2023 18:14:16 +0800
Subject: [PATCH 63/80] cosmetic fix in docstring

---
 openpype/hosts/max/api/menu.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/max/api/menu.py b/openpype/hosts/max/api/menu.py
index 7869433148..869f74c97e 100644
--- a/openpype/hosts/max/api/menu.py
+++ b/openpype/hosts/max/api/menu.py
@@ -56,12 +56,12 @@ class OpenPypeMenu(object):
         """Create AYON menu.
 
         Args:
-            name (str, Optional): Openpype/AYON menu name.
+            name (str, Optional): AYON menu name.
             before (str, Optional): Name of the 3dsmax main menu item to
-                add Openpype/AYON menu before.
+                add AYON menu before.
 
         Returns:
-            QtWidgets.QAction: Openpype/AYON menu action.
+            QtWidgets.QAction: AYON menu action.
 
         """
         if self.menu is not None:

From 212f6d004f5aee245b95139264bfa4e1bf3d0596 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 30 Nov 2023 18:18:11 +0800
Subject: [PATCH 64/80] cosmetic fix in the docstring

---
 openpype/hosts/max/api/menu.py     | 2 +-
 openpype/hosts/max/api/pipeline.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/max/api/menu.py b/openpype/hosts/max/api/menu.py
index 869f74c97e..caaa3e3730 100644
--- a/openpype/hosts/max/api/menu.py
+++ b/openpype/hosts/max/api/menu.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""3dsmax menu definition of OpenPype/AYON."""
+"""3dsmax menu definition of AYON."""
 import os
 from qtpy import QtWidgets, QtCore
 from pymxs import runtime as rt
diff --git a/openpype/hosts/max/api/pipeline.py b/openpype/hosts/max/api/pipeline.py
index e46c4cabe7..d0ae854dc8 100644
--- a/openpype/hosts/max/api/pipeline.py
+++ b/openpype/hosts/max/api/pipeline.py
@@ -175,7 +175,7 @@ def containerise(name: str, nodes: list, context,
 
 
 def load_custom_attribute_data():
-    """Re-loading the Openpype/AYON custom parameter built by the creator
+    """Re-loading the AYON custom parameter built by the creator
 
     Returns:
         attribute: re-loading the custom OP attributes set in Maxscript
@@ -213,7 +213,7 @@ def import_custom_attribute_data(container: str, selections: list):
 
 
 def update_custom_attribute_data(container: str, selections: list):
-    """Updating the Openpype/AYON custom parameter built by the creator
+    """Updating the AYON custom parameter built by the creator
 
     Args:
         container (str): target container which adds custom attributes

From 767e8d46ca1c94969edc91622d26ef13e37a5220 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Nov 2023 12:02:12 +0100
Subject: [PATCH 65/80] workfile template builder should work in ayon mode now

---
 .../workfile/workfile_template_builder.py     | 251 ++++++++++++++----
 1 file changed, 206 insertions(+), 45 deletions(-)

diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index 99bdb12543..0c4caa04f6 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -19,6 +19,7 @@ from abc import ABCMeta, abstractmethod
 
 import six
 
+from openpype import AYON_SERVER_ENABLED
 from openpype.client import (
     get_asset_by_name,
     get_linked_assets,
@@ -1272,31 +1273,54 @@ class PlaceholderLoadMixin(object):
         # Sort for readability
         families = list(sorted(families))
 
-        return [
+        if AYON_SERVER_ENABLED:
+            builder_type_enum_items = [
+                {"label": "Current folder", "value": "context_folder"},
+                # TODO implement linked folders
+                # {"label": "Linked folders", "value": "linked_folders"},
+                {"label": "All folders", "value": "all_folders"},
+            ]
+            build_type_label = "Folder Builder Type"
+            build_type_help = (
+                "Folder Builder Type\n"
+                "\nBuilder type describe what template loader will look"
+                " for."
+                "\nCurrent Folder: Template loader will look for products"
+                " of current context folder (Folder /assets/bob will"
+                " find asset)"
+                "\nAll folders: All folders matching the regex will be"
+                " used."
+            )
+        else:
+            builder_type_enum_items = [
+                {"label": "Current asset", "value": "context_asset"},
+                {"label": "Linked assets", "value": "linked_asset"},
+                {"label": "All assets", "value": "all_assets"},
+            ]
+            build_type_label = "Asset Builder Type"
+            build_type_help = (
+                "Asset Builder Type\n"
+                "\nBuilder type describe what template loader will look"
+                " for."
+                "\ncontext_asset : Template loader will look for subsets"
+                " of current context asset (Asset bob will find asset)"
+                "\nlinked_asset : Template loader will look for assets"
+                " linked to current context asset."
+                "\nLinked asset are looked in database under"
+                " field \"inputLinks\""
+            )
+
+        attr_defs = [
             attribute_definitions.UISeparatorDef(),
             attribute_definitions.UILabelDef("Main attributes"),
             attribute_definitions.UISeparatorDef(),
 
             attribute_definitions.EnumDef(
                 "builder_type",
-                label="Asset Builder Type",
+                label=build_type_label,
                 default=options.get("builder_type"),
-                items=[
-                    {"label": "Current asset", "value": "context_asset"},
-                    {"label": "Linked assets", "value": "linked_asset"},
-                    {"label": "All assets", "value": "all_assets"},
-                ],
-                tooltip=(
-                    "Asset Builder Type\n"
-                    "\nBuilder type describe what template loader will look"
-                    " for."
-                    "\ncontext_asset : Template loader will look for subsets"
-                    " of current context asset (Asset bob will find asset)"
-                    "\nlinked_asset : Template loader will look for assets"
-                    " linked to current context asset."
-                    "\nLinked asset are looked in database under"
-                    " field \"inputLinks\""
-                )
+                items=builder_type_enum_items,
+                tooltip=build_type_help
             ),
             attribute_definitions.EnumDef(
                 "family",
@@ -1352,34 +1376,61 @@ class PlaceholderLoadMixin(object):
             attribute_definitions.UISeparatorDef(),
             attribute_definitions.UILabelDef("Optional attributes"),
             attribute_definitions.UISeparatorDef(),
-            attribute_definitions.TextDef(
-                "asset",
-                label="Asset filter",
-                default=options.get("asset"),
-                placeholder="regex filtering by asset name",
-                tooltip=(
-                    "Filtering assets by matching field regex to asset's name"
-                )
-            ),
-            attribute_definitions.TextDef(
-                "subset",
-                label="Subset filter",
-                default=options.get("subset"),
-                placeholder="regex filtering by subset name",
-                tooltip=(
-                    "Filtering assets by matching field regex to subset's name"
-                )
-            ),
-            attribute_definitions.TextDef(
-                "hierarchy",
-                label="Hierarchy filter",
-                default=options.get("hierarchy"),
-                placeholder="regex filtering by asset's hierarchy",
-                tooltip=(
-                    "Filtering assets by matching field asset's hierarchy"
-                )
-            )
         ]
+        if AYON_SERVER_ENABLED:
+            attr_defs.extend([
+                attribute_definitions.TextDef(
+                    "folder_path",
+                    label="Folder filter",
+                    default=options.get("folder_path"),
+                    placeholder="regex filtering by folder path",
+                    tooltip=(
+                        "Filtering assets by matching"
+                        " field regex to folder path"
+                    )
+                ),
+                attribute_definitions.TextDef(
+                    "product_name",
+                    label="Product filter",
+                    default=options.get("product_name"),
+                    placeholder="regex filtering by product name",
+                    tooltip=(
+                        "Filtering assets by matching"
+                        " field regex to product name"
+                    )
+                ),
+            ])
+        else:
+            attr_defs.extend([
+                attribute_definitions.TextDef(
+                    "asset",
+                    label="Asset filter",
+                    default=options.get("asset"),
+                    placeholder="regex filtering by asset name",
+                    tooltip=(
+                        "Filtering assets by matching field regex to asset's name"
+                    )
+                ),
+                attribute_definitions.TextDef(
+                    "subset",
+                    label="Subset filter",
+                    default=options.get("subset"),
+                    placeholder="regex filtering by subset name",
+                    tooltip=(
+                        "Filtering assets by matching field regex to subset's name"
+                    )
+                ),
+                attribute_definitions.TextDef(
+                    "hierarchy",
+                    label="Hierarchy filter",
+                    default=options.get("hierarchy"),
+                    placeholder="regex filtering by asset's hierarchy",
+                    tooltip=(
+                        "Filtering assets by matching field asset's hierarchy"
+                    )
+                )
+            ])
+        return attr_defs
 
     def parse_loader_args(self, loader_args):
         """Helper function to parse string of loader arugments.
@@ -1409,6 +1460,109 @@ class PlaceholderLoadMixin(object):
 
         return {}
 
+    def _query_by_folder_regex(self, project_name, folder_regex):
+        """Query folders by folder path regex.
+
+        WARNING:
+            This method will be removed once the same functionality is
+                available in ayon-python-api.
+
+        Args:
+            project_name (str): Project name.
+            folder_regex (str): Regex for folder path.
+
+        Returns:
+            list[str]: List of folder paths.
+        """
+
+        from ayon_api.graphql_queries import folders_graphql_query
+        from openpype.client import get_ayon_server_api_connection
+
+        query = folders_graphql_query({"id"})
+
+        folders_field = None
+        for child in query._children:
+            if child.path != "project":
+                continue
+
+            for project_child in child._children:
+                if project_child.path == "project/folders":
+                    folders_field = project_child
+                    break
+            if folders_field:
+                break
+
+        if "folderPathRegex" not in query._variables:
+            folder_path_regex_var = query.add_variable(
+                "folderPathRegex", "String!"
+            )
+            folders_field.set_filter("pathEx", folder_path_regex_var)
+
+        query.set_variable_value("projectName", project_name)
+        query.set_variable_value("folderPathRegex", folder_regex)
+
+        api = get_ayon_server_api_connection()
+        for parsed_data in query.continuous_query(api):
+            for folder in parsed_data["project"]["folders"]:
+                yield folder["id"]
+
+    def _get_representations_ayon(self, placeholder):
+        # An OpenPype placeholder loaded in AYON
+        if "asset" in placeholder.data:
+            return []
+
+        representation_name = placeholder.data["representation"]
+        if not representation_name:
+            return []
+
+        project_name = self.builder.project_name
+        current_asset_doc = self.builder.current_asset_doc
+
+        folder_path_regex = placeholder.data["folder_path"]
+        product_name_regex = re.compile(placeholder.data["product_name"])
+        product_type = placeholder.data["family"]
+
+        builder_type = placeholder.data["builder_type"]
+        folder_ids = []
+        if builder_type == "context_folder":
+            folder_ids = [current_asset_doc["_id"]]
+
+        elif builder_type == "all_folders":
+            folder_ids = list(self._query_by_folder_regex(
+                project_name, folder_path_regex
+            ))
+
+        if not folder_ids:
+            return []
+
+        from ayon_api import get_products, get_last_versions
+
+        products = list(get_products(
+            project_name,
+            folder_ids=folder_ids,
+            product_types=[product_type],
+            fields={"id", "name"}
+        ))
+        filtered_product_ids = set()
+        for product in products:
+            if product_name_regex.match(product["name"]):
+                filtered_product_ids.add(product["id"])
+
+        if not filtered_product_ids:
+            return []
+
+        version_ids = set(
+            get_last_versions(
+                project_name, filtered_product_ids, fields={"id"}
+            ).values()
+        )
+        return list(get_representations(
+            project_name,
+            representation_names=[representation_name],
+            version_ids=version_ids
+        ))
+
+
     def _get_representations(self, placeholder):
         """Prepared query of representations based on load options.
 
@@ -1428,6 +1582,13 @@ class PlaceholderLoadMixin(object):
                 from placeholder data.
         """
 
+        if AYON_SERVER_ENABLED:
+            return self._get_representations_ayon(placeholder)
+
+        # An AYON placeholder loaded in OpenPype
+        if "folder_path" in placeholder.data:
+            return []
+
         project_name = self.builder.project_name
         current_asset_doc = self.builder.current_asset_doc
         linked_asset_docs = self.builder.linked_asset_docs

From d7db8b0090f95620982f5171a05e5eb2a2aee7b7 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 30 Nov 2023 12:03:03 +0100
Subject: [PATCH 66/80] renaming menu to ayon

---
 openpype/hosts/resolve/api/menu.py            |  7 ++++--
 .../resolve/utility_scripts/AYON__Menu.py     | 22 +++++++++++++++++++
 openpype/hosts/resolve/utils.py               |  9 ++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 openpype/hosts/resolve/utility_scripts/AYON__Menu.py

diff --git a/openpype/hosts/resolve/api/menu.py b/openpype/hosts/resolve/api/menu.py
index 9c6fe4957c..2210178a67 100644
--- a/openpype/hosts/resolve/api/menu.py
+++ b/openpype/hosts/resolve/api/menu.py
@@ -7,6 +7,9 @@ from openpype.tools.utils import host_tools
 from openpype.pipeline import registered_host
 
 
+MENU_LABEL = os.environ["AVALON_LABEL"]
+
+
 def load_stylesheet():
     path = os.path.join(os.path.dirname(__file__), "menu_style.qss")
     if not os.path.exists(path):
@@ -39,7 +42,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
     def __init__(self, *args, **kwargs):
         super(OpenPypeMenu, self).__init__(*args, **kwargs)
 
-        self.setObjectName("OpenPypeMenu")
+        self.setObjectName(f"{MENU_LABEL}Menu")
 
         self.setWindowFlags(
             QtCore.Qt.Window
@@ -49,7 +52,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
             | QtCore.Qt.WindowStaysOnTopHint
         )
 
-        self.setWindowTitle("OpenPype")
+        self.setWindowTitle(f"{MENU_LABEL}")
         save_current_btn = QtWidgets.QPushButton("Save current file", self)
         workfiles_btn = QtWidgets.QPushButton("Workfiles ...", self)
         create_btn = QtWidgets.QPushButton("Create ...", self)
diff --git a/openpype/hosts/resolve/utility_scripts/AYON__Menu.py b/openpype/hosts/resolve/utility_scripts/AYON__Menu.py
new file mode 100644
index 0000000000..4f14927074
--- /dev/null
+++ b/openpype/hosts/resolve/utility_scripts/AYON__Menu.py
@@ -0,0 +1,22 @@
+import os
+import sys
+
+from openpype.pipeline import install_host
+from openpype.lib import Logger
+
+log = Logger.get_logger(__name__)
+
+
+def main(env):
+    from openpype.hosts.resolve.api import ResolveHost, launch_pype_menu
+
+    # activate resolve from openpype
+    host = ResolveHost()
+    install_host(host)
+
+    launch_pype_menu()
+
+
+if __name__ == "__main__":
+    result = main(os.environ)
+    sys.exit(not bool(result))
diff --git a/openpype/hosts/resolve/utils.py b/openpype/hosts/resolve/utils.py
index 5e3003862f..9b91a14267 100644
--- a/openpype/hosts/resolve/utils.py
+++ b/openpype/hosts/resolve/utils.py
@@ -2,6 +2,7 @@ import os
 import shutil
 from openpype.lib import Logger, is_running_from_build
 
+from openpype import AYON_SERVER_ENABLED
 RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
@@ -54,6 +55,14 @@ def setup(env):
             src = os.path.join(directory, script)
             dst = os.path.join(util_scripts_dir, script)
 
+            # TODO: remove this once we have a proper solution
+            if AYON_SERVER_ENABLED:
+                if "OpenPype__Menu.py" == script:
+                    continue
+            else:
+                if "AYON__Menu.py" == script:
+                    continue
+
             # TODO: Make this a less hacky workaround
             if script == "openpype_startup.scriptlib":
                 # Handle special case for scriptlib that needs to be a folder

From 3dcbc2ff18eb72af1214ad1e93863839e86fb788 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Nov 2023 12:09:18 +0100
Subject: [PATCH 67/80] formatting fix

---
 openpype/pipeline/workfile/workfile_template_builder.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index 0c4caa04f6..4f53f3993b 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -1408,7 +1408,8 @@ class PlaceholderLoadMixin(object):
                     default=options.get("asset"),
                     placeholder="regex filtering by asset name",
                     tooltip=(
-                        "Filtering assets by matching field regex to asset's name"
+                        "Filtering assets by matching"
+                        " field regex to asset's name"
                     )
                 ),
                 attribute_definitions.TextDef(
@@ -1417,7 +1418,8 @@ class PlaceholderLoadMixin(object):
                     default=options.get("subset"),
                     placeholder="regex filtering by subset name",
                     tooltip=(
-                        "Filtering assets by matching field regex to subset's name"
+                        "Filtering assets by matching"
+                        " field regex to subset's name"
                     )
                 ),
                 attribute_definitions.TextDef(

From 8c87b9963d162f5886ee4ccbae43700539f39e51 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 30 Nov 2023 14:22:32 +0100
Subject: [PATCH 68/80] script menu name change in server addon

---
 server_addon/hiero/server/settings/scriptsmenu.py | 8 ++++----
 server_addon/hiero/server/version.py              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server_addon/hiero/server/settings/scriptsmenu.py b/server_addon/hiero/server/settings/scriptsmenu.py
index 51cb088298..ea898dd7ff 100644
--- a/server_addon/hiero/server/settings/scriptsmenu.py
+++ b/server_addon/hiero/server/settings/scriptsmenu.py
@@ -28,14 +28,14 @@ class ScriptsmenuSettings(BaseSettingsModel):
 
 
 DEFAULT_SCRIPTSMENU_SETTINGS = {
-    "name": "OpenPype Tools",
+    "name": "Custom Tools",
     "definition": [
         {
             "type": "action",
             "sourcetype": "python",
-            "title": "OpenPype Docs",
-            "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_hiero')",
-            "tooltip": "Open the OpenPype Hiero user doc page"
+            "title": "Ayon Hiero Docs",
+            "command": "import webbrowser;webbrowser.open(url='https://ayon.ynput.io/docs/addon_hiero_artist')",  # noqa
+            "tooltip": "Open the Ayon Hiero user doc page"
         }
     ]
 }
diff --git a/server_addon/hiero/server/version.py b/server_addon/hiero/server/version.py
index 3dc1f76bc6..485f44ac21 100644
--- a/server_addon/hiero/server/version.py
+++ b/server_addon/hiero/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"

From 93eb7751e3673a58d69da5f2526cc58b17620261 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 30 Nov 2023 14:24:43 +0100
Subject: [PATCH 69/80] wrong menu order

---
 openpype/hosts/hiero/api/menu.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
index 9967e9c875..ca611570cc 100644
--- a/openpype/hosts/hiero/api/menu.py
+++ b/openpype/hosts/hiero/api/menu.py
@@ -95,18 +95,18 @@ def menu_install():
 
     menu.addSeparator()
 
-    publish_action = menu.addAction("Publish...")
-    publish_action.setIcon(QtGui.QIcon("icons:Output.png"))
-    publish_action.triggered.connect(
-        lambda *args: publish(hiero.ui.mainWindow())
-    )
-
     creator_action = menu.addAction("Create...")
     creator_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png"))
     creator_action.triggered.connect(
         lambda: host_tools.show_creator(parent=main_window)
     )
 
+    publish_action = menu.addAction("Publish...")
+    publish_action.setIcon(QtGui.QIcon("icons:Output.png"))
+    publish_action.triggered.connect(
+        lambda *args: publish(hiero.ui.mainWindow())
+    )
+
     loader_action = menu.addAction("Load...")
     loader_action.setIcon(QtGui.QIcon("icons:CopyRectangle.png"))
     loader_action.triggered.connect(

From 4c9adaf2e838c94aaadb3453fe3b5bf4f0acadac Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 30 Nov 2023 14:36:38 +0100
Subject: [PATCH 70/80] nuke: updating name for custom tools menu item

---
 server_addon/nuke/server/settings/scriptsmenu.py | 8 ++++----
 server_addon/nuke/server/version.py              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server_addon/nuke/server/settings/scriptsmenu.py b/server_addon/nuke/server/settings/scriptsmenu.py
index 0b2d660da5..f7495dd2db 100644
--- a/server_addon/nuke/server/settings/scriptsmenu.py
+++ b/server_addon/nuke/server/settings/scriptsmenu.py
@@ -26,14 +26,14 @@ class ScriptsmenuSettings(BaseSettingsModel):
 
 
 DEFAULT_SCRIPTSMENU_SETTINGS = {
-    "name": "OpenPype Tools",
+    "name": "Custom Tools",
     "definition": [
         {
             "type": "action",
             "sourcetype": "python",
-            "title": "OpenPype Docs",
-            "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_nuke_tut')",
-            "tooltip": "Open the OpenPype Nuke user doc page"
+            "title": "Ayon Nuke Docs",
+            "command": "import webbrowser;webbrowser.open(url='https://ayon.ynput.io/docs/addon_nuke_artist')",
+            "tooltip": "Open the Ayon Nuke user doc page"
         },
         {
             "type": "action",
diff --git a/server_addon/nuke/server/version.py b/server_addon/nuke/server/version.py
index 1276d0254f..0a8da88258 100644
--- a/server_addon/nuke/server/version.py
+++ b/server_addon/nuke/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"

From 8449f0468f02780e4b4d6c5b8e651d724d890dc9 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 30 Nov 2023 14:39:26 +0100
Subject: [PATCH 71/80] hound

---
 server_addon/nuke/server/settings/scriptsmenu.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server_addon/nuke/server/settings/scriptsmenu.py b/server_addon/nuke/server/settings/scriptsmenu.py
index f7495dd2db..3dd6765920 100644
--- a/server_addon/nuke/server/settings/scriptsmenu.py
+++ b/server_addon/nuke/server/settings/scriptsmenu.py
@@ -32,21 +32,21 @@ DEFAULT_SCRIPTSMENU_SETTINGS = {
             "type": "action",
             "sourcetype": "python",
             "title": "Ayon Nuke Docs",
-            "command": "import webbrowser;webbrowser.open(url='https://ayon.ynput.io/docs/addon_nuke_artist')",
+            "command": "import webbrowser;webbrowser.open(url='https://ayon.ynput.io/docs/addon_nuke_artist')",  # noqa
             "tooltip": "Open the Ayon Nuke user doc page"
         },
         {
             "type": "action",
             "sourcetype": "python",
             "title": "Set Frame Start (Read Node)",
-            "command": "from openpype.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();",
+            "command": "from openpype.hosts.nuke.startup.frame_setting_for_read_nodes import main;main();",  # noqa
             "tooltip": "Set frame start for read node(s)"
         },
         {
             "type": "action",
             "sourcetype": "python",
             "title": "Set non publish output for Write Node",
-            "command": "from openpype.hosts.nuke.startup.custom_write_node import main;main();",
+            "command": "from openpype.hosts.nuke.startup.custom_write_node import main;main();",  # noqa
             "tooltip": "Open the OpenPype Nuke user doc page"
         }
     ]

From dc033d283ebb7164ca4024d00ab0b4a645ee81af Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Thu, 30 Nov 2023 16:21:11 +0100
Subject: [PATCH 72/80] Changed the labels for layout json extractor

---
 openpype/hosts/blender/plugins/publish/extract_layout.py | 2 +-
 server_addon/blender/server/settings/publish_plugins.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/blender/plugins/publish/extract_layout.py b/openpype/hosts/blender/plugins/publish/extract_layout.py
index 41c6b0912c..3e8978c8d3 100644
--- a/openpype/hosts/blender/plugins/publish/extract_layout.py
+++ b/openpype/hosts/blender/plugins/publish/extract_layout.py
@@ -14,7 +14,7 @@ from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
 class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
     """Extract a layout."""
 
-    label = "Extract Layout"
+    label = "Extract Layout (JSON)"
     hosts = ["blender"]
     families = ["layout"]
     optional = True
diff --git a/server_addon/blender/server/settings/publish_plugins.py b/server_addon/blender/server/settings/publish_plugins.py
index 1c4ad0c6fd..7a5bc236d4 100644
--- a/server_addon/blender/server/settings/publish_plugins.py
+++ b/server_addon/blender/server/settings/publish_plugins.py
@@ -128,7 +128,7 @@ class PublishPuginsModel(BaseSettingsModel):
     )
     ExtractLayout: ValidatePluginModel = Field(
         default_factory=ValidatePluginModel,
-        title="Extract Layout"
+        title="Extract Layout (JSON)"
     )
     ExtractThumbnail: ExtractPlayblastModel = Field(
         default_factory=ExtractPlayblastModel,

From 6f293e231aafc157913cfa28de45f158d632cfe4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Nov 2023 18:52:37 +0100
Subject: [PATCH 73/80] ignore additional filters if are not filled

---
 .../pipeline/workfile/workfile_template_builder.py  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index 4f53f3993b..0dd8e21426 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -1501,7 +1501,8 @@ class PlaceholderLoadMixin(object):
             folders_field.set_filter("pathEx", folder_path_regex_var)
 
         query.set_variable_value("projectName", project_name)
-        query.set_variable_value("folderPathRegex", folder_regex)
+        if folder_regex:
+            query.set_variable_value("folderPathRegex", folder_regex)
 
         api = get_ayon_server_api_connection()
         for parsed_data in query.continuous_query(api):
@@ -1521,7 +1522,10 @@ class PlaceholderLoadMixin(object):
         current_asset_doc = self.builder.current_asset_doc
 
         folder_path_regex = placeholder.data["folder_path"]
-        product_name_regex = re.compile(placeholder.data["product_name"])
+        product_name_regex_value = placeholder.data["product_name"]
+        product_name_regex = None
+        if product_name_regex_value:
+            product_name_regex = re.compile(product_name_regex_value)
         product_type = placeholder.data["family"]
 
         builder_type = placeholder.data["builder_type"]
@@ -1547,7 +1551,10 @@ class PlaceholderLoadMixin(object):
         ))
         filtered_product_ids = set()
         for product in products:
-            if product_name_regex.match(product["name"]):
+            if (
+                product_name_regex is None
+                or product_name_regex.match(product["name"])
+            ):
                 filtered_product_ids.add(product["id"])
 
         if not filtered_product_ids:

From 2ea4bcc3afeccb8fba5f891550e82d43d79eb859 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Nov 2023 19:08:35 +0100
Subject: [PATCH 74/80] fix versions loop

---
 openpype/pipeline/workfile/workfile_template_builder.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index 0dd8e21426..9dc833061a 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -1561,7 +1561,8 @@ class PlaceholderLoadMixin(object):
             return []
 
         version_ids = set(
-            get_last_versions(
+            version["id"]
+            for version in get_last_versions(
                 project_name, filtered_product_ids, fields={"id"}
             ).values()
         )

From 804086f8694ef0b56c3da6471e4df6247c840e91 Mon Sep 17 00:00:00 2001
From: Ynbot <bot@ynput.io>
Date: Sat, 2 Dec 2023 03:25:30 +0000
Subject: [PATCH 75/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 c1c33c0f65..98efdaec5f 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.17.7-nightly.4"
+__version__ = "3.17.7-nightly.5"

From 9678fb35b875cbfd2b47e10ea546773510f620b6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 2 Dec 2023 03:26:07 +0000
Subject: [PATCH 76/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 60ad923546..c65a04c774 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.17.7-nightly.5
         - 3.17.7-nightly.4
         - 3.17.7-nightly.3
         - 3.17.7-nightly.2
@@ -134,7 +135,6 @@ body:
         - 3.15.3-nightly.1
         - 3.15.2
         - 3.15.2-nightly.6
-        - 3.15.2-nightly.5
     validations:
       required: true
   - type: dropdown

From c62edc1c040f83954b849e093a28399cfa092f5b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 4 Dec 2023 11:26:07 +0100
Subject: [PATCH 77/80] Updated label (#5980)

---
 server_addon/photoshop/server/settings/publish_plugins.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_addon/photoshop/server/settings/publish_plugins.py b/server_addon/photoshop/server/settings/publish_plugins.py
index 6bc72b4072..2863979ca9 100644
--- a/server_addon/photoshop/server/settings/publish_plugins.py
+++ b/server_addon/photoshop/server/settings/publish_plugins.py
@@ -150,7 +150,7 @@ class PhotoshopPublishPlugins(BaseSettingsModel):
     )
 
     CollectVersion: CollectVersionPlugin = Field(
-        title="Create Image",
+        title="Collect Version",
         default_factory=CollectVersionPlugin,
     )
 

From 523f0230334a8f17e592bc56188e3a5b00d2c7b3 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 4 Dec 2023 11:27:43 +0100
Subject: [PATCH 78/80] SiteSync: implemented in Ayon Loader (#5962)

* Added new SiteSync model

Used to get information from SiteSync module to enhance Loader UI.

* Added new SiteSync method to controller

Other models will be using these to get information pertaining SiteSync

* Added missed commit

* Implemented collection of SiteSync info

* Added AvailabilityDelegate

Shows how many representations are present locally and remotely in Loader summary page.

* Added fields to store progress info

* Fix HiddenAttr to carry value

* Refactored to internal variable

Changes made after discussion

* Implemented ActionItems for upload/download/remove

Replaced old Launcher approach, now it is not necessary after refactor of Ayon launcher.

* Update openpype/tools/ayon_loader/abstract.py

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

* Hound

* Refactor better retrieval of icon

* Refactor better readability

* Refactor renamed delegate

* Refactor better retrieval of icons

* Refactor better readability

* Refactor removed unneeded explicit refresh

* Hound

* Hound

* Hound

* Fix used wrong type

* Update openpype/tools/ayon_loader/ui/products_delegates.py

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

* Refactor renamed variable name

* Refactor formatting

* Added progress for representations

* cache version availability

* cache representations sync status

* changed representations count logic and moved it to products model

* site sync enabled is cached

* active and remote site names are cached

* small tweaks in site sync model

* change methods called by controller

* hide site sync columns if site sync not enabled

* use string conversion before iteration

* smal formatting changes

* updated abstract class with abstract methods

* renamed site sync model variable

* fixed method name

* fix used method name

* rename '_sitesync_addon' to '_site_sync_addon'

* fix remote site name cache

* small formatting changes in delegate

* modify site sync delegate to be more dynamic

* fix delegate painting

* do not handle repre progress in products model

* Add comma back

* simplify delegate code

---------

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
---
 openpype/tools/attribute_defs/widgets.py      |   2 +-
 openpype/tools/ayon_loader/abstract.py        |  97 +++-
 openpype/tools/ayon_loader/control.py         |  61 ++-
 openpype/tools/ayon_loader/models/__init__.py |   2 +
 openpype/tools/ayon_loader/models/products.py |  36 ++
 .../tools/ayon_loader/models/site_sync.py     | 509 ++++++++++++++++++
 .../ayon_loader/ui/products_delegates.py      |  80 +++
 .../tools/ayon_loader/ui/products_model.py    |  51 +-
 .../tools/ayon_loader/ui/products_widget.py   |  30 +-
 .../tools/ayon_loader/ui/repres_widget.py     |  83 ++-
 10 files changed, 931 insertions(+), 20 deletions(-)
 create mode 100644 openpype/tools/ayon_loader/models/site_sync.py

diff --git a/openpype/tools/attribute_defs/widgets.py b/openpype/tools/attribute_defs/widgets.py
index 8957f2b19d..7dea01e0a8 100644
--- a/openpype/tools/attribute_defs/widgets.py
+++ b/openpype/tools/attribute_defs/widgets.py
@@ -608,7 +608,7 @@ class UnknownAttrWidget(_BaseAttrDefWidget):
 class HiddenAttrWidget(_BaseAttrDefWidget):
     def _ui_init(self):
         self.setVisible(False)
-        self._value = None
+        self._value = self.attr_def.default
         self._multivalue = False
 
     def setVisible(self, visible):
diff --git a/openpype/tools/ayon_loader/abstract.py b/openpype/tools/ayon_loader/abstract.py
index 45042395d9..bf3e81d485 100644
--- a/openpype/tools/ayon_loader/abstract.py
+++ b/openpype/tools/ayon_loader/abstract.py
@@ -137,7 +137,7 @@ class VersionItem:
         handles,
         step,
         comment,
-        source
+        source,
     ):
         self.version_id = version_id
         self.product_id = product_id
@@ -215,7 +215,7 @@ class RepreItem:
         representation_name,
         representation_icon,
         product_name,
-        folder_label,
+        folder_label
     ):
         self.representation_id = representation_id
         self.representation_name = representation_name
@@ -590,6 +590,22 @@ class FrontendLoaderController(_BaseLoaderController):
 
         pass
 
+    @abstractmethod
+    def get_versions_representation_count(
+        self, project_name, version_ids, sender=None
+    ):
+        """
+        Args:
+            project_name (str): Project name.
+            version_ids (Iterable[str]): Version ids.
+            sender (Optional[str]): Sender who requested the items.
+
+        Returns:
+            dict[str, int]: Representation count by version id.
+        """
+
+        pass
+
     @abstractmethod
     def get_thumbnail_path(self, project_name, thumbnail_id):
         """Get thumbnail path for thumbnail id.
@@ -849,3 +865,80 @@ class FrontendLoaderController(_BaseLoaderController):
         """
 
         pass
+
+    # Site sync functions
+    @abstractmethod
+    def is_site_sync_enabled(self, project_name=None):
+        """Is site sync enabled.
+
+        Site sync addon can be enabled but can be disabled per project.
+
+        When asked for enabled state without project name, it should return
+            True if site sync addon is available and enabled.
+
+        Args:
+            project_name (Optional[str]): Project name.
+
+        Returns:
+            bool: True if site sync is enabled.
+        """
+
+        pass
+
+    @abstractmethod
+    def get_active_site_icon_def(self, project_name):
+        """Active site icon definition.
+
+        Args:
+            project_name (Union[str, None]): Project name.
+
+        Returns:
+            Union[dict[str, Any], None]: Icon definition or None if site sync
+                is not enabled for the project.
+        """
+
+        pass
+
+    @abstractmethod
+    def get_remote_site_icon_def(self, project_name):
+        """Remote site icon definition.
+
+        Args:
+            project_name (Union[str, None]): Project name.
+
+        Returns:
+            Union[dict[str, Any], None]: Icon definition or None if site sync
+                is not enabled for the project.
+        """
+
+        pass
+
+    @abstractmethod
+    def get_version_sync_availability(self, project_name, version_ids):
+        """Version sync availability.
+
+        Args:
+            project_name (str): Project name.
+            version_ids (Iterable[str]): Version ids.
+
+        Returns:
+            dict[str, tuple[int, int]]: Sync availability by version id.
+        """
+
+        pass
+
+    @abstractmethod
+    def get_representations_sync_status(
+        self, project_name, representation_ids
+    ):
+        """Representations sync status.
+
+        Args:
+            project_name (str): Project name.
+            representation_ids (Iterable[str]): Representation ids.
+
+        Returns:
+            dict[str, tuple[int, int]]: Sync status by representation id.
+        """
+
+        pass
diff --git a/openpype/tools/ayon_loader/control.py b/openpype/tools/ayon_loader/control.py
index 8ec0d96e2e..060cef6661 100644
--- a/openpype/tools/ayon_loader/control.py
+++ b/openpype/tools/ayon_loader/control.py
@@ -15,7 +15,12 @@ from openpype.tools.ayon_utils.models import (
 )
 
 from .abstract import BackendLoaderController, FrontendLoaderController
-from .models import SelectionModel, ProductsModel, LoaderActionsModel
+from .models import (
+    SelectionModel,
+    ProductsModel,
+    LoaderActionsModel,
+    SiteSyncModel
+)
 
 
 class ExpectedSelection:
@@ -108,6 +113,7 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
         self._products_model = ProductsModel(self)
         self._loader_actions_model = LoaderActionsModel(self)
         self._thumbnails_model = ThumbnailsModel()
+        self._site_sync_model = SiteSyncModel(self)
 
     @property
     def log(self):
@@ -143,6 +149,7 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
         self._loader_actions_model.reset()
         self._projects_model.reset()
         self._thumbnails_model.reset()
+        self._site_sync_model.reset()
 
         self._projects_model.refresh()
 
@@ -195,13 +202,22 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
             project_name, version_ids, sender
         )
 
+    def get_versions_representation_count(
+        self, project_name, version_ids, sender=None
+    ):
+        return self._products_model.get_versions_repre_count(
+            project_name, version_ids, sender
+        )
+
     def get_folder_thumbnail_ids(self, project_name, folder_ids):
         return self._thumbnails_model.get_folder_thumbnail_ids(
-            project_name, folder_ids)
+            project_name, folder_ids
+        )
 
     def get_version_thumbnail_ids(self, project_name, version_ids):
         return self._thumbnails_model.get_version_thumbnail_ids(
-            project_name, version_ids)
+            project_name, version_ids
+        )
 
     def get_thumbnail_path(self, project_name, thumbnail_id):
         return self._thumbnails_model.get_thumbnail_path(
@@ -219,8 +235,16 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
 
     def get_representations_action_items(
             self, project_name, representation_ids):
-        return self._loader_actions_model.get_representations_action_items(
+        action_items = (
+            self._loader_actions_model.get_representations_action_items(
+                project_name, representation_ids)
+        )
+
+        action_items.extend(self._site_sync_model.get_site_sync_action_items(
             project_name, representation_ids)
+        )
+
+        return action_items
 
     def trigger_action_item(
         self,
@@ -230,6 +254,14 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
         version_ids,
         representation_ids
     ):
+        if self._site_sync_model.is_site_sync_action(identifier):
+            self._site_sync_model.trigger_action_item(
+                identifier,
+                project_name,
+                representation_ids
+            )
+            return
+
         self._loader_actions_model.trigger_action_item(
             identifier,
             options,
@@ -336,6 +368,27 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
             self._loaded_products_cache.update_data(product_ids)
         return self._loaded_products_cache.get_data()
 
+    def is_site_sync_enabled(self, project_name=None):
+        return self._site_sync_model.is_site_sync_enabled(project_name)
+
+    def get_active_site_icon_def(self, project_name):
+        return self._site_sync_model.get_active_site_icon_def(project_name)
+
+    def get_remote_site_icon_def(self, project_name):
+        return self._site_sync_model.get_remote_site_icon_def(project_name)
+
+    def get_version_sync_availability(self, project_name, version_ids):
+        return self._site_sync_model.get_version_sync_availability(
+            project_name, version_ids
+        )
+
+    def get_representations_sync_status(
+        self, project_name, representation_ids
+    ):
+        return self._site_sync_model.get_representations_sync_status(
+            project_name, representation_ids
+        )
+
     def is_loaded_products_supported(self):
         return self._host is not None
 
diff --git a/openpype/tools/ayon_loader/models/__init__.py b/openpype/tools/ayon_loader/models/__init__.py
index 6adfe71d86..8e640659a0 100644
--- a/openpype/tools/ayon_loader/models/__init__.py
+++ b/openpype/tools/ayon_loader/models/__init__.py
@@ -1,10 +1,12 @@
 from .selection import SelectionModel
 from .products import ProductsModel
 from .actions import LoaderActionsModel
+from .site_sync import SiteSyncModel
 
 
 __all__ = (
     "SelectionModel",
     "ProductsModel",
     "LoaderActionsModel",
+    "SiteSyncModel",
 )
diff --git a/openpype/tools/ayon_loader/models/products.py b/openpype/tools/ayon_loader/models/products.py
index 816dabaf90..daa36aefdc 100644
--- a/openpype/tools/ayon_loader/models/products.py
+++ b/openpype/tools/ayon_loader/models/products.py
@@ -317,6 +317,42 @@ class ProductsModel:
 
         return output
 
+    def get_versions_repre_count(self, project_name, version_ids, sender):
+        """Get representation count for passed version ids.
+
+        Args:
+            project_name (str): Project name.
+            version_ids (Iterable[str]): Version ids.
+            sender (Union[str, None]): Who triggered the method.
+
+        Returns:
+            dict[str, int]: Number of representations by version id.
+        """
+
+        output = {}
+        if not any((project_name, version_ids)):
+            return output
+
+        invalid_version_ids = set()
+        project_cache = self._repre_items_cache[project_name]
+        for version_id in version_ids:
+            version_cache = project_cache[version_id]
+            if version_cache.is_valid:
+                output[version_id] = len(version_cache.get_data())
+            else:
+                invalid_version_ids.add(version_id)
+
+        if invalid_version_ids:
+            self.refresh_representation_items(
+                project_name, invalid_version_ids, sender
+            )
+
+        for version_id in invalid_version_ids:
+            version_cache = project_cache[version_id]
+            output[version_id] = len(version_cache.get_data())
+
+        return output
+
     def change_products_group(self, project_name, product_ids, group_name):
         """Change group name for passed product ids.
 
diff --git a/openpype/tools/ayon_loader/models/site_sync.py b/openpype/tools/ayon_loader/models/site_sync.py
new file mode 100644
index 0000000000..90852b6954
--- /dev/null
+++ b/openpype/tools/ayon_loader/models/site_sync.py
@@ -0,0 +1,509 @@
+import collections
+
+from openpype.lib import Logger
+from openpype.client.entities import get_representations
+from openpype.client import get_linked_representation_id
+from openpype.modules import ModulesManager
+from openpype.tools.ayon_utils.models import NestedCacheItem
+from openpype.tools.ayon_loader.abstract import ActionItem
+
+DOWNLOAD_IDENTIFIER = "sitesync.download"
+UPLOAD_IDENTIFIER = "sitesync.upload"
+REMOVE_IDENTIFIER = "sitesync.remove"
+
+log = Logger.get_logger(__name__)
+
+
+def _default_version_availability():
+    return 0, 0
+
+
+def _default_repre_status():
+    return 0.0, 0.0
+
+
+class SiteSyncModel:
+    """Model handling site sync logic.
+
+    Model cares about handling of site sync functionality. All public
+    functions should be possible to call even if site sync is not available.
+    """
+
+    lifetime = 60  # In seconds (minute by default)
+    status_lifetime = 20
+
+    def __init__(self, controller):
+        self._controller = controller
+
+        self._site_icons = None
+        self._site_sync_enabled_cache = NestedCacheItem(
+            levels=1, lifetime=self.lifetime
+        )
+        self._active_site_cache = NestedCacheItem(
+            levels=1, lifetime=self.lifetime
+        )
+        self._remote_site_cache = NestedCacheItem(
+            levels=1, lifetime=self.lifetime
+        )
+        self._version_availability_cache = NestedCacheItem(
+            levels=2,
+            default_factory=_default_version_availability,
+            lifetime=self.status_lifetime
+        )
+        self._repre_status_cache = NestedCacheItem(
+            levels=2,
+            default_factory=_default_repre_status,
+            lifetime=self.status_lifetime
+        )
+
+        manager = ModulesManager()
+        self._site_sync_addon = manager.get("sync_server")
+
+    def reset(self):
+        self._site_icons = None
+        self._site_sync_enabled_cache.reset()
+        self._active_site_cache.reset()
+        self._remote_site_cache.reset()
+        self._version_availability_cache.reset()
+        self._repre_status_cache.reset()
+
+    def is_site_sync_enabled(self, project_name=None):
+        """Site sync is enabled for a project.
+
+        Returns false if site sync addon is not available or enabled
+            or project has disabled it.
+
+        Args:
+            project_name (Union[str, None]): Project name. If project name
+                is 'None', True is returned if site sync addon
+                is available and enabled.
+
+        Returns:
+            bool: Site sync is enabled.
+        """
+
+        if not self._is_site_sync_addon_enabled():
+            return False
+        cache = self._site_sync_enabled_cache[project_name]
+        if not cache.is_valid:
+            enabled = True
+            if project_name:
+                enabled = self._site_sync_addon.is_project_enabled(
+                    project_name, single=True
+                )
+            cache.update_data(enabled)
+        return cache.get_data()
+
+    def get_active_site(self, project_name):
+        """Active site name for a project.
+
+        Args:
+            project_name (str): Project name.
+
+        Returns:
+            Union[str, None]: Remote site name.
+        """
+
+        cache = self._active_site_cache[project_name]
+        if not cache.is_valid:
+            site_name = None
+            if project_name and self._is_site_sync_addon_enabled():
+                site_name = self._site_sync_addon.get_active_site(project_name)
+            cache.update_data(site_name)
+        return cache.get_data()
+
+    def get_remote_site(self, project_name):
+        """Remote site name for a project.
+
+        Args:
+            project_name (str): Project name.
+
+        Returns:
+            Union[str, None]: Remote site name.
+        """
+
+        cache = self._remote_site_cache[project_name]
+        if not cache.is_valid:
+            site_name = None
+            if project_name and self._is_site_sync_addon_enabled():
+                site_name = self._site_sync_addon.get_remote_site(project_name)
+            cache.update_data(site_name)
+        return cache.get_data()
+
+    def get_active_site_icon_def(self, project_name):
+        """Active site icon definition.
+
+        Args:
+            project_name (Union[str, None]): Name of project.
+
+        Returns:
+            Union[dict[str, Any], None]: Site icon definition.
+        """
+
+        if not project_name:
+            return None
+
+        active_site = self.get_active_site(project_name)
+        provider = self._get_provider_for_site(project_name, active_site)
+        return self._get_provider_icon(provider)
+
+    def get_remote_site_icon_def(self, project_name):
+        """Remote site icon definition.
+
+        Args:
+            project_name (Union[str, None]): Name of project.
+
+        Returns:
+            Union[dict[str, Any], None]: Site icon definition.
+        """
+
+        if not project_name or not self.is_site_sync_enabled(project_name):
+            return None
+        remote_site = self.get_remote_site(project_name)
+        provider = self._get_provider_for_site(project_name, remote_site)
+        return self._get_provider_icon(provider)
+
+    def get_version_sync_availability(self, project_name, version_ids):
+        """Returns how many representations are available on sites.
+
+        Returned value `{version_id: (4, 6)}` denotes that locally are
+            available 4 and remotely 6 representation.
+        NOTE: Available means they were synced to site.
+
+        Returns:
+            dict[str, tuple[int, int]]
+        """
+
+        if not self.is_site_sync_enabled(project_name):
+            return {
+                version_id: _default_version_availability()
+                for version_id in version_ids
+            }
+
+        output = {}
+        project_cache = self._version_availability_cache[project_name]
+        invalid_ids = set()
+        for version_id in version_ids:
+            repre_cache = project_cache[version_id]
+            if repre_cache.is_valid:
+                output[version_id] = repre_cache.get_data()
+            else:
+                invalid_ids.add(version_id)
+
+        if invalid_ids:
+            self._refresh_version_availability(
+                project_name, invalid_ids
+            )
+            for version_id in invalid_ids:
+                version_cache = project_cache[version_id]
+                output[version_id] = version_cache.get_data()
+        return output
+
+    def get_representations_sync_status(
+        self, project_name, representation_ids
+    ):
+        """
+
+        Args:
+            project_name (str): Project name.
+            representation_ids (Iterable[str]): Representation ids.
+
+        Returns:
+            dict[str, tuple[float, float]]
+        """
+
+        if not self.is_site_sync_enabled(project_name):
+            return {
+                repre_id: _default_repre_status()
+                for repre_id in representation_ids
+            }
+
+        output = {}
+        project_cache = self._repre_status_cache[project_name]
+        invalid_ids = set()
+        for repre_id in representation_ids:
+            repre_cache = project_cache[repre_id]
+            if repre_cache.is_valid:
+                output[repre_id] = repre_cache.get_data()
+            else:
+                invalid_ids.add(repre_id)
+
+        if invalid_ids:
+            self._refresh_representations_sync_status(
+                project_name, invalid_ids
+            )
+            for repre_id in invalid_ids:
+                repre_cache = project_cache[repre_id]
+                output[repre_id] = repre_cache.get_data()
+        return output
+
+    def get_site_sync_action_items(self, project_name, representation_ids):
+        """
+
+        Args:
+             project_name (str): Project name.
+             representation_ids (Iterable[str]): Representation ids.
+
+        Returns:
+            list[ActionItem]: Actions that can be shown in loader.
+        """
+
+        if not self.is_site_sync_enabled(project_name):
+            return []
+
+        repres_status = self.get_representations_sync_status(
+            project_name, representation_ids
+        )
+
+        repre_ids_per_identifier = collections.defaultdict(set)
+        for repre_id in representation_ids:
+            repre_status = repres_status[repre_id]
+            local_status, remote_status = repre_status
+
+            if local_status:
+                repre_ids_per_identifier[UPLOAD_IDENTIFIER].add(repre_id)
+                repre_ids_per_identifier[REMOVE_IDENTIFIER].add(repre_id)
+
+            if remote_status:
+                repre_ids_per_identifier[DOWNLOAD_IDENTIFIER].add(repre_id)
+
+        action_items = []
+        for identifier, repre_ids in repre_ids_per_identifier.items():
+            if identifier == DOWNLOAD_IDENTIFIER:
+                action_items.append(self._create_download_action_item(
+                    project_name, repre_ids
+                ))
+            elif identifier == UPLOAD_IDENTIFIER:
+                action_items.append(self._create_upload_action_item(
+                    project_name, repre_ids
+                ))
+            elif identifier == REMOVE_IDENTIFIER:
+                action_items.append(self._create_delete_action_item(
+                    project_name, repre_ids
+                ))
+
+        return action_items
+
+    def is_site_sync_action(self, identifier):
+        """Should be `identifier` handled by SiteSync.
+
+        Args:
+            identifier (str): Action identifier.
+
+        Returns:
+            bool: Should action be handled by SiteSync.
+        """
+
+        return identifier in {
+            UPLOAD_IDENTIFIER,
+            DOWNLOAD_IDENTIFIER,
+            REMOVE_IDENTIFIER,
+        }
+
+    def trigger_action_item(
+        self,
+        identifier,
+        project_name,
+        representation_ids
+    ):
+        """Resets status for site_name or remove local files.
+
+        Args:
+            identifier (str): Action identifier.
+            project_name (str): Project name.
+            representation_ids (Iterable[str]): Representation ids.
+        """
+
+        active_site = self.get_active_site(project_name)
+        remote_site = self.get_remote_site(project_name)
+
+        repre_docs = list(get_representations(
+            project_name, representation_ids=representation_ids
+        ))
+        families_per_repre_id = {
+            item["_id"]: item["context"]["family"]
+            for item in repre_docs
+        }
+
+        for repre_id in representation_ids:
+            family = families_per_repre_id[repre_id]
+            if identifier == DOWNLOAD_IDENTIFIER:
+                self._add_site(
+                    project_name, repre_id, active_site, family
+                )
+
+            elif identifier == UPLOAD_IDENTIFIER:
+                self._add_site(
+                    project_name, repre_id, remote_site, family
+                )
+
+            elif identifier == REMOVE_IDENTIFIER:
+                self._site_sync_addon.remove_site(
+                    project_name,
+                    repre_id,
+                    active_site,
+                    remove_local_files=True
+                )
+
+    def _is_site_sync_addon_enabled(self):
+        """
+        Returns:
+            bool: Site sync addon is enabled.
+        """
+
+        if self._site_sync_addon is None:
+            return False
+        return self._site_sync_addon.enabled
+
+    def _get_provider_for_site(self, project_name, site_name):
+        """Provider for a site.
+
+        Args:
+            project_name (str): Project name.
+            site_name (str): Site name.
+
+        Returns:
+            Union[str, None]: Provider name.
+        """
+
+        if not self._is_site_sync_addon_enabled():
+            return None
+        return self._site_sync_addon.get_provider_for_site(
+            project_name, site_name
+        )
+
+    def _get_provider_icon(self, provider):
+        """site provider icons.
+
+        Returns:
+            Union[dict[str, Any], None]: Icon of site provider.
+        """
+
+        if not provider:
+            return None
+
+        if self._site_icons is None:
+            self._site_icons = self._site_sync_addon.get_site_icons()
+        return self._site_icons.get(provider)
+
+    def _refresh_version_availability(self, project_name, version_ids):
+        if not project_name or not version_ids:
+            return
+        project_cache = self._version_availability_cache[project_name]
+
+        avail_by_id = self._site_sync_addon.get_version_availability(
+            project_name,
+            version_ids,
+            self.get_active_site(project_name),
+            self.get_remote_site(project_name),
+        )
+        for version_id in version_ids:
+            status = avail_by_id.get(version_id)
+            if status is None:
+                status = _default_version_availability()
+            project_cache[version_id].update_data(status)
+
+    def _refresh_representations_sync_status(
+        self, project_name, representation_ids
+    ):
+        if not project_name or not representation_ids:
+            return
+        project_cache = self._repre_status_cache[project_name]
+        status_by_repre_id = (
+            self._site_sync_addon.get_representations_sync_state(
+                project_name,
+                representation_ids,
+                self.get_active_site(project_name),
+                self.get_remote_site(project_name),
+            )
+        )
+        for repre_id in representation_ids:
+            status = status_by_repre_id.get(repre_id)
+            if status is None:
+                status = _default_repre_status()
+            project_cache[repre_id].update_data(status)
+
+    def _create_download_action_item(self, project_name, representation_ids):
+        return self._create_action_item(
+            project_name,
+            representation_ids,
+            DOWNLOAD_IDENTIFIER,
+            "Download",
+            "Mark representation for download locally",
+            "fa.download"
+        )
+
+    def _create_upload_action_item(self, project_name, representation_ids):
+        return self._create_action_item(
+            project_name,
+            representation_ids,
+            UPLOAD_IDENTIFIER,
+            "Upload",
+            "Mark representation for upload remotely",
+            "fa.upload"
+        )
+
+    def _create_delete_action_item(self, project_name, representation_ids):
+        return self._create_action_item(
+            project_name,
+            representation_ids,
+            REMOVE_IDENTIFIER,
+            "Remove from local",
+            "Remove local synchronization",
+            "fa.trash"
+        )
+
+    def _create_action_item(
+        self,
+        project_name,
+        representation_ids,
+        identifier,
+        label,
+        tooltip,
+        icon_name
+    ):
+        return ActionItem(
+            identifier,
+            label,
+            icon={
+                "type": "awesome-font",
+                "name": icon_name,
+                "color": "#999999"
+            },
+            tooltip=tooltip,
+            options={},
+            order=1,
+            project_name=project_name,
+            folder_ids=[],
+            product_ids=[],
+            version_ids=[],
+            representation_ids=representation_ids,
+        )
+
+    def _add_site(self, project_name, repre_id, site_name, family):
+        self._site_sync_addon.add_site(
+            project_name, repre_id, site_name, force=True
+        )
+
+        # TODO this should happen in site sync addon
+        if family != "workfile":
+            return
+
+        links = get_linked_representation_id(
+            project_name,
+            repre_id=repre_id,
+            link_type="reference"
+        )
+        for link_repre_id in links:
+            try:
+                print("Adding {} to linked representation: {}".format(
+                    site_name, link_repre_id))
+                self._site_sync_addon.add_site(
+                    project_name,
+                    link_repre_id,
+                    site_name,
+                    force=False
+                )
+            except Exception:
+                # do not add/reset working site for references
+                log.debug("Site present", exc_info=True)
diff --git a/openpype/tools/ayon_loader/ui/products_delegates.py b/openpype/tools/ayon_loader/ui/products_delegates.py
index 6729468bfa..979fa57fd2 100644
--- a/openpype/tools/ayon_loader/ui/products_delegates.py
+++ b/openpype/tools/ayon_loader/ui/products_delegates.py
@@ -8,6 +8,11 @@ from .products_model import (
     VERSION_NAME_EDIT_ROLE,
     VERSION_ID_ROLE,
     PRODUCT_IN_SCENE_ROLE,
+    ACTIVE_SITE_ICON_ROLE,
+    REMOTE_SITE_ICON_ROLE,
+    REPRESENTATIONS_COUNT_ROLE,
+    SYNC_ACTIVE_SITE_AVAILABILITY,
+    SYNC_REMOTE_SITE_AVAILABILITY,
 )
 
 
@@ -189,3 +194,78 @@ class LoadedInSceneDelegate(QtWidgets.QStyledItemDelegate):
         value = index.data(PRODUCT_IN_SCENE_ROLE)
         color = self._colors.get(value, self._default_color)
         option.palette.setBrush(QtGui.QPalette.Text, color)
+
+
+class SiteSyncDelegate(QtWidgets.QStyledItemDelegate):
+    """Paints icons and downloaded representation ration for both sites."""
+
+    def paint(self, painter, option, index):
+        super(SiteSyncDelegate, self).paint(painter, option, index)
+        option = QtWidgets.QStyleOptionViewItem(option)
+        option.showDecorationSelected = True
+
+        active_icon = index.data(ACTIVE_SITE_ICON_ROLE)
+        remote_icon = index.data(REMOTE_SITE_ICON_ROLE)
+
+        availability_active = "{}/{}".format(
+            index.data(SYNC_ACTIVE_SITE_AVAILABILITY),
+            index.data(REPRESENTATIONS_COUNT_ROLE)
+        )
+        availability_remote = "{}/{}".format(
+            index.data(SYNC_REMOTE_SITE_AVAILABILITY),
+            index.data(REPRESENTATIONS_COUNT_ROLE)
+        )
+
+        if availability_active is None or availability_remote is None:
+            return
+
+        items_to_draw = [
+            (value, icon)
+            for value, icon in (
+                (availability_active, active_icon),
+                (availability_remote, remote_icon),
+            )
+            if icon
+        ]
+        if not items_to_draw:
+            return
+
+        icon_size = QtCore.QSize(24, 24)
+        padding = 10
+        pos_x = option.rect.x()
+
+        item_width = int(option.rect.width() / len(items_to_draw))
+        if item_width < 1:
+            item_width = 0
+
+        for value, icon in items_to_draw:
+            item_rect = QtCore.QRect(
+                pos_x,
+                option.rect.y(),
+                item_width,
+                option.rect.height()
+            )
+            # Prepare pos_x for next item
+            pos_x = item_rect.x() + item_rect.width()
+
+            pixmap = icon.pixmap(icon.actualSize(icon_size))
+            point = QtCore.QPoint(
+                item_rect.x() + padding,
+                item_rect.y() + ((item_rect.height() - pixmap.height()) * 0.5)
+            )
+            painter.drawPixmap(point, pixmap)
+
+            icon_offset = icon_size.width() + (padding * 2)
+            text_rect = QtCore.QRect(item_rect)
+            text_rect.setLeft(text_rect.left() + icon_offset)
+            if text_rect.width() < 1:
+                continue
+
+            painter.drawText(
+                text_rect,
+                option.displayAlignment,
+                value
+            )
+
+    def displayText(self, value, locale):
+        pass
diff --git a/openpype/tools/ayon_loader/ui/products_model.py b/openpype/tools/ayon_loader/ui/products_model.py
index 741f15766b..84f5bc9a5f 100644
--- a/openpype/tools/ayon_loader/ui/products_model.py
+++ b/openpype/tools/ayon_loader/ui/products_model.py
@@ -29,6 +29,11 @@ VERSION_HANDLES_ROLE = QtCore.Qt.UserRole + 18
 VERSION_STEP_ROLE = QtCore.Qt.UserRole + 19
 VERSION_AVAILABLE_ROLE = QtCore.Qt.UserRole + 20
 VERSION_THUMBNAIL_ID_ROLE = QtCore.Qt.UserRole + 21
+ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 22
+REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 23
+REPRESENTATIONS_COUNT_ROLE = QtCore.Qt.UserRole + 24
+SYNC_ACTIVE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 25
+SYNC_REMOTE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 26
 
 
 class ProductsModel(QtGui.QStandardItemModel):
@@ -68,6 +73,7 @@ class ProductsModel(QtGui.QStandardItemModel):
     published_time_col = column_labels.index("Time")
     folders_label_col = column_labels.index("Folder")
     in_scene_col = column_labels.index("In scene")
+    site_sync_avail_col = column_labels.index("Availability")
 
     def __init__(self, controller):
         super(ProductsModel, self).__init__()
@@ -303,7 +309,26 @@ class ProductsModel(QtGui.QStandardItemModel):
         model_item.setData(
             version_item.thumbnail_id, VERSION_THUMBNAIL_ID_ROLE)
 
-    def _get_product_model_item(self, product_item):
+        # TODO call site sync methods for all versions at once
+        project_name = self._last_project_name
+        version_id = version_item.version_id
+        repre_count = self._controller.get_versions_representation_count(
+            project_name, [version_id]
+        )[version_id]
+        active, remote = self._controller.get_version_sync_availability(
+            project_name, [version_id]
+        )[version_id]
+
+        model_item.setData(repre_count, REPRESENTATIONS_COUNT_ROLE)
+        model_item.setData(active, SYNC_ACTIVE_SITE_AVAILABILITY)
+        model_item.setData(remote, SYNC_REMOTE_SITE_AVAILABILITY)
+
+    def _get_product_model_item(
+        self,
+        product_item,
+        active_site_icon,
+        remote_site_icon
+    ):
         model_item = self._items_by_id.get(product_item.product_id)
         versions = list(product_item.version_items.values())
         versions.sort()
@@ -329,6 +354,9 @@ class ProductsModel(QtGui.QStandardItemModel):
         in_scene = 1 if product_item.product_in_scene else 0
         model_item.setData(in_scene, PRODUCT_IN_SCENE_ROLE)
 
+        model_item.setData(active_site_icon, ACTIVE_SITE_ICON_ROLE)
+        model_item.setData(remote_site_icon, REMOTE_SITE_ICON_ROLE)
+
         self._set_version_data_to_product_item(model_item, last_version)
         return model_item
 
@@ -341,6 +369,15 @@ class ProductsModel(QtGui.QStandardItemModel):
         self._last_project_name = project_name
         self._last_folder_ids = folder_ids
 
+        active_site_icon_def = self._controller.get_active_site_icon_def(
+            project_name
+        )
+        remote_site_icon_def = self._controller.get_remote_site_icon_def(
+            project_name
+        )
+        active_site_icon = get_qt_icon(active_site_icon_def)
+        remote_site_icon = get_qt_icon(remote_site_icon_def)
+
         product_items = self._controller.get_product_items(
             project_name,
             folder_ids,
@@ -402,7 +439,11 @@ class ProductsModel(QtGui.QStandardItemModel):
                 new_root_items.append(parent_item)
 
             for product_item in top_items:
-                item = self._get_product_model_item(product_item)
+                item = self._get_product_model_item(
+                    product_item,
+                    active_site_icon,
+                    remote_site_icon,
+                )
                 new_items.append(item)
 
             for path_info in merged_product_items.values():
@@ -418,7 +459,11 @@ class ProductsModel(QtGui.QStandardItemModel):
                 merged_product_types = set()
                 new_merged_items = []
                 for product_item in product_items:
-                    item = self._get_product_model_item(product_item)
+                    item = self._get_product_model_item(
+                        product_item,
+                        active_site_icon,
+                        remote_site_icon,
+                    )
                     new_merged_items.append(item)
                     merged_product_types.add(product_item.product_type)
 
diff --git a/openpype/tools/ayon_loader/ui/products_widget.py b/openpype/tools/ayon_loader/ui/products_widget.py
index 2d4959dc19..99faefe693 100644
--- a/openpype/tools/ayon_loader/ui/products_widget.py
+++ b/openpype/tools/ayon_loader/ui/products_widget.py
@@ -19,7 +19,11 @@ from .products_model import (
     VERSION_ID_ROLE,
     VERSION_THUMBNAIL_ID_ROLE,
 )
-from .products_delegates import VersionDelegate, LoadedInSceneDelegate
+from .products_delegates import (
+    VersionDelegate,
+    LoadedInSceneDelegate,
+    SiteSyncDelegate
+)
 from .actions_utils import show_actions_menu
 
 
@@ -92,7 +96,7 @@ class ProductsWidget(QtWidgets.QWidget):
         55,   # Handles
         10,   # Step
         25,   # Loaded in scene
-        65,   # Site info (maybe?)
+        65,   # Site sync info
     )
 
     def __init__(self, controller, parent):
@@ -135,6 +139,10 @@ class ProductsWidget(QtWidgets.QWidget):
         products_view.setItemDelegateForColumn(
             products_model.in_scene_col, in_scene_delegate)
 
+        site_sync_delegate = SiteSyncDelegate()
+        products_view.setItemDelegateForColumn(
+            products_model.site_sync_avail_col, site_sync_delegate)
+
         main_layout = QtWidgets.QHBoxLayout(self)
         main_layout.setContentsMargins(0, 0, 0, 0)
         main_layout.addWidget(products_view, 1)
@@ -167,6 +175,8 @@ class ProductsWidget(QtWidgets.QWidget):
 
         self._version_delegate = version_delegate
         self._time_delegate = time_delegate
+        self._in_scene_delegate = in_scene_delegate
+        self._site_sync_delegate = site_sync_delegate
 
         self._selected_project_name = None
         self._selected_folder_ids = set()
@@ -182,6 +192,9 @@ class ProductsWidget(QtWidgets.QWidget):
             products_model.in_scene_col,
             not controller.is_loaded_products_supported()
         )
+        self._set_site_sync_visibility(
+            self._controller.is_site_sync_enabled()
+        )
 
     def set_name_filter(self, name):
         """Set filter of product name.
@@ -216,6 +229,12 @@ class ProductsWidget(QtWidgets.QWidget):
     def refresh(self):
         self._refresh_model()
 
+    def _set_site_sync_visibility(self, site_sync_enabled):
+        self._products_view.setColumnHidden(
+            self._products_model.site_sync_avail_col,
+            not site_sync_enabled
+        )
+
     def _fill_version_editor(self):
         model = self._products_proxy_model
         index_queue = collections.deque()
@@ -375,7 +394,12 @@ class ProductsWidget(QtWidgets.QWidget):
         self._on_selection_change()
 
     def _on_folders_selection_change(self, event):
-        self._selected_project_name = event["project_name"]
+        project_name = event["project_name"]
+        site_sync_enabled = self._controller.is_site_sync_enabled(
+            project_name
+        )
+        self._set_site_sync_visibility(site_sync_enabled)
+        self._selected_project_name = project_name
         self._selected_folder_ids = event["folder_ids"]
         self._refresh_model()
         self._update_folders_label_visible()
diff --git a/openpype/tools/ayon_loader/ui/repres_widget.py b/openpype/tools/ayon_loader/ui/repres_widget.py
index 7de582e629..efc1bb89a4 100644
--- a/openpype/tools/ayon_loader/ui/repres_widget.py
+++ b/openpype/tools/ayon_loader/ui/repres_widget.py
@@ -14,6 +14,10 @@ REPRESENTATION_ID_ROLE = QtCore.Qt.UserRole + 2
 PRODUCT_NAME_ROLE = QtCore.Qt.UserRole + 3
 FOLDER_LABEL_ROLE = QtCore.Qt.UserRole + 4
 GROUP_TYPE_ROLE = QtCore.Qt.UserRole + 5
+ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 6
+REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 7
+SYNC_ACTIVE_SITE_PROGRESS = QtCore.Qt.UserRole + 8
+SYNC_REMOTE_SITE_PROGRESS = QtCore.Qt.UserRole + 9
 
 
 class RepresentationsModel(QtGui.QStandardItemModel):
@@ -22,12 +26,14 @@ class RepresentationsModel(QtGui.QStandardItemModel):
         ("Name", 120),
         ("Product name", 125),
         ("Folder", 125),
-        # ("Active site", 85),
-        # ("Remote site", 85)
+        ("Active site", 85),
+        ("Remote site", 85)
     ]
     column_labels = [label for label, _ in colums_info]
     column_widths = [width for _, width in colums_info]
     folder_column = column_labels.index("Product name")
+    active_site_column = column_labels.index("Active site")
+    remote_site_column = column_labels.index("Remote site")
 
     def __init__(self, controller):
         super(RepresentationsModel, self).__init__()
@@ -59,7 +65,7 @@ class RepresentationsModel(QtGui.QStandardItemModel):
         repre_items = self._controller.get_representation_items(
             self._selected_project_name, self._selected_version_ids
         )
-        self._fill_items(repre_items)
+        self._fill_items(repre_items, self._selected_project_name)
         self.refreshed.emit()
 
     def data(self, index, role=None):
@@ -69,13 +75,23 @@ class RepresentationsModel(QtGui.QStandardItemModel):
         col = index.column()
         if col != 0:
             if role == QtCore.Qt.DecorationRole:
-                return None
+                if col == 3:
+                    role = ACTIVE_SITE_ICON_ROLE
+                elif col == 4:
+                    role = REMOTE_SITE_ICON_ROLE
+                else:
+                    return None
 
             if role == QtCore.Qt.DisplayRole:
                 if col == 1:
                     role = PRODUCT_NAME_ROLE
                 elif col == 2:
                     role = FOLDER_LABEL_ROLE
+                elif col == 3:
+                    role = SYNC_ACTIVE_SITE_PROGRESS
+                elif col == 4:
+                    role = SYNC_REMOTE_SITE_PROGRESS
+
             index = self.index(index.row(), 0, index.parent())
         return super(RepresentationsModel, self).data(index, role)
 
@@ -89,7 +105,13 @@ class RepresentationsModel(QtGui.QStandardItemModel):
         root_item = self.invisibleRootItem()
         root_item.removeRows(0, root_item.rowCount())
 
-    def _get_repre_item(self, repre_item):
+    def _get_repre_item(
+        self,
+        repre_item,
+        active_site_icon,
+        remote_site_icon,
+        repres_sync_status
+    ):
         repre_id = repre_item.representation_id
         repre_name = repre_item.representation_name
         repre_icon = repre_item.representation_icon
@@ -102,6 +124,12 @@ class RepresentationsModel(QtGui.QStandardItemModel):
             item.setColumnCount(self.columnCount())
             item.setEditable(False)
 
+        sync_status = repres_sync_status[repre_id]
+        active_progress, remote_progress = sync_status
+
+        active_site_progress = "{}%".format(int(active_progress * 100))
+        remote_site_progress = "{}%".format(int(remote_progress * 100))
+
         icon = get_qt_icon(repre_icon)
         item.setData(repre_name, QtCore.Qt.DisplayRole)
         item.setData(icon, QtCore.Qt.DecorationRole)
@@ -109,6 +137,10 @@ class RepresentationsModel(QtGui.QStandardItemModel):
         item.setData(repre_id, REPRESENTATION_ID_ROLE)
         item.setData(repre_item.product_name, PRODUCT_NAME_ROLE)
         item.setData(repre_item.folder_label, FOLDER_LABEL_ROLE)
+        item.setData(active_site_icon, ACTIVE_SITE_ICON_ROLE)
+        item.setData(remote_site_icon, REMOTE_SITE_ICON_ROLE)
+        item.setData(active_site_progress, SYNC_ACTIVE_SITE_PROGRESS)
+        item.setData(remote_site_progress, SYNC_REMOTE_SITE_PROGRESS)
         return is_new_item, item
 
     def _get_group_icon(self):
@@ -134,14 +166,29 @@ class RepresentationsModel(QtGui.QStandardItemModel):
         self._groups_items_by_name[repre_name] = item
         return True, item
 
-    def _fill_items(self, repre_items):
+    def _fill_items(self, repre_items, project_name):
+        active_site_icon_def = self._controller.get_active_site_icon_def(
+            project_name
+        )
+        remote_site_icon_def = self._controller.get_remote_site_icon_def(
+            project_name
+        )
+        active_site_icon = get_qt_icon(active_site_icon_def)
+        remote_site_icon = get_qt_icon(remote_site_icon_def)
+
         items_to_remove = set(self._items_by_id.keys())
         repre_items_by_name = collections.defaultdict(list)
+        repre_ids = set()
         for repre_item in repre_items:
+            repre_ids.add(repre_item.representation_id)
             items_to_remove.discard(repre_item.representation_id)
             repre_name = repre_item.representation_name
             repre_items_by_name[repre_name].append(repre_item)
 
+        repres_sync_status = self._controller.get_representations_sync_status(
+            project_name, repre_ids
+        )
+
         root_item = self.invisibleRootItem()
         for repre_id in items_to_remove:
             item = self._items_by_id.pop(repre_id)
@@ -164,7 +211,12 @@ class RepresentationsModel(QtGui.QStandardItemModel):
 
             new_group_items = []
             for repre_item in repre_name_items:
-                is_new_item, item = self._get_repre_item(repre_item)
+                is_new_item, item = self._get_repre_item(
+                    repre_item,
+                    active_site_icon,
+                    remote_site_icon,
+                    repres_sync_status
+                )
                 item_parent = item.parent()
                 if item_parent is None:
                     item_parent = root_item
@@ -255,6 +307,9 @@ class RepresentationsWidget(QtWidgets.QWidget):
         self._repre_model = repre_model
         self._repre_proxy_model = repre_proxy_model
 
+        self._set_site_sync_visibility(
+            self._controller.is_site_sync_enabled()
+        )
         self._set_multiple_folders_selected(False)
 
     def refresh(self):
@@ -265,6 +320,20 @@ class RepresentationsWidget(QtWidgets.QWidget):
 
     def _on_project_change(self, event):
         self._selected_project_name = event["project_name"]
+        site_sync_enabled = self._controller.is_site_sync_enabled(
+            self._selected_project_name
+        )
+        self._set_site_sync_visibility(site_sync_enabled)
+
+    def _set_site_sync_visibility(self, site_sync_enabled):
+        self._repre_view.setColumnHidden(
+            self._repre_model.active_site_column,
+            not site_sync_enabled
+        )
+        self._repre_view.setColumnHidden(
+            self._repre_model.remote_site_column,
+            not site_sync_enabled
+        )
 
     def _set_multiple_folders_selected(self, selected_multiple_folders):
         if selected_multiple_folders == self._selected_multiple_folders:

From 463a7fb323f7f81d266ac354579775b7502c4f12 Mon Sep 17 00:00:00 2001
From: Toke Jepsen <tokejepsen@gmail.com>
Date: Mon, 4 Dec 2023 15:13:23 +0000
Subject: [PATCH 79/80] Skip Arnold license for test rendering. (#5984)

---
 .../input/workfile/test_project_test_asset_test_task_v001.ma     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma b/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
index c476a78086..2e882a5baa 100644
--- a/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
+++ b/tests/integration/hosts/maya/test_deadline_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
@@ -236,6 +236,7 @@ createNode polyDisc -n "polyDisc1";
 	rename -uid "9ED8A7BD-4FFD-6107-4322-35ACD1D3AC42";
 createNode aiOptions -s -n "defaultArnoldRenderOptions";
 	rename -uid "31A81965-48A6-B90D-503D-2FA162B7C982";
+	setAttr ".skip_license_check" yes;
 createNode aiAOVFilter -s -n "defaultArnoldFilter";
 	rename -uid "77A2BCB1-4613-905E-080E-B997FD5E1C6F";
 	setAttr ".ai_translator" -type "string" "gaussian";

From 71badb50ccaab5c4e1e3801e8268721c0ae7f133 Mon Sep 17 00:00:00 2001
From: Toke Jepsen <tokejepsen@gmail.com>
Date: Mon, 4 Dec 2023 15:14:59 +0000
Subject: [PATCH 80/80] Do not persist data by default. (#5987)

---
 tests/integration/hosts/maya/test_deadline_publish_in_maya.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/hosts/maya/test_deadline_publish_in_maya.py b/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
index c2ef342600..7d2b409db3 100644
--- a/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
+++ b/tests/integration/hosts/maya/test_deadline_publish_in_maya.py
@@ -21,7 +21,7 @@ class TestDeadlinePublishInMaya(MayaDeadlinePublishTestClass):
         {OPENPYPE_ROOT}/.venv/Scripts/python.exe {OPENPYPE_ROOT}/start.py runtests ../tests/integration/hosts/maya  # noqa: E501
 
     """
-    PERSIST = True
+    PERSIST = False
 
     TEST_FILES = [
         ("test_deadline_publish_in_maya", "", "")