From d1364d2c15de6b66dcd985f5f514c669352c2179 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 13 Mar 2024 20:31:14 +0800
Subject: [PATCH 01/48] bug fix on getting aov expected files when global aov
 mode disabled

---
 .../hosts/maya/api/lib_renderproducts.py      | 112 +++++++++---------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
index 7f26145e1d..63071c0053 100644
--- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py
+++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
@@ -1136,68 +1136,72 @@ class RenderProductsRedshift(ARenderProducts):
         light_groups_enabled = False
         has_beauty_aov = False
         colorspace = lib.get_color_management_output_transform()
-        for aov in aovs:
-            enabled = self._get_attr(aov, "enabled")
-            if not enabled:
-                continue
+        global_aov_enabled = bool(
+            self._get_attr("redshiftOptions.aovGlobalEnableMode")
+        )
+        if global_aov_enabled:
+            for aov in aovs:
+                enabled = self._get_attr(aov, "enabled")
+                if not enabled:
+                    continue
 
-            aov_type = self._get_attr(aov, "aovType")
-            if self.multipart and aov_type not in self.unmerged_aovs:
-                continue
+                aov_type = self._get_attr(aov, "aovType")
+                if self.multipart and aov_type not in self.unmerged_aovs:
+                    continue
 
-            # Any AOVs that still get processed, like Cryptomatte
-            # by themselves are not multipart files.
+                # Any AOVs that still get processed, like Cryptomatte
+                # by themselves are not multipart files.
 
-            # Redshift skips rendering of masterlayer without AOV suffix
-            # when a Beauty AOV is rendered. It overrides the main layer.
-            if aov_type == "Beauty":
-                has_beauty_aov = True
+                # Redshift skips rendering of masterlayer without AOV suffix
+                # when a Beauty AOV is rendered. It overrides the main layer.
+                if aov_type == "Beauty":
+                    has_beauty_aov = True
 
-            aov_name = self._get_attr(aov, "name")
+                aov_name = self._get_attr(aov, "name")
 
-            # Support light Groups
-            light_groups = []
-            if self._get_attr(aov, "supportsLightGroups"):
-                all_light_groups = self._get_attr(aov, "allLightGroups")
-                if all_light_groups:
-                    # All light groups is enabled
-                    light_groups = self._get_redshift_light_groups()
-                else:
-                    value = self._get_attr(aov, "lightGroupList")
-                    # note: string value can return None when never set
-                    if value:
-                        selected_light_groups = value.strip().split()
-                        light_groups = selected_light_groups
+                # Support light Groups
+                light_groups = []
+                if self._get_attr(aov, "supportsLightGroups"):
+                    all_light_groups = self._get_attr(aov, "allLightGroups")
+                    if all_light_groups:
+                        # All light groups is enabled
+                        light_groups = self._get_redshift_light_groups()
+                    else:
+                        value = self._get_attr(aov, "lightGroupList")
+                        # note: string value can return None when never set
+                        if value:
+                            selected_light_groups = value.strip().split()
+                            light_groups = selected_light_groups
 
-                for light_group in light_groups:
-                    aov_light_group_name = "{}_{}".format(aov_name,
-                                                          light_group)
-                    for camera in cameras:
-                        product = RenderProduct(
-                            productName=aov_light_group_name,
-                            aov=aov_name,
-                            ext=ext,
-                            multipart=False,
-                            camera=camera,
-                            driver=aov,
-                            colorspace=colorspace)
-                        products.append(product)
+                    for light_group in light_groups:
+                        aov_light_group_name = "{}_{}".format(aov_name,
+                                                            light_group)
+                        for camera in cameras:
+                            product = RenderProduct(
+                                productName=aov_light_group_name,
+                                aov=aov_name,
+                                ext=ext,
+                                multipart=False,
+                                camera=camera,
+                                driver=aov,
+                                colorspace=colorspace)
+                            products.append(product)
 
-            if light_groups:
-                light_groups_enabled = True
+                if light_groups:
+                    light_groups_enabled = True
 
-            # Redshift AOV Light Select always renders the global AOV
-            # even when light groups are present so we don't need to
-            # exclude it when light groups are active
-            for camera in cameras:
-                product = RenderProduct(productName=aov_name,
-                                        aov=aov_name,
-                                        ext=ext,
-                                        multipart=False,
-                                        camera=camera,
-                                        driver=aov,
-                                        colorspace=colorspace)
-                products.append(product)
+                # Redshift AOV Light Select always renders the global AOV
+                # even when light groups are present so we don't need to
+                # exclude it when light groups are active
+                for camera in cameras:
+                    product = RenderProduct(productName=aov_name,
+                                            aov=aov_name,
+                                            ext=ext,
+                                            multipart=False,
+                                            camera=camera,
+                                            driver=aov,
+                                            colorspace=colorspace)
+                    products.append(product)
 
         # When a Beauty AOV is added manually, it will be rendered as
         # 'Beauty_other' in file name and "standard" beauty will have

From 024f6f5163a72722f7bed1d2062c45cf02332d80 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 13 Mar 2024 21:22:23 +0800
Subject: [PATCH 02/48] return products instead if global aov mode is disabled

---
 .../hosts/maya/api/lib_renderproducts.py      | 112 +++++++++---------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
index 63071c0053..28981e1187 100644
--- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py
+++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
@@ -1139,69 +1139,71 @@ class RenderProductsRedshift(ARenderProducts):
         global_aov_enabled = bool(
             self._get_attr("redshiftOptions.aovGlobalEnableMode")
         )
-        if global_aov_enabled:
-            for aov in aovs:
-                enabled = self._get_attr(aov, "enabled")
-                if not enabled:
-                    continue
+        if not global_aov_enabled:
+            return products
 
-                aov_type = self._get_attr(aov, "aovType")
-                if self.multipart and aov_type not in self.unmerged_aovs:
-                    continue
+        for aov in aovs:
+            enabled = self._get_attr(aov, "enabled")
+            if not enabled:
+                continue
 
-                # Any AOVs that still get processed, like Cryptomatte
-                # by themselves are not multipart files.
+            aov_type = self._get_attr(aov, "aovType")
+            if self.multipart and aov_type not in self.unmerged_aovs:
+                continue
 
-                # Redshift skips rendering of masterlayer without AOV suffix
-                # when a Beauty AOV is rendered. It overrides the main layer.
-                if aov_type == "Beauty":
-                    has_beauty_aov = True
+            # Any AOVs that still get processed, like Cryptomatte
+            # by themselves are not multipart files.
 
-                aov_name = self._get_attr(aov, "name")
+            # Redshift skips rendering of masterlayer without AOV suffix
+            # when a Beauty AOV is rendered. It overrides the main layer.
+            if aov_type == "Beauty":
+                has_beauty_aov = True
 
-                # Support light Groups
-                light_groups = []
-                if self._get_attr(aov, "supportsLightGroups"):
-                    all_light_groups = self._get_attr(aov, "allLightGroups")
-                    if all_light_groups:
-                        # All light groups is enabled
-                        light_groups = self._get_redshift_light_groups()
-                    else:
-                        value = self._get_attr(aov, "lightGroupList")
-                        # note: string value can return None when never set
-                        if value:
-                            selected_light_groups = value.strip().split()
-                            light_groups = selected_light_groups
+            aov_name = self._get_attr(aov, "name")
 
-                    for light_group in light_groups:
-                        aov_light_group_name = "{}_{}".format(aov_name,
-                                                            light_group)
-                        for camera in cameras:
-                            product = RenderProduct(
-                                productName=aov_light_group_name,
-                                aov=aov_name,
-                                ext=ext,
-                                multipart=False,
-                                camera=camera,
-                                driver=aov,
-                                colorspace=colorspace)
-                            products.append(product)
+            # Support light Groups
+            light_groups = []
+            if self._get_attr(aov, "supportsLightGroups"):
+                all_light_groups = self._get_attr(aov, "allLightGroups")
+                if all_light_groups:
+                    # All light groups is enabled
+                    light_groups = self._get_redshift_light_groups()
+                else:
+                    value = self._get_attr(aov, "lightGroupList")
+                    # note: string value can return None when never set
+                    if value:
+                        selected_light_groups = value.strip().split()
+                        light_groups = selected_light_groups
 
-                if light_groups:
-                    light_groups_enabled = True
+                for light_group in light_groups:
+                    aov_light_group_name = "{}_{}".format(aov_name,
+                                                          light_group)
+                    for camera in cameras:
+                        product = RenderProduct(
+                            productName=aov_light_group_name,
+                            aov=aov_name,
+                            ext=ext,
+                            multipart=False,
+                            camera=camera,
+                            driver=aov,
+                            colorspace=colorspace)
+                        products.append(product)
 
-                # Redshift AOV Light Select always renders the global AOV
-                # even when light groups are present so we don't need to
-                # exclude it when light groups are active
-                for camera in cameras:
-                    product = RenderProduct(productName=aov_name,
-                                            aov=aov_name,
-                                            ext=ext,
-                                            multipart=False,
-                                            camera=camera,
-                                            driver=aov,
-                                            colorspace=colorspace)
-                    products.append(product)
+            if light_groups:
+                light_groups_enabled = True
+
+            # Redshift AOV Light Select always renders the global AOV
+            # even when light groups are present so we don't need to
+            # exclude it when light groups are active
+            for camera in cameras:
+                product = RenderProduct(productName=aov_name,
+                                        aov=aov_name,
+                                        ext=ext,
+                                        multipart=False,
+                                        camera=camera,
+                                        driver=aov,
+                                        colorspace=colorspace)
+                products.append(product)
 
         # When a Beauty AOV is added manually, it will be rendered as
         # 'Beauty_other' in file name and "standard" beauty will have

From b729bf4f30432a5a86ab7670e73b3e2b4514cc87 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 13 Mar 2024 23:56:31 +0800
Subject: [PATCH 03/48] make sure beauty still being added as render product

---
 client/ayon_core/hosts/maya/api/lib_renderproducts.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
index 28981e1187..3bba25ee12 100644
--- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py
+++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
@@ -1140,6 +1140,15 @@ class RenderProductsRedshift(ARenderProducts):
             self._get_attr("redshiftOptions.aovGlobalEnableMode")
         )
         if not global_aov_enabled:
+            beauty_name = "BeautyAux" if has_beauty_aov else ""
+            for camera in cameras:
+                products.insert(0,
+                                RenderProduct(productName=beauty_name,
+                                            ext=ext,
+                                            multipart=self.multipart,
+                                            camera=camera,
+                                            colorspace=colorspace))
+
             return products
 
         for aov in aovs:

From ffa395af64b066808cdffce100ad8593bf36fbd1 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 14 Mar 2024 15:10:03 +0800
Subject: [PATCH 04/48] add only beauty output when global aov disabled

---
 .../hosts/maya/api/lib_renderproducts.py      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
index 3bba25ee12..5f3917f642 100644
--- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py
+++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
@@ -1133,24 +1133,24 @@ class RenderProductsRedshift(ARenderProducts):
             aovs = list(set(aovs) - set(ref_aovs))
 
         products = []
-        light_groups_enabled = False
-        has_beauty_aov = False
-        colorspace = lib.get_color_management_output_transform()
         global_aov_enabled = bool(
             self._get_attr("redshiftOptions.aovGlobalEnableMode")
         )
+        colorspace = lib.get_color_management_output_transform()
         if not global_aov_enabled:
-            beauty_name = "BeautyAux" if has_beauty_aov else ""
+            # only beauty output
             for camera in cameras:
                 products.insert(0,
-                                RenderProduct(productName=beauty_name,
-                                            ext=ext,
-                                            multipart=self.multipart,
-                                            camera=camera,
-                                            colorspace=colorspace))
-
+                                RenderProduct(productName="",
+                                              ext=ext,
+                                              multipart=self.multipart,
+                                              camera=camera,
+                                              colorspace=colorspace))
             return products
 
+        light_groups_enabled = False
+        has_beauty_aov = False
+
         for aov in aovs:
             enabled = self._get_attr(aov, "enabled")
             if not enabled:

From 85dc52a2c1b9c63d29c9dd1755c2fe316cf5e2cd Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 20 Mar 2024 17:30:34 +0100
Subject: [PATCH 05/48] Fusion: Add Launch Hook to start "AYON menu" on Fusion
 start

---
 .../hooks/pre_fusion_launch_menu_hook.py      | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py

diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
new file mode 100644
index 0000000000..825d432a3e
--- /dev/null
+++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
@@ -0,0 +1,34 @@
+import os
+from ayon_core.lib import PreLaunchHook
+from ayon_core.hosts.fusion import FUSION_HOST_DIR
+
+
+class FusionLaunchMenuHook(PreLaunchHook):
+    """Launch OpenPype menu on start of Fusion"""
+    app_groups = ["fusion"]
+    order = 9
+
+    def execute(self):
+
+        # TODO: Make this optional via project settings
+
+        variant = self.application.name
+        if variant.isnumeric():
+            version = int(variant)
+            if version < 18:
+                print("Skipping launch of OpenPype menu on Fusion start "
+                      "because Fusion version below 18.0 does not support "
+                      "/execute argument on launch. "
+                      f"Version detected: {version}")
+                return
+        else:
+            print(f"Application variant is not numeric: {variant}. "
+                  "Validation for Fusion version 18+ for /execute "
+                  "prelaunch argument skipped.")
+
+        path = os.path.join(FUSION_HOST_DIR,
+                            "deploy",
+                            "MenuScripts",
+                            "launch_menu.py").replace("\\", "/")
+        script = f"fusion:RunScript('{path}')"
+        self.launch_context.launch_args.extend(["/execute", script])

From 943b4d7b087b9d0e257013b5be2e65d4c70d7da7 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 25 Mar 2024 13:35:25 +0100
Subject: [PATCH 06/48] Also update tool on only task or asset change

---
 client/ayon_core/hosts/fusion/api/plugin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py
index f63b5eaec3..1af3467bf1 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -125,6 +125,8 @@ class GenericCreateSaver(Creator):
         product_name = data["productName"]
         if (
             original_product_name != product_name
+            or tool.GetData("openpype.task") != data["task"]
+            or tool.GetData("openpype.asset") != data["asset"]
             or original_format != data["creator_attributes"]["image_format"]
         ):
             self._configure_saver_tool(data, tool, product_name)

From 55b389b7a7707dd1464bb819a440f2484c52a46b Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 25 Mar 2024 21:36:53 +0100
Subject: [PATCH 07/48] Only launch when enabled in settings

---
 .../hosts/fusion/hooks/pre_fusion_launch_menu_hook.py    | 6 ++++--
 server_addon/fusion/server/settings.py                   | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
index 825d432a3e..f5a1c75a50 100644
--- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
+++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
@@ -9,8 +9,10 @@ class FusionLaunchMenuHook(PreLaunchHook):
     order = 9
 
     def execute(self):
-
-        # TODO: Make this optional via project settings
+        # Prelaunch hook is optional
+        settings = self.data["project_settings"][self.host_name]
+        if not settings["hooks"]["FusionLaunchMenuHook"]["enabled"]:
+            return
 
         variant = self.application.name
         if variant.isnumeric():
