From ce5a563b4c55dceababeea459d25b3429d9a14be Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 09:56:42 +0100
Subject: [PATCH 01/45] do not convert applications settings

---
 client/ayon_core/lib/applications.py       | 225 ++++++++-------------
 client/ayon_core/settings/ayon_settings.py |  85 +-------
 2 files changed, 91 insertions(+), 219 deletions(-)

diff --git a/client/ayon_core/lib/applications.py b/client/ayon_core/lib/applications.py
index febdaacdd1..70aa9811c7 100644
--- a/client/ayon_core/lib/applications.py
+++ b/client/ayon_core/lib/applications.py
@@ -230,29 +230,25 @@ class ApplicationGroup:
         self.manager = manager
         self._data = data
 
-        self.enabled = data.get("enabled", True)
-        self.label = data.get("label") or None
-        self.icon = data.get("icon") or None
-        self._environment = data.get("environment") or {}
+        self.enabled = data["enabled"]
+        self.label = data["label"] or None
+        self.icon = data["icon"] or None
+        env = {}
+        try:
+            env = json.loads(data["environment"])
+        except Exception:
+            pass
+        self._environment = env
 
-        host_name = data.get("host_name", None)
+        host_name = data["host_name"] or None
         self.is_host = host_name is not None
         self.host_name = host_name
 
-        variants = data.get("variants") or {}
-        key_label_mapping = variants.pop(M_DYNAMIC_KEY_LABEL, {})
-        for variant_name, variant_data in variants.items():
-            if variant_name in METADATA_KEYS:
-                continue
-
-            if "variant_label" not in variant_data:
-                variant_label = key_label_mapping.get(variant_name)
-                if variant_label:
-                    variant_data["variant_label"] = variant_label
-
-            variants[variant_name] = Application(
-                variant_name, variant_data, self
-            )
+        settings_variants = data["variants"]
+        variants = {}
+        for variant_data in settings_variants:
+            app_variant = Application(variant_data, self)
+            variants[app_variant.name] = app_variant
 
         self.variants = variants
 
@@ -274,62 +270,56 @@ class Application:
     Object by itself does nothing special.
 
     Args:
-        name (str): Specific version (or variant) of application.
-            e.g. "maya2020", "nuke11.3", etc.
         data (dict): Data for the version containing information about
             executables, variant label or if is enabled.
             Only required key is `executables`.
         group (ApplicationGroup): App group object that created the application
             and under which application belongs.
+
     """
-
-    def __init__(self, name, data, group):
-        self.name = name
-        self.group = group
+    def __init__(self, data, group):
         self._data = data
-
+        name = data["name"]
+        label = data["label"] or name
         enabled = False
         if group.enabled:
             enabled = data.get("enabled", True)
-        self.enabled = enabled
-        self.use_python_2 = data.get("use_python_2", False)
-
-        self.label = data.get("variant_label") or name
-        self.full_name = "/".join((group.name, name))
 
         if group.label:
-            full_label = " ".join((group.label, self.label))
+            full_label = " ".join((group.label, label))
         else:
-            full_label = self.label
-        self.full_label = full_label
-        self._environment = data.get("environment") or {}
+            full_label = label
+        env = {}
+        try:
+            env = json.loads(data["environment"])
+        except Exception:
+            pass
 
-        arguments = data.get("arguments")
+        arguments = data["arguments"]
         if isinstance(arguments, dict):
             arguments = arguments.get(platform.system().lower())
 
         if not arguments:
             arguments = []
+
+        _executables = data["executables"].get(platform.system().lower(), [])
+        executables = [
+            ApplicationExecutable(executable)
+            for executable in _executables
+        ]
+
+        self.group = group
+
+        self.name = name
+        self.label = label
+        self.enabled = enabled
+        self.use_python_2 = data.get("use_python_2", False)
+
+        self.full_name = "/".join((group.name, name))
+        self.full_label = full_label
         self.arguments = arguments
-
-        if "executables" not in data:
-            self.executables = [
-                UndefinedApplicationExecutable()
-            ]
-            return
-
-        _executables = data["executables"]
-        if isinstance(_executables, dict):
-            _executables = _executables.get(platform.system().lower())
-
-        if not _executables:
-            _executables = []
-
-        executables = []
-        for executable in _executables:
-            executables.append(ApplicationExecutable(executable))
-
         self.executables = executables
+        self._environment = env
 
     def __repr__(self):
         return "<{}> - {}".format(self.__class__.__name__, self.full_name)
@@ -384,12 +374,12 @@ class ApplicationManager:
     """Load applications and tools and store them by their full name.
 
     Args:
-        system_settings (dict): Preloaded system settings. When passed manager
+        studio_settings (dict): Preloaded studio settings. When passed manager
             will always use these values. Gives ability to create manager
             using different settings.
     """
 
-    def __init__(self, system_settings=None):
+    def __init__(self, studio_settings=None):
         self.log = Logger.get_logger(self.__class__.__name__)
 
         self.app_groups = {}
@@ -397,16 +387,16 @@ class ApplicationManager:
         self.tool_groups = {}
         self.tools = {}
 
-        self._system_settings = system_settings
+        self._studio_settings = studio_settings
 
         self.refresh()
 
-    def set_system_settings(self, system_settings):
+    def set_studio_settings(self, studio_settings):
         """Ability to change init system settings.
 
         This will trigger refresh of manager.
         """
-        self._system_settings = system_settings
+        self._studio_settings = studio_settings
 
         self.refresh()
 
@@ -417,72 +407,30 @@ class ApplicationManager:
         self.tool_groups.clear()
         self.tools.clear()
 
-        if self._system_settings is not None:
-            settings = copy.deepcopy(self._system_settings)
+        if self._studio_settings is not None:
+            settings = copy.deepcopy(self._studio_settings)
         else:
             settings = get_system_settings(
                 clear_metadata=False, exclude_locals=False
             )
 
-        all_app_defs = {}
+        applications_addon_settings = settings["applications"]
+
         # Prepare known applications
-        app_defs = settings["applications"]
-        additional_apps = {}
+        app_defs = applications_addon_settings["applications"]
+        additional_apps = app_defs.pop("additional_apps")
+        app_defs.update(additional_apps)
+
         for group_name, variant_defs in app_defs.items():
-            if group_name in METADATA_KEYS:
-                continue
-
-            if group_name == "additional_apps":
-                additional_apps = variant_defs
-            else:
-                all_app_defs[group_name] = variant_defs
-
-        # Prepare additional applications
-        # - First find dynamic keys that can be used as labels of group
-        dynamic_keys = {}
-        for group_name, variant_defs in additional_apps.items():
-            if group_name == M_DYNAMIC_KEY_LABEL:
-                dynamic_keys = variant_defs
-                break
-
-        # Add additional apps to known applications
-        for group_name, variant_defs in additional_apps.items():
-            if group_name in METADATA_KEYS:
-                continue
-
-            # Determine group label
-            label = variant_defs.get("label")
-            if not label:
-                # Look for label set in dynamic labels
-                label = dynamic_keys.get(group_name)
-                if not label:
-                    label = group_name
-                variant_defs["label"] = label
-
-            all_app_defs[group_name] = variant_defs
-
-        for group_name, variant_defs in all_app_defs.items():
-            if group_name in METADATA_KEYS:
-                continue
-
             group = ApplicationGroup(group_name, variant_defs, self)
             self.app_groups[group_name] = group
             for app in group:
                 self.applications[app.full_name] = app
 
-        tools_definitions = settings["tools"]["tool_groups"]
-        tool_label_mapping = tools_definitions.pop(M_DYNAMIC_KEY_LABEL, {})
-        for tool_group_name, tool_group_data in tools_definitions.items():
-            if not tool_group_name or tool_group_name in METADATA_KEYS:
-                continue
-
-            tool_group_label = (
-                tool_label_mapping.get(tool_group_name) or tool_group_name
-            )
-            group = EnvironmentToolGroup(
-                tool_group_name, tool_group_label, tool_group_data, self
-            )
-            self.tool_groups[tool_group_name] = group
+        tools_definitions = applications_addon_settings["tool_groups"]
+        for tool_group_data in tools_definitions:
+            group = EnvironmentToolGroup(tool_group_data, self)
+            self.tool_groups[group.name] = group
             for tool in group:
                 self.tools[tool.full_name] = tool
 
@@ -571,30 +519,31 @@ class EnvironmentToolGroup:
         are same.
 
     Args:
-        name (str): Name of the tool group.
-        data (dict): Group's information with it's variants.
+        data (dict): Group information with variants.
         manager (ApplicationManager): Manager that creates the group.
     """
 
-    def __init__(self, name, label, data, manager):
+    def __init__(self, data, manager):
+        name = data["name"]
+        label = data["label"]
+
         self.name = name
         self.label = label
         self._data = data
         self.manager = manager
-        self._environment = data["environment"]
 
-        variants = data.get("variants") or {}
-        label_by_key = variants.pop(M_DYNAMIC_KEY_LABEL, {})
+        environment = {}
+        try:
+            environment = json.loads(data["environment"])
+        except Exception:
+            pass
+        self._environment = environment
+
+        variants = data.get("variants") or []
         variants_by_name = {}
-        for variant_name, variant_data in variants.items():
-            if variant_name in METADATA_KEYS:
-                continue
-
-            variant_label = label_by_key.get(variant_name) or variant_name
-            tool = EnvironmentTool(
-                variant_name, variant_label, variant_data, self
-            )
-            variants_by_name[variant_name] = tool
+        for variant_data in variants:
+            tool = EnvironmentTool(variant_data, self)
+            variants_by_name[tool.name] = tool
         self.variants = variants_by_name
 
     def __repr__(self):
@@ -615,23 +564,25 @@ class EnvironmentTool:
     Structure of tool information.
 
     Args:
-        name (str): Name of the tool.
         variant_data (dict): Variant data with environments and
             host and app variant filters.
-        group (str): Name of group which wraps tool.
+        group (EnvironmentToolGroup): Name of group which wraps tool.
     """
 
-    def __init__(self, name, label, variant_data, group):
+    def __init__(self, variant_data, group):
         # Backwards compatibility 3.9.1 - 3.9.2
         # - 'variant_data' contained only environments but contain also host
         #   and application variant filters
-        host_names = variant_data.get("host_names", [])
-        app_variants = variant_data.get("app_variants", [])
+        name = variant_data["name"]
+        label = variant_data["label"]
+        host_names = variant_data["host_names"]
+        app_variants = variant_data["app_variants"]
 
-        if "environment" in variant_data:
-            environment = variant_data["environment"]
-        else:
-            environment = variant_data
+        environment = {}
+        try:
+            environment = json.loads(variant_data["environment"])
+        except Exception:
+            pass
 
         self.host_names = host_names
         self.app_variants = app_variants
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index ed1199d517..acf5e0bb30 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -72,77 +72,6 @@ def _convert_host_imageio(host_settings):
     imageio_file_rules["rules"] = new_rules
 
 
-def _convert_applications_groups(groups, clear_metadata):
-    environment_key = "environment"
-    if isinstance(groups, dict):
-        new_groups = []
-        for name, item in groups.items():
-            item["name"] = name
-            new_groups.append(item)
-        groups = new_groups
-
-    output = {}
-    group_dynamic_labels = {}
-    for group in groups:
-        group_name = group.pop("name")
-        if "label" in group:
-            group_dynamic_labels[group_name] = group["label"]
-
-        tool_group_envs = group[environment_key]
-        if isinstance(tool_group_envs, six.string_types):
-            group[environment_key] = json.loads(tool_group_envs)
-
-        variants = {}
-        variant_dynamic_labels = {}
-        for variant in group.pop("variants"):
-            variant_name = variant.pop("name")
-            label = variant.get("label")
-            if label and label != variant_name:
-                variant_dynamic_labels[variant_name] = label
-            variant_envs = variant[environment_key]
-            if isinstance(variant_envs, six.string_types):
-                variant[environment_key] = json.loads(variant_envs)
-            variants[variant_name] = variant
-        group["variants"] = variants
-
-        if not clear_metadata:
-            variants["__dynamic_keys_labels__"] = variant_dynamic_labels
-        output[group_name] = group
-
-    if not clear_metadata:
-        output["__dynamic_keys_labels__"] = group_dynamic_labels
-    return output
-
-
-def _convert_applications_system_settings(
-    ayon_settings, output, clear_metadata
-):
-    # Addon settings
-    addon_settings = ayon_settings["applications"]
-
-    # Remove project settings
-    addon_settings.pop("only_available", None)
-
-    # Applications settings
-    ayon_apps = addon_settings["applications"]
-
-    additional_apps = ayon_apps.pop("additional_apps")
-    applications = _convert_applications_groups(
-        ayon_apps, clear_metadata
-    )
-    applications["additional_apps"] = _convert_applications_groups(
-        additional_apps, clear_metadata
-    )
-
-    # Tools settings
-    tools = _convert_applications_groups(
-        addon_settings["tool_groups"], clear_metadata
-    )
-
-    output["applications"] = applications
-    output["tools"] = {"tool_groups": tools}
-
-
 def _convert_general(ayon_settings, output, default_settings):
     # TODO get studio name/code
     core_settings = ayon_settings["core"]
@@ -290,7 +219,7 @@ def convert_system_settings(ayon_settings, default_settings, addon_versions):
         "modules": {}
     }
     if "applications" in ayon_settings:
-        _convert_applications_system_settings(ayon_settings, output, False)
+        output["applications"] = ayon_settings["applications"]
 
     if "core" in ayon_settings:
         _convert_general(ayon_settings, output, default_settings)
@@ -313,15 +242,6 @@ def convert_system_settings(ayon_settings, default_settings, addon_versions):
 
 
 # --------- Project settings ---------
-def _convert_applications_project_settings(ayon_settings, output):
-    if "applications" not in ayon_settings:
-        return
-
-    output["applications"] = {
-        "only_available": ayon_settings["applications"]["only_available"]
-    }
-
-
 def _convert_blender_project_settings(ayon_settings, output):
     if "blender" not in ayon_settings:
         return
@@ -1373,7 +1293,8 @@ def convert_project_settings(ayon_settings, default_settings):
             output[key] = ayon_settings[key]
             _convert_host_imageio(output[key])
 
-    _convert_applications_project_settings(ayon_settings, output)
+    if "applications" in ayon_settings:
+        output["applications"] = ayon_settings["applications"]
     _convert_blender_project_settings(ayon_settings, output)
     _convert_celaction_project_settings(ayon_settings, output)
     _convert_flame_project_settings(ayon_settings, output)

From 2534ee9cd7c279301fbc68de4cc10efb0c54616f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 12:57:19 +0100
Subject: [PATCH 02/45] CollectAudio can read AYON settings

---
 client/ayon_core/plugins/publish/collect_audio.py | 10 +++++-----
 client/ayon_core/settings/ayon_settings.py        |  5 -----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/plugins/publish/collect_audio.py b/client/ayon_core/plugins/publish/collect_audio.py
index 94477e5578..6da3fd0685 100644
--- a/client/ayon_core/plugins/publish/collect_audio.py
+++ b/client/ayon_core/plugins/publish/collect_audio.py
@@ -43,7 +43,7 @@ class CollectAudio(pyblish.api.ContextPlugin):
         "unreal"
     ]
 
-    audio_subset_name = "audioMain"
+    audio_product_name = "audioMain"
 
     def process(self, context):
         # Fake filtering by family inside context plugin
@@ -71,9 +71,9 @@ class CollectAudio(pyblish.api.ContextPlugin):
 
         asset_names = set(instances_by_asset_name.keys())
         self.log.debug((
-            "Searching for audio subset '{subset}' in assets {assets}"
+            "Searching for audio product '{subset}' in assets {assets}"
         ).format(
-            subset=self.audio_subset_name,
+            subset=self.audio_product_name,
             assets=", ".join([
                 '"{}"'.format(asset_name)
                 for asset_name in asset_names
@@ -130,11 +130,11 @@ class CollectAudio(pyblish.api.ContextPlugin):
         }
         asset_ids = set(asset_id_by_name.values())
 
-        # Query subsets with name define by 'audio_subset_name' attr
+        # Query subsets with name define by 'audio_product_name' attr
         # - one or none subsets with the name should be available on an asset
         subset_docs = get_subsets(
             project_name,
-            subset_names=[self.audio_subset_name],
+            subset_names=[self.audio_product_name],
             asset_ids=asset_ids,
             fields=["_id", "parent"]
         )
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index acf5e0bb30..11a9f45367 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -1080,11 +1080,6 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
     # Publish conversion
     ayon_publish = ayon_core["publish"]
 
-    ayon_collect_audio = ayon_publish["CollectAudio"]
-    if "audio_product_name" in ayon_collect_audio:
-        ayon_collect_audio["audio_subset_name"] = (
-            ayon_collect_audio.pop("audio_product_name"))
-
     for profile in ayon_publish["ExtractReview"]["profiles"]:
         if "product_types" in profile:
             profile["families"] = profile.pop("product_types")

From 163d0269e5c9178f8d4d7cbf68f4dadf5ced9c0b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 12:58:18 +0100
Subject: [PATCH 03/45] ExtractReview can read AYON settings

---
 .../plugins/publish/extract_review.py         | 57 +++++++++++--------
 client/ayon_core/settings/ayon_settings.py    | 28 ---------
 server/settings/publish_plugins.py            |  8 +--
 3 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index 91d39882ae..a6e0196dc7 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -74,7 +74,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
     alpha_exts = ["exr", "png", "dpx"]
 
     # Preset attributes
-    profiles = None
+    profiles = []
 
     def process(self, instance):
         self.log.debug(str(instance.data["representations"]))
@@ -112,7 +112,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
             self.profiles,
             {
                 "hosts": host_name,
-                "families": family,
+                "product_types": family,
             },
             logger=self.log)
         if not profile:
@@ -719,12 +719,12 @@ class ExtractReview(pyblish.api.InstancePlugin):
         lut_filters = self.lut_filters(new_repre, instance, ffmpeg_input_args)
         ffmpeg_video_filters.extend(lut_filters)
 
-        bg_alpha = 0
+        bg_alpha = 0.0
         bg_color = output_def.get("bg_color")
         if bg_color:
             bg_red, bg_green, bg_blue, bg_alpha = bg_color
 
-        if bg_alpha > 0:
+        if bg_alpha > 0.0:
             if not temp_data["input_allow_bg"]:
                 self.log.info((
                     "Output definition has defined BG color input was"
@@ -734,8 +734,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
                 bg_color_hex = "#{0:0>2X}{1:0>2X}{2:0>2X}".format(
                     bg_red, bg_green, bg_blue
                 )
-                bg_color_alpha = float(bg_alpha) / 255
-                bg_color_str = "{}@{}".format(bg_color_hex, bg_color_alpha)
+                bg_color_str = "{}@{}".format(bg_color_hex, bg_alpha)
 
                 self.log.info("Applying BG color {}".format(bg_color_str))
                 color_args = [
@@ -1060,8 +1059,10 @@ class ExtractReview(pyblish.api.InstancePlugin):
         # NOTE: value in "-ac" was hardcoded to 2, changed to audio inputs len.
         # Need to merge audio if there are more than 1 input.
         if len(audio_inputs) > 1:
-            audio_out_args.append("-filter_complex amerge")
-            audio_out_args.append("-ac {}".format(len(audio_inputs)))
+            audio_out_args.extend([
+                "-filter_complex", "amerge",
+                "-ac", str(len(audio_inputs))
+            ])
 
         return audio_in_args, audio_filters, audio_out_args
 
@@ -1079,7 +1080,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         fill_color_hex = "{0:0>2X}{1:0>2X}{2:0>2X}".format(
             f_red, f_green, f_blue
         )
-        fill_color_alpha = float(f_alpha) / 255
+        fill_color_alpha = f_alpha
 
         line_thickness = letter_box_def["line_thickness"]
         line_color = letter_box_def["line_color"]
@@ -1087,7 +1088,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         line_color_hex = "{0:0>2X}{1:0>2X}{2:0>2X}".format(
             l_red, l_green, l_blue
         )
-        line_color_alpha = float(l_alpha) / 255
+        line_color_alpha = l_alpha
 
         # test ratios and define if pillar or letter boxes
         output_ratio = float(output_width) / float(output_height)
@@ -1283,8 +1284,12 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
         # NOTE Setting only one of `width` or `heigth` is not allowed
         # - settings value can't have None but has value of 0
-        output_width = output_def.get("width") or output_width or None
-        output_height = output_def.get("height") or output_height or None
+        output_width = (
+            output_def.get("output_width") or output_width or None
+        )
+        output_height = (
+            output_def.get("output_height") or output_height or None
+        )
         # Force to use input resolution if output resolution was not defined
         #   in settings. Resolution from instance is not used when
         #   'use_input_res' is set to 'True'.
@@ -1294,7 +1299,12 @@ class ExtractReview(pyblish.api.InstancePlugin):
         overscan_color_value = "black"
         overscan_color = output_def.get("overscan_color")
         if overscan_color:
-            bg_red, bg_green, bg_blue, _ = overscan_color
+            if len(overscan_color) == 3:
+                bg_red, bg_green, bg_blue = overscan_color
+            else:
+                # Backwards compatibility
+                bg_red, bg_green, bg_blue, _  = overscan_color
+
             overscan_color_value = "#{0:0>2X}{1:0>2X}{2:0>2X}".format(
                 bg_red, bg_green, bg_blue
             )
@@ -1505,12 +1515,13 @@ class ExtractReview(pyblish.api.InstancePlugin):
         Returns:
             list: Containg all output definitions matching entered families.
         """
