From c60bd1cb2df44735ed1ce719f88449928f8d4e4e Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 20 Mar 2024 17:56:29 +0100
Subject: [PATCH 001/119] Fusion: Add Validate Instance in Context validator

---
 client/ayon_core/hosts/fusion/api/action.py   | 52 ++++++++++++
 .../publish/validate_instance_in_context.py   | 80 +++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py

diff --git a/client/ayon_core/hosts/fusion/api/action.py b/client/ayon_core/hosts/fusion/api/action.py
index 1643f1ce03..a0c6aafcb5 100644
--- a/client/ayon_core/hosts/fusion/api/action.py
+++ b/client/ayon_core/hosts/fusion/api/action.py
@@ -58,3 +58,55 @@ class SelectInvalidAction(pyblish.api.Action):
         self.log.info(
             "Selecting invalid tools: %s" % ", ".join(sorted(names))
         )
+
+
+class SelectToolAction(pyblish.api.Action):
+    """Select invalid output tool in Fusion when plug-in failed.
+
+    """
+
+    label = "Select saver"
+    on = "failed"  # This action is only available on a failed plug-in
+    icon = "search"  # Icon from Awesome Icon
+
+    def process(self, context, plugin):
+        errored_instances = get_errored_instances_from_context(
+            context,
+            plugin=plugin,
+        )
+
+        # Get the invalid nodes for the plug-ins
+        self.log.info("Finding invalid nodes..")
+        tools = []
+        for instance in errored_instances:
+
+            tool = instance.data.get("tool")
+            if tool is not None:
+                tools.append(tool)
+            else:
+                self.log.warning(
+                    "Plug-in returned to be invalid, "
+                    f"but has no saver for instance {instance.name}."
+                )
+
+        if not tools:
+            # Assume relevant comp is current comp and clear selection
+            self.log.info("No invalid tools found.")
+            comp = get_current_comp()
+            flow = comp.CurrentFrame.FlowView
+            flow.Select()  # No args equals clearing selection
+            return
+
+        # Assume a single comp
+        first_tool = tools[0]
+        comp = first_tool.Comp()
+        flow = comp.CurrentFrame.FlowView
+        flow.Select()  # No args equals clearing selection
+        names = set()
+        for tool in tools:
+            flow.Select(tool, True)
+            comp.SetActiveTool(tool)
+            names.add(tool.Name)
+        self.log.info(
+            "Selecting invalid tools: %s" % ", ".join(sorted(names))
+        )
diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py
new file mode 100644
index 0000000000..3aa6fb452f
--- /dev/null
+++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+"""Validate if instance context is the same as publish context."""
+
+import pyblish.api
+from ayon_core.hosts.fusion.api.action import SelectToolAction
+from ayon_core.pipeline.publish import (
+    RepairAction,
+    ValidateContentsOrder,
+    PublishValidationError,
+    OptionalPyblishPluginMixin
+)
+
+
+class ValidateInstanceInContextFusion(pyblish.api.InstancePlugin,
+                                      OptionalPyblishPluginMixin):
+    """Validator to check if instance context matches context of publish.
+
+    When working in per-shot style you always publish data in context of
+    current asset (shot). This validator checks if this is so. It is optional
+    so it can be disabled when needed.
+    """
+    # Similar to maya and houdini-equivalent `ValidateInstanceInContext`
+
+    order = ValidateContentsOrder
+    label = "Instance in same Context"
+    optional = True
+    hosts = ["fusion"]
+    actions = [SelectToolAction, RepairAction]
+
+    def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
+        instance_context = self.get_context(instance.data)
+        context = self.get_context(instance.context.data)
+        if instance_context != context:
+            context_label = "{} > {}".format(*context)
+            instance_label = "{} > {}".format(*instance_context)
+
+            raise PublishValidationError(
+                message=(
+                    "Instance '{}' publishes to different asset than current "
+                    "context: {}. Current context: {}".format(
+                        instance.name, instance_label, context_label
+                    )
+                ),
+                description=(
+                    "## Publishing to a different asset\n"
+                    "There are publish instances present which are publishing "
+                    "into a different asset than your current context.\n\n"
+                    "Usually this is not what you want but there can be cases "
+                    "where you might want to publish into another asset or "
+                    "shot. If that's the case you can disable the validation "
+                    "on the instance to ignore it."
+                )
+            )
+
+    @classmethod
+    def repair(cls, instance):
+
+        create_context = instance.context.data["create_context"]
+        instance_id = instance.data.get("instance_id")
+        created_instance = create_context.get_instance_by_id(
+            instance_id
+        )
+        if created_instance is None:
+            raise RuntimeError(
+                f"No CreatedInstances found with id '{instance_id} "
+                f"in {create_context.instances_by_id}"
+            )
+
+        context_asset, context_task = cls.get_context(instance.context.data)
+        created_instance["folderPath"] = context_asset
+        created_instance["task"] = context_task
+        create_context.save_changes()
+
+    @staticmethod
+    def get_context(data):
+        """Return asset, task from publishing context data"""
+        return data["folderPath"], data["task"]

From 7d9ff383096a262bb03b66009802945c974dad8a Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 20 Mar 2024 17:57:02 +0100
Subject: [PATCH 002/119] Correctly preserve the instance's task instead of
 forcing current context task

---
 client/ayon_core/hosts/fusion/plugins/publish/collect_render.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