diff --git a/server_addon/fusion/server/settings.py b/server_addon/fusion/server/settings.py
index a913db16da..b44feb1f03 100644
--- a/server_addon/fusion/server/settings.py
+++ b/server_addon/fusion/server/settings.py
@@ -75,6 +75,12 @@ class HooksModel(BaseSettingsModel):
         default_factory=HookOptionalModel,
         title="Install PySide2"
     )
+    FusionLaunchMenuHook: HookOptionalModel = SettingsField(
+        default_factory=HookOptionalModel,
+        title="Launch AYON Menu on Fusion Start",
+        description="Launch the AYON menu on Fusion application startup. "
+                    "This is only supported for Fusion 18+"
+    )
 
 
 class CreateSaverModel(CreateSaverPluginModel):
@@ -143,6 +149,9 @@ DEFAULT_VALUES = {
     "hooks": {
         "InstallPySideToFusion": {
             "enabled": True
+        },
+        "FusionLaunchMenuHook": {
+            "enabled": True
         }
     },
     "create": {

From 38c32c55af7b882cb75b161cbf581bc7c6cc2881 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 25 Mar 2024 21:37:22 +0100
Subject: [PATCH 08/48] Bump fusion server addon version

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

diff --git a/server_addon/fusion/server/version.py b/server_addon/fusion/server/version.py
index bbab0242f6..1276d0254f 100644
--- a/server_addon/fusion/server/version.py
+++ b/server_addon/fusion/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"

From 2ae618d2cbef243e3ea9ab57197ceda813410aca Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Mon, 25 Mar 2024 21:51:12 +0100
Subject: [PATCH 09/48] Update
 client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py

---
 .../ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
index f5a1c75a50..e70d4b844e 100644
--- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
+++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py
@@ -4,7 +4,7 @@ from ayon_core.hosts.fusion import FUSION_HOST_DIR
 
 
 class FusionLaunchMenuHook(PreLaunchHook):
-    """Launch OpenPype menu on start of Fusion"""
+    """Launch AYON menu on start of Fusion"""
     app_groups = ["fusion"]
     order = 9
 

From cb6f4dd79857ffbe62e8a99cb91d3db83f8712d5 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 27 Mar 2024 09:56:44 +0100
Subject: [PATCH 10/48] Turn off by default

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

diff --git a/server_addon/fusion/server/settings.py b/server_addon/fusion/server/settings.py
index b44feb1f03..f16ae6e3e7 100644
--- a/server_addon/fusion/server/settings.py
+++ b/server_addon/fusion/server/settings.py
@@ -151,7 +151,7 @@ DEFAULT_VALUES = {
             "enabled": True
         },
         "FusionLaunchMenuHook": {
-            "enabled": True
+            "enabled": False
         }
     },
     "create": {

From 8eab84e2dadafc1b1e00d0d33cd4bfed2d6f85ef Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Thu, 28 Mar 2024 18:10:28 +0100
Subject: [PATCH 11/48] Maya: Load Rendersetup - allow loading unmanaged +
 automatically 'accept' the import + pick import mode

---
 .../maya/plugins/load/load_rendersetup.py     | 112 ++++++++++++++----
 1 file changed, 86 insertions(+), 26 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
index 6f20e677f0..fb1183dfcb 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
@@ -9,7 +9,9 @@ instance.
 import json
 import sys
 import six
+import contextlib
 
+from ayon_core.lib import BoolDef, EnumDef
 from ayon_core.pipeline import (
     load,
     get_representation_path
@@ -21,6 +23,31 @@ from maya import cmds
 import maya.app.renderSetup.model.renderSetup as renderSetup
 
 
+@contextlib.contextmanager
+def mark_all_imported(enabled):
+    """Mark all imported nodes accepted by removing the `imported` attribute"""
+    if not enabled:
+        yield
+        return
+
+    node_types = cmds.pluginInfo("renderSetup", query=True, dependNode=True)
+
+    # Get node before load, then we can disable `imported`
+    # attribute on all new render setup layers after import
+    before = cmds.ls(type=node_types, long=True)
+    try:
+        yield
+    finally:
+        after = cmds.ls(type=node_types, long=True)
+        for node in (node for node in after if node not in before):
+            if cmds.attributeQuery("imported",
+                                   node=node,
+                                   exists=True):
+                plug = "{}.imported".format(node)
+                if cmds.getAttr(plug):
+                    cmds.deleteAttr(plug)
+
+
 class RenderSetupLoader(load.LoaderPlugin):
     """Load json preset for RenderSetup overwriting current one."""
 
@@ -32,38 +59,71 @@ class RenderSetupLoader(load.LoaderPlugin):
     icon = "tablet"
     color = "orange"
 
+    options = [
+        BoolDef("accept_import",
+                label="Accept import on load",
+                tooltip=(
+                  "By default importing or pasting Render Setup collections "
+                  "will display them italic in the Render Setup list.\nWith "
+                  "this enabled the load will directly mark the import "
+                  "'accepted' and remove the italic view."
+                ),
+                default=True),
+        BoolDef("load_managed",
+                label="Load Managed",
+                tooltip=(
+                  "Containerize the rendersetup on load so it can be "
+                  "'updated' later."
+                ),
+                default=True),
+        EnumDef("import_mode",
+                label="Import mode",
+                items={
+                    renderSetup.DECODE_AND_OVERWRITE: (
+                        "Flush existing render setup and "
+                        "add without any namespace"
+                    ),
+                    renderSetup.DECODE_AND_MERGE: (
+                        "Merge with the existing render setup objects and "
+                        "rename the unexpected objects"
+                    ),
+                    renderSetup.DECODE_AND_RENAME: (
+                        "Renaming all decoded render setup objects to not "
+                        "conflict with the existing render setup"
+                    ),
+                },
+                default=renderSetup.DECODE_AND_OVERWRITE)
+    ]
+
     def load(self, context, name, namespace, data):
         """Load RenderSetup settings."""
 
-        # from ayon_core.hosts.maya.api.lib import namespaced
-
-        folder_name = context["folder"]["name"]
-        namespace = namespace or lib.unique_namespace(
-            folder_name + "_",
-            prefix="_" if folder_name[0].isdigit() else "",
-            suffix="_",
-        )
         path = self.filepath_from_context(context)
+
+        accept_import = data.get("accept_import", True)
+        import_mode = data.get("import_mode", renderSetup.DECODE_AND_OVERWRITE)
+
         self.log.info(">>> loading json [ {} ]".format(path))
-        with open(path, "r") as file:
-            renderSetup.instance().decode(
-                json.load(file), renderSetup.DECODE_AND_OVERWRITE, None)
+        with mark_all_imported(accept_import):
+            with open(path, "r") as file:
+                renderSetup.instance().decode(
+                    json.load(file), import_mode, None)
 
-        nodes = []
-        null = cmds.sets(name="null_SET", empty=True)
-        nodes.append(null)
+        if data.get("load_managed", True):
+            self.log.info(">>> containerising [ {} ]".format(name))
+            asset = context['asset']['name']
+            namespace = namespace or lib.unique_namespace(
+                asset + "_",
+                prefix="_" if asset[0].isdigit() else "",
+                suffix="_",
+            )
 
-        self[:] = nodes
-        if not nodes:
-            return
-
-        self.log.info(">>> containerising [ {} ]".format(name))
-        return containerise(
-            name=name,
-            namespace=namespace,
-            nodes=nodes,
-            context=context,
-            loader=self.__class__.__name__)
+            return containerise(
+                name=name,
+                namespace=namespace,
+                nodes=[],
+                context=context,
+                loader=self.__class__.__name__)
 
     def remove(self, container):
         """Remove RenderSetup settings instance."""
@@ -73,7 +133,7 @@ class RenderSetupLoader(load.LoaderPlugin):
 
         self.log.info("Removing '%s' from Maya.." % container["name"])
 
-        container_content = cmds.sets(container_name, query=True)
+        container_content = cmds.sets(container_name, query=True) or []
         nodes = cmds.ls(container_content, long=True)
 
         nodes.append(container_name)

From 27d531536c779561ad6b0573be226eaf70e86b1b Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 12:28:48 +0100
Subject: [PATCH 12/48] Fix `asset` -> `folder`

---
 .../ayon_core/hosts/maya/plugins/load/load_rendersetup.py   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
index fb1183dfcb..53e8307fee 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
@@ -111,10 +111,10 @@ class RenderSetupLoader(load.LoaderPlugin):
 
         if data.get("load_managed", True):
             self.log.info(">>> containerising [ {} ]".format(name))
-            asset = context['asset']['name']
+            folder_name = context["folder"]["name"]
             namespace = namespace or lib.unique_namespace(
-                asset + "_",
-                prefix="_" if asset[0].isdigit() else "",
+                folder_name + "_",
+                prefix="_" if folder_name[0].isdigit() else "",
                 suffix="_",
             )
 

From 74ec0d0acda7e8cf88ec9dd826e00a79e4dc6623 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 13:04:56 +0100
Subject: [PATCH 13/48] Remove redundant import

---
 client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
index 53e8307fee..7096f86e35 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py
@@ -127,8 +127,6 @@ class RenderSetupLoader(load.LoaderPlugin):
 
     def remove(self, container):
         """Remove RenderSetup settings instance."""
-        from maya import cmds
-
         container_name = container["objectName"]
 
         self.log.info("Removing '%s' from Maya.." % container["name"])

From 9cbb3b136db73a422cceb2c1edc6cd2f19aa067a Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 14:29:28 +0100
Subject: [PATCH 14/48] Apply playback options in one call

---
 client/ayon_core/hosts/maya/api/lib.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index b18d3a0c33..ac3e32db0d 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2444,12 +2444,10 @@ def set_scene_fps(fps, update=True):
     cmds.currentUnit(time=unit, updateAnimation=update)
 
     # Set time slider data back to previous state
-    cmds.playbackOptions(edit=True, minTime=start_frame)
-    cmds.playbackOptions(edit=True, maxTime=end_frame)
-
-    # Set animation data
-    cmds.playbackOptions(edit=True, animationStartTime=animation_start)
-    cmds.playbackOptions(edit=True, animationEndTime=animation_end)
+    cmds.playbackOptions(minTime=start_frame,
+                         maxTime=end_frame,
+                         animationStartTime=animation_start,
+                         animationEndTime=animation_end)
 
     cmds.currentTime(current_frame, edit=True, update=True)
 

From f17170d43a4d2d567d72bf8fca0b8ed0d7aaba7b Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 14:37:29 +0100
Subject: [PATCH 15/48] Optimize `get_related_sets`

Opt-out earlier if no valid sets to perform less maya calls
---
 client/ayon_core/hosts/maya/api/lib.py | 36 ++++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index b18d3a0c33..2b0a4449c9 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2125,22 +2125,6 @@ def get_related_sets(node):
 
     """
 
-    # Ignore specific suffices
-    ignore_suffices = ["out_SET", "controls_SET", "_INST", "_CON"]
-
-    # Default nodes to ignore
-    defaults = {"defaultLightSet", "defaultObjectSet"}
-
-    # Ids to ignore
-    ignored = {
-        AVALON_INSTANCE_ID,
-        AVALON_CONTAINER_ID,
-        AYON_INSTANCE_ID,
-        AYON_CONTAINER_ID,
-    }
-
-    view_sets = get_isolate_view_sets()
-
     sets = cmds.listSets(object=node, extendToShape=False)
     if not sets:
         return []
@@ -2151,6 +2135,14 @@ def get_related_sets(node):
     # returned by `cmds.listSets(allSets=True)`
     sets = cmds.ls(sets)
 
+    # Ids to ignore
+    ignored = {
+        AVALON_INSTANCE_ID,
+        AVALON_CONTAINER_ID,
+        AYON_INSTANCE_ID,
+        AYON_CONTAINER_ID,
+    }
+
     # Ignore `avalon.container`
     sets = [
         s for s in sets
@@ -2159,6 +2151,8 @@ def get_related_sets(node):
            or cmds.getAttr(f"{s}.id") not in ignored
         )
     ]
+    if not sets:
+        return sets
 
     # Exclude deformer sets (`type=2` for `maya.cmds.listSets`)
     deformer_sets = cmds.listSets(object=node,
@@ -2168,12 +2162,20 @@ def get_related_sets(node):
     sets = [s for s in sets if s not in deformer_sets]
 
     # Ignore when the set has a specific suffix
+    ignore_suffices = ["out_SET", "controls_SET", "_INST", "_CON"]
     sets = [s for s in sets if not any(s.endswith(x) for x in ignore_suffices)]
 
+    # Default nodes to ignore
+    defaults = {"defaultLightSet", "defaultObjectSet"}
+    sets = [s for s in sets if s not in defaults]
+
+    if not sets:
+        return sets
+
     # Ignore viewport filter view sets (from isolate select and
     # viewports)
+    view_sets = get_isolate_view_sets()
     sets = [s for s in sets if s not in view_sets]
-    sets = [s for s in sets if s not in defaults]
 
     return sets
 

From c6a7272e89962a090454e52c63c660e2bfc4d8dd Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 14:42:34 +0100
Subject: [PATCH 16/48] Who would have known that `str.endswith` can take a
 `tuple`? You do!

---
 client/ayon_core/hosts/maya/api/lib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 2b0a4449c9..7e81ea6317 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2162,8 +2162,8 @@ def get_related_sets(node):
     sets = [s for s in sets if s not in deformer_sets]
 
     # Ignore when the set has a specific suffix
-    ignore_suffices = ["out_SET", "controls_SET", "_INST", "_CON"]
-    sets = [s for s in sets if not any(s.endswith(x) for x in ignore_suffices)]
+    ignore_suffices = ("out_SET", "controls_SET", "_INST", "_CON")
+    sets = [s for s in sets if not s.endswith(ignore_suffices)]
 
     # Default nodes to ignore
     defaults = {"defaultLightSet", "defaultObjectSet"}

From f0ba7e62723a2fb0e502ae59d4ad6d52f7007b1b Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 17:26:34 +0100
Subject: [PATCH 17/48] Optimize `get_all_children` logic with ignoring
 intermediate objects

---
 client/ayon_core/hosts/maya/api/lib.py        | 20 ++++++++++++--
 .../publish/collect_arnold_scene_source.py    | 17 ++++++++----
 .../maya/plugins/publish/collect_instances.py | 26 +++++++++----------
 .../maya/tools/mayalookassigner/commands.py   |  5 ++--
 4 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index b18d3a0c33..5ad893de06 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -4009,17 +4009,26 @@ def len_flattened(components):
     return n
 
 
-def get_all_children(nodes):
+def get_all_children(nodes, ignore_intermediate_objects=False):
     """Return all children of `nodes` including each instanced child.
     Using maya.cmds.listRelatives(allDescendents=True) includes only the first
     instance. As such, this function acts as an optimal replacement with a
     focus on a fast query.
 
+    Args:
+        nodes (iterable): List of nodes to get children for.
+        ignore_intermediate_objects (bool): Ignore any children that
+            are intermediate objects.
+
+    Returns:
+        set: Children of input nodes.
+
     """
 
     sel = OpenMaya.MSelectionList()
     traversed = set()
     iterator = OpenMaya.MItDag(OpenMaya.MItDag.kDepthFirst)
+    fn_dag = OpenMaya.MFnDagNode()
     for node in nodes:
 
         if node in traversed:
@@ -4036,6 +4045,13 @@ def get_all_children(nodes):
         iterator.next()  # noqa: B305
         while not iterator.isDone():
 
+            if ignore_intermediate_objects:
+                fn_dag.setObject(iterator.currentItem())
+                if fn_dag.isIntermediateObject:
+                    iterator.prune()
+                    iterator.next()  # noqa: B305
+                    continue
+
             path = iterator.fullPathName()
 
             if path in traversed:
@@ -4046,7 +4062,7 @@ def get_all_children(nodes):
             traversed.add(path)
             iterator.next()  # noqa: B305
 
-    return list(traversed)
+    return traversed
 
 
 def get_capture_preset(
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
index 2d621353e6..dca4560334 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
@@ -46,11 +46,18 @@ class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
         self.log.debug("data: {}".format(instance.data))
 
     def get_hierarchy(self, nodes):
-        """Return nodes with all their children"""
+        """Return nodes with all their children:
+
+        Arguments:
+            nodes (List[str]): List of nodes to collect children hierarchy for
+
+        Returns:
+            list: Input nodes with their children hierarchy
+
+        """
         nodes = cmds.ls(nodes, long=True)
         if not nodes:
             return []
-        children = get_all_children(nodes)
-        # Make sure nodes merged with children only
-        # contains unique entries
-        return list(set(nodes + children))
+
+        children = get_all_children(nodes, ignore_intermediate_objects=True)
+        return list(children.union(nodes))
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
index 85be15bb7b..774c217cfd 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
@@ -48,15 +48,15 @@ class CollectNewInstances(pyblish.api.InstancePlugin):
             # Collect members
             members = cmds.ls(members, long=True) or []
 
+            # Collect full hierarchy
             dag_members = cmds.ls(members, type="dagNode", long=True)
-            children = get_all_children(dag_members)
-            children = cmds.ls(children, noIntermediate=True, long=True)
-            parents = (
-                self.get_all_parents(members)
-                if creator_attributes.get("includeParentHierarchy", True)
-                else []
-            )
-            members_hierarchy = list(set(members + children + parents))
+            children = get_all_children(dag_members,
+                                        ignore_intermediate_objects=True)
+
+            members_hierarchy = set(members)
+            members_hierarchy.update(children)
+            if creator_attributes.get("includeParentHierarchy", True):
+                members_hierarchy.update(self.get_all_parents(dag_members))
 
             instance[:] = members_hierarchy
 
@@ -97,16 +97,16 @@ class CollectNewInstances(pyblish.api.InstancePlugin):
         """Get all parents by using string operations (optimization)
 
         Args:
-            nodes (list): the nodes which are found in the objectSet
+            nodes (iterable): the nodes which are found in the objectSet
 
         Returns:
-            list
+            set
         """
 
-        parents = []
+        parents = set()
         for node in nodes:
             splitted = node.split("|")
             items = ["|".join(splitted[0:i]) for i in range(2, len(splitted))]
-            parents.extend(items)
+            parents.update(items)
 
-        return list(set(parents))
+        return parents
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
index 75c82164c2..ad43a24385 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
+++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
@@ -49,8 +49,9 @@ def get_selected_nodes():
     """Get information from current selection"""
 
     selection = cmds.ls(selection=True, long=True)
-    hierarchy = lib.get_all_children(selection)
-    return list(set(selection + hierarchy))
+    hierarchy = lib.get_all_children(selection,
+                                     ignore_intermediate_objects=True)
+    return list(hierarchy.union(selection))
 
 
 def get_all_asset_nodes():

From 32b325b5cce2a0d1280565eaf5a1847576112137 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 29 Mar 2024 17:28:47 +0100
Subject: [PATCH 18/48] Cosmetics

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

diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
index dca4560334..0db89bee31 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
@@ -46,7 +46,7 @@ class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
         self.log.debug("data: {}".format(instance.data))
 
     def get_hierarchy(self, nodes):
-        """Return nodes with all their children:
+        """Return nodes with all their children.
 
         Arguments:
             nodes (List[str]): List of nodes to collect children hierarchy for

From f3324c3863598f1946525aef02cbd8abd5444637 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 2 Apr 2024 11:09:58 +0200
Subject: [PATCH 19/48] Perform one less list comprehension

---
 client/ayon_core/hosts/maya/api/lib.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 7e81ea6317..ef0e394cf0 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2155,20 +2155,20 @@ def get_related_sets(node):
         return sets
 
     # Exclude deformer sets (`type=2` for `maya.cmds.listSets`)
-    deformer_sets = cmds.listSets(object=node,
-                                  extendToShape=False,
-                                  type=2) or []
-    deformer_sets = set(deformer_sets)  # optimize lookup
-    sets = [s for s in sets if s not in deformer_sets]
+    exclude_sets = cmds.listSets(object=node,
+                                 extendToShape=False,
+                                 type=2) or []
+    exclude_sets = set(exclude_sets)  # optimize lookup
+
+    # Default nodes to ignore
+    exclude_sets.update({"defaultLightSet", "defaultObjectSet"})
+
+    # Filter out the sets to exclude
+    sets = [s for s in sets if s not in exclude_sets]
 
     # Ignore when the set has a specific suffix
     ignore_suffices = ("out_SET", "controls_SET", "_INST", "_CON")
     sets = [s for s in sets if not s.endswith(ignore_suffices)]
-
-    # Default nodes to ignore
-    defaults = {"defaultLightSet", "defaultObjectSet"}
-    sets = [s for s in sets if s not in defaults]
-
     if not sets:
         return sets
 

From 86624067c06d4cc28401693e07be15b3514e4209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 2 Apr 2024 15:20:07 +0200
Subject: [PATCH 20/48] :bug: add headless flag to prevent UI interactivity

---
 .../ayon_core/plugins/publish/extract_burnin.py   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py
index 727d7f1bc2..93774842ca 100644
--- a/client/ayon_core/plugins/publish/extract_burnin.py
+++ b/client/ayon_core/plugins/publish/extract_burnin.py
@@ -27,7 +27,7 @@ class ExtractBurnin(publish.Extractor):
     Extractor to create video with pre-defined burnins from
     existing extracted video representation.
 
-    It will work only on represenations having `burnin = True` or
+    It will work only on representations having `burnin = True` or
     `tags` including `burnin`
     """
 
@@ -125,7 +125,7 @@ class ExtractBurnin(publish.Extractor):
 
             burnin_defs = copy.deepcopy(src_burnin_defs)
 
-            # Filter output definition by `burnin` represetation key
+            # Filter output definition by `burnin` representation key
             repre_linked_burnins = [
                 burnin_def
                 for burnin_def in burnin_defs
@@ -378,6 +378,7 @@ class ExtractBurnin(publish.Extractor):
                 # Prepare subprocess arguments
                 args = list(executable_args)
                 args.append(temporary_json_filepath)
+                args.append("--headless")
                 self.log.debug("Executing: {}".format(" ".join(args)))
 
                 # Run burnin script
@@ -547,7 +548,7 @@ class ExtractBurnin(publish.Extractor):
         return burnin_data, temp_data
 
     def repres_is_valid(self, repre):
-        """Validation if representaion should be processed.
+        """Validation if representation should be processed.
 
         Args:
             repre (dict): Representation which should be checked.
@@ -579,7 +580,7 @@ class ExtractBurnin(publish.Extractor):
             tags (list): Tags of processed representation.
 
         Returns:
-            list: Containg all burnin definitions matching entered tags.
+            list: Contain all burnin definitions matching entered tags.
 
         """
         filtered_burnins = []
@@ -604,7 +605,7 @@ class ExtractBurnin(publish.Extractor):
 
         Store data to `temp_data` for keys "full_input_path" which is full path
         to source files optionally with sequence formatting,
-        "full_output_path" full path to otput with optionally with sequence
+        "full_output_path" full path to output with optionally with sequence
         formatting, "full_input_paths" list of all source files which will be
         deleted when burnin script ends, "repre_files" list of output
         filenames.
@@ -754,7 +755,7 @@ class ExtractBurnin(publish.Extractor):
             profile (dict): Profile from presets matching current context.
 
         Returns:
-            list: Containg all valid output definitions.
+            list: Contain all valid output definitions.
         """
         filtered_burnin_defs = []
 
@@ -775,7 +776,7 @@ class ExtractBurnin(publish.Extractor):
             ):
                 self.log.debug((
                     "Skipped burnin definition \"{}\". Family"
-                    " fiters ({}) does not match current instance families: {}"
+                    " filters ({}) does not match current instance families: {}"
                 ).format(
                     filename_suffix, str(families_filters), str(families)
                 ))

From 3c14b3e356e0c2cb95e44a1618849564666a310b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 2 Apr 2024 17:36:21 +0200
Subject: [PATCH 21/48] live update of applications and tools attribute

---
 server_addon/applications/server/__init__.py | 167 ++++++++++++++-----
 1 file changed, 128 insertions(+), 39 deletions(-)

diff --git a/server_addon/applications/server/__init__.py b/server_addon/applications/server/__init__.py
index d5c2de3df3..a199325475 100644
--- a/server_addon/applications/server/__init__.py
+++ b/server_addon/applications/server/__init__.py
@@ -118,9 +118,28 @@ class ApplicationsAddon(BaseServerAddon):
             )
 
     async def setup(self):
-        need_restart = await self.create_applications_attribute()
+        need_restart = await self.create_required_attributes()
         if need_restart:
             self.request_server_restart()
+        await self.update_enums()
+
+    def _get_applications_def(self):
+        return {
+            "name": "applications",
+            "type": "list_of_strings",
+            "title": "Applications",
+            "scope": ["project"],
+            "enum":[],
+        }
+
+    def _get_tools_def(self):
+        return {
+            "name": "tools",
+            "type": "list_of_strings",
+            "title": "Tools",
+            "scope": ["project", "folder", "task"],
+            "enum":[],
+        }
 
     async def create_applications_attribute(self) -> bool:
         """Make sure there are required attributes which ftrack addon needs.
@@ -129,6 +148,85 @@ class ApplicationsAddon(BaseServerAddon):
             bool: 'True' if an attribute was created or updated.
         """
 
+        need_restart = await self.create_required_attributes()
+        await self.update_enums()
+        return need_restart
+
+    async def create_required_attributes(self) -> bool:
+        """Make sure there are required 'applications' and 'tools' attributes.
+        This only checks for the existence of the attributes, it does not populate
+        them with any data. When an attribute is added, server needs to be restarted,
+        while adding enum data to the attribute does not require a restart.
+        Returns:
+            bool: 'True' if an attribute was created or updated.
+        """
+
+        # keep track of the last attribute position (for adding new attributes)
+        apps_present = False
+        tools_present = False
+        apps_attribute_data = self._get_applications_def()
+        apps_attrib_name = apps_attribute_data["name"]
+
+        tools_attribute_data = self._get_tools_def()
+        tools_attrib_name = tools_attribute_data["name"]
+
+        last_index = -1
+        async for row in Postgres.iterate(
+            "SELECT name, position FROM attributes ORDER BY position"
+        ):
+            # check if the required attributes are present
+            # (in that case, we don't need to add them)
+            # also keep track of the last attribute position
+            if row["name"] == apps_attrib_name:
+                apps_present = True
+            elif row["name"] == tools_attrib_name:
+                tools_present = True
+            last_index = row["position"]
+
+        attributes_to_create = {}
+        if not apps_present:
+            attributes_to_create[apps_attrib_name] = {
+                "scope": apps_attribute_data["scope"],
+                "data": {
+                    "title": apps_attribute_data["title"],
+                    "type": apps_attribute_data["type"],
+                    "enum": [],
+                }
+            }
+
+        if not tools_present:
+            attributes_to_create[tools_attrib_name] = {
+                "scope": tools_attribute_data["scope"],
+                "data": {
+                    "title": tools_attribute_data["title"],
+                    "type": tools_attribute_data["type"],
+                    "enum": [],
+                },
+            }
+
+        # when any of the required attributes are not present, add them
+        # and return 'True' to indicate that server needs to be restarted
+        needs_restart = False
+        for name, payload in attributes_to_create.items():
+            await Postgres.execute(
+                "INSERT INTO attributes (name, position, scope, data) VALUES ($1, $2, $3, $4)",
+                name,
+                last_index + 1,
+                payload["scope"],
+                payload["data"],
+            )
+            last_index += 1
+            needs_restart = True
+
+        return needs_restart
+
+    async def update_enums(self):
+        """Updates applications and tools enums based on the addon settings.
+        This method is called when the addon is started (after we are sure that the
+        'applications' and 'tools' attributes exist) and when the addon settings are
+        updated (using on_settings_updated method).
+        """
+
         instance = AddonLibrary.getinstance()
         app_defs = instance.data.get(self.name)
         all_applications = []
@@ -148,33 +246,32 @@ class ApplicationsAddon(BaseServerAddon):
                 merge_groups(all_applications, app_groups)
                 merge_groups(all_tools, studio_settings["tool_groups"])
 
-        query = "SELECT name, position, scope, data from public.attributes"
-
         apps_attrib_name = "applications"
         tools_attrib_name = "tools"
 
         apps_enum = get_enum_items_from_groups(all_applications)
         tools_enum = get_enum_items_from_groups(all_tools)
+
         apps_attribute_data = {
             "type": "list_of_strings",
             "title": "Applications",
-            "enum": apps_enum
+            "enum": apps_enum,
         }
         tools_attribute_data = {
             "type": "list_of_strings",
             "title": "Tools",
-            "enum": tools_enum
+            "enum": tools_enum,
         }
+
         apps_scope = ["project"]
         tools_scope = ["project", "folder", "task"]
 
-        apps_match_position = None
         apps_matches = False
-        tools_match_position = None
         tools_matches = False
-        position = 1
-        async for row in Postgres.iterate(query):
-            position += 1
+
+        async for row in Postgres.iterate(
+            "SELECT name, position, scope, data from public.attributes"
+        ):
             if row["name"] == apps_attrib_name:
                 # Check if scope is matching ftrack addon requirements
                 if (
@@ -182,7 +279,6 @@ class ApplicationsAddon(BaseServerAddon):
                     and row["data"].get("enum") == apps_enum
                 ):
                     apps_matches = True
-                apps_match_position = row["position"]
 
             elif row["name"] == tools_attrib_name:
                 if (
@@ -190,45 +286,38 @@ class ApplicationsAddon(BaseServerAddon):
                     and row["data"].get("enum") == tools_enum
                 ):
                     tools_matches = True
-                tools_match_position = row["position"]
 
         if apps_matches and tools_matches:
-            return False
+            return
 
-        postgre_query = "\n".join((
-            "INSERT INTO public.attributes",
-            "    (name, position, scope, data)",
-            "VALUES",
-            "    ($1, $2, $3, $4)",
-            "ON CONFLICT (name)",
-            "DO UPDATE SET",
-            "    scope = $3,",
-            "    data = $4",
-        ))
         if not apps_matches:
-            # Reuse position from found attribute
-            if apps_match_position is None:
-                apps_match_position = position
-                position += 1
-
             await Postgres.execute(
-                postgre_query,
-                apps_attrib_name,
-                apps_match_position,
+                """
+                UPDATE attributes SET
+                    scope = $1,
+                    data = $2
+                WHERE 
+                    name = $3
+                """,
                 apps_scope,
                 apps_attribute_data,
+                apps_attrib_name,
             )
 
         if not tools_matches:
-            if tools_match_position is None:
-                tools_match_position = position
-                position += 1
-
             await Postgres.execute(
-                postgre_query,
-                tools_attrib_name,
-                tools_match_position,
+                """
+                UPDATE attributes SET
+                    scope = $1,
+                    data = $2
+                WHERE 
+                    name = $3
+                """,
                 tools_scope,
                 tools_attribute_data,
+                tools_attrib_name,
             )
-        return True
+
+    async def on_settings_changed(self, *args, **kwargs):
+        _ = args, kwargs
+        await self.update_enums()
\ No newline at end of file

From 769bcbaf2e39b4a67d8f6504e8860b53d46b93df Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 2 Apr 2024 17:36:43 +0200
Subject: [PATCH 22/48] bump version to 0.1.9

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

diff --git a/server_addon/applications/server/version.py b/server_addon/applications/server/version.py
index 9cb17e7976..c11f861afb 100644
--- a/server_addon/applications/server/version.py
+++ b/server_addon/applications/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.9"

From 98bed9f5c610deb2f947d643573ce18bd85054da Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 2 Apr 2024 18:10:03 +0200
Subject: [PATCH 23/48] Update to latest avalon core

---
 client/ayon_core/hosts/fusion/api/plugin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py
index c2ecea93fc..80167189a5 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -126,7 +126,7 @@ class GenericCreateSaver(Creator):
         if (
             original_product_name != product_name
             or tool.GetData("openpype.task") != data["task"]
-            or tool.GetData("openpype.asset") != data["asset"]
+            or tool.GetData("openpype.folderPath") != data["folderPath"]
             or original_format != data["creator_attributes"]["image_format"]
         ):
             self._configure_saver_tool(data, tool, product_name)

From 9e3bba4feab7b4a9f78c338249cf080c0fb8bebc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 3 Apr 2024 12:40:27 +0200
Subject: [PATCH 24/48] use project name from context for settings collection

---
 client/ayon_core/plugins/publish/collect_settings.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/plugins/publish/collect_settings.py b/client/ayon_core/plugins/publish/collect_settings.py
index 66b89a114c..5b0e17d8c5 100644
--- a/client/ayon_core/plugins/publish/collect_settings.py
+++ b/client/ayon_core/plugins/publish/collect_settings.py
@@ -1,5 +1,5 @@
 from pyblish import api
-from ayon_core.settings import get_current_project_settings
+from ayon_core.settings import get_project_settings
 
 
 class CollectSettings(api.ContextPlugin):
@@ -9,4 +9,7 @@ class CollectSettings(api.ContextPlugin):
     label = "Collect Settings"
 
     def process(self, context):
-        context.data["project_settings"] = get_current_project_settings()
+        project_name = context.data["projectName"]
+        project_settings = get_project_settings(project_name)
+        context.data["project_settings"] = project_settings
+        context.data["projectSettings"] = project_settings

From 3ddcae8f4ecb89b15d25f4a3fe1cb08fe0875d8d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 3 Apr 2024 12:42:40 +0200
Subject: [PATCH 25/48] added debug log

---
 client/ayon_core/plugins/publish/collect_settings.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/ayon_core/plugins/publish/collect_settings.py b/client/ayon_core/plugins/publish/collect_settings.py
index 5b0e17d8c5..6628bb1bb0 100644
--- a/client/ayon_core/plugins/publish/collect_settings.py
+++ b/client/ayon_core/plugins/publish/collect_settings.py
@@ -10,6 +10,9 @@ class CollectSettings(api.ContextPlugin):
 
     def process(self, context):
         project_name = context.data["projectName"]
+        self.log.debug(
+            "Collecting settings for project: {}".format(project_name)
+        )
         project_settings = get_project_settings(project_name)
         context.data["project_settings"] = project_settings
         context.data["projectSettings"] = project_settings

From 010e1256273df8639da19f527a199c051057e088 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 3 Apr 2024 13:43:56 +0200
Subject: [PATCH 26/48] remove 'projectSettings' key

---
 client/ayon_core/plugins/publish/collect_settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/plugins/publish/collect_settings.py b/client/ayon_core/plugins/publish/collect_settings.py
index 6628bb1bb0..db58e7eaa9 100644
--- a/client/ayon_core/plugins/publish/collect_settings.py
+++ b/client/ayon_core/plugins/publish/collect_settings.py
@@ -15,4 +15,3 @@ class CollectSettings(api.ContextPlugin):
         )
         project_settings = get_project_settings(project_name)
         context.data["project_settings"] = project_settings
-        context.data["projectSettings"] = project_settings

From 72aeb63ef974cfc80bd1ff0d22b1f51448336939 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 3 Apr 2024 14:12:13 +0200
Subject: [PATCH 27/48] reset cache of attributes on server when enums are
 updated

---
 server_addon/applications/server/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server_addon/applications/server/__init__.py b/server_addon/applications/server/__init__.py
index a199325475..07e6c46cc3 100644
--- a/server_addon/applications/server/__init__.py
+++ b/server_addon/applications/server/__init__.py
@@ -3,6 +3,7 @@ import json
 import copy
 
 from ayon_server.addons import BaseServerAddon, AddonLibrary
+from ayon_server.entities.core import attribute_library
 from ayon_server.lib.postgres import Postgres
 
 from .version import __version__
@@ -318,6 +319,9 @@ class ApplicationsAddon(BaseServerAddon):
                 tools_attrib_name,
             )
 