-        outputs = profile.get("outputs") or {}
+        outputs = profile.get("outputs")
         if not outputs:
-            return outputs
+            return []
 
         filtered_outputs = {}
-        for filename_suffix, output_def in outputs.items():
+        for output_def in outputs:
+            filename_suffix = output_def["name"]
             output_filters = output_def.get("filter")
             # If no filter on output preset, skip filtering and add output
             # profile for farther processing
@@ -1523,16 +1534,16 @@ class ExtractReview(pyblish.api.InstancePlugin):
                 continue
 
             # Subsets name filters
-            subset_filters = [
-                subset_filter
-                for subset_filter in output_filters.get("subsets", [])
+            product_name_filters = [
+                name_filter
+                for name_filter in output_filters.get("product_names", [])
                 # Skip empty strings
-                if subset_filter
+                if name_filter
             ]
-            if subset_name and subset_filters:
+            if subset_name and product_name_filters:
                 match = False
-                for subset_filter in subset_filters:
-                    compiled = re.compile(subset_filter)
+                for product_name_filter in product_name_filters:
+                    compiled = re.compile(product_name_filter)
                     if compiled.search(subset_name):
                         match = True
                         break
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 11a9f45367..4a59bb9438 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -1080,34 +1080,6 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
     # Publish conversion
     ayon_publish = ayon_core["publish"]
 
-    for profile in ayon_publish["ExtractReview"]["profiles"]:
-        if "product_types" in profile:
-            profile["families"] = profile.pop("product_types")
-        new_outputs = {}
-        for output_def in profile.pop("outputs"):
-            name = output_def.pop("name")
-            new_outputs[name] = output_def
-
-            output_def_filter = output_def["filter"]
-            if "product_names" in output_def_filter:
-                output_def_filter["subsets"] = (
-                    output_def_filter.pop("product_names"))
-
-            for color_key in ("overscan_color", "bg_color"):
-                output_def[color_key] = _convert_color(output_def[color_key])
-
-            letter_box = output_def["letter_box"]
-            for color_key in ("fill_color", "line_color"):
-                letter_box[color_key] = _convert_color(letter_box[color_key])
-
-            if "output_width" in output_def:
-                output_def["width"] = output_def.pop("output_width")
-
-            if "output_height" in output_def:
-                output_def["height"] = output_def.pop("output_height")
-
-        profile["outputs"] = new_outputs
-
     # ExtractThumbnail plugin
     ayon_extract_thumbnail = ayon_publish["ExtractThumbnail"]
     # fix display and view at oiio defaults
diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index 7aa86aafa6..f1b93b03b5 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -9,7 +9,7 @@ from ayon_server.settings import (
     task_types_enum,
 )
 
-from ayon_server.types import ColorRGBA_uint8
+from ayon_server.types import ColorRGB_uint8, ColorRGBA_uint8
 
 
 class ValidateBaseModel(BaseSettingsModel):
@@ -383,8 +383,8 @@ class ExtractReviewOutputDefModel(BaseSettingsModel):
             "Crop input overscan. See the documentation for more information."
         )
     )