index 36102d02cb..b1ecce728b 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
@@ -53,7 +53,7 @@ class CollectFusionRender(
             if product_type not in ["render", "image"]:
                 continue
 
-            task_name = context.data["task"]
+            task_name = inst.data["task"]
             tool = inst.data["transientData"]["tool"]
 
             instance_families = inst.data.get("families", [])

From d2503fae073113374da76bde5d11a902a055cf7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 26 Mar 2024 11:01:08 +0100
Subject: [PATCH 003/119] :recycle: remove explicit list

---
 client/ayon_core/plugins/publish/integrate.py | 64 +------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index ce34f2e88b..5b91d9afb8 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -42,7 +42,7 @@ def prepare_changes(old_entity, new_entity):
 
     Returns:
         dict[str, Any]: Changes that have new entity.
-        
+
     """
     changes = {}
     for key in set(new_entity.keys()):
@@ -108,68 +108,6 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
 
     label = "Integrate Asset"
     order = pyblish.api.IntegratorOrder
-    families = ["workfile",
-                "pointcache",
-                "pointcloud",
-                "proxyAbc",
-                "camera",
-                "animation",
-                "model",
-                "maxScene",
-                "mayaAscii",
-                "mayaScene",
-                "setdress",
-                "layout",
-                "ass",
-                "vdbcache",
-                "scene",
-                "vrayproxy",
-                "vrayscene_layer",
-                "render",
-                "prerender",
-                "imagesequence",
-                "review",
-                "rendersetup",
-                "rig",
-                "plate",
-                "look",
-                "ociolook",
-                "audio",
-                "yetiRig",
-                "yeticache",
-                "nukenodes",
-                "gizmo",
-                "source",
-                "matchmove",
-                "image",
-                "assembly",
-                "fbx",
-                "gltf",
-                "textures",
-                "action",
-                "harmony.template",
-                "harmony.palette",
-                "editorial",
-                "background",
-                "camerarig",
-                "redshiftproxy",
-                "effect",
-                "xgen",
-                "hda",
-                "usd",
-                "staticMesh",
-                "skeletalMesh",
-                "mvLook",
-                "mvUsd",
-                "mvUsdComposition",
-                "mvUsdOverride",
-                "online",
-                "uasset",
-                "blendScene",
-                "yeticacheUE",
-                "tycache"
-                ]
-
     default_template_name = "publish"
 
     # Representation context keys that should always be written to

From 4c51f3a560109fa75c50f4104e609f93b4c8f28b Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 26 Mar 2024 17:44:31 +0100
Subject: [PATCH 004/119] Implement fix for losing instance id and disconnected
 logs in publisher UI

---
 .../fusion/plugins/publish/collect_render.py  |  7 +++++++
 .../publish/abstract_collect_render.py        | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
index b1ecce728b..3f5e2837bc 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
@@ -119,6 +119,13 @@ class CollectFusionRender(
             instances.append(instance)
             instances_to_remove.append(inst)
 
+            # TODO: Avoid this transfer instance id hack
+            # pass on the `id` of the original instance so any artist
+            # facing logs transfer as if they were made on the new instance
+            # instead, see `AbstractCollectRender.process()`
+            instance.id = inst.id
+            instance.instance_id = inst.data.get("instance_id")
+
         for instance in instances_to_remove:
             context.remove(instance)
 
diff --git a/client/ayon_core/pipeline/publish/abstract_collect_render.py b/client/ayon_core/pipeline/publish/abstract_collect_render.py
index 745632ca0a..8b98cb678e 100644
--- a/client/ayon_core/pipeline/publish/abstract_collect_render.py
+++ b/client/ayon_core/pipeline/publish/abstract_collect_render.py
@@ -215,6 +215,25 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
             render_instance_dict = attr.asdict(render_instance)
 
             instance = context.create_instance(render_instance.name)
+
+            # TODO: Avoid this transfer instance id hack
+            # Transfer the id from another instance, e.g. when the render
+            # instance is intended to "replace" an existing instance like
+            # fusion does in `CollectRender`. Without matching the ids any
+            # logs produced for the instance prior to the "replacement" will
+            # not show artist-facing logs in reports
+            transfer_id = getattr(render_instance, "id")
+            if transfer_id:
+                instance._id = transfer_id
+                # The `instance_id` data may be overridden on the Creator
+                # to e.g. maybe make unique by node name instead of uuid,
+                # like in Maya, Fusion, Houdini integration.
+                # This transfers that unique (named) instance id.
+                # This transfer logic is currently (only?) used in Fusion.
+                transfer_instance_id = getattr(render_instance, "instance_id")
+                if transfer_instance_id:
+                    instance.data["instance_id"] = transfer_instance_id
+
             instance.data["label"] = render_instance.label
             instance.data.update(render_instance_dict)
             instance.data.update(data)

From d094f83efbb7e2f2d4c158dafc3ba6cee93a914e Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 18 Apr 2024 17:22:39 +0800
Subject: [PATCH 005/119] make sure the bake animation is boolean option

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

diff --git a/client/ayon_core/hosts/maya/api/fbx.py b/client/ayon_core/hosts/maya/api/fbx.py
index 939da4011b..3f1395cb40 100644
--- a/client/ayon_core/hosts/maya/api/fbx.py
+++ b/client/ayon_core/hosts/maya/api/fbx.py
@@ -47,7 +47,7 @@ class FBXExtractor:
             "smoothMesh": bool,
             "instances": bool,
             # "referencedContainersContent": bool, # deprecated in Maya 2016+
-            "bakeComplexAnimation": int,
+            "bakeComplexAnimation": bool,
             "bakeComplexStart": int,
             "bakeComplexEnd": int,
             "bakeComplexStep": int,

From cf9707db85f637b3549a3b84ec30aca2ddeea400 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 30 Apr 2024 11:25:04 +0200
Subject: [PATCH 006/119] Refactor OCIO config settings and profiles

Added new OCIO config profile types and paths for built-in and custom configurations. Updated default values accordingly.
---
 server/settings/main.py | 138 +++++++++++++++++++++++++++-------------
 1 file changed, 95 insertions(+), 43 deletions(-)

diff --git a/server/settings/main.py b/server/settings/main.py
index 28a69e182d..85c1779999 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -54,9 +54,66 @@ class CoreImageIOFileRulesModel(BaseSettingsModel):
         return value
 
 
-class CoreImageIOConfigModel(BaseSettingsModel):
-    filepath: list[str] = SettingsField(
-        default_factory=list, title="Config path"
+_ocio_config_profile_types = [
+    {"value": "buildin_path", "label": "Ayon built-in OCIO config"},
+    {"value": "custom_path", "label": "Path to OCIO config"},
+    {"value": "product", "label": "Published product"},
+]
+
+
+def _ocio_build_in_paths():
+    return [
+        {
+            "value": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
+            "label": "ACES 1.2",
+            "description": "Aces 1.2 OCIO config file."
+        },
+        {
+            "value": "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio",
+            "label": "Nuke default",
+        },
+    ]
+
+
+class CoreImageIOConfigProfilesModel(BaseSettingsModel):
+    host_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Host names"
+    )
+    task_types: list[str] = SettingsField(
+        default_factory=list,
+        title="Task types",
+        enum_resolver=task_types_enum
+    )
+    task_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Task names"
+    )
+    type: str = SettingsField(
+        title="Profile type",
+        enum_resolver=lambda: _ocio_config_profile_types,
+        conditionalEnum=True,
+        default="buildin_path",
+        section="---",
+    )
+
+    buildin_path: str = SettingsField(
+        "ACES 1.2",
+        title="Built-in OCIO config",
+        enum_resolver=_ocio_build_in_paths,
+    )
+    custom_path: str = SettingsField(
+        "",
+        title="OCIO config path",
+        description="Path to OCIO config. Anatomy formatting is supported.",
+    )
+    product: str = SettingsField(
+        "",
+        title="Product name",
+        description=(
+            "Published product name to get OCIO config from. "
+            "Partial match is supported."
+        ),
     )
 
 
@@ -65,9 +122,8 @@ class CoreImageIOBaseModel(BaseSettingsModel):
         False,
         title="Enable Color Management"
     )
-    ocio_config: CoreImageIOConfigModel = SettingsField(
-        default_factory=CoreImageIOConfigModel,
-        title="OCIO config"
+    ocio_config_profiles: list[CoreImageIOConfigProfilesModel] = SettingsField(
+        default_factory=list, title="OCIO config profiles"
     )
     file_rules: CoreImageIOFileRulesModel = SettingsField(
         default_factory=CoreImageIOFileRulesModel,
@@ -186,12 +242,17 @@ class CoreSettings(BaseSettingsModel):
 DEFAULT_VALUES = {
     "imageio": {
         "activate_global_color_management": False,
-        "ocio_config": {
-            "filepath": [
-                "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
-                "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio"
-            ]
-        },
+        "ocio_config_profiles": [
+            {
+                "host_names": [],
+                "task_types": [],
+                "task_names": [],
+                "type": "buildin_path",
+                "buildin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
+                "custom_path": "",
+                "product": "",
+            }
+        ],
         "file_rules": {
             "activate_global_file_rules": False,
             "rules": [
@@ -199,42 +260,33 @@ DEFAULT_VALUES = {
                     "name": "example",
                     "pattern": ".*(beauty).*",
                     "colorspace": "ACES - ACEScg",
-                    "ext": "exr"
+                    "ext": "exr",
                 }
-            ]
-        }
+            ],
+        },
     },
     "studio_name": "",
     "studio_code": "",
-    "environments": "{\n\"STUDIO_SW\": {\n        \"darwin\": \"/mnt/REPO_SW\",\n        \"linux\": \"/mnt/REPO_SW\",\n        \"windows\": \"P:/REPO_SW\"\n    }\n}",
+    "environments": '{\n"STUDIO_SW": {\n        "darwin": "/mnt/REPO_SW",\n        "linux": "/mnt/REPO_SW",\n        "windows": "P:/REPO_SW"\n    }\n}',
     "tools": DEFAULT_TOOLS_VALUES,
-    "version_start_category": {
-        "profiles": []
-    },
+    "version_start_category": {"profiles": []},
     "publish": DEFAULT_PUBLISH_VALUES,
-    "project_folder_structure": json.dumps({
-        "__project_root__": {
-            "prod": {},
-            "resources": {
-                "footage": {
-                    "plates": {},
-                    "offline": {}
+    "project_folder_structure": json.dumps(
+        {
+            "__project_root__": {
+                "prod": {},
+                "resources": {
+                    "footage": {"plates": {}, "offline": {}},
+                    "audio": {},
+                    "art_dept": {},
                 },
-                "audio": {},
-                "art_dept": {}
-            },
-            "editorial": {},
-            "assets": {
-                "characters": {},
-                "locations": {}
-            },
-            "shots": {}
-        }
-    }, indent=4),
-    "project_plugins": {
-        "windows": [],
-        "darwin": [],
-        "linux": []
-    },
-    "project_environments": "{}"
+                "editorial": {},
+                "assets": {"characters": {}, "locations": {}},
+                "shots": {},
+            }
+        },
+        indent=4,
+    ),
+    "project_plugins": {"windows": [], "darwin": [], "linux": []},
+    "project_environments": "{}",
 }

From 7b86da34ae86b0f866f610b0eb048511ddf1c743 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:59:04 +0200
Subject: [PATCH 007/119] fix buildin to builtin

---
 server/settings/main.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/settings/main.py b/server/settings/main.py
index 85c1779999..8bbe13da30 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -55,13 +55,13 @@ class CoreImageIOFileRulesModel(BaseSettingsModel):
 
 
 _ocio_config_profile_types = [
-    {"value": "buildin_path", "label": "Ayon built-in OCIO config"},
+    {"value": "builtin_path", "label": "Ayon built-in OCIO config"},
     {"value": "custom_path", "label": "Path to OCIO config"},
     {"value": "product", "label": "Published product"},
 ]
 
 
-def _ocio_build_in_paths():
+def _ocio_built_in_paths():
     return [
         {
             "value": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
@@ -93,14 +93,14 @@ class CoreImageIOConfigProfilesModel(BaseSettingsModel):
         title="Profile type",
         enum_resolver=lambda: _ocio_config_profile_types,
         conditionalEnum=True,
-        default="buildin_path",
+        default="builtin_path",
         section="---",
     )
 
-    buildin_path: str = SettingsField(
+    builtin_path: str = SettingsField(
         "ACES 1.2",
         title="Built-in OCIO config",
-        enum_resolver=_ocio_build_in_paths,
+        enum_resolver=_ocio_built_in_paths,
     )
     custom_path: str = SettingsField(
         "",
@@ -247,8 +247,8 @@ DEFAULT_VALUES = {
                 "host_names": [],
                 "task_types": [],
                 "task_names": [],
-                "type": "buildin_path",
-                "buildin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
+                "type": "builtin_path",
+                "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
                 "custom_path": "",
                 "product": "",
             }

From 8c525987e58991d770208f93bedcc6ed1bcd3bde Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:59:16 +0200
Subject: [PATCH 008/119] change Ayon to AYON

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

diff --git a/server/settings/main.py b/server/settings/main.py
index 8bbe13da30..d6a38a90e6 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -55,7 +55,7 @@ class CoreImageIOFileRulesModel(BaseSettingsModel):
 
 
 _ocio_config_profile_types = [
-    {"value": "builtin_path", "label": "Ayon built-in OCIO config"},
+    {"value": "builtin_path", "label": "AYON built-in OCIO config"},
     {"value": "custom_path", "label": "Path to OCIO config"},
     {"value": "product", "label": "Published product"},
 ]

From c0d9edad758559c15790c4cfd09f7c357ca84362 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 30 Apr 2024 15:59:33 +0200
Subject: [PATCH 009/119] _ocio_config_profile_types is function

---
 server/settings/main.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/settings/main.py b/server/settings/main.py
index d6a38a90e6..230414ffe7 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -54,11 +54,12 @@ class CoreImageIOFileRulesModel(BaseSettingsModel):
         return value
 
 
-_ocio_config_profile_types = [
-    {"value": "builtin_path", "label": "AYON built-in OCIO config"},
-    {"value": "custom_path", "label": "Path to OCIO config"},
-    {"value": "product", "label": "Published product"},
-]
+def _ocio_config_profile_types():
+    return [
+        {"value": "builtin_path", "label": "AYON built-in OCIO config"},
+        {"value": "custom_path", "label": "Path to OCIO config"},
+        {"value": "product", "label": "Published product"},
+    ]
 
 
 def _ocio_built_in_paths():
@@ -91,7 +92,7 @@ class CoreImageIOConfigProfilesModel(BaseSettingsModel):
     )
     type: str = SettingsField(
         title="Profile type",
-        enum_resolver=lambda: _ocio_config_profile_types,
+        enum_resolver=_ocio_config_profile_types,
         conditionalEnum=True,
         default="builtin_path",
         section="---",

From feb73842c377c401f2acdd1dc18c6852b3b23de7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 30 Apr 2024 16:07:17 +0200
Subject: [PATCH 010/119] rename 'product' attribute to 'product_name'

---
 server/settings/main.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/settings/main.py b/server/settings/main.py
index 230414ffe7..c9c86bdd0d 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -97,7 +97,6 @@ class CoreImageIOConfigProfilesModel(BaseSettingsModel):
         default="builtin_path",
         section="---",
     )
-
     builtin_path: str = SettingsField(
         "ACES 1.2",
         title="Built-in OCIO config",
@@ -108,7 +107,7 @@ class CoreImageIOConfigProfilesModel(BaseSettingsModel):
         title="OCIO config path",
         description="Path to OCIO config. Anatomy formatting is supported.",
     )
-    product: str = SettingsField(
+    product_name: str = SettingsField(
         "",
         title="Product name",
         description=(
@@ -251,7 +250,7 @@ DEFAULT_VALUES = {
                 "type": "builtin_path",
                 "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
                 "custom_path": "",
-                "product": "",
+                "product_name": "",
             }
         ],
         "file_rules": {

From 3812f229240f7dc7eb4c71979973a355c831a0fa Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 2 May 2024 10:33:32 +0200
Subject: [PATCH 011/119] implemented 'get_imageio_config_preset' with new
 profiles handling

---
 client/ayon_core/pipeline/colorspace.py | 317 ++++++++++++++++++++----
 1 file changed, 272 insertions(+), 45 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index efa3bbf968..8dcbaeb877 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -8,14 +8,19 @@ import tempfile
 import warnings
 from copy import deepcopy
 
+import ayon_api
+
 from ayon_core import AYON_CORE_ROOT
 from ayon_core.settings import get_project_settings
 from ayon_core.lib import (
+    filter_profiles,
     StringTemplate,
     run_ayon_launcher_process,
-    Logger
+    Logger,
 )
 from ayon_core.pipeline import Anatomy
+from ayon_core.pipeline.template_data import get_template_data
+from ayon_core.pipeline.load import get_representation_path_with_anatomy
 from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 
 
@@ -758,6 +763,9 @@ def get_imageio_config(
     Config path is formatted in `path` key
     and original settings input is saved into `template` key.
 
+    Deprecated:
+        Deprecated since '0.3.1' . Use `get_imageio_config_preset` instead.
+
     Args:
         project_name (str): project name
         host_name (str): host name
@@ -768,88 +776,307 @@ def get_imageio_config(
 
     Returns:
         dict: config path data or empty dict
-    """
-    project_settings = project_settings or get_project_settings(project_name)
-    anatomy = anatomy or Anatomy(project_name)
 
+    """
     if not anatomy_data:
         from ayon_core.pipeline.context_tools import (
             get_current_context_template_data)
         anatomy_data = get_current_context_template_data()
 
-    formatting_data = deepcopy(anatomy_data)
+    task_name = anatomy_data["task"]["name"]
+    folder_path = anatomy_data["folder"]["path"]
+    return get_imageio_config_preset(
+        project_name,
+        folder_path,
+        task_name,
+        host_name,
+        anatomy=anatomy,
+        project_settings=project_settings,
+        template_data=anatomy_data,
+        env=env,
+    )
 
-    # Add project roots to anatomy data
-    formatting_data["root"] = anatomy.roots
-    formatting_data["platform"] = platform.system().lower()
+
+def _get_global_config_data(
+    project_name,
+    host_name,
+    anatomy,
+    template_data,
+    imageio_global,
+    folder_id,
+    log,
+):
+    """Get global config data.
+
+    Global config from core settings is using profiles that are based on
+    host name, task name and task type. The filtered profile can define 3
+    types of config sources:
+    1. AYON ocio addon configs.
+    2. Custom path to ocio config.
+    3. Path to 'ocioconfig' representation on product. Name of product can be
+        defined in settings. Product name can be regex but exact match is
+        always preferred.
+
+    None is returned when no profile is found, when path
+
+    Args:
+        project_name (str): Project name.
+        host_name (str): Host name.
+        anatomy (Anatomy): Project anatomy object.
+        template_data (dict[str, Any]): Template data.
+        imageio_global (dict[str, Any]): Core imagio settings.
+        folder_id (Union[dict[str, Any], None]): Folder id.
+        log (logging.Logger): Logger object.
+
+    Returns:
+        Union[dict[str, str], None]: Config data with path and template
+            or None.
+
+    """
+    task_name = task_type = None
+    task_data = template_data.get("task")
+    if task_data:
+        task_name = task_data["name"]
+        task_type = task_data["type"]
+
+    filter_values = {
+        "task_names": task_name,
+        "task_types": task_type,
+        "host_names": host_name,
+    }
+    profile = filter_profiles(
+        imageio_global["ocio_config_profiles"], filter_values
+    )
+    if profile is None:
+        log.info(f"No config profile matched filters {str(filter_values)}")
+        return None
+
+    profile_type = profile["type"]
+    if profile_type in ("builtin_path", "custom_path"):
+        template = profile[profile_type]
+        result = StringTemplate.format_strict_template(
+            template, template_data
+        )
+        normalized_path = str(result.normalized())
+        if not os.path.exists(normalized_path):
+            log.warning(f"Path was not found '{normalized_path}'.")
+            return None
+
+        return {
+            "path": normalized_path,
+            "template": template
+        }
+
+    # TODO decide if this is the right name for representation
+    repre_name = "ocioconfig"
+
+    folder_info = template_data.get("folder")
+    if not folder_info:
+        log.warning("Folder info is missing.")
+        return None
+    folder_path = folder_info["path"]
+
+    product_name = profile["product_name"]
+    if folder_id is None:
+        folder_entity = ayon_api.get_folder_by_path(
+            project_name, folder_path, fields={"id"}
+        )
+        if not folder_entity:
+            log.warning(f"Folder entity '{folder_path}' was not found..")
+            return None
+        folder_id = folder_entity["id"]
+
+    product_entities_by_name = {
+        product_entity["name"]: product_entity
+        for product_entity in ayon_api.get_products(
+        project_name,
+            folder_ids={folder_id},
+            product_name_regex=product_name,
+            fields={"id", "name"}
+        )
+    }
+    if not product_entities_by_name:
+        log.debug(
+            f"No product entities were found for folder '{folder_path}' with"
+            f" product name filter '{product_name}'."
+        )
+        return None
+
+    # Try to use exact match first, otherwise use first available product
+    product_entity = product_entities_by_name.get(product_name)
+    if product_entity is None:
+        product_entity = next(iter(product_entities_by_name.values()))
+
+    product_name = product_entity["name"]
+    # Find last product version
+    version_entity = ayon_api.get_last_version_by_product_id(
+        project_name,
+        product_id=product_entity["id"],
+        fields={"id"}
+    )
+    if not version_entity:
+        log.info(
+            f"Product '{product_name}' does not have available any versions."
+        )
+        return None
+
+    # Find 'ocioconfig' representation entity
+    repre_entity = ayon_api.get_representation_by_name(
+        project_name,
+        representation_name=repre_name,
+        version_id=version_entity["id"],
+    )
+    if not repre_entity:
+        log.debug(
+            f"Representation '{repre_name}'"
+            f" not found on product '{product_name}'."
+        )
+        return None
+
+    path = get_representation_path_with_anatomy(repre_entity, anatomy)
+    template = repre_entity["attrib"]["template"]
+    return {
+        "path": path,
+        "template": template,
+    }
+
+
+def get_imageio_config_preset(
+    project_name,
+    folder_path,
+    task_name,
+    host_name,
+    anatomy=None,
+    project_settings=None,
+    template_data=None,
+    env=None,
+    folder_id=None,
+):
+    """Returns config data from settings
+
+    Output contains 'path' key and 'template' key holds its template.
+
+    Template data can be prepared with 'get_template_data'.
+
+    Args:
+        project_name (str): Project name.
+        folder_path (str): Folder path.
+        task_name (str): Task name.
+        host_name (str): Host name.
+        anatomy (Optional[Anatomy]): Project anatomy object.
+        project_settings (Optional[dict]): Project settings.
+        template_data (Optional[dict]): Template data used for
+            template formatting.
+        env (Optional[dict]): Environment variables. Environments are used
+            for template formatting too. Values from 'os.environ' are used
+            when not provided.
+        folder_id (Optional[str]): Folder id. Is used only when config path
+            is received from published representation. Is autofilled when
+            not provided.
+
+    Returns:
+        dict: config path data or empty dict
+
+    """
+    if not project_settings:
+        project_settings = get_project_settings(project_name)
 
     # Get colorspace settings
     imageio_global, imageio_host = _get_imageio_settings(
-        project_settings, host_name)
+        project_settings, host_name
+    )
+    # Global color management must be enabled to be able to use host settings
+    if not imageio_global["activate_global_color_management"]:
+        log.info("Colorspace management is disabled globally.")
+        return {}
 
     # Host 'ocio_config' is optional
     host_ocio_config = imageio_host.get("ocio_config") or {}
-
-    # Global color management must be enabled to be able to use host settings
-    activate_color_management = imageio_global.get(
-        "activate_global_color_management")
-    # TODO: remove this in future - backward compatibility
-    # For already saved overrides from previous version look for 'enabled'
-    #   on host settings.
-    if activate_color_management is None:
-        activate_color_management = host_ocio_config.get("enabled", False)
-
-    if not activate_color_management:
-        # if global settings are disabled return empty dict because
-        # it is expected that no colorspace management is needed
-        log.info("Colorspace management is disabled globally.")
-        return {}
+    # TODO remove
+    #  - backward compatibility when host settings had only 'enabled' flag
+    #      the flag was split into 'activate_global_color_management'
+    #      and 'override_global_config'
+    host_ocio_config_enabled = host_ocio_config.get("enabled", False)
 
     # Check if host settings group is having 'activate_host_color_management'
     # - if it does not have activation key then default it to True so it uses
     #       global settings
-    # This is for backward compatibility.
-    # TODO: in future rewrite this to be more explicit
     activate_host_color_management = imageio_host.get(
-        "activate_host_color_management")
-
-    # TODO: remove this in future - backward compatibility
+        "activate_host_color_management"
+    )
     if activate_host_color_management is None:
-        activate_host_color_management = host_ocio_config.get("enabled", False)
+        activate_host_color_management = host_ocio_config_enabled
 
     if not activate_host_color_management:
         # if host settings are disabled return False because
         # it is expected that no colorspace management is needed
         log.info(
-            "Colorspace management for host '{}' is disabled.".format(
-                host_name)
+            f"Colorspace management for host '{host_name}' is disabled."
         )
         return {}
 
-    # get config path from either global or host settings
-    # depending on override flag
+    project_entity = None
+    if anatomy is None:
+        project_entity = ayon_api.get_project(project_name)
+        anatomy = Anatomy(project_name, project_entity)
+
+    if env is None:
+        env = dict(os.environ.items())
+
+    if template_data:
+        template_data = deepcopy(template_data)
+    else:
+        if not project_entity:
+            project_entity = ayon_api.get_project(project_name)
+
+        folder_entity = ayon_api.get_folder_by_path(
+            project_name, folder_path
+        )
+        folder_id = folder_entity["id"]
+        task_entity = ayon_api.get_task_by_name(
+            project_name, folder_id, task_name
+        )
+        template_data = get_template_data(
+            project_entity,
+            folder_entity,
+            task_entity,
+            host_name,
+            project_settings,
+        )
+
+    # Add project roots to anatomy data
+    template_data["root"] = anatomy.roots
+    template_data["platform"] = platform.system().lower()
+
+    # Add environment variables to template data
+    template_data.update(env)
+
+    # Get config path from core or host settings
+    #  - based on override flag in host settings
     # TODO: in future rewrite this to be more explicit
     override_global_config = host_ocio_config.get("override_global_config")
     if override_global_config is None:
-        # for already saved overrides from previous version
-        # TODO: remove this in future - backward compatibility
-        override_global_config = host_ocio_config.get("enabled")
+        override_global_config = host_ocio_config_enabled
 
-    if override_global_config:
-        config_data = _get_config_data(
-            host_ocio_config["filepath"], formatting_data, env
+    if not override_global_config:
+        config_data = _get_global_config_data(
+            project_name,
+            host_name,
+            anatomy,
+            template_data,
+            imageio_global,
+            folder_id,
+            log,
         )
     else:
-        # get config path from global
-        config_global = imageio_global["ocio_config"]
         config_data = _get_config_data(
-            config_global["filepath"], formatting_data, env
+            host_ocio_config["filepath"], template_data, env
         )
 
     if not config_data:
         raise FileExistsError(
-            "No OCIO config found in settings. It is "
-            "either missing or there is typo in path inputs"
+            "No OCIO config found in settings. It is"
+            " either missing or there is typo in path inputs"
         )
 
     return config_data

From 71f2c074c55938672025f6ed7af450a32d3584b8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 2 May 2024 10:58:51 +0200
Subject: [PATCH 012/119] implemented conversion of settings overrides

---
 server/__init__.py | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/server/__init__.py b/server/__init__.py
index 152cc77218..f6f89f2049 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from ayon_server.addons import BaseServerAddon
 
 from .settings import CoreSettings, DEFAULT_VALUES
@@ -9,3 +11,46 @@ class CoreAddon(BaseServerAddon):
     async def get_default_settings(self):
         settings_model_cls = self.get_settings_model()
         return settings_model_cls(**DEFAULT_VALUES)
+
+    async def convert_settings_overrides(
+        self,
+        source_version: str,
+        overrides: dict[str, Any],
+    ) -> dict[str, Any]:
+        self._convert_imagio_configs_0_3_1(overrides)
+        # Use super conversion
+        return await super().convert_settings_overrides(
+            source_version, overrides
+        )
+
+    def _convert_imagio_configs_0_3_1(self, overrides):
+        """Imageio config settings did change to profiles since 0.3.1. ."""
+        imageio_overrides = overrides.get("imageio") or {}
+        if "ocio_config" not in imageio_overrides:
+            return
+
+        ocio_config = imageio_overrides.pop("ocio_config")
+        filepath = ocio_config["filepath"]
+        if not filepath:
+            return
+        first_filepath = filepath[0]
+        ocio_config_profiles = imageio_overrides.setdefault(
+            "ocio_config_profiles", []
+        )
+        base_value = {
+            "type": "builtin_path",
+            "product": "",
+            "host_names": [],
+            "task_names": [],
+            "task_types": [],
+            "custom_path": "",
+            "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio"
+        }
+        if first_filepath not in (
+            "{BUILTIN_OCIO_ROOT}/aces_1.2/config.oci",
+            "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio",
+        ):
+            base_value["type"] = "custom_path"
+            base_value["custom_path"] = first_filepath
+
+        ocio_config_profiles.append(base_value)

From 230611e91c6a89f73b8fc9c80a9414107018a0ac Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 15:58:26 +0200
Subject: [PATCH 013/119] AY-4801 - new creator for editorial_pckg

Should publish folder with otio file and (.mov) resources.
---
 .../create/create_editorial_package.py        | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py

diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
new file mode 100644
index 0000000000..6a581b59d1
--- /dev/null
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
@@ -0,0 +1,66 @@
+from pathlib import Path
+
+from ayon_core.pipeline import (
+    CreatedInstance,
+)
+
+from ayon_core.lib.attribute_definitions import FileDef
+from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
+
+
+class EditorialPackageCreator(TrayPublishCreator):
+    """Creates instance for OTIO file from published folder.
+
+    Folder contains OTIO file and exported .mov files. Process should publish
+    whole folder as single `editorial_pckg` product type and (possibly) convert
+    .mov files into different format and copy them into `publish` `resources`
+    subfolder.
+    """
+    identifier = "editorial_pckg"
+    label = "Editorial package"
+    product_type = "editorial_pckg"
+    description = "Publish folder with OTIO file and resources"
+
+    # Position batch creator after simple creators
+    order = 120
+
+
+    def get_icon(self):
+        return "fa.folder"
+
+    def create(self, product_name, instance_data, pre_create_data):
+        folder_path = pre_create_data.get("folder_path")
+        if not folder_path:
+            return
+
+        instance_data["creator_attributes"] = {
+            "path": (Path(folder_path["directory"]) /
+                     Path(folder_path["filenames"][0])).as_posix()
+        }
+
+        # Create new instance
+        new_instance = CreatedInstance(self.product_type, product_name,
+                                       instance_data, self)
+        self._store_new_instance(new_instance)
+
+    def get_pre_create_attr_defs(self):
+        # Use same attributes as for instance attributes
+        return [
+            FileDef(
+                "folder_path",
+                folders=True,
+                single_item=True,
+                extensions=[],
+                allow_sequences=False,
+                label="Folder path"
+            )
+        ]
+
+    def get_detail_description(self):
+        return """# Publish folder with OTIO file and video clips
+
+        Folder contains OTIO file and exported .mov files. Process should 
+        publish whole folder as single `editorial_pckg` product type and 
+        (possibly) convert .mov files into different format and copy them into 
+        `publish` `resources` subfolder.
+        """

From 4318218881c6d4c0ad0f83bd23395b1c8936f5b7 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 16:02:56 +0200
Subject: [PATCH 014/119] AY-4801 - new collector for editorial_pckg

Collects otio_path and resource_paths from folder.
Doesn't parse and collect otio_data yet, to not carry too much data over.(Might be changed)
---
 .../publish/collect_editorial_package.py      | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
new file mode 100644
index 0000000000..101f58b6d1
--- /dev/null
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
@@ -0,0 +1,58 @@
+"""Produces instance.data["editorial_pckg"] data used during integration.
+
+Requires:
+    instance.data["creator_attributes"]["path"] - from creator
+
+Provides:
+    instance -> editorial_pckg (dict):
+                    folder_path (str)
+                    otio_path   (str) - from dragged folder
+                    resource_paths (list)
+
+"""
+import os
+
+import pyblish.api
+
+from ayon_core.lib.transcoding import VIDEO_EXTENSIONS
+
+
+class CollectEditorialPackage(pyblish.api.InstancePlugin):
+    """Collects path to OTIO file and resources"""
+
+    label = "Collect Editorial Package"
+    order = pyblish.api.CollectorOrder - 0.1
+
+    hosts = ["traypublisher"]
+    families = ["editorial_pckg"]
+
+    def process(self, instance):
+        folder_path = instance.data["creator_attributes"].get("path")
+        if not folder_path or not os.path.exists(folder_path):
+            self.log.info((
+                "Instance doesn't contain collected existing folder path."
+            ))
+            return
+
+        instance.data["editorial_pckg"] = {}
+        instance.data["editorial_pckg"]["folder_path"] = folder_path
+
+        otio_path, resource_paths = (
+            self._get_otio_and_resource_paths(folder_path))
+
+        instance.data["editorial_pckg"]["otio_path"] = otio_path
+        instance.data["editorial_pckg"]["resource_paths"] = resource_paths
+
+    def _get_otio_and_resource_paths(self, folder_path):
+        otio_path = None
+        resource_paths = []
+
+        file_names = os.listdir(folder_path)
+        for filename in file_names:
+            _, ext = os.path.splitext(filename)
+            file_path = os.path.join(folder_path, filename)
+            if ext == ".otio":
+                otio_path = file_path
+            elif ext in VIDEO_EXTENSIONS:
+                resource_paths.append(file_path)
+        return otio_path, resource_paths

From 1ff4d63091fbcbdcabc434317181fd19f00a916d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 16:11:12 +0200
Subject: [PATCH 015/119] AY-4801 - new validator for editorial_pckg

Currently checks only by file names and expects flat structure.
It ignores path to resources in otio file as folder might be dragged in and
published from different location than it was created.
---
 .../publish/validate_editorial_package.py     | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
new file mode 100644
index 0000000000..869dc73811
--- /dev/null
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
@@ -0,0 +1,70 @@
+import os
+import opentimelineio
+
+import pyblish.api
+from ayon_core.pipeline import PublishValidationError
+
+
+class ValidateEditorialPackage(pyblish.api.InstancePlugin):
+    """Checks that published folder contains all resources from otio
+
+    Currently checks only by file names and expects flat structure.
+    It ignores path to resources in otio file as folder might be dragged in and
+    published from different location than it was created.
+    """
+
+    label = "Validate Editorial Package"
+    order = pyblish.api.ValidatorOrder - 0.49
+
+    hosts = ["traypublisher"]
+    families = ["editorial_pckg"]
+
+    def process(self, instance):
+        editorial_pckg_data = instance.data.get("editorial_pckg")
+        if not editorial_pckg_data:
+            raise PublishValidationError(
+                f"Editorial package not collected")
+
+        folder_path = editorial_pckg_data["folder_path"]
+
+        otio_path = editorial_pckg_data["otio_path"]
+        if not otio_path:
+            raise PublishValidationError(
+                f"Folder {folder_path} missing otio file")
+
+        resource_paths = editorial_pckg_data["resource_paths"]
+
+        resource_file_names = {os.path.basename(path)
+                               for path in resource_paths}
+
+        otio_data = opentimelineio.adapters.read_from_file(otio_path)
+
+        target_urls = self._get_all_target_urls(otio_data)
+        missing_files = set()
+        for target_url in target_urls:
+            target_basename = os.path.basename(target_url)
+            if target_basename not in resource_file_names:
+                missing_files.add(target_basename)
+
+        if missing_files:
+            raise PublishValidationError("Otio file contains missing files "
+                                         f"'{missing_files}'.")
+
+        instance.data["editorial_pckg"]["otio_data"] = otio_data
+
+    def _get_all_target_urls(self, otio_data):
+        target_urls = []
+
+        # Iterate through tracks, clips, or other elements
+        for track in otio_data.tracks:
+            for clip in track:
+                # Check if the clip has a media reference
+                if clip.media_reference is not None:
+                    # Access the target_url from the media reference
+                    target_url = clip.media_reference.target_url
+                    if target_url:
+                        target_urls.append(target_url)
+
+        return target_urls
+
+

From 20dad59947e4fb13d026670baa73820e9e378ecd Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 18:31:40 +0200
Subject: [PATCH 016/119] AY-4801 - added editorial_pckg to integrate

---
 client/ayon_core/plugins/publish/integrate.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index 764168edd3..5a9d8eae2b 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -169,6 +169,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
                 "yeticacheUE",
                 "tycache",
                 "csv_ingest_file",
+                "editorial_pckg"
                 ]
 
     default_template_name = "publish"

From 345f5f31f1a395c4f4d468166bc343933be9974e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 18:44:48 +0200
Subject: [PATCH 017/119] AY-4801 - added editorial_pckg extractor

Modifies otio file with rootless publish paths, prepares for integration.
---
 .../plugins/publish/extract_editorial_pckg.py | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
new file mode 100644
index 0000000000..dc8163e1ff
--- /dev/null
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -0,0 +1,122 @@
+import os.path
+import opentimelineio
+
+import pyblish.api
+
+from ayon_core.pipeline import publish
+
+
+class ExtractEditorialPackage(publish.Extractor):
+    """Replaces movie paths in otio file with publish rootless
+
+    Prepares movie resources for integration.
+    TODO introduce conversion to .mp4
+    """
+
+    label = "Extract Editorial Package"
+    order = pyblish.api.ExtractorOrder - 0.45
+    hosts = ["traypublisher"]
+    families = ["editorial_pckg"]
+
+    def process(self, instance):
+        editorial_pckg_data = instance.data.get("editorial_pckg")
+
+        otio_path = editorial_pckg_data["otio_path"]
+        otio_basename = os.path.basename(otio_path)
+        staging_dir = self.staging_dir(instance)
+
+        editorial_pckg_repre = {
+            'name': "editorial_pckg",
+            'ext': "otio",
+            'files': otio_basename,
+            "stagingDir": staging_dir,
+        }
+        otio_staging_path = os.path.join(staging_dir, otio_basename)
+
+        instance.data["representations"].append(editorial_pckg_repre)
+
+        publish_path = self._get_published_path(instance)
+        publish_folder = os.path.dirname(publish_path)
+        publish_resource_folder = os.path.join(publish_folder, "resources")
+
+        resource_paths = editorial_pckg_data["resource_paths"]
+        transfers = self._get_transfers(resource_paths,
+                                        publish_resource_folder)
+        if not "transfers" in instance.data:
+            instance.data["transfers"] = []
+        instance.data["transfers"] = transfers
+
+        source_to_rootless = self._get_resource_path_mapping(instance,
+                                                             transfers)
+
+        otio_data = editorial_pckg_data["otio_data"]
+        otio_data = self._replace_target_urls(otio_data, source_to_rootless)
+
+        opentimelineio.adapters.write_to_file(otio_data, otio_staging_path)
+
+        self.log.info("Added Editorial Package representation: {}".format(
+            editorial_pckg_repre))
+
+    def _get_resource_path_mapping(self, instance, transfers):
+        """Returns dict of {source_mov_path: rootless_published_path}."""
+        replace_paths = {}
+        anatomy = instance.context.data["anatomy"]
+        for source, destination in transfers:
+            rootless_path = self._get_rootless(anatomy, destination)
+            source_file_name = os.path.basename(source)
+            replace_paths[source_file_name] = rootless_path
+        return replace_paths
+
+    def _get_transfers(self, resource_paths, publish_resource_folder):
+        """Returns list of tuples (source, destination) movie paths."""
+        transfers = []
+        for res_path in resource_paths:
+            res_basename = os.path.basename(res_path)
+            pub_res_path = os.path.join(publish_resource_folder, res_basename)
+            transfers.append((res_path, pub_res_path))
+        return transfers
+
+    def _replace_target_urls(self, otio_data, replace_paths):
+        """Replace original movie paths with published rootles ones."""
+        for track in otio_data.tracks:
+            for clip in track:
+                # Check if the clip has a media reference
+                if clip.media_reference is not None:
+                    # Access the target_url from the media reference
+                    target_url = clip.media_reference.target_url
+                    if not target_url:
+                        continue
+                    file_name = os.path.basename(target_url)
+                    replace_value = replace_paths.get(file_name)
+                    if replace_value:
+                        clip.media_reference.target_url = replace_value
+
+        return otio_data
+
+    def _get_rootless(self, anatomy, path):
+        """Try to find rootless {root[work]} path from `path`"""
+        success, rootless_path = anatomy.find_root_template_from_path(
+            path)
+        if not success:
+            # `rootless_path` is not set to `output_dir` if none of roots match
+            self.log.warning(
+               f"Could not find root path for remapping '{path}'."
+            )
+            rootless_path = path
+
+        return rootless_path
+
+    def _get_published_path(self, instance):
+        """Calculates expected `publish` folder"""
+        # determine published path from Anatomy.
+        template_data = instance.data.get("anatomyData")
+        rep = instance.data["representations"][0]
+        template_data["representation"] = rep.get("name")
+        template_data["ext"] = rep.get("ext")
+        template_data["comment"] = None
+
+        anatomy = instance.context.data["anatomy"]
+        template_data["root"] = anatomy.roots
+        template = anatomy.get_template_item("publish", "default", "path")
+        template_filled = template.format_strict(template_data)
+        return os.path.normpath(template_filled)

From 5e0ab289293b37a195c3c59bf42221c4e04e823d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:04:36 +0200
Subject: [PATCH 018/119] renamed 'tools__get_config_data_name' to
 '_get_host_config_data'

---
 client/ayon_core/pipeline/colorspace.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 8dcbaeb877..f17e9d5f7b 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1069,7 +1069,7 @@ def get_imageio_config_preset(
             log,
         )
     else:
-        config_data = _get_config_data(
+        config_data = _get_host_config_data(
             host_ocio_config["filepath"], template_data, env
         )
 
@@ -1082,7 +1082,7 @@ def get_imageio_config_preset(
     return config_data
 
 
-def _get_config_data(path_list, anatomy_data, env=None):
+def _get_host_config_data(path_list, anatomy_data, env=None):
     """Return first existing path in path list.
 
     If template is used in path inputs,

From 1589ee5c0e9ccf35e723d7f703fad4118470c8bc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:05:01 +0200
Subject: [PATCH 019/119] simplified '_get_host_config_data'

---
 client/ayon_core/pipeline/colorspace.py | 43 ++++++++++---------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index f17e9d5f7b..595c50606c 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1082,39 +1082,30 @@ def get_imageio_config_preset(
     return config_data
 
 
-def _get_host_config_data(path_list, anatomy_data, env=None):
+def _get_host_config_data(templates, template_data):
     """Return first existing path in path list.
 
-    If template is used in path inputs,
-    then it is formatted by anatomy data
-    and environment variables
+    Use template data to fill possible formatting in paths.
 
     Args:
-        path_list (list[str]): list of abs paths
-        anatomy_data (dict): formatting data
-        env (Optional[dict]): Environment variables.
+        templates (list[str]): List of templates to config paths.
+        template_data (dict): Template data used to format templates.
 
     Returns:
-        dict: config data
+        Union[dict, None]: Config data or 'None' if templates are empty
+            or any path exists.
+
     """
-    formatting_data = deepcopy(anatomy_data)
-
-    environment_vars = env or dict(**os.environ)
-
-    # format the path for potential env vars
-    formatting_data.update(environment_vars)
-
-    # first try host config paths
-    for path_ in path_list:
-        formatted_path = _format_path(path_, formatting_data)
-
-        if not os.path.exists(formatted_path):
-            continue
-
-        return {
-            "path": os.path.normpath(formatted_path),
-            "template": path_
-        }
+    for template in templates:
+        formatted_path = StringTemplate.format_strict_template(
+            template, template_data
+        )
+        path = os.path.abspath(formatted_path)
+        if os.path.exists(path):
+            return {
+                "path": os.path.normpath(path),
+                "template": template
+            }
 
 
 def _format_path(template_path, formatting_data):

From aaeaa1e7f0c6c977716b5e240b3610090d32190c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:10:14 +0200
Subject: [PATCH 020/119] removed unused '_format_path'

---
 client/ayon_core/pipeline/colorspace.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 595c50606c..363012dad5 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1108,24 +1108,6 @@ def _get_host_config_data(templates, template_data):
             }
 
 
-def _format_path(template_path, formatting_data):
-    """Single template path formatting.
-
-    Args:
-        template_path (str): template string
-        formatting_data (dict): data to be used for
-                                template formatting
-
-    Returns:
-        str: absolute formatted path
-    """
-    # format path for anatomy keys
-    formatted_path = StringTemplate(template_path).format(
-        formatting_data)
-
-    return os.path.abspath(formatted_path)
-
-
 def get_imageio_file_rules(project_name, host_name, project_settings=None):
     """Get ImageIO File rules from project settings
 

From c6b6ca1e3cfbb3d400b65ec3ead9d5bd5518650b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:10:36 +0200
Subject: [PATCH 021/119] use safer option to format template path

---
 client/ayon_core/pipeline/colorspace.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 363012dad5..1ab93c7844 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1097,9 +1097,12 @@ def _get_host_config_data(templates, template_data):
 
     """
     for template in templates:
-        formatted_path = StringTemplate.format_strict_template(
+        formatted_path = StringTemplate.format_template(
             template, template_data
         )
+        if not formatted_path.solved:
+            continue
+
         path = os.path.abspath(formatted_path)
         if os.path.exists(path):
             return {

From bc01bf08f2a45339b476af61094904551a73a12b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:50:00 +0200
Subject: [PATCH 022/119] updated
 'get_colorspace_settings_from_publish_context' to use new function

---
 client/ayon_core/pipeline/colorspace.py | 30 ++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 1ab93c7844..5793fd1143 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1236,27 +1236,41 @@ def get_colorspace_settings_from_publish_context(context_data):
 
     Returns:
         tuple | bool: config, file rules or None
+
     """
     if "imageioSettings" in context_data and context_data["imageioSettings"]:
         return context_data["imageioSettings"]
 
     project_name = context_data["projectName"]
+    folder_path = context_data["folderPath"]
+    task_name = context_data["task"]
     host_name = context_data["hostName"]
-    anatomy_data = context_data["anatomyData"]
-    project_settings_ = context_data["project_settings"]
+    anatomy = context_data["anatomy"]
+    template_data = context_data["anatomyData"]
+    project_settings = context_data["project_settings"]
+    folder_id = None
+    folder_entity = context_data.get("folderEntity")
+    if folder_entity:
+        folder_id = folder_entity["id"]
 
-    config_data = get_imageio_config(
-        project_name, host_name,
-        project_settings=project_settings_,
-        anatomy_data=anatomy_data
+    config_data = get_imageio_config_preset(
+        project_name,
+        folder_path,
+        task_name,
+        host_name,
+        anatomy=anatomy,
+        project_settings=project_settings,
+        template_data=template_data,
+        folder_id=folder_id,
     )
 
     # caching invalid state, so it's not recalculated all the time
     file_rules = None
     if config_data:
         file_rules = get_imageio_file_rules(
-            project_name, host_name,
-            project_settings=project_settings_
+            project_name,
+            host_name,
+            project_settings=project_settings
         )
 
     # caching settings for future instance processing

From 178e30d8e7fdba1012908f1f7574e824ab03055a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:52:31 +0200
Subject: [PATCH 023/119] fix call of '_get_host_config_data'

---
 client/ayon_core/pipeline/colorspace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 5793fd1143..906f9f96fa 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1070,7 +1070,7 @@ def get_imageio_config_preset(
         )
     else:
         config_data = _get_host_config_data(
-            host_ocio_config["filepath"], template_data, env
+            host_ocio_config["filepath"], template_data
         )
 
     if not config_data:

From 571658b1290c69b9444ecaabc35247722dd15aca Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:53:12 +0200
Subject: [PATCH 024/119] make context optional

---
 client/ayon_core/pipeline/colorspace.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 906f9f96fa..a715651f4a 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -783,8 +783,8 @@ def get_imageio_config(
             get_current_context_template_data)
         anatomy_data = get_current_context_template_data()
 
-    task_name = anatomy_data["task"]["name"]
-    folder_path = anatomy_data["folder"]["path"]
+    task_name = anatomy_data.get("task", {}).get("name")
+    folder_path = anatomy_data.get("folder", {}).get("path")
     return get_imageio_config_preset(
         project_name,
         folder_path,
@@ -1029,13 +1029,17 @@ def get_imageio_config_preset(
         if not project_entity:
             project_entity = ayon_api.get_project(project_name)
 
-        folder_entity = ayon_api.get_folder_by_path(
-            project_name, folder_path
-        )
-        folder_id = folder_entity["id"]
-        task_entity = ayon_api.get_task_by_name(
-            project_name, folder_id, task_name
-        )
+        folder_entity = task_entity = folder_id = None
+        if folder_path:
+            folder_entity = ayon_api.get_folder_by_path(
+                project_name, folder_path
+            )
+            folder_id = folder_entity["id"]
+
+        if folder_id and task_name:
+            task_entity = ayon_api.get_task_by_name(
+                project_name, folder_id, task_name
+            )
         template_data = get_template_data(
             project_entity,
             folder_entity,

From cd857753ae6f24bf066514ecaf26d32bed827217 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:54:00 +0200
Subject: [PATCH 025/119] 'config_data' are now required in other functions

---
 client/ayon_core/pipeline/colorspace.py | 86 ++++++++++++++-----------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index a715651f4a..9e33b2e531 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -126,42 +126,48 @@ def get_ocio_config_script_path():
 
 
 def get_colorspace_name_from_filepath(
-    filepath, host_name, project_name,
-    config_data=None, file_rules=None,
+    filepath,
+    host_name,
+    project_name,
+    config_data,
+    file_rules=None,
     project_settings=None,
     validate=True
 ):
     """Get colorspace name from filepath
 
     Args:
-        filepath (str): path string, file rule pattern is tested on it
-        host_name (str): host name
-        project_name (str): project name
-        config_data (Optional[dict]): config path and template in dict.
-                                      Defaults to None.
-        file_rules (Optional[dict]): file rule data from settings.
-                                     Defaults to None.
-        project_settings (Optional[dict]): project settings. Defaults to None.
+        filepath (str): Path string, file rule pattern is tested on it.
+        host_name (str): Host name.
+        project_name (str): Project name.
+        config_data (dict): Config path and template in dict.
+        file_rules (Optional[dict]): File rule data from settings.
+        project_settings (Optional[dict]): Project settings.
         validate (Optional[bool]): should resulting colorspace be validated
-                                with config file? Defaults to True.
+            with config file? Defaults to True.
 
     Returns:
-        str: name of colorspace
-    """
-    project_settings, config_data, file_rules = _get_context_settings(
-        host_name, project_name,
-        config_data=config_data, file_rules=file_rules,
-        project_settings=project_settings
-    )
+        Union[str, None]: name of colorspace
 
+    """
     if not config_data:
         # in case global or host color management is not enabled
         return None
 
+    if file_rules is None:
+        if project_settings is None:
+            project_settings = get_project_settings(project_name)
+        file_rules = get_imageio_file_rules(
+            project_name, host_name, project_settings
+        )
+
     # use ImageIO file rules
     colorspace_name = get_imageio_file_rules_colorspace_from_filepath(
-        filepath, host_name, project_name,
-        config_data=config_data, file_rules=file_rules,
+        filepath,
+        host_name,
+        project_name,
+        config_data=config_data,
+        file_rules=file_rules,
         project_settings=project_settings
     )
 
@@ -187,7 +193,8 @@ def get_colorspace_name_from_filepath(
     # validate matching colorspace with config
     if validate:
         validate_imageio_colorspace_in_config(
-            config_data["path"], colorspace_name)
+            config_data["path"], colorspace_name
+        )
 
     return colorspace_name
 
@@ -226,8 +233,11 @@ def _get_context_settings(
 
 
 def get_imageio_file_rules_colorspace_from_filepath(
-    filepath, host_name, project_name,
-    config_data=None, file_rules=None,
+    filepath,
+    host_name,
+    project_name,
+    config_data,
+    file_rules=None,
     project_settings=None
 ):
     """Get colorspace name from filepath
@@ -235,28 +245,28 @@ def get_imageio_file_rules_colorspace_from_filepath(
     ImageIO Settings file rules are tested for matching rule.
 
     Args:
-        filepath (str): path string, file rule pattern is tested on it
-        host_name (str): host name
-        project_name (str): project name
-        config_data (Optional[dict]): config path and template in dict.
-                                      Defaults to None.
-        file_rules (Optional[dict]): file rule data from settings.
-                                     Defaults to None.
-        project_settings (Optional[dict]): project settings. Defaults to None.
+        filepath (str): Path string, file rule pattern is tested on it.
+        host_name (str): Host name.
+        project_name (str): Project name.
+        config_data (dict): Config path and template in dict.
+        file_rules (Optional[dict]): File rule data from settings.
+        project_settings (Optional[dict]): Project settings.
 
     Returns:
-        str: name of colorspace
-    """
-    project_settings, config_data, file_rules = _get_context_settings(
-        host_name, project_name,
-        config_data=config_data, file_rules=file_rules,
-        project_settings=project_settings
-    )
+        Union[str, None]: Name of colorspace.
 
+    """
     if not config_data:
         # in case global or host color management is not enabled
         return None
 
+    if file_rules is None:
+        if project_settings is None:
+            project_settings = get_project_settings(project_name)
+        file_rules = get_imageio_file_rules(
+            project_name, host_name, project_settings
+        )
+
     # match file rule from path
     colorspace_name = None
     for file_rule in file_rules:

From 5d6993d1112c7e24285f43b78ae68193abe29e7b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:54:18 +0200
Subject: [PATCH 026/119] removed unused '_get_context_settings'

---
 client/ayon_core/pipeline/colorspace.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 9e33b2e531..0e745b625f 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -210,28 +210,6 @@ def get_colorspace_from_filepath(*args, **kwargs):
     return get_imageio_file_rules_colorspace_from_filepath(*args, **kwargs)
 
 
-def _get_context_settings(
-    host_name, project_name,
-    config_data=None, file_rules=None,
-    project_settings=None
-):
-    project_settings = project_settings or get_project_settings(
-        project_name
-    )
-
-    config_data = config_data or get_imageio_config(
-        project_name, host_name, project_settings)
-
-    # in case host color management is not enabled
-    if not config_data:
-        return (None, None, None)
-
-    file_rules = file_rules or get_imageio_file_rules(
-        project_name, host_name, project_settings)
-
-    return project_settings, config_data, file_rules
-
-
 def get_imageio_file_rules_colorspace_from_filepath(
     filepath,
     host_name,

From 1586b316c8ab700b1f9e42dc57e813454010356a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:54:47 +0200
Subject: [PATCH 027/119] implemented function for current context

---
 client/ayon_core/pipeline/colorspace.py | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 0e745b625f..e0fa613ae8 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -23,6 +23,7 @@ from ayon_core.pipeline.template_data import get_template_data
 from ayon_core.pipeline.load import get_representation_path_with_anatomy
 from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 
+from .context_tools import get_current_context, get_current_host_name
 
 log = Logger.get_logger(__name__)
 
@@ -1402,3 +1403,37 @@ def get_display_view_colorspace_subprocess(config_path, display, view):
         # return default view colorspace name
         with open(tmp_json_path, "r") as f:
             return json.load(f)
+
+
+# --- Current context functions ---
+def get_current_context_imageio_config_preset(
+    anatomy=None,
+    project_settings=None,
+    template_data=None,
+    env=None,
+):
+    """Get ImageIO config preset for current context.
+
+    Args:
+        anatomy (Optional[Anatomy]): Current project anatomy.
+        project_settings (Optional[dict[str, Any]]): Current project settings.
+        template_data (Optional[dict[str, Any]]): Prepared template data
+            for current context.
+        env (Optional[dict[str, str]]): Custom environment variable values.
+
+    Returns:
+        dict: ImageIO config preset.
+
+    """
+    context = get_current_context()
+    host_name = get_current_host_name()
+    return get_imageio_config_preset(
+        context["project_name"],
+        context["folder_path"],
+        context["task_name"],
+        host_name,
+        anatomy=anatomy,
+        project_settings=project_settings,
+        template_data=template_data,
+        env=env,
+    )

From 3d1fa6471cbf8be68906a94aacea80bc90dc0a53 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 15:59:50 +0200
Subject: [PATCH 028/119] use 'get_current_context_imageio_config_preset' in
 host integrations

---
 client/ayon_core/hosts/hiero/api/lib.py       |  5 +---
 client/ayon_core/hosts/max/api/lib.py         | 11 ++------
 .../hosts/maya/plugins/load/load_image.py     |  5 ++--
 .../plugins/create/create_colorspace_look.py  |  7 +-----
 .../publish/collect_explicit_colorspace.py    | 25 +++++++++----------
 5 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/client/ayon_core/hosts/hiero/api/lib.py b/client/ayon_core/hosts/hiero/api/lib.py
index aaf99546c7..456a68f125 100644
--- a/client/ayon_core/hosts/hiero/api/lib.py
+++ b/client/ayon_core/hosts/hiero/api/lib.py
@@ -1110,10 +1110,7 @@ def apply_colorspace_project():
     '''
     # backward compatibility layer
     # TODO: remove this after some time
-    config_data = get_imageio_config(
-        project_name=get_current_project_name(),
-        host_name="hiero"
-    )
+    config_data = get_current_context_imageio_config_preset()
 
     if config_data:
         presets.update({
diff --git a/client/ayon_core/hosts/max/api/lib.py b/client/ayon_core/hosts/max/api/lib.py
index d9a3af3336..4170a992a5 100644
--- a/client/ayon_core/hosts/max/api/lib.py
+++ b/client/ayon_core/hosts/max/api/lib.py
@@ -372,12 +372,8 @@ def reset_colorspace():
     """
     if int(get_max_version()) < 2024:
         return
-    project_name = get_current_project_name()
-    colorspace_mgr = rt.ColorPipelineMgr
-    project_settings = get_project_settings(project_name)
 
-    max_config_data = colorspace.get_imageio_config(
-        project_name, "max", project_settings)
+    max_config_data = colorspace.get_current_context_imageio_config_preset()
     if max_config_data:
         ocio_config_path = max_config_data["path"]
         colorspace_mgr = rt.ColorPipelineMgr
@@ -392,10 +388,7 @@ def check_colorspace():
                  "because Max main window can't be found.")
     if int(get_max_version()) >= 2024:
         color_mgr = rt.ColorPipelineMgr
-        project_name = get_current_project_name()
-        project_settings = get_project_settings(project_name)
-        max_config_data = colorspace.get_imageio_config(
-            project_name, "max", project_settings)
+        max_config_data = colorspace.get_current_context_imageio_config_preset()
         if max_config_data and color_mgr.Mode != rt.Name("OCIO_Custom"):
             if not is_headless():
                 from ayon_core.tools.utils import SimplePopup
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image.py b/client/ayon_core/hosts/maya/plugins/load/load_image.py
index 5b0858ce70..171920f747 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_image.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_image.py
@@ -8,7 +8,7 @@ from ayon_core.pipeline import (
 from ayon_core.pipeline.load.utils import get_representation_path_from_context
 from ayon_core.pipeline.colorspace import (
     get_imageio_file_rules_colorspace_from_filepath,
-    get_imageio_config,
+    get_current_context_imageio_config_preset,
     get_imageio_file_rules
 )
 from ayon_core.settings import get_project_settings
@@ -270,8 +270,7 @@ class FileNodeLoader(load.LoaderPlugin):
         host_name = get_current_host_name()
         project_settings = get_project_settings(project_name)
 
-        config_data = get_imageio_config(
-            project_name, host_name,
+        config_data = get_current_context_imageio_config_preset(
             project_settings=project_settings
         )
 
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
index 4d865c1c5c..da05afe86b 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
@@ -156,14 +156,9 @@ This creator publishes color space look file (LUT).
         ]
 
     def apply_settings(self, project_settings):
-        host = self.create_context.host
-        host_name = host.name
-        project_name = host.get_current_project_name()
-        config_data = colorspace.get_imageio_config(
-            project_name, host_name,
+        config_data = colorspace.get_current_context_imageio_config_preset(
             project_settings=project_settings
         )
-
         if not config_data:
             self.enabled = False
             return
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
index 8e29a0048d..5fbb9a6f4c 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py
@@ -1,10 +1,7 @@
 import pyblish.api
-from ayon_core.pipeline import (
-    publish,
-    registered_host
-)
 from ayon_core.lib import EnumDef
 from ayon_core.pipeline import colorspace
+from ayon_core.pipeline import publish
 from ayon_core.pipeline.publish import KnownPublishError
 
 
@@ -19,9 +16,10 @@ class CollectColorspace(pyblish.api.InstancePlugin,
     families = ["render", "plate", "reference", "image", "online"]
     enabled = False
 
-    colorspace_items = [
+    default_colorspace_items = [
         (None, "Don't override")
     ]
+    colorspace_items = list(default_colorspace_items)
     colorspace_attr_show = False
     config_items = None
 
@@ -69,14 +67,13 @@ class CollectColorspace(pyblish.api.InstancePlugin,
 
     @classmethod
     def apply_settings(cls, project_settings):
-        host = registered_host()
-        host_name = host.name
-        project_name = host.get_current_project_name()
-        config_data = colorspace.get_imageio_config(
-            project_name, host_name,
+        config_data = colorspace.get_current_context_imageio_config_preset(
             project_settings=project_settings
         )
 
+        enabled = False
+        colorspace_items = list(cls.default_colorspace_items)
+        config_items = None
         if config_data:
             filepath = config_data["path"]
             config_items = colorspace.get_ocio_config_colorspaces(filepath)
@@ -85,9 +82,11 @@ class CollectColorspace(pyblish.api.InstancePlugin,
                 include_aliases=True,
                 include_roles=True
             )
-            cls.config_items = config_items
-            cls.colorspace_items.extend(labeled_colorspaces)
-            cls.enabled = True
+            colorspace_items.extend(labeled_colorspaces)
+
+        cls.config_items = config_items
+        cls.colorspace_items = colorspace_items
+        cls.enabled = enabled
 
     @classmethod
     def get_attribute_defs(cls):

From f827dc2060488de74421cd7d0b8fc826a499975e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 16:55:59 +0200
Subject: [PATCH 029/119] use new function in pre launch hook

---
 client/ayon_core/hooks/pre_ocio_hook.py | 52 ++++++++++++++-----------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py
index 0817afec71..6c30b267bc 100644
--- a/client/ayon_core/hooks/pre_ocio_hook.py
+++ b/client/ayon_core/hooks/pre_ocio_hook.py
@@ -1,7 +1,7 @@
 from ayon_applications import PreLaunchHook
 
-from ayon_core.pipeline.colorspace import get_imageio_config
-from ayon_core.pipeline.template_data import get_template_data_with_names
+from ayon_core.pipeline.colorspace import get_imageio_config_preset
+from ayon_core.pipeline.template_data import get_template_data
 
 
 class OCIOEnvHook(PreLaunchHook):
@@ -26,32 +26,38 @@ class OCIOEnvHook(PreLaunchHook):
     def execute(self):
         """Hook entry method."""
 
-        template_data = get_template_data_with_names(
-            project_name=self.data["project_name"],
-            folder_path=self.data["folder_path"],
-            task_name=self.data["task_name"],
+        folder_entity = self.data["folder_entity"]
+
+        template_data = get_template_data(
+            self.data["project_entity"],
+            folder_entity=folder_entity,
+            task_entity=self.data["task_entity"],
             host_name=self.host_name,
-            settings=self.data["project_settings"]
+            settings=self.data["project_settings"],
         )
 
-        config_data = get_imageio_config(
-            project_name=self.data["project_name"],
-            host_name=self.host_name,
-            project_settings=self.data["project_settings"],
-            anatomy_data=template_data,
+        config_data = get_imageio_config_preset(
+            self.data["project_name"],
+            self.data["folder_path"],
+            self.data["task_name"],
+            self.host_name,
             anatomy=self.data["anatomy"],
+            project_settings=self.data["project_settings"],
+            template_data=template_data,
             env=self.launch_context.env,
+            folder_id=folder_entity["id"],
         )
 
-        if config_data:
-            ocio_path = config_data["path"]
-
-            if self.host_name in ["nuke", "hiero"]:
-                ocio_path = ocio_path.replace("\\", "/")
-
-            self.log.info(
-                f"Setting OCIO environment to config path: {ocio_path}")
-
-            self.launch_context.env["OCIO"] = ocio_path
-        else:
+        if not config_data:
             self.log.debug("OCIO not set or enabled")
+            return
+
+        ocio_path = config_data["path"]
+
+        if self.host_name in ["nuke", "hiero"]:
+            ocio_path = ocio_path.replace("\\", "/")
+
+        self.log.info(
+            f"Setting OCIO environment to config path: {ocio_path}")
+
+        self.launch_context.env["OCIO"] = ocio_path

From 5a43242bda200a79454fbef579e00156c29fd144 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 16:56:43 +0200
Subject: [PATCH 030/119] use 'get_current_context_imageio_config_preset' in
 nuke

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

diff --git a/client/ayon_core/hosts/nuke/api/lib.py b/client/ayon_core/hosts/nuke/api/lib.py
index e3505a16f2..0a4755c166 100644
--- a/client/ayon_core/hosts/nuke/api/lib.py
+++ b/client/ayon_core/hosts/nuke/api/lib.py
@@ -43,7 +43,9 @@ from ayon_core.pipeline import (
 from ayon_core.pipeline.context_tools import (
     get_current_context_custom_workfile_template
 )
-from ayon_core.pipeline.colorspace import get_imageio_config
+from ayon_core.pipeline.colorspace import (
+    get_current_context_imageio_config_preset
+)
 from ayon_core.pipeline.workfile import BuildWorkfile
 from . import gizmo_menu
 from .constants import ASSIST
@@ -1552,10 +1554,7 @@ class WorkfileSettings(object):
             imageio_host (dict): host colorspace configurations
 
         '''
-        config_data = get_imageio_config(
-            project_name=get_current_project_name(),
-            host_name="nuke"
-        )
+        config_data = get_current_context_imageio_config_preset()
 
         workfile_settings = imageio_host["workfile"]
         color_management = workfile_settings["color_management"]

From 1568d40c98c07919dc90fdffc85f1c9a39af59c8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 16:57:03 +0200
Subject: [PATCH 031/119] temp json fole wrapper is safe

---
 client/ayon_core/pipeline/colorspace.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index e0fa613ae8..e985bdfcf5 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -87,28 +87,25 @@ def deprecated(new_destination):
 def _make_temp_json_file():
     """Wrapping function for json temp file
     """
+    temporary_json_file = None
     try:
         # Store dumped json to temporary file
-        temporary_json_file = tempfile.NamedTemporaryFile(
+        with tempfile.NamedTemporaryFile(
             mode="w", suffix=".json", delete=False
-        )
-        temporary_json_file.close()
-        temporary_json_filepath = temporary_json_file.name.replace(
-            "\\", "/"
-        )
+        ) as tmpfile:
+            temporary_json_filepath = tmpfile.name.replace("\\", "/")
 
         yield temporary_json_filepath
 
-    except IOError as _error:
+    except IOError as exc:
         raise IOError(
-            "Unable to create temp json file: {}".format(
-                _error
-            )
+            "Unable to create temp json file: {}".format(exc)
         )
 
     finally:
         # Remove the temporary json
-        os.remove(temporary_json_filepath)
+        if temporary_json_file is not None:
+            os.remove(temporary_json_filepath)
 
 
 def get_ocio_config_script_path():

From c0d5e77177463ca075ee1fed2e9c61416dd6196d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 16:57:27 +0200
Subject: [PATCH 032/119] simplified 'get_ocio_config_script_path'

---
 client/ayon_core/pipeline/colorspace.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index e985bdfcf5..cbd63c851f 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -113,13 +113,12 @@ def get_ocio_config_script_path():
 
     Returns:
         str: path string
+
     """
-    return os.path.normpath(
-        os.path.join(
-            AYON_CORE_ROOT,
-            "scripts",
-            "ocio_wrapper.py"
-        )
+    return os.path.join(
+        os.path.normpath(AYON_CORE_ROOT),
+        "scripts",
+        "ocio_wrapper.py"
     )
 
 

From 0c84c32e15ce1732139afaef5533c8f16e8f0c78 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 18:00:09 +0200
Subject: [PATCH 033/119] pass config data to
 'get_imageio_file_rules_colorspace_from_filepath' in nuke loader

---
 client/ayon_core/hosts/nuke/plugins/load/load_clip.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py b/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
index df8f2ab018..1f707c25cf 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
@@ -9,7 +9,8 @@ from ayon_core.pipeline import (
     get_representation_path,
 )
 from ayon_core.pipeline.colorspace import (
-    get_imageio_file_rules_colorspace_from_filepath
+    get_imageio_file_rules_colorspace_from_filepath,
+    get_current_context_imageio_config_preset,
 )
 from ayon_core.hosts.nuke.api.lib import (
     get_imageio_input_colorspace,
@@ -547,9 +548,10 @@ class LoadClip(plugin.NukeLoader):
                 f"Colorspace from representation colorspaceData: {colorspace}"
             )
 
+        config_data = get_current_context_imageio_config_preset()
         # check if any filerules are not applicable
         new_parsed_colorspace = get_imageio_file_rules_colorspace_from_filepath( # noqa
-            filepath, "nuke", project_name
+            filepath, "nuke", project_name, config_data=config_data
         )
         self.log.debug(f"Colorspace new filerules: {new_parsed_colorspace}")
 

From 5599d773c7f49f4ecee35a6cca1a0c1186b92a2e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 18:02:21 +0200
Subject: [PATCH 034/119] use 'get_imageio_file_rules_colorspace_from_filepath'
 instead of 'get_imageio_colorspace_from_filepath'

---
 client/ayon_core/pipeline/colorspace.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index cbd63c851f..7b0d4c8491 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1328,12 +1328,15 @@ def set_colorspace_data_to_representation(
         filename = filename[0]
 
     # get matching colorspace from rules
-    colorspace = colorspace or get_imageio_colorspace_from_filepath(
-        filename, host_name, project_name,
-        config_data=config_data,
-        file_rules=file_rules,
-        project_settings=project_settings
-    )
+    if colorspace is None:
+        colorspace = get_imageio_file_rules_colorspace_from_filepath(
+            filename,
+            host_name,
+            project_name,
+            config_data=config_data,
+            file_rules=file_rules,
+            project_settings=project_settings
+        )
 
     # infuse data to representation
     if colorspace:

From bf8b2fb3fafd6d9ee8cd7a868b7b44f26514147a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 18:02:41 +0200
Subject: [PATCH 035/119] 'get_display_view_colorspace_subprocess' is private

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

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 7b0d4c8491..4034527282 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1364,15 +1364,16 @@ def get_display_view_colorspace_name(config_path, display, view):
     if not compatibility_check():
         # python environment is not compatible with PyOpenColorIO
         # needs to be run in subprocess
-        return get_display_view_colorspace_subprocess(config_path,
-                                                      display, view)
+        return _get_display_view_colorspace_subprocess(
+            config_path, display, view
+        )
 
     from ayon_core.scripts.ocio_wrapper import _get_display_view_colorspace_name  # noqa
 
     return _get_display_view_colorspace_name(config_path, display, view)
 
 
-def get_display_view_colorspace_subprocess(config_path, display, view):
+def _get_display_view_colorspace_subprocess(config_path, display, view):
     """Returns the colorspace attribute of the (display, view) pair
         via subprocess.
 

From 322e36128a8ed2497fa862e1ad150f834ecd73be Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 18:04:12 +0200
Subject: [PATCH 036/119] space sufficient cache logic

---
 client/ayon_core/pipeline/colorspace.py | 29 +++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 4034527282..77c830d44a 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -509,16 +509,15 @@ def get_ocio_config_colorspaces(config_path):
         if not compatibility_check():
             # python environment is not compatible with PyOpenColorIO
             # needs to be run in subprocess
-            CachedData.ocio_config_colorspaces[config_path] = \
-                _get_wrapped_with_subprocess(
-                    "config", "get_colorspace", in_path=config_path
+            config_colorspaces = _get_wrapped_with_subprocess(
+                "config", "get_colorspace", in_path=config_path
             )
         else:
             # TODO: refactor this so it is not imported but part of this file
             from ayon_core.scripts.ocio_wrapper import _get_colorspace_data
 
-            CachedData.ocio_config_colorspaces[config_path] = \
-                _get_colorspace_data(config_path)
+            config_colorspaces = _get_colorspace_data(config_path)
+        CachedData.ocio_config_colorspaces[config_path] = config_colorspaces
 
     return CachedData.ocio_config_colorspaces[config_path]
 
@@ -1160,16 +1159,15 @@ def get_remapped_colorspace_to_native(
         Union[str, None]: native colorspace name defined in remapping or None
     """
 
-    CachedData.remapping.setdefault(host_name, {})
-    if CachedData.remapping[host_name].get("to_native") is None:
+    host_mapping = CachedData.remapping.setdefault(host_name, {})
+    if "to_native" not in host_mapping:
         remapping_rules = imageio_host_settings["remapping"]["rules"]
-        CachedData.remapping[host_name]["to_native"] = {
+        host_mapping["to_native"] = {
             rule["ocio_name"]: rule["host_native_name"]
             for rule in remapping_rules
         }
 
-    return CachedData.remapping[host_name]["to_native"].get(
-        ocio_colorspace_name)
+    return host_mapping["to_native"].get(ocio_colorspace_name)
 
 
 def get_remapped_colorspace_from_native(
@@ -1184,18 +1182,17 @@ def get_remapped_colorspace_from_native(
 
     Returns:
         Union[str, None]: Ocio colorspace name defined in remapping or None.
-    """
 
-    CachedData.remapping.setdefault(host_name, {})
-    if CachedData.remapping[host_name].get("from_native") is None:
+    """
+    host_mapping = CachedData.remapping.setdefault(host_name, {})
+    if "from_native" not in host_mapping:
         remapping_rules = imageio_host_settings["remapping"]["rules"]
-        CachedData.remapping[host_name]["from_native"] = {
+        host_mapping["from_native"] = {
             rule["host_native_name"]: rule["ocio_name"]
             for rule in remapping_rules
         }
 
-    return CachedData.remapping[host_name]["from_native"].get(
-        host_native_colorspace_name)
+    return host_mapping["from_native"].get(host_native_colorspace_name)
 
 
 def _get_imageio_settings(project_settings, host_name):

From b679b06919bfbde31790f920d6fb95555849f675 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 18:04:42 +0200
Subject: [PATCH 037/119] formatting changes

---
 client/ayon_core/pipeline/colorspace.py | 48 +++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 77c830d44a..ed590758a3 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -334,10 +334,10 @@ def parse_colorspace_from_filepath(
         pattern = "|".join(
             # Allow to match spaces also as underscores because the
             # integrator replaces spaces with underscores in filenames
-            re.escape(colorspace) for colorspace in
+            re.escape(colorspace)
             # Sort by longest first so the regex matches longer matches
             # over smaller matches, e.g. matching 'Output - sRGB' over 'sRGB'
-            sorted(colorspaces, key=len, reverse=True)
+            for colorspace in sorted(colorspaces, key=len, reverse=True)
         )
         return re.compile(pattern)
 
@@ -529,11 +529,12 @@ def convert_colorspace_enumerator_item(
     """Convert colorspace enumerator item to dictionary
 
     Args:
-        colorspace_item (str): colorspace and family in couple
-        config_items (dict[str,dict]): colorspace data
+        colorspace_enum_item (str): Colorspace and family in couple.
+        config_items (dict[str,dict]): Colorspace data.
 
     Returns:
         dict: colorspace data
+
     """
     if "::" not in colorspace_enum_item:
         return None
@@ -1103,13 +1104,13 @@ def get_imageio_file_rules(project_name, host_name, project_settings=None):
     """Get ImageIO File rules from project settings
 
     Args:
-        project_name (str): project name
-        host_name (str): host name
-        project_settings (dict, optional): project settings.
-                                           Defaults to None.
+        project_name (str): Project name.
+        host_name (str): Host name.
+        project_settings (Optional[dict]): Project settings.
 
     Returns:
         list[dict[str, Any]]: file rules data
+
     """
     project_settings = project_settings or get_project_settings(project_name)
 
@@ -1151,7 +1152,7 @@ def get_remapped_colorspace_to_native(
     """Return native colorspace name.
 
     Args:
-        ocio_colorspace_name (str | None): ocio colorspace name
+        ocio_colorspace_name (str | None): OCIO colorspace name.
         host_name (str): Host name.
         imageio_host_settings (dict[str, Any]): ImageIO host settings.
 
@@ -1199,12 +1200,12 @@ def _get_imageio_settings(project_settings, host_name):
     """Get ImageIO settings for global and host
 
     Args:
-        project_settings (dict): project settings.
-                                 Defaults to None.
-        host_name (str): host name
+        project_settings (dict[str, Any]): Project settings.
+        host_name (str): Host name.
 
     Returns:
-        tuple[dict, dict]: image io settings for global and host
+        tuple[dict, dict]: Image io settings for global and host.
+
     """
     # get image io from global and host_name
     imageio_global = project_settings["core"]["imageio"]
@@ -1266,18 +1267,13 @@ def get_colorspace_settings_from_publish_context(context_data):
 
 
 def set_colorspace_data_to_representation(
-    representation, context_data,
+    representation,
+    context_data,
     colorspace=None,
     log=None
 ):
     """Sets colorspace data to representation.
 
-    Args:
-        representation (dict): publishing representation
-        context_data (publish.Context.data): publishing context data
-        colorspace (str, optional): colorspace name. Defaults to None.
-        log (logging.Logger, optional): logger instance. Defaults to None.
-
     Example:
         ```
         {
@@ -1292,6 +1288,12 @@ def set_colorspace_data_to_representation(
         }
         ```
 
+    Args:
+        representation (dict): publishing representation
+        context_data (publish.Context.data): publishing context data
+        colorspace (Optional[str]): Colorspace name.
+        log (Optional[logging.Logger]): logger instance.
+
     """
     log = log or Logger.get_logger(__name__)
 
@@ -1355,9 +1357,9 @@ def get_display_view_colorspace_name(config_path, display, view):
         view (str): view name e.g. "sRGB"
 
     Returns:
-        view color space name (str) e.g. "Output - sRGB"
-    """
+        str: View color space name. e.g. "Output - sRGB"
 
+    """
     if not compatibility_check():
         # python environment is not compatible with PyOpenColorIO
         # needs to be run in subprocess
@@ -1381,8 +1383,8 @@ def _get_display_view_colorspace_subprocess(config_path, display, view):
 
     Returns:
         view color space name (str) e.g. "Output - sRGB"
-    """
 
+    """
     with _make_temp_json_file() as tmp_json_path:
         # Prepare subprocess arguments
         args = [

From ff05fafb77e5901e34e2dbcb070435f5fc72cd96 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 18:04:52 +0200
Subject: [PATCH 038/119] mark 'get_imageio_config' as deprecated

---
 client/ayon_core/pipeline/colorspace.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index ed590758a3..e9da194984 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -735,6 +735,7 @@ def get_views_data_subprocess(config_path):
     )
 
 
+@deprecated("get_imageio_config_preset")
 def get_imageio_config(
     project_name,
     host_name,

From 2facf91bcb4a5ea5812dc93b3b2c026978a7a7f3 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 7 May 2024 13:51:36 +0200
Subject: [PATCH 039/119] AY-4801-Added conversion of resources

Added similar configuration as for ExtractReview to control possible conversion from .mov to target format (.mp4)
---
 .../plugins/publish/extract_editorial_pckg.py | 151 ++++++++++++++++--
 .../server/settings/publish_plugins.py        |  89 ++++++++++-
 2 files changed, 230 insertions(+), 10 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index dc8163e1ff..02f953d579 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -1,16 +1,20 @@
+import copy
 import os.path
+import subprocess
+
 import opentimelineio
 
 import pyblish.api
 
+from ayon_core.lib import filter_profiles, get_ffmpeg_tool_args, run_subprocess
 from ayon_core.pipeline import publish
 
 
-class ExtractEditorialPackage(publish.Extractor):
+class ExtractEditorialPckgConversion(publish.Extractor):
     """Replaces movie paths in otio file with publish rootless
 
-    Prepares movie resources for integration.
-    TODO introduce conversion to .mp4
+    Prepares movie resources for integration (adds them to `transfers`).
+    Converts .mov files according to output definition.
     """
 
     label = "Extract Editorial Package"
@@ -35,13 +39,22 @@ class ExtractEditorialPackage(publish.Extractor):
 
         instance.data["representations"].append(editorial_pckg_repre)
 
-        publish_path = self._get_published_path(instance)
-        publish_folder = os.path.dirname(publish_path)
-        publish_resource_folder = os.path.join(publish_folder, "resources")
-
+        publish_resource_folder = self._get_publish_resource_folder(instance)
         resource_paths = editorial_pckg_data["resource_paths"]
         transfers = self._get_transfers(resource_paths,
                                         publish_resource_folder)
+
+        project_settings = instance.context.data["project_settings"]
+        profiles = (project_settings["traypublisher"]
+                                    ["publish"]
+                                    ["ExtractEditorialPckgConversion"]
+                                    .get("profiles"))
+        output_def = None
+        if profiles:
+            output_def = self._get_output_definition(instance, profiles)
+        if output_def:
+            transfers = self._convert_resources(output_def, transfers)
+
         if not "transfers" in instance.data:
             instance.data["transfers"] = []
         instance.data["transfers"] = transfers
@@ -57,6 +70,36 @@ class ExtractEditorialPackage(publish.Extractor):
         self.log.info("Added Editorial Package representation: {}".format(
             editorial_pckg_repre))
 
+    def _get_publish_resource_folder(self, instance):
+        """Calculates publish folder and create it."""
+        publish_path = self._get_published_path(instance)
+        publish_folder = os.path.dirname(publish_path)
+        publish_resource_folder = os.path.join(publish_folder, "resources")
+
+        if not os.path.exists(publish_resource_folder):
+            os.makedirs(publish_resource_folder, exist_ok=True)
+        return publish_resource_folder
+
+    def _get_output_definition(self, instance, profiles):
+        """Return appropriate profile by context information."""
+        product_type = instance.data["productType"]
+        product_name = instance.data["productName"]
+        task_entity = instance.data["taskEntity"] or {}
+        task_name = task_entity.get("name")
+        task_type = task_entity.get("taskType")
+        filtering_criteria = {
+            "product_types": product_type,
+            "product_names": product_name,
+            "task_names": task_name,
+            "task_types": task_type,
+        }
+        profile = filter_profiles(
+            profiles,
+            filtering_criteria,
+            logger=self.log
+        )
+        return profile
+
     def _get_resource_path_mapping(self, instance, transfers):
         """Returns dict of {source_mov_path: rootless_published_path}."""
         replace_paths = {}
@@ -68,7 +111,7 @@ class ExtractEditorialPackage(publish.Extractor):
         return replace_paths
 
     def _get_transfers(self, resource_paths, publish_resource_folder):
-        """Returns list of tuples (source, destination) movie paths."""
+        """Returns list of tuples (source, destination) with movie paths."""
         transfers = []
         for res_path in resource_paths:
             res_basename = os.path.basename(res_path)
@@ -77,7 +120,7 @@ class ExtractEditorialPackage(publish.Extractor):
         return transfers
 
     def _replace_target_urls(self, otio_data, replace_paths):
-        """Replace original movie paths with published rootles ones."""
+        """Replace original movie paths with published rootless ones."""
         for track in otio_data.tracks:
             for clip in track:
                 # Check if the clip has a media reference
@@ -120,3 +163,93 @@ class ExtractEditorialPackage(publish.Extractor):
         template = anatomy.get_template_item("publish", "default", "path")
         template_filled = template.format_strict(template_data)
         return os.path.normpath(template_filled)
+
+    def _convert_resources(self, output_def, transfers):
+        """Converts all resource files to configured format."""
+        outputs = output_def["outputs"]
+        if not outputs:
+            self.log.warning("No output configured in "
+               "ayon+settings://traypublisher/publish/ExtractEditorialPckgConversion/profiles/0/outputs")  # noqa
+            return transfers
+
+        final_transfers = []
+        # most likely only single output is expected
+        for output in outputs:
+            out_extension = output["ext"]
+            out_def_ffmpeg_args = output["ffmpeg_args"]
+            ffmpeg_input_args = [
+                value.strip()
+                for value in out_def_ffmpeg_args["input"]
+                if value.strip()
+            ]
+            ffmpeg_video_filters = [
+                value.strip()
+                for value in out_def_ffmpeg_args["video_filters"]
+                if value.strip()
+            ]
+            ffmpeg_audio_filters = [
+                value.strip()
+                for value in out_def_ffmpeg_args["audio_filters"]
+                if value.strip()
+            ]
+            ffmpeg_output_args = [
+                value.strip()
+                for value in out_def_ffmpeg_args["output"]
+                if value.strip()
+            ]
+            ffmpeg_input_args = self._split_ffmpeg_args(ffmpeg_input_args)
+
+            generic_args = [
+                subprocess.list2cmdline(get_ffmpeg_tool_args("ffmpeg"))
+            ]
+            generic_args.extend(ffmpeg_input_args)
+            if ffmpeg_video_filters:
+                generic_args.append("-filter:v")
+                generic_args.append(
+                    "\"{}\"".format(",".join(ffmpeg_video_filters)))
+
+            if ffmpeg_audio_filters:
+                generic_args.append("-filter:a")
+                generic_args.append(
+                    "\"{}\"".format(",".join(ffmpeg_audio_filters)))
+
+            for source, destination in transfers:
+                base_name = os.path.basename(destination)
+                file_name, ext = os.path.splitext(base_name)
+                dest_path = os.path.join(os.path.dirname(destination),
+                                         f"{file_name}.{out_extension}")
+                final_transfers.append((source, dest_path))
+
+                all_args = copy.deepcopy(generic_args)
+                all_args.append(f"-i {source}")
+                all_args.extend(ffmpeg_output_args)  # order matters
+                all_args.append(f"{dest_path}")
+                subprcs_cmd = " ".join(all_args)
+
+                # run subprocess
+                self.log.debug("Executing: {}".format(subprcs_cmd))
+                run_subprocess(subprcs_cmd, shell=True, logger=self.log)
+        return final_transfers
+
+    def _split_ffmpeg_args(self, in_args):
+        """Makes sure all entered arguments are separated in individual items.
+
+        Split each argument string with " -" to identify if string contains
+        one or more arguments.
+        """
+        splitted_args = []
+        for arg in in_args:
+            sub_args = arg.split(" -")
+            if len(sub_args) == 1:
+                if arg and arg not in splitted_args:
+                    splitted_args.append(arg)
+                continue
+
+            for idx, arg in enumerate(sub_args):
+                if idx != 0:
+                    arg = "-" + arg
+
+                if arg and arg not in splitted_args:
+                    splitted_args.append(arg)
+        return splitted_args
+
diff --git a/server_addon/traypublisher/server/settings/publish_plugins.py b/server_addon/traypublisher/server/settings/publish_plugins.py
index f413c86227..9869f54620 100644
--- a/server_addon/traypublisher/server/settings/publish_plugins.py
+++ b/server_addon/traypublisher/server/settings/publish_plugins.py
@@ -1,4 +1,11 @@
-from ayon_server.settings import BaseSettingsModel, SettingsField
+from pydantic import validator
+
+from ayon_server.settings import (
+    BaseSettingsModel,
+    SettingsField,
+    task_types_enum,
+    ensure_unique_names
+)
 
 
 class ValidatePluginModel(BaseSettingsModel):
@@ -14,6 +21,74 @@ class ValidateFrameRangeModel(ValidatePluginModel):
      'my_asset_to_publish.mov')"""
 
 
+class ExtractEditorialPckgFFmpegModel(BaseSettingsModel):
+    video_filters: list[str] = SettingsField(
+        default_factory=list,
+        title="Video filters"
+    )
+    audio_filters: list[str] = SettingsField(
+        default_factory=list,
+        title="Audio filters"
+    )
+    input: list[str] = SettingsField(
+        default_factory=list,
+        title="Input arguments"
+    )
+    output: list[str] = SettingsField(
+        default_factory=list,
+        title="Output arguments"
+    )
+
+
+class ExtractEditorialPckgOutputDefModel(BaseSettingsModel):
+    """Set extension and ffmpeg arguments. See `ExtractReview` for example."""
+    _layout = "expanded"
+    name: str = SettingsField("", title="Name")
+    ext: str = SettingsField("", title="Output extension")
+
+    ffmpeg_args: ExtractEditorialPckgFFmpegModel = SettingsField(
+        default_factory=ExtractEditorialPckgFFmpegModel,
+        title="FFmpeg arguments"
+    )
+
+
+class ExtractEditorialPckgProfileModel(BaseSettingsModel):
+    product_types: list[str] = SettingsField(
+        default_factory=list,
+        title="Product types"
+    )
+    task_types: list[str] = SettingsField(
+        default_factory=list,
+        title="Task types",
+        enum_resolver=task_types_enum
+    )
+    task_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Task names"
+    )
+    product_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Product names"
+    )
+    outputs: list[ExtractEditorialPckgOutputDefModel] = SettingsField(
+        default_factory=list,
+        title="Output Definitions",
+    )
+
+    @validator("outputs")
+    def validate_unique_outputs(cls, value):
+        ensure_unique_names(value)
+        return value
+
+
+class ExtractEditorialPckgConversionModel(BaseSettingsModel):
+    """Conversion of input movie files into expected format."""
+    enabled: bool = SettingsField(True)
+    profiles: list[ExtractEditorialPckgProfileModel] = SettingsField(
+        default_factory=list, title="Profiles"
+    )
+
+
 class TrayPublisherPublishPlugins(BaseSettingsModel):
     CollectFrameDataFromAssetEntity: ValidatePluginModel = SettingsField(
         default_factory=ValidatePluginModel,
@@ -28,6 +103,13 @@ class TrayPublisherPublishPlugins(BaseSettingsModel):
         default_factory=ValidatePluginModel,
     )
 
+    ExtractEditorialPckgConversion: ExtractEditorialPckgConversionModel = (
+        SettingsField(
+            default_factory=ExtractEditorialPckgConversionModel,
+            title="Extract Editorial Package Conversion"
+        )
+    )
+
 
 DEFAULT_PUBLISH_PLUGINS = {
     "CollectFrameDataFromAssetEntity": {
@@ -44,5 +126,10 @@ DEFAULT_PUBLISH_PLUGINS = {
         "enabled": True,
         "optional": True,
         "active": True
+    },
+    "ExtractEditorialPckgConversion": {
+        "enabled": True,
+        "optional": True,
+        "active": True
     }
 }

From c3910256b117487bff677ff81ef7b4c2c67a07a1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 7 May 2024 14:40:45 +0200
Subject: [PATCH 040/119] fix circular import

---
 client/ayon_core/pipeline/colorspace.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index e9da194984..705d1570b0 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -23,7 +23,6 @@ from ayon_core.pipeline.template_data import get_template_data
 from ayon_core.pipeline.load import get_representation_path_with_anatomy
 from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 
-from .context_tools import get_current_context, get_current_host_name
 
 log = Logger.get_logger(__name__)
 
@@ -765,8 +764,7 @@ def get_imageio_config(
 
     """
     if not anatomy_data:
-        from ayon_core.pipeline.context_tools import (
-            get_current_context_template_data)
+        from .context_tools import get_current_context_template_data
         anatomy_data = get_current_context_template_data()
 
     task_name = anatomy_data.get("task", {}).get("name")
@@ -1425,6 +1423,8 @@ def get_current_context_imageio_config_preset(
         dict: ImageIO config preset.
 
     """
+    from .context_tools import get_current_context, get_current_host_name
+
     context = get_current_context()
     host_name = get_current_host_name()
     return get_imageio_config_preset(

From 393897f2a9b2f4af3533ba2f6f00716d2de151d2 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 7 May 2024 18:08:55 +0200
Subject: [PATCH 041/119] don't change controller project on close

---
 client/ayon_core/tools/loader/ui/window.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/ayon_core/tools/loader/ui/window.py b/client/ayon_core/tools/loader/ui/window.py
index 3a6f4679fa..8529a53b06 100644
--- a/client/ayon_core/tools/loader/ui/window.py
+++ b/client/ayon_core/tools/loader/ui/window.py
@@ -335,9 +335,7 @@ class LoaderWindow(QtWidgets.QWidget):
 
     def closeEvent(self, event):
         super(LoaderWindow, self).closeEvent(event)
-        # Deselect project so current context will be selected
-        #   on next 'showEvent'
-        self._controller.set_selected_project(None)
+
         self._reset_on_show = True
 
     def keyPressEvent(self, event):

From 4d502a55481adbfdbd5fe06aeefe2f7ad14d381e Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 8 May 2024 21:42:04 +0800
Subject: [PATCH 042/119] add reset max file and clear undo buffer in the
 callback of starting new scene

---
 client/ayon_core/hosts/max/api/lib.py      |  3 ---
 client/ayon_core/hosts/max/api/pipeline.py | 11 +++++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/ayon_core/hosts/max/api/lib.py b/client/ayon_core/hosts/max/api/lib.py
index d9a3af3336..0e3abe25ec 100644
--- a/client/ayon_core/hosts/max/api/lib.py
+++ b/client/ayon_core/hosts/max/api/lib.py
@@ -6,12 +6,9 @@ import json
 from typing import Any, Dict, Union
 
 import six
-import ayon_api
 
 from ayon_core.pipeline import (
     get_current_project_name,
-    get_current_folder_path,
-    get_current_task_name,
     colorspace
 )
 from ayon_core.settings import get_project_settings
diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py
index dc13f47795..c6298bf590 100644
--- a/client/ayon_core/hosts/max/api/pipeline.py
+++ b/client/ayon_core/hosts/max/api/pipeline.py
@@ -52,11 +52,8 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
 
         self._has_been_setup = True
 
-        def context_setting():
-            return lib.set_context_setting()
-
         rt.callbacks.addScript(rt.Name('systemPostNew'),
-                               context_setting)
+                               on_post_open)
 
         rt.callbacks.addScript(rt.Name('filePostOpen'),
                                lib.check_colorspace)
@@ -163,6 +160,12 @@ def ls() -> list:
         yield lib.read(container)
 
 
+def on_post_open():
+    lib.set_context_setting()
+    rt.resetMaxFile(rt.Name("noPrompt"))
+    rt.clearUndoBuffer()
+
+
 def containerise(name: str, nodes: list, context,
                  namespace=None, loader=None, suffix="_CON"):
     data = {

From 7dadac74ac23db64d89512e792e7725d403a84f7 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 8 May 2024 21:50:43 +0800
Subject: [PATCH 043/119] restore unncessary change

---
 client/ayon_core/hosts/max/api/lib.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/ayon_core/hosts/max/api/lib.py b/client/ayon_core/hosts/max/api/lib.py
index 0e3abe25ec..d9a3af3336 100644
--- a/client/ayon_core/hosts/max/api/lib.py
+++ b/client/ayon_core/hosts/max/api/lib.py
@@ -6,9 +6,12 @@ import json
 from typing import Any, Dict, Union
 
 import six
+import ayon_api
 
 from ayon_core.pipeline import (
     get_current_project_name,
+    get_current_folder_path,
+    get_current_task_name,
     colorspace
 )
 from ayon_core.settings import get_project_settings

From d25e8f508eeef612f99cca12976774fd3e401c5f Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 8 May 2024 22:21:07 +0800
Subject: [PATCH 044/119] use on_new as name of the function

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

diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py
index c6298bf590..776565bade 100644
--- a/client/ayon_core/hosts/max/api/pipeline.py
+++ b/client/ayon_core/hosts/max/api/pipeline.py
@@ -52,8 +52,7 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
 
         self._has_been_setup = True
 
-        rt.callbacks.addScript(rt.Name('systemPostNew'),
-                               on_post_open)
+        rt.callbacks.addScript(rt.Name('systemPostNew'), on_new)
 
         rt.callbacks.addScript(rt.Name('filePostOpen'),
                                lib.check_colorspace)
@@ -160,7 +159,7 @@ def ls() -> list:
         yield lib.read(container)
 
 
-def on_post_open():
+def on_new():
     lib.set_context_setting()
     rt.resetMaxFile(rt.Name("noPrompt"))
     rt.clearUndoBuffer()

From 36cbdcfde77580e86a512b292603a5f810c8f77d Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 8 May 2024 22:56:26 +0800
Subject: [PATCH 045/119] only reset max file and clear undo buffer when there
 is unsaved change before starting new scene

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

diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py
index 776565bade..4782159ef8 100644
--- a/client/ayon_core/hosts/max/api/pipeline.py
+++ b/client/ayon_core/hosts/max/api/pipeline.py
@@ -161,8 +161,9 @@ def ls() -> list:
 
 def on_new():
     lib.set_context_setting()
-    rt.resetMaxFile(rt.Name("noPrompt"))
-    rt.clearUndoBuffer()
+    if rt.checkForSave():
+        rt.resetMaxFile(rt.Name("noPrompt"))
+        rt.clearUndoBuffer()
 
 
 def containerise(name: str, nodes: list, context,

From 46ed96cad8ac8fc34804bf52232fa302e1c39071 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Wed, 8 May 2024 23:10:44 +0800
Subject: [PATCH 046/119] add redraw views for new scene

---
 client/ayon_core/hosts/max/api/pipeline.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py
index 4782159ef8..d9cfc3407f 100644
--- a/client/ayon_core/hosts/max/api/pipeline.py
+++ b/client/ayon_core/hosts/max/api/pipeline.py
@@ -164,6 +164,7 @@ def on_new():
     if rt.checkForSave():
         rt.resetMaxFile(rt.Name("noPrompt"))
         rt.clearUndoBuffer()
+        rt.redrawViews()
 
 
 def containerise(name: str, nodes: list, context,

From 8b9a45e7152bb5c83d3eafaa11c466742ea1df2b Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 9 May 2024 15:20:56 +0800
Subject: [PATCH 047/119] color channel from baking write node should be
 aligning with that from the write node created from creator

---
 client/ayon_core/hosts/nuke/api/plugin.py                   | 3 +++
 .../ayon_core/hosts/nuke/plugins/publish/collect_writes.py  | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/client/ayon_core/hosts/nuke/api/plugin.py
index fb56dec833..02f41ff865 100644
--- a/client/ayon_core/hosts/nuke/api/plugin.py
+++ b/client/ayon_core/hosts/nuke/api/plugin.py
@@ -778,6 +778,7 @@ class ExporterReviewMov(ExporterReview):
         # deal with now lut defined in viewer lut
         self.viewer_lut_raw = klass.viewer_lut_raw
         self.write_colorspace = instance.data["colorspace"]
+        self.color_channels = instance.data["color_channels"]
 
         self.name = name or "baked"
         self.ext = ext or "mov"
@@ -947,6 +948,8 @@ class ExporterReviewMov(ExporterReview):
         self.log.debug("Path: {}".format(self.path))
         write_node["file"].setValue(str(self.path))
         write_node["file_type"].setValue(str(self.ext))
+        write_node["channels"].setValue(str(self.color_channels))
+
         # Knobs `meta_codec` and `mov64_codec` are not available on centos.
         # TODO shouldn't this come from settings on outputs?
         try:
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
index 745351dc49..27525bcad1 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
@@ -153,6 +153,9 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
         # Determine defined file type
         ext = write_node["file_type"].value()
 
+        # determine defined channel type
+        color_channels = write_node["channels"].value()
+
         # get frame range data
         handle_start = instance.context.data["handleStart"]
         handle_end = instance.context.data["handleEnd"]
@@ -172,7 +175,8 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             "path": write_file_path,
             "outputDir": output_dir,
             "ext": ext,
-            "colorspace": colorspace
+            "colorspace": colorspace,
+            "color_channels": color_channels
         })
 
         if product_type == "render":

From b7662645b5c980c09c599ce4d88ad03a77d0d00f Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 9 May 2024 16:15:30 +0200
Subject: [PATCH 048/119] Refactor indentation for better readability

Adjusted the indentation in a function to improve code clarity and readability.
---
 client/ayon_core/pipeline/colorspace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 705d1570b0..3503d0c534 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -873,7 +873,7 @@ def _get_global_config_data(
     product_entities_by_name = {
         product_entity["name"]: product_entity
         for product_entity in ayon_api.get_products(
-        project_name,
+            project_name,
             folder_ids={folder_id},
             product_name_regex=product_name,
             fields={"id", "name"}

From 9b2564cfd7049cbaff6670451c9cd6762023bb7f Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 9 May 2024 16:22:21 +0200
Subject: [PATCH 049/119] fixing settings type name key

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

diff --git a/server/settings/main.py b/server/settings/main.py
index c9c86bdd0d..97bd376f47 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -58,7 +58,7 @@ def _ocio_config_profile_types():
     return [
         {"value": "builtin_path", "label": "AYON built-in OCIO config"},
         {"value": "custom_path", "label": "Path to OCIO config"},
-        {"value": "product", "label": "Published product"},
+        {"value": "product_name", "label": "Published product"},
     ]
 
 

From f70bdc5795a698e8316b064a57720ddb8585ccb7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 9 May 2024 16:59:50 +0200
Subject: [PATCH 050/119] fix product name in base value

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

diff --git a/server/__init__.py b/server/__init__.py
index f6f89f2049..31a6e8dfca 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -39,7 +39,7 @@ class CoreAddon(BaseServerAddon):
         )
         base_value = {
             "type": "builtin_path",
-            "product": "",
+            "product_name": "",
             "host_names": [],
             "task_names": [],
             "task_types": [],

From bcd1e864c0b2507080521141c61adbc70c5b4fc8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 9 May 2024 17:00:04 +0200
Subject: [PATCH 051/119] use correct builtin path

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

diff --git a/server/__init__.py b/server/__init__.py
index 31a6e8dfca..50eda35c89 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -46,10 +46,13 @@ class CoreAddon(BaseServerAddon):
             "custom_path": "",
             "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio"
         }
-        if first_filepath not in (
+        if first_filepath in (
             "{BUILTIN_OCIO_ROOT}/aces_1.2/config.oci",
             "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio",
         ):
+            base_value["type"] = "builtin_path"
+            base_value["builtin_path"] = first_filepath
+        else:
             base_value["type"] = "custom_path"
             base_value["custom_path"] = first_filepath
 

From 925ff8b86f11e595be591b7458b28694608efb91 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 9 May 2024 17:04:09 +0200
Subject: [PATCH 052/119] fix value check

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

diff --git a/server/__init__.py b/server/__init__.py
index 50eda35c89..82473927b6 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -47,7 +47,7 @@ class CoreAddon(BaseServerAddon):
             "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio"
         }
         if first_filepath in (
-            "{BUILTIN_OCIO_ROOT}/aces_1.2/config.oci",
+            "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio",
             "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio",
         ):
             base_value["type"] = "builtin_path"

From 9570d92411dcd8efa97a93da61e34141a829f049 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 9 May 2024 18:10:58 +0200
Subject: [PATCH 053/119] change layout of profiles

---
 server/settings/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/settings/main.py b/server/settings/main.py
index 97bd376f47..d1cee32afa 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -77,6 +77,7 @@ def _ocio_built_in_paths():
 
 
 class CoreImageIOConfigProfilesModel(BaseSettingsModel):
+    _layout = "expanded"
     host_names: list[str] = SettingsField(
         default_factory=list,
         title="Host names"

From b7be1952e8533a6f794c7604ad4de939060a7495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Je=C5=BEek?= <jakubjezek001@gmail.com>
Date: Thu, 9 May 2024 20:24:54 +0200
Subject: [PATCH 054/119] Update
 client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 .../traypublisher/plugins/create/create_editorial_package.py     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
index 6a581b59d1..19ca032a0f 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
@@ -24,7 +24,6 @@ class EditorialPackageCreator(TrayPublishCreator):
     # Position batch creator after simple creators
     order = 120
 
-
     def get_icon(self):
         return "fa.folder"
 

From 4d737790de9d598f7a5b88e7e20b6ca6e738b444 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 9 May 2024 21:04:54 +0100
Subject: [PATCH 055/119] Working version

---
 client/ayon_core/hosts/nuke/api/plugin.py                | 9 +++++++--
 .../nuke/plugins/publish/extract_review_intermediates.py | 9 +++++++--
 server_addon/nuke/package.py                             | 2 +-
 server_addon/nuke/server/settings/publish_plugins.py     | 3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/client/ayon_core/hosts/nuke/api/plugin.py
index fb56dec833..ec256ea303 100644
--- a/client/ayon_core/hosts/nuke/api/plugin.py
+++ b/client/ayon_core/hosts/nuke/api/plugin.py
@@ -834,7 +834,7 @@ class ExporterReviewMov(ExporterReview):
         self.log.info("Nodes exported...")
         return path
 
-    def generate_mov(self, farm=False, **kwargs):
+    def generate_mov(self, farm=False, delete=True, **kwargs):
         # colorspace data
         colorspace = None
         # get colorspace settings
@@ -987,8 +987,13 @@ class ExporterReviewMov(ExporterReview):
             self.render(write_node.name())
 
         # ---------- generate representation data
+        tags = ["review", "need_thumbnail"]
+
+        if delete:
+            tags.append("delete")
+
         self.get_representation_data(
-            tags=["review", "need_thumbnail", "delete"] + add_tags,
+            tags=tags + add_tags,
             custom_tags=add_custom_tags,
             range=True,
             colorspace=colorspace
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
index 8d7a3ec311..82c7b6e4c5 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
@@ -136,11 +136,16 @@ class ExtractReviewIntermediates(publish.Extractor):
                     self, instance, o_name, o_data["extension"],
                     multiple_presets)
 
+                o_data["add_custom_tags"].append("intermediate")
+                delete = not o_data.get("publish", False)
+
                 if instance.data.get("farm"):
                     if "review" in instance.data["families"]:
                         instance.data["families"].remove("review")
 
-                    data = exporter.generate_mov(farm=True, **o_data)
+                    data = exporter.generate_mov(
+                        farm=True, delete=delete, **o_data
+                    )
 
                     self.log.debug(
                         "_ data: {}".format(data))
@@ -154,7 +159,7 @@ class ExtractReviewIntermediates(publish.Extractor):
                         "bakeWriteNodeName": data.get("bakeWriteNodeName")
                     })
                 else:
-                    data = exporter.generate_mov(**o_data)
+                    data = exporter.generate_mov(delete=delete, **o_data)
 
                 # add representation generated by exporter
                 generated_repres.extend(data["representations"])
diff --git a/server_addon/nuke/package.py b/server_addon/nuke/package.py
index bf03c4e7e7..e522b9fb5d 100644
--- a/server_addon/nuke/package.py
+++ b/server_addon/nuke/package.py
@@ -1,3 +1,3 @@
 name = "nuke"
 title = "Nuke"
-version = "0.1.11"
+version = "0.1.12"
diff --git a/server_addon/nuke/server/settings/publish_plugins.py b/server_addon/nuke/server/settings/publish_plugins.py
index d5b05d8715..e67f7be24f 100644
--- a/server_addon/nuke/server/settings/publish_plugins.py
+++ b/server_addon/nuke/server/settings/publish_plugins.py
@@ -125,6 +125,7 @@ class ReformatNodesConfigModel(BaseSettingsModel):
 
 class IntermediateOutputModel(BaseSettingsModel):
     name: str = SettingsField(title="Output name")
+    publish: bool = SettingsField(title="Publish")
     filter: BakingStreamFilterModel = SettingsField(
         title="Filter", default_factory=BakingStreamFilterModel)
     read_raw: bool = SettingsField(
@@ -346,6 +347,7 @@ DEFAULT_PUBLISH_PLUGIN_SETTINGS = {
         "outputs": [
             {
                 "name": "baking",
+                "publish": False,
                 "filter": {
                     "task_types": [],
                     "product_types": [],
@@ -401,6 +403,7 @@ DEFAULT_PUBLISH_PLUGIN_SETTINGS = {
         "outputs": [
             {
                 "name": "baking",
+                "publish": False,
                 "filter": {
                     "task_types": [],
                     "product_types": [],

From 2a675f51a6db20322b3e1d5e8f537723bc33154d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:38:16 +0200
Subject: [PATCH 056/119] AY-4801-simplified Settings

Got rid of profiles, didn't make much sense.
Git rid of multiple output definitions, didn't make sense with single otio file.
---
 .../server/settings/publish_plugins.py        | 44 +++----------------
 1 file changed, 7 insertions(+), 37 deletions(-)

diff --git a/server_addon/traypublisher/server/settings/publish_plugins.py b/server_addon/traypublisher/server/settings/publish_plugins.py
index 9869f54620..2afe20c865 100644
--- a/server_addon/traypublisher/server/settings/publish_plugins.py
+++ b/server_addon/traypublisher/server/settings/publish_plugins.py
@@ -41,9 +41,7 @@ class ExtractEditorialPckgFFmpegModel(BaseSettingsModel):
 
 
 class ExtractEditorialPckgOutputDefModel(BaseSettingsModel):
-    """Set extension and ffmpeg arguments. See `ExtractReview` for example."""
     _layout = "expanded"
-    name: str = SettingsField("", title="Name")
     ext: str = SettingsField("", title="Output extension")
 
     ffmpeg_args: ExtractEditorialPckgFFmpegModel = SettingsField(
@@ -52,40 +50,13 @@ class ExtractEditorialPckgOutputDefModel(BaseSettingsModel):
     )
 
 
-class ExtractEditorialPckgProfileModel(BaseSettingsModel):
-    product_types: list[str] = SettingsField(
-        default_factory=list,
-        title="Product types"
-    )
-    task_types: list[str] = SettingsField(
-        default_factory=list,
-        title="Task types",
-        enum_resolver=task_types_enum
-    )
-    task_names: list[str] = SettingsField(
-        default_factory=list,
-        title="Task names"
-    )
-    product_names: list[str] = SettingsField(
-        default_factory=list,
-        title="Product names"
-    )
-    outputs: list[ExtractEditorialPckgOutputDefModel] = SettingsField(
-        default_factory=list,
-        title="Output Definitions",
-    )
-
-    @validator("outputs")
-    def validate_unique_outputs(cls, value):
-        ensure_unique_names(value)
-        return value
-
-
 class ExtractEditorialPckgConversionModel(BaseSettingsModel):
-    """Conversion of input movie files into expected format."""
-    enabled: bool = SettingsField(True)
-    profiles: list[ExtractEditorialPckgProfileModel] = SettingsField(
-        default_factory=list, title="Profiles"
+    """Set output definition if resource files should be converted."""
+    conversion_enabled: bool = SettingsField(True,
+                                             title="Conversion enabled")
+    output: ExtractEditorialPckgOutputDefModel = SettingsField(
+        default_factory=ExtractEditorialPckgOutputDefModel,
+        title="Output Definitions",
     )
 
 
@@ -128,8 +99,7 @@ DEFAULT_PUBLISH_PLUGINS = {
         "active": True
     },
     "ExtractEditorialPckgConversion": {
-        "enabled": True,
-        "optional": True,
+        "optional": False,
         "active": True
     }
 }

From a1d310fad04e210ac1cf60c86473346c5a3061e4 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:39:07 +0200
Subject: [PATCH 057/119] AY-4801-exposed state of conversion from Settings in
 creator

Settings have toggle to on/off conversion, this is exposed for Artist to decide ad-hoc.
---
 .../create/create_editorial_package.py        | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
index 6a581b59d1..72a156dfb7 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
@@ -4,7 +4,12 @@ from ayon_core.pipeline import (
     CreatedInstance,
 )
 
-from ayon_core.lib.attribute_definitions import FileDef
+from ayon_core.lib.attribute_definitions import (
+    FileDef,
+    BoolDef,
+    TextDef,
+    HiddenDef
+)
 from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
 
 
@@ -24,6 +29,16 @@ class EditorialPackageCreator(TrayPublishCreator):
     # Position batch creator after simple creators
     order = 120
 
+    conversion_enabled = False
+
+    def apply_settings(self, project_settings):
+        self.conversion_enabled = (
+            project_settings["traypublisher"]
+                            ["publish"]
+                            ["ExtractEditorialPckgConversion"]
+                            ["conversion_enabled"]
+        )
+        print(project_settings)
 
     def get_icon(self):
         return "fa.folder"
@@ -34,8 +49,9 @@ class EditorialPackageCreator(TrayPublishCreator):
             return
 
         instance_data["creator_attributes"] = {
-            "path": (Path(folder_path["directory"]) /
-                     Path(folder_path["filenames"][0])).as_posix()
+            "folder_path": (Path(folder_path["directory"]) /
+                            Path(folder_path["filenames"][0])).as_posix(),
+            "conversion_enabled": pre_create_data["conversion_enabled"]
         }
 
         # Create new instance
@@ -53,7 +69,23 @@ class EditorialPackageCreator(TrayPublishCreator):
                 extensions=[],
                 allow_sequences=False,
                 label="Folder path"
-            )
+            ),
+            BoolDef("conversion_enabled",
+                    tooltip="Convert to output defined in Settings.",
+                    default=self.conversion_enabled,
+                    label="Convert resources"),
+        ]
+
+    def get_instance_attr_defs(self):
+        return [
+            TextDef(
+                "folder_path",
+                label="Folder path",
+                disabled=True
+            ),
+            BoolDef("conversion_enabled",
+                    tooltip="Convert to output defined in Settings.",
+                    label="Convert resources"),
         ]
 
     def get_detail_description(self):

From b55ed2e7869a508f33621b656cc03e23e8bd66d2 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:39:42 +0200
Subject: [PATCH 058/119] AY-4801-updated variable name

Old 'path' clashed in output of instance attributes in Publisher.
---
 .../traypublisher/plugins/publish/collect_editorial_package.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
index 101f58b6d1..cb1277546c 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_editorial_package.py
@@ -27,7 +27,7 @@ class CollectEditorialPackage(pyblish.api.InstancePlugin):
     families = ["editorial_pckg"]
 
     def process(self, instance):
-        folder_path = instance.data["creator_attributes"].get("path")
+        folder_path = instance.data["creator_attributes"]["folder_path"]
         if not folder_path or not os.path.exists(folder_path):
             self.log.info((
                 "Instance doesn't contain collected existing folder path."

From 663ace6c8f23ae8faf61408c761aed6457d4c100 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:40:44 +0200
Subject: [PATCH 059/119] AY-4801-conversion controlled by instance attribute

---
 .../plugins/publish/extract_editorial_pckg.py   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index 02f953d579..6b6f0bfe1d 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -45,14 +45,15 @@ class ExtractEditorialPckgConversion(publish.Extractor):
                                         publish_resource_folder)
 
         project_settings = instance.context.data["project_settings"]
-        profiles = (project_settings["traypublisher"]
-                                    ["publish"]
-                                    ["ExtractEditorialPckgConversion"]
-                                    .get("profiles"))
-        output_def = None
-        if profiles:
-            output_def = self._get_output_definition(instance, profiles)
-        if output_def:
+        output_def = (project_settings["traypublisher"]
+                                      ["publish"]
+                                      ["ExtractEditorialPckgConversion"]
+                                      ["output"])
+
+        conversion_enabled = (instance.data["creator_attributes"]
+                                           ["conversion_enabled"])
+
+        if conversion_enabled and output_def["ext"]:
             transfers = self._convert_resources(output_def, transfers)
 
         if not "transfers" in instance.data:

From 0a45c5f8fff5e1bae29cec10033cff3263cfc638 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:41:10 +0200
Subject: [PATCH 060/119] AY-4801-removed profile filtering

---
 .../plugins/publish/extract_editorial_pckg.py | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index 6b6f0bfe1d..e2eb4cb916 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -6,7 +6,7 @@ import opentimelineio
 
 import pyblish.api
 
-from ayon_core.lib import filter_profiles, get_ffmpeg_tool_args, run_subprocess
+from ayon_core.lib import  get_ffmpeg_tool_args, run_subprocess
 from ayon_core.pipeline import publish
 
 
@@ -81,26 +81,6 @@ class ExtractEditorialPckgConversion(publish.Extractor):
             os.makedirs(publish_resource_folder, exist_ok=True)
         return publish_resource_folder
 
-    def _get_output_definition(self, instance, profiles):
-        """Return appropriate profile by context information."""
-        product_type = instance.data["productType"]
-        product_name = instance.data["productName"]
-        task_entity = instance.data["taskEntity"] or {}
-        task_name = task_entity.get("name")
-        task_type = task_entity.get("taskType")
-        filtering_criteria = {
-            "product_types": product_type,
-            "product_names": product_name,
-            "task_names": task_name,
-            "task_types": task_type,
-        }
-        profile = filter_profiles(
-            profiles,
-            filtering_criteria,
-            logger=self.log
-        )
-        return profile
-
     def _get_resource_path_mapping(self, instance, transfers):
         """Returns dict of {source_mov_path: rootless_published_path}."""
         replace_paths = {}

From f8503aa5dc7b62e0d5fdd9d982dc55b1204b604a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:41:37 +0200
Subject: [PATCH 061/119] AY-4801-removed multiple output definitions

---
 .../plugins/publish/extract_editorial_pckg.py | 107 +++++++++---------
 1 file changed, 52 insertions(+), 55 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index e2eb4cb916..488b8e5a75 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -147,69 +147,66 @@ class ExtractEditorialPckgConversion(publish.Extractor):
 
     def _convert_resources(self, output_def, transfers):
         """Converts all resource files to configured format."""
-        outputs = output_def["outputs"]
-        if not outputs:
-            self.log.warning("No output configured in "
-               "ayon+settings://traypublisher/publish/ExtractEditorialPckgConversion/profiles/0/outputs")  # noqa
+        out_extension = output_def["ext"]
+        if not out_extension:
+            self.log.warning("No output extension configured in "
+               "ayon+settings://traypublisher/publish/ExtractEditorialPckgConversion")  # noqa
             return transfers
 
         final_transfers = []
-        # most likely only single output is expected
-        for output in outputs:
-            out_extension = output["ext"]
-            out_def_ffmpeg_args = output["ffmpeg_args"]
-            ffmpeg_input_args = [
-                value.strip()
-                for value in out_def_ffmpeg_args["input"]
-                if value.strip()
-            ]
-            ffmpeg_video_filters = [
-                value.strip()
-                for value in out_def_ffmpeg_args["video_filters"]
-                if value.strip()
-            ]
-            ffmpeg_audio_filters = [
-                value.strip()
-                for value in out_def_ffmpeg_args["audio_filters"]
-                if value.strip()
-            ]
-            ffmpeg_output_args = [
-                value.strip()
-                for value in out_def_ffmpeg_args["output"]
-                if value.strip()
-            ]
-            ffmpeg_input_args = self._split_ffmpeg_args(ffmpeg_input_args)
+        out_def_ffmpeg_args = output_def["ffmpeg_args"]
+        ffmpeg_input_args = [
+            value.strip()
+            for value in out_def_ffmpeg_args["input"]
+            if value.strip()
+        ]
+        ffmpeg_video_filters = [
+            value.strip()
+            for value in out_def_ffmpeg_args["video_filters"]
+            if value.strip()
+        ]
+        ffmpeg_audio_filters = [
+            value.strip()
+            for value in out_def_ffmpeg_args["audio_filters"]
+            if value.strip()
+        ]
+        ffmpeg_output_args = [
+            value.strip()
+            for value in out_def_ffmpeg_args["output"]
+            if value.strip()
+        ]
+        ffmpeg_input_args = self._split_ffmpeg_args(ffmpeg_input_args)
 
-            generic_args = [
-                subprocess.list2cmdline(get_ffmpeg_tool_args("ffmpeg"))
-            ]
-            generic_args.extend(ffmpeg_input_args)
-            if ffmpeg_video_filters:
-                generic_args.append("-filter:v")
-                generic_args.append(
-                    "\"{}\"".format(",".join(ffmpeg_video_filters)))
+        generic_args = [
+            subprocess.list2cmdline(get_ffmpeg_tool_args("ffmpeg"))
+        ]
+        generic_args.extend(ffmpeg_input_args)
+        if ffmpeg_video_filters:
+            generic_args.append("-filter:v")
+            generic_args.append(
+                "\"{}\"".format(",".join(ffmpeg_video_filters)))
 
-            if ffmpeg_audio_filters:
-                generic_args.append("-filter:a")
-                generic_args.append(
-                    "\"{}\"".format(",".join(ffmpeg_audio_filters)))
+        if ffmpeg_audio_filters:
+            generic_args.append("-filter:a")
+            generic_args.append(
+                "\"{}\"".format(",".join(ffmpeg_audio_filters)))
 
-            for source, destination in transfers:
-                base_name = os.path.basename(destination)
-                file_name, ext = os.path.splitext(base_name)
-                dest_path = os.path.join(os.path.dirname(destination),
-                                         f"{file_name}.{out_extension}")
-                final_transfers.append((source, dest_path))
+        for source, destination in transfers:
+            base_name = os.path.basename(destination)
+            file_name, ext = os.path.splitext(base_name)
+            dest_path = os.path.join(os.path.dirname(destination),
+                                     f"{file_name}.{out_extension}")
+            final_transfers.append((source, dest_path))
 
-                all_args = copy.deepcopy(generic_args)
-                all_args.append(f"-i {source}")
-                all_args.extend(ffmpeg_output_args)  # order matters
-                all_args.append(f"{dest_path}")
-                subprcs_cmd = " ".join(all_args)
+            all_args = copy.deepcopy(generic_args)
+            all_args.append(f"-i {source}")
+            all_args.extend(ffmpeg_output_args)  # order matters
+            all_args.append(f"{dest_path}")
+            subprcs_cmd = " ".join(all_args)
 
-                # run subprocess
-                self.log.debug("Executing: {}".format(subprcs_cmd))
-                run_subprocess(subprcs_cmd, shell=True, logger=self.log)
+            # run subprocess
+            self.log.debug("Executing: {}".format(subprcs_cmd))
+            run_subprocess(subprcs_cmd, shell=True, logger=self.log)
         return final_transfers
 
     def _split_ffmpeg_args(self, in_args):

From ba0918964f3766465104d278489d49bad7585233 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 14:41:57 +0200
Subject: [PATCH 062/119] AY-4801-updated validation message

---
 .../plugins/publish/extract_editorial_pckg.py             | 8 +++++---
 .../plugins/publish/validate_editorial_package.py         | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index 488b8e5a75..d25a7146a0 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -111,9 +111,11 @@ class ExtractEditorialPckgConversion(publish.Extractor):
                     if not target_url:
                         continue
                     file_name = os.path.basename(target_url)
-                    replace_value = replace_paths.get(file_name)
-                    if replace_value:
-                        clip.media_reference.target_url = replace_value
+                    replace_path = replace_paths.get(file_name)
+                    if replace_path:
+                        clip.media_reference.target_url = replace_path
+                        if clip.name == file_name:
+                            clip.name = os.path.basename(replace_path)
 
         return otio_data
 
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
index 869dc73811..ce545610ea 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
@@ -47,8 +47,9 @@ class ValidateEditorialPackage(pyblish.api.InstancePlugin):
                 missing_files.add(target_basename)
 
         if missing_files:
-            raise PublishValidationError("Otio file contains missing files "
-                                         f"'{missing_files}'.")
+            raise PublishValidationError(
+                "Otio file contains missing files `{missing_files}`.\n\n"
+                f"Please add them to `{folder_path}` and republish.")
 
         instance.data["editorial_pckg"]["otio_data"] = otio_data
 

From 4cfc90bbb3b7bf97315b993028edc201280fabe4 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Fri, 10 May 2024 16:29:56 +0300
Subject: [PATCH 063/119] Add OPMenu Stencil

---
 .../hosts/houdini/startup/OPmenu.xml          | 528 ++++++++++++++++++
 1 file changed, 528 insertions(+)
 create mode 100644 client/ayon_core/hosts/houdini/startup/OPmenu.xml

diff --git a/client/ayon_core/hosts/houdini/startup/OPmenu.xml b/client/ayon_core/hosts/houdini/startup/OPmenu.xml
new file mode 100644
index 0000000000..bdb559a084
--- /dev/null
+++ b/client/ayon_core/hosts/houdini/startup/OPmenu.xml
@@ -0,0 +1,528 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- OPMenu Stencil.
+    It's used to extend the OPMenu while keeping the order of the menu items.
+-->
+
+
+<!--
+    This file defines the menu items when right-clicking over nodes in
+    Houdini.
+
+    Files named the same (ie. OPmenu.xml) can exist in $HOME/houdiniX.Y/
+    directory and will supplement the original definitions found in
+    $HFS/houdini/ (aka $HH).
+
+    The format in this file is similar to the format in $HH/MainMenuMaster
+    except that it uses the <menuDocument> and <menu> tags instead of
+    <mainMenu> and <menuBar>. See the comments in that file for more advanced
+    customization abilities.
+
+    Note that the id's correspond to their hotkeys with the h.pane.wsheet.
+    prefix (where available). For example, the item with id,
+    "opmenu.flag_display", refers to the action in the hotkeys manager as
+    "h.pane.wsheet.opmenu.flag_display".
+
+    Also note that you can specify which context a particular menu item shows
+    up in. To do this, add a context property:
+        <context>
+            <networkCategory>Object</networkCategory>
+        </context>
+    Or, for multiple contexts, a comma-separated list:
+        <context>
+            <networkCategory>Object,Sop,Dop</networkCategory>
+        </context>
+    Or use an expression to determine if the menu item appears in the current
+    context.  For example, to make the menu item appear only if the node is an
+    Object node:
+        <context>
+            <expression>kwargs["node"].type().category().name() == "Object"</expression>
+        </context>
+
+    For context expressions and menu scripts, a 'kwargs' python dictionary is
+    provided with the following values:
+        'node'      :   The node that the menu was opened for.
+        'toolname'  :   The menu item's hotkey id (ie. the element's id
+                        prefixed with h.pane.parms.)
+        'altclick'  :   True if the Alt key was also pressed, False otherwise
+        'ctrlclick' :   True if the Ctrl key was also pressed, False otherwise
+        'shiftclick':   True if the Shift key was also pressed, False otherwise
+        'cmdclick'  :   True if the Option key was also pressed, False
+                        otherwise. Note that this can only be true on OSX.
+-->
+
+<menuDocument>
+    <!-- menuDocument can only contain 1 menu element, whose id is
+         implicitly "root_menu"
+      -->
+    <menu>
+
+        <!-- This item appears at the top of the menu when you right-click an
+        "example" subnet -->
+
+        <!--
+        <scriptItem>
+            <label>Save Node Example...</label>
+            <context>
+                <expression>kwargs['node'].userData("__example_for") is not None</expression>
+            </context>
+            <scriptCode><![CDATA[
+from houdinihelp import examples
+examples.save_node_example(kwargs['node'])
+]]></scriptCode>
+        </scriptItem>
+        -->
+
+        <!-- Node flags submenu. -->
+        <subMenu id="opmenu.flags_menu">
+            <actionItem id="opmenu.flag_display">
+            </actionItem>
+            <actionItem id="opmenu.flag_select">
+            </actionItem>
+            <actionItem id="opmenu.flag_origin">
+            </actionItem>
+            <actionItem id="opmenu.flag_xray">
+            </actionItem>
+            <actionItem id="opmenu.flag_render">
+            </actionItem>
+            <actionItem id="opmenu.flag_output">
+            </actionItem>
+            <actionItem id="opmenu.flag_template">
+            </actionItem>
+            <actionItem id="opmenu.flag_footprint">
+            </actionItem>
+            <subMenu id="opmenu.flags_outputforview_menu">
+                <actionItem id="opmenu.flag_outputforview_0">
+                </actionItem>
+                <actionItem id="opmenu.flag_outputforview_1">
+                </actionItem>
+                <actionItem id="opmenu.flag_outputforview_2">
+                </actionItem>
+                <actionItem id="opmenu.flag_outputforview_3">
+                </actionItem>
+            </subMenu>
+
+            <actionItem id="opmenu.flag_highlight">
+            </actionItem>
+            <actionItem id="opmenu.flag_unload">
+            </actionItem>
+            <actionItem id="opmenu.flag_export">
+            </actionItem>
+            <actionItem id="opmenu.flag_lock">
+            </actionItem>
+            <actionItem id="opmenu.flag_thumbnail">
+            </actionItem>
+            <actionItem id="opmenu.flag_bypass">
+            </actionItem>
+            <actionItem id="opmenu.flag_hidden">
+            </actionItem>
+            <actionItem id="opmenu.flag_displaydescriptivename">
+            </actionItem>
+            <actionItem id="opmenu.flag_displaycomment">
+            </actionItem>
+            <actionItem id="opmenu.flag_expose">
+            </actionItem>
+
+            <separatorItem/>
+
+            <actionItem id="opmenu.takedisplay">
+            </actionItem>
+            <actionItem id="opmenu.takeoutput">
+            </actionItem>
+            <actionItem id="opmenu.takebypass">
+            </actionItem>
+        </subMenu>
+
+        <!-- Actions submenu. -->
+        <subMenu id="opmenu.actions_menu">
+            <actionItem id="opmenu.select_node">
+            </actionItem>
+            <actionItem id="opmenu.use_default_color">
+            </actionItem>
+            <actionItem id="opmenu.use_default_shape">
+            </actionItem>
+            <actionItem id="collapse">
+            </actionItem>
+            <actionItem id="collapse_to_material">
+            </actionItem>
+            <actionItem id="opmenu.extract">
+            </actionItem>
+            <actionItem id="opmenu.refcopy">
+            </actionItem>
+            <actionItem id="opmenu.change_type">
+            </actionItem>
+            <separatorItem/>
+            <actionItem id="delete">
+            </actionItem>
+            <scriptItem>
+            </scriptItem>
+        </subMenu>
+        <!-- End actions submenu -->
+
+        <!-- LOP actions submenu. -->
+    <subMenu id="opmenu.lop_options_menu">
+        <scriptItem id="opmenu.select_modified_prims">
+        </scriptItem>
+        <scriptItem id="opmenu.inspect_stage">
+        </scriptItem>
+        <scriptItem id="opmenu.inspect_active_layer">
+        </scriptItem>
+        <scriptItem id="opmenu.inspect_layers">
+        </scriptItem>
+        <separatorItem/>
+        <scriptItem id="opmenu.create_lop_activationparm">
+        </scriptItem>
+        <scriptItem id="opmenu.remove_lop_activationparm">
+        </scriptItem>
+    </subMenu>
+    <!-- End LOP actions menu -->
+
+        <!-- Asset examples submenu -->
+        <!--
+        <subMenu id="opmenu.examples_menu">
+            <label>Examples</label>
+            <context>
+                <expression><![CDATA[
+from houdinihelp import examples
+return (
+    examples.has_examples(kwargs['node']) or
+    examples.can_have_example(kwargs['node'])
+)
+]]></expression>
+            </context>
+
+            <scriptItem id="h.panes.wsheet.addnodeexample">
+                <label>Create Example for This Node</label>
+                <context>
+                    <expression><![CDATA[
+from houdinihelp import examples
+return examples.can_have_example(kwargs['node'])
+]]></expression>
+                </context>
+                <scriptCode><![CDATA[
+from houdinihelp import examples
+examples.start_node_example(kwargs['node'], alt=kwargs['altclick'])
+]]></scriptCode>
+            </scriptItem>
+
+            <separatorItem/>
+
+            <scriptMenuStripDynamic>
+                <contentsScriptCode><![CDATA[
+from houdinihelp import examples
+return examples.examples_menu(kwargs['node'])
+]]></contentsScriptCode>
+                <scriptCode><![CDATA[
+from houdinihelp import examples
+examples.load_token(kwargs['selectedtoken'], kwargs['node'], shift=kwargs['shiftclick'], alt=kwargs['altclick'])
+]]></scriptCode>
+            </scriptMenuStripDynamic>
+        </subMenu>
+        -->
+        <!-- End examples submenu -->
+
+
+        <actionItem id="jump">
+        </actionItem>
+
+        <separatorItem/>
+
+        <subMenu id="opmenu.preview_menu">
+            <actionItem id="opmenu.preview_icon">
+            </actionItem>
+            <actionItem id="opmenu.preview_quarter">
+            </actionItem>
+            <actionItem id="opmenu.preview_half">
+            </actionItem>
+            <actionItem id="opmenu.preview_full">
+            </actionItem>
+        </subMenu>
+        <actionItem id="opmenu.flipbook">
+        </actionItem>
+
+        <scriptItem id="opmenu.generate_static">
+        </scriptItem>
+        <scriptItem id="opmenu.cook_output_node">
+        </scriptItem>
+        <scriptItem id="opmenu.dirty_all">
+        </scriptItem>
+        <scriptItem id="opmenu.cancel_cook">
+        </scriptItem>
+        <scriptItem id="opmenu.generate_node">
+        </scriptItem>
+        <scriptItem id="opmenu.generate_node_static">
+        </scriptItem>
+  <scriptItem id="cook_selected_node">
+  </scriptItem>
+  <scriptItem id="cancel_node">
+  </scriptItem>
+  <separatorItem/>
+        <scriptItem id="dirty_node">
+        </scriptItem>
+  <scriptItem id="dirty_cook_selected_node">
+  </scriptItem>
+  <scriptItem id="dirty_clean_node">
+  </scriptItem>
+  <scriptItem id="clean_temp_dir">
+  </scriptItem>
+  <scriptItem id="set_default_scheduler">
+  </scriptItem>
+  <scriptItem id="open_temp_directory">
+  </scriptItem>
+  <separatorItem/>
+        <scriptItem id="opmenu.open_task_graph_table">
+        </scriptItem>
+<separatorItem/>
+        <subMenu id="opmenu.parms_and_channels_menu">
+            <actionItem id="opmenu.parameters">
+            </actionItem>
+            <actionItem id="opmenu.promotematerial">
+            </actionItem>
+            <separatorItem/>
+            <actionItem id="opmenu.create_channel_groups">
+            </actionItem>
+            <actionItem id="opmenu.scope_channels">
+            </actionItem>
+            <actionItem id="opmenu.delete_channels">
+            </actionItem>
+            <separatorItem/>
+            <!--
+                Please do not move Edit Parameter Interface... above Type
+                Properties...  This was done twice in the past and each time we
+                found the location to be problematic so we moved it back to the
+                middle of the menu.
+            -->
+            <actionItem id="opmenu.spareparms">
+            </actionItem>
+        </subMenu>
+
+        <!-- VOP options submenu. -->
+        <subMenu id="opmenu.vop_options_menu">
+            <actionItem id="opmenu.vn_view_code">
+            </actionItem>
+        <actionItem id="opmenu.edit_vop_network">
+        </actionItem>
+            <actionItem id="opmenu.creator">
+            </actionItem>
+            <separatorItem/>
+            <actionItem id="opmenu.vn_create_shop">
+            </actionItem>
+            <actionItem id="opmenu.vn_save_context_op">
+            </actionItem>
+            <actionItem id="opmenu.vn_create_vop_type">
+            </actionItem>
+            <actionItem id="opmenu.vn_convert_to_type">
+
+            </actionItem>
+            <separatorItem/>
+            <actionItem id="opmenu.parm_definer">
+            </actionItem>
+            <separatorItem/>
+            <subMenu id="opmenu.lod_menu">
+                <actionItem id="opmenu.flag_lodlow">
+                </actionItem>
+                <actionItem id="opmenu.flag_lodmed">
+                </actionItem>
+                <actionItem id="opmenu.flag_lodhigh">
+                </actionItem>
+            </subMenu>
+            <actionItem id="opmenu.collapse_input_groups">
+            </actionItem>
+            <actionItem id="opmenu.expand_input_groups">
+            </actionItem>
+            <separatorItem/>
+            <actionItem id="opmenu.create_parms">
+            </actionItem>
+            <actionItem id="opmenu.create_subnet_inputs">
+            </actionItem>
+            <actionItem id="opmenu.create_consts">
+            </actionItem>
+            <separatorItem/>
+            <actionItem id="opmenu.create_output_bindings">
+            </actionItem>
+            <actionItem id="opmenu.create_subnet_outputs">
+            </actionItem>
+        </subMenu>
+
+        <actionItem id="opmenu.preview">
+        </actionItem>
+        <actionItem id="opmenu.spreadsheet">
+        </actionItem>
+
+        <scriptItem id="opmenu.extended_info">
+        </scriptItem>
+        <actionItem id="opmenu.view_deps">
+        </actionItem>
+        <actionItem id="opmenu.edit_comment">
+        </actionItem>
+
+        <!-- Save options. -->
+        <subMenu id="opmenu.save_menu">
+        <actionItem id="opmenu.save_geometry">
+        </actionItem>
+        <scriptItem id="opmenu.save_stage">
+        </scriptItem>
+        <scriptItem id="opmenu.save_active_layer">
+        </scriptItem>
+        <scriptItem id="opmenu.save_materialx">
+        </scriptItem>
+        <actionItem id="opmenu.vn_save_code">
+        </actionItem>
+        <actionItem id="opmenu.save_texture">
+        </actionItem>
+        <actionItem id="opmenu.save_image">
+        </actionItem>
+        <actionItem id="opmenu.save_lut">
+        </actionItem>
+            <actionItem id="opmenu.save_data">
+            </actionItem>
+            <actionItem id="opmenu.edit_data">
+            </actionItem>
+        <actionItem id="opmenu.save_to_gallery">
+        </actionItem>
+        </subMenu>
+
+        <separatorItem/>
+
+        <!-- Chop options. -->
+            <actionItem id="opmenu.set_scope">
+            </actionItem>
+            <actionItem id="opmenu.add_to_scope">
+            </actionItem>
+
+        <separatorItem/>
+
+        <!-- Input and output option submenus. -->
+        <subMenu id="opmenu.inputs_menu">
+            <actionItem id="opmenu.hide_inputs">
+            </actionItem>
+            <actionItem id="opmenu.expose_inputs">
+            </actionItem>
+            <actionItem id="opmenu.select_inputs">
+            </actionItem>
+            <scriptItem id="opmenu.select_input_parameters">
+            </scriptItem>
+        </subMenu>
+        <subMenu id="opmenu.outputs_menu">
+            <actionItem id="opmenu.hide_outputs">
+            </actionItem>
+            <actionItem id="opmenu.expose_outputs">
+            </actionItem>
+            <actionItem id="opmenu.select_outputs">
+            </actionItem>
+            <actionItem id="opmenu.collapse_outputs">
+            </actionItem>
+        </subMenu>
+
+        <separatorItem/>
+
+        <subMenu id="opmenu.character_tools_menu">
+            <actionItem id="opmenu.charpicker">
+            </actionItem>
+            <actionItem id="opmenu.poselibrary">
+            </actionItem>
+        </subMenu>
+        <separatorItem/>
+
+        <actionItem id="opmenu.help">
+        </actionItem>
+
+        <separatorItem/>
+
+        <!-- Operator type and asset options. -->
+        <subMenu id="opmenu.vhda_options_create">
+                <scriptItem id="opmenu.vhda_create">
+                </scriptItem>
+                <separatorItem/>
+                <scriptItem id="opmenu.vhda_prefcreate">
+                </scriptItem>
+        </subMenu>
+
+
+        <actionItem id="opmenu.unsynchronize">
+        </actionItem>
+        <actionItem id="opmenu.synchronize">
+        </actionItem>
+
+        <actionItem id="opmenu.diff">
+        </actionItem>
+
+        <subMenu id="opmenu.vhda_options">
+            <scriptItem id="opmenu.vhda_save_as">
+            </scriptItem>
+            <separatorItem/>
+            <scriptItem id="opmenu.vhda_bump_major">
+            </scriptItem>
+            <scriptItem id="opmenu.vhda_bump_minor">
+            </scriptItem>
+            <separatorItem/>
+            <scriptItem id="opmenu.vhda_pref">
+            </scriptItem>
+        </subMenu>
+
+        <actionItem id="opmenu.saveoptype">
+        </actionItem>
+
+        <separatorItem/>
+
+        <!--
+        <subMenu>
+            <label>Donut</label>
+
+            <titleItem>
+                <label>Node Macros</label>
+            </titleItem>
+            <scriptMenuStripDynamic id="dynamic_node_macros">
+                <contentsScriptCode><![CDATA[
+from nodemacros.ui import houdiniStorage
+return houdiniStorage().menuFor(kwargs["node"])
+]]>
+                </contentsScriptCode>
+                <scriptCode><![CDATA[
+from nodemacros.ui import houdiniStorage
+houdiniStorage().applyMacro(kwargs["selectedtoken"], kwargs["node"])
+]]>
+               </scriptCode>
+            </scriptMenuStripDynamic>
+
+            <separatorItem/>
+
+            <scriptItem id="save_cluster_macro">
+                <label>Save Selected Item(s) as Macro....</label>
+                <scriptCode><![CDATA[
+from nodemacros import ui
+ui.showMacroEditorForItems(kwargs["items"], kwargs["node"])
+]]>
+                </scriptCode>
+            </scriptItem>
+
+            <scriptItem id="edit_macro_list">
+                <label>Edit Macro List</label>
+                <scriptCode><![CDATA[
+from nodemacros.manager import showMacroManager
+showMacroManager()
+]]>
+                </scriptCode>
+            </scriptItem>
+
+            <scriptItem id="macro_help">
+                <label>Donut Help</label>
+                <scriptCode><![CDATA[
+from nodemacros.ui import MACRO_HELP_PATH
+hou.ui.curDesktop().displayHelpPath(MACRO_HELP_PATH)
+]]>
+                </scriptCode>
+            </scriptItem>
+        </subMenu>
+
+        <separatorItem/>
+        -->
+
+        <actionItem id="opmenu.optypemanager">
+        </actionItem>
+        <actionItem id="opmenu.properties">
+        </actionItem>
+
+        <menuStripDynamic id="custom_hscript">
+        </menuStripDynamic>
+    </menu>
+</menuDocument>

From 2c12a540c184b7d7323bdf5306d3dbae9031a787 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Fri, 10 May 2024 16:36:18 +0300
Subject: [PATCH 064/119] update OPMenu: add 'Create New (AYON)...' script item

---
 client/ayon_core/hosts/houdini/startup/OPmenu.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/client/ayon_core/hosts/houdini/startup/OPmenu.xml b/client/ayon_core/hosts/houdini/startup/OPmenu.xml
index bdb559a084..0d58cf53fe 100644
--- a/client/ayon_core/hosts/houdini/startup/OPmenu.xml
+++ b/client/ayon_core/hosts/houdini/startup/OPmenu.xml
@@ -432,6 +432,21 @@ examples.load_token(kwargs['selectedtoken'], kwargs['node'], shift=kwargs['shift
         <subMenu id="opmenu.vhda_options_create">
                 <scriptItem id="opmenu.vhda_create">
                 </scriptItem>
+                <scriptItem id="opmenu.vhda_create_ayon">
+                    <label>Create New (AYON)...</label>
+                    <context>
+                    </context>
+                    <scriptCode>
+<![CDATA[
+from ayon_core.hosts.houdini.api.creator_node_shelves import create_interactive
+
+node = kwargs["node"]
+if node not in hou.selectedNodes():
+    node.setSelected(True)
+create_interactive("io.openpype.creators.houdini.hda", **kwargs)
+]]>
+                     </scriptCode>
+                </scriptItem>
                 <separatorItem/>
                 <scriptItem id="opmenu.vhda_prefcreate">
                 </scriptItem>

From 171ecf2be41c9d6e13e862b7479713d5f3ce221e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 15:53:50 +0200
Subject: [PATCH 065/119] AY-4801-bump up version of OpenTimelineIO

---
 client/pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/pyproject.toml b/client/pyproject.toml
index 1a0ad7e5f2..5e811321f8 100644
--- a/client/pyproject.toml
+++ b/client/pyproject.toml
@@ -16,7 +16,7 @@ aiohttp_json_rpc = "*" # TVPaint server
 aiohttp-middlewares = "^2.0.0"
 wsrpc_aiohttp = "^3.1.1" # websocket server
 Click = "^8"
-OpenTimelineIO = "0.14.1"
+OpenTimelineIO = "0.16.0"
 opencolorio = "2.2.1"
 Pillow = "9.5.0"
 pynput = "^1.7.2" # Timers manager - TODO remove

From c976261786de427ba2cff49afee44d5a6e28c99e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 16:04:02 +0200
Subject: [PATCH 066/119] AY-4801-added default setting to .mp4 conversion

---
 .../server/settings/publish_plugins.py          | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/server_addon/traypublisher/server/settings/publish_plugins.py b/server_addon/traypublisher/server/settings/publish_plugins.py
index 2afe20c865..dc659f6110 100644
--- a/server_addon/traypublisher/server/settings/publish_plugins.py
+++ b/server_addon/traypublisher/server/settings/publish_plugins.py
@@ -100,6 +100,21 @@ DEFAULT_PUBLISH_PLUGINS = {
     },
     "ExtractEditorialPckgConversion": {
         "optional": False,
-        "active": True
+        "conversion_enabled": True,
+        "output": {
+            "ext": "",
+            "ffmpeg_args": {
+              "video_filters": [],
+              "audio_filters": [],
+              "input": [
+                "-apply_trc gamma22"
+              ],
+              "output": [
+                "-pix_fmt yuv420p",
+                "-crf 18",
+                "-intra"
+              ]
+            }
+        }
     }
 }

From e19986a792972962be07d060249cfe3c56764ca3 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 10 May 2024 16:26:10 +0200
Subject: [PATCH 067/119] AY-4801-bump up version of traypublisher package

---
 server_addon/traypublisher/package.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_addon/traypublisher/package.py b/server_addon/traypublisher/package.py
index 4ca8ae9fd3..c138a2296d 100644
--- a/server_addon/traypublisher/package.py
+++ b/server_addon/traypublisher/package.py
@@ -1,3 +1,3 @@
 name = "traypublisher"
 title = "TrayPublisher"
-version = "0.1.4"
+version = "0.1.5"

From 922db60bd031f5a071c5de84b595e9a7a6d5bab2 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Fri, 10 May 2024 17:18:36 +0200
Subject: [PATCH 068/119] Add quotes to file paths in
 ExtractEditorialPckgConversion, improve error message handling in
 ValidateEditorialPackage.

---
 .../traypublisher/plugins/publish/extract_editorial_pckg.py  | 5 ++---
 .../plugins/publish/validate_editorial_package.py            | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index d25a7146a0..a4d8d2c6fb 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -201,9 +201,9 @@ class ExtractEditorialPckgConversion(publish.Extractor):
             final_transfers.append((source, dest_path))
 
             all_args = copy.deepcopy(generic_args)
-            all_args.append(f"-i {source}")
+            all_args.append(f"-i \"{source}\"")
             all_args.extend(ffmpeg_output_args)  # order matters
-            all_args.append(f"{dest_path}")
+            all_args.append(f"\"{dest_path}\"")
             subprcs_cmd = " ".join(all_args)
 
             # run subprocess
@@ -232,4 +232,3 @@ class ExtractEditorialPckgConversion(publish.Extractor):
                 if arg and arg not in splitted_args:
                     splitted_args.append(arg)
         return splitted_args
-
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
index ce545610ea..89594ce441 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
@@ -48,7 +48,7 @@ class ValidateEditorialPackage(pyblish.api.InstancePlugin):
 
         if missing_files:
             raise PublishValidationError(
-                "Otio file contains missing files `{missing_files}`.\n\n"
+                f"Otio file contains missing files `{missing_files}`.\n\n"
                 f"Please add them to `{folder_path}` and republish.")
 
         instance.data["editorial_pckg"]["otio_data"] = otio_data
@@ -67,5 +67,3 @@ class ValidateEditorialPackage(pyblish.api.InstancePlugin):
                         target_urls.append(target_url)
 
         return target_urls
-
-

From 86b2f3b5b52431f6cb11b91e771552c717fa6df8 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Fri, 10 May 2024 18:45:15 +0300
Subject: [PATCH 069/119] remove redundant elements

---
 .../hosts/houdini/startup/OPmenu.xml          | 520 +-----------------
 1 file changed, 3 insertions(+), 517 deletions(-)

diff --git a/client/ayon_core/hosts/houdini/startup/OPmenu.xml b/client/ayon_core/hosts/houdini/startup/OPmenu.xml
index 0d58cf53fe..0a7b265fa1 100644
--- a/client/ayon_core/hosts/houdini/startup/OPmenu.xml
+++ b/client/ayon_core/hosts/houdini/startup/OPmenu.xml
@@ -1,438 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- OPMenu Stencil.
-    It's used to extend the OPMenu while keeping the order of the menu items.
--->
-
-
-<!--
-    This file defines the menu items when right-clicking over nodes in
-    Houdini.
-
-    Files named the same (ie. OPmenu.xml) can exist in $HOME/houdiniX.Y/
-    directory and will supplement the original definitions found in
-    $HFS/houdini/ (aka $HH).
-
-    The format in this file is similar to the format in $HH/MainMenuMaster
-    except that it uses the <menuDocument> and <menu> tags instead of
-    <mainMenu> and <menuBar>. See the comments in that file for more advanced
-    customization abilities.
-
-    Note that the id's correspond to their hotkeys with the h.pane.wsheet.
-    prefix (where available). For example, the item with id,
-    "opmenu.flag_display", refers to the action in the hotkeys manager as
-    "h.pane.wsheet.opmenu.flag_display".
-
-    Also note that you can specify which context a particular menu item shows
-    up in. To do this, add a context property:
-        <context>
-            <networkCategory>Object</networkCategory>
-        </context>
-    Or, for multiple contexts, a comma-separated list:
-        <context>
-            <networkCategory>Object,Sop,Dop</networkCategory>
-        </context>
-    Or use an expression to determine if the menu item appears in the current
-    context.  For example, to make the menu item appear only if the node is an
-    Object node:
-        <context>
-            <expression>kwargs["node"].type().category().name() == "Object"</expression>
-        </context>
-
-    For context expressions and menu scripts, a 'kwargs' python dictionary is
-    provided with the following values:
-        'node'      :   The node that the menu was opened for.
-        'toolname'  :   The menu item's hotkey id (ie. the element's id
-                        prefixed with h.pane.parms.)
-        'altclick'  :   True if the Alt key was also pressed, False otherwise
-        'ctrlclick' :   True if the Ctrl key was also pressed, False otherwise
-        'shiftclick':   True if the Shift key was also pressed, False otherwise
-        'cmdclick'  :   True if the Option key was also pressed, False
-                        otherwise. Note that this can only be true on OSX.
+    It's used to extend the OPMenu.
 -->
 
 <menuDocument>
-    <!-- menuDocument can only contain 1 menu element, whose id is
-         implicitly "root_menu"
-      -->
     <menu>
-
-        <!-- This item appears at the top of the menu when you right-click an
-        "example" subnet -->
-
-        <!--
-        <scriptItem>
-            <label>Save Node Example...</label>
-            <context>
-                <expression>kwargs['node'].userData("__example_for") is not None</expression>
-            </context>
-            <scriptCode><![CDATA[
-from houdinihelp import examples
-examples.save_node_example(kwargs['node'])
-]]></scriptCode>
-        </scriptItem>
-        -->
-
-        <!-- Node flags submenu. -->
-        <subMenu id="opmenu.flags_menu">
-            <actionItem id="opmenu.flag_display">
-            </actionItem>
-            <actionItem id="opmenu.flag_select">
-            </actionItem>
-            <actionItem id="opmenu.flag_origin">
-            </actionItem>
-            <actionItem id="opmenu.flag_xray">
-            </actionItem>
-            <actionItem id="opmenu.flag_render">
-            </actionItem>
-            <actionItem id="opmenu.flag_output">
-            </actionItem>
-            <actionItem id="opmenu.flag_template">
-            </actionItem>
-            <actionItem id="opmenu.flag_footprint">
-            </actionItem>
-            <subMenu id="opmenu.flags_outputforview_menu">
-                <actionItem id="opmenu.flag_outputforview_0">
-                </actionItem>
-                <actionItem id="opmenu.flag_outputforview_1">
-                </actionItem>
-                <actionItem id="opmenu.flag_outputforview_2">
-                </actionItem>
-                <actionItem id="opmenu.flag_outputforview_3">
-                </actionItem>
-            </subMenu>
-
-            <actionItem id="opmenu.flag_highlight">
-            </actionItem>
-            <actionItem id="opmenu.flag_unload">
-            </actionItem>
-            <actionItem id="opmenu.flag_export">
-            </actionItem>
-            <actionItem id="opmenu.flag_lock">
-            </actionItem>
-            <actionItem id="opmenu.flag_thumbnail">
-            </actionItem>
-            <actionItem id="opmenu.flag_bypass">
-            </actionItem>
-            <actionItem id="opmenu.flag_hidden">
-            </actionItem>
-            <actionItem id="opmenu.flag_displaydescriptivename">
-            </actionItem>
-            <actionItem id="opmenu.flag_displaycomment">
-            </actionItem>
-            <actionItem id="opmenu.flag_expose">
-            </actionItem>
-
-            <separatorItem/>
-
-            <actionItem id="opmenu.takedisplay">
-            </actionItem>
-            <actionItem id="opmenu.takeoutput">
-            </actionItem>
-            <actionItem id="opmenu.takebypass">
-            </actionItem>
-        </subMenu>
-
-        <!-- Actions submenu. -->
-        <subMenu id="opmenu.actions_menu">
-            <actionItem id="opmenu.select_node">
-            </actionItem>
-            <actionItem id="opmenu.use_default_color">
-            </actionItem>
-            <actionItem id="opmenu.use_default_shape">
-            </actionItem>
-            <actionItem id="collapse">
-            </actionItem>
-            <actionItem id="collapse_to_material">
-            </actionItem>
-            <actionItem id="opmenu.extract">
-            </actionItem>
-            <actionItem id="opmenu.refcopy">
-            </actionItem>
-            <actionItem id="opmenu.change_type">
-            </actionItem>
-            <separatorItem/>
-            <actionItem id="delete">
-            </actionItem>
-            <scriptItem>
-            </scriptItem>
-        </subMenu>
-        <!-- End actions submenu -->
-
-        <!-- LOP actions submenu. -->
-    <subMenu id="opmenu.lop_options_menu">
-        <scriptItem id="opmenu.select_modified_prims">
-        </scriptItem>
-        <scriptItem id="opmenu.inspect_stage">
-        </scriptItem>
-        <scriptItem id="opmenu.inspect_active_layer">
-        </scriptItem>
-        <scriptItem id="opmenu.inspect_layers">
-        </scriptItem>
-        <separatorItem/>
-        <scriptItem id="opmenu.create_lop_activationparm">
-        </scriptItem>
-        <scriptItem id="opmenu.remove_lop_activationparm">
-        </scriptItem>
-    </subMenu>
-    <!-- End LOP actions menu -->
-
-        <!-- Asset examples submenu -->
-        <!--
-        <subMenu id="opmenu.examples_menu">
-            <label>Examples</label>
-            <context>
-                <expression><![CDATA[
-from houdinihelp import examples
-return (
-    examples.has_examples(kwargs['node']) or
-    examples.can_have_example(kwargs['node'])
-)
-]]></expression>
-            </context>
-
-            <scriptItem id="h.panes.wsheet.addnodeexample">
-                <label>Create Example for This Node</label>
-                <context>
-                    <expression><![CDATA[
-from houdinihelp import examples
-return examples.can_have_example(kwargs['node'])
-]]></expression>
-                </context>
-                <scriptCode><![CDATA[
-from houdinihelp import examples
-examples.start_node_example(kwargs['node'], alt=kwargs['altclick'])
-]]></scriptCode>
-            </scriptItem>
-
-            <separatorItem/>
-
-            <scriptMenuStripDynamic>
-                <contentsScriptCode><![CDATA[
-from houdinihelp import examples
-return examples.examples_menu(kwargs['node'])
-]]></contentsScriptCode>
-                <scriptCode><![CDATA[
-from houdinihelp import examples
-examples.load_token(kwargs['selectedtoken'], kwargs['node'], shift=kwargs['shiftclick'], alt=kwargs['altclick'])
-]]></scriptCode>
-            </scriptMenuStripDynamic>
-        </subMenu>
-        -->
-        <!-- End examples submenu -->
-
-
-        <actionItem id="jump">
-        </actionItem>
-
-        <separatorItem/>
-
-        <subMenu id="opmenu.preview_menu">
-            <actionItem id="opmenu.preview_icon">
-            </actionItem>
-            <actionItem id="opmenu.preview_quarter">
-            </actionItem>
-            <actionItem id="opmenu.preview_half">
-            </actionItem>
-            <actionItem id="opmenu.preview_full">
-            </actionItem>
-        </subMenu>
-        <actionItem id="opmenu.flipbook">
-        </actionItem>
-
-        <scriptItem id="opmenu.generate_static">
-        </scriptItem>
-        <scriptItem id="opmenu.cook_output_node">
-        </scriptItem>
-        <scriptItem id="opmenu.dirty_all">
-        </scriptItem>
-        <scriptItem id="opmenu.cancel_cook">
-        </scriptItem>
-        <scriptItem id="opmenu.generate_node">
-        </scriptItem>
-        <scriptItem id="opmenu.generate_node_static">
-        </scriptItem>
-  <scriptItem id="cook_selected_node">
-  </scriptItem>
-  <scriptItem id="cancel_node">
-  </scriptItem>
-  <separatorItem/>
-        <scriptItem id="dirty_node">
-        </scriptItem>
-  <scriptItem id="dirty_cook_selected_node">
-  </scriptItem>
-  <scriptItem id="dirty_clean_node">
-  </scriptItem>
-  <scriptItem id="clean_temp_dir">
-  </scriptItem>
-  <scriptItem id="set_default_scheduler">
-  </scriptItem>
-  <scriptItem id="open_temp_directory">
-  </scriptItem>
-  <separatorItem/>
-        <scriptItem id="opmenu.open_task_graph_table">
-        </scriptItem>
-<separatorItem/>
-        <subMenu id="opmenu.parms_and_channels_menu">
-            <actionItem id="opmenu.parameters">
-            </actionItem>
-            <actionItem id="opmenu.promotematerial">
-            </actionItem>
-            <separatorItem/>
-            <actionItem id="opmenu.create_channel_groups">
-            </actionItem>
-            <actionItem id="opmenu.scope_channels">
-            </actionItem>
-            <actionItem id="opmenu.delete_channels">
-            </actionItem>
-            <separatorItem/>
-            <!--
-                Please do not move Edit Parameter Interface... above Type
-                Properties...  This was done twice in the past and each time we
-                found the location to be problematic so we moved it back to the
-                middle of the menu.
-            -->
-            <actionItem id="opmenu.spareparms">
-            </actionItem>
-        </subMenu>
-
-        <!-- VOP options submenu. -->
-        <subMenu id="opmenu.vop_options_menu">
-            <actionItem id="opmenu.vn_view_code">
-            </actionItem>
-        <actionItem id="opmenu.edit_vop_network">
-        </actionItem>
-            <actionItem id="opmenu.creator">
-            </actionItem>
-            <separatorItem/>
-            <actionItem id="opmenu.vn_create_shop">
-            </actionItem>
-            <actionItem id="opmenu.vn_save_context_op">
-            </actionItem>
-            <actionItem id="opmenu.vn_create_vop_type">
-            </actionItem>
-            <actionItem id="opmenu.vn_convert_to_type">
-
-            </actionItem>
-            <separatorItem/>
-            <actionItem id="opmenu.parm_definer">
-            </actionItem>
-            <separatorItem/>
-            <subMenu id="opmenu.lod_menu">
-                <actionItem id="opmenu.flag_lodlow">
-                </actionItem>
-                <actionItem id="opmenu.flag_lodmed">
-                </actionItem>
-                <actionItem id="opmenu.flag_lodhigh">
-                </actionItem>
-            </subMenu>
-            <actionItem id="opmenu.collapse_input_groups">
-            </actionItem>
-            <actionItem id="opmenu.expand_input_groups">
-            </actionItem>
-            <separatorItem/>
-            <actionItem id="opmenu.create_parms">
-            </actionItem>
-            <actionItem id="opmenu.create_subnet_inputs">
-            </actionItem>
-            <actionItem id="opmenu.create_consts">
-            </actionItem>
-            <separatorItem/>
-            <actionItem id="opmenu.create_output_bindings">
-            </actionItem>
-            <actionItem id="opmenu.create_subnet_outputs">
-            </actionItem>
-        </subMenu>
-
-        <actionItem id="opmenu.preview">
-        </actionItem>
-        <actionItem id="opmenu.spreadsheet">
-        </actionItem>
-
-        <scriptItem id="opmenu.extended_info">
-        </scriptItem>
-        <actionItem id="opmenu.view_deps">
-        </actionItem>
-        <actionItem id="opmenu.edit_comment">
-        </actionItem>
-
-        <!-- Save options. -->
-        <subMenu id="opmenu.save_menu">
-        <actionItem id="opmenu.save_geometry">
-        </actionItem>
-        <scriptItem id="opmenu.save_stage">
-        </scriptItem>
-        <scriptItem id="opmenu.save_active_layer">
-        </scriptItem>
-        <scriptItem id="opmenu.save_materialx">
-        </scriptItem>
-        <actionItem id="opmenu.vn_save_code">
-        </actionItem>
-        <actionItem id="opmenu.save_texture">
-        </actionItem>
-        <actionItem id="opmenu.save_image">
-        </actionItem>
-        <actionItem id="opmenu.save_lut">
-        </actionItem>
-            <actionItem id="opmenu.save_data">
-            </actionItem>
-            <actionItem id="opmenu.edit_data">
-            </actionItem>
-        <actionItem id="opmenu.save_to_gallery">
-        </actionItem>
-        </subMenu>
-
-        <separatorItem/>
-
-        <!-- Chop options. -->
-            <actionItem id="opmenu.set_scope">
-            </actionItem>
-            <actionItem id="opmenu.add_to_scope">
-            </actionItem>
-
-        <separatorItem/>
-
-        <!-- Input and output option submenus. -->
-        <subMenu id="opmenu.inputs_menu">
-            <actionItem id="opmenu.hide_inputs">
-            </actionItem>
-            <actionItem id="opmenu.expose_inputs">
-            </actionItem>
-            <actionItem id="opmenu.select_inputs">
-            </actionItem>
-            <scriptItem id="opmenu.select_input_parameters">
-            </scriptItem>
-        </subMenu>
-        <subMenu id="opmenu.outputs_menu">
-            <actionItem id="opmenu.hide_outputs">
-            </actionItem>
-            <actionItem id="opmenu.expose_outputs">
-            </actionItem>
-            <actionItem id="opmenu.select_outputs">
-            </actionItem>
-            <actionItem id="opmenu.collapse_outputs">
-            </actionItem>
-        </subMenu>
-
-        <separatorItem/>
-
-        <subMenu id="opmenu.character_tools_menu">
-            <actionItem id="opmenu.charpicker">
-            </actionItem>
-            <actionItem id="opmenu.poselibrary">
-            </actionItem>
-        </subMenu>
-        <separatorItem/>
-
-        <actionItem id="opmenu.help">
-        </actionItem>
-
-        <separatorItem/>
-
         <!-- Operator type and asset options. -->
         <subMenu id="opmenu.vhda_options_create">
-                <scriptItem id="opmenu.vhda_create">
-                </scriptItem>
+            <insertBefore>opmenu.unsynchronize</insertBefore>
                 <scriptItem id="opmenu.vhda_create_ayon">
+                    <insertAfter>opmenu.vhda_create</insertAfter>
                     <label>Create New (AYON)...</label>
                     <context>
                     </context>
@@ -447,97 +24,6 @@ create_interactive("io.openpype.creators.houdini.hda", **kwargs)
 ]]>
                      </scriptCode>
                 </scriptItem>
-                <separatorItem/>
-                <scriptItem id="opmenu.vhda_prefcreate">
-                </scriptItem>
         </subMenu>
-
-
-        <actionItem id="opmenu.unsynchronize">
-        </actionItem>
-        <actionItem id="opmenu.synchronize">
-        </actionItem>
-
-        <actionItem id="opmenu.diff">
-        </actionItem>
-
-        <subMenu id="opmenu.vhda_options">
-            <scriptItem id="opmenu.vhda_save_as">
-            </scriptItem>
-            <separatorItem/>
-            <scriptItem id="opmenu.vhda_bump_major">
-            </scriptItem>
-            <scriptItem id="opmenu.vhda_bump_minor">
-            </scriptItem>
-            <separatorItem/>
-            <scriptItem id="opmenu.vhda_pref">
-            </scriptItem>
-        </subMenu>
-
-        <actionItem id="opmenu.saveoptype">
-        </actionItem>
-
-        <separatorItem/>
-
-        <!--
-        <subMenu>
-            <label>Donut</label>
-
-            <titleItem>
-                <label>Node Macros</label>
-            </titleItem>
-            <scriptMenuStripDynamic id="dynamic_node_macros">
-                <contentsScriptCode><![CDATA[
-from nodemacros.ui import houdiniStorage
-return houdiniStorage().menuFor(kwargs["node"])
-]]>
-                </contentsScriptCode>
-                <scriptCode><![CDATA[
-from nodemacros.ui import houdiniStorage
-houdiniStorage().applyMacro(kwargs["selectedtoken"], kwargs["node"])
-]]>
-               </scriptCode>
-            </scriptMenuStripDynamic>
-
-            <separatorItem/>
-
-            <scriptItem id="save_cluster_macro">
-                <label>Save Selected Item(s) as Macro....</label>
-                <scriptCode><![CDATA[
-from nodemacros import ui
-ui.showMacroEditorForItems(kwargs["items"], kwargs["node"])
-]]>
-                </scriptCode>
-            </scriptItem>
-
-            <scriptItem id="edit_macro_list">
-                <label>Edit Macro List</label>
-                <scriptCode><![CDATA[
-from nodemacros.manager import showMacroManager
-showMacroManager()
-]]>
-                </scriptCode>
-            </scriptItem>
-
-            <scriptItem id="macro_help">
-                <label>Donut Help</label>
-                <scriptCode><![CDATA[
-from nodemacros.ui import MACRO_HELP_PATH
-hou.ui.curDesktop().displayHelpPath(MACRO_HELP_PATH)
-]]>
-                </scriptCode>
-            </scriptItem>
-        </subMenu>
-
-        <separatorItem/>
-        -->
-
-        <actionItem id="opmenu.optypemanager">
-        </actionItem>
-        <actionItem id="opmenu.properties">
-        </actionItem>
-
-        <menuStripDynamic id="custom_hscript">
-        </menuStripDynamic>
     </menu>
 </menuDocument>

From 8dc0043d0308b3e823bd055ae7a54217d95462d6 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Sat, 11 May 2024 00:00:52 +0800
Subject: [PATCH 070/119] add joint into accepted_controllers & make sure the
 bake animation doesn't get resample when it is exported

---
 .../hosts/maya/plugins/publish/extract_fbx_animation.py         | 1 +
 .../hosts/maya/plugins/publish/validate_animated_reference.py   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
index ee66ed2fb7..36dc1b1544 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
@@ -36,6 +36,7 @@ class ExtractFBXAnimation(publish.Extractor):
         out_members = instance.data.get("animated_skeleton", [])
         # Export
         instance.data["constraints"] = True
+        instance.data["bakeResampleAnimation"] = False
         instance.data["skeletonDefinitions"] = True
         instance.data["referencedAssetsContent"] = True
         fbx_exporter.set_options_from_instance(instance)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
index 2ba2bff6fc..c9dcc662af 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
@@ -16,7 +16,7 @@ class ValidateAnimatedReferenceRig(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["animation.fbx"]
     label = "Animated Reference Rig"
-    accepted_controllers = ["transform", "locator"]
+    accepted_controllers = ["transform", "locator", "joint"]
     actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
     optional = False
 

From 2d4bc1e7ca9546692a242a40e273d1e88fe6fcdf Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Sat, 11 May 2024 00:23:53 +0800
Subject: [PATCH 071/119] add inputchildren as options

---
 client/ayon_core/hosts/maya/api/fbx.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/hosts/maya/api/fbx.py b/client/ayon_core/hosts/maya/api/fbx.py
index 3f1395cb40..437d64abbf 100644
--- a/client/ayon_core/hosts/maya/api/fbx.py
+++ b/client/ayon_core/hosts/maya/api/fbx.py
@@ -102,6 +102,7 @@ class FBXExtractor:
             "constraints": False,
             "lights": True,
             "embeddedTextures": False,
+            "includeChildren": True,
             "inputConnections": True,
             "upAxis": "y",
             "triangulate": False,

From f820050f7eb7ac95d3c4f07174a5a409e47d2d3a Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 13 May 2024 18:39:33 +0800
Subject: [PATCH 072/119] add inputChildren into the dict from options function

---
 client/ayon_core/hosts/maya/api/fbx.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/hosts/maya/api/fbx.py b/client/ayon_core/hosts/maya/api/fbx.py
index 437d64abbf..fd1bf2c901 100644
--- a/client/ayon_core/hosts/maya/api/fbx.py
+++ b/client/ayon_core/hosts/maya/api/fbx.py
@@ -59,6 +59,7 @@ class FBXExtractor:
             "constraints": bool,
             "lights": bool,
             "embeddedTextures": bool,
+            "includeChildren": bool,
             "inputConnections": bool,
             "upAxis": str,  # x, y or z,
             "triangulate": bool,

From 4a70e5bb0084285062527937c3b2d3858d36e506 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 13 May 2024 18:56:56 +0800
Subject: [PATCH 073/119] make sure the constraint is false when exporting

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

diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
index 36dc1b1544..21a8abd46f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
@@ -35,8 +35,7 @@ class ExtractFBXAnimation(publish.Extractor):
         fbx_exporter = fbx.FBXExtractor(log=self.log)
         out_members = instance.data.get("animated_skeleton", [])
         # Export
-        instance.data["constraints"] = True
-        instance.data["bakeResampleAnimation"] = False
+        instance.data["constraints"] = False
         instance.data["skeletonDefinitions"] = True
         instance.data["referencedAssetsContent"] = True
         fbx_exporter.set_options_from_instance(instance)

From 8cf1d53e2b66eccc6040ebbc48f4f99c9e4a19d0 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 13 May 2024 22:42:37 +0800
Subject: [PATCH 074/119] add TODO

---
 .../hosts/maya/plugins/publish/extract_fbx_animation.py        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
index 21a8abd46f..77b5b79b5f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py
@@ -35,7 +35,8 @@ class ExtractFBXAnimation(publish.Extractor):
         fbx_exporter = fbx.FBXExtractor(log=self.log)
         out_members = instance.data.get("animated_skeleton", [])
         # Export
-        instance.data["constraints"] = False
+        # TODO: need to set up the options for users to set up
+        # the flags they intended to export
         instance.data["skeletonDefinitions"] = True
         instance.data["referencedAssetsContent"] = True
         fbx_exporter.set_options_from_instance(instance)

From fb2714005999c262d5e023afd17c76ae9c296dca Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 13 May 2024 23:39:49 +0800
Subject: [PATCH 075/119] remove joint

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

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
index c9dcc662af..2ba2bff6fc 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
@@ -16,7 +16,7 @@ class ValidateAnimatedReferenceRig(pyblish.api.InstancePlugin,
     hosts = ["maya"]
     families = ["animation.fbx"]
     label = "Animated Reference Rig"
-    accepted_controllers = ["transform", "locator", "joint"]
+    accepted_controllers = ["transform", "locator"]
     actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
     optional = False
 

From aa6b254326f052b05f95fee20e91fad784a54c1a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 14 May 2024 11:14:06 +0200
Subject: [PATCH 076/119] do not try to fix own overrides

---
 server/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/__init__.py b/server/__init__.py
index 82473927b6..79f505ccd5 100644
--- a/server/__init__.py
+++ b/server/__init__.py
@@ -26,10 +26,14 @@ class CoreAddon(BaseServerAddon):
     def _convert_imagio_configs_0_3_1(self, overrides):
         """Imageio config settings did change to profiles since 0.3.1. ."""
         imageio_overrides = overrides.get("imageio") or {}
-        if "ocio_config" not in imageio_overrides:
+        if (
+            "ocio_config" not in imageio_overrides
+            or "filepath" not in imageio_overrides["ocio_config"]
+        ):
             return
 
         ocio_config = imageio_overrides.pop("ocio_config")
+
         filepath = ocio_config["filepath"]
         if not filepath:
             return

From 37cd670f40a89206023adc0da2e6b11aff0ed273 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 14 May 2024 11:40:47 +0200
Subject: [PATCH 077/119] removed deprecated function
 'get_template_data_from_session'

---
 client/ayon_core/pipeline/context_tools.py | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/client/ayon_core/pipeline/context_tools.py b/client/ayon_core/pipeline/context_tools.py
index 33567d7280..c32d04c44c 100644
--- a/client/ayon_core/pipeline/context_tools.py
+++ b/client/ayon_core/pipeline/context_tools.py
@@ -459,36 +459,6 @@ def is_representation_from_latest(representation):
     )
 
 
-def get_template_data_from_session(session=None, settings=None):
-    """Template data for template fill from session keys.
-
-    Args:
-        session (Union[Dict[str, str], None]): The Session to use. If not
-            provided use the currently active global Session.
-        settings (Optional[Dict[str, Any]]): Prepared studio or project
-            settings.
-
-    Returns:
-        Dict[str, Any]: All available data from session.
-    """
-
-    if session is not None:
-        project_name = session["AYON_PROJECT_NAME"]
-        folder_path = session["AYON_FOLDER_PATH"]
-        task_name = session["AYON_TASK_NAME"]
-        host_name = session["AYON_HOST_NAME"]
-    else:
-        context = get_current_context()
-        project_name = context["project_name"]
-        folder_path = context["folder_path"]
-        task_name = context["task_name"]
-        host_name = get_current_host_name()
-
-    return get_template_data_with_names(
-        project_name, folder_path, task_name, host_name, settings
-    )
-
-
 def get_current_context_template_data(settings=None):
     """Prepare template data for current context.
 

From 217cd06f9a7c94b4bc0e12c54e2da5c48e73855d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 14 May 2024 12:31:50 +0200
Subject: [PATCH 078/119] fix ruff comments

---
 .../traypublisher/plugins/create/create_editorial_package.py   | 1 -
 .../traypublisher/plugins/publish/extract_editorial_pckg.py    | 2 --
 .../plugins/publish/validate_editorial_package.py              | 3 +--
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
index 830cfa5564..82b109be28 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial_package.py
@@ -8,7 +8,6 @@ from ayon_core.lib.attribute_definitions import (
     FileDef,
     BoolDef,
     TextDef,
-    HiddenDef
 )
 from ayon_core.hosts.traypublisher.api.plugin import TrayPublishCreator
 
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
index a4d8d2c6fb..6dd4e84704 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_editorial_pckg.py
@@ -56,8 +56,6 @@ class ExtractEditorialPckgConversion(publish.Extractor):
         if conversion_enabled and output_def["ext"]:
             transfers = self._convert_resources(output_def, transfers)
 
-        if not "transfers" in instance.data:
-            instance.data["transfers"] = []
         instance.data["transfers"] = transfers
 
         source_to_rootless = self._get_resource_path_mapping(instance,
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
index 89594ce441..c63c4a6a73 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_editorial_package.py
@@ -22,8 +22,7 @@ class ValidateEditorialPackage(pyblish.api.InstancePlugin):
     def process(self, instance):
         editorial_pckg_data = instance.data.get("editorial_pckg")
         if not editorial_pckg_data:
-            raise PublishValidationError(
-                f"Editorial package not collected")
+            raise PublishValidationError("Editorial package not collected")
 
         folder_path = editorial_pckg_data["folder_path"]
 

From 4dc893dfd571365337594ac2e764e69c230e352c Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 14 May 2024 12:32:21 +0200
Subject: [PATCH 079/119] Nuke: Refactor metadata imprinting

- Simplified code by removing 'author' attribute from metadata imprinting in various plugins.
---
 client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py     | 4 ++--
 client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py   | 4 ++--
 client/ayon_core/hosts/nuke/plugins/load/load_clip.py         | 4 +---
 client/ayon_core/hosts/nuke/plugins/load/load_effects.py      | 2 --
 client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py   | 2 --
 client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py        | 2 --
 client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py     | 2 --
 client/ayon_core/hosts/nuke/plugins/load/load_image.py        | 3 +--
 client/ayon_core/hosts/nuke/plugins/load/load_model.py        | 4 ++--
 .../ayon_core/hosts/nuke/plugins/load/load_script_precomp.py  | 2 --
 10 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py b/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py
index 7d823919dc..50af8a4eb9 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_backdrop.py
@@ -62,7 +62,7 @@ class LoadBackdropNodes(load.LoaderPlugin):
         }
 
         # add attributes from the version to imprint to metadata knob
-        for k in ["source", "author", "fps"]:
+        for k in ["source", "fps"]:
             data_imprint[k] = version_attributes[k]
 
         # getting file path
@@ -206,7 +206,7 @@ class LoadBackdropNodes(load.LoaderPlugin):
             "colorspaceInput": colorspace,
         }
 
-        for k in ["source", "author", "fps"]:
+        for k in ["source", "fps"]:
             data_imprint[k] = version_attributes[k]
 
         # adding nodes to node graph
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py b/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py
index 14c54c3adc..3c7d4f3bb2 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_camera_abc.py
@@ -48,7 +48,7 @@ class AlembicCameraLoader(load.LoaderPlugin):
             "frameEnd": last,
             "version": version_entity["version"],
         }
-        for k in ["source", "author", "fps"]:
+        for k in ["source", "fps"]:
             data_imprint[k] = version_attributes[k]
 
         # getting file path
@@ -123,7 +123,7 @@ class AlembicCameraLoader(load.LoaderPlugin):
         }
 
         # add attributes from the version to imprint to metadata knob
-        for k in ["source", "author", "fps"]:
+        for k in ["source", "fps"]:
             data_imprint[k] = version_attributes[k]
 
         # getting file path
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py b/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
index df8f2ab018..22203a5978 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_clip.py
@@ -197,7 +197,6 @@ class LoadClip(plugin.NukeLoader):
                 "frameStart",
                 "frameEnd",
                 "source",
-                "author",
                 "fps",
                 "handleStart",
                 "handleEnd",
@@ -347,8 +346,7 @@ class LoadClip(plugin.NukeLoader):
                 "source": version_attributes.get("source"),
                 "handleStart": str(self.handle_start),
                 "handleEnd": str(self.handle_end),
-                "fps": str(version_attributes.get("fps")),
-                "author": version_attributes.get("author")
+                "fps": str(version_attributes.get("fps"))
             }
 
             last_version_entity = ayon_api.get_last_version_by_product_id(
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_effects.py b/client/ayon_core/hosts/nuke/plugins/load/load_effects.py
index a87c81295a..be7420fcf0 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_effects.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_effects.py
@@ -69,7 +69,6 @@ class LoadEffects(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
@@ -189,7 +188,6 @@ class LoadEffects(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps",
         ]:
             data_imprint[k] = version_attributes[k]
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py b/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py
index 8fa1347598..9bb430b37b 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_effects_ip.py
@@ -69,7 +69,6 @@ class LoadEffectsInputProcess(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
@@ -192,7 +191,6 @@ class LoadEffectsInputProcess(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py
index 95f85bacfc..57d00795ae 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo.py
@@ -71,7 +71,6 @@ class LoadGizmo(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
@@ -139,7 +138,6 @@ class LoadGizmo(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py
index 3112e27811..ed2b1ec458 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_gizmo_ip.py
@@ -73,7 +73,6 @@ class LoadGizmoInputProcess(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
@@ -145,7 +144,6 @@ class LoadGizmoInputProcess(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_image.py b/client/ayon_core/hosts/nuke/plugins/load/load_image.py
index d825b621fc..b5fccd8a0d 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_image.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_image.py
@@ -133,7 +133,7 @@ class LoadImage(load.LoaderPlugin):
                 "version": version_entity["version"],
                 "colorspace": colorspace,
             }
-            for k in ["source", "author", "fps"]:
+            for k in ["source", "fps"]:
                 data_imprint[k] = version_attributes.get(k, str(None))
 
             r["tile_color"].setValue(int("0x4ecd25ff", 16))
@@ -207,7 +207,6 @@ class LoadImage(load.LoaderPlugin):
             "colorspace": version_attributes.get("colorSpace"),
             "source": version_attributes.get("source"),
             "fps": str(version_attributes.get("fps")),
-            "author": version_attributes.get("author")
         }
 
         # change color of node
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_model.py b/client/ayon_core/hosts/nuke/plugins/load/load_model.py
index 0326e0a4fc..40862cd1e0 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_model.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_model.py
@@ -47,7 +47,7 @@ class AlembicModelLoader(load.LoaderPlugin):
             "version": version_entity["version"]
         }
         # add attributes from the version to imprint to metadata knob
-        for k in ["source", "author", "fps"]:
+        for k in ["source", "fps"]:
             data_imprint[k] = version_attributes[k]
 
         # getting file path
@@ -130,7 +130,7 @@ class AlembicModelLoader(load.LoaderPlugin):
         }
 
         # add additional metadata from the version to imprint to Avalon knob
-        for k in ["source", "author", "fps"]:
+        for k in ["source", "fps"]:
             data_imprint[k] = version_attributes[k]
 
         # getting file path
diff --git a/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py b/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py
index 3e554f9d3b..d6699be164 100644
--- a/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py
+++ b/client/ayon_core/hosts/nuke/plugins/load/load_script_precomp.py
@@ -55,7 +55,6 @@ class LinkAsGroup(load.LoaderPlugin):
             "handleStart",
             "handleEnd",
             "source",
-            "author",
             "fps"
         ]:
             data_imprint[k] = version_attributes[k]
@@ -131,7 +130,6 @@ class LinkAsGroup(load.LoaderPlugin):
             "colorspace": version_attributes.get("colorSpace"),
             "source": version_attributes.get("source"),
             "fps": version_attributes.get("fps"),
-            "author": version_attributes.get("author")
         }
 
         # Update the imprinted representation

From 7f4385c9a23020b044a7a34a3de4aec6f3491543 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 14 May 2024 12:33:44 +0200
Subject: [PATCH 080/119] remove unused imports

---
 server_addon/traypublisher/server/settings/publish_plugins.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server_addon/traypublisher/server/settings/publish_plugins.py b/server_addon/traypublisher/server/settings/publish_plugins.py
index dc659f6110..99a0bbf107 100644
--- a/server_addon/traypublisher/server/settings/publish_plugins.py
+++ b/server_addon/traypublisher/server/settings/publish_plugins.py
@@ -1,10 +1,6 @@
-from pydantic import validator
-
 from ayon_server.settings import (
     BaseSettingsModel,
     SettingsField,
-    task_types_enum,
-    ensure_unique_names
 )
 
 

From 53b25cb77e65a48ca10149d2eff743e6cf13fd3c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 14 May 2024 13:28:41 +0200
Subject: [PATCH 081/119] fix import

---
 client/ayon_core/modules/royalrender/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/modules/royalrender/api.py b/client/ayon_core/modules/royalrender/api.py
index a69f88c43c..ef715811c5 100644
--- a/client/ayon_core/modules/royalrender/api.py
+++ b/client/ayon_core/modules/royalrender/api.py
@@ -7,7 +7,7 @@ from ayon_core.lib import Logger, run_subprocess, AYONSettingsRegistry
 from ayon_core.lib.vendor_bin_utils import find_tool_in_custom_paths
 
 from .rr_job import SubmitFile
-from .rr_job import RRjob, SubmitterParameter # noqa F401
+from .rr_job import RRJob, SubmitterParameter # noqa F401
 
 
 class Api:

From c5b0a1e0cebf5c4c6cbf8768d41ead634ba07a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 14 May 2024 14:19:00 +0200
Subject: [PATCH 082/119] :bug: fix merge

---
 client/ayon_core/plugins/publish/integrate.py | 68 -------------------
 1 file changed, 68 deletions(-)

diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index 33dc3024d1..865b566e6e 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -108,75 +108,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
 
     label = "Integrate Asset"
     order = pyblish.api.IntegratorOrder
-<<<<<<< enhancement/AY-4138_remove-explicit-products-type-list -- Incoming Change
-=======
-    families = ["workfile",
-                "pointcache",
-                "pointcloud",
-                "proxyAbc",
-                "camera",
-                "animation",
-                "model",
-                "maxScene",
-                "mayaAscii",
-                "mayaScene",
-                "setdress",
-                "layout",
-                "ass",
-                "assProxy",
-                "vdbcache",
-                "scene",
-                "vrayproxy",
-                "vrayscene_layer",
-                "render",
-                "prerender",
-                "imagesequence",
-                "review",
-                "rendersetup",
-                "rig",
-                "plate",
-                "look",
-                "ociolook",
-                "audio",
-                "yetiRig",
-                "yeticache",
-                "nukenodes",
-                "gizmo",
-                "source",
-                "matchmove",
-                "image",
-                "assembly",
-                "fbx",
-                "gltf",
-                "textures",
-                "action",
-                "harmony.template",
-                "harmony.palette",
-                "editorial",
-                "background",
-                "camerarig",
-                "redshiftproxy",
-                "effect",
-                "xgen",
-                "hda",
-                "usd",
-                "staticMesh",
-                "skeletalMesh",
-                "mvLook",
-                "mvUsd",
-                "mvUsdComposition",
-                "mvUsdOverride",
-                "online",
-                "uasset",
-                "blendScene",
-                "yeticacheUE",
-                "tycache",
-                "csv_ingest_file",
-                "editorial_pckg",
-                "render.local.hou",
-                ]
 
->>>>>>> develop -- Current Change
     default_template_name = "publish"
 
     # Representation context keys that should always be written to

From 1b05428eb73087b222890509e0a12c0e59a90654 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 10:17:30 +0200
Subject: [PATCH 083/119] expand default settings for readability

---
 server/settings/main.py | 42 ++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/server/settings/main.py b/server/settings/main.py
index d1cee32afa..40e16e7e91 100644
--- a/server/settings/main.py
+++ b/server/settings/main.py
@@ -268,26 +268,50 @@ DEFAULT_VALUES = {
     },
     "studio_name": "",
     "studio_code": "",
-    "environments": '{\n"STUDIO_SW": {\n        "darwin": "/mnt/REPO_SW",\n        "linux": "/mnt/REPO_SW",\n        "windows": "P:/REPO_SW"\n    }\n}',
+    "environments": json.dumps(
+        {
+            "STUDIO_SW": {
+                "darwin": "/mnt/REPO_SW",
+                "linux": "/mnt/REPO_SW",
+                "windows": "P:/REPO_SW"
+            }
+        },
+        indent=4
+    ),
     "tools": DEFAULT_TOOLS_VALUES,
-    "version_start_category": {"profiles": []},
+    "version_start_category": {
+        "profiles": []
+    },
     "publish": DEFAULT_PUBLISH_VALUES,
     "project_folder_structure": json.dumps(
         {
             "__project_root__": {
                 "prod": {},
                 "resources": {
-                    "footage": {"plates": {}, "offline": {}},
+                    "footage": {
+                        "plates": {},
+                        "offline": {}
+                    },
                     "audio": {},
-                    "art_dept": {},
+                    "art_dept": {}
                 },
                 "editorial": {},
-                "assets": {"characters": {}, "locations": {}},
-                "shots": {},
+                "assets": {
+                    "characters": {},
+                    "locations": {}
+                },
+                "shots": {}
             }
         },
-        indent=4,
+        indent=4
     ),
-    "project_plugins": {"windows": [], "darwin": [], "linux": []},
-    "project_environments": "{}",
+    "project_plugins": {
+        "windows": [],
+        "darwin": [],
+        "linux": []
+    },
+    "project_environments": json.dumps(
+        {},
+        indent=4
+    )
 }

From c6a396de4f8850a1acf56125a82a8248a6666fc4 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 15 May 2024 17:15:07 +0200
Subject: [PATCH 084/119] AY-1110 - updated variable to be more descriptive

Bump up version
---
 server_addon/deadline/package.py              | 2 +-
 server_addon/deadline/server/settings/main.py | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server_addon/deadline/package.py b/server_addon/deadline/package.py
index 25ba1c1166..e26734c813 100644
--- a/server_addon/deadline/package.py
+++ b/server_addon/deadline/package.py
@@ -1,3 +1,3 @@
 name = "deadline"
 title = "Deadline"
-version = "0.1.11"
+version = "0.1.12"
diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py
index 5d42b9b1ef..47ad72a86f 100644
--- a/server_addon/deadline/server/settings/main.py
+++ b/server_addon/deadline/server/settings/main.py
@@ -38,10 +38,9 @@ class ServerItemSubmodel(BaseSettingsModel):
     name: str = SettingsField(title="Name")
     value: str = SettingsField(title="Url")
     require_authentication: bool = SettingsField(
-        False,
-        title="Require authentication")
-    ssl: bool = SettingsField(False,
-                              title="SSL")
+        False, title="Require authentication")
+    not_verify_ssl: bool = SettingsField(
+        False, title="Don't verify SSL")
 
 
 class DeadlineSettings(BaseSettingsModel):
@@ -78,7 +77,7 @@ DEFAULT_VALUES = {
             "name": "default",
             "value": "http://127.0.0.1:8082",
             "require_authentication": False,
-            "ssl": False
+            "not_verify_ssl": False
         }
     ],
     "deadline_server": "default",

From e9697884e98ce02dc603fdae81155e114370e1a3 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 15 May 2024 17:18:13 +0200
Subject: [PATCH 085/119] AY-1110 - use field from Setttings instead of
 OPENPYPE_DONT_VERIFY_SSL

---
 .../deadline/abstract_submit_deadline.py      | 35 +++++++------------
 .../publish/collect_user_credentials.py       |  3 ++
 .../publish/submit_blender_deadline.py        |  5 +--
 .../publish/submit_celaction_deadline.py      |  6 ++--
 .../plugins/publish/submit_fusion_deadline.py |  3 +-
 .../plugins/publish/submit_max_deadline.py    | 16 ++++++---
 .../plugins/publish/submit_maya_deadline.py   | 18 +++++++---
 .../plugins/publish/submit_nuke_deadline.py   |  8 +++--
 .../publish/submit_publish_cache_job.py       |  5 +--
 .../plugins/publish/submit_publish_job.py     |  5 +--
 10 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
index 00e51100bc..564966b6a0 100644
--- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py
+++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
@@ -29,15 +29,11 @@ from ayon_core.pipeline.publish.lib import (
 JSONDecodeError = getattr(json.decoder, "JSONDecodeError", ValueError)
 
 
-# TODO both 'requests_post' and 'requests_get' should not set 'verify' based
-#   on environment variable. This should be done in a more controlled way,
-#   e.g. each deadline url could have checkbox to enabled/disable
-#   ssl verification.
 def requests_post(*args, **kwargs):
     """Wrap request post method.
 
-    Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-    variable is found. This is useful when Deadline server is
+    Disabling SSL certificate validation if ``verify`` kwarg is set to False.
+    This is useful when Deadline server is
     running with self-signed certificates and its certificate is not
     added to trusted certificates on client machines.
 
@@ -46,10 +42,6 @@ def requests_post(*args, **kwargs):
         of defense SSL is providing, and it is not recommended.
 
     """
-    if 'verify' not in kwargs:
-        kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL",
-                                              True) else True  # noqa
-
     auth = kwargs.get("auth")
     if auth:
         kwargs["auth"] = tuple(auth)  # explicit cast to tuple
@@ -61,8 +53,8 @@ def requests_post(*args, **kwargs):
 def requests_get(*args, **kwargs):
     """Wrap request get method.
 
-    Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
-    variable is found. This is useful when Deadline server is
+    Disabling SSL certificate validation if ``verify`` kwarg is set to False.
+    This is useful when Deadline server is
     running with self-signed certificates and its certificate is not
     added to trusted certificates on client machines.
 
@@ -71,9 +63,6 @@ def requests_get(*args, **kwargs):
         of defense SSL is providing, and it is not recommended.
 
     """
-    if 'verify' not in kwargs:
-        kwargs['verify'] = False if os.getenv("OPENPYPE_DONT_VERIFY_SSL",
-                                              True) else True  # noqa
     auth = kwargs.get("auth")
     if auth:
         kwargs["auth"] = tuple(auth)
@@ -466,7 +455,8 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         self.aux_files = self.get_aux_files()
 
         auth = instance.data["deadline"]["auth"]
-        job_id = self.process_submission(auth)
+        verify = instance.data["deadline"]["verify"]
+        job_id = self.process_submission(auth, verify)
         self.log.info("Submitted job to Deadline: {}.".format(job_id))
 
         # TODO: Find a way that's more generic and not render type specific
@@ -479,10 +469,10 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
                 job_info=render_job_info,
                 plugin_info=render_plugin_info
             )
-            render_job_id = self.submit(payload, auth)
+            render_job_id = self.submit(payload, auth, verify)
             self.log.info("Render job id: %s", render_job_id)
 
-    def process_submission(self, auth=None):
+    def process_submission(self, auth=None, verify=True):
         """Process data for submission.
 
         This takes Deadline JobInfo, PluginInfo, AuxFile, creates payload
@@ -493,7 +483,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
 
         """
         payload = self.assemble_payload()
-        return self.submit(payload, auth)
+        return self.submit(payload, auth, verify)
 
     @abstractmethod
     def get_job_info(self):
@@ -583,7 +573,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
             "AuxFiles": aux_files or self.aux_files
         }
 
-    def submit(self, payload, auth):
+    def submit(self, payload, auth, verify):
         """Submit payload to Deadline API end-point.
 
         This takes payload in the form of JSON file and POST it to
@@ -592,6 +582,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         Args:
             payload (dict): dict to become json in deadline submission.
             auth (tuple): (username, password)
+            verify (bool): verify SSL certificate if present
 
         Returns:
             str: resulting Deadline job id.
@@ -601,8 +592,8 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
 
         """
         url = "{}/api/jobs".format(self._deadline_url)
-        response = requests_post(url, json=payload,
-                                 auth=auth)
+        response = requests_post(
+            url, json=payload, auth=auth, verify=verify)
         if not response.ok:
             self.log.error("Submission failed!")
             self.log.error(response.status_code)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
index 5d03523c89..99d75ecb9e 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
@@ -76,6 +76,9 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
         )
         instance.data["deadline"]["auth"] = None
 
+        instance.data["deadline"]["verify"] = (
+            not deadline_info["not_verify_ssl"])
+
         if not deadline_info["require_authentication"]:
             return
         # TODO import 'get_addon_site_settings' when available 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
index f5805beb5c..311dbcedd5 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -174,8 +174,9 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         instance.data["toBeRenderedOn"] = "deadline"
 
         payload = self.assemble_payload()
-        return self.submit(payload,
-                           auth=instance.data["deadline"]["auth"])
+        auth = instance.data["deadline"]["auth"]
+        verify = instance.data["deadline"]["verify"]
+        return self.submit(payload, auth=auth, verify=verify)
 
     def from_published_scene(self):
         """
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
index 2220442dac..a17bf0c3ef 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
@@ -193,9 +193,11 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
         self.expected_files(instance, render_path)
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
-
+        auth = instance.data["deadline"]["auth"]
+        verify = instance.data["deadline"]["verify"]
         response = requests_post(self.deadline_url, json=payload,
-                                 auth=instance.data["deadline"]["require_authentication"])
+                                 auth=auth,
+                                 verify=verify)
 
         if not response.ok:
             self.log.error(
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
index e9b93a47cd..6c70119628 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
@@ -242,7 +242,8 @@ class FusionSubmitDeadline(
         # E.g. http://192.168.0.1:8082/api/jobs
         url = "{}/api/jobs".format(deadline_url)
         auth = instance.data["deadline"]["auth"]
-        response = requests_post(url, json=payload, auth=auth)
+        verify = instance.data["deadline"]["verify"]
+        response = requests_post(url, json=payload, auth=auth, verify=verify)
         if not response.ok:
             raise Exception(response.text)
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
index e9f6c382c5..ababb01285 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -181,19 +181,27 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
         self.log.debug("Submitting 3dsMax render..")
         project_settings = instance.context.data["project_settings"]
+        auth = instance.data["deadline"]["auth"]
+        verify = instance.data["deadline"]["verify"]
         if instance.data.get("multiCamera"):
             self.log.debug("Submitting jobs for multiple cameras..")
             payload = self._use_published_name_for_multiples(
                 payload_data, project_settings)
             job_infos, plugin_infos = payload
             for job_info, plugin_info in zip(job_infos, plugin_infos):
-                self.submit(self.assemble_payload(job_info, plugin_info),
-                            instance.data["deadline"]["auth"])
+                self.submit(
+                    self.assemble_payload(job_info, plugin_info),
+                    auth=auth,
+                    verify=verify
+                )
         else:
             payload = self._use_published_name(payload_data, project_settings)
             job_info, plugin_info = payload
-            self.submit(self.assemble_payload(job_info, plugin_info),
-                        instance.data["deadline"]["auth"])
+            self.submit(
+                self.assemble_payload(job_info, plugin_info),
+                auth=auth,
+                verify=verify
+            )
 
     def _use_published_name(self, data, project_settings):
         # Not all hosts can import these modules.
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 250dc8b7ea..f1bc1cb2be 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
@@ -292,7 +292,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
         return plugin_payload
 
-    def process_submission(self, auth=None):
+    def process_submission(self, auth=None, verify=True):
         from maya import cmds
         instance = self._instance
 
@@ -332,8 +332,10 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         if "vrayscene" in instance.data["families"]:
             self.log.debug("Submitting V-Ray scene render..")
             vray_export_payload = self._get_vray_export_payload(payload_data)
+
             export_job = self.submit(vray_export_payload,
-                                     instance.data["deadline"]["auth"])
+                                     auth=auth,
+                                     verify=verify)
 
             payload = self._get_vray_render_payload(payload_data)
 
@@ -353,7 +355,8 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             # Submit main render job
             job_info, plugin_info = payload
             self.submit(self.assemble_payload(job_info, plugin_info),
-                        instance.data["deadline"]["auth"])
+                        auth=auth,
+                        verify=verify)
 
     def _tile_render(self, payload):
         """Submit as tile render per frame with dependent assembly jobs."""
@@ -557,13 +560,18 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         # Submit assembly jobs
         assembly_job_ids = []
         num_assemblies = len(assembly_payloads)
+        auth = instance.data["deadline"]["auth"]
+        verify = instance.data["deadline"]["verify"]
         for i, payload in enumerate(assembly_payloads):
             self.log.debug(
                 "submitting assembly job {} of {}".format(i + 1,
                                                           num_assemblies)
             )
-            assembly_job_id = self.submit(payload,
-                instance.data["deadline"]["auth"])
+            assembly_job_id = self.submit(
+                payload,
+                auth=auth,
+                verify=verify
+            )
             assembly_job_ids.append(assembly_job_id)
 
         instance.data["assemblySubmissionJobs"] = assembly_job_ids
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 ef744ae1e1..db35c2ae67 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
@@ -424,8 +424,12 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
         auth = instance.data["deadline"]["auth"]
-        response = requests_post(self.deadline_url, json=payload, timeout=10,
-                                 auth=auth)
+        verify = instance.data["deadline"]["verify"]
+        response = requests_post(self.deadline_url,
+                                 json=payload,
+                                 timeout=10,
+                                 auth=auth,
+                                 verify=verify)
 
         if not response.ok:
             raise Exception(response.text)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
index ce15eda9a0..103f1355da 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
@@ -210,8 +210,9 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
 
         url = "{}/api/jobs".format(self.deadline_url)
         auth = instance.data["deadline"]["auth"]
-        response = requests_post(url, json=payload, timeout=10,
-                                 auth=auth)
+        verify = instance.data["deadline"]["verify"]
+        response = requests_post(
+            url, json=payload, timeout=10, auth=auth, verify=verify)
         if not response.ok:
             raise Exception(response.text)
 
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 0f505dce78..64313c5c4d 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
@@ -304,8 +304,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
 
         url = "{}/api/jobs".format(self.deadline_url)
         auth = instance.data["deadline"]["auth"]
-        response = requests_post(url, json=payload, timeout=10,
-                                 auth=auth)
+        verify = instance.data["deadline"]["verify"]
+        response = requests_post(
+            url, json=payload, timeout=10, auth=auth, verify=verify)
         if not response.ok:
             raise Exception(response.text)
 

From 61fcc3ddecc2121d4947344215cce3dbff8caff5 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 15 May 2024 17:47:37 +0200
Subject: [PATCH 086/119] AY-1110 - use get_addon_site_settings from ayon_api

Method was not available previously
---
 .../deadline/plugins/publish/collect_user_credentials.py   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
index 99d75ecb9e..30e3703b58 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
@@ -12,7 +12,7 @@ Provides:
 """
 import pyblish.api
 
-from ayon_api import get_server_api_connection
+from ayon_api import get_addon_site_settings
 from ayon_core.modules.deadline.deadline_module import DeadlineModule
 from ayon_core.modules.deadline import __version__
 
@@ -81,9 +81,8 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
 
         if not deadline_info["require_authentication"]:
             return
-        # TODO import 'get_addon_site_settings' when available 
-        #   in public 'ayon_api'
-        local_settings = get_server_api_connection().get_addon_site_settings(
+
+        local_settings = get_addon_site_settings(
             DeadlineModule.name, __version__)
         local_settings = local_settings["local_settings"]
         for server_info in local_settings:

From b300db793a9af3d93e093df074dbf07685440f82 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:28:19 +0200
Subject: [PATCH 087/119] move deprecated functions at the end of file

---
 client/ayon_core/pipeline/colorspace.py | 215 ++++++++++++------------
 1 file changed, 106 insertions(+), 109 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 3503d0c534..c081b58752 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -195,17 +195,6 @@ def get_colorspace_name_from_filepath(
     return colorspace_name
 
 
-# TODO: remove this in future - backward compatibility
-@deprecated("get_imageio_file_rules_colorspace_from_filepath")
-def get_imageio_colorspace_from_filepath(*args, **kwargs):
-    return get_imageio_file_rules_colorspace_from_filepath(*args, **kwargs)
-
-# TODO: remove this in future - backward compatibility
-@deprecated("get_imageio_file_rules_colorspace_from_filepath")
-def get_colorspace_from_filepath(*args, **kwargs):
-    return get_imageio_file_rules_colorspace_from_filepath(*args, **kwargs)
-
-
 def get_imageio_file_rules_colorspace_from_filepath(
     filepath,
     host_name,
@@ -394,21 +383,6 @@ def validate_imageio_colorspace_in_config(config_path, colorspace_name):
     return True
 
 
-# TODO: remove this in future - backward compatibility
-@deprecated("_get_wrapped_with_subprocess")
-def get_data_subprocess(config_path, data_type):
-    """[Deprecated] Get data via subprocess
-
-    Wrapper for Python 2 hosts.
-
-    Args:
-        config_path (str): path leading to config.ocio file
-    """
-    return _get_wrapped_with_subprocess(
-        "config", data_type, in_path=config_path,
-    )
-
-
 def _get_wrapped_with_subprocess(command_group, command, **kwargs):
     """Get data via subprocess
 
@@ -673,24 +647,6 @@ def get_colorspaces_enumerator_items(
     return labeled_colorspaces
 
 
-# TODO: remove this in future - backward compatibility
-@deprecated("_get_wrapped_with_subprocess")
-def get_colorspace_data_subprocess(config_path):
-    """[Deprecated] Get colorspace data via subprocess
-
-    Wrapper for Python 2 hosts.
-
-    Args:
-        config_path (str): path leading to config.ocio file
-
-    Returns:
-        dict: colorspace and family in couple
-    """
-    return _get_wrapped_with_subprocess(
-        "config", "get_colorspace", in_path=config_path
-    )
-
-
 def get_ocio_config_views(config_path):
     """Get all viewer data
 
@@ -716,71 +672,6 @@ def get_ocio_config_views(config_path):
     return _get_views_data(config_path)
 
 
-# TODO: remove this in future - backward compatibility
-@deprecated("_get_wrapped_with_subprocess")
-def get_views_data_subprocess(config_path):
-    """[Deprecated] Get viewers data via subprocess
-
-    Wrapper for Python 2 hosts.
-
-    Args:
-        config_path (str): path leading to config.ocio file
-
-    Returns:
-        dict: `display/viewer` and viewer data
-    """
-    return _get_wrapped_with_subprocess(
-        "config", "get_views", in_path=config_path
-    )
-
-
-@deprecated("get_imageio_config_preset")
-def get_imageio_config(
-    project_name,
-    host_name,
-    project_settings=None,
-    anatomy_data=None,
-    anatomy=None,
-    env=None
-):
-    """Returns config data from settings
-
-    Config path is formatted in `path` key
-    and original settings input is saved into `template` key.
-
-    Deprecated:
-        Deprecated since '0.3.1' . Use `get_imageio_config_preset` instead.
-
-    Args:
-        project_name (str): project name
-        host_name (str): host name
-        project_settings (Optional[dict]): Project settings.
-        anatomy_data (Optional[dict]): anatomy formatting data.
-        anatomy (Optional[Anatomy]): Anatomy object.
-        env (Optional[dict]): Environment variables.
-
-    Returns:
-        dict: config path data or empty dict
-
-    """
-    if not anatomy_data:
-        from .context_tools import get_current_context_template_data
-        anatomy_data = get_current_context_template_data()
-
-    task_name = anatomy_data.get("task", {}).get("name")
-    folder_path = anatomy_data.get("folder", {}).get("path")
-    return get_imageio_config_preset(
-        project_name,
-        folder_path,
-        task_name,
-        host_name,
-        anatomy=anatomy,
-        project_settings=project_settings,
-        template_data=anatomy_data,
-        env=env,
-    )
-
-
 def _get_global_config_data(
     project_name,
     host_name,
@@ -1437,3 +1328,109 @@ def get_current_context_imageio_config_preset(
         template_data=template_data,
         env=env,
     )
+
+
+# --- Deprecated functions ---
+@deprecated("get_imageio_file_rules_colorspace_from_filepath")
+def get_imageio_colorspace_from_filepath(*args, **kwargs):
+    return get_imageio_file_rules_colorspace_from_filepath(*args, **kwargs)
+
+
+@deprecated("get_imageio_file_rules_colorspace_from_filepath")
+def get_colorspace_from_filepath(*args, **kwargs):
+    return get_imageio_file_rules_colorspace_from_filepath(*args, **kwargs)
+
+
+@deprecated("_get_wrapped_with_subprocess")
+def get_colorspace_data_subprocess(config_path):
+    """[Deprecated] Get colorspace data via subprocess
+
+    Wrapper for Python 2 hosts.
+
+    Args:
+        config_path (str): path leading to config.ocio file
+
+    Returns:
+        dict: colorspace and family in couple
+    """
+    return _get_wrapped_with_subprocess(
+        "config", "get_colorspace", in_path=config_path
+    )
+
+
+@deprecated("_get_wrapped_with_subprocess")
+def get_views_data_subprocess(config_path):
+    """[Deprecated] Get viewers data via subprocess
+
+    Wrapper for Python 2 hosts.
+
+    Args:
+        config_path (str): path leading to config.ocio file
+
+    Returns:
+        dict: `display/viewer` and viewer data
+    """
+    return _get_wrapped_with_subprocess(
+        "config", "get_views", in_path=config_path
+    )
+
+
+@deprecated("_get_wrapped_with_subprocess")
+def get_data_subprocess(config_path, data_type):
+    """[Deprecated] Get data via subprocess
+
+    Wrapper for Python 2 hosts.
+
+    Args:
+        config_path (str): path leading to config.ocio file
+    """
+    return _get_wrapped_with_subprocess(
+        "config", data_type, in_path=config_path,
+    )
+
+
+@deprecated("get_imageio_config_preset")
+def get_imageio_config(
+    project_name,
+    host_name,
+    project_settings=None,
+    anatomy_data=None,
+    anatomy=None,
+    env=None
+):
+    """Returns config data from settings
+
+    Config path is formatted in `path` key
+    and original settings input is saved into `template` key.
+
+    Deprecated:
+        Deprecated since '0.3.1' . Use `get_imageio_config_preset` instead.
+
+    Args:
+        project_name (str): project name
+        host_name (str): host name
+        project_settings (Optional[dict]): Project settings.
+        anatomy_data (Optional[dict]): anatomy formatting data.
+        anatomy (Optional[Anatomy]): Anatomy object.
+        env (Optional[dict]): Environment variables.
+
+    Returns:
+        dict: config path data or empty dict
+
+    """
+    if not anatomy_data:
+        from .context_tools import get_current_context_template_data
+        anatomy_data = get_current_context_template_data()
+
+    task_name = anatomy_data.get("task", {}).get("name")
+    folder_path = anatomy_data.get("folder", {}).get("path")
+    return get_imageio_config_preset(
+        project_name,
+        folder_path,
+        task_name,
+        host_name,
+        anatomy=anatomy,
+        project_settings=project_settings,
+        template_data=anatomy_data,
+        env=env,
+    )

From 4d398e21371ff8a840d14f35887a4107bbcf46f1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:32:04 +0200
Subject: [PATCH 088/119] added functions that are using 'PyOpenColorIO'

---
 client/ayon_core/pipeline/colorspace.py | 170 ++++++++++++++++++++++++
 1 file changed, 170 insertions(+)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index c081b58752..562e698f75 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1294,6 +1294,176 @@ def _get_display_view_colorspace_subprocess(config_path, display, view):
             return json.load(f)
 
 
+# --- Implementation of logic using 'PyOpenColorIO' ---
+def _get_ocio_config(config_path):
+    """Helper function to create OCIO config object.
+
+    Args:
+        config_path (str): Path to config.
+
+    Returns:
+        PyOpenColorIO.Config: OCIO config for the confing path.
+
+    """
+    import PyOpenColorIO
+
+    config_path = os.path.abspath(config_path)
+
+    if not os.path.isfile(config_path):
+        raise IOError("Input path should be `config.ocio` file")
+
+    return PyOpenColorIO.Config.CreateFromFile(config_path)
+
+
+def _get_config_file_rules_colorspace_from_filepath(config_path, filepath):
+    """Return found colorspace data found in v2 file rules.
+
+    Args:
+        config_path (str): path string leading to config.ocio
+        filepath (str): path string leading to v2 file rules
+
+    Raises:
+        IOError: Input config does not exist.
+
+    Returns:
+        dict: aggregated available colorspaces
+
+    """
+    config = _get_ocio_config(config_path)
+
+    # TODO: use `parseColorSpaceFromString` instead if ocio v1
+    return config.getColorSpaceFromFilepath(str(filepath))
+
+
+def _get_config_version_data(config_path):
+    """Return major and minor version info.
+
+    Args:
+        config_path (str): path string leading to config.ocio
+
+    Raises:
+        IOError: Input config does not exist.
+
+    Returns:
+        dict: minor and major keys with values
+
+    """
+    config = _get_ocio_config(config_path)
+
+    return {
+        "major": config.getMajorVersion(),
+        "minor": config.getMinorVersion()
+    }
+
+
+def _get_display_view_colorspace_name(config_path, display, view):
+    """Returns the colorspace attribute of the (display, view) pair.
+
+    Args:
+        config_path (str): path string leading to config.ocio
+        display (str): display name e.g. "ACES"
+        view (str): view name e.g. "sRGB"
+
+    Raises:
+        IOError: Input config does not exist.
+
+    Returns:
+        str: view color space name e.g. "Output - sRGB"
+
+    """
+    config = _get_ocio_config(config_path)
+    return config.getDisplayViewColorSpaceName(display, view)
+
+
+def _get_ocio_config_colorspaces(config_path):
+    """Return all found colorspace data.
+
+    Args:
+        config_path (str): path string leading to config.ocio
+
+    Raises:
+        IOError: Input config does not exist.
+
+    Returns:
+        dict: aggregated available colorspaces
+
+    """
+    config = _get_ocio_config(config_path)
+
+    colorspace_data = {
+        "roles": {},
+        "colorspaces": {
+            color.getName(): {
+                "family": color.getFamily(),
+                "categories": list(color.getCategories()),
+                "aliases": list(color.getAliases()),
+                "equalitygroup": color.getEqualityGroup(),
+            }
+            for color in config.getColorSpaces()
+        },
+        "displays_views": {
+            f"{view} ({display})": {
+                "display": display,
+                "view": view
+
+            }
+            for display in config.getDisplays()
+            for view in config.getViews(display)
+        },
+        "looks": {}
+    }
+
+    # add looks
+    looks = config.getLooks()
+    if looks:
+        colorspace_data["looks"] = {
+            look.getName(): {"process_space": look.getProcessSpace()}
+            for look in looks
+        }
+
+    # add roles
+    roles = config.getRoles()
+    if roles:
+        colorspace_data["roles"] = {
+            role: {"colorspace": colorspace}
+            for (role, colorspace) in roles
+        }
+
+    return colorspace_data
+
+
+def _get_ocio_config_views(config_path):
+    """Return all found viewer data.
+
+    Args:
+        config_path (str): path string leading to config.ocio
+
+    Raises:
+        IOError: Input config does not exist.
+
+    Returns:
+        dict: aggregated available viewers
+
+    """
+    config = _get_ocio_config(config_path)
+
+    output = {}
+    for display in config.getDisplays():
+        for view in config.getViews(display):
+            colorspace = config.getDisplayViewColorSpaceName(display, view)
+            # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views # noqa
+            if colorspace == "<USE_DISPLAY_NAME>":
+                colorspace = display
+
+            output[f"{display}/{view}"] = {
+                "display": display,
+                "view": view,
+                "colorspace": colorspace
+            }
+
+    return output
+
+
 # --- Current context functions ---
 def get_current_context_imageio_config_preset(
     anatomy=None,

From b0340f4f3b94e1dae75305410dda2c33c70ad03a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:35:42 +0200
Subject: [PATCH 089/119] renamed 'compatibility_check' to
 'has_compatible_ocio_package'

---
 client/ayon_core/pipeline/colorspace.py | 58 ++++++++++++++++---------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 562e698f75..a503c37101 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -107,6 +107,27 @@ def _make_temp_json_file():
             os.remove(temporary_json_filepath)
 
 
+def has_compatible_ocio_package():
+    """Current process has available compatible 'PyOpenColorIO'.
+
+    Returns:
+        bool: True if compatible package is available.
+
+    """
+    if CachedData.has_compatible_ocio_package is not None:
+        return CachedData.has_compatible_ocio_package
+
+    try:
+        import PyOpenColorIO  # noqa: F401
+        # TODO validate 'PyOpenColorIO' version
+        CachedData.has_compatible_ocio_package = True
+    except ImportError:
+        CachedData.has_compatible_ocio_package = False
+
+    # compatible
+    return CachedData.has_compatible_ocio_package
+
+
 def get_ocio_config_script_path():
     """Get path to ocio wrapper script
 
@@ -261,7 +282,7 @@ def get_config_file_rules_colorspace_from_filepath(config_path, filepath):
     Returns:
         Union[str, None]: matching colorspace name
     """
-    if not compatibility_check():
+    if not has_compatible_ocio_package():
         # python environment is not compatible with PyOpenColorIO
         # needs to be run in subprocess
         result_data = _get_wrapped_with_subprocess(
@@ -418,28 +439,12 @@ def _get_wrapped_with_subprocess(command_group, command, **kwargs):
             return json.load(f_)
 
 
-# TODO: this should be part of ocio_wrapper.py
-def compatibility_check():
-    """Making sure PyOpenColorIO is importable"""
-    if CachedData.has_compatible_ocio_package is not None:
-        return CachedData.has_compatible_ocio_package
-
-    try:
-        import PyOpenColorIO  # noqa: F401
-        CachedData.has_compatible_ocio_package = True
-    except ImportError:
-        CachedData.has_compatible_ocio_package = False
-
-    # compatible
-    return CachedData.has_compatible_ocio_package
-
-
 # TODO: this should be part of ocio_wrapper.py
 def compatibility_check_config_version(config_path, major=1, minor=None):
     """Making sure PyOpenColorIO config version is compatible"""
 
     if not CachedData.config_version_data.get(config_path):
-        if compatibility_check():
+        if has_compatible_ocio_package():
             # TODO: refactor this so it is not imported but part of this file
             from ayon_core.scripts.ocio_wrapper import _get_version_data
 
@@ -479,7 +484,7 @@ def get_ocio_config_colorspaces(config_path):
         dict: colorspace and family in couple
     """
     if not CachedData.ocio_config_colorspaces.get(config_path):
-        if not compatibility_check():
+        if not has_compatible_ocio_package():
             # python environment is not compatible with PyOpenColorIO
             # needs to be run in subprocess
             config_colorspaces = _get_wrapped_with_subprocess(
@@ -659,7 +664,7 @@ def get_ocio_config_views(config_path):
     Returns:
         dict: `display/viewer` and viewer data
     """
-    if not compatibility_check():
+    if not has_compatible_ocio_package():
         # python environment is not compatible with PyOpenColorIO
         # needs to be run in subprocess
         return _get_wrapped_with_subprocess(
@@ -1250,7 +1255,7 @@ def get_display_view_colorspace_name(config_path, display, view):
         str: View color space name. e.g. "Output - sRGB"
 
     """
-    if not compatibility_check():
+    if not has_compatible_ocio_package():
         # python environment is not compatible with PyOpenColorIO
         # needs to be run in subprocess
         return _get_display_view_colorspace_subprocess(
@@ -1501,6 +1506,17 @@ def get_current_context_imageio_config_preset(
 
 
 # --- Deprecated functions ---
+@deprecated("has_compatible_ocio_package")
+def compatibility_check():
+    """Making sure PyOpenColorIO is importable
+
+    Deprecated:
+        Deprecated since '0.3.2'. Use `has_compatible_ocio_package` instead.
+    """
+
+    return has_compatible_ocio_package()
+
+
 @deprecated("get_imageio_file_rules_colorspace_from_filepath")
 def get_imageio_colorspace_from_filepath(*args, **kwargs):
     return get_imageio_file_rules_colorspace_from_filepath(*args, **kwargs)

From c668ab49397b564dab51a9f901ef9e76a4974d87 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:38:41 +0200
Subject: [PATCH 090/119] modified ocio wrapper to use new functions

---
 client/ayon_core/scripts/ocio_wrapper.py | 480 +++++++----------------
 1 file changed, 142 insertions(+), 338 deletions(-)

diff --git a/client/ayon_core/scripts/ocio_wrapper.py b/client/ayon_core/scripts/ocio_wrapper.py
index 0a78e33c1f..9cbab32956 100644
--- a/client/ayon_core/scripts/ocio_wrapper.py
+++ b/client/ayon_core/scripts/ocio_wrapper.py
@@ -1,28 +1,31 @@
 """OpenColorIO Wrapper.
 
-Only to be interpreted by Python 3. It is run in subprocess in case
-Python 2 hosts needs to use it. Or it is used as module for Python 3
-processing.
-
-Providing functionality:
-- get_colorspace - console command - python 2
-                 - returning all available color spaces
-                   found in input config path.
-- _get_colorspace_data - python 3 - module function
-                      - returning all available colorspaces
-                        found in input config path.
-- get_views - console command - python 2
-            - returning all available viewers
-              found in input config path.
-- _get_views_data - python 3 - module function
-                 - returning all available viewers
-                   found in input config path.
+Receive OpenColorIO information and store it in JSON format for processed
+that don't have access to OpenColorIO or their version of OpenColorIO is
+not compatible.
 """
 
-import click
 import json
 from pathlib import Path
-import PyOpenColorIO as ocio
+
+import click
+
+from ayon_core.pipeline.colorspace import (
+    has_compatible_ocio_package,
+    get_display_view_colorspace_name,
+    get_config_file_rules_colorspace_from_filepath,
+    get_config_version_data,
+    get_ocio_config_views,
+    get_ocio_config_colorspaces,
+)
+
+
+def _save_output_to_json_file(output, output_path):
+    json_path = Path(output_path)
+    with open(json_path, "w") as stream:
+        json.dump(output, stream)
+
+    print(f"Data are saved to '{json_path}'")
 
 
 @click.group()
@@ -51,383 +54,184 @@ def colorspace():
 
 
 @config.command(
-    name="get_colorspace",
-    help=(
-        "return all colorspaces from config file "
-        "--path input arg is required"
-    )
-)
-@click.option("--in_path", required=True,
-              help="path where to read ocio config file",
-              type=click.Path(exists=True))
-@click.option("--out_path", required=True,
-              help="path where to write output json file",
-              type=click.Path())
-def get_colorspace(in_path, out_path):
+    name="get_ocio_config_colorspaces",
+    help="return all colorspaces from config file")
+@click.option(
+    "--config_path",
+    required=True,
+    help="OCIO config path to read ocio config file.",
+    type=click.Path(exists=True))
+@click.option(
+    "--output_path",
+    required=True,
+    help="path where to write output json file",
+    type=click.Path())
+def _get_ocio_config_colorspaces(config_path, output_path):
     """Aggregate all colorspace to file.
 
-    Python 2 wrapped console command
-
     Args:
-        in_path (str): config file path string
-        out_path (str): temp json file path string
+        config_path (str): config file path string
+        output_path (str): temp json file path string
 
     Example of use:
     > pyton.exe ./ocio_wrapper.py config get_colorspace
-        --in_path=<path> --out_path=<path>
+        --config_path <path> --output_path <path>
     """
-    json_path = Path(out_path)
-
-    out_data = _get_colorspace_data(in_path)
-
-    with open(json_path, "w") as f_:
-        json.dump(out_data, f_)
-
-    print(f"Colorspace data are saved to '{json_path}'")
-
-
-def _get_colorspace_data(config_path):
-    """Return all found colorspace data.
-
-    Args:
-        config_path (str): path string leading to config.ocio
-
-    Raises:
-        IOError: Input config does not exist.
-
-    Returns:
-        dict: aggregated available colorspaces
-    """
-    config_path = Path(config_path)
-
-    if not config_path.is_file():
-        raise IOError(
-            f"Input path `{config_path}` should be `config.ocio` file")
-
-    config = ocio.Config().CreateFromFile(str(config_path))
-
-    colorspace_data = {
-        "roles": {},
-        "colorspaces": {
-            color.getName(): {
-                "family": color.getFamily(),
-                "categories": list(color.getCategories()),
-                "aliases": list(color.getAliases()),
-                "equalitygroup": color.getEqualityGroup(),
-            }
-            for color in config.getColorSpaces()
-        },
-        "displays_views": {
-            f"{view} ({display})": {
-                "display": display,
-                "view": view
-
-            }
-            for display in config.getDisplays()
-            for view in config.getViews(display)
-        },
-        "looks": {}
-    }
-
-    # add looks
-    looks = config.getLooks()
-    if looks:
-        colorspace_data["looks"] = {
-            look.getName(): {"process_space": look.getProcessSpace()}
-            for look in looks
-        }
-
-    # add roles
-    roles = config.getRoles()
-    if roles:
-        colorspace_data["roles"] = {
-            role: {"colorspace": colorspace}
-            for (role, colorspace) in roles
-        }
-
-    return colorspace_data
+    _save_output_to_json_file(
+        get_ocio_config_colorspaces(config_path),
+        output_path
+    )
 
 
 @config.command(
-    name="get_views",
-    help=(
-        "return all viewers from config file "
-        "--path input arg is required"
-    )
-)
-@click.option("--in_path", required=True,
-              help="path where to read ocio config file",
-              type=click.Path(exists=True))
-@click.option("--out_path", required=True,
-              help="path where to write output json file",
-              type=click.Path())
-def get_views(in_path, out_path):
+    name="get_ocio_config_views",
+    help="All viewers from config file")
+@click.option(
+    "--config_path",
+    required=True,
+    help="OCIO config path to read ocio config file.",
+    type=click.Path(exists=True))
+@click.option(
+    "--output_path",
+    required=True,
+    help="path where to write output json file",
+    type=click.Path())
+def _get_ocio_config_views(config_path, output_path):
     """Aggregate all viewers to file.
 
-    Python 2 wrapped console command
-
     Args:
-        in_path (str): config file path string
-        out_path (str): temp json file path string
+        config_path (str): config file path string
+        output_path (str): temp json file path string
 
     Example of use:
     > pyton.exe ./ocio_wrapper.py config get_views \
-        --in_path=<path> --out_path=<path>
+        --config_path <path> --output <path>
     """
-    json_path = Path(out_path)
-
-    out_data = _get_views_data(in_path)
-
-    with open(json_path, "w") as f_:
-        json.dump(out_data, f_)
-
-    print(f"Viewer data are saved to '{json_path}'")
-
-
-def _get_views_data(config_path):
-    """Return all found viewer data.
-
-    Args:
-        config_path (str): path string leading to config.ocio
-
-    Raises:
-        IOError: Input config does not exist.
-
-    Returns:
-        dict: aggregated available viewers
-    """
-    config_path = Path(config_path)
-
-    if not config_path.is_file():
-        raise IOError("Input path should be `config.ocio` file")
-
-    config = ocio.Config().CreateFromFile(str(config_path))
-
-    data_ = {}
-    for display in config.getDisplays():
-        for view in config.getViews(display):
-            colorspace = config.getDisplayViewColorSpaceName(display, view)
-            # Special token. See https://opencolorio.readthedocs.io/en/latest/guides/authoring/authoring.html#shared-views # noqa
-            if colorspace == "<USE_DISPLAY_NAME>":
-                colorspace = display
-
-            data_[f"{display}/{view}"] = {
-                "display": display,
-                "view": view,
-                "colorspace": colorspace
-            }
-
-    return data_
+    _save_output_to_json_file(
+        get_ocio_config_views(config_path),
+        output_path
+    )
 
 
 @config.command(
-    name="get_version",
-    help=(
-        "return major and minor version from config file "
-        "--config_path input arg is required"
-        "--out_path input arg is required"
-    )
-)
-@click.option("--config_path", required=True,
-              help="path where to read ocio config file",
-              type=click.Path(exists=True))
-@click.option("--out_path", required=True,
-              help="path where to write output json file",
-              type=click.Path())
-def get_version(config_path, out_path):
+    name="get_config_version_data",
+    help="Get major and minor version from config file")
+@click.option(
+    "--config_path",
+    required=True,
+    help="OCIO config path to read ocio config file.",
+    type=click.Path(exists=True))
+@click.option(
+    "--output_path",
+    required=True,
+    help="path where to write output json file",
+    type=click.Path())
+def _get_config_version_data(config_path, output_path):
     """Get version of config.
 
-    Python 2 wrapped console command
-
     Args:
         config_path (str): ocio config file path string
-        out_path (str): temp json file path string
+        output_path (str): temp json file path string
 
     Example of use:
     > pyton.exe ./ocio_wrapper.py config get_version \
-        --config_path=<path> --out_path=<path>
+        --config_path <path> --output_path <path>
     """
-    json_path = Path(out_path)
-
-    out_data = _get_version_data(config_path)
-
-    with open(json_path, "w") as f_:
-        json.dump(out_data, f_)
-
-    print(f"Config version data are saved to '{json_path}'")
-
-
-def _get_version_data(config_path):
-    """Return major and minor version info.
-
-    Args:
-        config_path (str): path string leading to config.ocio
-
-    Raises:
-        IOError: Input config does not exist.
-
-    Returns:
-        dict: minor and major keys with values
-    """
-    config_path = Path(config_path)
-
-    if not config_path.is_file():
-        raise IOError("Input path should be `config.ocio` file")
-
-    config = ocio.Config().CreateFromFile(str(config_path))
-
-    return {
-        "major": config.getMajorVersion(),
-        "minor": config.getMinorVersion()
-    }
+    _save_output_to_json_file(
+        get_config_version_data(config_path),
+        output_path
+    )
 
 
 @colorspace.command(
     name="get_config_file_rules_colorspace_from_filepath",
-    help=(
-        "return colorspace from filepath "
-        "--config_path - ocio config file path (input arg is required) "
-        "--filepath - any file path (input arg is required) "
-        "--out_path - temp json file path (input arg is required)"
-    )
-)
-@click.option("--config_path", required=True,
-              help="path where to read ocio config file",
-              type=click.Path(exists=True))
-@click.option("--filepath", required=True,
-              help="path to file to get colorspace from",
-              type=click.Path())
-@click.option("--out_path", required=True,
-              help="path where to write output json file",
-              type=click.Path())
-def get_config_file_rules_colorspace_from_filepath(
-    config_path, filepath, out_path
+    help="Colorspace file rules from filepath")
+@click.option(
+    "--config_path",
+    required=True,
+    help="OCIO config path to read ocio config file.",
+    type=click.Path(exists=True))
+@click.option(
+    "--filepath",
+    equired=True,
+    help="Path to file to get colorspace from.",
+    type=click.Path())
+@click.option(
+    "--output_path",
+    required=True,
+    help="Path where to write output json file.",
+    type=click.Path())
+def _get_config_file_rules_colorspace_from_filepath(
+    config_path, filepath, output_path
 ):
     """Get colorspace from file path wrapper.
 
-    Python 2 wrapped console command
-
     Args:
         config_path (str): config file path string
         filepath (str): path string leading to file
-        out_path (str): temp json file path string
+        output_path (str): temp json file path string
 
     Example of use:
-    > pyton.exe ./ocio_wrapper.py \
+    > python.exe ./ocio_wrapper.py \
         colorspace get_config_file_rules_colorspace_from_filepath \
-        --config_path=<path> --filepath=<path> --out_path=<path>
+        --config_path <path> --filepath <path> --output_path <path>
     """
-    json_path = Path(out_path)
-
-    colorspace = _get_config_file_rules_colorspace_from_filepath(
-        config_path, filepath)
-
-    with open(json_path, "w") as f_:
-        json.dump(colorspace, f_)
-
-    print(f"Colorspace name is saved to '{json_path}'")
-
-
-def _get_config_file_rules_colorspace_from_filepath(config_path, filepath):
-    """Return found colorspace data found in v2 file rules.
-
-    Args:
-        config_path (str): path string leading to config.ocio
-        filepath (str): path string leading to v2 file rules
-
-    Raises:
-        IOError: Input config does not exist.
-
-    Returns:
-        dict: aggregated available colorspaces
-    """
-    config_path = Path(config_path)
-
-    if not config_path.is_file():
-        raise IOError(
-            f"Input path `{config_path}` should be `config.ocio` file")
-
-    config = ocio.Config().CreateFromFile(str(config_path))
-
-    # TODO: use `parseColorSpaceFromString` instead if ocio v1
-    colorspace = config.getColorSpaceFromFilepath(str(filepath))
-
-    return colorspace
-
-
-def _get_display_view_colorspace_name(config_path, display, view):
-    """Returns the colorspace attribute of the (display, view) pair.
-
-    Args:
-        config_path (str): path string leading to config.ocio
-        display (str): display name e.g. "ACES"
-        view (str): view name e.g. "sRGB"
-
-
-    Raises:
-        IOError: Input config does not exist.
-
-    Returns:
-        view color space name (str) e.g. "Output - sRGB"
-    """
-
-    config_path = Path(config_path)
-
-    if not config_path.is_file():
-        raise IOError("Input path should be `config.ocio` file")
-
-    config = ocio.Config.CreateFromFile(str(config_path))
-    colorspace = config.getDisplayViewColorSpaceName(display, view)
-
-    return colorspace
+    _save_output_to_json_file(
+        get_config_file_rules_colorspace_from_filepath(config_path, filepath),
+        output_path
+    )
 
 
 @config.command(
     name="get_display_view_colorspace_name",
     help=(
-        "return default view colorspace name "
-        "for the given display and view "
-        "--path input arg is required"
-    )
-)
-@click.option("--in_path", required=True,
-              help="path where to read ocio config file",
-              type=click.Path(exists=True))
-@click.option("--out_path", required=True,
-              help="path where to write output json file",
-              type=click.Path())
-@click.option("--display", required=True,
-              help="display name",
-              type=click.STRING)
-@click.option("--view", required=True,
-              help="view name",
-              type=click.STRING)
-def get_display_view_colorspace_name(in_path, out_path,
-                                     display, view):
+        "Default view colorspace name for the given display and view"
+    ))
+@click.option(
+    "--config_path",
+    required=True,
+    help="path where to read ocio config file",
+    type=click.Path(exists=True))
+@click.option(
+    "--display",
+    required=True,
+    help="Display name",
+    type=click.STRING)
+@click.option(
+    "--view",
+    required=True,
+    help="view name",
+    type=click.STRING)
+@click.option(
+    "--output_path",
+    required=True,
+    help="path where to write output json file",
+    type=click.Path())
+def _get_display_view_colorspace_name(
+    config_path, display, view, output_path
+):
     """Aggregate view colorspace name to file.
 
     Wrapper command for processes without access to OpenColorIO
 
     Args:
-        in_path (str): config file path string
-        out_path (str): temp json file path string
+        config_path (str): config file path string
+        output_path (str): temp json file path string
         display (str): display name e.g. "ACES"
         view (str): view name e.g. "sRGB"
 
     Example of use:
     > pyton.exe ./ocio_wrapper.py config \
-        get_display_view_colorspace_name --in_path=<path> \
-        --out_path=<path> --display=<display> --view=<view>
+        get_display_view_colorspace_name --config_path <path> \
+        --output_path <path> --display <display> --view <view>
     """
+    _save_output_to_json_file(
+        get_display_view_colorspace_name(config_path, display, view),
+        output_path
+    )
 
-    out_data = _get_display_view_colorspace_name(in_path,
-                                                 display,
-                                                 view)
 
-    with open(out_path, "w") as f:
-        json.dump(out_data, f)
-
-    print(f"Display view colorspace saved to '{out_path}'")
-
-if __name__ == '__main__':
+if __name__ == "__main__":
+    if not has_compatible_ocio_package():
+        raise RuntimeError("OpenColorIO is not available.")
     main()

From b23faf324903e5c5b4ae2deaa76087c3358b405d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:40:50 +0200
Subject: [PATCH 091/119] modified existing functions to use functions from
 colorspace.py

---
 client/ayon_core/pipeline/colorspace.py | 286 +++++++++++-------------
 1 file changed, 132 insertions(+), 154 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index a503c37101..c347638937 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -18,11 +18,10 @@ from ayon_core.lib import (
     run_ayon_launcher_process,
     Logger,
 )
+from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
 from ayon_core.pipeline import Anatomy
 from ayon_core.pipeline.template_data import get_template_data
 from ayon_core.pipeline.load import get_representation_path_with_anatomy
-from ayon_core.lib.transcoding import VIDEO_EXTENSIONS, IMAGE_EXTENSIONS
-
 
 log = Logger.get_logger(__name__)
 
@@ -281,26 +280,50 @@ def get_config_file_rules_colorspace_from_filepath(config_path, filepath):
 
     Returns:
         Union[str, None]: matching colorspace name
+
     """
-    if not has_compatible_ocio_package():
-        # python environment is not compatible with PyOpenColorIO
-        # needs to be run in subprocess
+    if has_compatible_ocio_package():
+        result_data = _get_config_file_rules_colorspace_from_filepath(
+            config_path, filepath
+        )
+    else:
         result_data = _get_wrapped_with_subprocess(
-            "colorspace", "get_config_file_rules_colorspace_from_filepath",
+            "colorspace",
+            "get_config_file_rules_colorspace_from_filepath",
             config_path=config_path,
             filepath=filepath
         )
-        if result_data:
-            return result_data[0]
-
-    # TODO: refactor this so it is not imported but part of this file
-    from ayon_core.scripts.ocio_wrapper import _get_config_file_rules_colorspace_from_filepath  # noqa: E501
-
-    result_data = _get_config_file_rules_colorspace_from_filepath(
-        config_path, filepath)
 
     if result_data:
         return result_data[0]
+    return None
+
+
+def get_config_version_data(config_path):
+    """Return major and minor version info.
+
+    Args:
+        config_path (str): path string leading to config.ocio
+
+    Raises:
+        IOError: Input config does not exist.
+
+    Returns:
+        dict: minor and major keys with values
+
+    """
+    if config_path not in CachedData.config_version_data:
+        if has_compatible_ocio_package():
+            version_data = _get_config_version_data(config_path)
+        else:
+            version_data = _get_wrapped_with_subprocess(
+                "config",
+                "get_config_version_data",
+                config_path=config_path
+            )
+        CachedData.config_version_data[config_path] = version_data
+
+    return deepcopy(CachedData.config_version_data[config_path])
 
 
 def parse_colorspace_from_filepath(
@@ -394,6 +417,7 @@ def validate_imageio_colorspace_in_config(config_path, colorspace_name):
 
     Returns:
         bool: True if exists
+
     """
     colorspaces = get_ocio_config_colorspaces(config_path)["colorspaces"]
     if colorspace_name not in colorspaces:
@@ -405,9 +429,7 @@ def validate_imageio_colorspace_in_config(config_path, colorspace_name):
 
 
 def _get_wrapped_with_subprocess(command_group, command, **kwargs):
-    """Get data via subprocess
-
-    Wrapper for Python 2 hosts.
+    """Get data via subprocess.
 
     Args:
         command_group (str): command group name
@@ -420,14 +442,16 @@ def _get_wrapped_with_subprocess(command_group, command, **kwargs):
     with _make_temp_json_file() as tmp_json_path:
         # Prepare subprocess arguments
         args = [
-            "run", get_ocio_config_script_path(),
-            command_group, command
+            "run",
+            get_ocio_config_script_path(),
+            command_group,
+            command
         ]
 
-        for key_, value_ in kwargs.items():
-            args.extend(("--{}".format(key_), value_))
+        for key, value in kwargs.items():
+            args.extend(("--{}".format(key), value))
 
-        args.append("--out_path")
+        args.append("--output_path")
         args.append(tmp_json_path)
 
         log.info("Executing: {}".format(" ".join(args)))
@@ -435,39 +459,23 @@ def _get_wrapped_with_subprocess(command_group, command, **kwargs):
         run_ayon_launcher_process(*args, logger=log)
 
         # return all colorspaces
-        with open(tmp_json_path, "r") as f_:
-            return json.load(f_)
+        with open(tmp_json_path, "r") as stream:
+            return json.load(stream)
 
 
-# TODO: this should be part of ocio_wrapper.py
 def compatibility_check_config_version(config_path, major=1, minor=None):
     """Making sure PyOpenColorIO config version is compatible"""
 
-    if not CachedData.config_version_data.get(config_path):
-        if has_compatible_ocio_package():
-            # TODO: refactor this so it is not imported but part of this file
-            from ayon_core.scripts.ocio_wrapper import _get_version_data
-
-            CachedData.config_version_data[config_path] = \
-                _get_version_data(config_path)
-
-        else:
-            # python environment is not compatible with PyOpenColorIO
-            # needs to be run in subprocess
-            CachedData.config_version_data[config_path] = \
-                _get_wrapped_with_subprocess(
-                    "config", "get_version", config_path=config_path
-            )
+    version_data = get_config_version_data(config_path)
 
     # check major version
-    if CachedData.config_version_data[config_path]["major"] != major:
+    if version_data["major"] != major:
         return False
 
     # check minor version
-    if minor and CachedData.config_version_data[config_path]["minor"] != minor:
+    if minor is not None and version_data["minor"] != minor:
         return False
 
-    # compatible
     return True
 
 
@@ -482,22 +490,20 @@ def get_ocio_config_colorspaces(config_path):
 
     Returns:
         dict: colorspace and family in couple
-    """
-    if not CachedData.ocio_config_colorspaces.get(config_path):
-        if not has_compatible_ocio_package():
-            # python environment is not compatible with PyOpenColorIO
-            # needs to be run in subprocess
-            config_colorspaces = _get_wrapped_with_subprocess(
-                "config", "get_colorspace", in_path=config_path
-            )
-        else:
-            # TODO: refactor this so it is not imported but part of this file
-            from ayon_core.scripts.ocio_wrapper import _get_colorspace_data
 
-            config_colorspaces = _get_colorspace_data(config_path)
+    """
+    if config_path not in CachedData.ocio_config_colorspaces:
+        if has_compatible_ocio_package():
+            config_colorspaces = _get_ocio_config_colorspaces(config_path)
+        else:
+            config_colorspaces = _get_wrapped_with_subprocess(
+                "config",
+                "get_ocio_config_colorspaces",
+                config_path=config_path
+            )
         CachedData.ocio_config_colorspaces[config_path] = config_colorspaces
 
-    return CachedData.ocio_config_colorspaces[config_path]
+    return deepcopy(CachedData.ocio_config_colorspaces[config_path])
 
 
 def convert_colorspace_enumerator_item(
@@ -571,16 +577,18 @@ def get_colorspaces_enumerator_items(
     Families can be used for building menu and submenus in gui.
 
     Args:
-        config_items (dict[str,dict]): colorspace data coming from
-            `get_ocio_config_colorspaces` function
-        include_aliases (bool): include aliases in result
-        include_looks (bool): include looks in result
-        include_roles (bool): include roles in result
+        config_items (dict[str,dict]): Colorspace data coming from
+            `get_ocio_config_colorspaces` function.
+        include_aliases (Optional[bool]): Include aliases in result.
+        include_looks (Optional[bool]): Include looks in result.
+        include_roles (Optional[bool]): Include roles in result.
+        include_display_views (Optional[bool]): Include display views
+            in result.
 
     Returns:
-        list[tuple[str,str]]: colorspace and family in couple
+        list[tuple[str, str]]: Colorspace and family in couples.
+
     """
-    labeled_colorspaces = []
     aliases = set()
     colorspaces = set()
     looks = set()
@@ -590,64 +598,74 @@ def get_colorspaces_enumerator_items(
         if items_type == "colorspaces":
             for color_name, color_data in colorspace_items.items():
                 if color_data.get("aliases"):
-                    aliases.update([
+                    aliases.update({
                         (
                             "aliases::{}".format(alias_name),
                             "[alias] {} ({})".format(alias_name, color_name)
                         )
                         for alias_name in color_data["aliases"]
-                    ])
+                    })
                 colorspaces.add((
                     "{}::{}".format(items_type, color_name),
                     "[colorspace] {}".format(color_name)
                 ))
 
         elif items_type == "looks":
-            looks.update([
+            looks.update({
                 (
                     "{}::{}".format(items_type, name),
                     "[look] {} ({})".format(name, role_data["process_space"])
                 )
                 for name, role_data in colorspace_items.items()
-            ])
+            })
 
         elif items_type == "displays_views":
-            display_views.update([
+            display_views.update({
                 (
                     "{}::{}".format(items_type, name),
                     "[view (display)] {}".format(name)
                 )
                 for name, _ in colorspace_items.items()
-            ])
+            })
 
         elif items_type == "roles":
-            roles.update([
+            roles.update({
                 (
                     "{}::{}".format(items_type, name),
                     "[role] {} ({})".format(name, role_data["colorspace"])
                 )
                 for name, role_data in colorspace_items.items()
-            ])
+            })
 
-    if roles and include_roles:
-        roles = sorted(roles, key=lambda x: x[0])
-        labeled_colorspaces.extend(roles)
+    def _sort_key_getter(item):
+        """Use colorspace for sorting."""
+        return item[0]
 
-    # add colorspaces as second so it is not first in menu
-    colorspaces = sorted(colorspaces, key=lambda x: x[0])
-    labeled_colorspaces.extend(colorspaces)
+    labeled_colorspaces = []
+    if include_roles:
+        labeled_colorspaces.extend(
+            sorted(roles, key=_sort_key_getter)
+        )
 
-    if aliases and include_aliases:
-        aliases = sorted(aliases, key=lambda x: x[0])
-        labeled_colorspaces.extend(aliases)
+    # Add colorspaces after roles, so it is not first in menu
+    labeled_colorspaces.extend(
+        sorted(colorspaces, key=_sort_key_getter)
+    )
 
-    if looks and include_looks:
-        looks = sorted(looks, key=lambda x: x[0])
-        labeled_colorspaces.extend(looks)
+    if include_aliases:
+        labeled_colorspaces.extend(
+            sorted(aliases, key=_sort_key_getter)
+        )
 
-    if display_views and include_display_views:
-        display_views = sorted(display_views, key=lambda x: x[0])
-        labeled_colorspaces.extend(display_views)
+    if include_looks:
+        labeled_colorspaces.extend(
+            sorted(looks, key=_sort_key_getter)
+        )
+
+    if include_display_views:
+        labeled_colorspaces.extend(
+            sorted(display_views, key=_sort_key_getter)
+        )
 
     return labeled_colorspaces
 
@@ -663,18 +681,16 @@ def get_ocio_config_views(config_path):
 
     Returns:
         dict: `display/viewer` and viewer data
+
     """
-    if not has_compatible_ocio_package():
-        # python environment is not compatible with PyOpenColorIO
-        # needs to be run in subprocess
-        return _get_wrapped_with_subprocess(
-            "config", "get_views", in_path=config_path
-        )
+    if has_compatible_ocio_package():
+        return _get_ocio_config_views(config_path)
 
-    # TODO: refactor this so it is not imported but part of this file
-    from ayon_core.scripts.ocio_wrapper import _get_views_data
-
-    return _get_views_data(config_path)
+    return _get_wrapped_with_subprocess(
+        "config",
+        "get_ocio_config_views",
+        config_path=config_path
+    )
 
 
 def _get_global_config_data(
@@ -1255,48 +1271,17 @@ def get_display_view_colorspace_name(config_path, display, view):
         str: View color space name. e.g. "Output - sRGB"
 
     """
-    if not has_compatible_ocio_package():
-        # python environment is not compatible with PyOpenColorIO
-        # needs to be run in subprocess
-        return _get_display_view_colorspace_subprocess(
+    if has_compatible_ocio_package():
+        return _get_display_view_colorspace_name(
             config_path, display, view
         )
-
-    from ayon_core.scripts.ocio_wrapper import _get_display_view_colorspace_name  # noqa
-
-    return _get_display_view_colorspace_name(config_path, display, view)
-
-
-def _get_display_view_colorspace_subprocess(config_path, display, view):
-    """Returns the colorspace attribute of the (display, view) pair
-        via subprocess.
-
-    Args:
-        config_path (str): path string leading to config.ocio
-        display (str): display name e.g. "ACES"
-        view (str): view name e.g. "sRGB"
-
-    Returns:
-        view color space name (str) e.g. "Output - sRGB"
-
-    """
-    with _make_temp_json_file() as tmp_json_path:
-        # Prepare subprocess arguments
-        args = [
-            "run", get_ocio_config_script_path(),
-            "config", "get_display_view_colorspace_name",
-            "--in_path", config_path,
-            "--out_path", tmp_json_path,
-            "--display", display,
-            "--view", view
-        ]
-        log.debug("Executing: {}".format(" ".join(args)))
-
-        run_ayon_launcher_process(*args, logger=log)
-
-        # return default view colorspace name
-        with open(tmp_json_path, "r") as f:
-            return json.load(f)
+    return _get_wrapped_with_subprocess(
+        "config",
+        "get_display_view_colorspace_name",
+        config_path=config_path,
+        display=display,
+        view=view
+    )
 
 
 # --- Implementation of logic using 'PyOpenColorIO' ---
@@ -1531,7 +1516,8 @@ def get_colorspace_from_filepath(*args, **kwargs):
 def get_colorspace_data_subprocess(config_path):
     """[Deprecated] Get colorspace data via subprocess
 
-    Wrapper for Python 2 hosts.
+    Deprecated:
+        Deprecated since OpenPype. Use `_get_wrapped_with_subprocess` instead.
 
     Args:
         config_path (str): path leading to config.ocio file
@@ -1540,7 +1526,9 @@ def get_colorspace_data_subprocess(config_path):
         dict: colorspace and family in couple
     """
     return _get_wrapped_with_subprocess(
-        "config", "get_colorspace", in_path=config_path
+        "config",
+        "get_ocio_config_colorspaces",
+        config_path=config_path
     )
 
 
@@ -1548,30 +1536,20 @@ def get_colorspace_data_subprocess(config_path):
 def get_views_data_subprocess(config_path):
     """[Deprecated] Get viewers data via subprocess
 
-    Wrapper for Python 2 hosts.
+    Deprecated:
+        Deprecated since OpenPype. Use `_get_wrapped_with_subprocess` instead.
 
     Args:
         config_path (str): path leading to config.ocio file
 
     Returns:
         dict: `display/viewer` and viewer data
+
     """
     return _get_wrapped_with_subprocess(
-        "config", "get_views", in_path=config_path
-    )
-
-
-@deprecated("_get_wrapped_with_subprocess")
-def get_data_subprocess(config_path, data_type):
-    """[Deprecated] Get data via subprocess
-
-    Wrapper for Python 2 hosts.
-
-    Args:
-        config_path (str): path leading to config.ocio file
-    """
-    return _get_wrapped_with_subprocess(
-        "config", data_type, in_path=config_path,
+        "config",
+        "get_ocio_config_views",
+        config_path=config_path
     )
 
 

From 25fe55aa316f8f5d16bd6c773d0aa3c1a3d07935 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:42:21 +0200
Subject: [PATCH 092/119] validate 'PyOpenColorIO' version

---
 client/ayon_core/pipeline/colorspace.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index c347638937..c29bdd762d 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -116,13 +116,21 @@ def has_compatible_ocio_package():
     if CachedData.has_compatible_ocio_package is not None:
         return CachedData.has_compatible_ocio_package
 
+    is_compatible = False
     try:
-        import PyOpenColorIO  # noqa: F401
-        # TODO validate 'PyOpenColorIO' version
-        CachedData.has_compatible_ocio_package = True
-    except ImportError:
-        CachedData.has_compatible_ocio_package = False
+        import PyOpenColorIO
 
+        # Check if PyOpenColorIO is compatible
+        # - version 2.0.0 or higher is required
+        # NOTE version 1 does not have '__version__' attribute
+        if hasattr(PyOpenColorIO, "__version__"):
+            version_parts = PyOpenColorIO.__version__.split(".")
+            major = int(version_parts[0])
+            is_compatible = (major, ) >= (2, )
+    except ImportError:
+        pass
+
+    CachedData.has_compatible_ocio_package = is_compatible
     # compatible
     return CachedData.has_compatible_ocio_package
 

From 8806463c7789fdcc2ce222576062c759c56c8b19 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:42:30 +0200
Subject: [PATCH 093/119] use raw DeprecationWarning

---
 client/ayon_core/pipeline/colorspace.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index c29bdd762d..b568e2cdf1 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -36,10 +36,6 @@ class CachedData:
     }
 
 
-class DeprecatedWarning(DeprecationWarning):
-    pass
-
-
 def deprecated(new_destination):
     """Mark functions as deprecated.
 
@@ -64,13 +60,13 @@ def deprecated(new_destination):
 
         @functools.wraps(decorated_func)
         def wrapper(*args, **kwargs):
-            warnings.simplefilter("always", DeprecatedWarning)
+            warnings.simplefilter("always", DeprecationWarning)
             warnings.warn(
                 (
                     "Call to deprecated function '{}'"
                     "\nFunction was moved or removed.{}"
                 ).format(decorated_func.__name__, warning_message),
-                category=DeprecatedWarning,
+                category=DeprecationWarning,
                 stacklevel=4
             )
             return decorated_func(*args, **kwargs)

From 3b93392eb75663351e04de49d2c55cf163cd56cc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:47:23 +0200
Subject: [PATCH 094/119] fix typo

---
 client/ayon_core/scripts/ocio_wrapper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/scripts/ocio_wrapper.py b/client/ayon_core/scripts/ocio_wrapper.py
index 9cbab32956..897e910fa5 100644
--- a/client/ayon_core/scripts/ocio_wrapper.py
+++ b/client/ayon_core/scripts/ocio_wrapper.py
@@ -153,7 +153,7 @@ def _get_config_version_data(config_path, output_path):
     type=click.Path(exists=True))
 @click.option(
     "--filepath",
-    equired=True,
+    required=True,
     help="Path to file to get colorspace from.",
     type=click.Path())
 @click.option(

From ddbec4ea71ae9e57c9c2a1d9d82abbe01933896f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 15 May 2024 18:57:04 +0200
Subject: [PATCH 095/119] added docstring to sorter

---
 client/ayon_core/pipeline/colorspace.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index b568e2cdf1..d9785b61fb 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -642,7 +642,15 @@ def get_colorspaces_enumerator_items(
             })
 
     def _sort_key_getter(item):
-        """Use colorspace for sorting."""
+        """Use colorspace for sorting.
+
+        Args:
+            item (tuple[str, str]): Item with colorspace and label.
+
+        Returns:
+            str: Colorspace.
+
+        """
         return item[0]
 
     labeled_colorspaces = []

From d353dd145a4c82a72498de87f9dfb32f2cffac09 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 16 May 2024 09:40:53 +0200
Subject: [PATCH 096/119] removed unnecessary command group

---
 client/ayon_core/pipeline/colorspace.py  | 11 +--------
 client/ayon_core/scripts/ocio_wrapper.py | 30 ++++--------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index d9785b61fb..239c187959 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -292,7 +292,6 @@ def get_config_file_rules_colorspace_from_filepath(config_path, filepath):
         )
     else:
         result_data = _get_wrapped_with_subprocess(
-            "colorspace",
             "get_config_file_rules_colorspace_from_filepath",
             config_path=config_path,
             filepath=filepath
@@ -321,7 +320,6 @@ def get_config_version_data(config_path):
             version_data = _get_config_version_data(config_path)
         else:
             version_data = _get_wrapped_with_subprocess(
-                "config",
                 "get_config_version_data",
                 config_path=config_path
             )
@@ -432,11 +430,10 @@ def validate_imageio_colorspace_in_config(config_path, colorspace_name):
     return True
 
 
-def _get_wrapped_with_subprocess(command_group, command, **kwargs):
+def _get_wrapped_with_subprocess(command, **kwargs):
     """Get data via subprocess.
 
     Args:
-        command_group (str): command group name
         command (str): command name
         **kwargs: command arguments
 
@@ -448,7 +445,6 @@ def _get_wrapped_with_subprocess(command_group, command, **kwargs):
         args = [
             "run",
             get_ocio_config_script_path(),
-            command_group,
             command
         ]
 
@@ -501,7 +497,6 @@ def get_ocio_config_colorspaces(config_path):
             config_colorspaces = _get_ocio_config_colorspaces(config_path)
         else:
             config_colorspaces = _get_wrapped_with_subprocess(
-                "config",
                 "get_ocio_config_colorspaces",
                 config_path=config_path
             )
@@ -699,7 +694,6 @@ def get_ocio_config_views(config_path):
         return _get_ocio_config_views(config_path)
 
     return _get_wrapped_with_subprocess(
-        "config",
         "get_ocio_config_views",
         config_path=config_path
     )
@@ -1288,7 +1282,6 @@ def get_display_view_colorspace_name(config_path, display, view):
             config_path, display, view
         )
     return _get_wrapped_with_subprocess(
-        "config",
         "get_display_view_colorspace_name",
         config_path=config_path,
         display=display,
@@ -1538,7 +1531,6 @@ def get_colorspace_data_subprocess(config_path):
         dict: colorspace and family in couple
     """
     return _get_wrapped_with_subprocess(
-        "config",
         "get_ocio_config_colorspaces",
         config_path=config_path
     )
@@ -1559,7 +1551,6 @@ def get_views_data_subprocess(config_path):
 
     """
     return _get_wrapped_with_subprocess(
-        "config",
         "get_ocio_config_views",
         config_path=config_path
     )
diff --git a/client/ayon_core/scripts/ocio_wrapper.py b/client/ayon_core/scripts/ocio_wrapper.py
index 897e910fa5..0414fc59ce 100644
--- a/client/ayon_core/scripts/ocio_wrapper.py
+++ b/client/ayon_core/scripts/ocio_wrapper.py
@@ -33,27 +33,7 @@ def main():
     pass  # noqa: WPS100
 
 
-@main.group()
-def config():
-    """Config related commands group
-
-    Example of use:
-    > pyton.exe ./ocio_wrapper.py config <command> *args
-    """
-    pass  # noqa: WPS100
-
-
-@main.group()
-def colorspace():
-    """Colorspace related commands group
-
-    Example of use:
-    > pyton.exe ./ocio_wrapper.py config <command> *args
-    """
-    pass  # noqa: WPS100
-
-
-@config.command(
+@main.command(
     name="get_ocio_config_colorspaces",
     help="return all colorspaces from config file")
 @click.option(
@@ -83,7 +63,7 @@ def _get_ocio_config_colorspaces(config_path, output_path):
     )
 
 
-@config.command(
+@main.command(
     name="get_ocio_config_views",
     help="All viewers from config file")
 @click.option(
@@ -113,7 +93,7 @@ def _get_ocio_config_views(config_path, output_path):
     )
 
 
-@config.command(
+@main.command(
     name="get_config_version_data",
     help="Get major and minor version from config file")
 @click.option(
@@ -143,7 +123,7 @@ def _get_config_version_data(config_path, output_path):
     )
 
 
-@colorspace.command(
+@main.command(
     name="get_config_file_rules_colorspace_from_filepath",
     help="Colorspace file rules from filepath")
 @click.option(
@@ -182,7 +162,7 @@ def _get_config_file_rules_colorspace_from_filepath(
     )
 
 
-@config.command(
+@main.command(
     name="get_display_view_colorspace_name",
     help=(
         "Default view colorspace name for the given display and view"

From dc0f1769d5a73ebea1c9e7546d412f744370c65a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 16 May 2024 12:31:13 +0200
Subject: [PATCH 097/119] Revert "AY-1110 - use get_addon_site_settings from
 ayon_api"

This reverts commit 61fcc3ddecc2121d4947344215cce3dbff8caff5.
---
 .../deadline/plugins/publish/collect_user_credentials.py   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
index 30e3703b58..99d75ecb9e 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
@@ -12,7 +12,7 @@ Provides:
 """
 import pyblish.api
 
-from ayon_api import get_addon_site_settings
+from ayon_api import get_server_api_connection
 from ayon_core.modules.deadline.deadline_module import DeadlineModule
 from ayon_core.modules.deadline import __version__
 
@@ -81,8 +81,9 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
 
         if not deadline_info["require_authentication"]:
             return
-
-        local_settings = get_addon_site_settings(
+        # TODO import 'get_addon_site_settings' when available 
+        #   in public 'ayon_api'
+        local_settings = get_server_api_connection().get_addon_site_settings(
             DeadlineModule.name, __version__)
         local_settings = local_settings["local_settings"]
         for server_info in local_settings:

From 340c07317f32bbfa94b865189cb554a36bb17465 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 16 May 2024 19:38:26 +0800
Subject: [PATCH 098/119] make validator animated reference being optional

---
 .../hosts/maya/plugins/publish/validate_animated_reference.py | 2 +-
 server_addon/maya/server/settings/publishers.py               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
index 2ba2bff6fc..4e8261d42e 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
@@ -18,7 +18,7 @@ class ValidateAnimatedReferenceRig(pyblish.api.InstancePlugin,
     label = "Animated Reference Rig"
     accepted_controllers = ["transform", "locator"]
     actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
-    optional = False
+    optional = True
 
     def process(self, instance):
         if not self.is_active(instance.data):
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 20523b2ca9..3e8dc704b7 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -1448,8 +1448,8 @@ DEFAULT_PUBLISH_SETTINGS = {
         "active": True
     },
     "ValidateAnimatedReferenceRig": {
-        "enabled": True,
-        "optional": False,
+        "enabled": False,
+        "optional": True,
         "active": True
     },
     "ValidateAnimationContent": {

From ce194b32febe009e2eec969c2fba77fb8238a319 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 16 May 2024 20:25:03 +0800
Subject: [PATCH 099/119] remove the validator

---
 .../publish/validate_animated_reference.py    | 71 -------------------
 .../maya/server/settings/publishers.py        | 10 +--
 2 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
deleted file mode 100644
index 4e8261d42e..0000000000
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_animated_reference.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import pyblish.api
-import ayon_core.hosts.maya.api.action
-from ayon_core.pipeline.publish import (
-    PublishValidationError,
-    ValidateContentsOrder,
-    OptionalPyblishPluginMixin
-)
-from maya import cmds
-
-
-class ValidateAnimatedReferenceRig(pyblish.api.InstancePlugin,
-                                   OptionalPyblishPluginMixin):
-    """Validate all nodes in skeletonAnim_SET are referenced"""
-
-    order = ValidateContentsOrder
-    hosts = ["maya"]
-    families = ["animation.fbx"]
-    label = "Animated Reference Rig"
-    accepted_controllers = ["transform", "locator"]
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
-    optional = True
-
-    def process(self, instance):
-        if not self.is_active(instance.data):
-            return
-        animated_sets = instance.data.get("animated_skeleton", [])
-        if not animated_sets:
-            self.log.debug(
-                "No nodes found in skeletonAnim_SET. "
-                "Skipping validation of animated reference rig..."
-            )
-            return
-
-        for animated_reference in animated_sets:
-            is_referenced = cmds.referenceQuery(
-                animated_reference, isNodeReferenced=True)
-            if not bool(is_referenced):
-                raise PublishValidationError(
-                    "All the content in skeletonAnim_SET"
-                    " should be referenced nodes"
-                )
-        invalid_controls = self.validate_controls(animated_sets)
-        if invalid_controls:
-            raise PublishValidationError(
-                "All the content in skeletonAnim_SET"
-                " should be transforms"
-            )
-
-    @classmethod
-    def validate_controls(self, set_members):
-        """Check if the controller set contains only accepted node types.
-
-        Checks if all its set members are within the hierarchy of the root
-        Checks if the node types of the set members valid
-
-        Args:
-            set_members: list of nodes of the skeleton_anim_set
-            hierarchy: list of nodes which reside under the root node
-
-        Returns:
-            errors (list)
-        """
-
-        # Validate control types
-        invalid = []
-        set_members = cmds.ls(set_members, long=True)
-        for node in set_members:
-            if cmds.nodeType(node) not in self.accepted_controllers:
-                invalid.append(node)
-
-        return invalid
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 3e8dc704b7..3ff57bab13 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -921,10 +921,7 @@ class PublishersModel(BaseSettingsModel):
         default_factory=BasicValidateModel,
         title="Validate Animated Reference Rig",
     )
-    ValidateAnimationContent: BasicValidateModel = SettingsField(
-        default_factory=BasicValidateModel,
-        title="Validate Animation Content",
-    )
+
     ValidateOutRelatedNodeIds: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
         title="Validate Animation Out Set Related Node Ids",
@@ -1447,11 +1444,6 @@ DEFAULT_PUBLISH_SETTINGS = {
         "optional": True,
         "active": True
     },
-    "ValidateAnimatedReferenceRig": {
-        "enabled": False,
-        "optional": True,
-        "active": True
-    },
     "ValidateAnimationContent": {
         "enabled": True,
         "optional": False,

From cd0bf07939a557744a2bc94d5f67479282b5099c Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 16 May 2024 21:11:32 +0800
Subject: [PATCH 100/119] upversion

---
 server_addon/maya/package.py                    | 2 +-
 server_addon/maya/server/settings/publishers.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py
index fe3e3039f5..5ab2fa217c 100644
--- a/server_addon/maya/package.py
+++ b/server_addon/maya/package.py
@@ -1,3 +1,3 @@
 name = "maya"
 title = "Maya"
-version = "0.1.18"
+version = "0.1.19"
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 3ff57bab13..01ac6f4acd 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -917,11 +917,10 @@ class PublishersModel(BaseSettingsModel):
         default_factory=BasicValidateModel,
         title="Validate Rig Controllers",
     )
-    ValidateAnimatedReferenceRig: BasicValidateModel = SettingsField(
+    ValidateAnimationContent: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
-        title="Validate Animated Reference Rig",
+        title="Validate Animation Content",
     )
-
     ValidateOutRelatedNodeIds: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
         title="Validate Animation Out Set Related Node Ids",

From 2536f86c221099a70cd7bbf7a226593674c24c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Thu, 16 May 2024 22:54:02 +0200
Subject: [PATCH 101/119] :recycle: fix UE name on linux and darwin

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

diff --git a/client/ayon_core/hosts/unreal/lib.py b/client/ayon_core/hosts/unreal/lib.py
index 37122b2096..185853a0aa 100644
--- a/client/ayon_core/hosts/unreal/lib.py
+++ b/client/ayon_core/hosts/unreal/lib.py
@@ -80,17 +80,21 @@ def get_engine_versions(env=None):
 def get_editor_exe_path(engine_path: Path, engine_version: str) -> Path:
     """Get UE Editor executable path."""
     ue_path = engine_path / "Engine/Binaries"
+
+    ue_name = "UnrealEditor"
+
+    # handle older versions of Unreal Engine
+    if engine_version.split(".")[0] == "4":
+        ue_name = "UE4Editor"
+
     if platform.system().lower() == "windows":
-        if engine_version.split(".")[0] == "4":
-            ue_path /= "Win64/UE4Editor.exe"
-        elif engine_version.split(".")[0] == "5":
-            ue_path /= "Win64/UnrealEditor.exe"
+            ue_path /= f"Win64/{ue_name}.exe"
 
     elif platform.system().lower() == "linux":
-        ue_path /= "Linux/UE4Editor"
+        ue_path /= f"Linux/{ue_name}"
 
     elif platform.system().lower() == "darwin":
-        ue_path /= "Mac/UE4Editor"
+        ue_path /= f"Mac/{ue_name}"
 
     return ue_path
 

From cc7769dd21fc2d8312220d5f61f07b7c6eef5038 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 11:13:11 +0200
Subject: [PATCH 102/119] ValidateContainers have profile based settings

---
 .../plugins/publish/validate_containers.py    | 40 +++++++++++++--
 server/settings/publish_plugins.py            | 49 +++++++++++++++++++
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/plugins/publish/validate_containers.py b/client/ayon_core/plugins/publish/validate_containers.py
index bd21ec9693..21736f0659 100644
--- a/client/ayon_core/plugins/publish/validate_containers.py
+++ b/client/ayon_core/plugins/publish/validate_containers.py
@@ -1,6 +1,11 @@
 import pyblish.api
+
+from ayon_core.lib import filter_profiles
+from ayon_core.host import ILoadHost
 from ayon_core.pipeline.load import any_outdated_containers
 from ayon_core.pipeline import (
+    get_current_host_name,
+    registered_host,
     PublishXmlValidationError,
     OptionalPyblishPluginMixin
 )
@@ -18,17 +23,44 @@ class ShowInventory(pyblish.api.Action):
         host_tools.show_scene_inventory()
 
 
-class ValidateContainers(OptionalPyblishPluginMixin,
-                         pyblish.api.ContextPlugin):
-
+class ValidateContainers(
+    OptionalPyblishPluginMixin,
+    pyblish.api.ContextPlugin
+):
     """Containers are must be updated to latest version on publish."""
 
     label = "Validate Outdated Containers"
     order = pyblish.api.ValidatorOrder
-    hosts = ["maya", "houdini", "nuke", "harmony", "photoshop", "aftereffects"]
+
     optional = True
     actions = [ShowInventory]
 
+    @classmethod
+    def apply_settings(cls, settings):
+        # Disable plugin if host does not inherit from 'ILoadHost'
+        # - not a host that can load containers
+        host = registered_host()
+        if not isinstance(host, ILoadHost):
+            cls.enabled = False
+            return
+
+        # Disable if no profile is found for the current host
+        profile = filter_profiles(
+            settings["core"]["publish"]["ValidateContainers"]["profiles"],
+            {"host_names": get_current_host_name()}
+        )
+        if not profile:
+            cls.enabled = False
+            return
+
+        # Apply settings from profile
+        for attr_name in {
+            "enabled",
+            "optional",
+            "active",
+        }:
+            setattr(cls, attr_name, profile[attr_name])
+
     def process(self, context):
         if not self.is_active(context.data):
             return
diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index e61bf6986b..f487438109 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -59,6 +59,32 @@ class CollectFramesFixDefModel(BaseSettingsModel):
     )
 
 
+class ValidateContainersProfile(BaseSettingsModel):
+    _layout = "expanded"
+    # Filtering
+    host_names: list[str] = SettingsField(
+        default_factory=list,
+        title="Host names"
+    )
+    # Profile values
+    enabled: bool = SettingsField(True)
+    optional: bool = SettingsField(True)
+    active: bool = SettingsField(True)
+
+
+class ValidateContainersModel(BaseSettingsModel):
+    """Validate if Publishing intent was selected.
+
+    It is possible to disable validation for specific publishing context
+    with profiles.
+    """
+
+    _isGroup = True
+    profiles: list[ValidateContainersProfile] = SettingsField(
+        default_factory=list
+    )
+
+
 class ValidateIntentProfile(BaseSettingsModel):
     _layout = "expanded"
     hosts: list[str] = SettingsField(default_factory=list, title="Host names")
@@ -770,6 +796,10 @@ class PublishPuginsModel(BaseSettingsModel):
         default_factory=ValidateBaseModel,
         title="Validate Version"
     )
+    ValidateContainers: ValidateContainersModel = SettingsField(
+        default_factory=ValidateContainersModel,
+        title="Validate Containers"
+    )
     ValidateIntent: ValidateIntentModel = SettingsField(
         default_factory=ValidateIntentModel,
         title="Validate Intent"
@@ -855,6 +885,25 @@ DEFAULT_PUBLISH_VALUES = {
         "optional": False,
         "active": True
     },
+    "ValidateContainers": {
+        "profiles": [
+            {
+                # Default host names are based on original
+                #   filter of ValidateContainer pyblish plugin
+                "host_names": [
+                    "maya",
+                    "houdini",
+                    "nuke",
+                    "harmony",
+                    "photoshop",
+                    "aftereffects"
+                ],
+                "enabled": True,
+                "optional": True,
+                "active": True
+            }
+        ]
+    },
     "ValidateIntent": {
         "enabled": False,
         "profiles": []

From 0101527af2864458d3c0728ab3ae508dd7a7bafb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 11:14:28 +0200
Subject: [PATCH 103/119] add titles

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

diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index f487438109..f40cc1fefe 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -67,9 +67,9 @@ class ValidateContainersProfile(BaseSettingsModel):
         title="Host names"
     )
     # Profile values
-    enabled: bool = SettingsField(True)
-    optional: bool = SettingsField(True)
-    active: bool = SettingsField(True)
+    enabled: bool = SettingsField(True, title="Enabled")
+    optional: bool = SettingsField(True, title="Optional")
+    active: bool = SettingsField(True, title="Active")
 
 
 class ValidateContainersModel(BaseSettingsModel):

From d2a0719de3ba30a74f846a67082c7a02e0f1855b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 11:28:02 +0200
Subject: [PATCH 104/119] remove 'ValidateContainers' settings from other hosts

---
 server_addon/aftereffects/package.py           |  2 +-
 .../server/settings/publish_plugins.py         | 15 ---------------
 server_addon/harmony/package.py                |  2 +-
 server_addon/harmony/server/settings/main.py   |  5 -----
 .../harmony/server/settings/publish_plugins.py | 13 -------------
 server_addon/maya/package.py                   |  2 +-
 .../maya/server/settings/publishers.py         |  9 ---------
 server_addon/nuke/package.py                   |  2 +-
 .../nuke/server/settings/publish_plugins.py    |  9 ---------
 server_addon/photoshop/package.py              |  2 +-
 .../server/settings/publish_plugins.py         | 18 ------------------
 11 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/server_addon/aftereffects/package.py b/server_addon/aftereffects/package.py
index a680b37602..7a2f9bc7af 100644
--- a/server_addon/aftereffects/package.py
+++ b/server_addon/aftereffects/package.py
@@ -1,3 +1,3 @@
 name = "aftereffects"
 title = "AfterEffects"
-version = "0.1.3"
+version = "0.1.4"
diff --git a/server_addon/aftereffects/server/settings/publish_plugins.py b/server_addon/aftereffects/server/settings/publish_plugins.py
index 61d67f26d3..a9f30c6686 100644
--- a/server_addon/aftereffects/server/settings/publish_plugins.py
+++ b/server_addon/aftereffects/server/settings/publish_plugins.py
@@ -22,12 +22,6 @@ class ValidateSceneSettingsModel(BaseSettingsModel):
     )
 
 
-class ValidateContainersModel(BaseSettingsModel):
-    enabled: bool = SettingsField(True, title="Enabled")
-    optional: bool = SettingsField(True, title="Optional")
-    active: bool = SettingsField(True, title="Active")
-
-
 class AfterEffectsPublishPlugins(BaseSettingsModel):
     CollectReview: CollectReviewPluginModel = SettingsField(
         default_factory=CollectReviewPluginModel,
@@ -37,10 +31,6 @@ class AfterEffectsPublishPlugins(BaseSettingsModel):
         default_factory=ValidateSceneSettingsModel,
         title="Validate Scene Settings",
     )
-    ValidateContainers: ValidateContainersModel = SettingsField(
-        default_factory=ValidateContainersModel,
-        title="Validate Containers",
-    )
 
 
 AE_PUBLISH_PLUGINS_DEFAULTS = {
@@ -58,9 +48,4 @@ AE_PUBLISH_PLUGINS_DEFAULTS = {
             ".*"
         ]
     },
-    "ValidateContainers": {
-        "enabled": True,
-        "optional": True,
-        "active": True,
-    }
 }
diff --git a/server_addon/harmony/package.py b/server_addon/harmony/package.py
index 83e88e7d57..00824cedef 100644
--- a/server_addon/harmony/package.py
+++ b/server_addon/harmony/package.py
@@ -1,3 +1,3 @@
 name = "harmony"
 title = "Harmony"
-version = "0.1.2"
+version = "0.1.3"
diff --git a/server_addon/harmony/server/settings/main.py b/server_addon/harmony/server/settings/main.py
index 9c780b63c2..8a72c966d8 100644
--- a/server_addon/harmony/server/settings/main.py
+++ b/server_addon/harmony/server/settings/main.py
@@ -45,11 +45,6 @@ DEFAULT_HARMONY_SETTING = {
             "optional": True,
             "active": True
         },
-        "ValidateContainers": {
-            "enabled": True,
-            "optional": True,
-            "active": True
-        },
         "ValidateSceneSettings": {
             "enabled": True,
             "optional": True,
diff --git a/server_addon/harmony/server/settings/publish_plugins.py b/server_addon/harmony/server/settings/publish_plugins.py
index c9e7c515e4..2d976389f6 100644
--- a/server_addon/harmony/server/settings/publish_plugins.py
+++ b/server_addon/harmony/server/settings/publish_plugins.py
@@ -18,14 +18,6 @@ class ValidateAudioPlugin(BaseSettingsModel):
     active: bool = SettingsField(True, title="Active")
 
 
-class ValidateContainersPlugin(BaseSettingsModel):
-    """Check if loaded container is scene are latest versions."""
-    _isGroup = True
-    enabled: bool = True
-    optional: bool = SettingsField(False, title="Optional")
-    active: bool = SettingsField(True, title="Active")
-
-
 class ValidateSceneSettingsPlugin(BaseSettingsModel):
     """Validate if FrameStart, FrameEnd and Resolution match shot data in DB.
        Use regular expressions to limit validations only on particular asset
@@ -63,11 +55,6 @@ class HarmonyPublishPlugins(BaseSettingsModel):
         default_factory=ValidateAudioPlugin,
     )
 
-    ValidateContainers: ValidateContainersPlugin = SettingsField(
-        title="Validate Containers",
-        default_factory=ValidateContainersPlugin,
-    )
-
     ValidateSceneSettings: ValidateSceneSettingsPlugin = SettingsField(
         title="Validate Scene Settings",
         default_factory=ValidateSceneSettingsPlugin,
diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py
index 5ab2fa217c..4537c23eaa 100644
--- a/server_addon/maya/package.py
+++ b/server_addon/maya/package.py
@@ -1,3 +1,3 @@
 name = "maya"
 title = "Maya"
-version = "0.1.19"
+version = "0.1.20"
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 01ac6f4acd..9c552e17fa 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -634,10 +634,6 @@ class PublishersModel(BaseSettingsModel):
         title="Validate Instance In Context",
         section="Validators"
     )
-    ValidateContainers: BasicValidateModel = SettingsField(
-        default_factory=BasicValidateModel,
-        title="Validate Containers"
-    )
     ValidateFrameRange: ValidateFrameRangeModel = SettingsField(
         default_factory=ValidateFrameRangeModel,
         title="Validate Frame Range"
@@ -1059,11 +1055,6 @@ DEFAULT_PUBLISH_SETTINGS = {
         "optional": True,
         "active": True
     },
-    "ValidateContainers": {
-        "enabled": True,
-        "optional": True,
-        "active": True
-    },
     "ValidateFrameRange": {
         "enabled": True,
         "optional": True,
diff --git a/server_addon/nuke/package.py b/server_addon/nuke/package.py
index e522b9fb5d..bc166bd14e 100644
--- a/server_addon/nuke/package.py
+++ b/server_addon/nuke/package.py
@@ -1,3 +1,3 @@
 name = "nuke"
 title = "Nuke"
-version = "0.1.12"
+version = "0.1.13"
diff --git a/server_addon/nuke/server/settings/publish_plugins.py b/server_addon/nuke/server/settings/publish_plugins.py
index e67f7be24f..6c37ecd37a 100644
--- a/server_addon/nuke/server/settings/publish_plugins.py
+++ b/server_addon/nuke/server/settings/publish_plugins.py
@@ -231,10 +231,6 @@ class PublishPluginsModel(BaseSettingsModel):
         default_factory=OptionalPluginModel,
         section="Validators"
     )
-    ValidateContainers: OptionalPluginModel = SettingsField(
-        title="Validate Containers",
-        default_factory=OptionalPluginModel
-    )
     ValidateKnobs: ValidateKnobsModel = SettingsField(
         title="Validate Knobs",
         default_factory=ValidateKnobsModel
@@ -300,11 +296,6 @@ DEFAULT_PUBLISH_PLUGIN_SETTINGS = {
         "optional": True,
         "active": True
     },
-    "ValidateContainers": {
-        "enabled": True,
-        "optional": True,
-        "active": True
-    },
     "ValidateKnobs": {
         "enabled": False,
         "knobs": "\n".join([
diff --git a/server_addon/photoshop/package.py b/server_addon/photoshop/package.py
index 25615529d1..22043f951c 100644
--- a/server_addon/photoshop/package.py
+++ b/server_addon/photoshop/package.py
@@ -1,3 +1,3 @@
 name = "photoshop"
 title = "Photoshop"
-version = "0.1.2"
+version = "0.1.3"
diff --git a/server_addon/photoshop/server/settings/publish_plugins.py b/server_addon/photoshop/server/settings/publish_plugins.py
index d04faaf53a..149b08beb4 100644
--- a/server_addon/photoshop/server/settings/publish_plugins.py
+++ b/server_addon/photoshop/server/settings/publish_plugins.py
@@ -83,14 +83,6 @@ class CollectVersionPlugin(BaseSettingsModel):
     enabled: bool = SettingsField(True, title="Enabled")
 
 
-class ValidateContainersPlugin(BaseSettingsModel):
-    """Check that workfile contains latest version of loaded items"""  # noqa
-    _isGroup = True
-    enabled: bool = True
-    optional: bool = SettingsField(False, title="Optional")
-    active: bool = SettingsField(True, title="Active")
-
-
 class ValidateNamingPlugin(BaseSettingsModel):
     """Validate naming of products and layers"""  # noqa
     invalid_chars: str = SettingsField(
@@ -154,11 +146,6 @@ class PhotoshopPublishPlugins(BaseSettingsModel):
         default_factory=CollectVersionPlugin,
     )
 
-    ValidateContainers: ValidateContainersPlugin = SettingsField(
-        title="Validate Containers",
-        default_factory=ValidateContainersPlugin,
-    )
-
     ValidateNaming: ValidateNamingPlugin = SettingsField(
         title="Validate naming of products and layers",
         default_factory=ValidateNamingPlugin,
@@ -187,11 +174,6 @@ DEFAULT_PUBLISH_SETTINGS = {
     "CollectVersion": {
         "enabled": False
     },
-    "ValidateContainers": {
-        "enabled": True,
-        "optional": True,
-        "active": True
-    },
     "ValidateNaming": {
         "invalid_chars": "[ \\\\/+\\*\\?\\(\\)\\[\\]\\{\\}:,;]",
         "replace_char": "_"

From bb05691289def08af1d69449cd284f880839097e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 11:48:41 +0200
Subject: [PATCH 105/119] remove houdini settings too

---
 server_addon/houdini/package.py                 | 2 +-
 server_addon/houdini/server/settings/publish.py | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/server_addon/houdini/package.py b/server_addon/houdini/package.py
index 6c81eba439..06b034da38 100644
--- a/server_addon/houdini/package.py
+++ b/server_addon/houdini/package.py
@@ -1,3 +1,3 @@
 name = "houdini"
 title = "Houdini"
-version = "0.2.14"
+version = "0.2.15"
diff --git a/server_addon/houdini/server/settings/publish.py b/server_addon/houdini/server/settings/publish.py
index 9e8e796aff..4a0c022f23 100644
--- a/server_addon/houdini/server/settings/publish.py
+++ b/server_addon/houdini/server/settings/publish.py
@@ -77,10 +77,6 @@ class PublishPluginsModel(BaseSettingsModel):
         default_factory=CollectLocalRenderInstancesModel,
         title="Collect Local Render Instances."
     )
-    ValidateContainers: BasicValidateModel = SettingsField(
-        default_factory=BasicValidateModel,
-        title="Validate Latest Containers.",
-        section="Validators")
     ValidateInstanceInContextHoudini: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
         title="Validate Instance is in same Context.")
@@ -119,11 +115,6 @@ DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
             ]
         }
     },
-    "ValidateContainers": {
-        "enabled": True,
-        "optional": True,
-        "active": True
-    },
     "ValidateInstanceInContextHoudini": {
         "enabled": True,
         "optional": True,

From d4ca6bf3f644615ca49e3b43c649000f05f35b6f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 12:14:47 +0200
Subject: [PATCH 106/119] use kwarg to pass project entity

---
 client/ayon_core/pipeline/colorspace.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 239c187959..099616ff4a 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -920,7 +920,7 @@ def get_imageio_config_preset(
     project_entity = None
     if anatomy is None:
         project_entity = ayon_api.get_project(project_name)
-        anatomy = Anatomy(project_name, project_entity)
+        anatomy = Anatomy(project_name, project_entity=project_entity)
 
     if env is None:
         env = dict(os.environ.items())

From 7340ab081d0b7bc197eb205eeaad57571b8e73f3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 12:21:08 +0200
Subject: [PATCH 107/119] do not lower task name when it can be None

---
 client/ayon_core/tools/push_to_project/models/integrate.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/ayon_core/tools/push_to_project/models/integrate.py b/client/ayon_core/tools/push_to_project/models/integrate.py
index 6e43050c05..5937ffa4da 100644
--- a/client/ayon_core/tools/push_to_project/models/integrate.py
+++ b/client/ayon_core/tools/push_to_project/models/integrate.py
@@ -723,7 +723,6 @@ class ProjectPushItemProcess:
         dst_project_name = self._item.dst_project_name
         dst_folder_id = self._item.dst_folder_id
         dst_task_name = self._item.dst_task_name
-        dst_task_name_low = dst_task_name.lower()
         new_folder_name = self._item.new_folder_name
         if not dst_folder_id and not new_folder_name:
             self._status.set_failed(
@@ -765,7 +764,7 @@ class ProjectPushItemProcess:
                 dst_project_name, folder_ids=[folder_entity["id"]]
             )
         }
-        task_info = folder_tasks.get(dst_task_name_low)
+        task_info = folder_tasks.get(dst_task_name.lower())
         if not task_info:
             self._status.set_failed(
                 f"Could find task with name \"{dst_task_name}\""

From 45611ea27e8e3f8106df6dc45075a02e2a1145fd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 12:35:42 +0200
Subject: [PATCH 108/119] call update on viewport instead on view

---
 client/ayon_core/tools/launcher/ui/actions_widget.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/tools/launcher/ui/actions_widget.py b/client/ayon_core/tools/launcher/ui/actions_widget.py
index a225827418..d03aceb009 100644
--- a/client/ayon_core/tools/launcher/ui/actions_widget.py
+++ b/client/ayon_core/tools/launcher/ui/actions_widget.py
@@ -359,7 +359,8 @@ class ActionsWidget(QtWidgets.QWidget):
     def _on_model_refresh(self):
         self._proxy_model.sort(0)
         # Force repaint all items
-        self._view.update()
+        viewport = self._view.viewport()
+        viewport.update()
 
     def _on_animation(self):
         time_now = time.time()

From 9dcfd06ed62599f4544e6c86af07e712da972b83 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 14:53:29 +0200
Subject: [PATCH 109/119] change "profiles" key to "plugin_state_profiles"

---
 .../ayon_core/plugins/publish/validate_containers.py   | 10 ++++++++--
 server/settings/publish_plugins.py                     |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/plugins/publish/validate_containers.py b/client/ayon_core/plugins/publish/validate_containers.py
index 21736f0659..3fd5083b4e 100644
--- a/client/ayon_core/plugins/publish/validate_containers.py
+++ b/client/ayon_core/plugins/publish/validate_containers.py
@@ -45,9 +45,15 @@ class ValidateContainers(
             return
 
         # Disable if no profile is found for the current host
+        profiles = (
+            settings
+            ["core"]
+            ["publish"]
+            ["ValidateContainers"]
+            ["plugin_state_profiles"]
+        )
         profile = filter_profiles(
-            settings["core"]["publish"]["ValidateContainers"]["profiles"],
-            {"host_names": get_current_host_name()}
+            profiles, {"host_names": get_current_host_name()}
         )
         if not profile:
             cls.enabled = False
diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index f40cc1fefe..0c19655035 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -80,7 +80,7 @@ class ValidateContainersModel(BaseSettingsModel):
     """
 
     _isGroup = True
-    profiles: list[ValidateContainersProfile] = SettingsField(
+    plugin_state_profiles: list[ValidateContainersProfile] = SettingsField(
         default_factory=list
     )
 
@@ -886,7 +886,7 @@ DEFAULT_PUBLISH_VALUES = {
         "active": True
     },
     "ValidateContainers": {
-        "profiles": [
+        "plugin_state_profiles": [
             {
                 # Default host names are based on original
                 #   filter of ValidateContainer pyblish plugin

From daf35ecd0f7c7bcde0a19c121e6bd1d302f9a0a7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 14:53:37 +0200
Subject: [PATCH 110/119] add a title to profiles

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

diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index 0c19655035..8cf660354a 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -81,7 +81,8 @@ class ValidateContainersModel(BaseSettingsModel):
 
     _isGroup = True
     plugin_state_profiles: list[ValidateContainersProfile] = SettingsField(
-        default_factory=list
+        default_factory=list,
+        title="Plugin enable state profiles",
     )
 
 

From 38fd82623357d3001e96d0bc076c2dba0ff663b5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 20 May 2024 15:34:12 +0200
Subject: [PATCH 111/119] rename 'ValidateContainers' to
 'ValidateOutdatedContainers'

---
 .../ayon_core/plugins/publish/validate_containers.py |  4 ++--
 server/settings/publish_plugins.py                   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/ayon_core/plugins/publish/validate_containers.py b/client/ayon_core/plugins/publish/validate_containers.py
index 3fd5083b4e..520e7a7ce9 100644
--- a/client/ayon_core/plugins/publish/validate_containers.py
+++ b/client/ayon_core/plugins/publish/validate_containers.py
@@ -23,7 +23,7 @@ class ShowInventory(pyblish.api.Action):
         host_tools.show_scene_inventory()
 
 
-class ValidateContainers(
+class ValidateOutdatedContainers(
     OptionalPyblishPluginMixin,
     pyblish.api.ContextPlugin
 ):
@@ -49,7 +49,7 @@ class ValidateContainers(
             settings
             ["core"]
             ["publish"]
-            ["ValidateContainers"]
+            ["ValidateOutdatedContainers"]
             ["plugin_state_profiles"]
         )
         profile = filter_profiles(
diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index 8cf660354a..61e73ce912 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -59,7 +59,7 @@ class CollectFramesFixDefModel(BaseSettingsModel):
     )
 
 
-class ValidateContainersProfile(BaseSettingsModel):
+class ValidateOutdatedContainersProfile(BaseSettingsModel):
     _layout = "expanded"
     # Filtering
     host_names: list[str] = SettingsField(
@@ -72,7 +72,7 @@ class ValidateContainersProfile(BaseSettingsModel):
     active: bool = SettingsField(True, title="Active")
 
 
-class ValidateContainersModel(BaseSettingsModel):
+class ValidateOutdatedContainersModel(BaseSettingsModel):
     """Validate if Publishing intent was selected.
 
     It is possible to disable validation for specific publishing context
@@ -80,7 +80,7 @@ class ValidateContainersModel(BaseSettingsModel):
     """
 
     _isGroup = True
-    plugin_state_profiles: list[ValidateContainersProfile] = SettingsField(
+    plugin_state_profiles: list[ValidateOutdatedContainersProfile] = SettingsField(
         default_factory=list,
         title="Plugin enable state profiles",
     )
@@ -797,8 +797,8 @@ class PublishPuginsModel(BaseSettingsModel):
         default_factory=ValidateBaseModel,
         title="Validate Version"
     )
-    ValidateContainers: ValidateContainersModel = SettingsField(
-        default_factory=ValidateContainersModel,
+    ValidateOutdatedContainers: ValidateOutdatedContainersModel = SettingsField(
+        default_factory=ValidateOutdatedContainersModel,
         title="Validate Containers"
     )
     ValidateIntent: ValidateIntentModel = SettingsField(
@@ -886,7 +886,7 @@ DEFAULT_PUBLISH_VALUES = {
         "optional": False,
         "active": True
     },
-    "ValidateContainers": {
+    "ValidateOutdatedContainers": {
         "plugin_state_profiles": [
             {
                 # Default host names are based on original

From caf3682e87bc3f4356f5ed8a9d54d0c040282588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A0=20Serra=20Arrizabalaga?=
 <fabia.serra92@gmail.com>
Date: Tue, 21 May 2024 22:22:33 +0200
Subject: [PATCH 112/119] Make sure actions in Launcher are sorted so they
 don't keep changing order randomly

---
 client/ayon_core/tools/launcher/models/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/tools/launcher/models/actions.py b/client/ayon_core/tools/launcher/models/actions.py
index 32df600c87..c27f0cd757 100644
--- a/client/ayon_core/tools/launcher/models/actions.py
+++ b/client/ayon_core/tools/launcher/models/actions.py
@@ -332,7 +332,7 @@ class ActionsModel:
         selection = self._prepare_selection(project_name, folder_id, task_id)
         output = []
         action_items = self._get_action_items(project_name)
-        for identifier, action in self._get_action_objects().items():
+        for identifier, action in sorted(self._get_action_objects().items()):
             if not action.is_compatible(selection):
                 continue
 

From 6c461eb21c981ebb70c19d40013f63fcefbd1a5f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 22 May 2024 09:54:27 +0200
Subject: [PATCH 113/119] add addon name to version.py

---
 server_addon/create_ayon_addons.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/server_addon/create_ayon_addons.py b/server_addon/create_ayon_addons.py
index f0a36d4740..749077d2a8 100644
--- a/server_addon/create_ayon_addons.py
+++ b/server_addon/create_ayon_addons.py
@@ -47,7 +47,7 @@ plugin_for = ["ayon_server"]
 """
 
 CLIENT_VERSION_CONTENT = '''# -*- coding: utf-8 -*-
-"""Package declaring AYON core addon version."""
+"""Package declaring AYON addon '{}' version."""
 __version__ = "{}"
 '''
 
@@ -183,6 +183,7 @@ def create_addon_zip(
 
 
 def prepare_client_code(
+    addon_name: str,
     addon_dir: Path,
     addon_output_dir: Path,
     addon_version: str
@@ -211,7 +212,9 @@ def prepare_client_code(
         version_path = subpath / "version.py"
         if version_path.exists():
             with open(version_path, "w") as stream:
-                stream.write(CLIENT_VERSION_CONTENT.format(addon_version))
+                stream.write(
+                    CLIENT_VERSION_CONTENT.format(addon_name, addon_version)
+                )
 
         zip_filepath = private_dir / "client.zip"
         with ZipFileLongPaths(zip_filepath, "w", zipfile.ZIP_DEFLATED) as zipf:
@@ -262,7 +265,9 @@ def create_addon_package(
         server_dir, addon_output_dir / "server", dirs_exist_ok=True
     )
 
-    prepare_client_code(addon_dir, addon_output_dir, addon_version)
+    prepare_client_code(
+        package.name, addon_dir, addon_output_dir, addon_version
+    )
 
     if create_zip:
         create_addon_zip(

From dd29bd8fa8f88853fb8cf4ea4ec496ec8e2a41cf Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Wed, 22 May 2024 15:46:03 +0300
Subject: [PATCH 114/119] remove original render instance

---
 .../ayon_core/hosts/houdini/plugins/publish/extract_render.py  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
index 7b4762a25f..651df15c10 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
@@ -72,3 +72,6 @@ class ExtractRender(publish.Extractor):
             raise RuntimeError("Failed to complete render extraction. "
                                "Missing output files: {}".format(
                                    missing_frames))
+
+        # Remove original render instance
+        instance.context.remove(instance)

From 60a76239bf254406eb19eef3096e3b94a40d0060 Mon Sep 17 00:00:00 2001
From: Mustafa Taher <mustafataherzaky@outlook.com>
Date: Wed, 22 May 2024 18:32:28 +0300
Subject: [PATCH 115/119] disable integration for the original render instance

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../ayon_core/hosts/houdini/plugins/publish/extract_render.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
index 651df15c10..20e9341ebd 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
@@ -74,4 +74,4 @@ class ExtractRender(publish.Extractor):
                                    missing_frames))
 
         # Remove original render instance
-        instance.context.remove(instance)
+        instance.data["integrate"] = False

From ab8d5186b9f9c9a9fc885272dc398b579aa8225e Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Wed, 22 May 2024 18:42:19 +0300
Subject: [PATCH 116/119] update comment about skipping integration

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

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
index 20e9341ebd..267280ad9f 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
@@ -73,5 +73,5 @@ class ExtractRender(publish.Extractor):
                                "Missing output files: {}".format(
                                    missing_frames))
 
-        # Remove original render instance
+        # Skip integrating original render instance
         instance.data["integrate"] = False

From 48167e23c79baf4510d514426139f07f9ec86a9b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 22 May 2024 17:43:31 +0200
Subject: [PATCH 117/119] Implement sorting proxy model

---
 .../tools/launcher/ui/actions_widget.py       | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/tools/launcher/ui/actions_widget.py b/client/ayon_core/tools/launcher/ui/actions_widget.py
index a225827418..3e4dfaf6e4 100644
--- a/client/ayon_core/tools/launcher/ui/actions_widget.py
+++ b/client/ayon_core/tools/launcher/ui/actions_widget.py
@@ -290,6 +290,34 @@ class ActionDelegate(QtWidgets.QStyledItemDelegate):
         painter.drawPixmap(extender_x, extender_y, pix)
 
 
+class ActionsProxyModel(QtCore.QSortFilterProxyModel):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive)
+
+    def lessThan(self, left, right):
+        # Sort by action order and then by label
+        left_value = left.data(ACTION_SORT_ROLE)
+        right_value = right.data(ACTION_SORT_ROLE)
+
+        # Values are same -> use super sorting
+        if left_value == right_value:
+            # Default behavior is using DisplayRole
+            return super().lessThan(left, right)
+
+        # Validate 'None' values
+        if right_value is None:
+            return True
+        if left_value is None:
+            return False
+        # Sort values and handle incompatible types
+        try:
+            return left_value < right_value
+        except TypeError:
+            return True
+
+
 class ActionsWidget(QtWidgets.QWidget):
     def __init__(self, controller, parent):
         super(ActionsWidget, self).__init__(parent)
@@ -316,10 +344,7 @@ class ActionsWidget(QtWidgets.QWidget):
 
         model = ActionsQtModel(controller)
 
-        proxy_model = QtCore.QSortFilterProxyModel()
-        proxy_model.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive)
-        proxy_model.setSortRole(ACTION_SORT_ROLE)
-
+        proxy_model = ActionsProxyModel()
         proxy_model.setSourceModel(model)
         view.setModel(proxy_model)
 

From 88cae86ee67a0cedd2e0635dd1fe1f6a2a45f4d9 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 22 May 2024 17:43:42 +0200
Subject: [PATCH 118/119] reverse sorting in actions model

---
 client/ayon_core/tools/launcher/models/actions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/tools/launcher/models/actions.py b/client/ayon_core/tools/launcher/models/actions.py
index c27f0cd757..32df600c87 100644
--- a/client/ayon_core/tools/launcher/models/actions.py
+++ b/client/ayon_core/tools/launcher/models/actions.py
@@ -332,7 +332,7 @@ class ActionsModel:
         selection = self._prepare_selection(project_name, folder_id, task_id)
         output = []
         action_items = self._get_action_items(project_name)
-        for identifier, action in sorted(self._get_action_objects().items()):
+        for identifier, action in self._get_action_objects().items():
             if not action.is_compatible(selection):
                 continue
 

From 7f586576415493f0c49bdb497fb70c9921b038ed Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Wed, 22 May 2024 18:46:39 +0300
Subject: [PATCH 119/119] move code to a dedicated place

---
 .../plugins/publish/collect_local_render_instances.py       | 6 +++---
 .../hosts/houdini/plugins/publish/extract_render.py         | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py
index 5a446fa0d3..474002e1ee 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py
@@ -132,6 +132,6 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin):
                 ]
             })
 
-        # Remove original render instance
-        # I can't remove it here as I still need it to trigger the render.
-        # context.remove(instance)
+        # Skip integrating original render instance.
+        # We are not removing it because it's used to trigger the render.
+        instance.data["integrate"] = False
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
index 267280ad9f..7b4762a25f 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py
@@ -72,6 +72,3 @@ class ExtractRender(publish.Extractor):
             raise RuntimeError("Failed to complete render extraction. "
                                "Missing output files: {}".format(
                                    missing_frames))
-
-        # Skip integrating original render instance
-        instance.data["integrate"] = False