+        # Reset attributes cache on server
+        attribute_library.load()
+
     async def on_settings_changed(self, *args, **kwargs):
         _ = args, kwargs
         await self.update_enums()
\ No newline at end of file

From 16bc2e601dd448a836e4289aed5e107e76803512 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 3 Apr 2024 14:12:28 +0200
Subject: [PATCH 28/48] make 'update_enums' private method '_update_enums'

---
 server_addon/applications/server/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server_addon/applications/server/__init__.py b/server_addon/applications/server/__init__.py
index 07e6c46cc3..30181285fb 100644
--- a/server_addon/applications/server/__init__.py
+++ b/server_addon/applications/server/__init__.py
@@ -122,7 +122,7 @@ class ApplicationsAddon(BaseServerAddon):
         need_restart = await self.create_required_attributes()
         if need_restart:
             self.request_server_restart()
-        await self.update_enums()
+        await self._update_enums()
 
     def _get_applications_def(self):
         return {
@@ -150,7 +150,7 @@ class ApplicationsAddon(BaseServerAddon):
         """
 
         need_restart = await self.create_required_attributes()
-        await self.update_enums()
+        await self._update_enums()
         return need_restart
 
     async def create_required_attributes(self) -> bool:
@@ -221,7 +221,7 @@ class ApplicationsAddon(BaseServerAddon):
 
         return needs_restart
 
-    async def update_enums(self):
+    async def _update_enums(self):
         """Updates applications and tools enums based on the addon settings.
         This method is called when the addon is started (after we are sure that the
         'applications' and 'tools' attributes exist) and when the addon settings are
@@ -324,4 +324,4 @@ class ApplicationsAddon(BaseServerAddon):
 
     async def on_settings_changed(self, *args, **kwargs):
         _ = args, kwargs
-        await self.update_enums()
\ No newline at end of file
+        await self._update_enums()

From 5a4f374e921ef05e91abfb0eedfeb3fdae920b7a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 3 Apr 2024 15:46:17 +0200
Subject: [PATCH 29/48] better sql queries

---
 server_addon/applications/server/__init__.py | 84 +++++++++-----------
 1 file changed, 36 insertions(+), 48 deletions(-)

diff --git a/server_addon/applications/server/__init__.py b/server_addon/applications/server/__init__.py
index 30181285fb..2668589cbe 100644
--- a/server_addon/applications/server/__init__.py
+++ b/server_addon/applications/server/__init__.py
@@ -163,61 +163,49 @@ class ApplicationsAddon(BaseServerAddon):
         """
 
         # keep track of the last attribute position (for adding new attributes)
-        apps_present = False
-        tools_present = False
         apps_attribute_data = self._get_applications_def()
-        apps_attrib_name = apps_attribute_data["name"]
-
         tools_attribute_data = self._get_tools_def()
+
+        apps_attrib_name = apps_attribute_data["name"]
         tools_attrib_name = tools_attribute_data["name"]
 
-        last_index = -1
-        async for row in Postgres.iterate(
-            "SELECT name, position FROM attributes ORDER BY position"
-        ):
-            # check if the required attributes are present
-            # (in that case, we don't need to add them)
-            # also keep track of the last attribute position
-            if row["name"] == apps_attrib_name:
-                apps_present = True
-            elif row["name"] == tools_attrib_name:
-                tools_present = True
-            last_index = row["position"]
+        async with Postgres.acquire() as conn, conn.transaction():
+            query = "SELECT BOOL_OR(name = 'applications') AS has_applications, BOOL_OR(name = 'tools') AS has_tools FROM attributes;"
+            result = (await conn.fetch(query))[0]
 
-        attributes_to_create = {}
-        if not apps_present:
-            attributes_to_create[apps_attrib_name] = {
-                "scope": apps_attribute_data["scope"],
-                "data": {
-                    "title": apps_attribute_data["title"],
-                    "type": apps_attribute_data["type"],
-                    "enum": [],
+            attributes_to_create = {}
+            if not result["has_applications"]:
+                attributes_to_create[apps_attrib_name] = {
+                    "scope": apps_attribute_data["scope"],
+                    "data": {
+                        "title": apps_attribute_data["title"],
+                        "type": apps_attribute_data["type"],
+                        "enum": [],
+                    }
                 }
-            }
 
-        if not tools_present:
-            attributes_to_create[tools_attrib_name] = {
-                "scope": tools_attribute_data["scope"],
-                "data": {
-                    "title": tools_attribute_data["title"],
-                    "type": tools_attribute_data["type"],
-                    "enum": [],
-                },
-            }
+            if not result["has_tools"]:
+                attributes_to_create[tools_attrib_name] = {
+                    "scope": tools_attribute_data["scope"],
+                    "data": {
+                        "title": tools_attribute_data["title"],
+                        "type": tools_attribute_data["type"],
+                        "enum": [],
+                    },
+                }
 
-        # when any of the required attributes are not present, add them
-        # and return 'True' to indicate that server needs to be restarted
-        needs_restart = False
-        for name, payload in attributes_to_create.items():
-            await Postgres.execute(
-                "INSERT INTO attributes (name, position, scope, data) VALUES ($1, $2, $3, $4)",
-                name,
-                last_index + 1,
-                payload["scope"],
-                payload["data"],
-            )
-            last_index += 1
-            needs_restart = True
+            needs_restart = False
+            # when any of the required attributes are not present, add them
+            # and return 'True' to indicate that server needs to be restarted
+            for name, payload in attributes_to_create.items():
+                insert_query = "INSERT INTO attributes (name, scope, data, position) VALUES ($1, $2, $3, (SELECT COALESCE(MAX(position), 0) + 1 FROM attributes)) ON CONFLICT DO NOTHING"
+                await conn.execute(
+                    insert_query,
+                    name,
+                    payload["scope"],
+                    payload["data"],
+                )
+                needs_restart = True
 
         return needs_restart
 
@@ -320,7 +308,7 @@ class ApplicationsAddon(BaseServerAddon):
             )
 
         # Reset attributes cache on server
-        attribute_library.load()
+        await attribute_library.load()
 
     async def on_settings_changed(self, *args, **kwargs):
         _ = args, kwargs

From 6109803c1d48a0a302e158e81724aff96821f070 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 3 Apr 2024 16:08:09 +0200
Subject: [PATCH 30/48] Update instances using `CreateContext` to correctly
 update product names if needed

- Also rely on task attributes for resolution and frame ranges instead of folder attributes
---
 client/ayon_core/hosts/maya/api/lib.py | 71 +++++++++++++++-----------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 8d418813cd..52ac67f3e2 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -37,7 +37,7 @@ from ayon_core.pipeline import (
     AYON_CONTAINER_ID,
 )
 from ayon_core.lib import NumberDef
-from ayon_core.pipeline.context_tools import get_current_folder_entity
+from ayon_core.pipeline.context_tools import get_current_task_entity
 from ayon_core.pipeline.create import CreateContext
 from ayon_core.lib.profiles_filtering import filter_profiles
 
@@ -2636,7 +2636,7 @@ def reset_scene_resolution():
         None
     """
 
-    folder_attributes = get_current_folder_entity()["attrib"]
+    folder_attributes = get_current_task_entity(fields={"attrib"})["attrib"]
 
     # Set resolution
     width = folder_attributes.get("resolutionWidth", 1920)
@@ -3244,33 +3244,46 @@ def update_content_on_context_change():
     """
     This will update scene content to match new folder on context change
     """
-    scene_sets = cmds.listSets(allSets=True)
-    folder_entity = get_current_folder_entity()
-    folder_attributes = folder_entity["attrib"]
-    new_folder_path = folder_entity["path"]
-    for s in scene_sets:
-        try:
-            if cmds.getAttr("{}.id".format(s)) in {
-                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
-            }:
-                attr = cmds.listAttr(s)
-                print(s)
-                if "folderPath" in attr:
-                    print(
-                        "  - setting folder to: [ {} ]".format(new_folder_path)
-                    )
-                    cmds.setAttr(
-                        "{}.folderPath".format(s),
-                        new_folder_path, type="string"
-                    )
-                if "frameStart" in attr:
-                    cmds.setAttr("{}.frameStart".format(s),
-                                 folder_attributes["frameStart"])
-                if "frameEnd" in attr:
-                    cmds.setAttr("{}.frameEnd".format(s),
-                                 folder_attributes["frameEnd"],)
-        except ValueError:
-            pass
+
+    host = registered_host()
+    create_context = CreateContext(host)
+    folder_entity = get_current_task_entity(fields={"attrib"})
+
+    instance_values = {
+        "folderPath": create_context.get_current_folder_path(),
+        "task": create_context.get_current_task_name(),
+    }
+    creator_attribute_values = {
+        "frameStart": folder_entity["attrib"]["frameStart"],
+        "frameEnd": folder_entity["attrib"]["frameEnd"],
+    }
+
+    has_changes = False
+    for instance in create_context.instances:
+        for key, value in instance_values.items():
+            if key not in instance or instance[key] == value:
+                continue
+
+            # Update instance value
+            print(f"Updating {instance.product_name} {key} to: {value}")
+            instance[key] = value
+            has_changes = True
+
+        creator_attributes = instance.creator_attributes
+        for key, value in creator_attribute_values.items():
+            if (
+                    key not in creator_attributes
+                    or creator_attributes[key] == value
+            ):
+                continue
+
+            # Update instance creator attribute value
+            print(f"Updating {instance.product_name} {key} to: {value}")
+            instance[key] = value
+            has_changes = True
+
+    if has_changes:
+        create_context.save_changes()
 
 
 def show_message(title, msg):

From 5acf6f3b08fc3423c4af9a7bea4fc442a50b80a8 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 3 Apr 2024 16:12:51 +0200
Subject: [PATCH 31/48] Update variable name

---
 client/ayon_core/hosts/maya/api/lib.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 52ac67f3e2..8bf753693f 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2636,12 +2636,12 @@ def reset_scene_resolution():
         None
     """
 
-    folder_attributes = get_current_task_entity(fields={"attrib"})["attrib"]
+    task_attributes = get_current_task_entity(fields={"attrib"})["attrib"]
 
     # Set resolution
-    width = folder_attributes.get("resolutionWidth", 1920)
-    height = folder_attributes.get("resolutionHeight", 1080)
-    pixelAspect = folder_attributes.get("pixelAspect", 1)
+    width = task_attributes.get("resolutionWidth", 1920)
+    height = task_attributes.get("resolutionHeight", 1080)
+    pixelAspect = task_attributes.get("pixelAspect", 1)
 
     set_scene_resolution(width, height, pixelAspect)
 

From ef0cc38d7f7b3cb959444673c9f28d36ce861338 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 3 Apr 2024 16:13:02 +0200
Subject: [PATCH 32/48] Cosmetics

---
 client/ayon_core/hosts/maya/api/lib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 8bf753693f..07ae65748e 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2641,9 +2641,9 @@ def reset_scene_resolution():
     # Set resolution
     width = task_attributes.get("resolutionWidth", 1920)
     height = task_attributes.get("resolutionHeight", 1080)
-    pixelAspect = task_attributes.get("pixelAspect", 1)
+    pixel_aspect = task_attributes.get("pixelAspect", 1)
 
-    set_scene_resolution(width, height, pixelAspect)
+    set_scene_resolution(width, height, pixel_aspect)
 
 
 def set_context_settings(

From c48364cd0546e50d8497a3fc6e163f13d25931a7 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 3 Apr 2024 16:13:32 +0200
Subject: [PATCH 33/48] Update docstring

---
 client/ayon_core/hosts/maya/api/lib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 07ae65748e..72f680943f 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -2629,8 +2629,8 @@ def reset_frame_range(playback=True, render=True, fps=True):
 def reset_scene_resolution():
     """Apply the scene resolution  from the project definition
 
-    scene resolution can be overwritten by an folder if the folder.attrib
-    contains any information regarding scene resolution .
+    The scene resolution will be retrieved from the current task entity's
+    attributes.
 
     Returns:
         None

From ca04b809c3e12614497739dd39818b4a4a4b8a00 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Thu, 4 Apr 2024 01:43:19 +0200
Subject: [PATCH 34/48] Compute workdir based on instance folder path and task
 data if it does not match current context

---
 client/ayon_core/hosts/fusion/api/plugin.py | 31 ++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py
index 80167189a5..efe8269120 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -16,6 +16,12 @@ from ayon_core.pipeline import (
     AVALON_INSTANCE_ID,
     AYON_INSTANCE_ID,
 )
+from ayon_core.pipeline.workfile import get_workdir
+from ayon_api import (
+    get_project,
+    get_folder_by_path,
+    get_task_by_name
+)
 
 
 class GenericCreateSaver(Creator):
@@ -147,7 +153,30 @@ class GenericCreateSaver(Creator):
         folder_path = formatting_data["folderPath"]
         folder_name = folder_path.rsplit("/", 1)[-1]
 
-        workdir = os.path.normpath(os.getenv("AYON_WORKDIR"))
+        # If the folder path and task do not match the current context then the
+        # workdir is not just the `AYON_WORKDIR`. Hence, we need to actually
+        # compute the resulting workdir
+        if (
+            data["folderPath"] == self.create_context.get_current_folder_path()
+            and data["task"] == self.create_context.get_current_task_name()
+        ):
+            workdir = os.path.normpath(os.getenv("AYON_WORKDIR"))
+        else:
+            # TODO: Optimize this logic
+            project_name = self.create_context.get_current_project_name()
+            project_entity = get_project(project_name)
+            folder_entity = get_folder_by_path(project_name,
+                                               data["folderPath"])
+            task_entity = get_task_by_name(project_name,
+                                           folder_id=folder_entity["id"],
+                                           task_name=data["task"])
+            workdir = get_workdir(
+                project_entity=project_entity,
+                folder_entity=folder_entity,
+                task_entity=task_entity,
+                host_name=self.create_context.host_name,
+            )
+
         formatting_data.update({
             "workdir": workdir,
             "frame": "0" * frame_padding,

From ccc3c1710acda86eeaf4840a88384f127c55f549 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 4 Apr 2024 11:01:48 +0200
Subject: [PATCH 35/48] use 'sitesync' over 'sync_server'

---
 client/ayon_core/host/dirmap.py               | 36 +++++++--------
 client/ayon_core/hosts/nuke/api/lib.py        | 18 ++++----
 client/ayon_core/pipeline/anatomy/anatomy.py  | 20 ++++----
 .../tools/loader/models/site_sync.py          |  2 +-
 .../ayon_core/tools/sceneinventory/control.py |  4 +-
 .../tools/sceneinventory/models/site_sync.py  | 46 +++++++++----------
 client/ayon_core/tools/sceneinventory/view.py |  6 +--
 .../ayon_core/tools/sceneinventory/window.py  |  2 +-
 8 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/client/ayon_core/host/dirmap.py b/client/ayon_core/host/dirmap.py
index effafb6261..2e24877d28 100644
--- a/client/ayon_core/host/dirmap.py
+++ b/client/ayon_core/host/dirmap.py
@@ -36,23 +36,23 @@ class HostDirmap(object):
         host_name,
         project_name,
         project_settings=None,
-        sync_module=None
+        sitesync_addon=None
     ):
         self.host_name = host_name
         self.project_name = project_name
         self._project_settings = project_settings
-        self._sync_module = sync_module
+        self._sitesync_addon = sitesync_addon
         # to limit reinit of Modules
-        self._sync_module_discovered = sync_module is not None
+        self._sitesync_addon_discovered = sitesync_addon is not None
         self._log = None
 
     @property
-    def sync_module(self):
-        if not self._sync_module_discovered:
-            self._sync_module_discovered = True
+    def sitesync_addon(self):
+        if not self._sitesync_addon_discovered:
+            self._sitesync_addon_discovered = True
             manager = AddonsManager()
-            self._sync_module = manager.get("sync_server")
-        return self._sync_module
+            self._sitesync_addon = manager.get("sitesync")
+        return self._sitesync_addon
 
     @property
     def project_settings(self):
@@ -158,25 +158,25 @@ class HostDirmap(object):
         """
         project_name = self.project_name
 
-        sync_module = self.sync_module
+        sitesync_addon = self.sitesync_addon
         mapping = {}
         if (
-            sync_module is None
-            or not sync_module.enabled
-            or project_name not in sync_module.get_enabled_projects()
+            sitesync_addon is None
+            or not sitesync_addon.enabled
+            or project_name not in sitesync_addon.get_enabled_projects()
         ):
             return mapping
 
-        active_site = sync_module.get_local_normalized_site(
-            sync_module.get_active_site(project_name))
-        remote_site = sync_module.get_local_normalized_site(
-            sync_module.get_remote_site(project_name))
+        active_site = sitesync_addon.get_local_normalized_site(
+            sitesync_addon.get_active_site(project_name))
+        remote_site = sitesync_addon.get_local_normalized_site(
+            sitesync_addon.get_remote_site(project_name))
         self.log.debug(
             "active {} - remote {}".format(active_site, remote_site)
         )
 
         if active_site == "local" and active_site != remote_site:
-            sync_settings = sync_module.get_sync_project_setting(
+            sync_settings = sitesync_addon.get_sync_project_setting(
                 project_name,
                 exclude_locals=False,
                 cached=False)
@@ -194,7 +194,7 @@ class HostDirmap(object):
             self.log.debug("remote overrides {}".format(remote_overrides))
 
             current_platform = platform.system().lower()
-            remote_provider = sync_module.get_provider_for_site(
+            remote_provider = sitesync_addon.get_provider_for_site(
                 project_name, remote_site
             )
             # dirmap has sense only with regular disk provider, in the workfile
diff --git a/client/ayon_core/hosts/nuke/api/lib.py b/client/ayon_core/hosts/nuke/api/lib.py
index 4fcba8d2d4..78cbe85097 100644
--- a/client/ayon_core/hosts/nuke/api/lib.py
+++ b/client/ayon_core/hosts/nuke/api/lib.py
@@ -2627,11 +2627,11 @@ class NukeDirmap(HostDirmap):
 
 
 class DirmapCache:
-    """Caching class to get settings and sync_module easily and only once."""
+    """Caching class to get settings and sitesync easily and only once."""
     _project_name = None
     _project_settings = None
-    _sync_module_discovered = False
-    _sync_module = None
+    _sitesync_addon_discovered = False
+    _sitesync_addon = None
     _mapping = None
 
     @classmethod
@@ -2647,11 +2647,11 @@ class DirmapCache:
         return cls._project_settings
 
     @classmethod
-    def sync_module(cls):
-        if not cls._sync_module_discovered:
-            cls._sync_module_discovered = True
-            cls._sync_module = AddonsManager().get("sync_server")
-        return cls._sync_module
+    def sitesync_addon(cls):
+        if not cls._sitesync_addon_discovered:
+            cls._sitesync_addon_discovered = True
+            cls._sitesync_addon = AddonsManager().get("sitesync")
+        return cls._sitesync_addon
 
     @classmethod
     def mapping(cls):
@@ -2673,7 +2673,7 @@ def dirmap_file_name_filter(file_name):
         "nuke",
         DirmapCache.project_name(),
         DirmapCache.project_settings(),
-        DirmapCache.sync_module(),
+        DirmapCache.sitesync_addon(),
     )
     if not DirmapCache.mapping():
         DirmapCache.set_mapping(dirmap_processor.get_mappings())
diff --git a/client/ayon_core/pipeline/anatomy/anatomy.py b/client/ayon_core/pipeline/anatomy/anatomy.py
index 0d250116bd..73dd215233 100644
--- a/client/ayon_core/pipeline/anatomy/anatomy.py
+++ b/client/ayon_core/pipeline/anatomy/anatomy.py
@@ -447,7 +447,7 @@ class CacheItem:
 
 
 class Anatomy(BaseAnatomy):
-    _sync_server_addon_cache = CacheItem()
+    _sitesync_addon_cache = CacheItem()
     _project_cache = collections.defaultdict(CacheItem)
     _default_site_id_cache = collections.defaultdict(CacheItem)
     _root_overrides_cache = collections.defaultdict(
@@ -482,13 +482,13 @@ class Anatomy(BaseAnatomy):
         return copy.deepcopy(project_cache.data)
 
     @classmethod
-    def get_sync_server_addon(cls):
-        if cls._sync_server_addon_cache.is_outdated:
+    def get_sitesync_addon(cls):
+        if cls._sitesync_addon_cache.is_outdated:
             manager = AddonsManager()
-            cls._sync_server_addon_cache.update_data(
-                manager.get_enabled_addon("sync_server")
+            cls._sitesync_addon_cache.update_data(
+                manager.get_enabled_addon("sitesync")
             )
-        return cls._sync_server_addon_cache.data
+        return cls._sitesync_addon_cache.data
 
     @classmethod
     def _get_studio_roots_overrides(cls, project_name):
@@ -525,8 +525,8 @@ class Anatomy(BaseAnatomy):
         """
 
         # First check if sync server is available and enabled
-        sync_server = cls.get_sync_server_addon()
-        if sync_server is None or not sync_server.enabled:
+        sitesync_addon = cls.get_sitesync_addon()
+        if sitesync_addon is None or not sitesync_addon.enabled:
             # QUESTION is ok to force 'studio' when site sync is not enabled?
             site_name = "studio"
 
@@ -535,7 +535,7 @@ class Anatomy(BaseAnatomy):
             project_cache = cls._default_site_id_cache[project_name]
             if project_cache.is_outdated:
                 project_cache.update_data(
-                    sync_server.get_active_site_type(project_name)
+                    sitesync_addon.get_active_site_type(project_name)
                 )
             site_name = project_cache.data
 
@@ -549,7 +549,7 @@ class Anatomy(BaseAnatomy):
                 )
             else:
                 # Ask sync server to get roots overrides
-                roots_overrides = sync_server.get_site_root_overrides(
+                roots_overrides = sitesync.get_site_root_overrides(
                     project_name, site_name
                 )
             site_cache.update_data(roots_overrides)
diff --git a/client/ayon_core/tools/loader/models/site_sync.py b/client/ayon_core/tools/loader/models/site_sync.py
index a589cf7fbe..fd4470894d 100644
--- a/client/ayon_core/tools/loader/models/site_sync.py
+++ b/client/ayon_core/tools/loader/models/site_sync.py
@@ -57,7 +57,7 @@ class SiteSyncModel:
         )
 
         manager = AddonsManager()
-        self._site_sync_addon = manager.get("sync_server")
+        self._site_sync_addon = manager.get("sitesync")
 
     def reset(self):
         self._site_icons = None
diff --git a/client/ayon_core/tools/sceneinventory/control.py b/client/ayon_core/tools/sceneinventory/control.py
index 77f4d60b22..eae0f066f4 100644
--- a/client/ayon_core/tools/sceneinventory/control.py
+++ b/client/ayon_core/tools/sceneinventory/control.py
@@ -89,8 +89,8 @@ class SceneInventoryController:
         return []
 
     # Site Sync methods
-    def is_sync_server_enabled(self):
-        return self._site_sync_model.is_sync_server_enabled()
+    def is_sitesync_enabled(self):
+        return self._site_sync_model.is_sitesync_enabled()
 
     def get_sites_information(self):
         return self._site_sync_model.get_sites_information()
diff --git a/client/ayon_core/tools/sceneinventory/models/site_sync.py b/client/ayon_core/tools/sceneinventory/models/site_sync.py
index 7f09f2b25b..fb49161e6e 100644
--- a/client/ayon_core/tools/sceneinventory/models/site_sync.py
+++ b/client/ayon_core/tools/sceneinventory/models/site_sync.py
@@ -9,30 +9,30 @@ class SiteSyncModel:
     def __init__(self, controller):
         self._controller = controller
 
-        self._sync_server_module = NOT_SET
-        self._sync_server_enabled = None
+        self._sitesync_addon = NOT_SET
+        self._sitesync_enabled = None
         self._active_site = NOT_SET
         self._remote_site = NOT_SET
         self._active_site_provider = NOT_SET
         self._remote_site_provider = NOT_SET
 
     def reset(self):
-        self._sync_server_module = NOT_SET
-        self._sync_server_enabled = None
+        self._sitesync_addon = NOT_SET
+        self._sitesync_enabled = None
         self._active_site = NOT_SET
         self._remote_site = NOT_SET
         self._active_site_provider = NOT_SET
         self._remote_site_provider = NOT_SET
 
-    def is_sync_server_enabled(self):
+    def is_sitesync_enabled(self):
         """Site sync is enabled.
 
         Returns:
             bool: Is enabled or not.
         """
 
-        self._cache_sync_server_module()
-        return self._sync_server_enabled
+        self._cache_sitesync_addon()
+        return self._sitesync_enabled
 
     def get_site_provider_icons(self):
         """Icon paths per provider.
@@ -41,9 +41,9 @@ class SiteSyncModel:
             dict[str, str]: Path by provider name.
         """
 
-        if not self.is_sync_server_enabled():
+        if not self.is_sitesync_enabled():
             return {}
-        site_sync_addon = self._get_sync_server_module()
+        site_sync_addon = self._get_sitesync_addon()
         return site_sync_addon.get_site_icons()
 
     def get_sites_information(self):
@@ -65,11 +65,11 @@ class SiteSyncModel:
             }
             for repre_id in representation_ids
         }