-    overscan_color: ColorRGBA_uint8 = SettingsField(
-        (0, 0, 0, 0.0),
+    overscan_color: ColorRGB_uint8 = SettingsField(
+        (0, 0, 0),
         title="Overscan color",
         description=(
             "Overscan color is used when input aspect ratio is not"
@@ -896,7 +896,7 @@ DEFAULT_PUBLISH_VALUES = {
                             "single_frame_filter": "single_frame"
                         },
                         "overscan_crop": "",
-                        "overscan_color": [0, 0, 0, 1.0],
+                        "overscan_color": [0, 0, 0],
                         "width": 1920,
                         "height": 1080,
                         "scale_pixel_aspect": True,

From b5f7fb3162195790c762d7cc314a8f277c43e0d0 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:00:28 +0100
Subject: [PATCH 04/45] deadline can read AYON settings

---
 .../plugins/publish/submit_maya_deadline.py   | 12 ++++-
 .../plugins/publish/submit_nuke_deadline.py   | 16 ++++---
 .../plugins/publish/submit_publish_job.py     | 45 +++++++++++++++----
 client/ayon_core/settings/ayon_settings.py    | 45 +------------------
 4 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
index 84e6e93e6a..baa389cb12 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -18,6 +18,7 @@ Attributes:
 
 from __future__ import print_function
 import os
+import json
 import getpass
 import copy
 import re
@@ -131,8 +132,15 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         cls.group = settings.get("group", cls.group)
         cls.strict_error_checking = settings.get("strict_error_checking",
                                                  cls.strict_error_checking)
-        cls.jobInfo = settings.get("jobInfo", cls.jobInfo)
-        cls.pluginInfo = settings.get("pluginInfo", cls.pluginInfo)
+        job_info = settings.get("jobInfo")
+        if job_info:
+            job_info = json.loads(job_info)
+        plugin_info = settings.get("pluginInfo")
+        if plugin_info:
+            plugin_info = json.loads(plugin_info)
+
+        cls.jobInfo = job_info or cls.jobInfo
+        cls.pluginInfo = plugin_info or cls.pluginInfo
 
     def get_job_info(self):
         job_info = DeadlineJobInfo(Plugin="MayaBatch")
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 9fff8edee6..ce4fd96da4 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -40,10 +40,10 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
     concurrent_tasks = 1
     group = ""
     department = ""
-    limit_groups = {}
+    limit_groups = []
     use_gpu = False
     env_allowed_keys = []
-    env_search_replace_values = {}
+    env_search_replace_values = []
     workfile_dependency = True
     use_published_workfile = True
 
@@ -402,8 +402,10 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         # finally search replace in values of any key
         if self.env_search_replace_values:
             for key, value in environment.items():
-                for _k, _v in self.env_search_replace_values.items():
-                    environment[key] = value.replace(_k, _v)
+                for item in self.env_search_replace_values:
+                    environment[key] = value.replace(
+                        item["name"], item["value"]
+                    )
 
         payload["JobInfo"].update({
             "EnvironmentKeyValue%d" % index: "{key}={value}".format(
@@ -539,8 +541,10 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         import nuke
 
         captured_groups = []
-        for lg_name, list_node_class in self.limit_groups.items():
-            for node_class in list_node_class:
+        for limit_group in self.limit_groups:
+            lg_name = limit_group["name"]
+
+            for node_class in limit_group["value"]:
                 for node in nuke.allNodes(recurseGroups=True):
                     # ignore all nodes not member of defined class
                     if node.Class() not in node_class:
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
index bd343e103a..3e9514204d 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
@@ -99,12 +99,33 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
                 "karma_rop", "vray_rop",
                 "redshift_rop"]
 
-    aov_filter = {"maya": [r".*([Bb]eauty).*"],
-                  "blender": [r".*([Bb]eauty).*"],
-                  "aftereffects": [r".*"],  # for everything from AE
-                  "harmony": [r".*"],  # for everything from AE
-                  "celaction": [r".*"],
-                  "max": [r".*"]}
+    aov_filter = [
+        {
+            "name": "maya",
+            "value": [r".*([Bb]eauty).*"]
+        },
+        {
+            "name": "blender",
+            "value": [r".*([Bb]eauty).*"]
+        },
+        {
+            # for everything from AE
+            "name": "aftereffects",
+            "value": [r".*"]
+        },
+        {
+            "name": "harmony",
+            "value": [r".*"]
+        },
+        {
+            "name": "celaction",
+            "value": [r".*"]
+        },
+        {
+            "name": "max",
+            "value": [r".*"]
+        },
+    ]
 
     environ_keys = [
         "FTRACK_API_USER",
@@ -506,17 +527,23 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             self.log.debug("Instance has review explicitly disabled.")
             do_not_add_review = True
 
+        aov_filter = {
+            item["name"]: item["value"]
+            for item in self.aov_filter
+        }
         if isinstance(instance.data.get("expectedFiles")[0], dict):
             instances = create_instances_for_aov(
                 instance, instance_skeleton_data,
-                self.aov_filter, self.skip_integration_repre_list,
-                do_not_add_review)
+                aov_filter,
+                self.skip_integration_repre_list,
+                do_not_add_review
+            )
         else:
             representations = prepare_representations(
                 instance_skeleton_data,
                 instance.data.get("expectedFiles"),
                 anatomy,
-                self.aov_filter,
+                aov_filter,
                 self.skip_integration_repre_list,
                 do_not_add_review,
                 instance.context,
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 4a59bb9438..bca5198f95 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -951,49 +951,6 @@ def _convert_webpublisher_project_settings(ayon_settings, output):
     output["webpublisher"] = ayon_webpublisher
 
 
-def _convert_deadline_project_settings(ayon_settings, output):
-    if "deadline" not in ayon_settings:
-        return
-
-    ayon_deadline = ayon_settings["deadline"]
-
-    for key in ("deadline_urls",):
-        ayon_deadline.pop(key)
-
-    ayon_deadline_publish = ayon_deadline["publish"]
-    limit_groups = {
-        item["name"]: item["value"]
-        for item in ayon_deadline_publish["NukeSubmitDeadline"]["limit_groups"]
-    }
-    ayon_deadline_publish["NukeSubmitDeadline"]["limit_groups"] = limit_groups
-
-    maya_submit = ayon_deadline_publish["MayaSubmitDeadline"]
-    for json_key in ("jobInfo", "pluginInfo"):
-        src_text = maya_submit.pop(json_key)
-        try:
-            value = json.loads(src_text)
-        except ValueError:
-            value = {}
-        maya_submit[json_key] = value
-
-    nuke_submit = ayon_deadline_publish["NukeSubmitDeadline"]
-    nuke_submit["env_search_replace_values"] = {
-        item["name"]: item["value"]
-        for item in nuke_submit.pop("env_search_replace_values")
-    }
-    nuke_submit["limit_groups"] = {
-        item["name"]: item["value"] for item in nuke_submit.pop("limit_groups")
-    }
-
-    process_subsetted_job = ayon_deadline_publish["ProcessSubmittedJobOnFarm"]
-    process_subsetted_job["aov_filter"] = {
-        item["name"]: item["value"]
-        for item in process_subsetted_job.pop("aov_filter")
-    }
-
-    output["deadline"] = ayon_deadline
-
-
 def _convert_royalrender_project_settings(ayon_settings, output):
     if "royalrender" not in ayon_settings:
         return
@@ -1254,6 +1211,7 @@ def convert_project_settings(ayon_settings, default_settings):
         "houdini",
         "resolve",
         "unreal",
+        "deadline",
     }
     for key in exact_match:
         if key in ayon_settings:
@@ -1276,7 +1234,6 @@ def convert_project_settings(ayon_settings, default_settings):
     _convert_traypublisher_project_settings(ayon_settings, output)
     _convert_webpublisher_project_settings(ayon_settings, output)
 
-    _convert_deadline_project_settings(ayon_settings, output)
     _convert_royalrender_project_settings(ayon_settings, output)
     _convert_kitsu_project_settings(ayon_settings, output)
     _convert_shotgrid_project_settings(ayon_settings, output)

From aac11597aaf3d54898e9c4428c9358baea139872 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:00:55 +0100
Subject: [PATCH 05/45] simplify how applications are applied

---
 client/ayon_core/settings/ayon_settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index bca5198f95..1521a0dc25 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -1211,6 +1211,7 @@ def convert_project_settings(ayon_settings, default_settings):
         "houdini",
         "resolve",
         "unreal",
+        "applications",
         "deadline",
     }
     for key in exact_match:
@@ -1218,8 +1219,6 @@ def convert_project_settings(ayon_settings, default_settings):
             output[key] = ayon_settings[key]
             _convert_host_imageio(output[key])
 
-    if "applications" in ayon_settings:
-        output["applications"] = ayon_settings["applications"]
     _convert_blender_project_settings(ayon_settings, output)
     _convert_celaction_project_settings(ayon_settings, output)
     _convert_flame_project_settings(ayon_settings, output)

From 40a5b0e6d9c271c3e6faf8e708d1013a0ae18324 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:07:00 +0100
Subject: [PATCH 06/45] photoshop plugins can use AYON settings

---
 .../plugins/publish/collect_color_coded_instances.py |  6 +++---
 .../photoshop/plugins/publish/collect_review.py      |  2 --
 client/ayon_core/settings/ayon_settings.py           | 12 ------------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
index e309da62ba..987097f4ff 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
@@ -42,7 +42,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
     # flattened template cannot
     subset_template_name = ""
     create_flatten_image = "no"
-    flatten_subset_template = ""
+    flatten_product_name_template = ""
 
     def process(self, context):
         self.log.info("CollectColorCodedInstances")
@@ -124,12 +124,12 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
 
         if self.create_flatten_image != "no" and publishable_layers:
             self.log.debug("create_flatten_image")
-            if not self.flatten_subset_template:
+            if not self.flatten_product_name_template:
                 self.log.warning("No template for flatten image")
                 return
 
             fill_pairs.pop("layer")
-            subset = self.flatten_subset_template.format(
+            subset = self.flatten_product_name_template.format(
                 **prepare_template_data(fill_pairs))
 
             first_layer = publishable_layers[0]  # dummy layer
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
index e487760736..e51dd253ca 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
@@ -22,8 +22,6 @@ class CollectReview(pyblish.api.ContextPlugin):
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.1
 
-    publish = True
-
     def process(self, context):
         for instance in context:
             creator_attributes = instance.data["creator_attributes"]
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 1521a0dc25..b90de7946b 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -808,18 +808,6 @@ def _convert_photoshop_project_settings(ayon_settings, output):
 
     ayon_photoshop = ayon_settings["photoshop"]
     _convert_host_imageio(ayon_photoshop)
-
-    ayon_publish_photoshop = ayon_photoshop["publish"]
-
-    ayon_colorcoded = ayon_publish_photoshop["CollectColorCodedInstances"]
-    if "flatten_product_type_template" in ayon_colorcoded:
-        ayon_colorcoded["flatten_subset_template"] = (
-            ayon_colorcoded.pop("flatten_product_type_template"))
-
-    collect_review = ayon_publish_photoshop["CollectReview"]
-    if "active" in collect_review:
-        collect_review["publish"] = collect_review.pop("active")
-
     output["photoshop"] = ayon_photoshop
 
 

From 94b50b2d96e783eb3706af4a593ed2a73f502f7d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:07:42 +0100
Subject: [PATCH 07/45] cleanup photoshop plugin attributes

---
 .../plugins/publish/collect_color_coded_instances.py       | 3 +--
 .../hosts/photoshop/plugins/publish/collect_review.py      | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
index 987097f4ff..236fe878ba 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
@@ -29,9 +29,8 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
     Identifier:
         id (str): "pyblish.avalon.instance"
     """
-    order = pyblish.api.CollectorOrder + 0.100
 
-    label = "Instances"
+    label = "Collect Color-coded Instances"
     order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
     targets = ["automated"]
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
index e51dd253ca..3a4b7b5828 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
@@ -6,19 +6,14 @@ Provides:
     instance     -> family ("review")
 """
 
-import os
-
 import pyblish.api
 
-from ayon_core.pipeline.create import get_subset_name
-
 
 class CollectReview(pyblish.api.ContextPlugin):
     """Adds review to families for instances marked to be reviewable.
     """
 
-    label = "Collect Review"
-    label = "Review"
+    label = "Collect Review Family"
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.1
 

From f6f09ce43b2f1c9b4618bbaf508a8ad643f07dad Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:10:19 +0100
Subject: [PATCH 08/45] substance can read shelves from AYON settings

---
 .../hosts/substancepainter/api/pipeline.py      | 17 +++++++++--------
 client/ayon_core/settings/ayon_settings.py      |  8 --------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/client/ayon_core/hosts/substancepainter/api/pipeline.py b/client/ayon_core/hosts/substancepainter/api/pipeline.py
index 2bbcf2aded..03cb22136c 100644
--- a/client/ayon_core/hosts/substancepainter/api/pipeline.py
+++ b/client/ayon_core/hosts/substancepainter/api/pipeline.py
@@ -240,33 +240,34 @@ class SubstanceHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
 
     def _install_shelves(self, project_settings):
 
-        shelves = project_settings["substancepainter"].get("shelves", {})
+        shelves = project_settings["substancepainter"].get("shelves", [])
         if not shelves:
             return
 
         # Prepare formatting data if we detect any path which might have
         # template tokens like {asset} in there.
         formatting_data = {}
-        has_formatting_entries = any("{" in path for path in shelves.values())
+        has_formatting_entries = any("{" in item["value"] for item in shelves)
         if has_formatting_entries:
             project_name = self.get_current_project_name()
             asset_name = self.get_current_asset_name()
             task_name = self.get_current_asset_name()
             system_settings = get_system_settings()
-            formatting_data = get_template_data_with_names(project_name,
-                                                           asset_name,
-                                                           task_name,
-                                                           system_settings)
+            formatting_data = get_template_data_with_names(
+                project_name, asset_name, task_name, system_settings
+            )
             anatomy = Anatomy(project_name)
             formatting_data["root"] = anatomy.roots
 
-        for name, path in shelves.items():
-            shelf_name = None
+        for shelve_item in shelves:
 
             # Allow formatting with anatomy for the paths
+            path = shelve_item["value"]
             if "{" in path:
                 path = StringTemplate.format_template(path, formatting_data)
 
+            name = shelve_item["name"]
+            shelf_name = None
             try:
                 shelf_name = lib.load_shelf(path, name=name)
             except ValueError as exc:
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index b90de7946b..726b2147cd 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -817,14 +817,6 @@ def _convert_substancepainter_project_settings(ayon_settings, output):
 
     ayon_substance_painter = ayon_settings["substancepainter"]
     _convert_host_imageio(ayon_substance_painter)
-    if "shelves" in ayon_substance_painter:
-        shelves_items = ayon_substance_painter["shelves"]
-        new_shelves_items = {
-            item["name"]: item["value"]
-            for item in shelves_items
-        }
-        ayon_substance_painter["shelves"] = new_shelves_items
-
     output["substancepainter"] = ayon_substance_painter
 
 

From 8fb6e1e4d43b58254f01e2e7957cf8380d7653bd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:14:16 +0100
Subject: [PATCH 09/45] fix photoshop settings

---
 server_addon/photoshop/server/settings/publish_plugins.py | 6 +++---
 server_addon/photoshop/server/version.py                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server_addon/photoshop/server/settings/publish_plugins.py b/server_addon/photoshop/server/settings/publish_plugins.py
index c4a392d490..d04faaf53a 100644
--- a/server_addon/photoshop/server/settings/publish_plugins.py
+++ b/server_addon/photoshop/server/settings/publish_plugins.py
@@ -62,9 +62,9 @@ class CollectColorCodedInstancesPlugin(BaseSettingsModel):
         enum_resolver=lambda: create_flatten_image_enum,
     )
 
-    flatten_product_type_template: str = SettingsField(
+    flatten_product_name_template: str = SettingsField(
         "",
-        title="Subset template for flatten image"
+        title="Product name template for flatten image"
     )
 
     color_code_mapping: list[ColorCodeMappings] = SettingsField(
@@ -178,7 +178,7 @@ class PhotoshopPublishPlugins(BaseSettingsModel):
 DEFAULT_PUBLISH_SETTINGS = {
     "CollectColorCodedInstances": {
         "create_flatten_image": "no",
-        "flatten_product_type_template": "",
+        "flatten_product_name_template": "",
         "color_code_mapping": []
     },
     "CollectReview": {
diff --git a/server_addon/photoshop/server/version.py b/server_addon/photoshop/server/version.py
index a242f0e757..df0c92f1e2 100644
--- a/server_addon/photoshop/server/version.py
+++ b/server_addon/photoshop/server/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.1"
+__version__ = "0.1.2"

From 53df65a4127d6fba8cfc4350d6189c55d104055c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 13:14:57 +0100
Subject: [PATCH 10/45] TVPaint can read AYON settings

---
 client/ayon_core/settings/ayon_settings.py    | 23 +------------------
 .../server/settings/publish_plugins.py        |  8 +++----
 server_addon/tvpaint/server/version.py        |  2 +-
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 726b2147cd..e151043afb 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -823,30 +823,9 @@ def _convert_substancepainter_project_settings(ayon_settings, output):
 def _convert_tvpaint_project_settings(ayon_settings, output):
     if "tvpaint" not in ayon_settings:
         return
+
     ayon_tvpaint = ayon_settings["tvpaint"]
-
     _convert_host_imageio(ayon_tvpaint)
-
-    ayon_publish_settings = ayon_tvpaint["publish"]
-    for plugin_name in (
-        "ValidateProjectSettings",
-        "ValidateMarks",
-        "ValidateStartFrame",
-        "ValidateAssetName",
-    ):
-        ayon_value = ayon_publish_settings[plugin_name]
-        for src_key, dst_key in (
-            ("action_enabled", "optional"),
-            ("action_enable", "active"),
-        ):
-            if src_key in ayon_value:
-                ayon_value[dst_key] = ayon_value.pop(src_key)
-
-    extract_sequence_setting = ayon_publish_settings["ExtractSequence"]
-    extract_sequence_setting["review_bg"] = _convert_color(
-        extract_sequence_setting["review_bg"]
-    )
-
     output["tvpaint"] = ayon_tvpaint
 
 
diff --git a/server_addon/tvpaint/server/settings/publish_plugins.py b/server_addon/tvpaint/server/settings/publish_plugins.py
index 0623524c92..37ad3e0e70 100644
--- a/server_addon/tvpaint/server/settings/publish_plugins.py
+++ b/server_addon/tvpaint/server/settings/publish_plugins.py
@@ -1,5 +1,5 @@
 from ayon_server.settings import BaseSettingsModel, SettingsField
-from ayon_server.types import ColorRGBA_uint8
+from ayon_server.types import ColorRGB_uint8
 
 
 class CollectRenderInstancesModel(BaseSettingsModel):
@@ -11,8 +11,8 @@ class CollectRenderInstancesModel(BaseSettingsModel):
 class ExtractSequenceModel(BaseSettingsModel):
     """Review BG color is used for whole scene review and for thumbnails."""
     # TODO Use alpha color
-    review_bg: ColorRGBA_uint8 = SettingsField(
-        (255, 255, 255, 1.0),
+    review_bg: ColorRGB_uint8 = SettingsField(
+        (255, 255, 255),
         title="Review BG color")
 
 
@@ -100,7 +100,7 @@ DEFAULT_PUBLISH_SETTINGS = {
         "ignore_render_pass_transparency": False
     },
     "ExtractSequence": {
-        "review_bg": [255, 255, 255, 1.0]
+        "review_bg": [255, 255, 255]
     },
     "ValidateProjectSettings": {
         "enabled": True,
diff --git a/server_addon/tvpaint/server/version.py b/server_addon/tvpaint/server/version.py
index 485f44ac21..b3f4756216 100644
--- a/server_addon/tvpaint/server/version.py
+++ b/server_addon/tvpaint/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"

From 00e2bebd125615bf31b120aaa452773391245a51 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 14:44:30 +0100
Subject: [PATCH 11/45] blender can use AYON settings

---
 .../hosts/blender/plugins/publish/extract_playblast.py   | 9 ++++++---
 .../hosts/blender/plugins/publish/extract_thumbnail.py   | 6 ++++--
 client/ayon_core/settings/ayon_settings.py               | 6 ------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
index 83e6b26fbe..04fc2c5c39 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
@@ -1,9 +1,11 @@
 import os
+import json
+
 import clique
+import pyblish.api
 
 import bpy
 
-import pyblish.api
 from ayon_core.pipeline import publish
 from ayon_core.hosts.blender.api import capture
 from ayon_core.hosts.blender.api.lib import maintained_time
@@ -23,6 +25,8 @@ class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin):
     optional = True
     order = pyblish.api.ExtractorOrder + 0.01
 
+    presets = "{}"
+
     def process(self, instance):
         if not self.is_active(instance.data):
             return
@@ -59,8 +63,7 @@ class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         self.log.debug(f"Outputting images to {path}")
 
-        project_settings = instance.context.data["project_settings"]["blender"]
-        presets = project_settings["publish"]["ExtractPlayblast"]["presets"]
+        presets = json.loads(self.presets)
         preset = presets.get("default")
         preset.update({
             "camera": camera,
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
index 7b445a0113..ec701610ce 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
@@ -1,5 +1,6 @@
 import os
 import glob
+import json
 
 import pyblish.api
 from ayon_core.pipeline import publish
@@ -21,7 +22,7 @@ class ExtractThumbnail(publish.Extractor):
     hosts = ["blender"]
     families = ["review"]
     order = pyblish.api.ExtractorOrder + 0.01
-    presets = {}
+    presets = "{}"
 
     def process(self, instance):
         self.log.debug("Extracting capture..")
@@ -44,7 +45,8 @@ class ExtractThumbnail(publish.Extractor):
         family = instance.data.get("family")
         isolate = instance.data("isolate", None)
 
-        preset = self.presets.get(family, {})
+        presets = json.loads(self.presets)
+        preset = presets.get(family, {})
 
         preset.update({
             "camera": camera,
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index e151043afb..e2e569c233 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -248,12 +248,6 @@ def _convert_blender_project_settings(ayon_settings, output):
     ayon_blender = ayon_settings["blender"]
     _convert_host_imageio(ayon_blender)
 
-    ayon_publish = ayon_blender["publish"]
-
-    for plugin in ("ExtractThumbnail", "ExtractPlayblast"):
-        plugin_settings = ayon_publish[plugin]
-        plugin_settings["presets"] = json.loads(plugin_settings["presets"])
-
     output["blender"] = ayon_blender
 
 

From 5c0d866c1efa4b194b0b0534ac1dd410042f8ad2 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 14:50:53 +0100
Subject: [PATCH 12/45] fusion is handling AYON settings in code

---
 client/ayon_core/hosts/fusion/api/plugin.py | 11 ++++++-
 client/ayon_core/settings/ayon_settings.py  | 33 ---------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py
index 12a29d2986..5d7a9dd87d 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -148,7 +148,16 @@ class GenericCreateSaver(Creator):
         })
 
         # build file path to render
-        filepath = self.temp_rendering_path_template.format(**formatting_data)
+        # TODO make sure the keys are available in 'formatting_data'
+        temp_rendering_path_template = (
+            self.temp_rendering_path_template
+            .replace("{product[name]}", "{subset}")
+            .replace("{product[type]}", "{family}")
+            .replace("{folder[name]}", "{asset}")
+            .replace("{task[name]}", "{task}")
+        )
+
+        filepath = temp_rendering_path_template.format(**formatting_data)
 
         comp = get_current_comp()
         tool["Clip"] = comp.ReverseMapPath(os.path.normpath(filepath))
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index e2e569c233..39b0b117f7 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -324,39 +324,6 @@ def _convert_fusion_project_settings(ayon_settings, output):
     ayon_fusion = ayon_settings["fusion"]
     _convert_host_imageio(ayon_fusion)
 
-    ayon_imageio_fusion = ayon_fusion["imageio"]
-
-    if "ocioSettings" in ayon_imageio_fusion:
-        ayon_ocio_setting = ayon_imageio_fusion.pop("ocioSettings")
-        paths = ayon_ocio_setting.pop("ocioPathModel")
-        for key, value in tuple(paths.items()):
-            new_value = []
-            if value:
-                new_value.append(value)
-            paths[key] = new_value
-
-        ayon_ocio_setting["configFilePath"] = paths
-        ayon_imageio_fusion["ocio"] = ayon_ocio_setting
-    elif "ocio" in ayon_imageio_fusion:
-        paths = ayon_imageio_fusion["ocio"].pop("configFilePath")
-        for key, value in tuple(paths.items()):
-            new_value = []
-            if value:
-                new_value.append(value)
-            paths[key] = new_value
-        ayon_imageio_fusion["ocio"]["configFilePath"] = paths
-
-    _convert_host_imageio(ayon_imageio_fusion)
-
-    ayon_create_saver = ayon_fusion["create"]["CreateSaver"]
-    ayon_create_saver["temp_rendering_path_template"] = (
-        ayon_create_saver["temp_rendering_path_template"]
-        .replace("{product[name]}", "{subset}")
-        .replace("{product[type]}", "{family}")
-        .replace("{folder[name]}", "{asset}")
-        .replace("{task[name]}", "{task}")
-    )
-
     output["fusion"] = ayon_fusion
 
 

From cd1ac5c15b8268158ff5a5ad8b64cf31fd25a340 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:04:57 +0100
Subject: [PATCH 13/45] maya use render settings from AYON

---
 .../ayon_core/hosts/maya/api/lib_rendersettings.py | 14 +++++++-------
 .../hosts/maya/plugins/create/create_render.py     |  2 +-
 .../hosts/maya/plugins/create/create_vrayscene.py  |  2 +-
 .../plugins/publish/validate_render_image_rule.py  |  2 +-
 client/ayon_core/settings/ayon_settings.py         |  3 ---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib_rendersettings.py b/client/ayon_core/hosts/maya/api/lib_rendersettings.py
index 54ee7888b3..1e2c95ac73 100644
--- a/client/ayon_core/hosts/maya/api/lib_rendersettings.py
+++ b/client/ayon_core/hosts/maya/api/lib_rendersettings.py
@@ -46,7 +46,7 @@ class RenderSettings(object):
             project_settings = get_project_settings(
                 get_current_project_name()
             )
-        render_settings = project_settings["maya"]["RenderSettings"]
+        render_settings = project_settings["maya"]["render_settings"]
         image_prefixes = {
             "vray": render_settings["vray_renderer"]["image_prefix"],
             "arnold": render_settings["arnold_renderer"]["image_prefix"],
@@ -82,12 +82,12 @@ class RenderSettings(object):
         try:
             aov_separator = self._aov_chars[(
                 self._project_settings["maya"]
-                                      ["RenderSettings"]
+                                      ["render_settings"]
                                       ["aov_separator"]
             )]
         except KeyError:
             aov_separator = "_"
-        reset_frame = self._project_settings["maya"]["RenderSettings"]["reset_current_frame"] # noqa
+        reset_frame = self._project_settings["maya"]["render_settings"]["reset_current_frame"] # noqa
 
         if reset_frame:
             start_frame = cmds.getAttr("defaultRenderGlobals.startFrame")
@@ -131,7 +131,7 @@ class RenderSettings(object):
         import maya.mel as mel  # noqa: F401
 
         createOptions()
-        render_settings = self._project_settings["maya"]["RenderSettings"]
+        render_settings = self._project_settings["maya"]["render_settings"]
         arnold_render_presets = render_settings["arnold_renderer"] # noqa
         # Force resetting settings and AOV list to avoid having to deal with
         # AOV checking logic, for now.
@@ -180,7 +180,7 @@ class RenderSettings(object):
         from maya import cmds  # noqa: F401
         import maya.mel as mel  # noqa: F401
 
-        render_settings = self._project_settings["maya"]["RenderSettings"]
+        render_settings = self._project_settings["maya"]["render_settings"]
         redshift_render_presets = render_settings["redshift_renderer"]
 
         remove_aovs = render_settings["remove_aovs"]
@@ -239,7 +239,7 @@ class RenderSettings(object):
         rman_render_presets = (
             self._project_settings
             ["maya"]
-            ["RenderSettings"]
+            ["render_settings"]
             ["renderman_renderer"]
         )
         display_filters = rman_render_presets["display_filters"]
@@ -304,7 +304,7 @@ class RenderSettings(object):
 
         settings = cmds.ls(type="VRaySettingsNode")
         node = settings[0] if settings else cmds.createNode("VRaySettingsNode")
-        render_settings = self._project_settings["maya"]["RenderSettings"]
+        render_settings = self._project_settings["maya"]["render_settings"]
         vray_render_presets = render_settings["vray_renderer"]
         # vrayRenderElement
         remove_aovs = render_settings["remove_aovs"]
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 f537f249cd..4481836c89 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_render.py
@@ -35,7 +35,7 @@ class CreateRenderlayer(plugin.RenderlayerCreator):
 
     @classmethod
     def apply_settings(cls, project_settings):
-        cls.render_settings = project_settings["maya"]["RenderSettings"]
+        cls.render_settings = project_settings["maya"]["render_settings"]
 
     def create(self, subset_name, instance_data, pre_create_data):
         # Only allow a single render instance to exist
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py b/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
index 3642f5f689..bc8110eff1 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
@@ -23,7 +23,7 @@ class CreateVRayScene(plugin.RenderlayerCreator):
 
     @classmethod
     def apply_settings(cls, project_settings):
-        cls.render_settings = project_settings["maya"]["RenderSettings"]
+        cls.render_settings = project_settings["maya"]["render_settings"]
 
     def create(self, subset_name, instance_data, pre_create_data):
         # Only allow a single render instance to exist
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py b/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
index 576886072d..efc622c416 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
@@ -55,7 +55,7 @@ class ValidateRenderImageRule(pyblish.api.InstancePlugin):
         if staging_dir:
             cls.log.debug(
                 "Staging dir found: \"{}\". Ignoring setting from "
-                "`project_settings/maya/RenderSettings/"
+                "`project_settings/maya/render_settings/"
                 "default_render_image_folder`.".format(staging_dir)
             )
             return staging_dir
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 39b0b117f7..0c7acc1854 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,9 +333,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    # Change key of render settings
-    ayon_maya["RenderSettings"] = ayon_maya.pop("render_settings")
-
     # Convert extensions mapping
     ayon_maya["ext_mapping"] = {
         item["name"]: item["value"]

From 8d830ae37406ad0ae9df91fc4b4bb250261e1643 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:05:38 +0100
Subject: [PATCH 14/45] maya can handle ext_mapping from AYON

---
 .../maya/plugins/publish/extract_camera_mayaScene.py      | 8 +++++---
 .../maya/plugins/publish/extract_import_reference.py      | 8 +++++---
 .../ayon_core/hosts/maya/plugins/publish/extract_look.py  | 8 +++++---
 .../hosts/maya/plugins/publish/extract_maya_scene_raw.py  | 8 +++++---
 .../ayon_core/hosts/maya/plugins/publish/extract_model.py | 8 +++++---
 .../ayon_core/hosts/maya/plugins/publish/extract_rig.py   | 8 +++++---
 .../hosts/maya/plugins/publish/extract_yeti_rig.py        | 8 +++++---
 client/ayon_core/settings/ayon_settings.py                | 6 ------
 8 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
index 8ca1fd9d3a..689eed09f8 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
@@ -112,9 +112,11 @@ class ExtractCameraMayaScene(publish.Extractor,
     def process(self, instance):
         """Plugin entry point."""
         # get settings
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py b/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py
index 2a43a30b8d..3fb84c8d83 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py
@@ -37,9 +37,11 @@ class ExtractImportReference(publish.Extractor,
         if not self.is_active(instance.data):
             return
 
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py b/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
index 7f97a7bf82..29390e2c7d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
@@ -431,9 +431,11 @@ class ExtractLook(publish.Extractor):
                 project settings.
 
         """
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
index 5045a8d252..cd6f3bab6a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
@@ -43,9 +43,11 @@ class ExtractMayaSceneRaw(publish.Extractor, AYONPyblishPluginMixin):
 
     def process(self, instance):
         """Plugin entry point."""
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py b/client/ayon_core/hosts/maya/plugins/publish/extract_model.py
index b6ae4d537a..543af59e8f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_model.py
@@ -35,9 +35,11 @@ class ExtractModel(publish.Extractor,
         if not self.is_active(instance.data):
             return
 
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py b/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py
index 13e3d7c6b4..305f4698c6 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py
@@ -18,9 +18,11 @@ class ExtractRig(publish.Extractor):
 
     def process(self, instance):
         """Plugin entry point."""
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py
index 7387849736..0b67117ebc 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py
@@ -100,9 +100,11 @@ class ExtractYetiRig(publish.Extractor):
 
     def process(self, instance):
         """Plugin entry point."""
-        ext_mapping = (
-            instance.context.data["project_settings"]["maya"]["ext_mapping"]
-        )
+        maya_settings = instance.context.data["project_settings"]["maya"]
+        ext_mapping = {
+            item["name"]: item["value"]
+            for item in maya_settings["ext_mapping"]
+        }
         if ext_mapping:
             self.log.debug("Looking in settings for scene type ...")
             # use extension mapping for first family found
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 0c7acc1854..14af455d5b 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,12 +333,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    # Convert extensions mapping
-    ayon_maya["ext_mapping"] = {
-        item["name"]: item["value"]
-        for item in ayon_maya["ext_mapping"]
-    }
-
     # Maya dirmap
     ayon_maya_dirmap = ayon_maya.pop("maya_dirmap")
     ayon_maya_dirmap_path = ayon_maya_dirmap["paths"]

From 2c7da1a6de01c0d7821475c600950bd0626cde65 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:09:04 +0100
Subject: [PATCH 15/45] dirmap settings are using AYON settings

---
 client/ayon_core/host/dirmap.py             | 24 ++++++++++-----------
 client/ayon_core/hosts/maya/api/plugin.py   |  2 +-
 client/ayon_core/hosts/nuke/api/pipeline.py |  2 +-
 client/ayon_core/settings/ayon_settings.py  | 20 -----------------
 4 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/client/ayon_core/host/dirmap.py b/client/ayon_core/host/dirmap.py
index cecd689a4c..9756657386 100644
--- a/client/ayon_core/host/dirmap.py
+++ b/client/ayon_core/host/dirmap.py
@@ -92,8 +92,8 @@ class HostDirmap(object):
 
         self.on_enable_dirmap()
 
-        for k, sp in enumerate(mapping["source-path"]):
-            dst = mapping["destination-path"][k]
+        for k, sp in enumerate(mapping["source_path"]):
+            dst = mapping["destination_path"][k]
             try:
                 # add trailing slash if missing
                 sp = os.path.join(sp, '')
@@ -116,7 +116,7 @@ class HostDirmap(object):
                 continue
 
     def get_mappings(self):
-        """Get translation from source-path to destination-path.
+        """Get translation from source_path to destination_path.
 
             It checks if Site Sync is enabled and user chose to use local
             site, in that case configuration in Local Settings takes precedence
@@ -138,8 +138,8 @@ class HostDirmap(object):
 
         if (
             not mapping
-            or not mapping.get("destination-path")
-            or not mapping.get("source-path")
+            or not mapping.get("destination_path")
+            or not mapping.get("source_path")
         ):
             return {}
         self.log.info("Processing directory mapping ...")
@@ -154,7 +154,7 @@ class HostDirmap(object):
             in Local Settings.
 
             Returns:
-                dict : { "source-path": [XXX], "destination-path": [YYYY]}
+                dict : { "source_path": [XXX], "destination_path": [YYYY]}
         """
         project_name = self.project_name
 
@@ -210,13 +210,13 @@ class HostDirmap(object):
                     continue
 
                 if os.path.isdir(active_site_dir):
-                    if "destination-path" not in mapping:
-                        mapping["destination-path"] = []
-                    mapping["destination-path"].append(active_site_dir)
+                    if "destination_path" not in mapping:
+                        mapping["destination_path"] = []
+                    mapping["destination_path"].append(active_site_dir)
 
-                    if "source-path" not in mapping:
-                        mapping["source-path"] = []
-                    mapping["source-path"].append(remote_site_dir)
+                    if "source_path" not in mapping:
+                        mapping["source_path"] = []
+                    mapping["source_path"].append(remote_site_dir)
 
             self.log.debug("local sync mapping:: {}".format(mapping))
         return mapping
diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py
index c5e3f42d10..e0ff900c01 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -937,7 +937,7 @@ class ReferenceLoader(Loader):
         """
         settings = get_project_settings(project_name)
         use_env_var_as_root = (settings["maya"]
-                                       ["maya-dirmap"]
+                                       ["maya_dirmap"]
                                        ["use_env_var_as_root"])
         if use_env_var_as_root:
             anatomy = Anatomy(project_name)
diff --git a/client/ayon_core/hosts/nuke/api/pipeline.py b/client/ayon_core/hosts/nuke/api/pipeline.py
index bdba0757b6..99bd5616cb 100644
--- a/client/ayon_core/hosts/nuke/api/pipeline.py
+++ b/client/ayon_core/hosts/nuke/api/pipeline.py
@@ -176,7 +176,7 @@ def add_nuke_callbacks():
     nuke.addOnScriptLoad(WorkfileSettings().set_context_settings)
 
 
-    if nuke_settings["nuke-dirmap"]["enabled"]:
+    if nuke_settings["nuke_dirmap"]["enabled"]:
         log.info("Added Nuke's dir-mapping callback ...")
         # Add dirmap for file paths.
         nuke.addFilenameFilter(dirmap_file_name_filter)
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 14af455d5b..6114b5767c 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,17 +333,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    # Maya dirmap
-    ayon_maya_dirmap = ayon_maya.pop("maya_dirmap")
-    ayon_maya_dirmap_path = ayon_maya_dirmap["paths"]
-    ayon_maya_dirmap_path["source-path"] = (
-        ayon_maya_dirmap_path.pop("source_path")
-    )
-    ayon_maya_dirmap_path["destination-path"] = (
-        ayon_maya_dirmap_path.pop("destination_path")
-    )
-    ayon_maya["maya-dirmap"] = ayon_maya_dirmap
-
     # Create plugins
     ayon_create = ayon_maya["create"]
     ayon_create_static_mesh = ayon_create["CreateUnrealStaticMesh"]
@@ -580,15 +569,6 @@ def _convert_nuke_project_settings(ayon_settings, output):
 
     ayon_nuke = ayon_settings["nuke"]
 
-    # --- Dirmap ---
-    dirmap = ayon_nuke.pop("dirmap")
-    for src_key, dst_key in (
-        ("source_path", "source-path"),
-        ("destination_path", "destination-path"),
-    ):
-        dirmap["paths"][dst_key] = dirmap["paths"].pop(src_key)
-    ayon_nuke["nuke-dirmap"] = dirmap
-
     # --- Load ---
     ayon_load = ayon_nuke["load"]
     ayon_load["LoadClip"]["_representations"] = (

From c35bae324373af98722f91c802d49d7fde24f024 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:23:01 +0100
Subject: [PATCH 16/45] Validate attributes converts attributes on own

---
 .../plugins/publish/validate_attributes.py     | 18 ++++++++++++------
 client/ayon_core/settings/ayon_settings.py     |  7 -------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
index 3dfe2f4f2d..fc39756bf0 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
@@ -1,3 +1,4 @@
+import json
 from collections import defaultdict
 
 import pyblish.api
@@ -23,19 +24,19 @@ class ValidateAttributes(pyblish.api.InstancePlugin,
     """
 
     order = ValidateContentsOrder
-    label = "Attributes"
+    label = "Validate Attributes"
     hosts = ["maya"]
     actions = [RepairAction]
     optional = True
 
-    attributes = None
+    attributes = "{}"
 
     def process(self, instance):
         if not self.is_active(instance.data):
             return
 
         # Check for preset existence.
-        if not self.attributes:
+        if not self.get_attributes_data():
             return
 
         invalid = self.get_invalid(instance, compute=True)
@@ -44,6 +45,10 @@ class ValidateAttributes(pyblish.api.InstancePlugin,
                 "Found attributes with invalid values: {}".format(invalid)
             )
 
+    @classmethod
+    def get_attributes_data(cls):
+        return json.loads(cls.attributes)
+
     @classmethod
     def get_invalid(cls, instance, compute=False):
         if compute:
@@ -55,21 +60,22 @@ class ValidateAttributes(pyblish.api.InstancePlugin,
     def get_invalid_attributes(cls, instance):
         invalid_attributes = []
 
+        attributes_data = cls.get_attributes_data()
         # Filter families.
         families = [instance.data["family"]]
         families += instance.data.get("families", [])
-        families = set(families) & set(cls.attributes.keys())
+        families = set(families) & set(attributes_data.keys())
         if not families:
             return []
 
         # Get all attributes to validate.
         attributes = defaultdict(dict)
         for family in families:
-            if family not in cls.attributes:
+            if family not in attributes_data:
                 # No attributes to validate for family
                 continue
 
-            for preset_attr, preset_value in cls.attributes[family].items():
+            for preset_attr, preset_value in attributes_data[family].items():
                 node_name, attribute_name = preset_attr.split(".", 1)
                 attributes[node_name][attribute_name] = preset_value
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 6114b5767c..a27f071e7c 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -343,13 +343,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
-    try:
-        attributes = json.loads(
-            ayon_publish["ValidateAttributes"]["attributes"]
-        )
-    except ValueError:
-        attributes = {}
-    ayon_publish["ValidateAttributes"]["attributes"] = attributes
 
     try:
         SUFFIX_NAMING_TABLE = json.loads(

From 649d6478e083143fcedfa640a47d8c8fc70790fc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:23:28 +0100
Subject: [PATCH 17/45] removed deprecated conversion

---
 client/ayon_core/settings/ayon_settings.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index a27f071e7c..251fafa597 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,14 +333,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    # Create plugins
-    ayon_create = ayon_maya["create"]
-    ayon_create_static_mesh = ayon_create["CreateUnrealStaticMesh"]
-    if "static_mesh_prefixes" in ayon_create_static_mesh:
-        ayon_create_static_mesh["static_mesh_prefix"] = (
-            ayon_create_static_mesh.pop("static_mesh_prefixes")
-        )
-
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
 

From bf4c8c7b3d4e41a7472d076a8e71d8f5568dda3d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:23:52 +0100
Subject: [PATCH 18/45] SUFFIX_NAMING_TABLE is converted in plugin

---
 .../validate_transform_naming_suffix.py       | 67 +++++++++++--------
 client/ayon_core/settings/ayon_settings.py    | 12 ----
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py b/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
index 1f8d6b7470..e565866778 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """Plugin for validating naming conventions."""
+import json
 from maya import cmds
 
 import pyblish.api
@@ -35,29 +36,37 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin,
     """
 
     order = ValidateContentsOrder
-    hosts = ['maya']
-    families = ['model']
+    hosts = ["maya"]
+    families = ["model"]
     optional = True
-    label = 'Suffix Naming Conventions'
+    label = "Suffix Naming Conventions"
     actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
-    SUFFIX_NAMING_TABLE = {"mesh": ["_GEO", "_GES", "_GEP", "_OSD"],
-                           "nurbsCurve": ["_CRV"],
-                           "nurbsSurface": ["_NRB"],
-                           "locator": ["_LOC"],
-                           "group": ["_GRP"]}
+    SUFFIX_NAMING_TABLE = json.dumps({
+        "mesh": ["_GEO", "_GES", "_GEP", "_OSD"],
+        "nurbsCurve": ["_CRV"],
+        "nurbsSurface": ["_NRB"],
+        "locator": ["_LOC"],
+        "group": ["_GRP"]
+    })
 
     ALLOW_IF_NOT_IN_SUFFIX_TABLE = True
 
     @classmethod
     def get_table_for_invalid(cls):
-        ss = []
-        for k, v in cls.SUFFIX_NAMING_TABLE.items():
-            ss.append(" - <b>{}</b>: {}".format(k, ", ".join(v)))
+        suffix_naming_table = json.loads(cls.SUFFIX_NAMING_TABLE)
+        ss = [
+            " - <b>{}</b>: {}".format(k, ", ".join(v))
+            for k, v in suffix_naming_table.items()
+        ]
         return "<br>".join(ss)
 
     @staticmethod
-    def is_valid_name(node_name, shape_type,
-                      SUFFIX_NAMING_TABLE, ALLOW_IF_NOT_IN_SUFFIX_TABLE):
+    def is_valid_name(
+        node_name,
+        shape_type,
+        suffix_naming_table,
+        allow_if_not_in_suffix_table
+    ):
         """Return whether node's name is correct.
 
         The correctness for a transform's suffix is dependent on what
@@ -70,18 +79,18 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin,
         Args:
             node_name (str): Node name.
             shape_type (str): Type of node.
-            SUFFIX_NAMING_TABLE (dict): Mapping dict for suffixes.
-            ALLOW_IF_NOT_IN_SUFFIX_TABLE (dict): Filter dict.
+            suffix_naming_table (dict): Mapping dict for suffixes.
+            allow_if_not_in_suffix_table (bool): Default output.
 
         """
-        if shape_type not in SUFFIX_NAMING_TABLE:
-            return ALLOW_IF_NOT_IN_SUFFIX_TABLE
-        else:
-            suffices = SUFFIX_NAMING_TABLE[shape_type]
-            for suffix in suffices:
-                if node_name.endswith(suffix):
-                    return True
-            return False
+        if shape_type not in suffix_naming_table:
+            return allow_if_not_in_suffix_table
+
+        suffices = suffix_naming_table[shape_type]
+        for suffix in suffices:
+            if node_name.endswith(suffix):
+                return True
+        return False
 
     @classmethod
     def get_invalid(cls, instance):
@@ -91,9 +100,10 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin,
             instance (:class:`pyblish.api.Instance`): published instance.
 
         """
-        transforms = cmds.ls(instance, type='transform', long=True)
+        transforms = cmds.ls(instance, type="transform", long=True)
 
         invalid = []
+        suffix_naming_table = json.loads(cls.SUFFIX_NAMING_TABLE)
         for transform in transforms:
             shapes = cmds.listRelatives(transform,
                                         shapes=True,
@@ -101,9 +111,12 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin,
                                         noIntermediate=True)
 
             shape_type = cmds.nodeType(shapes[0]) if shapes else "group"
-            if not cls.is_valid_name(transform, shape_type,
-                                     cls.SUFFIX_NAMING_TABLE,
-                                     cls.ALLOW_IF_NOT_IN_SUFFIX_TABLE):
+            if not cls.is_valid_name(
+                transform,
+                shape_type,
+                suffix_naming_table,
+                cls.ALLOW_IF_NOT_IN_SUFFIX_TABLE
+            ):
                 invalid.append(transform)
 
         return invalid
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 251fafa597..165e47da1a 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -336,18 +336,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
 
-    try:
-        SUFFIX_NAMING_TABLE = json.loads(
-            ayon_publish
-            ["ValidateTransformNamingSuffix"]
-            ["SUFFIX_NAMING_TABLE"]
-        )
-    except ValueError:
-        SUFFIX_NAMING_TABLE = {}
-    ayon_publish["ValidateTransformNamingSuffix"]["SUFFIX_NAMING_TABLE"] = (
-        SUFFIX_NAMING_TABLE
-    )
-
     validate_frame_range = ayon_publish["ValidateFrameRange"]
     if "exclude_product_types" in validate_frame_range:
         validate_frame_range["exclude_families"] = (

From a657dfac4e3416d6f7e8f6c4560c3844c21522df Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:30:53 +0100
Subject: [PATCH 19/45] maya 'ValidateFrameRange' is handling AYON settings

---
 .../hosts/maya/plugins/publish/validate_frame_range.py      | 6 ++++--
 client/ayon_core/settings/ayon_settings.py                  | 5 -----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py b/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
index 85cc606b25..d5f99e5563 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
@@ -39,7 +39,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin,
                 "yeticache"]
     optional = True
     actions = [RepairAction]
-    exclude_families = []
+    exclude_product_types = []
 
     def process(self, instance):
         if not self.is_active(instance.data):
@@ -73,7 +73,9 @@ class ValidateFrameRange(pyblish.api.InstancePlugin,
 
         # compare with data on instance
         errors = []
-        if [ef for ef in self.exclude_families
+        # QUESTION shouldn't this be just:
+        #   'if instance.data["family"] in self.exclude_product_types:'
+        if [ef for ef in self.exclude_product_types
                 if instance.data["family"] in ef]:
             return
         if (inst_start != frame_start_handle):
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 165e47da1a..9cadb36869 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -336,11 +336,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
 
-    validate_frame_range = ayon_publish["ValidateFrameRange"]
-    if "exclude_product_types" in validate_frame_range:
-        validate_frame_range["exclude_families"] = (
-            validate_frame_range.pop("exclude_product_types"))
-
     # Extract playblast capture settings
     validate_rendern_settings = ayon_publish["ValidateRenderSettings"]
     for key in (

From 6ae8537983ba2d885744ac831a79e95f4b766499 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:31:41 +0100
Subject: [PATCH 20/45] maya 'ValidateRenderSettings' can handle AYON settings

---
 .../plugins/publish/validate_rendersettings.py    | 13 ++++++++++---
 client/ayon_core/settings/ayon_settings.py        | 15 ---------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
index ed70d81b63..7f6c0bab1d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -281,6 +281,8 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
         # if so, compare its value from the one required.
         for data in cls.get_nodes(instance, renderer):
             for node in data["nodes"]:
+                # Why is captured 'PublishValidationError'? How it can be
+                #   raised by 'cmds.getAttr(...)'?
                 try:
                     render_value = cmds.getAttr(
                         "{}.{}".format(node, data["attribute"])
@@ -310,11 +312,16 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     @classmethod
     def get_nodes(cls, instance, renderer):
         maya_settings = instance.context.data["project_settings"]["maya"]
+        renderer_key = "{}_render_attributes".format(renderer)
         validation_settings = (
             maya_settings["publish"]["ValidateRenderSettings"].get(
-                "{}_render_attributes".format(renderer)
-            ) or []
-        )
+                renderer_key
+            )
+        ) or []
+        validation_settings = [
+            (item["type"], item["value"])
+            for item in validation_settings
+        ]
         result = []
         for attr, values in OrderedDict(validation_settings).items():
             values = [convert_to_int_or_float(v) for v in values if v]
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 9cadb36869..e9ec2ba650 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -336,21 +336,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
 
-    # Extract playblast capture settings
-    validate_rendern_settings = ayon_publish["ValidateRenderSettings"]
-    for key in (
-        "arnold_render_attributes",
-        "vray_render_attributes",
-        "redshift_render_attributes",
-        "renderman_render_attributes",
-    ):
-        if key not in validate_rendern_settings:
-            continue
-        validate_rendern_settings[key] = [
-            [item["type"], item["value"]]
-            for item in validate_rendern_settings[key]
-        ]
-
     plugin_path_attributes = ayon_publish["ValidatePluginPathAttributes"]
     plugin_path_attributes["attribute"] = {
         item["name"]: item["value"]

From 43167dbb094dc97124d2ae8239c1f87a0a68cb28 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:33:20 +0100
Subject: [PATCH 21/45] maya 'ValidatePluginPathAttributes' can handle AYON
 settings

---
 .../plugins/publish/validate_plugin_path_attributes.py    | 8 ++++++--
 client/ayon_core/settings/ayon_settings.py                | 6 ------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py
index d672be6fa0..fd71039e30 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py
@@ -30,14 +30,18 @@ class ValidatePluginPathAttributes(pyblish.api.InstancePlugin):
     def get_invalid(cls, instance):
         invalid = list()
 
-        file_attrs = cls.attribute
+        file_attrs = {
+            item["name"]: item["value"]
+            for item in cls.attribute
+        }
         if not file_attrs:
             return invalid
 
         # Consider only valid node types to avoid "Unknown object type" warning
         all_node_types = set(cmds.allNodeTypes())
         node_types = [
-            key for key in file_attrs.keys()
+            key
+            for key in file_attrs.keys()
             if key in all_node_types
         ]
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index e9ec2ba650..3d58b8f272 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -336,12 +336,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
 
-    plugin_path_attributes = ayon_publish["ValidatePluginPathAttributes"]
-    plugin_path_attributes["attribute"] = {
-        item["name"]: item["value"]
-        for item in plugin_path_attributes["attribute"]
-    }
-
     ayon_capture_preset = ayon_publish["ExtractPlayblast"]["capture_preset"]
     display_options = ayon_capture_preset["DisplayOptions"]
     for key in ("background", "backgroundBottom", "backgroundTop"):

From 1256816f1cf5d8b4ecc840933efd233d386168f3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:56:52 +0100
Subject: [PATCH 22/45] maya 'ExtractPlayblast' can use AYON settings

---
 client/ayon_core/hosts/maya/api/lib.py        | 29 +++++++++-----
 .../maya/plugins/create/create_review.py      |  2 +-
 .../maya/plugins/publish/collect_review.py    |  2 +-
 client/ayon_core/settings/ayon_settings.py    | 39 -------------------
 .../maya/server/settings/publish_playblast.py | 35 ++++++++---------
 5 files changed, 38 insertions(+), 69 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 7b791c3d51..f46471b94d 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -329,7 +329,7 @@ def generate_capture_preset(instance, camera, path,
 
     # Update preset with current panel setting
     # if override_viewport_options is turned off
-    if not capture_preset["Viewport Options"]["override_viewport_options"]:
+    if not capture_preset["ViewportOptions"]["override_viewport_options"]:
         panel_preset = capture.parse_view(preset["panel"])
         panel_preset.pop("camera")
         preset.update(panel_preset)
@@ -2937,14 +2937,15 @@ def load_capture_preset(data):
     options.update(data["Generic"])
     options.update(data["Resolution"])
 
-    camera_options.update(data['Camera Options'])
+    camera_options.update(data["CameraOptions"])
     viewport_options.update(data["Renderer"])
 
     # DISPLAY OPTIONS
     disp_options = {}
-    for key, value in data['Display Options'].items():
-        if key.startswith('background'):
+    for key, value in data["DisplayOptions"].items():
+        if key.startswith("background"):
             # Convert background, backgroundTop, backgroundBottom colors
+
             if len(value) == 4:
                 # Ignore alpha + convert RGB to float
                 value = [
@@ -2956,7 +2957,7 @@ def load_capture_preset(data):
         elif key == "displayGradient":
             disp_options[key] = value
 
-    options['display_options'] = disp_options
+    options["display_options"] = disp_options
 
     # Viewport Options has a mixture of Viewport2 Options and Viewport Options
     # to pass along to capture. So we'll need to differentiate between the two
@@ -2981,7 +2982,7 @@ def load_capture_preset(data):
         "motionBlurShutterOpenFraction",
         "lineAAEnable"
     }
-    for key, value in data['Viewport Options'].items():
+    for key, value in data["ViewportOptions"].items():
 
         # There are some keys we want to ignore
         if key in {"override_viewport_options", "high_quality"}:
@@ -4059,10 +4060,10 @@ def get_capture_preset(task_name, task_type, subset, project_settings, log):
 
     Args:
         task_name (str): Task name.
-        take_type (str): Task type.
+        task_type (str): Task type.
         subset (str): Subset name.
         project_settings (dict): Project settings.
-        log (object): Logging object.
+        log (logging.Logger): Logging object.
     """
     capture_preset = None
     filtering_criteria = {
@@ -4091,8 +4092,18 @@ def get_capture_preset(task_name, task_type, subset, project_settings, log):
             "Falling back to deprecated Extract Playblast capture preset "
             "because no new style playblast profiles are defined."
         )
-        capture_preset = plugin_settings["capture_preset"]
+        capture_preset = plugin_settings.get("capture_preset")
 
+    if capture_preset:
+        # Create deepcopy of preset as we'll change the values
+        capture_preset = copy.deepcopy(capture_preset)
+
+        viewport_options = capture_preset["ViewportOptions"]
+        # Change 'list' to 'dict' for 'capture.py'
+        viewport_options["pluginObjects"] = {
+            item["name"]: item["value"]
+            for item in viewport_options["pluginObjects"]
+        }
     return capture_preset or {}
 
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_review.py b/client/ayon_core/hosts/maya/plugins/create/create_review.py
index 6f7c0ca802..3e75b52556 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_review.py
@@ -75,7 +75,7 @@ class CreateReview(plugin.MayaCreator):
                 "review_width": preset["Resolution"]["width"],
                 "review_height": preset["Resolution"]["height"],
                 "isolate": preset["Generic"]["isolate_view"],
-                "imagePlane": preset["Viewport Options"]["imagePlane"],
+                "imagePlane": preset["ViewportOptions"]["imagePlane"],
                 "panZoom": preset["Generic"]["pan_zoom"]
             }
             for key, value in mapping.items():
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py b/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
index 679a21243a..205c871c93 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
@@ -39,7 +39,7 @@ class CollectReview(pyblish.api.InstancePlugin):
         if display_lights == "project_settings":
             settings = instance.context.data["project_settings"]
             settings = settings["maya"]["publish"]["ExtractPlayblast"]
-            settings = settings["capture_preset"]["Viewport Options"]
+            settings = settings["capture_preset"]["ViewportOptions"]
             display_lights = settings["displayLights"]
 
         # Collect camera focal length.
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 3d58b8f272..8e4c5abe10 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -336,45 +336,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     # --- Publish (START) ---
     ayon_publish = ayon_maya["publish"]
 
-    ayon_capture_preset = ayon_publish["ExtractPlayblast"]["capture_preset"]
-    display_options = ayon_capture_preset["DisplayOptions"]
-    for key in ("background", "backgroundBottom", "backgroundTop"):
-        display_options[key] = _convert_color(display_options[key])
-
-    for src_key, dst_key in (
-        ("DisplayOptions", "Display Options"),
-        ("ViewportOptions", "Viewport Options"),
-        ("CameraOptions", "Camera Options"),
-    ):
-        ayon_capture_preset[dst_key] = ayon_capture_preset.pop(src_key)
-
-    viewport_options = ayon_capture_preset["Viewport Options"]
-    viewport_options["pluginObjects"] = {
-        item["name"]: item["value"]
-        for item in viewport_options["pluginObjects"]
-    }
-
-    ayon_playblast_settings = ayon_publish["ExtractPlayblast"]["profiles"]
-    if ayon_playblast_settings:
-        for setting in ayon_playblast_settings:
-            capture_preset = setting["capture_preset"]
-            display_options = capture_preset["DisplayOptions"]
-            for key in ("background", "backgroundBottom", "backgroundTop"):
-                display_options[key] = _convert_color(display_options[key])
-
-            for src_key, dst_key in (
-                ("DisplayOptions", "Display Options"),
-                ("ViewportOptions", "Viewport Options"),
-                ("CameraOptions", "Camera Options"),
-            ):
-                capture_preset[dst_key] = capture_preset.pop(src_key)
-
-            viewport_options = capture_preset["Viewport Options"]
-            viewport_options["pluginObjects"] = {
-                item["name"]: item["value"]
-                for item in viewport_options["pluginObjects"]
-            }
-
     # Extract Camera Alembic bake attributes
     try:
         bake_attributes = json.loads(
diff --git a/server_addon/maya/server/settings/publish_playblast.py b/server_addon/maya/server/settings/publish_playblast.py
index 0461a18cc8..dcedf3ccc9 100644
--- a/server_addon/maya/server/settings/publish_playblast.py
+++ b/server_addon/maya/server/settings/publish_playblast.py
@@ -6,7 +6,7 @@ from ayon_server.settings import (
     ensure_unique_names,
     task_types_enum,
 )
-from ayon_server.types import ColorRGBA_uint8
+from ayon_server.types import ColorRGB_float
 
 
 def hardware_falloff_enum():
@@ -54,17 +54,17 @@ class DisplayOptionsSetting(BaseSettingsModel):
     override_display: bool = SettingsField(
         True, title="Override display options"
     )
-    background: ColorRGBA_uint8 = SettingsField(
-        (125, 125, 125, 1.0), title="Background Color"
+    background: ColorRGB_float = SettingsField(
+        (0.5, 0.5, 0.5), title="Background Color"
     )
     displayGradient: bool = SettingsField(
         True, title="Display background gradient"
     )
-    backgroundTop: ColorRGBA_uint8 = SettingsField(
-        (125, 125, 125, 1.0), title="Background Top"
+    backgroundTop: ColorRGB_float = SettingsField(
+        (0.5, 0.5, 0.5), title="Background Top"
     )
-    backgroundBottom: ColorRGBA_uint8 = SettingsField(
-        (125, 125, 125, 1.0), title="Background Bottom"
+    backgroundBottom: ColorRGB_float = SettingsField(
+        (0.5, 0.5, 0.5), title="Background Bottom"
     )
 
 
@@ -283,22 +283,19 @@ DEFAULT_PLAYBLAST_SETTING = {
         "DisplayOptions": {
             "override_display": True,
             "background": [
-                125,
-                125,
-                125,
-                1.0
+                0.5,
+                0.5,
+                0.5
             ],
             "backgroundBottom": [
-                125,
-                125,
-                125,
-                1.0
+                0.5,
+                0.5,
+                0.5
             ],
             "backgroundTop": [
-                125,
-                125,
-                125,
-                1.0
+                0.5,
+                0.5,
+                0.5
             ],
             "displayGradient": True
         },

From 6a3b475be5595ddc9a47fabe9febbde15a941836 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 15:57:17 +0100
Subject: [PATCH 23/45] maya 'ExtractCameraAlembic' can use AYON settings

---
 .../maya/plugins/publish/extract_camera_alembic.py  |  8 +++++---
 client/ayon_core/settings/ayon_settings.py          | 13 -------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
index b9561e299e..2be9cfec95 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
@@ -1,4 +1,5 @@
 import os
+import json
 
 from maya import cmds
 
@@ -21,7 +22,7 @@ class ExtractCameraAlembic(publish.Extractor,
     label = "Extract Camera (Alembic)"
     hosts = ["maya"]
     families = ["camera", "matchmove"]
-    bake_attributes = []
+    bake_attributes = "[]"
 
     def process(self, instance):
 
@@ -95,11 +96,12 @@ class ExtractCameraAlembic(publish.Extractor,
 
             job_str += ' -file "{0}"'.format(path)
 
+            bake_attributes = json.loads(self.bake_attributes)
             # bake specified attributes in preset
-            assert isinstance(self.bake_attributes, (list, tuple)), (
+            assert isinstance(bake_attributes, list), (
                 "Attributes to bake must be specified as a list"
             )
-            for attr in self.bake_attributes:
+            for attr in bake_attributes:
                 self.log.debug("Adding {} attribute".format(attr))
                 job_str += " -attr {0}".format(attr)
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 8e4c5abe10..f9e674b2c1 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,19 +333,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    # --- Publish (START) ---
-    ayon_publish = ayon_maya["publish"]
-
-    # Extract Camera Alembic bake attributes
-    try:
-        bake_attributes = json.loads(
-            ayon_publish["ExtractCameraAlembic"]["bake_attributes"]
-        )
-    except ValueError:
-        bake_attributes = []
-    ayon_publish["ExtractCameraAlembic"]["bake_attributes"] = bake_attributes
-
-    # --- Publish (END) ---
     for renderer_settings in ayon_maya["RenderSettings"].values():
         if (
             not isinstance(renderer_settings, dict)

From 6c48e74bd2350bf8a8829d09b7556547f771d5e8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 16:04:55 +0100
Subject: [PATCH 24/45] additional options for renderer can us AYON settings

---
 client/ayon_core/hosts/maya/api/lib_rendersettings.py |  3 ++-
 client/ayon_core/settings/ayon_settings.py            | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib_rendersettings.py b/client/ayon_core/hosts/maya/api/lib_rendersettings.py
index 1e2c95ac73..b8a4d04a10 100644
--- a/client/ayon_core/hosts/maya/api/lib_rendersettings.py
+++ b/client/ayon_core/hosts/maya/api/lib_rendersettings.py
@@ -390,7 +390,8 @@ class RenderSettings(object):
         import maya.mel as mel  # noqa: F401
 
         for item in additional_attribs:
-            attribute, value = item
+            attribute = item["attribute"]
+            value = item["value"]
             attribute = str(attribute)  # ensure str conversion from settings
             attribute_type = cmds.getAttr(attribute, type=True)
             if attribute_type in {"long", "bool"}:
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index f9e674b2c1..5d7a9e0356 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,17 +333,6 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    for renderer_settings in ayon_maya["RenderSettings"].values():
-        if (
-            not isinstance(renderer_settings, dict)
-            or "additional_options" not in renderer_settings
-        ):
-            continue
-        renderer_settings["additional_options"] = [
-            [item["attribute"], item["value"]]
-            for item in renderer_settings["additional_options"]
-        ]
-
     # Workfile build
     ayon_workfile_build = ayon_maya["workfile_build"]
     for item in ayon_workfile_build["profiles"]:

From 0404e27e8eeb5eb598852d946c9d80bb36892dbf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 16:07:37 +0100
Subject: [PATCH 25/45] added product key to template formatting data

---
 client/ayon_core/hosts/maya/api/plugin.py  | 31 +++++++++++++---------
 client/ayon_core/settings/ayon_settings.py | 13 ---------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py
index e0ff900c01..01ca4f7875 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -611,33 +611,38 @@ class Loader(LoaderPlugin):
         options["attach_to_root"] = True
         custom_naming = self.load_settings[loader_key]
 
-        if not custom_naming['namespace']:
+        if not custom_naming["namespace"]:
             raise LoadError("No namespace specified in "
                             "Maya ReferenceLoader settings")
-        elif not custom_naming['group_name']:
+        elif not custom_naming["group_name"]:
             self.log.debug("No custom group_name, no group will be created.")
             options["attach_to_root"] = False
 
-        asset = context['asset']
-        subset = context['subset']
+        asset = context["asset"]
+        subset = context["subset"]
+        family = (
+            subset["data"].get("family")
+            or subset["data"]["families"][0]
+        )
         formatting_data = {
-            "asset_name": asset['name'],
-            "asset_type": asset['type'],
+            "asset_name": asset["name"],
+            "asset_type": asset["type"],
             "folder": {
                 "name": asset["name"],
             },
-            "subset": subset['name'],
-            "family": (
-                subset['data'].get('family') or
-                subset['data']['families'][0]
-            )
+            "subset": subset["name"],
+            "product": {
+                "name": subset["name"],
+                "type": family,
+            },
+            "family": family
         }
 
-        custom_namespace = custom_naming['namespace'].format(
+        custom_namespace = custom_naming["namespace"].format(
             **formatting_data
         )
 
-        custom_group_name = custom_naming['group_name'].format(
+        custom_group_name = custom_naming["group_name"].format(
             **formatting_data
         )
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 5d7a9e0356..1a353a5a64 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -351,19 +351,6 @@ def _convert_maya_project_settings(ayon_settings, output):
     for key, color in tuple(load_colors.items()):
         load_colors[key] = _convert_color(color)
 
-    reference_loader = ayon_maya_load["reference_loader"]
-    reference_loader["namespace"] = (
-        reference_loader["namespace"]
-        .replace("{product[name]}", "{subset}")
-    )
-
-    if ayon_maya_load.get("import_loader"):
-        import_loader = ayon_maya_load["import_loader"]
-        import_loader["namespace"] = (
-            import_loader["namespace"]
-            .replace("{product[name]}", "{subset}")
-        )
-
     output["maya"] = ayon_maya
 
 

From dcd1f0946b6609b2f9264ee7bbbe3999ea3e9e2b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 16:47:00 +0100
Subject: [PATCH 26/45] use load plugin colors from AYON settings

---
 client/ayon_core/hosts/maya/api/plugin.py     |  34 +++
 .../maya/plugins/load/load_arnold_standin.py  |   6 +-
 .../hosts/maya/plugins/load/load_gpucache.py  |  10 +-
 .../maya/plugins/load/load_redshift_proxy.py  |  12 +-
 .../hosts/maya/plugins/load/load_reference.py |  21 +-
 .../maya/plugins/load/load_vdb_to_arnold.py   |  14 +-
 .../maya/plugins/load/load_vdb_to_redshift.py |  14 +-
 .../maya/plugins/load/load_vdb_to_vray.py     |  13 +-
 .../hosts/maya/plugins/load/load_vrayproxy.py |  12 +-
 .../hosts/maya/plugins/load/load_vrayscene.py |  14 +-
 .../maya/plugins/load/load_yeti_cache.py      |  14 +-
 .../hosts/maya/plugins/load/load_yeti_rig.py  |  15 +-
 client/ayon_core/settings/ayon_settings.py    |   7 -
 server_addon/maya/server/settings/loaders.py  | 226 ++++++++++++++----
 14 files changed, 275 insertions(+), 137 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py
index 01ca4f7875..aba5fd8903 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -22,6 +22,7 @@ from ayon_core.pipeline import (
     LegacyCreator,
     LoaderPlugin,
     get_representation_path,
+    get_current_project_name,
 )
 from ayon_core.pipeline.load import LoadError
 from ayon_core.client import get_asset_by_name
@@ -585,6 +586,39 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
                                project_name)
 
 
+def get_load_color_for_family(family, settings=None):
+    """Get color for family from settings.
+
+    Args:
+        family (str): Family name.
+        settings (Optional[dict]): Settings dictionary.
+
+    Returns:
+        Union[tuple[float, float, float], None]: RGB color.
+
+    """
+    if settings is None:
+        settings = get_project_settings(get_current_project_name())
+
+    colors = settings["maya"]["load"]["colors"]
+    color = colors.get(family)
+    if not color:
+        return None
+
+    if len(color) == 3:
+        red, green, blue = color
+    elif len(color) == 4:
+        red, green, blue, _ = color
+    else:
+        raise ValueError("Invalid color definition {}".format(str(color)))
+
+    if type(red, int):
+        red = red / 255.0
+        green = green / 255.0
+        blue = blue / 255.0
+    return red, green, blue
+
+
 class Loader(LoaderPlugin):
     hosts = ["maya"]
 
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
index c690d1c205..d70a43a8c3 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
@@ -16,6 +16,7 @@ from ayon_core.hosts.maya.api.lib import (
     convert_to_maya_fps
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 def is_sequence(files):
@@ -72,11 +73,12 @@ class ArnoldStandinLoader(load.LoaderPlugin):
 
         # Set color.
         settings = get_project_settings(context["project"]["name"])
-        color = settings['maya']['load']['colors'].get('ass')
+        color = get_load_color_for_family("ass", settings)
         if color is not None:
+            red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", True)
             cmds.setAttr(
-                root + ".outlinerColor", color[0], color[1], color[2]
+                root + ".outlinerColor", red, green, blue
             )
 
         with maintained_selection():
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py b/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
index 00a76d374b..cdaaeeae6a 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
@@ -9,6 +9,7 @@ from ayon_core.pipeline import (
     get_representation_path
 )
 from ayon_core.settings import get_project_settings
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 class GpuCacheLoader(load.LoaderPlugin):
@@ -39,13 +40,12 @@ class GpuCacheLoader(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-        c = colors.get('model')
-        if c is not None:
+        color = get_load_color_for_family("model", settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
             cmds.setAttr(
-                root + ".outlinerColor",
-                (float(c[0]) / 255), (float(c[1]) / 255), (float(c[2]) / 255)
+                root + ".outlinerColor", red, green, blue
             )
 
         # Create transform with shape
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
index dd378602c9..8910d0fcd0 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
@@ -16,6 +16,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 class RedshiftProxyLoader(load.LoaderPlugin):
@@ -59,12 +60,13 @@ class RedshiftProxyLoader(load.LoaderPlugin):
         # colour the group node
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1)
-            cmds.setAttr("{0}.outlinerColor".format(group_node),
-                         c[0], c[1], c[2])
+            cmds.setAttr(
+                "{0}.outlinerColor".format(group_node), red, green, blue
+            )
 
         return containerise(
             name=name,
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_reference.py b/client/ayon_core/hosts/maya/plugins/load/load_reference.py
index 36bd2e5969..75f42a9fe6 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_reference.py
@@ -1,4 +1,3 @@
-import os
 import difflib
 import contextlib
 
@@ -6,7 +5,7 @@ from maya import cmds
 import qargparse
 
 from ayon_core.settings import get_project_settings
-import ayon_core.hosts.maya.api.plugin
+from ayon_core.hosts.maya.api import plugin
 from ayon_core.hosts.maya.api.lib import (
     maintained_selection,
     get_container_members,
@@ -87,7 +86,7 @@ def preserve_modelpanel_cameras(container, log=None):
             cmds.modelPanel(panel, edit=True, camera=new_camera)
 
 
-class ReferenceLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
+class ReferenceLoader(plugin.ReferenceLoader):
     """Reference file"""
 
     families = ["model",
@@ -185,14 +184,16 @@ class ReferenceLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
                     "{}.displayHandle".format(group_name), display_handle
                 )
 
-                colors = settings['maya']['load']['colors']
-                c = colors.get(family)
-                if c is not None:
+                color = plugin.get_load_color_for_family(family, settings)
+                if color is not None:
+                    red, green, blue = color
                     cmds.setAttr("{}.useOutlinerColor".format(group_name), 1)
-                    cmds.setAttr("{}.outlinerColor".format(group_name),
-                                 (float(c[0]) / 255),
-                                 (float(c[1]) / 255),
-                                 (float(c[2]) / 255))
+                    cmds.setAttr(
+                        "{}.outlinerColor".format(group_name),
+                        red,
+                        green,
+                        blue
+                    )
 
                 cmds.setAttr(
                     "{}.displayHandle".format(group_name), display_handle
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
index 98f98330d7..c68fddc60a 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
@@ -5,6 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 # TODO aiVolume doesn't automatically set velocity fps correctly, set manual?
 
 
@@ -50,16 +51,11 @@ class LoadVDBtoArnold(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
-            cmds.setAttr(root + ".outlinerColor",
-                         (float(c[0]) / 255),
-                         (float(c[1]) / 255),
-                         (float(c[2]) / 255)
-                         )
+            cmds.setAttr(root + ".outlinerColor", red, green, blue)
 
         # Create VRayVolumeGrid
         grid_node = cmds.createNode("aiVolume",
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
index 426e85cf7c..1bc75ae4c6 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
@@ -5,6 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 class LoadVDBtoRedShift(load.LoaderPlugin):
@@ -69,16 +70,11 @@ class LoadVDBtoRedShift(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
-            cmds.setAttr(root + ".outlinerColor",
-                (float(c[0])/255),
-                (float(c[1])/255),
-                (float(c[2])/255)
-            )
+            cmds.setAttr(root + ".outlinerColor", red, green, blue)
 
         # Create VR
         volume_node = cmds.createNode("RedshiftVolumeShape",
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
index ca0519900b..0c87162629 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
@@ -5,6 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 from maya import cmds
 
@@ -129,15 +130,11 @@ class LoadVDBtoVRay(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
-            cmds.setAttr(root + ".outlinerColor",
-                         float(c[0]) / 255,
-                         float(c[1]) / 255,
-                         float(c[2]) / 255)
+            cmds.setAttr(root + ".outlinerColor", red, green, blue)
 
         # Create VRayVolumeGrid
         grid_node = cmds.createNode("VRayVolumeGrid",
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
index 9b36303b64..50b63f4f11 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
@@ -22,6 +22,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 class VRayProxyLoader(load.LoaderPlugin):
@@ -80,15 +81,12 @@ class VRayProxyLoader(load.LoaderPlugin):
         # colour the group node
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1)
             cmds.setAttr(
-                "{0}.outlinerColor".format(group_node),
-                (float(c[0]) / 255),
-                (float(c[1]) / 255),
-                (float(c[2]) / 255)
+                "{0}.outlinerColor".format(group_node), red, green, blue
             )
 
         return containerise(
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py b/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
index 92d2b32549..7b4edb0567 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 import maya.cmds as cmds  # noqa
 from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import (
@@ -12,6 +11,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 class VRaySceneLoader(load.LoaderPlugin):
@@ -58,14 +58,12 @@ class VRaySceneLoader(load.LoaderPlugin):
         # colour the group node
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr("{0}.useOutlinerColor".format(root_node), 1)
-            cmds.setAttr("{0}.outlinerColor".format(root_node),
-                (float(c[0])/255),
-                (float(c[1])/255),
-                (float(c[2])/255)
+            cmds.setAttr(
+                "{0}.outlinerColor".format(root_node), red, green, blue
             )
 
         return containerise(
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
index d2fc1c0ab0..afbb632d87 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
@@ -13,6 +13,7 @@ from ayon_core.pipeline import (
 )
 from ayon_core.hosts.maya.api import lib
 from ayon_core.hosts.maya.api.pipeline import containerise
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
 
 
 # Do not reset these values on update but only apply on first load
@@ -81,16 +82,11 @@ class YetiCacheLoader(load.LoaderPlugin):
         project_name = context["project"]["name"]
 
         settings = get_project_settings(project_name)
-        colors = settings['maya']['load']['colors']
-
-        c = colors.get(family)
-        if c is not None:
+        color = get_load_color_for_family(family, settings)
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr(group_node + ".useOutlinerColor", 1)
-            cmds.setAttr(group_node + ".outlinerColor",
-                (float(c[0])/255),
-                (float(c[1])/255),
-                (float(c[2])/255)
-            )
+            cmds.setAttr(group_node + ".outlinerColor", red, green, blue)
 
         nodes.append(group_node)
 
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
index 2572e550e2..e7178be38b 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
@@ -1,11 +1,10 @@
 import maya.cmds as cmds
 
-from ayon_core.settings import get_current_project_settings
-import ayon_core.hosts.maya.api.plugin
+from ayon_core.hosts.maya.api import plugin
 from ayon_core.hosts.maya.api import lib
 
 
-class YetiRigLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
+class YetiRigLoader(plugin.ReferenceLoader):
     """This loader will load Yeti rig."""
 
     families = ["yetiRig"]
@@ -41,14 +40,12 @@ class YetiRigLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader):
                 groupName=group_name
             )
 
-        settings = get_current_project_settings()
-        colors = settings["maya"]["load"]["colors"]
-        c = colors.get("yetiRig")
-        if c is not None:
+        color = plugin.get_load_color_for_family("yetiRig")
+        if color is not None:
+            red, green, blue = color
             cmds.setAttr(group_name + ".useOutlinerColor", 1)
             cmds.setAttr(
-                group_name + ".outlinerColor",
-                (float(c[0]) / 255), (float(c[1]) / 255), (float(c[2]) / 255)
+                group_name + ".outlinerColor", red, green, blue
             )
         self[:] = nodes
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 1a353a5a64..5734ac0707 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -344,13 +344,6 @@ def _convert_maya_project_settings(ayon_settings, output):
                 subitem["subset_name_filters"] = subitem.pop(
                     "product_name_filters")
 
-    _convert_host_imageio(ayon_maya)
-
-    ayon_maya_load = ayon_maya["load"]
-    load_colors = ayon_maya_load["colors"]
-    for key, color in tuple(load_colors.items()):
-        load_colors[key] = _convert_color(color)
-
     output["maya"] = ayon_maya
 
 
diff --git a/server_addon/maya/server/settings/loaders.py b/server_addon/maya/server/settings/loaders.py
index 15d4275b80..df1172ae7d 100644
--- a/server_addon/maya/server/settings/loaders.py
+++ b/server_addon/maya/server/settings/loaders.py
@@ -1,40 +1,136 @@
 from ayon_server.settings import BaseSettingsModel, SettingsField
-from ayon_server.types import ColorRGBA_uint8
+from ayon_server.types import ColorRGB_float
 
 
 class ColorsSetting(BaseSettingsModel):
-    model: ColorRGBA_uint8 = SettingsField(
-        (209, 132, 30, 1.0), title="Model:")
-    rig: ColorRGBA_uint8 = SettingsField(
-        (59, 226, 235, 1.0), title="Rig:")
-    pointcache: ColorRGBA_uint8 = SettingsField(
-        (94, 209, 30, 1.0), title="Pointcache:")
-    animation: ColorRGBA_uint8 = SettingsField(
-        (94, 209, 30, 1.0), title="Animation:")
-    ass: ColorRGBA_uint8 = SettingsField(
-        (249, 135, 53, 1.0), title="Arnold StandIn:")
-    camera: ColorRGBA_uint8 = SettingsField(
-        (136, 114, 244, 1.0), title="Camera:")
-    fbx: ColorRGBA_uint8 = SettingsField(
-        (215, 166, 255, 1.0), title="FBX:")
-    mayaAscii: ColorRGBA_uint8 = SettingsField(
-        (67, 174, 255, 1.0), title="Maya Ascii:")
-    mayaScene: ColorRGBA_uint8 = SettingsField(
-        (67, 174, 255, 1.0), title="Maya Scene:")
-    setdress: ColorRGBA_uint8 = SettingsField(
-        (255, 250, 90, 1.0), title="Set Dress:")
-    layout: ColorRGBA_uint8 = SettingsField((
-        255, 250, 90, 1.0), title="Layout:")
-    vdbcache: ColorRGBA_uint8 = SettingsField(
-        (249, 54, 0, 1.0), title="VDB Cache:")
-    vrayproxy: ColorRGBA_uint8 = SettingsField(
-        (255, 150, 12, 1.0), title="VRay Proxy:")
-    vrayscene_layer: ColorRGBA_uint8 = SettingsField(
-        (255, 150, 12, 1.0), title="VRay Scene:")
-    yeticache: ColorRGBA_uint8 = SettingsField(
-        (99, 206, 220, 1.0), title="Yeti Cache:")
-    yetiRig: ColorRGBA_uint8 = SettingsField(
-        (0, 205, 125, 1.0), title="Yeti Rig:")
+    model: ColorRGB_float = SettingsField(
+        (
+            0.8196078431372549,
+            0.5176470588235295,
+            0.11764705882352941
+        ),
+        title="Model:"
+    )
+    rig: ColorRGB_float = SettingsField(
+        (
+            0.23137254901960785,
+            0.8862745098039215,
+            0.9215686274509803
+        ),
+        title="Rig:"
+    )
+    pointcache: ColorRGB_float = SettingsField(
+        (
+            0.3686274509803922,
+            0.8196078431372549,
+            0.11764705882352941
+        ),
+        title="Pointcache:"
+    )
+    animation: ColorRGB_float = SettingsField(
+        (
+            0.3686274509803922,
+            0.8196078431372549,
+            0.11764705882352941
+        ),
+        title="Animation:"
+    )
+    ass: ColorRGB_float = SettingsField(
+        (
+            0.9764705882352941,
+            0.5294117647058824,
+            0.20784313725490197
+        ),
+        title="Arnold StandIn:"
+    )
+    camera: ColorRGB_float = SettingsField(
+        (
+            0.5333333333333333,
+            0.4470588235294118,
+            0.9568627450980393
+        ),
+        title="Camera:"
+    )
+    fbx: ColorRGB_float = SettingsField(
+        (
+            0.8431372549019608,
+            0.6509803921568628,
+            1.0
+        ),
+        title="FBX:"
+    )
+    mayaAscii: ColorRGB_float = SettingsField(
+        (
+            0.2627450980392157,
+            0.6823529411764706,
+            1.0
+        ),
+        title="Maya Ascii:"
+    )
+    mayaScene: ColorRGB_float = SettingsField(
+        (
+            0.2627450980392157,
+            0.6823529411764706,
+            1.0
+        ),
+        title="Maya Scene:"
+    )
+    setdress: ColorRGB_float = SettingsField(
+        (
+            1.0,
+            0.9803921568627451,
+            0.35294117647058826
+        ),
+        title="Set Dress:"
+    )
+    layout: ColorRGB_float = SettingsField(
+        (
+            1.0,
+            0.9803921568627451,
+            0.35294117647058826
+        ),
+        title="Layout:"
+    )
+    vdbcache: ColorRGB_float = SettingsField(
+        (
+            0.9764705882352941,
+            0.21176470588235294,
+            0.0
+        ),
+        title="VDB Cache:"
+    )
+    vrayproxy: ColorRGB_float = SettingsField(
+        (
+            1.0,
+            0.5882352941176471,
+            0.047058823529411764
+        ),
+        title="VRay Proxy:"
+    )
+    vrayscene_layer: ColorRGB_float = SettingsField(
+        (
+            1.0,
+            0.5882352941176471,
+            0.047058823529411764
+        ),
+        title="VRay Scene:"
+    )
+    yeticache: ColorRGB_float = SettingsField(
+        (
+            0.38823529411764707,
+            0.807843137254902,
+            0.8627450980392157
+        ),
+        title="Yeti Cache:"
+    )
+    yetiRig: ColorRGB_float = SettingsField(
+        (
+            0.0,
+            0.803921568627451,
+            0.49019607843137253
+        ),
+        title="Yeti Rig:"
+    )
 
 
 class ReferenceLoaderModel(BaseSettingsModel):
@@ -68,52 +164,84 @@ class LoadersModel(BaseSettingsModel):
 DEFAULT_LOADERS_SETTING = {
     "colors": {
         "model": [
-            209, 132, 30, 1.0
+            0.8196078431372549,
+            0.5176470588235295,
+            0.11764705882352941
         ],
         "rig": [
-            59, 226, 235, 1.0
+            0.23137254901960785,
+            0.8862745098039215,
+            0.9215686274509803
         ],
         "pointcache": [
-            94, 209, 30, 1.0
+            0.3686274509803922,
+            0.8196078431372549,
+            0.11764705882352941
         ],
         "animation": [
-            94, 209, 30, 1.0
+            0.3686274509803922,
+            0.8196078431372549,
+            0.11764705882352941
         ],
         "ass": [
-            249, 135, 53, 1.0
+            0.9764705882352941,
+            0.5294117647058824,
+            0.20784313725490197
         ],
         "camera": [
-            136, 114, 244, 1.0
+            0.5333333333333333,
+            0.4470588235294118,
+            0.9568627450980393
         ],
         "fbx": [
-            215, 166, 255, 1.0
+            0.8431372549019608,
+            0.6509803921568628,
+            1.0
         ],
         "mayaAscii": [
-            67, 174, 255, 1.0
+            0.2627450980392157,
+            0.6823529411764706,
+            1.0
         ],
         "mayaScene": [
-            67, 174, 255, 1.0
+            0.2627450980392157,
+            0.6823529411764706,
+            1.0
         ],
         "setdress": [
-            255, 250, 90, 1.0
+            1.0,
+            0.9803921568627451,
+            0.35294117647058826
         ],
         "layout": [
-            255, 250, 90, 1.0
+            1.0,
+            0.9803921568627451,
+            0.35294117647058826
         ],
         "vdbcache": [
-            249, 54, 0, 1.0
+            0.9764705882352941,
+            0.21176470588235294,
+            0.0
         ],
         "vrayproxy": [
-            255, 150, 12, 1.0
+            1.0,
+            0.5882352941176471,
+            0.047058823529411764
         ],
         "vrayscene_layer": [
-            255, 150, 12, 1.0
+            1.0,
+            0.5882352941176471,
+            0.047058823529411764
         ],
         "yeticache": [
-            99, 206, 220, 1.0
+            0.38823529411764707,
+            0.807843137254902,
+            0.8627450980392157
         ],
         "yetiRig": [
-            0, 205, 125, 1.0
+            0.0,
+            0.803921568627451,
+            0.49019607843137253
         ]
     },
     "reference_loader": {

From c3a8c2ac7f1f7869ef8c7ec09988e571c2a399e4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 16:55:54 +0100
Subject: [PATCH 27/45] build workfile works with new keys

---
 client/ayon_core/pipeline/workfile/build_workfile.py | 10 +++++-----
 client/ayon_core/settings/ayon_settings.py           | 11 +----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/client/ayon_core/pipeline/workfile/build_workfile.py b/client/ayon_core/pipeline/workfile/build_workfile.py
index c62facaaa9..8df3830d6e 100644
--- a/client/ayon_core/pipeline/workfile/build_workfile.py
+++ b/client/ayon_core/pipeline/workfile/build_workfile.py
@@ -321,7 +321,7 @@ class BuildWorkfile:
                 continue
 
             # Check families
-            profile_families = profile.get("families")
+            profile_families = profile.get("product_types")
             if not profile_families:
                 self.log.warning((
                     "Build profile is missing families configuration: {0}"
@@ -338,7 +338,7 @@ class BuildWorkfile:
                 continue
 
             # Prepare lowered families and representation names
-            profile["families_lowered"] = [
+            profile["product_types_lowered"] = [
                 fam.lower() for fam in profile_families
             ]
             profile["repre_names_lowered"] = [
@@ -375,11 +375,11 @@ class BuildWorkfile:
             family_low = family.lower()
             for profile in profiles:
                 # Skip profile if does not contain family
-                if family_low not in profile["families_lowered"]:
+                if family_low not in profile["product_types_lowered"]:
                     continue
 
                 # Precompile name filters as regexes
-                profile_regexes = profile.get("subset_name_filters")
+                profile_regexes = profile.get("product_name_filters")
                 if profile_regexes:
                     _profile_regexes = []
                     for regex in profile_regexes:
@@ -538,7 +538,7 @@ class BuildWorkfile:
         build_presets += self.build_presets.get("linked_assets", [])
         subset_ids_ordered = []
         for preset in build_presets:
-            for preset_family in preset["families"]:
+            for preset_family in preset["product_types"]:
                 for id, subset in subsets_by_id.items():
                     if preset_family not in subset["data"].get("families", []):
                         continue
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 5734ac0707..40d4c775be 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -333,16 +333,7 @@ def _convert_maya_project_settings(ayon_settings, output):
 
     ayon_maya = ayon_settings["maya"]
 
-    # Workfile build
-    ayon_workfile_build = ayon_maya["workfile_build"]
-    for item in ayon_workfile_build["profiles"]:
-        for key in ("current_context", "linked_assets"):
-            for subitem in item[key]:
-                if "families" in subitem:
-                    break
-                subitem["families"] = subitem.pop("product_types")
-                subitem["subset_name_filters"] = subitem.pop(
-                    "product_name_filters")
+    _convert_host_imageio(ayon_maya)
 
     output["maya"] = ayon_maya
 

From 85526b41ad8f3dccca1a98fc000367c63e3084fa Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:05:14 +0100
Subject: [PATCH 28/45] flame 'ExtractProductResources' uses AYON settings

---
 .../publish/extract_subset_resources.py       | 19 ++++++++++++-------
 client/ayon_core/settings/ayon_settings.py    | 19 -------------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py b/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
index af699fd03a..9e55dbce96 100644
--- a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
+++ b/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
@@ -1,6 +1,5 @@
 import os
 import re
-import tempfile
 from copy import deepcopy
 
 import pyblish.api
@@ -15,12 +14,12 @@ from ayon_core.pipeline.editorial import (
 import flame
 
 
-class ExtractSubsetResources(publish.Extractor):
+class ExtractProductResources(publish.Extractor):
     """
     Extractor for transcoding files from Flame clip
     """
 
-    label = "Extract subset resources"
+    label = "Extract product resources"
     order = pyblish.api.ExtractorOrder
     families = ["clip"]
     hosts = ["flame"]
@@ -47,7 +46,7 @@ class ExtractSubsetResources(publish.Extractor):
     hide_ui_on_process = True
 
     # settings
-    export_presets_mapping = {}
+    export_presets_mapping = []
 
     def process(self, instance):
         if not self.keep_original_representation:
@@ -146,15 +145,21 @@ class ExtractSubsetResources(publish.Extractor):
         # append staging dir for later cleanup
         instance.context.data["cleanupFullPaths"].append(staging_dir)
 
+        export_presets_mapping = {}
+        for preset_mapping in deepcopy(self.export_presets_mapping):
+            name = preset_mapping.pop("name")
+            export_presets_mapping[name] = preset_mapping
+
         # add default preset type for thumbnail and reviewable video
         # update them with settings and override in case the same
         # are found in there
-        _preset_keys = [k.split('_')[0] for k in self.export_presets_mapping]
+        _preset_keys = [k.split('_')[0] for k in export_presets_mapping]
         export_presets = {
-            k: v for k, v in deepcopy(self.default_presets).items()
+            k: v
+            for k, v in deepcopy(self.default_presets).items()
             if k not in _preset_keys
         }
-        export_presets.update(self.export_presets_mapping)
+        export_presets.update(export_presets_mapping)
 
         if not instance.data.get("versionData"):
             instance.data["versionData"] = {}
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 40d4c775be..7de6011916 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -268,25 +268,6 @@ def _convert_flame_project_settings(ayon_settings, output):
     ayon_flame = ayon_settings["flame"]
 
     ayon_publish_flame = ayon_flame["publish"]
-    # Plugin 'ExtractSubsetResources' renamed to 'ExtractProductResources'
-    if "ExtractSubsetResources" in ayon_publish_flame:
-        ayon_product_resources = ayon_publish_flame["ExtractSubsetResources"]
-    else:
-        ayon_product_resources = (
-            ayon_publish_flame.pop("ExtractProductResources"))
-        ayon_publish_flame["ExtractSubsetResources"] = ayon_product_resources
-
-    # 'ExtractSubsetResources' changed model of 'export_presets_mapping'
-    # - some keys were moved under 'other_parameters'
-    new_subset_resources = {}
-    for item in ayon_product_resources.pop("export_presets_mapping"):
-        name = item.pop("name")
-        if "other_parameters" in item:
-            other_parameters = item.pop("other_parameters")
-            item.update(other_parameters)
-        new_subset_resources[name] = item
-
-    ayon_product_resources["export_presets_mapping"] = new_subset_resources
 
     # 'imageio' changed model
     # - missing subkey 'project' which is in root of 'imageio' model

From f19d8762df971ac9802c163d2e29d379bbadcf6d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:10:47 +0100
Subject: [PATCH 29/45] flame Loaders can use AYON settings

---
 .../flame/plugins/load/load_clip_batch.py     | 19 ++++++++++---
 client/ayon_core/settings/ayon_settings.py    | 27 -------------------
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py b/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
index a66bf53622..57797e5a44 100644
--- a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
+++ b/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
@@ -50,17 +50,28 @@ class LoadClipBatch(opfapi.ClipLoader):
         version_name = version.get("name", None)
         colorspace = self.get_colorspace(context)
 
+        # TODO remove '{folder[name]}' and '{product[name]}' replacement
+        clip_name_template = (
+            self.clip_name_template
+            .replace("{folder[name]}", "{asset}")
+            .replace("{product[name]}", "{subset}")
+        )
+        layer_rename_template = (
+            self.layer_rename_template
+            .replace("{folder[name]}", "{asset}")
+            .replace("{product[name]}", "{subset}")
+        )
         # in case output is not in context replace key to representation
         if not context["representation"]["context"].get("output"):
-            self.clip_name_template = self.clip_name_template.replace(
+            clip_name_template = clip_name_template.replace(
                 "output", "representation")
-            self.layer_rename_template = self.layer_rename_template.replace(
+            layer_rename_template = layer_rename_template.replace(
                 "output", "representation")
 
         formatting_data = deepcopy(context["representation"]["context"])
         formatting_data["batch"] = self.batch.name.get_value()
 
-        clip_name = StringTemplate(self.clip_name_template).format(
+        clip_name = StringTemplate(clip_name_template).format(
             formatting_data)
 
         # convert colorspace with ocio to flame mapping
@@ -86,7 +97,7 @@ class LoadClipBatch(opfapi.ClipLoader):
             "path": path.replace("\\", "/"),
             "colorspace": colorspace,
             "version": "v{:0>3}".format(version_name),
-            "layer_rename_template": self.layer_rename_template,
+            "layer_rename_template": layer_rename_template,
             "layer_rename_patterns": self.layer_rename_patterns,
             "context_data": formatting_data
         }
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 7de6011916..39e30d4846 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -267,34 +267,7 @@ def _convert_flame_project_settings(ayon_settings, output):
 
     ayon_flame = ayon_settings["flame"]
 
-    ayon_publish_flame = ayon_flame["publish"]
-
-    # 'imageio' changed model
-    # - missing subkey 'project' which is in root of 'imageio' model
     _convert_host_imageio(ayon_flame)
-    ayon_imageio_flame = ayon_flame["imageio"]
-    if "project" not in ayon_imageio_flame:
-        profile_mapping = ayon_imageio_flame.pop("profilesMapping")
-        ayon_flame["imageio"] = {
-            "project": ayon_imageio_flame,
-            "profilesMapping": profile_mapping
-        }
-
-    ayon_load_flame = ayon_flame["load"]
-    for plugin_name in ("LoadClip", "LoadClipBatch"):
-        plugin_settings = ayon_load_flame[plugin_name]
-        plugin_settings["families"] = plugin_settings.pop("product_types")
-        plugin_settings["clip_name_template"] = (
-            plugin_settings["clip_name_template"]
-            .replace("{folder[name]}", "{asset}")
-            .replace("{product[name]}", "{subset}")
-        )
-        plugin_settings["layer_rename_template"] = (
-            plugin_settings["layer_rename_template"]
-            .replace("{folder[name]}", "{asset}")
-            .replace("{product[name]}", "{subset}")
-        )
-
     output["flame"] = ayon_flame
 
 

From b0dd56326135d4c16214cb347d576bd821a0a84d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:13:52 +0100
Subject: [PATCH 30/45] max PointCloud uses AYON settings

---
 .../hosts/max/plugins/publish/extract_pointcloud.py        | 4 +++-
 .../hosts/max/plugins/publish/validate_pointcloud.py       | 4 +++-
 client/ayon_core/settings/ayon_settings.py                 | 7 -------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py b/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py
index 294d63794e..67dde7f0a6 100644
--- a/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py
+++ b/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py
@@ -155,7 +155,9 @@ class ExtractPointCloud(publish.Extractor):
 
         custom_attr_list = []
         attr_settings = self.settings["attribute"]
-        for key, value in attr_settings.items():
+        for attr in attr_settings:
+            key = attr["name"]
+            value = attr["value"]
             custom_attr = "{0}.PRTChannels_{1}=True".format(operator,
                                                             value)
             self.log.debug(
diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py b/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py
index a025ed3992..73b18984ed 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py
@@ -59,7 +59,9 @@ class ValidatePointCloud(pyblish.api.InstancePlugin):
                     event_name = sub_anim.name
                     opt = "${0}.{1}.export_particles".format(sel.name,
                                                              event_name)
-                    for key, value in attr_settings.items():
+                    for attr in attr_settings:
+                        key = attr["name"]
+                        value = attr["value"]
                         custom_attr = "{0}.PRTChannels_{1}".format(opt,
                                                                    value)
                         try:
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 39e30d4846..5a1fbfb947 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -298,13 +298,6 @@ def _convert_3dsmax_project_settings(ayon_settings, output):
 
     ayon_max = ayon_settings["max"]
     _convert_host_imageio(ayon_max)
-    if "PointCloud" in ayon_max:
-        point_cloud_attribute = ayon_max["PointCloud"]["attribute"]
-        new_point_cloud_attribute = {
-            item["name"]: item["value"]
-            for item in point_cloud_attribute
-        }
-        ayon_max["PointCloud"]["attribute"] = new_point_cloud_attribute
     # --- Publish (START) ---
     ayon_publish = ayon_max["publish"]
     if "ValidateAttributes" in ayon_publish:

From 96cbbeb823809ae68071a883f19b877d0cd7452e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:15:51 +0100
Subject: [PATCH 31/45] max 'ValidateAttributes' can use AYON settings

---
 .../plugins/publish/validate_attributes.py    | 22 ++++++++++++++-----
 client/ayon_core/settings/ayon_settings.py    |  8 -------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py b/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py
index 444a8f0829..354539871f 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """Validator for Attributes."""
+import json
+
 from pyblish.api import ContextPlugin, ValidatorOrder
 from pymxs import runtime as rt
 
@@ -61,9 +63,13 @@ class ValidateAttributes(OptionalPyblishPluginMixin,
 
     @classmethod
     def get_invalid(cls, context):
-        attributes = (
-            context.data["project_settings"]["max"]["publish"]
-                        ["ValidateAttributes"]["attributes"]
+        attributes = json.loads(
+            context.data
+            ["project_settings"]
+            ["max"]
+            ["publish"]
+            ["ValidateAttributes"]
+            ["attributes"]
         )
         if not attributes:
             return
@@ -112,9 +118,13 @@ class ValidateAttributes(OptionalPyblishPluginMixin,
 
     @classmethod
     def repair(cls, context):
-        attributes = (
-            context.data["project_settings"]["max"]["publish"]
-                        ["ValidateAttributes"]["attributes"]
+        attributes = json.loads(
+            context.data
+            ["project_settings"]
+            ["max"]
+            ["publish"]
+            ["ValidateAttributes"]
+            ["attributes"]
         )
         invalid_attributes = cls.get_invalid(context)
         for attrs in invalid_attributes:
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 5a1fbfb947..4d79e922b3 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -300,14 +300,6 @@ def _convert_3dsmax_project_settings(ayon_settings, output):
     _convert_host_imageio(ayon_max)
     # --- Publish (START) ---
     ayon_publish = ayon_max["publish"]
-    if "ValidateAttributes" in ayon_publish:
-        try:
-            attributes = json.loads(
-                ayon_publish["ValidateAttributes"]["attributes"]
-            )
-        except ValueError:
-            attributes = {}
-        ayon_publish["ValidateAttributes"]["attributes"] = attributes
 
     if "ValidateLoadedPlugin" in ayon_publish:
         loaded_plugin = (

From d8c8f7f0ec9687afa782eb3fa225e50186a85fc0 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:23:10 +0100
Subject: [PATCH 32/45] max 'ValidateLoadedPlugin' can use AYON settings

---
 .../max/plugins/publish/validate_loaded_plugin.py    | 12 ++++++++++--
 client/ayon_core/settings/ayon_settings.py           | 10 ----------
 server_addon/max/server/settings/publishers.py       |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
index fe6e32b27b..bf5ac26fef 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
@@ -25,7 +25,7 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
     optional = True
     actions = [RepairAction]
 
-    family_plugins_mapping = {}
+    family_plugins_mapping = []
 
     @classmethod
     def get_invalid(cls, instance):
@@ -34,6 +34,12 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
         if not family_plugins_mapping:
             return
 
+        # Backward compatibility - settings did have 'product_types'
+        if "product_types" in family_plugins_mapping:
+            family_plugins_mapping["families"] = family_plugins_mapping.pop(
+                "product_types"
+            )
+
         invalid = []
         # Find all plug-in requirements for current instance
         instance_families = {instance.data["family"]}
@@ -47,7 +53,9 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
             if not mapping:
                 return
 
-            match_families = {fam.strip() for fam in mapping["families"]}
+            match_families = {
+                fam.strip() for fam in mapping["families"]
+            }
             has_match = "*" in match_families or match_families.intersection(
                 instance_families)
 
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 4d79e922b3..02442645bb 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -297,16 +297,6 @@ def _convert_3dsmax_project_settings(ayon_settings, output):
         return
 
     ayon_max = ayon_settings["max"]
-    _convert_host_imageio(ayon_max)
-    # --- Publish (START) ---
-    ayon_publish = ayon_max["publish"]
-
-    if "ValidateLoadedPlugin" in ayon_publish:
-        loaded_plugin = (
-            ayon_publish["ValidateLoadedPlugin"]["family_plugins_mapping"]
-        )
-        for item in loaded_plugin:
-            item["families"] = item.pop("product_types")
 
     output["max"] = ayon_max
 
diff --git a/server_addon/max/server/settings/publishers.py b/server_addon/max/server/settings/publishers.py
index da782cb494..e8a48ec3d1 100644
--- a/server_addon/max/server/settings/publishers.py
+++ b/server_addon/max/server/settings/publishers.py
@@ -28,9 +28,9 @@ class ValidateAttributesModel(BaseSettingsModel):
 
 
 class FamilyMappingItemModel(BaseSettingsModel):
-    product_types: list[str] = SettingsField(
+    families: list[str] = SettingsField(
         default_factory=list,
-        title="Product Types"
+        title="Families"
     )
     plugins: list[str] = SettingsField(
         default_factory=list,

From 7e2331467df72d8c8a1a72ffdfba8c940cbcfad1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:35:22 +0100
Subject: [PATCH 33/45] simplify general settings conversion

---
 client/ayon_core/pipeline/template_data.py |  7 ++--
 client/ayon_core/settings/__init__.py      |  2 --
 client/ayon_core/settings/ayon_settings.py | 40 ++++------------------
 client/ayon_core/settings/lib.py           | 12 +++----
 4 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/client/ayon_core/pipeline/template_data.py b/client/ayon_core/pipeline/template_data.py
index a1b944a431..a5ca84c754 100644
--- a/client/ayon_core/pipeline/template_data.py
+++ b/client/ayon_core/pipeline/template_data.py
@@ -17,12 +17,11 @@ def get_general_template_data(system_settings=None):
 
     if not system_settings:
         system_settings = get_system_settings()
-    studio_name = system_settings["general"]["studio_name"]
-    studio_code = system_settings["general"]["studio_code"]
+    core_settings = system_settings["core"]
     return {
         "studio": {
-            "name": studio_name,
-            "code": studio_code
+            "name": core_settings["studio_name"],
+            "code": core_settings["studio_code"]
         },
         "user": get_ayon_username()
     }
diff --git a/client/ayon_core/settings/__init__.py b/client/ayon_core/settings/__init__.py
index 51019ca570..ed3aaef7d4 100644
--- a/client/ayon_core/settings/__init__.py
+++ b/client/ayon_core/settings/__init__.py
@@ -4,7 +4,6 @@ from .constants import (
 )
 from .lib import (
     get_general_environments,
-    get_global_settings,
     get_system_settings,
     get_project_settings,
     get_current_project_settings,
@@ -17,7 +16,6 @@ __all__ = (
     "PROJECT_SETTINGS_KEY",
 
     "get_general_environments",
-    "get_global_settings",
     "get_system_settings",
     "get_project_settings",
     "get_current_project_settings",
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 02442645bb..1aa82995b6 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -73,31 +73,13 @@ def _convert_host_imageio(host_settings):
 
 
 def _convert_general(ayon_settings, output, default_settings):
-    # TODO get studio name/code
-    core_settings = ayon_settings["core"]
-    environments = core_settings["environments"]
-    if isinstance(environments, six.string_types):
-        environments = json.loads(environments)
-
-    general = default_settings["general"]
-    general.update({
-        "log_to_server": False,
-        "studio_name": core_settings["studio_name"],
-        "studio_code": core_settings["studio_code"],
-        "environment": environments
-    })
-    output["general"] = general
-
-
-def _convert_kitsu_system_settings(
-    ayon_settings, output, addon_versions, default_settings
-):
-    enabled = addon_versions.get("kitsu") is not None
-    kitsu_settings = default_settings["modules"]["kitsu"]
-    kitsu_settings["enabled"] = enabled
-    if enabled:
-        kitsu_settings["server"] = ayon_settings["kitsu"]["server"]
-    output["modules"]["kitsu"] = kitsu_settings
+    output["core"] = ayon_settings["core"]
+    version_check_interval = (
+        default_settings["general"]["version_check_interval"]
+    )
+    output["general"] = {
+        "version_check_interval": version_check_interval
+    }
 
 
 def _convert_timers_manager_system_settings(
@@ -701,14 +683,6 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
     ayon_core = ayon_settings["core"]
 
     _convert_host_imageio(ayon_core)
-
-    for key in (
-        "environments",
-        "studio_name",
-        "studio_code",
-    ):
-        ayon_core.pop(key, None)
-
     # Publish conversion
     ayon_publish = ayon_core["publish"]
 
diff --git a/client/ayon_core/settings/lib.py b/client/ayon_core/settings/lib.py
index beae376b7c..ee453956d2 100644
--- a/client/ayon_core/settings/lib.py
+++ b/client/ayon_core/settings/lib.py
@@ -15,7 +15,8 @@ from .constants import (
 
 from .ayon_settings import (
     get_ayon_project_settings,
-    get_ayon_system_settings
+    get_ayon_system_settings,
+    get_ayon_settings,
 )
 
 log = logging.getLogger(__name__)
@@ -253,14 +254,9 @@ def get_current_project_settings():
     return get_project_settings(project_name)
 
 
-def get_global_settings():
-    default_settings = load_openpype_default_settings()
-    return default_settings["system_settings"]["general"]
-
-
 def get_general_environments():
-    value = get_system_settings()
-    return value["general"]["environment"]
+    settings = get_ayon_settings()
+    return json.loads(settings["core"]["environments"])
 
 
 def get_system_settings(*args, **kwargs):

From b0d7e1601165e74cbf7ff50c4a49d5cf729be1c4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 9 Feb 2024 17:40:13 +0100
Subject: [PATCH 34/45] bump addon versions

---
 server_addon/max/server/version.py  | 2 +-
 server_addon/maya/server/version.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server_addon/max/server/version.py b/server_addon/max/server/version.py
index bbab0242f6..1276d0254f 100644
--- a/server_addon/max/server/version.py
+++ b/server_addon/max/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"
diff --git a/server_addon/maya/server/version.py b/server_addon/maya/server/version.py
index 684d830189..8202425a2d 100644
--- a/server_addon/maya/server/version.py
+++ b/server_addon/maya/server/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.8"
+__version__ = "0.1.9"

From a1900487649617447d92133a6219867e5b60d722 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 12 Feb 2024 10:31:56 +0100
Subject: [PATCH 35/45] removed unnecessary changes

---
 client/ayon_core/plugins/publish/extract_review.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index a6e0196dc7..4e6ece0038 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -1059,10 +1059,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
         # NOTE: value in "-ac" was hardcoded to 2, changed to audio inputs len.
         # Need to merge audio if there are more than 1 input.
         if len(audio_inputs) > 1:
-            audio_out_args.extend([
-                "-filter_complex", "amerge",
-                "-ac", str(len(audio_inputs))
-            ])
+            audio_out_args.append("-filter_complex amerge")
+            audio_out_args.append("-ac {}".format(len(audio_inputs)))
 
         return audio_in_args, audio_filters, audio_out_args
 

From 28ae27f5b034e782a1532298a5d85656f1fc1f6d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 12 Feb 2024 16:47:07 +0100
Subject: [PATCH 36/45] fix kitsu conversion

---
 client/ayon_core/settings/ayon_settings.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 1aa82995b6..35652d5c3c 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -82,6 +82,20 @@ def _convert_general(ayon_settings, output, default_settings):
     }
 
 
+def _convert_kitsu_system_settings(
+    ayon_settings, output, addon_versions, default_settings
+):
+    if "kitsu" in ayon_settings:
+        output["kitsu"] = ayon_settings["kitsu"]
+
+    enabled = addon_versions.get("kitsu") is not None
+    kitsu_settings = default_settings["modules"]["kitsu"]
+    kitsu_settings["enabled"] = enabled
+    if enabled:
+        kitsu_settings["server"] = ayon_settings["kitsu"]["server"]
+    output["modules"]["kitsu"] = kitsu_settings
+
+
 def _convert_timers_manager_system_settings(
     ayon_settings, output, addon_versions, default_settings
 ):

From f22358e78fcdf93d545774cbc78b7c75a43e4c16 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 12 Feb 2024 17:42:13 +0100
Subject: [PATCH 37/45] fix default value in 'filter_output_defs'

---
 client/ayon_core/plugins/publish/extract_review.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index 4e6ece0038..7af0da386b 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -1513,11 +1513,11 @@ class ExtractReview(pyblish.api.InstancePlugin):
         Returns:
             list: Containg all output definitions matching entered families.
         """
+        filtered_outputs = {}
         outputs = profile.get("outputs")
         if not outputs:
-            return []
+            return filtered_outputs
 
-        filtered_outputs = {}
         for output_def in outputs:
             filename_suffix = output_def["name"]
             output_filters = output_def.get("filter")

From 87d5b3baeced304c02ffdd8c4d44d18907c32e94 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Mon, 12 Feb 2024 23:06:14 +0100
Subject: [PATCH 38/45] fix overscan_color default value

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

diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index c684ddda40..c01fb92b9c 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -946,7 +946,7 @@ DEFAULT_PUBLISH_VALUES = {
                             "single_frame_filter": "multi_frame"
                         },
                         "overscan_crop": "",
-                        "overscan_color": [0, 0, 0, 1.0],
+                        "overscan_color": [0, 0, 0],
                         "width": 0,
                         "height": 0,
                         "scale_pixel_aspect": True,

From 1d85cec34c86e771b1339d6c5fd41fe5f877457c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Feb 2024 10:08:29 +0100
Subject: [PATCH 39/45] fix return type hint

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

diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index 7af0da386b..2ab70038c6 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -1511,7 +1511,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
             subset_name (str): name of subset
 
         Returns:
-            list: Containg all output definitions matching entered families.
+            dict[str, Any]: Containg all output definitions matching entered
+                families.
         """
         filtered_outputs = {}
         outputs = profile.get("outputs")

From f221dfa4252df76e52a9906887693a43fff6fd9a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 13 Feb 2024 10:53:11 +0100
Subject: [PATCH 40/45] Change label back

---
 .../ayon_core/hosts/photoshop/plugins/publish/collect_review.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
index 3a4b7b5828..1ffbadf022 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py
@@ -13,7 +13,7 @@ class CollectReview(pyblish.api.ContextPlugin):
     """Adds review to families for instances marked to be reviewable.
     """
 
-    label = "Collect Review Family"
+    label = "Collect Review"
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.1
 

From d751fdd798255ca971a2f9ed912f8dbb0ce24b41 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 13 Feb 2024 11:00:45 +0100
Subject: [PATCH 41/45] fix return docstring

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

diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index 2ab70038c6..b0bc94c317 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -1511,7 +1511,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
             subset_name (str): name of subset
 
         Returns:
-            dict[str, Any]: Containg all output definitions matching entered
+            dict[str, Any]: Containing all output definitions matching entered
                 families.
         """
         filtered_outputs = {}

From b5b4ec2e80ffe2eeafc910bb1c956376de787f56 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Feb 2024 11:17:48 +0100
Subject: [PATCH 42/45] round loader colors

---
 server_addon/maya/server/settings/loaders.py | 192 ++++---------------
 1 file changed, 32 insertions(+), 160 deletions(-)

diff --git a/server_addon/maya/server/settings/loaders.py b/server_addon/maya/server/settings/loaders.py
index df1172ae7d..b8264a56ef 100644
--- a/server_addon/maya/server/settings/loaders.py
+++ b/server_addon/maya/server/settings/loaders.py
@@ -4,131 +4,67 @@ from ayon_server.types import ColorRGB_float
 
 class ColorsSetting(BaseSettingsModel):
     model: ColorRGB_float = SettingsField(
-        (
-            0.8196078431372549,
-            0.5176470588235295,
-            0.11764705882352941
-        ),
+        (0.82, 0.52, 0.12),
         title="Model:"
     )
     rig: ColorRGB_float = SettingsField(
-        (
-            0.23137254901960785,
-            0.8862745098039215,
-            0.9215686274509803
-        ),
+        (0.23, 0.89, 0.92),
         title="Rig:"
     )
     pointcache: ColorRGB_float = SettingsField(
-        (
-            0.3686274509803922,
-            0.8196078431372549,
-            0.11764705882352941
-        ),
+        (0.37, 0.82, 0.12),
         title="Pointcache:"
     )
     animation: ColorRGB_float = SettingsField(
-        (
-            0.3686274509803922,
-            0.8196078431372549,
-            0.11764705882352941
-        ),
+        (0.37, 0.82, 0.12),
         title="Animation:"
     )
     ass: ColorRGB_float = SettingsField(
-        (
-            0.9764705882352941,
-            0.5294117647058824,
-            0.20784313725490197
-        ),
+        (0.98, 0.53, 0.21),
         title="Arnold StandIn:"
     )
     camera: ColorRGB_float = SettingsField(
-        (
-            0.5333333333333333,
-            0.4470588235294118,
-            0.9568627450980393
-        ),
+        (0.53, 0.45, 0.96),
         title="Camera:"
     )
     fbx: ColorRGB_float = SettingsField(
-        (
-            0.8431372549019608,
-            0.6509803921568628,
-            1.0
-        ),
+        (0.84, 0.65, 1.0),
         title="FBX:"
     )
     mayaAscii: ColorRGB_float = SettingsField(
-        (
-            0.2627450980392157,
-            0.6823529411764706,
-            1.0
-        ),
+        (0.26, 0.68, 1.0),
         title="Maya Ascii:"
     )
     mayaScene: ColorRGB_float = SettingsField(
-        (
-            0.2627450980392157,
-            0.6823529411764706,
-            1.0
-        ),
+        (0.26, 0.68, 1.0),
         title="Maya Scene:"
     )
     setdress: ColorRGB_float = SettingsField(
-        (
-            1.0,
-            0.9803921568627451,
-            0.35294117647058826
-        ),
+        (1.0, 0.98, 0.35),
         title="Set Dress:"
     )
     layout: ColorRGB_float = SettingsField(
-        (
-            1.0,
-            0.9803921568627451,
-            0.35294117647058826
-        ),
+        (1.0, 0.98, 0.35),
         title="Layout:"
     )
     vdbcache: ColorRGB_float = SettingsField(
-        (
-            0.9764705882352941,
-            0.21176470588235294,
-            0.0
-        ),
+        (0.98, 0.21, 0.0),
         title="VDB Cache:"
     )
     vrayproxy: ColorRGB_float = SettingsField(
-        (
-            1.0,
-            0.5882352941176471,
-            0.047058823529411764
-        ),
+        (1.0, 0.59, 0.05),
         title="VRay Proxy:"
     )
     vrayscene_layer: ColorRGB_float = SettingsField(
-        (
-            1.0,
-            0.5882352941176471,
-            0.047058823529411764
-        ),
+        (1.0, 0.59, 0.05),
         title="VRay Scene:"
     )
     yeticache: ColorRGB_float = SettingsField(
-        (
-            0.38823529411764707,
-            0.807843137254902,
-            0.8627450980392157
-        ),
+        (0.39, 0.81, 0.86),
         title="Yeti Cache:"
     )
     yetiRig: ColorRGB_float = SettingsField(
-        (
-            0.0,
-            0.803921568627451,
-            0.49019607843137253
-        ),
+        (0.0, 0.80, 0.49),
         title="Yeti Rig:"
     )
 
@@ -163,86 +99,22 @@ class LoadersModel(BaseSettingsModel):
 
 DEFAULT_LOADERS_SETTING = {
     "colors": {
-        "model": [
-            0.8196078431372549,
-            0.5176470588235295,
-            0.11764705882352941
-        ],
-        "rig": [
-            0.23137254901960785,
-            0.8862745098039215,
-            0.9215686274509803
-        ],
-        "pointcache": [
-            0.3686274509803922,
-            0.8196078431372549,
-            0.11764705882352941
-        ],
-        "animation": [
-            0.3686274509803922,
-            0.8196078431372549,
-            0.11764705882352941
-        ],
-        "ass": [
-            0.9764705882352941,
-            0.5294117647058824,
-            0.20784313725490197
-        ],
-        "camera": [
-            0.5333333333333333,
-            0.4470588235294118,
-            0.9568627450980393
-        ],
-        "fbx": [
-            0.8431372549019608,
-            0.6509803921568628,
-            1.0
-        ],
-        "mayaAscii": [
-            0.2627450980392157,
-            0.6823529411764706,
-            1.0
-        ],
-        "mayaScene": [
-            0.2627450980392157,
-            0.6823529411764706,
-            1.0
-        ],
-        "setdress": [
-            1.0,
-            0.9803921568627451,
-            0.35294117647058826
-        ],
-        "layout": [
-            1.0,
-            0.9803921568627451,
-            0.35294117647058826
-        ],
-        "vdbcache": [
-            0.9764705882352941,
-            0.21176470588235294,
-            0.0
-        ],
-        "vrayproxy": [
-            1.0,
-            0.5882352941176471,
-            0.047058823529411764
-        ],
-        "vrayscene_layer": [
-            1.0,
-            0.5882352941176471,
-            0.047058823529411764
-        ],
-        "yeticache": [
-            0.38823529411764707,
-            0.807843137254902,
-            0.8627450980392157
-        ],
-        "yetiRig": [
-            0.0,
-            0.803921568627451,
-            0.49019607843137253
-        ]
+        "model": [0.82, 0.52, 0.12],
+        "rig": [0.23, 0.89, 0.92],
+        "pointcache": [0.37, 0.82, 0.12],
+        "animation": [0.37, 0.82, 0.12],
+        "ass": [0.98, 0.53, 0.21],
+        "camera":[0.53, 0.45, 0.96],
+        "fbx": [0.84, 0.65, 1.0],
+        "mayaAscii": [0.26, 0.68, 1.0],
+        "mayaScene": [0.26, 0.68, 1.0],
+        "setdress": [1.0, 0.98, 0.35],
+        "layout": [1.0, 0.98, 0.35],
+        "vdbcache": [0.98, 0.21, 0.0],
+        "vrayproxy": [1.0, 0.59, 0.05],
+        "vrayscene_layer": [1.0, 0.59, 0.05],
+        "yeticache": [0.39, 0.81, 0.86],
+        "yetiRig": [0.0, 0.80, 0.49],
     },
     "reference_loader": {
         "namespace": "{folder[name]}_{product[name]}_##_",

From 20487204ba7c89f7310ef52f7af9b879978a1372 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Feb 2024 11:57:39 +0100
Subject: [PATCH 43/45] added 3dsmax imageio conversion back

---
 client/ayon_core/settings/ayon_settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 35652d5c3c..cea0158159 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -294,6 +294,8 @@ def _convert_3dsmax_project_settings(ayon_settings, output):
 
     ayon_max = ayon_settings["max"]
 
+    _convert_host_imageio(ayon_max)
+
     output["max"] = ayon_max
 
 

From 6bb04dfe08c63aa67d4f115f207c8cc8d1aaa428 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Feb 2024 13:06:48 +0100
Subject: [PATCH 44/45] fix 'RenderSettings' key usage

---
 .../plugins/publish/validate_render_image_rule.py     | 11 +++++++----
 .../maya/plugins/publish/validate_rendersettings.py   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py b/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
index efc622c416..384d99df1a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py
@@ -60,7 +60,10 @@ class ValidateRenderImageRule(pyblish.api.InstancePlugin):
             )
             return staging_dir
 
-        return instance.context.data.get('project_settings')\
-            .get('maya') \
-            .get('RenderSettings') \
-            .get('default_render_image_folder')
+        return (
+            instance.context.data
+            ["project_settings"]
+            ["maya"]
+            ["render_settings"]
+            ["default_render_image_folder"]
+        )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
index 7f6c0bab1d..78a247b3f2 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -265,7 +265,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
         # load validation definitions from settings
         settings_lights_flag = instance.context.data["project_settings"].get(
             "maya", {}).get(
-            "RenderSettings", {}).get(
+            "render_settings", {}).get(
             "enable_all_lights", False)
 
         instance_lights_flag = instance.data.get("renderSetupIncludeLights")

From 4529a5988950bc3cfa5035f0f397c80edda4adbe Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 13 Feb 2024 14:25:41 +0100
Subject: [PATCH 45/45] fix 'RenderSettings' to 'render_settings' in deadline

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
index b9c858a6a7..a4a5391ce1 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -259,7 +259,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         default_rs_include_lights = (
             instance.context.data['project_settings']
                                  ['maya']
-                                 ['RenderSettings']
+                                 ['render_settings']
                                  ['enable_all_lights']
         )