-        if not self.is_sync_server_enabled():
+        if not self.is_sitesync_enabled():
             return output
 
         project_name = self._controller.get_current_project_name()
-        site_sync = self._get_sync_server_module()
+        site_sync = self._get_sitesync_addon()
         repre_entities = ayon_api.get_representations(
             project_name, representation_ids
         )
@@ -95,7 +95,7 @@ class SiteSyncModel:
         """
 
         project_name = self._controller.get_current_project_name()
-        site_sync = self._get_sync_server_module()
+        site_sync = self._get_sitesync_addon()
         active_site = self._get_active_site()
         remote_site = self._get_remote_site()
         progress = self.get_representations_site_progress(
@@ -119,18 +119,18 @@ class SiteSyncModel:
                     project_name, repre_id, site, force=True
                 )
 
-    def _get_sync_server_module(self):
-        self._cache_sync_server_module()
-        return self._sync_server_module
+    def _get_sitesync_addon(self):
+        self._cache_sitesync_addon()
+        return self._sitesync_addon
 
-    def _cache_sync_server_module(self):
-        if self._sync_server_module is not NOT_SET:
-            return self._sync_server_module
+    def _cache_sitesync_addon(self):
+        if self._sitesync_addon is not NOT_SET:
+            return self._sitesync_addon
         manager = AddonsManager()
-        site_sync = manager.get("sync_server")
+        site_sync = manager.get("sitesync")
         sync_enabled = site_sync is not None and site_sync.enabled
-        self._sync_server_module = site_sync
-        self._sync_server_enabled = sync_enabled
+        self._sitesync_addon = site_sync
+        self._sitesync_enabled = sync_enabled
 
     def _get_active_site(self):
         if self._active_site is NOT_SET:
@@ -157,8 +157,8 @@ class SiteSyncModel:
         remote_site = None
         active_site_provider = None
         remote_site_provider = None
-        if self.is_sync_server_enabled():
-            site_sync = self._get_sync_server_module()
+        if self.is_sitesync_enabled():
+            site_sync = self._get_sitesync_addon()
             project_name = self._controller.get_current_project_name()
             active_site = site_sync.get_active_site(project_name)
             remote_site = site_sync.get_remote_site(project_name)
diff --git a/client/ayon_core/tools/sceneinventory/view.py b/client/ayon_core/tools/sceneinventory/view.py
index d576bdc139..5cbd4daf70 100644
--- a/client/ayon_core/tools/sceneinventory/view.py
+++ b/client/ayon_core/tools/sceneinventory/view.py
@@ -311,9 +311,9 @@ class SceneInventoryView(QtWidgets.QTreeView):
 
         menu.addAction(remove_action)
 
-        self._handle_sync_server(menu, repre_ids)
+        self._handle_sitesync(menu, repre_ids)
 
-    def _handle_sync_server(self, menu, repre_ids):
+    def _handle_sitesync(self, menu, repre_ids):
         """Adds actions for download/upload when SyncServer is enabled
 
         Args:
@@ -324,7 +324,7 @@ class SceneInventoryView(QtWidgets.QTreeView):
             (OptionMenu)
         """
 
-        if not self._controller.is_sync_server_enabled():
+        if not self._controller.is_sitesync_enabled():
             return
 
         menu.addSeparator()
diff --git a/client/ayon_core/tools/sceneinventory/window.py b/client/ayon_core/tools/sceneinventory/window.py
index 9584524edd..555db3a17c 100644
--- a/client/ayon_core/tools/sceneinventory/window.py
+++ b/client/ayon_core/tools/sceneinventory/window.py
@@ -70,7 +70,7 @@ class SceneInventoryWindow(QtWidgets.QDialog):
         view = SceneInventoryView(controller, self)
         view.setModel(proxy)
 
-        sync_enabled = controller.is_sync_server_enabled()
+        sync_enabled = controller.is_sitesync_enabled()
         view.setColumnHidden(model.active_site_col, not sync_enabled)
         view.setColumnHidden(model.remote_site_col, not sync_enabled)
 

From e1b22cbe8d6cf56ee8949fd54abf1b78b6bd0a22 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 4 Apr 2024 11:44:17 +0200
Subject: [PATCH 36/48] use same variable naming in rest of codebase

---
 client/ayon_core/tools/loader/abstract.py     |  2 +-
 client/ayon_core/tools/loader/control.py      | 22 +++----
 .../tools/loader/models/site_sync.py          | 60 +++++++++----------
 .../tools/loader/ui/products_model.py         |  2 +-
 .../tools/loader/ui/products_widget.py        | 20 +++----
 .../tools/loader/ui/repres_widget.py          | 14 ++---
 .../ayon_core/tools/sceneinventory/control.py | 14 ++---
 .../tools/sceneinventory/models/site_sync.py  | 28 ++++-----
 8 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/client/ayon_core/tools/loader/abstract.py b/client/ayon_core/tools/loader/abstract.py
index 33add0213b..7a7d335092 100644
--- a/client/ayon_core/tools/loader/abstract.py
+++ b/client/ayon_core/tools/loader/abstract.py
@@ -871,7 +871,7 @@ class FrontendLoaderController(_BaseLoaderController):
 
     # Site sync functions
     @abstractmethod
-    def is_site_sync_enabled(self, project_name=None):
+    def is_sitesync_enabled(self, project_name=None):
         """Is site sync enabled.
 
         Site sync addon can be enabled but can be disabled per project.
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index d8562f50ca..0c9bb369c7 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -113,7 +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)
+        self._sitesync_model = SiteSyncModel(self)
 
     @property
     def log(self):
@@ -149,7 +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._sitesync_model.reset()
 
         self._projects_model.refresh()
 
@@ -240,7 +240,7 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
                 project_name, representation_ids)
         )
 
-        action_items.extend(self._site_sync_model.get_site_sync_action_items(
+        action_items.extend(self._sitesync_model.get_sitesync_action_items(
             project_name, representation_ids)
         )
 
@@ -254,8 +254,8 @@ 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(
+        if self._sitesync_model.is_sitesync_action(identifier):
+            self._sitesync_model.trigger_action_item(
                 identifier,
                 project_name,
                 representation_ids
@@ -368,24 +368,24 @@ 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 is_sitesync_enabled(self, project_name=None):
+        return self._sitesync_model.is_sitesync_enabled(project_name)
 
     def get_active_site_icon_def(self, project_name):
-        return self._site_sync_model.get_active_site_icon_def(project_name)
+        return self._sitesync_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)
+        return self._sitesync_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(
+        return self._sitesync_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(
+        return self._sitesync_model.get_representations_sync_status(
             project_name, representation_ids
         )
 
diff --git a/client/ayon_core/tools/loader/models/site_sync.py b/client/ayon_core/tools/loader/models/site_sync.py
index fd4470894d..987510905b 100644
--- a/client/ayon_core/tools/loader/models/site_sync.py
+++ b/client/ayon_core/tools/loader/models/site_sync.py
@@ -36,7 +36,7 @@ class SiteSyncModel:
         self._controller = controller
 
         self._site_icons = None
-        self._site_sync_enabled_cache = NestedCacheItem(
+        self._sitesync_enabled_cache = NestedCacheItem(
             levels=1, lifetime=self.lifetime
         )
         self._active_site_cache = NestedCacheItem(
@@ -57,17 +57,17 @@ class SiteSyncModel:
         )
 
         manager = AddonsManager()
-        self._site_sync_addon = manager.get("sitesync")
+        self._sitesync_addon = manager.get("sitesync")
 
     def reset(self):
         self._site_icons = None
-        self._site_sync_enabled_cache.reset()
+        self._sitesync_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):
+    def is_sitesync_enabled(self, project_name=None):
         """Site sync is enabled for a project.
 
         Returns false if site sync addon is not available or enabled
@@ -82,13 +82,13 @@ class SiteSyncModel:
             bool: Site sync is enabled.
         """
 
-        if not self._is_site_sync_addon_enabled():
+        if not self._is_sitesync_addon_enabled():
             return False
-        cache = self._site_sync_enabled_cache[project_name]
+        cache = self._sitesync_enabled_cache[project_name]
         if not cache.is_valid:
             enabled = True
             if project_name:
-                enabled = self._site_sync_addon.is_project_enabled(
+                enabled = self._sitesync_addon.is_project_enabled(
                     project_name, single=True
                 )
             cache.update_data(enabled)
@@ -107,8 +107,8 @@ class SiteSyncModel:
         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)
+            if project_name and self._is_sitesync_addon_enabled():
+                site_name = self._sitesync_addon.get_active_site(project_name)
             cache.update_data(site_name)
         return cache.get_data()
 
@@ -125,8 +125,8 @@ class SiteSyncModel:
         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)
+            if project_name and self._is_sitesync_addon_enabled():
+                site_name = self._sitesync_addon.get_remote_site(project_name)
             cache.update_data(site_name)
         return cache.get_data()
 
@@ -140,7 +140,7 @@ class SiteSyncModel:
             Union[dict[str, Any], None]: Site icon definition.
         """
 
-        if not project_name or not self.is_site_sync_enabled(project_name):
+        if not project_name or not self.is_sitesync_enabled(project_name):
             return None
         active_site = self.get_active_site(project_name)
         return self._get_site_icon_def(project_name, active_site)
@@ -155,14 +155,14 @@ class SiteSyncModel:
             Union[dict[str, Any], None]: Site icon definition.
         """
 
-        if not project_name or not self.is_site_sync_enabled(project_name):
+        if not project_name or not self.is_sitesync_enabled(project_name):
             return None
         remote_site = self.get_remote_site(project_name)
         return self._get_site_icon_def(project_name, remote_site)
 
     def _get_site_icon_def(self, project_name, site_name):
         # use different icon for studio even if provider is 'local_drive'
-        if site_name == self._site_sync_addon.DEFAULT_SITE:
+        if site_name == self._sitesync_addon.DEFAULT_SITE:
             provider = "studio"
         else:
             provider = self._get_provider_for_site(project_name, site_name)
@@ -179,7 +179,7 @@ class SiteSyncModel:
             dict[str, tuple[int, int]]
         """
 
-        if not self.is_site_sync_enabled(project_name):
+        if not self.is_sitesync_enabled(project_name):
             return {
                 version_id: _default_version_availability()
                 for version_id in version_ids
@@ -217,7 +217,7 @@ class SiteSyncModel:
             dict[str, tuple[float, float]]
         """
 
-        if not self.is_site_sync_enabled(project_name):
+        if not self.is_sitesync_enabled(project_name):
             return {
                 repre_id: _default_repre_status()
                 for repre_id in representation_ids
@@ -242,7 +242,7 @@ class SiteSyncModel:
                 output[repre_id] = repre_cache.get_data()
         return output
 
-    def get_site_sync_action_items(self, project_name, representation_ids):
+    def get_sitesync_action_items(self, project_name, representation_ids):
         """
 
         Args:
@@ -253,7 +253,7 @@ class SiteSyncModel:
             list[ActionItem]: Actions that can be shown in loader.
         """
 
-        if not self.is_site_sync_enabled(project_name):
+        if not self.is_sitesync_enabled(project_name):
             return []
 
         repres_status = self.get_representations_sync_status(
@@ -289,7 +289,7 @@ class SiteSyncModel:
 
         return action_items
 
-    def is_site_sync_action(self, identifier):
+    def is_sitesync_action(self, identifier):
         """Should be `identifier` handled by SiteSync.
 
         Args:
@@ -353,22 +353,22 @@ class SiteSyncModel:
                 )
 
             elif identifier == REMOVE_IDENTIFIER:
-                self._site_sync_addon.remove_site(
+                self._sitesync_addon.remove_site(
                     project_name,
                     repre_id,
                     active_site,
                     remove_local_files=True
                 )
 
-    def _is_site_sync_addon_enabled(self):
+    def _is_sitesync_addon_enabled(self):
         """
         Returns:
             bool: Site sync addon is enabled.
         """
 
-        if self._site_sync_addon is None:
+        if self._sitesync_addon is None:
             return False
-        return self._site_sync_addon.enabled
+        return self._sitesync_addon.enabled
 
     def _get_provider_for_site(self, project_name, site_name):
         """Provider for a site.
@@ -381,9 +381,9 @@ class SiteSyncModel:
             Union[str, None]: Provider name.
         """
 
-        if not self._is_site_sync_addon_enabled():
+        if not self._is_sitesync_addon_enabled():
             return None
-        return self._site_sync_addon.get_provider_for_site(
+        return self._sitesync_addon.get_provider_for_site(
             project_name, site_name
         )
 
@@ -398,7 +398,7 @@ class SiteSyncModel:
             return None
 
         if self._site_icons is None:
-            self._site_icons = self._site_sync_addon.get_site_icons()
+            self._site_icons = self._sitesync_addon.get_site_icons()
         return self._site_icons.get(provider)
 
     def _refresh_version_availability(self, project_name, version_ids):
@@ -406,7 +406,7 @@ class SiteSyncModel:
             return
         project_cache = self._version_availability_cache[project_name]
 
-        avail_by_id = self._site_sync_addon.get_version_availability(
+        avail_by_id = self._sitesync_addon.get_version_availability(
             project_name,
             version_ids,
             self.get_active_site(project_name),
@@ -425,7 +425,7 @@ class SiteSyncModel:
             return
         project_cache = self._repre_status_cache[project_name]
         status_by_repre_id = (
-            self._site_sync_addon.get_representations_sync_state(
+            self._sitesync_addon.get_representations_sync_state(
                 project_name,
                 representation_ids,
                 self.get_active_site(project_name),
@@ -496,7 +496,7 @@ class SiteSyncModel:
         )
 
     def _add_site(self, project_name, repre_entity, site_name, product_type):
-        self._site_sync_addon.add_site(
+        self._sitesync_addon.add_site(
             project_name, repre_entity["id"], site_name, force=True
         )
 
@@ -513,7 +513,7 @@ class SiteSyncModel:
             try:
                 print("Adding {} to linked representation: {}".format(
                     site_name, link_repre_id))
-                self._site_sync_addon.add_site(
+                self._sitesync_addon.add_site(
                     project_name,
                     link_repre_id,
                     site_name,
diff --git a/client/ayon_core/tools/loader/ui/products_model.py b/client/ayon_core/tools/loader/ui/products_model.py
index c51172849a..41342ba0df 100644
--- a/client/ayon_core/tools/loader/ui/products_model.py
+++ b/client/ayon_core/tools/loader/ui/products_model.py
@@ -73,7 +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")
+    sitesync_avail_col = column_labels.index("Availability")
 
     def __init__(self, controller):
         super(ProductsModel, self).__init__()
diff --git a/client/ayon_core/tools/loader/ui/products_widget.py b/client/ayon_core/tools/loader/ui/products_widget.py
index 3025ec18bd..d9f027153e 100644
--- a/client/ayon_core/tools/loader/ui/products_widget.py
+++ b/client/ayon_core/tools/loader/ui/products_widget.py
@@ -139,9 +139,9 @@ class ProductsWidget(QtWidgets.QWidget):
         products_view.setItemDelegateForColumn(
             products_model.in_scene_col, in_scene_delegate)
 
-        site_sync_delegate = SiteSyncDelegate()
+        sitesync_delegate = SiteSyncDelegate()
         products_view.setItemDelegateForColumn(
-            products_model.site_sync_avail_col, site_sync_delegate)
+            products_model.sitesync_avail_col, sitesync_delegate)
 
         main_layout = QtWidgets.QHBoxLayout(self)
         main_layout.setContentsMargins(0, 0, 0, 0)
@@ -176,7 +176,7 @@ 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._sitesync_delegate = sitesync_delegate
 
         self._selected_project_name = None
         self._selected_folder_ids = set()
@@ -192,8 +192,8 @@ 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()
+        self._set_sitesync_visibility(
+            self._controller.is_sitesync_enabled()
         )
 
     def set_name_filter(self, name):
@@ -229,10 +229,10 @@ class ProductsWidget(QtWidgets.QWidget):
     def refresh(self):
         self._refresh_model()
 
-    def _set_site_sync_visibility(self, site_sync_enabled):
+    def _set_sitesync_visibility(self, sitesync_enabled):
         self._products_view.setColumnHidden(
-            self._products_model.site_sync_avail_col,
-            not site_sync_enabled
+            self._products_model.sitesync_avail_col,
+            not sitesync_enabled
         )
 
     def _fill_version_editor(self):
@@ -395,10 +395,10 @@ class ProductsWidget(QtWidgets.QWidget):
 
     def _on_folders_selection_change(self, event):
         project_name = event["project_name"]
-        site_sync_enabled = self._controller.is_site_sync_enabled(
+        sitesync_enabled = self._controller.is_sitesync_enabled(
             project_name
         )
-        self._set_site_sync_visibility(site_sync_enabled)
+        self._set_sitesync_visibility(sitesync_enabled)
         self._selected_project_name = project_name
         self._selected_folder_ids = event["folder_ids"]
         self._refresh_model()
diff --git a/client/ayon_core/tools/loader/ui/repres_widget.py b/client/ayon_core/tools/loader/ui/repres_widget.py
index 3b6b8f94bf..d19ad306a3 100644
--- a/client/ayon_core/tools/loader/ui/repres_widget.py
+++ b/client/ayon_core/tools/loader/ui/repres_widget.py
@@ -307,8 +307,8 @@ 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_sitesync_visibility(
+            self._controller.is_sitesync_enabled()
         )
         self._set_multiple_folders_selected(False)
 
@@ -320,19 +320,19 @@ 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(
+        sitesync_enabled = self._controller.is_sitesync_enabled(
             self._selected_project_name
         )
-        self._set_site_sync_visibility(site_sync_enabled)
+        self._set_sitesync_visibility(sitesync_enabled)
 
-    def _set_site_sync_visibility(self, site_sync_enabled):
+    def _set_sitesync_visibility(self, sitesync_enabled):
         self._repre_view.setColumnHidden(
             self._repre_model.active_site_column,
-            not site_sync_enabled
+            not sitesync_enabled
         )
         self._repre_view.setColumnHidden(
             self._repre_model.remote_site_column,
-            not site_sync_enabled
+            not sitesync_enabled
         )
 
     def _set_multiple_folders_selected(self, selected_multiple_folders):
diff --git a/client/ayon_core/tools/sceneinventory/control.py b/client/ayon_core/tools/sceneinventory/control.py
index eae0f066f4..592113455c 100644
--- a/client/ayon_core/tools/sceneinventory/control.py
+++ b/client/ayon_core/tools/sceneinventory/control.py
@@ -28,7 +28,7 @@ class SceneInventoryController:
         self._current_folder_id = None
         self._current_folder_set = False
 
-        self._site_sync_model = SiteSyncModel(self)
+        self._sitesync_model = SiteSyncModel(self)
         # Switch dialog requirements
         self._hierarchy_model = HierarchyModel(self)
         self._event_system = self._create_event_system()
@@ -47,7 +47,7 @@ class SceneInventoryController:
         self._current_folder_id = None
         self._current_folder_set = False
 
-        self._site_sync_model.reset()
+        self._sitesync_model.reset()
         self._hierarchy_model.reset()
 
     def get_current_context(self):
@@ -90,21 +90,21 @@ class SceneInventoryController:
 
     # Site Sync methods
     def is_sitesync_enabled(self):
-        return self._site_sync_model.is_sitesync_enabled()
+        return self._sitesync_model.is_sitesync_enabled()
 
     def get_sites_information(self):
-        return self._site_sync_model.get_sites_information()
+        return self._sitesync_model.get_sites_information()
 
     def get_site_provider_icons(self):
-        return self._site_sync_model.get_site_provider_icons()
+        return self._sitesync_model.get_site_provider_icons()
 
     def get_representations_site_progress(self, representation_ids):
-        return self._site_sync_model.get_representations_site_progress(
+        return self._sitesync_model.get_representations_site_progress(
             representation_ids
         )
 
     def resync_representations(self, representation_ids, site_type):
-        return self._site_sync_model.resync_representations(
+        return self._sitesync_model.resync_representations(
             representation_ids, site_type
         )
 
diff --git a/client/ayon_core/tools/sceneinventory/models/site_sync.py b/client/ayon_core/tools/sceneinventory/models/site_sync.py
index fb49161e6e..1a1f08bf02 100644
--- a/client/ayon_core/tools/sceneinventory/models/site_sync.py
+++ b/client/ayon_core/tools/sceneinventory/models/site_sync.py
@@ -43,8 +43,8 @@ class SiteSyncModel:
 
         if not self.is_sitesync_enabled():
             return {}
-        site_sync_addon = self._get_sitesync_addon()
-        return site_sync_addon.get_site_icons()
+        sitesync_addon = self._get_sitesync_addon()
+        return sitesync_addon.get_site_icons()
 
     def get_sites_information(self):
         return {
@@ -69,7 +69,7 @@ class SiteSyncModel:
             return output
 
         project_name = self._controller.get_current_project_name()
-        site_sync = self._get_sitesync_addon()
+        sitesync_addon = self._get_sitesync_addon()
         repre_entities = ayon_api.get_representations(
             project_name, representation_ids
         )
@@ -78,7 +78,7 @@ class SiteSyncModel:
 
         for repre_entity in repre_entities:
             repre_output = output[repre_entity["id"]]
-            result = site_sync.get_progress_for_repre(
+            result = sitesync_addon.get_progress_for_repre(
                 repre_entity, active_site, remote_site
             )
             repre_output["active_site"] = result[active_site]
@@ -95,7 +95,7 @@ class SiteSyncModel:
         """
 
         project_name = self._controller.get_current_project_name()
-        site_sync = self._get_sitesync_addon()
+        sitesync_addon = self._get_sitesync_addon()
         active_site = self._get_active_site()
         remote_site = self._get_remote_site()
         progress = self.get_representations_site_progress(
@@ -115,7 +115,7 @@ class SiteSyncModel:
                 site = remote_site
 
             if check_progress == 1:
-                site_sync.add_site(
+                sitesync_addon.add_site(
                     project_name, repre_id, site, force=True
                 )
 
@@ -127,9 +127,9 @@ class SiteSyncModel:
         if self._sitesync_addon is not NOT_SET:
             return self._sitesync_addon
         manager = AddonsManager()
-        site_sync = manager.get("sitesync")
-        sync_enabled = site_sync is not None and site_sync.enabled
-        self._sitesync_addon = site_sync
+        sitesync_addon = manager.get("sitesync")
+        sync_enabled = sitesync_addon is not None and sitesync_addon.enabled
+        self._sitesync_addon = sitesync_addon
         self._sitesync_enabled = sync_enabled
 
     def _get_active_site(self):
@@ -158,18 +158,18 @@ class SiteSyncModel:
         active_site_provider = None
         remote_site_provider = None
         if self.is_sitesync_enabled():
-            site_sync = self._get_sitesync_addon()
+            sitesync_addon = self._get_sitesync_addon()
             project_name = self._controller.get_current_project_name()
-            active_site = site_sync.get_active_site(project_name)
-            remote_site = site_sync.get_remote_site(project_name)
+            active_site = sitesync_addon.get_active_site(project_name)
+            remote_site = sitesync_addon.get_remote_site(project_name)
             active_site_provider = "studio"
             remote_site_provider = "studio"
             if active_site != "studio":
-                active_site_provider = site_sync.get_provider_for_site(
+                active_site_provider = sitesync_addon.get_provider_for_site(
                     project_name, active_site
                 )
             if remote_site != "studio":
-                remote_site_provider = site_sync.get_provider_for_site(
+                remote_site_provider = sitesync_addon.get_provider_for_site(
                     project_name, remote_site
                 )
 

From 7670a9ce4627db2c44f048495ad474930b8f25bd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 4 Apr 2024 11:47:16 +0200
Subject: [PATCH 37/48] rename files too

---
 client/ayon_core/tools/loader/models/__init__.py                | 2 +-
 .../ayon_core/tools/loader/models/{site_sync.py => sitesync.py} | 0
 client/ayon_core/tools/sceneinventory/models/__init__.py        | 2 +-
 .../tools/sceneinventory/models/{site_sync.py => sitesync.py}   | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename client/ayon_core/tools/loader/models/{site_sync.py => sitesync.py} (100%)
 rename client/ayon_core/tools/sceneinventory/models/{site_sync.py => sitesync.py} (100%)

diff --git a/client/ayon_core/tools/loader/models/__init__.py b/client/ayon_core/tools/loader/models/__init__.py
index 8e640659a0..10fd3da4d3 100644
--- a/client/ayon_core/tools/loader/models/__init__.py
+++ b/client/ayon_core/tools/loader/models/__init__.py
@@ -1,7 +1,7 @@
 from .selection import SelectionModel
 from .products import ProductsModel
 from .actions import LoaderActionsModel
-from .site_sync import SiteSyncModel
+from .sitesync import SiteSyncModel
 
 
 __all__ = (
diff --git a/client/ayon_core/tools/loader/models/site_sync.py b/client/ayon_core/tools/loader/models/sitesync.py
similarity index 100%
rename from client/ayon_core/tools/loader/models/site_sync.py
rename to client/ayon_core/tools/loader/models/sitesync.py
diff --git a/client/ayon_core/tools/sceneinventory/models/__init__.py b/client/ayon_core/tools/sceneinventory/models/__init__.py
index c861d3c1a0..f840a45aa8 100644
--- a/client/ayon_core/tools/sceneinventory/models/__init__.py
+++ b/client/ayon_core/tools/sceneinventory/models/__init__.py
@@ -1,4 +1,4 @@
-from .site_sync import SiteSyncModel
+from .sitesync import SiteSyncModel
 
 
 __all__ = (
diff --git a/client/ayon_core/tools/sceneinventory/models/site_sync.py b/client/ayon_core/tools/sceneinventory/models/sitesync.py
similarity index 100%
rename from client/ayon_core/tools/sceneinventory/models/site_sync.py
rename to client/ayon_core/tools/sceneinventory/models/sitesync.py

From 905587a00f88fc5e6038059b2fb6fe3d2c6ea67e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 4 Apr 2024 12:32:39 +0200
Subject: [PATCH 38/48] remove start.py or ayon executable instead of script

---
 client/ayon_core/cli.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/cli.py b/client/ayon_core/cli.py
index ab8e9f47f4..2f01f71a98 100644
--- a/client/ayon_core/cli.py
+++ b/client/ayon_core/cli.py
@@ -11,7 +11,7 @@ import acre
 from ayon_core import AYON_CORE_ROOT
 from ayon_core.addon import AddonsManager
 from ayon_core.settings import get_general_environments
-from ayon_core.lib import initialize_ayon_connection
+from ayon_core.lib import initialize_ayon_connection, is_running_from_build
 
 from .cli_commands import Commands
 
@@ -167,16 +167,29 @@ def run(script):
 
     if not script:
         print("Error: missing path to script file.")
+        return
+
+    # Remove first argument if it is the same as AYON executable
+    # - Forwards compatibility with future AYON versions.
+    # - Current AYON launcher keep the arguments with first argument but
+    #     future versions might remove it.
+    first_arg = sys.argv[0]
+    if is_running_from_build():
+        comp_path = os.path.join(os.environ["AYON_ROOT"], "start.py")
     else:
+        comp_path = os.getenv("AYON_EXECUTABLE")
+    # Normalize paths for comparison
+    first_arg = os.path.normpath(first_arg).lower()
+    comp_path = os.path.normpath(comp_path).lower()
+    if first_arg == comp_path:
+        sys.argv.pop(0)
 
-        args = sys.argv
-        args.remove("run")
-        args.remove(script)
-        sys.argv = args
+    # Remove 'run' command from sys.argv
+    sys.argv.remove("run")
 
-        args_string = " ".join(args[1:])
-        print(f"... running: {script} {args_string}")
-        runpy.run_path(script, run_name="__main__", )
+    args_string = " ".join(sys.argv[1:])
+    print(f"... running: {script} {args_string}")
+    runpy.run_path(script, run_name="__main__", )
 
 
 @main_cli.command()

From f7ea2cc525924794e2e12f4e6b039fc606808b8c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 4 Apr 2024 12:42:37 +0200
Subject: [PATCH 39/48] typos and cosmetics

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 client/ayon_core/cli.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/cli.py b/client/ayon_core/cli.py
index 2f01f71a98..40227b63b8 100644
--- a/client/ayon_core/cli.py
+++ b/client/ayon_core/cli.py
@@ -170,8 +170,8 @@ def run(script):
         return
 
     # Remove first argument if it is the same as AYON executable
-    # - Forwards compatibility with future AYON versions.
-    # - Current AYON launcher keep the arguments with first argument but
+    # - Forward compatibility with future AYON versions.
+    # - Current AYON launcher keeps the arguments with first argument but
     #     future versions might remove it.
     first_arg = sys.argv[0]
     if is_running_from_build():
@@ -189,7 +189,7 @@ def run(script):
 
     args_string = " ".join(sys.argv[1:])
     print(f"... running: {script} {args_string}")
-    runpy.run_path(script, run_name="__main__", )
+    runpy.run_path(script, run_name="__main__")
 
 
 @main_cli.command()

From 041933e96bba36f001de2194b160b311d1da4110 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 4 Apr 2024 12:49:52 +0200
Subject: [PATCH 40/48] use pathlib instead

---
 client/ayon_core/cli.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/cli.py b/client/ayon_core/cli.py
index 40227b63b8..80fbb57340 100644
--- a/client/ayon_core/cli.py
+++ b/client/ayon_core/cli.py
@@ -4,6 +4,7 @@ import os
 import sys
 import code
 import traceback
+from pathlib import Path
 
 import click
 import acre
@@ -178,10 +179,8 @@ def run(script):
         comp_path = os.path.join(os.environ["AYON_ROOT"], "start.py")
     else:
         comp_path = os.getenv("AYON_EXECUTABLE")
-    # Normalize paths for comparison
-    first_arg = os.path.normpath(first_arg).lower()
-    comp_path = os.path.normpath(comp_path).lower()
-    if first_arg == comp_path:
+    # Compare paths and remove first argument if it is the same as AYON
+    if Path(first_arg).resolve() == Path(comp_path).resolve():
         sys.argv.pop(0)
 
     # Remove 'run' command from sys.argv

From a4758f501c11cc3d1e8bfc2d8ea41e129d877713 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 4 Apr 2024 14:19:16 +0200
Subject: [PATCH 41/48] bump version to '0.3.0'

---
 client/ayon_core/version.py | 2 +-
 package.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index f3ad9713d5..7061e3c126 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON core addon version."""
-__version__ = "0.3.0-dev.1"
+__version__ = "0.3.0"
diff --git a/package.py b/package.py
index 470bbf256b..4b511da60d 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "0.3.0-dev.1"
+version = "0.3.0"
 
 client_dir = "ayon_core"
 

From f42ee6049006ca803f90f54db613c9a5dc24b132 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 4 Apr 2024 14:40:00 +0200
Subject: [PATCH 42/48] bump version to '0.3.1-dev.1'

---
 client/ayon_core/version.py | 2 +-
 package.py                  | 2 +-
 pyproject.toml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index 7061e3c126..a60de0493a 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON core addon version."""
-__version__ = "0.3.0"
+__version__ = "0.3.1-dev.1"
diff --git a/package.py b/package.py
index 4b511da60d..79450d029f 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "0.3.0"
+version = "0.3.1-dev.1"
 
 client_dir = "ayon_core"
 
diff --git a/pyproject.toml b/pyproject.toml
index bfdc3cca8c..3c9ff4ea0a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@
 
 [tool.poetry]
 name = "ayon-core"
-version = "0.3.0"
+version = "0.3.1"
 description = ""
 authors = ["Ynput Team <team@ynput.io>"]
 readme = "README.md"

From 368444a7f25c2d9a6d044f605a860677f268d2d8 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 4 Apr 2024 22:21:11 +0800
Subject: [PATCH 43/48] use cmds.setattr instead of self._get_attr()

---
 client/ayon_core/hosts/maya/api/lib_renderproducts.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
index 5f3917f642..6b73639040 100644
--- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py
+++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
@@ -1133,9 +1133,11 @@ class RenderProductsRedshift(ARenderProducts):
             aovs = list(set(aovs) - set(ref_aovs))
 
         products = []
+        # global_aov_enabled = bool(
+        #     self._get_attr("redshiftOptions.aovGlobalEnableMode")
+        # )
         global_aov_enabled = bool(
-            self._get_attr("redshiftOptions.aovGlobalEnableMode")
-        )
+            cmds.getAttr("redshiftOptions.aovGlobalEnableMode"))
         colorspace = lib.get_color_management_output_transform()
         if not global_aov_enabled:
             # only beauty output

From 4a04bd1397a9a5e564c6b5d7e7f7262b53588ccc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:35:49 +0200
Subject: [PATCH 44/48] fix update of context change

---
 client/ayon_core/tools/workfiles/control.py | 38 ++++++++++-----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/client/ayon_core/tools/workfiles/control.py b/client/ayon_core/tools/workfiles/control.py
index 7fa7af1662..2cdcd37d53 100644
--- a/client/ayon_core/tools/workfiles/control.py
+++ b/client/ayon_core/tools/workfiles/control.py
@@ -659,16 +659,7 @@ class BaseWorkfileController(
             folder_id != self.get_current_folder_id()
             or task_name != self.get_current_task_name()
         ):
-            folder_entity = ayon_api.get_folder_by_id(
-                event_data["project_name"],
-                event_data["folder_id"],
-            )
-            task_entity = ayon_api.get_task_by_name(
-                event_data["project_name"],
-                event_data["folder_id"],
-                event_data["task_name"]
-            )
-            change_current_context(folder_entity, task_entity)
+            self._change_current_context(project_name, folder_id, task_id)
 
         self._host_open_workfile(filepath)
 
@@ -710,16 +701,8 @@ class BaseWorkfileController(
             folder_id != self.get_current_folder_id()
             or task_name != self.get_current_task_name()
         ):
-            folder_entity = ayon_api.get_folder_by_id(
-                project_name, folder["id"]
-            )
-            task_entity = ayon_api.get_task_by_name(
-                project_name, folder["id"], task_name
-            )
-            change_current_context(
-                folder_entity,
-                task_entity,
-                template_key=template_key
+            self._change_current_context(
+                project_name, folder_id, task_id, template_key
             )
 
         # Save workfile
@@ -745,3 +728,18 @@ class BaseWorkfileController(
         # Trigger after save events
         emit_event("workfile.save.after", event_data, source="workfiles.tool")
         self.reset()
+
+    def _change_current_context(
+        self, project_name, folder_id, task_id, template_key=None
+    ):
+        # Change current context
+        folder_entity = self.get_folder_entity(project_name, folder_id)
+        task_entity = self.get_task_entity(project_name, task_id)
+        change_current_context(
+            folder_entity,
+            task_entity,
+            template_key=template_key
+        )
+        self._current_folder_id = folder_entity["id"]
+        self._current_folder_path = folder_entity["path"]
+        self._current_task_name = task_entity["name"]

From 2701d4bf8aeddb4da0841b49d7d06451ee5f06d8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 4 Apr 2024 16:46:15 +0200
Subject: [PATCH 45/48] removed unnecessary `reset` call

---
 client/ayon_core/tools/workfiles/control.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/tools/workfiles/control.py b/client/ayon_core/tools/workfiles/control.py
index 2cdcd37d53..3048e6be94 100644
--- a/client/ayon_core/tools/workfiles/control.py
+++ b/client/ayon_core/tools/workfiles/control.py
@@ -727,7 +727,6 @@ class BaseWorkfileController(
 
         # Trigger after save events
         emit_event("workfile.save.after", event_data, source="workfiles.tool")
-        self.reset()
 
     def _change_current_context(
         self, project_name, folder_id, task_id, template_key=None

From dc21231c291ebffb532151806e2e696ac3510fdc Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 4 Apr 2024 23:16:12 +0800
Subject: [PATCH 46/48] exposes asString as arguments for getting attributes
 for renderlayer & renderlayersetup

---
 client/ayon_core/hosts/maya/api/lib.py                |  9 +++++----
 client/ayon_core/hosts/maya/api/lib_renderproducts.py | 10 ++++------
 client/ayon_core/hosts/maya/api/lib_rendersetup.py    |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 060c16056c..89582bac8b 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -3129,7 +3129,7 @@ def load_capture_preset(data):
     return options
 
 
-def get_attr_in_layer(attr, layer):
+def get_attr_in_layer(attr, layer, as_string=True):
     """Return attribute value in specified renderlayer.
 
     Same as cmds.getAttr but this gets the attribute's value in a
@@ -3156,7 +3156,8 @@ def get_attr_in_layer(attr, layer):
     try:
         if cmds.mayaHasRenderSetup():
             from . import lib_rendersetup
-            return lib_rendersetup.get_attr_in_layer(attr, layer)
+            return lib_rendersetup.get_attr_in_layer(
+                attr, layer, as_string=as_string)
     except AttributeError:
         pass
 
@@ -3173,7 +3174,7 @@ def get_attr_in_layer(attr, layer):
                                        type="renderLayer") or []
     connections = filter(lambda x: x.endswith(".plug"), connections)
     if not connections:
-        return cmds.getAttr(attr)
+        return cmds.getAttr(attr, asString=as_string)
 
     # Some value types perform a conversion when assigning
     # TODO: See if there's a maya method to allow this conversion
@@ -3215,7 +3216,7 @@ def get_attr_in_layer(attr, layer):
                         value *= conversion
                     return value
 
-    return cmds.getAttr(attr)
+    return cmds.getAttr(attr, asString=as_string)
 
 
 def fix_incompatible_containers():
diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
index 6b73639040..832d1c21c2 100644
--- a/client/ayon_core/hosts/maya/api/lib_renderproducts.py
+++ b/client/ayon_core/hosts/maya/api/lib_renderproducts.py
@@ -297,7 +297,7 @@ class ARenderProducts:
         """
         return self._get_attr("defaultRenderGlobals", attribute)
 
-    def _get_attr(self, node_attr, attribute=None):
+    def _get_attr(self, node_attr, attribute=None, as_string=True):
         """Return the value of the attribute in the renderlayer
 
         For readability this allows passing in the attribute in two ways.
@@ -317,7 +317,7 @@ class ARenderProducts:
         else:
             plug = "{}.{}".format(node_attr, attribute)
 
-        return lib.get_attr_in_layer(plug, layer=self.layer)
+        return lib.get_attr_in_layer(plug, layer=self.layer, as_string=as_string)
 
     @staticmethod
     def extract_separator(file_prefix):
@@ -1133,11 +1133,9 @@ class RenderProductsRedshift(ARenderProducts):
             aovs = list(set(aovs) - set(ref_aovs))
 
         products = []
-        # global_aov_enabled = bool(
-        #     self._get_attr("redshiftOptions.aovGlobalEnableMode")
-        # )
         global_aov_enabled = bool(
-            cmds.getAttr("redshiftOptions.aovGlobalEnableMode"))
+            self._get_attr("redshiftOptions.aovGlobalEnableMode", as_string=False)
+        )
         colorspace = lib.get_color_management_output_transform()
         if not global_aov_enabled:
             # only beauty output
diff --git a/client/ayon_core/hosts/maya/api/lib_rendersetup.py b/client/ayon_core/hosts/maya/api/lib_rendersetup.py
index c2b5ec843c..6dca8eb6dd 100644
--- a/client/ayon_core/hosts/maya/api/lib_rendersetup.py
+++ b/client/ayon_core/hosts/maya/api/lib_rendersetup.py
@@ -77,7 +77,7 @@ def get_rendersetup_layer(layer):
                  if conn.endswith(".legacyRenderLayer")), None)
 
 
-def get_attr_in_layer(node_attr, layer):
+def get_attr_in_layer(node_attr, layer, as_string=True):
     """Return attribute value in Render Setup layer.
 
     This will only work for attributes which can be
@@ -124,7 +124,7 @@ def get_attr_in_layer(node_attr, layer):
             node = history_overrides[-1] if history_overrides else override
             node_attr_ = node + ".original"
 
-        return get_attribute(node_attr_, asString=True)
+        return get_attribute(node_attr_, asString=as_string)
 
     layer = get_rendersetup_layer(layer)
     rs = renderSetup.instance()
@@ -144,7 +144,7 @@ def get_attr_in_layer(node_attr, layer):
                 # we will let it error out.
                 rs.switchToLayer(current_layer)
 
-        return get_attribute(node_attr, asString=True)
+        return get_attribute(node_attr, asString=as_string)
 
     overrides = get_attr_overrides(node_attr, layer)
     default_layer_value = get_default_layer_value(node_attr)

From 8573a0f6cf63103284466d84c1c48ea6067e9fb0 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Thu, 4 Apr 2024 17:51:00 +0200
Subject: [PATCH 47/48] Improve Creator error for new users

---
 .../hosts/maya/plugins/create/create_render.py        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/create/create_render.py b/client/ayon_core/hosts/maya/plugins/create/create_render.py
index 213d5b543e..e5a8d4dbd8 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_render.py
@@ -40,8 +40,15 @@ class CreateRenderlayer(plugin.RenderlayerCreator):
     def create(self, product_name, instance_data, pre_create_data):
         # Only allow a single render instance to exist
         if self._get_singleton_node():
-            raise CreatorError("A Render instance already exists - only "
-                               "one can be configured.")
+            raise CreatorError(
+                "A Render instance already exists - only one can be "
+                "configured.\n\n"
+                "To render multiple render layers, create extra Render Setup "
+                "Layers via Maya's Render Setup UI.\n"
+                "Then refresh the publisher to detect the new layers for "
+                "rendering.\n\n"
+                "With a render instance present all Render Setup layers in "
+                "your workfile are renderable instances.")
 
         # Apply default project render settings on create
         if self.render_settings.get("apply_render_settings"):

From 26b7a53656062625fed2c62f1573ad0166a6dbc3 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Fri, 5 Apr 2024 15:10:36 +0800
Subject: [PATCH 48/48] add docstring and make sure the backward compatible is
 converting to string value as before

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

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 89582bac8b..91f60824b6 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -3147,6 +3147,7 @@ def get_attr_in_layer(attr, layer, as_string=True):
     Args:
         attr (str): attribute name, ex. "node.attribute"
         layer (str): layer name
+        as_string (bool): whether attribute should convert to a string value
 
     Returns:
         The return value from `maya.cmds.getAttr`
@@ -3165,7 +3166,7 @@ def get_attr_in_layer(attr, layer, as_string=True):
     current_layer = cmds.editRenderLayerGlobals(query=True,
                                                 currentRenderLayer=True)
     if layer == current_layer:
-        return cmds.getAttr(attr)
+        return cmds.getAttr(attr, asString=as_string)
 
     connections = cmds.listConnections(attr,
                                        plugs=True,
@@ -3174,7 +3175,7 @@ def get_attr_in_layer(attr, layer, as_string=True):
                                        type="renderLayer") or []
     connections = filter(lambda x: x.endswith(".plug"), connections)
     if not connections:
-        return cmds.getAttr(attr, asString=as_string)
+        return cmds.getAttr(attr)
 
     # Some value types perform a conversion when assigning
     # TODO: See if there's a maya method to allow this conversion