From 3b70243adce054b904f4fe61dfcc5beef0f7f54b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 14:50:13 +0100
Subject: [PATCH 01/89] AY-745 - added Deadline credentials to Settings

This provides Site Settings fields for Deadline user name and password.
---
 server_addon/deadline/server/settings/main.py | 23 +++++++++++++++++++
 server_addon/deadline/server/version.py       |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py
index 9537d6d550..8213268bce 100644
--- a/server_addon/deadline/server/settings/main.py
+++ b/server_addon/deadline/server/settings/main.py
@@ -18,6 +18,16 @@ class ServerListSubmodel(BaseSettingsModel):
     value: str = SettingsField(title="Value")
 
 
+class LocalSubmodel(BaseSettingsModel):
+    """Select your local and remote site"""
+    username: str = SettingsField("",
+                                  title="Username",
+                                  scope=["site"])
+    password: str = SettingsField("",
+                                  title="Password",
+                                  scope=["site"])
+
+
 async def defined_deadline_ws_name_enum_resolver(
     addon: "BaseServerAddon",
     settings_variant: str = "production",
@@ -48,17 +58,30 @@ class DeadlineSettings(BaseSettingsModel):
         scope=["project"],
         enum_resolver=defined_deadline_ws_name_enum_resolver
     )
+    require_authentication: bool = SettingsField(
+        False,
+        title="Require Authentication",
+        scope=["project"],
+    )
     publish: PublishPluginsModel = SettingsField(
         default_factory=PublishPluginsModel,
         title="Publish Plugins",
     )
 
+    local_settings: LocalSubmodel = SettingsField(
+        default_factory=LocalSubmodel,
+        title="Local setting",
+        scope=["site"],
+        description="This setting is only applicable for artist's site",
+    )
+
     @validator("deadline_urls")
     def validate_unique_names(cls, value):
         ensure_unique_names(value)
         return value
 
 
+
 DEFAULT_VALUES = {
     "deadline_urls": [
         {
diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
index c11f861afb..569b1212f7 100644
--- a/server_addon/deadline/server/version.py
+++ b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.9"
+__version__ = "0.1.10"

From 3137d8e7971cdc449a30f4efd77f368d2832fab4 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 14:53:57 +0100
Subject: [PATCH 02/89] AY-745 - added collector for DL user credentials

Collects credentials if Project Settings have deadline authentication required.
---
 .../publish/collect_user_credentials.py       | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py

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
new file mode 100644
index 0000000000..d523f693a2
--- /dev/null
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+"""Collect user credentials
+
+Requires:
+    context -> project_settings
+
+Provides:
+    context -> deadline_require_authentication (bool)
+    context -> deadline_auth (tuple (str, str)) - (username, password) or None
+"""
+import pyblish.api
+
+
+class CollectUserCredentials(pyblish.api.ContextPlugin):
+    """Collects user name and password for artist if DL requires authentication
+    """
+
+    # Run before collect_deadline_server_instance.
+    order = pyblish.api.CollectorOrder
+    label = "Collect Deadline User Credentials"
+
+    def process(self, context):
+        deadline_settings = context.data["project_settings"]["deadline"]
+
+        context.data["deadline_require_authentication"] = (
+            deadline_settings)["require_authentication"]
+        context.data["deadline_auth"] = None
+
+        if not context.data["deadline_require_authentication"]:
+            return
+
+        local_settings = deadline_settings["local_settings"]
+        context.data["deadline_auth"] = (local_settings["username"],
+                                         local_settings["password"])

From 20d47e54ca678a6046582ac6544fcb670a53f86b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 14:54:24 +0100
Subject: [PATCH 03/89] AY-745 - updated validator for DL connection

---
 .../help/validate_deadline_connection.xml      | 17 +++++++++++++++++
 .../publish/validate_deadline_connection.py    | 18 ++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml

diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml b/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
new file mode 100644
index 0000000000..cafcdb8928
--- /dev/null
+++ b/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+    <error id="main">
+        <title>Deadline Authentication</title>
+        <description>
+## Deadline authenticatin is required
+
+This project has set in Settings that Deadline requires authentication.
+
+### How to repair?
+
+Please go to Ayon Server Site settings and provide your Deadline username and
+            most likely password too. (Deadline could run in configuration that empty passwords are allowed. Ask your administrator for details.)
+
+        </description>
+    </error>
+</root>
\ No newline at end of file
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
index a7b300beff..b1503fb95b 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -1,5 +1,7 @@
 import pyblish.api
 
+from ayon_core.pipeline import PublishXmlValidationError
+
 from openpype_modules.deadline.abstract_submit_deadline import requests_get
 
 
@@ -15,8 +17,9 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
     responses = {}
 
     def process(self, instance):
+        context = instance.context
         # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
+        deadline_url = context.data["defaultDeadline"]
         # if custom one is set in instance, use that
         if instance.data.get("deadlineUrl"):
             deadline_url = instance.data.get("deadlineUrl")
@@ -25,8 +28,19 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
             )
         assert deadline_url, "Requires Deadline Webservice URL"
 
+        kwargs = {}
+        if context.data["deadline_require_authentication"]:
+            kwargs["auth"] = context.data["deadline_auth"]
+
+            if not context.data["deadline_auth"]:
+                raise PublishXmlValidationError(
+                    self,
+                    "Deadline requires authentication. "
+                    "At least username is required to be set in "
+                    "Site Settings.")
+
         if deadline_url not in self.responses:
-            self.responses[deadline_url] = requests_get(deadline_url)
+            self.responses[deadline_url] = requests_get(deadline_url, **kwargs)
 
         response = self.responses[deadline_url]
         assert response.ok, "Response must be ok"

From 5ad0d4af0080577cfa4928d36c152c5012ea2575 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 14:54:41 +0100
Subject: [PATCH 04/89] AY-745 - updated validator for DL pools

---
 client/ayon_core/modules/deadline/deadline_module.py       | 7 +++++--
 .../deadline/plugins/publish/validate_deadline_pools.py    | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py
index d2f0e263d4..761c8a8e92 100644
--- a/client/ayon_core/modules/deadline/deadline_module.py
+++ b/client/ayon_core/modules/deadline/deadline_module.py
@@ -45,7 +45,7 @@ class DeadlineModule(AYONAddon, IPluginPaths):
         }
 
     @staticmethod
-    def get_deadline_pools(webservice, log=None):
+    def get_deadline_pools(webservice, auth=None, log=None):
         # type: (str) -> list
         """Get pools from Deadline.
         Args:
@@ -64,7 +64,10 @@ class DeadlineModule(AYONAddon, IPluginPaths):
 
         argument = "{}/api/pools?NamesOnly=true".format(webservice)
         try:
-            response = requests_get(argument)
+            kwargs = {}
+            if auth:
+                kwargs["auth"] = auth
+            response = requests_get(argument, **kwargs)
         except requests.exceptions.ConnectionError as exc:
             msg = 'Cannot connect to DL web service {}'.format(webservice)
             log.error(msg)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
index 2feb044cf1..c54d187ccf 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -38,7 +38,8 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
             return
 
         deadline_url = self.get_deadline_url(instance)
-        pools = self.get_pools(deadline_url)
+        pools = self.get_pools(deadline_url,
+                               instance.context.data["deadline_auth"])
 
         invalid_pools = {}
         primary_pool = instance.data.get("primaryPool")
@@ -69,13 +70,14 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
             deadline_url = instance.data.get("deadlineUrl")
         return deadline_url
 
-    def get_pools(self, deadline_url):
+    def get_pools(self, deadline_url, auth):
         if deadline_url not in self.pools_per_url:
             self.log.debug(
                 "Querying available pools for Deadline url: {}".format(
                     deadline_url)
             )
             pools = DeadlineModule.get_deadline_pools(deadline_url,
+                                                      auth=auth,
                                                       log=self.log)
             self.log.info("Available pools: {}".format(pools))
             self.pools_per_url[deadline_url] = pools

From 615e6ae6f3ff13b817ebf1a5f0b7186aaef8016b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 15:02:14 +0100
Subject: [PATCH 05/89] AY-745 - updated validator for expected files

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index a666c5c2dc..0f20b5a644 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -208,7 +208,10 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
 
         url = "{}/api/jobs?JobID={}".format(deadline_url, job_id)
         try:
-            response = requests_get(url)
+            kwargs = {}
+            if instance.context.data["deadline_auth"]:
+                kwargs["auth"] = instance.context.data["deadline_auth"]
+            response = requests_get(url, **kwargs)
         except requests.exceptions.ConnectionError:
             self.log.error("Deadline is not accessible at "
                            "{}".format(deadline_url))

From 28e5834b4cbe6facec6baccb951c7b8e4f0cec11 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 15:04:17 +0100
Subject: [PATCH 06/89] AY-745 - added authentication credentials to all calls
 to DL

Changed all calls to module's method which handle SSL
---
 .../deadline/abstract_submit_deadline.py      | 19 +++++++++++++------
 .../publish/submit_celaction_deadline.py      |  8 ++++++--
 .../plugins/publish/submit_fusion_deadline.py |  8 +++++---
 .../plugins/publish/submit_maya_deadline.py   | 14 +++++++++-----
 .../plugins/publish/submit_nuke_deadline.py   |  8 ++++++--
 .../publish/submit_publish_cache_job.py       |  8 ++++++--
 .../plugins/publish/submit_publish_job.py     |  8 ++++++--
 7 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
index 2e0518ae20..293e981230 100644
--- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py
+++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
@@ -460,7 +460,9 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         self.plugin_info = self.get_plugin_info()
         self.aux_files = self.get_aux_files()
 
-        job_id = self.process_submission()
+        auth = context.data.get("deadline_auth")
+        self.log.info(f"auth::{auth}")
+        job_id = self.process_submission(auth)
         self.log.info("Submitted job to Deadline: {}.".format(job_id))
 
         # TODO: Find a way that's more generic and not render type specific
@@ -473,10 +475,10 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
                 job_info=render_job_info,
                 plugin_info=render_plugin_info
             )
-            render_job_id = self.submit(payload)
+            render_job_id = self.submit(payload, auth)
             self.log.info("Render job id: %s", render_job_id)
 
-    def process_submission(self):
+    def process_submission(self, auth=None):
         """Process data for submission.
 
         This takes Deadline JobInfo, PluginInfo, AuxFile, creates payload
@@ -487,7 +489,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
 
         """
         payload = self.assemble_payload()
-        return self.submit(payload)
+        return self.submit(payload, auth)
 
     @abstractmethod
     def get_job_info(self):
@@ -577,7 +579,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
             "AuxFiles": aux_files or self.aux_files
         }
 
-    def submit(self, payload):
+    def submit(self, payload, auth):
         """Submit payload to Deadline API end-point.
 
         This takes payload in the form of JSON file and POST it to
@@ -585,6 +587,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
 
         Args:
             payload (dict): dict to become json in deadline submission.
+            auth (tuple): (username, password)
 
         Returns:
             str: resulting Deadline job id.
@@ -594,7 +597,11 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
 
         """
         url = "{}/api/jobs".format(self._deadline_url)
-        response = requests_post(url, json=payload)
+        kwargs = {}
+        if auth:
+            kwargs["auth"] = auth
+        response = requests_post(url, json=payload,
+                                 **kwargs)
         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/submit_celaction_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
index bc3636da63..e3160988c8 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
@@ -2,9 +2,10 @@ import os
 import re
 import json
 import getpass
-import requests
 import pyblish.api
 
+from openpype_modules.deadline.abstract_submit_deadline import requests_post
+
 
 class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
     """Submit CelAction2D scene to Deadline
@@ -193,7 +194,10 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
 
-        response = requests.post(self.deadline_url, json=payload)
+        kwargs = {}
+        if instance.context.data["deadline_auth"]:
+            kwargs["auth"] = instance.context.data["deadline_auth"]
+        response = requests_post(self.deadline_url, json=payload, **kwargs)
 
         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 837ed91c60..54ec6101d0 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
@@ -2,10 +2,9 @@ import os
 import json
 import getpass
 
-import requests
-
 import pyblish.api
 
+from openpype_modules.deadline.abstract_submit_deadline import requests_post
 from ayon_core.pipeline.publish import (
     AYONPyblishPluginMixin
 )
@@ -251,7 +250,10 @@ class FusionSubmitDeadline(
 
         # E.g. http://192.168.0.1:8082/api/jobs
         url = "{}/api/jobs".format(deadline_url)
-        response = requests.post(url, json=payload)
+        kwargs = {}
+        if instance.context.data["deadline_auth"]:
+            kwargs["auth"] = instance.context.data["deadline_auth"]
+        response = requests_post(url, json=payload, **kwargs)
         if not response.ok:
             raise Exception(response.text)
 
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 0e871eb90e..10e834e09a 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
@@ -290,7 +290,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
         return plugin_payload
 
-    def process_submission(self):
+    def process_submission(self, auth=None):
         from maya import cmds
         instance = self._instance
 
@@ -330,7 +330,8 @@ 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)
+            export_job = self.submit(vray_export_payload,
+                                     instance.context.data["deadline_auth"])
 
             payload = self._get_vray_render_payload(payload_data)
 
@@ -349,7 +350,8 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         else:
             # Submit main render job
             job_info, plugin_info = payload
-            self.submit(self.assemble_payload(job_info, plugin_info))
+            self.submit(self.assemble_payload(job_info, plugin_info),
+                        instance.context.data["deadline_auth"])
 
     def _tile_render(self, payload):
         """Submit as tile render per frame with dependent assembly jobs."""
@@ -449,7 +451,8 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         # Submit frame tile jobs
         frame_tile_job_id = {}
         for frame, tile_job_payload in frame_payloads.items():
-            job_id = self.submit(tile_job_payload)
+            job_id = self.submit(tile_job_payload,
+                                 instance.context.data["deadline_auth"])
             frame_tile_job_id[frame] = job_id
 
         # Define assembly payloads
@@ -557,7 +560,8 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
                 "submitting assembly job {} of {}".format(i + 1,
                                                           num_assemblies)
             )
-            assembly_job_id = self.submit(payload)
+            assembly_job_id = self.submit(payload,
+                instance.context.data["deadline_auth"])
             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 a3111454b3..e80c56ee1f 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
@@ -4,9 +4,9 @@ import json
 import getpass
 from datetime import datetime
 
-import requests
 import pyblish.api
 
+from openpype_modules.deadline.abstract_submit_deadline import requests_post
 from ayon_core.pipeline.publish import (
     AYONPyblishPluginMixin
 )
@@ -434,7 +434,11 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
 
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
-        response = requests.post(self.deadline_url, json=payload, timeout=10)
+        kwargs = {}
+        if instance.context.data["deadline_auth"]:
+            kwargs["auth"] = instance.context.data["deadline_auth"]
+        response = requests_post(self.deadline_url, json=payload, timeout=10,
+                                 **kwargs)
 
         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 0561e0f65c..86ac2201e6 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
@@ -5,10 +5,10 @@ import json
 import re
 from copy import deepcopy
 
-import requests
 import ayon_api
 import pyblish.api
 
+from openpype_modules.deadline.abstract_submit_deadline import requests_post
 from ayon_core.pipeline import publish
 from ayon_core.lib import EnumDef, is_in_tests
 from ayon_core.pipeline.version_start import get_versioning_start
@@ -209,7 +209,11 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         self.log.debug("Submitting Deadline publish job ...")
 
         url = "{}/api/jobs".format(self.deadline_url)
-        response = requests.post(url, json=payload, timeout=10)
+        kwargs = {}
+        if instance.context.data["deadline_auth"]:
+            kwargs["auth"] = instance.context.data["deadline_auth"]
+        response = requests_post(url, json=payload, timeout=10,
+                                 **kwargs)
         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 7a6abd5507..e9e76a112c 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
@@ -5,11 +5,11 @@ import json
 import re
 from copy import deepcopy
 
-import requests
 import clique
 import ayon_api
 import pyblish.api
 
+from openpype_modules.deadline.abstract_submit_deadline import requests_post
 from ayon_core.pipeline import publish
 from ayon_core.lib import EnumDef, is_in_tests
 from ayon_core.pipeline.version_start import get_versioning_start
@@ -303,7 +303,11 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         self.log.debug("Submitting Deadline publish job ...")
 
         url = "{}/api/jobs".format(self.deadline_url)
-        response = requests.post(url, json=payload, timeout=10)
+        kwargs = {}
+        if instance.context.data["deadline_auth"]:
+            kwargs["auth"] = instance.context.data["deadline_auth"]
+        response = requests_post(url, json=payload, timeout=10,
+                                 **kwargs)
         if not response.ok:
             raise Exception(response.text)
 

From 0a9b88a7cf903b856821d273f63f14b442e44daa Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 15:17:06 +0100
Subject: [PATCH 07/89] AY-745 - fix validation

---
 .../plugins/publish/validate_deadline_connection.py       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
index b1503fb95b..2c05e505c5 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -32,7 +32,7 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
         if context.data["deadline_require_authentication"]:
             kwargs["auth"] = context.data["deadline_auth"]
 
-            if not context.data["deadline_auth"]:
+            if not context.data["deadline_auth"][0]:
                 raise PublishXmlValidationError(
                     self,
                     "Deadline requires authentication. "
@@ -43,6 +43,12 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
             self.responses[deadline_url] = requests_get(deadline_url, **kwargs)
 
         response = self.responses[deadline_url]
+        if response.status_code == 401:
+            raise PublishXmlValidationError(
+                self,
+                "Deadline requires authentication. "
+                "Provided credentials are not working. "
+                "Please change them in Site Settings")
         assert response.ok, "Response must be ok"
         assert response.text.startswith("Deadline Web Service "), (
             "Web service did not respond with 'Deadline Web Service'"

From 56a5f42a66582854e16753604c83f720a3adb848 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 16:11:52 +0100
Subject: [PATCH 08/89] Update
 client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml b/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
index cafcdb8928..e9377d8baa 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
+++ b/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
@@ -3,7 +3,7 @@
     <error id="main">
         <title>Deadline Authentication</title>
         <description>
-## Deadline authenticatin is required
+## Deadline authentication is required
 
 This project has set in Settings that Deadline requires authentication.
 

From 543ffa902512e62602f53ce5de94df258dea5b08 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 16:11:59 +0100
Subject: [PATCH 09/89] Update
 client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py

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

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 d523f693a2..75836d9fca 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
@@ -11,7 +11,7 @@ Provides:
 import pyblish.api
 
 
-class CollectUserCredentials(pyblish.api.ContextPlugin):
+class CollectDeadlineUserCredentials(pyblish.api.ContextPlugin):
     """Collects user name and password for artist if DL requires authentication
     """
 

From 209cad619118393eb7a3c1442e67d3e6df9cb543 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Mar 2024 16:13:08 +0100
Subject: [PATCH 10/89] AY-745 - remove logging

---
 client/ayon_core/modules/deadline/abstract_submit_deadline.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
index 293e981230..cc565fdc1e 100644
--- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py
+++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
@@ -461,7 +461,6 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         self.aux_files = self.get_aux_files()
 
         auth = context.data.get("deadline_auth")
-        self.log.info(f"auth::{auth}")
         job_id = self.process_submission(auth)
         self.log.info("Submitted job to Deadline: {}.".format(job_id))
 

From 7fae6d1aaf40952c69189569f99b099578dae3c1 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 25 Mar 2024 12:38:21 +0100
Subject: [PATCH 11/89] AY-745 - added new system wide Site settings

Credentials for DL servers should be set only once, not for each project separately
---
 server_addon/deadline/server/__init__.py      |  4 +-
 .../deadline/server/settings/__init__.py      |  2 +
 server_addon/deadline/server/settings/main.py | 51 +++++++------------
 .../deadline/server/settings/site_settings.py | 26 ++++++++++
 4 files changed, 48 insertions(+), 35 deletions(-)
 create mode 100644 server_addon/deadline/server/settings/site_settings.py

diff --git a/server_addon/deadline/server/__init__.py b/server_addon/deadline/server/__init__.py
index 36d04189a9..4a67b9741c 100644
--- a/server_addon/deadline/server/__init__.py
+++ b/server_addon/deadline/server/__init__.py
@@ -3,7 +3,7 @@ from typing import Type
 from ayon_server.addons import BaseServerAddon
 
 from .version import __version__
-from .settings import DeadlineSettings, DEFAULT_VALUES
+from .settings import DeadlineSettings, DEFAULT_VALUES, DeadlineSiteSettings
 
 
 class Deadline(BaseServerAddon):
@@ -11,6 +11,8 @@ class Deadline(BaseServerAddon):
     title = "Deadline"
     version = __version__
     settings_model: Type[DeadlineSettings] = DeadlineSettings
+    site_settings_model: Type[DeadlineSiteSettings] = DeadlineSiteSettings
+
 
     async def get_default_settings(self):
         settings_model_cls = self.get_settings_model()
diff --git a/server_addon/deadline/server/settings/__init__.py b/server_addon/deadline/server/settings/__init__.py
index 0307862afa..d25c0fb330 100644
--- a/server_addon/deadline/server/settings/__init__.py
+++ b/server_addon/deadline/server/settings/__init__.py
@@ -2,9 +2,11 @@ from .main import (
     DeadlineSettings,
     DEFAULT_VALUES,
 )
+from .site_settings import DeadlineSiteSettings
 
 
 __all__ = (
     "DeadlineSettings",
+    "DeadlineSiteSettings",
     "DEFAULT_VALUES",
 )
diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py
index 8213268bce..31a42a3e27 100644
--- a/server_addon/deadline/server/settings/main.py
+++ b/server_addon/deadline/server/settings/main.py
@@ -12,22 +12,6 @@ from .publish_plugins import (
 )
 
 
-class ServerListSubmodel(BaseSettingsModel):
-    _layout = "compact"
-    name: str = SettingsField(title="Name")
-    value: str = SettingsField(title="Value")
-
-
-class LocalSubmodel(BaseSettingsModel):
-    """Select your local and remote site"""
-    username: str = SettingsField("",
-                                  title="Username",
-                                  scope=["site"])
-    password: str = SettingsField("",
-                                  title="Password",
-                                  scope=["site"])
-
-
 async def defined_deadline_ws_name_enum_resolver(
     addon: "BaseServerAddon",
     settings_variant: str = "production",
@@ -39,42 +23,39 @@ async def defined_deadline_ws_name_enum_resolver(
 
     settings = await addon.get_studio_settings(variant=settings_variant)
 
-    ws_urls = []
+    ws_server_name = []
     for deadline_url_item in settings.deadline_urls:
-        ws_urls.append(deadline_url_item.name)
+        ws_server_name.append(deadline_url_item.name)
 
-    return ws_urls
+    return ws_server_name
+
+class ServerListSubmodel(BaseSettingsModel):
+    _layout = "compact"
+    name: str = SettingsField(title="Name")
+    value: str = SettingsField(title="Url")
+    require_authentication: bool = SettingsField(title="Require authentication")
+    ssl: bool = SettingsField(title="SSL")
 
 
 class DeadlineSettings(BaseSettingsModel):
     deadline_urls: list[ServerListSubmodel] = SettingsField(
         default_factory=list,
-        title="System Deadline Webservice URLs",
+        title="System Deadline Webservice Info",
         scope=["studio"],
     )
+
     deadline_server: str = SettingsField(
-        title="Project deadline server",
+        title="Project Deadline server name",
         section="---",
         scope=["project"],
         enum_resolver=defined_deadline_ws_name_enum_resolver
     )
-    require_authentication: bool = SettingsField(
-        False,
-        title="Require Authentication",
-        scope=["project"],
-    )
+
     publish: PublishPluginsModel = SettingsField(
         default_factory=PublishPluginsModel,
         title="Publish Plugins",
     )
 
-    local_settings: LocalSubmodel = SettingsField(
-        default_factory=LocalSubmodel,
-        title="Local setting",
-        scope=["site"],
-        description="This setting is only applicable for artist's site",
-    )
-
     @validator("deadline_urls")
     def validate_unique_names(cls, value):
         ensure_unique_names(value)
@@ -86,7 +67,9 @@ DEFAULT_VALUES = {
     "deadline_urls": [
         {
             "name": "default",
-            "value": "http://127.0.0.1:8082"
+            "value": "http://127.0.0.1:8082",
+            "require_authentication": False,
+            "ssl": False
         }
     ],
     "deadline_server": "default",
diff --git a/server_addon/deadline/server/settings/site_settings.py b/server_addon/deadline/server/settings/site_settings.py
new file mode 100644
index 0000000000..cc3ec66ad9
--- /dev/null
+++ b/server_addon/deadline/server/settings/site_settings.py
@@ -0,0 +1,26 @@
+from ayon_server.settings import (
+    BaseSettingsModel,
+    SettingsField,
+)
+from .main import defined_deadline_ws_name_enum_resolver
+
+
+class LocalSubmodel(BaseSettingsModel):
+    """Provide credentials for configured DL servers"""
+    _layout = "expanded"
+    server_name: str = SettingsField("",
+        title="DL server name",
+        enum_resolver=defined_deadline_ws_name_enum_resolver)
+    username: str = SettingsField("",
+                                  title="Username")
+    password: str = SettingsField("",
+                                  title="Password")
+
+
+class DeadlineSiteSettings(BaseSettingsModel):
+    local_settings: list[LocalSubmodel] = SettingsField(
+        default_factory=list,
+        title="Local setting",
+        description="Please provide credentials for configured Deadline servers",
+    )
+

From 6b0568a3edb5b5eb8e91160da8a6d69f7f268da1 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:36:54 +0100
Subject: [PATCH 12/89] AY-745 - added version to client side

Required for getting site settings from addon
---
 client/ayon_core/modules/deadline/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/ayon_core/modules/deadline/__init__.py b/client/ayon_core/modules/deadline/__init__.py
index 5631e501d8..683d8dbe4a 100644
--- a/client/ayon_core/modules/deadline/__init__.py
+++ b/client/ayon_core/modules/deadline/__init__.py
@@ -1,6 +1,8 @@
 from .deadline_module import DeadlineModule
+from .version import __version__
 
 
 __all__ = (
     "DeadlineModule",
+    "__version__"
 )

From 12d49cbe6158907102aaec4bd7d3e55a0a7f2a38 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:37:27 +0100
Subject: [PATCH 13/89] AY-745 - added field to carry over deadline info

Should be refactored into more generic if necessary
---
 client/ayon_core/pipeline/publish/abstract_collect_render.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/pipeline/publish/abstract_collect_render.py b/client/ayon_core/pipeline/publish/abstract_collect_render.py
index 745632ca0a..6bd011b8f1 100644
--- a/client/ayon_core/pipeline/publish/abstract_collect_render.py
+++ b/client/ayon_core/pipeline/publish/abstract_collect_render.py
@@ -80,6 +80,7 @@ class RenderInstance(object):
     anatomyData = attr.ib(default=None)
     outputDir = attr.ib(default=None)
     context = attr.ib(default=None)
+    deadline = attr.ib(default=None)
 
     @frameStart.validator
     def check_frame_start(self, _, value):

From 6347e659650f7b7179f9c6be76fc4befdd8ec6e5 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:38:20 +0100
Subject: [PATCH 14/89] AY-745 - explicit cast to tuple

Data class translates auth tuple into list
---
 .../ayon_core/modules/deadline/abstract_submit_deadline.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
index cc565fdc1e..9b62f473dd 100644
--- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py
+++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
@@ -49,6 +49,10 @@ def requests_post(*args, **kwargs):
     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
     # add 10sec timeout before bailing out
     kwargs['timeout'] = 10
     return requests.post(*args, **kwargs)
@@ -70,6 +74,9 @@ def requests_get(*args, **kwargs):
     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)
     # add 10sec timeout before bailing out
     kwargs['timeout'] = 10
     return requests.get(*args, **kwargs)

From 5c9fc4a9960cbeeca236e56df0ecf5fa28e174ab Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:38:46 +0100
Subject: [PATCH 15/89] AY-745 - changed structure

Additiona 'deadline' wrapper introduced
---
 .../ayon_core/modules/deadline/abstract_submit_deadline.py  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
index 9b62f473dd..e71177b34e 100644
--- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py
+++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
@@ -441,9 +441,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         """Plugin entry point."""
         self._instance = instance
         context = instance.context
-        self._deadline_url = context.data.get("defaultDeadline")
-        self._deadline_url = instance.data.get(
-            "deadlineUrl", self._deadline_url)
+        self._deadline_url = instance.data["deadline"]["url"]
 
         assert self._deadline_url, "Requires Deadline Webservice URL"
 
@@ -467,7 +465,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         self.plugin_info = self.get_plugin_info()
         self.aux_files = self.get_aux_files()
 
-        auth = context.data.get("deadline_auth")
+        auth = instance.data["deadline"]["auth"]
         job_id = self.process_submission(auth)
         self.log.info("Submitted job to Deadline: {}.".format(job_id))
 

From 68be4d77303ef311f09c92c779a125aff8fc93c0 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:40:56 +0100
Subject: [PATCH 16/89] AY-745 - changed aproach to get DL to use

collect_deadline_server_from_instance.py should be reworked as currently it is not applicable for any publishes. There were fields to provide DL server directly into DCC UI (Maya, Nuke), but they are gone with New Publisher.
---
 .../collect_deadline_server_from_instance.py  | 41 +++++++++++++++----
 .../collect_default_deadline_server.py        | 18 ++++----
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index ea4b7a213e..74ab79cfbc 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -7,6 +7,7 @@ attribute or using default server if that attribute doesn't exists.
 """
 import pyblish.api
 from ayon_core.pipeline.publish import KnownPublishError
+from ayon_core.pipeline.context_tools import get_current_host_name
 
 
 class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
@@ -15,15 +16,37 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     # Run before collect_render.
     order = pyblish.api.CollectorOrder + 0.005
     label = "Deadline Webservice from the Instance"
-    families = ["rendering", "renderlayer"]
-    hosts = ["maya"]
+    families = ["render",
+                "rendering",
+                "render.farm",
+                "renderFarm",
+                "renderlayer",
+                "maxrender",
+                "usdrender",
+                "redshift_rop",
+                "arnold_rop",
+                "mantra_rop",
+                "karma_rop",
+                "vray_rop",
+                "publish.hou",
+                "image"]  # for Fusion
 
     def process(self, instance):
-        instance.data["deadlineUrl"] = self._collect_deadline_url(instance)
-        instance.data["deadlineUrl"] = \
-            instance.data["deadlineUrl"].strip().rstrip("/")
+        if not "deadline" in instance.data:
+            instance.data["deadline"] = {}
+
+        host_name = get_current_host_name()
+        if host_name == "maya":
+            deadline_url = self._collect_deadline_url(instance)
+        else:
+            deadline_url = (instance.data.get("deadlineUrl") or  # backwards
+                            instance.data.get("deadline", {}).get("url"))
+        if deadline_url:
+            instance.data["deadline"]["url"] = deadline_url.strip().rstrip("/")
+        else:
+            instance.data["deadline"]["url"] = instance.context.data["deadline"]["defaultDeadline"]  # noqa
         self.log.debug(
-            "Using {} for submission.".format(instance.data["deadlineUrl"]))
+            "Using {} for submission".format(instance.data["deadline"]["url"]))
 
     def _collect_deadline_url(self, render_instance):
         # type: (pyblish.api.Instance) -> str
@@ -49,8 +72,8 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
             ["project_settings"]
             ["deadline"]
         )
-
-        default_server = render_instance.context.data["defaultDeadline"]
+        default_server = (render_instance.context.data["deadline"]
+                                                      ["defaultDeadline"])
         # QUESTION How and where is this is set? Should be removed?
         instance_server = render_instance.data.get("deadlineServers")
         if not instance_server:
@@ -66,7 +89,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
 
         default_servers = {
             url_item["name"]: url_item["value"]
-            for url_item in deadline_settings["deadline_urls"]
+            for url_item in deadline_settings["deadline_server_info"]
         }
         project_servers = (
             render_instance.context.data
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 8123409052..472a40300d 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -33,15 +33,17 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
         deadline_settings = context.data["project_settings"]["deadline"]
         deadline_server_name = deadline_settings["deadline_server"]
 
-        deadline_webservice = None
+        dl_ws_item = None
         if deadline_server_name:
-            deadline_webservice = deadline_module.deadline_urls.get(
+            dl_ws_item = deadline_module.deadline_server_info.get(
                 deadline_server_name)
 
-        default_deadline_webservice = deadline_module.deadline_urls["default"]
-        deadline_webservice = (
-            deadline_webservice
-            or default_deadline_webservice
-        )
+        if dl_ws_item:
+            deadline_url = dl_ws_item["value"]
+        else:
+            default_dl_item = deadline_module.deadline_server_info.pop()
+            deadline_url = default_dl_item["value"]
 
-        context.data["defaultDeadline"] = deadline_webservice.strip().rstrip("/")  # noqa
+        context.data["deadline"] = {}
+        context.data["deadline"]["defaultDeadline"] = (
+            deadline_url.strip().rstrip("/"))

From eca34a912be848c4f3f7f16991634156edb35745 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:41:44 +0100
Subject: [PATCH 17/89] AY-745 - update to Harmony collector

DL will not work for Harmony, needs to be translated into New Publisher.
---
 .../hosts/harmony/plugins/publish/collect_farm_render.py       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
index 156e2ac6ba..e869de316f 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
@@ -177,7 +177,8 @@ class CollectFarmRender(publish.AbstractCollectRender):
                 outputFormat=info[1],
                 outputStartFrame=info[3],
                 leadingZeros=info[2],
-                ignoreFrameHandleCheck=True
+                ignoreFrameHandleCheck=True,
+                # deadline=inst.data.get("deadline")  TODO
 
             )
             render_instance.context = context

From abfcd8b2e7985d15664fbc48923a0b2a0c71b211 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:43:02 +0100
Subject: [PATCH 18/89] AY-745 - explicit carry over of DL meta for
 AbstractCollectRender

AbstractCollectRender changes from original instance to `RenderInstance`, DL metadata must be propagated.
---
 .../hosts/aftereffects/plugins/publish/collect_render.py         | 1 +
 client/ayon_core/hosts/fusion/plugins/publish/collect_render.py  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
index afd58ca758..913b4a7b96 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
@@ -146,6 +146,7 @@ class CollectAERender(publish.AbstractCollectRender):
                 if "review" in instance.families:
                     # to skip ExtractReview locally
                     instance.families.remove("review")
+                instance.deadline = inst.data.get("deadline")
 
             instances.append(instance)
             instances_to_remove.append(inst)
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..ddc2902644 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
@@ -113,6 +113,7 @@ class CollectFusionRender(
                 if "review" in instance.families:
                     # to skip ExtractReview locally
                     instance.families.remove("review")
+                instance.deadline = inst.data.get("deadline")
 
             # add new instance to the list and remove the original
             # instance since it is not needed anymore

From 50ade43360ec6b5c6011f37186a25d216c5ea6b9 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:47:38 +0100
Subject: [PATCH 19/89] AY-745 - add user credentials to instance

All render instances should have deadline server collected, enhance metadata with credentials
---
 .../publish/collect_user_credentials.py       | 79 ++++++++++++++++---
 1 file changed, 66 insertions(+), 13 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 75836d9fca..061890dd08 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
@@ -3,32 +3,85 @@
 
 Requires:
     context -> project_settings
+    instance.data["deadline"]["url"]
+        or instance.data["deadlineUrl"] for backward compatibility, remove soon
 
 Provides:
-    context -> deadline_require_authentication (bool)
-    context -> deadline_auth (tuple (str, str)) - (username, password) or None
+    instance.data["deadline"] -> require_authentication (bool)
+    instance.data["deadline"] -> auth (tuple (str, str)) -
+        (username, password) or None
 """
 import pyblish.api
 
+from ayon_api import get_server_api_connection
+from ayon_core.modules.deadline.deadline_module import DeadlineModule
+from ayon_core.modules.deadline import __version__
 
-class CollectDeadlineUserCredentials(pyblish.api.ContextPlugin):
+
+class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
     """Collects user name and password for artist if DL requires authentication
     """
 
     # Run before collect_deadline_server_instance.
-    order = pyblish.api.CollectorOrder
+    order = pyblish.api.CollectorOrder + 0.200
     label = "Collect Deadline User Credentials"
 
-    def process(self, context):
-        deadline_settings = context.data["project_settings"]["deadline"]
+    hosts = ["aftereffects",
+             "fusion",
+             "harmony"
+             "nuke",
+             "maya",
+             "max",
+             "houdini"]
 
-        context.data["deadline_require_authentication"] = (
-            deadline_settings)["require_authentication"]
-        context.data["deadline_auth"] = None
+    families = ["render",
+                "rendering",
+                "render.farm",
+                "renderFarm",
+                "renderlayer",
+                "maxrender",
+                "usdrender",
+                "redshift_rop",
+                "arnold_rop",
+                "mantra_rop",
+                "karma_rop",
+                "vray_rop",
+                "publish.hou"]
 
-        if not context.data["deadline_require_authentication"]:
+    def process(self, instance):
+        # backward compatibility, remove soon
+        collected_deadline_url = (instance.data.get("deadlineUrl") or
+            instance.data.get("deadline", {}).get("url"))
+        if not collected_deadline_url:
+            raise ValueError("Instance doesn't have 'deadlineUrl'.")
+        context_data = instance.context.data
+        deadline_settings = context_data["project_settings"]["deadline"]
+
+        deadline_server_name = None
+        # deadline url might be set directly from instance, need to find
+        # metadata for it
+        for deadline_info in deadline_settings["deadline_urls"]:
+            dl_settings_url = deadline_info["value"].strip().rstrip("/")
+            if dl_settings_url == collected_deadline_url:
+                deadline_server_name = deadline_info["name"]
+                break
+
+        if not deadline_server_name:
+            raise ValueError(f"Collected {collected_deadline_url} doesn't " 
+                              "match any site configured in Studio Settings")
+
+        instance.data["deadline"]["require_authentication"] = (
+            deadline_info["require_authentication"]
+        )
+        instance.data["deadline"]["auth"] = None
+
+        if not deadline_info["require_authentication"]:
             return
 
-        local_settings = deadline_settings["local_settings"]
-        context.data["deadline_auth"] = (local_settings["username"],
-                                         local_settings["password"])
+        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:
+            if deadline_server_name == server_info["server_name"]:
+                instance.data["deadline"]["auth"] = (server_info["username"],
+                                                     server_info["password"])

From 7cf416dc7ed40858daeb8510c625dd83cf2f6e4f Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:48:24 +0100
Subject: [PATCH 20/89] AY-745 - refactored class variable

It is not only urls, it is whole metadata
---
 client/ayon_core/modules/deadline/deadline_module.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py
index 761c8a8e92..3a35654737 100644
--- a/client/ayon_core/modules/deadline/deadline_module.py
+++ b/client/ayon_core/modules/deadline/deadline_module.py
@@ -19,23 +19,23 @@ class DeadlineModule(AYONAddon, IPluginPaths):
 
     def initialize(self, studio_settings):
         # This module is always enabled
-        deadline_urls = {}
+        deadline_server_info = {}
         enabled = self.name in studio_settings
         if enabled:
             deadline_settings = studio_settings[self.name]
-            deadline_urls = {
-                url_item["name"]: url_item["value"]
+            deadline_server_info = {
+                url_item["name"]: url_item
                 for url_item in deadline_settings["deadline_urls"]
             }
 
-        if enabled and not deadline_urls:
+        if enabled and not deadline_server_info:
             enabled = False
             self.log.warning((
                 "Deadline Webservice URLs are not specified. Disabling addon."
             ))
 
         self.enabled = enabled
-        self.deadline_urls = deadline_urls
+        self.deadline_server_info = deadline_server_info
 
     def get_plugin_paths(self):
         """Deadline plugin paths."""

From 6faa5acdf79d185b6f09ec9db88bb6f0b80debc2 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:49:20 +0100
Subject: [PATCH 21/89] AY-745 - refactored format of credentials

Now on instance, in `deadline` dictionary
---
 .../plugins/publish/submit_blender_deadline.py     |  3 ++-
 .../plugins/publish/submit_fusion_deadline.py      | 10 ++++------
 .../plugins/publish/submit_max_deadline.py         |  6 ++++--
 .../plugins/publish/submit_maya_deadline.py        |  8 ++++----
 .../plugins/publish/submit_nuke_deadline.py        |  5 +++--
 .../plugins/publish/submit_publish_cache_job.py    |  5 +++--
 .../deadline/plugins/publish/submit_publish_job.py | 14 +++++++-------
 7 files changed, 27 insertions(+), 24 deletions(-)

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 ae19e63a37..a60bd70b13 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
@@ -172,7 +172,8 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         instance.data["toBeRenderedOn"] = "deadline"
 
         payload = self.assemble_payload()
-        return self.submit(payload)
+        return self.submit(payload,
+                           auth=instance.data["deadline"]["auth"])
 
     def from_published_scene(self):
         """
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 54ec6101d0..35c99108be 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
@@ -94,10 +94,7 @@ class FusionSubmitDeadline(
         from ayon_core.hosts.fusion.api.lib import get_frame_path
 
         # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
-        # if custom one is set in instance, use that
-        if instance.data.get("deadlineUrl"):
-            deadline_url = instance.data.get("deadlineUrl")
+        deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 
         # Collect all saver instances in context that are to be rendered
@@ -251,8 +248,9 @@ class FusionSubmitDeadline(
         # E.g. http://192.168.0.1:8082/api/jobs
         url = "{}/api/jobs".format(deadline_url)
         kwargs = {}
-        if instance.context.data["deadline_auth"]:
-            kwargs["auth"] = instance.context.data["deadline_auth"]
+        auth = instance.data["deadline"]["auth"]
+        if auth:
+            kwargs["auth"] = auth
         response = requests_post(url, json=payload, **kwargs)
         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 1abefa515a..51a9e6abfd 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
@@ -185,11 +185,13 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
                 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))
+                self.submit(self.assemble_payload(job_info, plugin_info),
+                            instance.data["deadline"]["auth"])
         else:
             payload = self._use_published_name(payload_data, project_settings)
             job_info, plugin_info = payload
-            self.submit(self.assemble_payload(job_info, plugin_info))
+            self.submit(self.assemble_payload(job_info, plugin_info),
+                        instance.data["deadline"]["auth"])
 
     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 10e834e09a..83ccfc7278 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
@@ -331,7 +331,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             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.context.data["deadline_auth"])
+                                     instance.data["deadline"]["auth"])
 
             payload = self._get_vray_render_payload(payload_data)
 
@@ -351,7 +351,7 @@ 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.context.data["deadline_auth"])
+                        instance.data["deadline"]["auth"])
 
     def _tile_render(self, payload):
         """Submit as tile render per frame with dependent assembly jobs."""
@@ -452,7 +452,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         frame_tile_job_id = {}
         for frame, tile_job_payload in frame_payloads.items():
             job_id = self.submit(tile_job_payload,
-                                 instance.context.data["deadline_auth"])
+                                 instance.data["deadline"]["auth"])
             frame_tile_job_id[frame] = job_id
 
         # Define assembly payloads
@@ -561,7 +561,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
                                                           num_assemblies)
             )
             assembly_job_id = self.submit(payload,
-                instance.context.data["deadline_auth"])
+                instance.data["deadline"]["auth"])
             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 e80c56ee1f..07ee30af8c 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
@@ -435,8 +435,9 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
         kwargs = {}
-        if instance.context.data["deadline_auth"]:
-            kwargs["auth"] = instance.context.data["deadline_auth"]
+        auth = instance.data["deadline"]["auth"]
+        if auth:
+            kwargs["auth"] = auth
         response = requests_post(self.deadline_url, json=payload, timeout=10,
                                  **kwargs)
 
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 86ac2201e6..09e4f8a446 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)
         kwargs = {}
-        if instance.context.data["deadline_auth"]:
-            kwargs["auth"] = instance.context.data["deadline_auth"]
+        auth = instance.data["deadline"]["auth"]
+        if auth:
+            kwargs["auth"] = auth
         response = requests_post(url, json=payload, timeout=10,
                                  **kwargs)
         if not response.ok:
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 e9e76a112c..bacf902849 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)
         kwargs = {}
-        if instance.context.data["deadline_auth"]:
-            kwargs["auth"] = instance.context.data["deadline_auth"]
+        auth = instance.data["deadline"]["auth"]
+        if auth:
+            kwargs["auth"] = auth
         response = requests_post(url, json=payload, timeout=10,
                                  **kwargs)
         if not response.ok:
@@ -462,10 +463,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             }
 
         # get default deadline webservice url from deadline module
-        self.deadline_url = instance.context.data["defaultDeadline"]
-        # if custom one is set in instance, use that
-        if instance.data.get("deadlineUrl"):
-            self.deadline_url = instance.data.get("deadlineUrl")
+        self.deadline_url = instance.data["deadline"]["url"]
         assert self.deadline_url, "Requires Deadline Webservice URL"
 
         deadline_publish_job_id = \
@@ -473,7 +471,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
 
         # Inject deadline url to instances.
         for inst in instances:
-            inst["deadlineUrl"] = self.deadline_url
+            if not "deadline" in inst:
+                inst["deadline"] = {}
+            inst["deadline"]["url"] = self.deadline_url
 
         # publish job file
         publish_job = {

From 2ed1d0feee7cb12db33e53b0982e5b6c8ce3b1ae Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:50:26 +0100
Subject: [PATCH 22/89] AY-745 - refactored format of credentials

Now on instance, in `deadline` dictionary
---
 .../publish/validate_deadline_connection.py   | 21 +++++++------------
 .../publish/validate_deadline_pools.py        | 12 ++---------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
index 2c05e505c5..e077aedd9b 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -10,29 +10,22 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
 
     label = "Validate Deadline Web Service"
     order = pyblish.api.ValidatorOrder
-    hosts = ["maya", "nuke"]
-    families = ["renderlayer", "render"]
+    hosts = ["maya", "nuke", "aftereffects", "harmony", "fusion"]
+    families = ["renderlayer", "render", "render.farm"]
 
     # cache
     responses = {}
 
     def process(self, instance):
-        context = instance.context
-        # get default deadline webservice url from deadline module
-        deadline_url = context.data["defaultDeadline"]
-        # if custom one is set in instance, use that
-        if instance.data.get("deadlineUrl"):
-            deadline_url = instance.data.get("deadlineUrl")
-            self.log.debug(
-                "We have deadline URL on instance {}".format(deadline_url)
-            )
+        deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 
         kwargs = {}
-        if context.data["deadline_require_authentication"]:
-            kwargs["auth"] = context.data["deadline_auth"]
+        if instance.data["deadline"]["require_authentication"]:
+            auth = instance.data["deadline"]["auth"]
+            kwargs["auth"] = auth
 
-            if not context.data["deadline_auth"][0]:
+            if not auth[0]:
                 raise PublishXmlValidationError(
                     self,
                     "Deadline requires authentication. "
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
index c54d187ccf..1afe49b7c9 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -37,9 +37,9 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
             self.log.debug("Skipping local instance.")
             return
 
-        deadline_url = self.get_deadline_url(instance)
+        deadline_url = instance.data["deadline"]["url"]
         pools = self.get_pools(deadline_url,
-                               instance.context.data["deadline_auth"])
+                               instance.data["deadline"].get("auth"))
 
         invalid_pools = {}
         primary_pool = instance.data.get("primaryPool")
@@ -62,14 +62,6 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
                 formatting_data={"pools_str": ", ".join(pools)}
             )
 
-    def get_deadline_url(self, instance):
-        # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
-        if instance.data.get("deadlineUrl"):
-            # if custom one is set in instance, use that
-            deadline_url = instance.data.get("deadlineUrl")
-        return deadline_url
-
     def get_pools(self, deadline_url, auth):
         if deadline_url not in self.pools_per_url:
             self.log.debug(

From 2dac53a940a1a8cc5efeaa6fcdc487cf2344f2ba Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:51:00 +0100
Subject: [PATCH 23/89] AY-745 - added protection for older DL

Some DLs returned `none` for no pools configured.
---
 .../deadline/plugins/publish/validate_deadline_pools.py        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
index 1afe49b7c9..5094b3deaf 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -71,6 +71,9 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
             pools = DeadlineModule.get_deadline_pools(deadline_url,
                                                       auth=auth,
                                                       log=self.log)
+            # some DL return "none" as a pool name
+            if not "none" in pools:
+                pools.append("none")
             self.log.info("Available pools: {}".format(pools))
             self.pools_per_url[deadline_url] = pools
 

From e604c28cdb901f1d9312691f0f71fcc6754d2d87 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 13:51:15 +0100
Subject: [PATCH 24/89] AY-745 - added version for client side

---
 client/ayon_core/modules/deadline/version.py | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 client/ayon_core/modules/deadline/version.py

diff --git a/client/ayon_core/modules/deadline/version.py b/client/ayon_core/modules/deadline/version.py
new file mode 100644
index 0000000000..569b1212f7
--- /dev/null
+++ b/client/ayon_core/modules/deadline/version.py
@@ -0,0 +1 @@
+__version__ = "0.1.10"

From 569d11932395bdc5c97a8cd2386f6b85c56fd8bb Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 14:57:11 +0100
Subject: [PATCH 25/89] AY-745 - add local filtering

Shouldn't run to DL
---
 .../publish/collect_deadline_server_from_instance.py   |  1 +
 .../plugins/publish/collect_default_deadline_server.py |  3 +--
 .../plugins/publish/collect_user_credentials.py        | 10 ++++------
 .../publish/validate_expected_and_rendered_files.py    |  6 +-----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index 74ab79cfbc..913d64cb91 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -16,6 +16,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     # Run before collect_render.
     order = pyblish.api.CollectorOrder + 0.005
     label = "Deadline Webservice from the Instance"
+    targets = ["local"]
     families = ["render",
                 "rendering",
                 "render.farm",
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 472a40300d..17b9386b5d 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -20,8 +20,7 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
     # Run before collect_deadline_server_instance.
     order = pyblish.api.CollectorOrder + 0.0025
     label = "Default Deadline Webservice"
-
-    pass_mongo_url = False
+    targets = ["local"]
 
     def process(self, context):
         try:
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 061890dd08..e7bbe48bd0 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
@@ -4,7 +4,6 @@
 Requires:
     context -> project_settings
     instance.data["deadline"]["url"]
-        or instance.data["deadlineUrl"] for backward compatibility, remove soon
 
 Provides:
     instance.data["deadline"] -> require_authentication (bool)
@@ -26,9 +25,10 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder + 0.200
     label = "Collect Deadline User Credentials"
 
+    targets = ["local"]
     hosts = ["aftereffects",
              "fusion",
-             "harmony"
+             "harmony",
              "nuke",
              "maya",
              "max",
@@ -49,11 +49,9 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
                 "publish.hou"]
 
     def process(self, instance):
-        # backward compatibility, remove soon
-        collected_deadline_url = (instance.data.get("deadlineUrl") or
-            instance.data.get("deadline", {}).get("url"))
+        collected_deadline_url = instance.data["deadline"]["url"]
         if not collected_deadline_url:
-            raise ValueError("Instance doesn't have 'deadlineUrl'.")
+            raise ValueError("Instance doesn't have '[deadline][url]'.")
         context_data = instance.context.data
         deadline_settings = context_data["project_settings"]["deadline"]
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index 0f20b5a644..2b1c99aca8 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -199,11 +199,7 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
             (dict): Job info from Deadline
 
         """
-        # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
-        # if custom one is set in instance, use that
-        if instance.data.get("deadlineUrl"):
-            deadline_url = instance.data.get("deadlineUrl")
+        deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 
         url = "{}/api/jobs?JobID={}".format(deadline_url, job_id)

From b4d5c02a6c51a7b8c2ced6e30925aa1052772253 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 14:57:37 +0100
Subject: [PATCH 26/89] AY-745 - fix retrieval of deadline url

---
 .../deadline/plugins/publish/submit_celaction_deadline.py | 6 +-----
 .../deadline/plugins/publish/submit_fusion_deadline.py    | 1 -
 .../deadline/plugins/publish/submit_nuke_deadline.py      | 6 +-----
 .../deadline/plugins/publish/submit_publish_cache_job.py  | 8 ++------
 4 files changed, 4 insertions(+), 17 deletions(-)

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 e3160988c8..fe399b6a32 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
@@ -31,11 +31,7 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
 
         context = instance.context
 
-        # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
-        # if custom one is set in instance, use that
-        if instance.data.get("deadlineUrl"):
-            deadline_url = instance.data.get("deadlineUrl")
+        deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 
         self.deadline_url = "{}/api/jobs".format(deadline_url)
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 35c99108be..88929ff6ab 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
@@ -93,7 +93,6 @@ class FusionSubmitDeadline(
 
         from ayon_core.hosts.fusion.api.lib import get_frame_path
 
-        # get default deadline webservice url from deadline module
         deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 
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 07ee30af8c..98f775187e 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
@@ -109,11 +109,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         node = instance.data["transientData"]["node"]
         context = instance.context
 
-        # get default deadline webservice url from deadline module
-        deadline_url = instance.context.data["defaultDeadline"]
-        # if custom one is set in instance, use that
-        if instance.data.get("deadlineUrl"):
-            deadline_url = instance.data.get("deadlineUrl")
+        deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 
         self.deadline_url = "{}/api/jobs".format(deadline_url)
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 09e4f8a446..728c4d186a 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
@@ -346,12 +346,8 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
 
         deadline_publish_job_id = None
         if submission_type == "deadline":
-            # get default deadline webservice url from deadline module
-            self.deadline_url = instance.context.data["defaultDeadline"]
-            # if custom one is set in instance, use that
-            if instance.data.get("deadlineUrl"):
-                self.deadline_url = instance.data.get("deadlineUrl")
-            assert self.deadline_url, "Requires Deadline Webservice URL"
+            deadline_url = instance.data["deadline"]["url"]
+            assert deadline_url, "Requires Deadline Webservice URL"
 
             deadline_publish_job_id = \
                 self._submit_deadline_post_job(instance, render_job)

From 77c939b93be2b2d7600043a8c9dcaa6f928f8cf5 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 15:06:54 +0100
Subject: [PATCH 27/89] AY-745 - remove unnecessary comment

---
 .../deadline/plugins/publish/collect_user_credentials.py        | 2 --
 1 file changed, 2 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 e7bbe48bd0..86418387a5 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
@@ -20,8 +20,6 @@ from ayon_core.modules.deadline import __version__
 class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
     """Collects user name and password for artist if DL requires authentication
     """
-
-    # Run before collect_deadline_server_instance.
     order = pyblish.api.CollectorOrder + 0.200
     label = "Collect Deadline User Credentials"
 

From 466f940a737f2ff32bdb115b503c7d0fab30530e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 15:31:00 +0100
Subject: [PATCH 28/89] AY-745 - added todo

This should be refactored in next PR
---
 .../plugins/publish/collect_deadline_server_from_instance.py     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index 913d64cb91..8e7f836830 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -36,6 +36,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
         if not "deadline" in instance.data:
             instance.data["deadline"] = {}
 
+        # todo: separate logic should be removed, all hosts should have same
         host_name = get_current_host_name()
         if host_name == "maya":
             deadline_url = self._collect_deadline_url(instance)

From 6bbb956732a4eaec3def182a3c240c5e90d59d53 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 15:34:40 +0100
Subject: [PATCH 29/89] AY-745 - renamed class

---
 server_addon/deadline/server/settings/site_settings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server_addon/deadline/server/settings/site_settings.py b/server_addon/deadline/server/settings/site_settings.py
index cc3ec66ad9..a77a6edc7e 100644
--- a/server_addon/deadline/server/settings/site_settings.py
+++ b/server_addon/deadline/server/settings/site_settings.py
@@ -5,7 +5,7 @@ from ayon_server.settings import (
 from .main import defined_deadline_ws_name_enum_resolver
 
 
-class LocalSubmodel(BaseSettingsModel):
+class CredentialPerServerModel(BaseSettingsModel):
     """Provide credentials for configured DL servers"""
     _layout = "expanded"
     server_name: str = SettingsField("",
@@ -18,7 +18,7 @@ class LocalSubmodel(BaseSettingsModel):
 
 
 class DeadlineSiteSettings(BaseSettingsModel):
-    local_settings: list[LocalSubmodel] = SettingsField(
+    local_settings: list[CredentialPerServerModel] = SettingsField(
         default_factory=list,
         title="Local setting",
         description="Please provide credentials for configured Deadline servers",

From 2dc3eec35f1b9d4b381334d6be164f41a10f0b76 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 15:38:03 +0100
Subject: [PATCH 30/89] AY-745 - renamed class

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

diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py
index 31a42a3e27..4289e3d335 100644
--- a/server_addon/deadline/server/settings/main.py
+++ b/server_addon/deadline/server/settings/main.py
@@ -29,7 +29,8 @@ async def defined_deadline_ws_name_enum_resolver(
 
     return ws_server_name
 
-class ServerListSubmodel(BaseSettingsModel):
+class ServerItemSubmodel(BaseSettingsModel):
+    """Connection info about configured DL servers."""
     _layout = "compact"
     name: str = SettingsField(title="Name")
     value: str = SettingsField(title="Url")
@@ -38,12 +39,14 @@ class ServerListSubmodel(BaseSettingsModel):
 
 
 class DeadlineSettings(BaseSettingsModel):
-    deadline_urls: list[ServerListSubmodel] = SettingsField(
+    # configured DL servers
+    deadline_urls: list[ServerItemSubmodel] = SettingsField(
         default_factory=list,
         title="System Deadline Webservice Info",
         scope=["studio"],
     )
 
+    # name(key) of selected server for project
     deadline_server: str = SettingsField(
         title="Project Deadline server name",
         section="---",

From bef6855cca0972d24cf942d6f7e964f78a875288 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 26 Mar 2024 15:55:53 +0100
Subject: [PATCH 31/89] AY-745 - fix passing DL credentials to metadata file

Must be passed to query current values for job if changed by artist in DL directly.
---
 .../modules/deadline/plugins/publish/submit_publish_job.py   | 4 ++--
 .../plugins/publish/validate_expected_and_rendered_files.py  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

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 99a976132a..6d288111b7 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
@@ -469,11 +469,11 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         deadline_publish_job_id = \
             self._submit_deadline_post_job(instance, render_job, instances)
 
-        # Inject deadline url to instances.
+        # Inject deadline url to instances to query DL for job id for overrides
         for inst in instances:
             if not "deadline" in inst:
                 inst["deadline"] = {}
-            inst["deadline"]["url"] = self.deadline_url
+            inst["deadline"] = instance.data["deadline"]
 
         # publish job file
         publish_job = {
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index 0c3977278e..83e867408c 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -205,8 +205,9 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
         url = "{}/api/jobs?JobID={}".format(deadline_url, job_id)
         try:
             kwargs = {}
-            if instance.context.data["deadline_auth"]:
-                kwargs["auth"] = instance.context.data["deadline_auth"]
+            auth = instance.data["deadline"]["auth"]
+            if auth:
+                kwargs["auth"] = auth
             response = requests_get(url, **kwargs)
         except requests.exceptions.ConnectionError:
             self.log.error("Deadline is not accessible at "

From 4bd1f05036e1cb22326f6621ed3df8c8dc810ad4 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Thu, 28 Mar 2024 23:10:08 +0100
Subject: [PATCH 32/89] Remove legacy `suspend_publish` attribute definition in
 favor of `publishJobState`

---
 .../plugins/publish/submit_fusion_deadline.py      | 14 +-------------
 .../publish/submit_houdini_render_deadline.py      |  6 ------
 .../plugins/publish/submit_nuke_deadline.py        |  9 ---------
 .../plugins/publish/submit_publish_cache_job.py    |  3 ---
 .../deadline/plugins/publish/submit_publish_job.py |  3 ---
 5 files changed, 1 insertion(+), 34 deletions(-)

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 cf124c0bcc..3232edfeb3 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
@@ -9,10 +9,7 @@ import pyblish.api
 from ayon_core.pipeline.publish import (
     AYONPyblishPluginMixin
 )
-from ayon_core.lib import (
-    BoolDef,
-    NumberDef,
-)
+from ayon_core.lib import NumberDef
 
 
 class FusionSubmitDeadline(
@@ -64,11 +61,6 @@ class FusionSubmitDeadline(
                 decimals=0,
                 minimum=1,
                 maximum=10
-            ),
-            BoolDef(
-                "suspend_publish",
-                default=False,
-                label="Suspend publish"
             )
         ]
 
@@ -80,10 +72,6 @@ class FusionSubmitDeadline(
         attribute_values = self.get_attr_values_from_data(
             instance.data)
 
-        # add suspend_publish attributeValue to instance data
-        instance.data["suspend_publish"] = attribute_values[
-            "suspend_publish"]
-
         context = instance.context
 
         key = "__hasRun{}".format(self.__class__.__name__)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index 6952604293..597a3cfc55 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -10,7 +10,6 @@ from openpype_modules.deadline import abstract_submit_deadline
 from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
 from ayon_core.lib import (
     is_in_tests,
-    BoolDef,
     TextDef,
     NumberDef
 )
@@ -90,11 +89,6 @@ class HoudiniSubmitDeadline(
     @classmethod
     def get_attribute_defs(cls):
         return [
-            BoolDef(
-                "suspend_publish",
-                default=False,
-                label="Suspend publish"
-            ),
             NumberDef(
                 "priority",
                 label="Priority",
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 ac01af901c..3138cd02e3 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
@@ -76,11 +76,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
                 default=cls.use_gpu,
                 label="Use GPU"
             ),
-            BoolDef(
-                "suspend_publish",
-                default=False,
-                label="Suspend publish"
-            ),
             BoolDef(
                 "workfile_dependency",
                 default=cls.workfile_dependency,
@@ -100,10 +95,6 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         instance.data["attributeValues"] = self.get_attr_values_from_data(
             instance.data)
 
-        # add suspend_publish attributeValue to instance data
-        instance.data["suspend_publish"] = instance.data["attributeValues"][
-            "suspend_publish"]
-
         families = instance.data["families"]
 
         node = instance.data["transientData"]["node"]
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 50bd414587..800a906630 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
@@ -144,9 +144,6 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
 
         instance_settings = self.get_attr_values_from_data(instance.data)
         initial_status = instance_settings.get("publishJobState", "Active")
-        # TODO: Remove this backwards compatibility of `suspend_publish`
-        if instance.data.get("suspend_publish"):
-            initial_status = "Suspended"
 
         args = [
             "--headless",
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 84bac6d017..7546ce08d6 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
@@ -221,9 +221,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
 
         instance_settings = self.get_attr_values_from_data(instance.data)
         initial_status = instance_settings.get("publishJobState", "Active")
-        # TODO: Remove this backwards compatibility of `suspend_publish`
-        if instance.data.get("suspend_publish"):
-            initial_status = "Suspended"
 
         args = [
             "--headless",

From ab74098b7bd49494ee7a1cf60e33605b602495a4 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 3 Apr 2024 14:07:39 +0200
Subject: [PATCH 33/89] AY-745 - provide default values for new Settings field

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

diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py
index 4289e3d335..8a6b0e3b37 100644
--- a/server_addon/deadline/server/settings/main.py
+++ b/server_addon/deadline/server/settings/main.py
@@ -34,8 +34,11 @@ class ServerItemSubmodel(BaseSettingsModel):
     _layout = "compact"
     name: str = SettingsField(title="Name")
     value: str = SettingsField(title="Url")
-    require_authentication: bool = SettingsField(title="Require authentication")
-    ssl: bool = SettingsField(title="SSL")
+    require_authentication: bool = SettingsField(
+        False,
+        title="Require authentication")
+    ssl: bool = SettingsField(False,
+                              title="SSL")
 
 
 class DeadlineSettings(BaseSettingsModel):

From 50127b9d84a19869cd2110294cc48dbec3b9340e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 4 Apr 2024 17:10:17 +0200
Subject: [PATCH 34/89] Refactor name to denote multiple servers

---
 client/ayon_core/modules/deadline/deadline_module.py      | 8 ++++----
 .../publish/collect_deadline_server_from_instance.py      | 2 +-
 .../plugins/publish/collect_default_deadline_server.py    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py
index 3a35654737..ea9e4085ab 100644
--- a/client/ayon_core/modules/deadline/deadline_module.py
+++ b/client/ayon_core/modules/deadline/deadline_module.py
@@ -19,23 +19,23 @@ class DeadlineModule(AYONAddon, IPluginPaths):
 
     def initialize(self, studio_settings):
         # This module is always enabled
-        deadline_server_info = {}
+        deadline_servers_info = {}
         enabled = self.name in studio_settings
         if enabled:
             deadline_settings = studio_settings[self.name]
-            deadline_server_info = {
+            deadline_servers_info = {
                 url_item["name"]: url_item
                 for url_item in deadline_settings["deadline_urls"]
             }
 
-        if enabled and not deadline_server_info:
+        if enabled and not deadline_servers_info:
             enabled = False
             self.log.warning((
                 "Deadline Webservice URLs are not specified. Disabling addon."
             ))
 
         self.enabled = enabled
-        self.deadline_server_info = deadline_server_info
+        self.deadline_servers_info = deadline_servers_info
 
     def get_plugin_paths(self):
         """Deadline plugin paths."""
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index 8e7f836830..c6b30d3b2a 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -91,7 +91,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
 
         default_servers = {
             url_item["name"]: url_item["value"]
-            for url_item in deadline_settings["deadline_server_info"]
+            for url_item in deadline_settings["deadline_servers_info"]
         }
         project_servers = (
             render_instance.context.data
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 419de7acac..ced72607bc 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -34,13 +34,13 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
 
         dl_ws_item = None
         if deadline_server_name:
-            dl_ws_item = deadline_module.deadline_server_info.get(
+            dl_ws_item = deadline_module.deadline_servers_info.get(
                 deadline_server_name)
 
         if dl_ws_item:
             deadline_url = dl_ws_item["value"]
         else:
-            default_dl_item = deadline_module.deadline_server_info.pop()
+            default_dl_item = deadline_module.deadline_servers_info.pop()
             deadline_url = default_dl_item["value"]
 
         context.data["deadline"] = {}

From 766cbd9f57135f44fb3121ad29ca29efc66fd0f0 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 4 Apr 2024 17:13:00 +0200
Subject: [PATCH 35/89] Refactor change docstring

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

diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py
index ea9e4085ab..b1089bbfe2 100644
--- a/client/ayon_core/modules/deadline/deadline_module.py
+++ b/client/ayon_core/modules/deadline/deadline_module.py
@@ -46,13 +46,14 @@ class DeadlineModule(AYONAddon, IPluginPaths):
 
     @staticmethod
     def get_deadline_pools(webservice, auth=None, log=None):
-        # type: (str) -> list
         """Get pools from Deadline.
         Args:
             webservice (str): Server url.
-            log (Logger)
+             auth (Optional[Tuple[str, str]]): Tuple containing username,
+                password
+            log (Optional[Logger]): Logger to log errors to, if provided.
         Returns:
-            list: Pools.
+            List[str]: Pools.
         Throws:
             RuntimeError: If deadline webservice is unreachable.
 

From c4c56f8d3f0d752abd5ddd6000d391b82d838fbc Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 5 Apr 2024 11:09:27 +0200
Subject: [PATCH 36/89] AY-747- refactor name of variable

---
 .../publish/collect_default_deadline_server.py       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index ced72607bc..2ea17123b7 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -32,16 +32,16 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
         deadline_settings = context.data["project_settings"]["deadline"]
         deadline_server_name = deadline_settings["deadline_server"]
 
-        dl_ws_item = None
+        dl_server_info = None
         if deadline_server_name:
-            dl_ws_item = deadline_module.deadline_servers_info.get(
+            dl_server_info = deadline_module.deadline_servers_info.get(
                 deadline_server_name)
 
-        if dl_ws_item:
-            deadline_url = dl_ws_item["value"]
+        if dl_server_info:
+            deadline_url = dl_server_info["value"]
         else:
-            default_dl_item = deadline_module.deadline_servers_info.pop()
-            deadline_url = default_dl_item["value"]
+            default_dl_server_info = deadline_module.deadline_servers_info.pop()
+            deadline_url = default_dl_server_info["value"]
 
         context.data["deadline"] = {}
         context.data["deadline"]["defaultDeadline"] = (

From 26a11a562869141fd2b7d2cf604af775c65fa1bd Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 5 Apr 2024 11:10:23 +0200
Subject: [PATCH 37/89] AY-747- refactor query default

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 2ea17123b7..6fca97b4ef 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -40,7 +40,7 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
         if dl_server_info:
             deadline_url = dl_server_info["value"]
         else:
-            default_dl_server_info = deadline_module.deadline_servers_info.pop()
+            default_dl_server_info = deadline_module.deadline_servers_info[0]
             deadline_url = default_dl_server_info["value"]
 
         context.data["deadline"] = {}

From cba1dae30ffeced94f79931f034e2640d1d5def8 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 5 Apr 2024 11:14:22 +0200
Subject: [PATCH 38/89] Update
 client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 .../plugins/publish/help/validate_deadline_connection.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml b/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
index e9377d8baa..eec05df08a 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
+++ b/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml
@@ -9,8 +9,8 @@ This project has set in Settings that Deadline requires authentication.
 
 ### How to repair?
 
-Please go to Ayon Server Site settings and provide your Deadline username and
-            most likely password too. (Deadline could run in configuration that empty passwords are allowed. Ask your administrator for details.)
+Please go to Ayon Server > Site Settings and provide your Deadline username and password.
+In some cases the password may be empty if Deadline is configured to allow that. Ask your administrator.
 
         </description>
     </error>

From 4332c507368c7d20ebf82043e5a2c8269e7221cf Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 5 Apr 2024 11:18:41 +0200
Subject: [PATCH 39/89] AY-747- refactor passing of auth

No necessary to pass kwargs
---
 .../ayon_core/modules/deadline/abstract_submit_deadline.py  | 5 +----
 .../deadline/plugins/publish/submit_celaction_deadline.py   | 6 ++----
 .../deadline/plugins/publish/submit_fusion_deadline.py      | 5 +----
 .../deadline/plugins/publish/submit_nuke_deadline.py        | 5 +----
 .../deadline/plugins/publish/submit_publish_cache_job.py    | 5 +----
 .../modules/deadline/plugins/publish/submit_publish_job.py  | 5 +----
 6 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
index e71177b34e..00e51100bc 100644
--- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py
+++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py
@@ -601,11 +601,8 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
 
         """
         url = "{}/api/jobs".format(self._deadline_url)
-        kwargs = {}
-        if auth:
-            kwargs["auth"] = auth
         response = requests_post(url, json=payload,
-                                 **kwargs)
+                                 auth=auth)
         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/submit_celaction_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
index 86c017818f..2ff50a16b9 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
@@ -194,10 +194,8 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
 
-        kwargs = {}
-        if instance.context.data["deadline_auth"]:
-            kwargs["auth"] = instance.context.data["deadline_auth"]
-        response = requests_post(self.deadline_url, json=payload, **kwargs)
+        response = requests_post(self.deadline_url, json=payload,
+                                 auth=instance.context.data["deadline_auth"])
 
         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 4027991ca7..d5664f14c4 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
@@ -251,11 +251,8 @@ class FusionSubmitDeadline(
 
         # E.g. http://192.168.0.1:8082/api/jobs
         url = "{}/api/jobs".format(deadline_url)
-        kwargs = {}
         auth = instance.data["deadline"]["auth"]
-        if auth:
-            kwargs["auth"] = auth
-        response = requests_post(url, json=payload, **kwargs)
+        response = requests_post(url, json=payload, auth=auth)
         if not response.ok:
             raise Exception(response.text)
 
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 287b3da19c..dbf92719e8 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
@@ -431,12 +431,9 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
 
         self.log.debug("__ expectedFiles: `{}`".format(
             instance.data["expectedFiles"]))
-        kwargs = {}
         auth = instance.data["deadline"]["auth"]
-        if auth:
-            kwargs["auth"] = auth
         response = requests_post(self.deadline_url, json=payload, timeout=10,
-                                 **kwargs)
+                                 auth=auth)
 
         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 8ae781d051..9f6278a4c5 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
@@ -209,12 +209,9 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         self.log.debug("Submitting Deadline publish job ...")
 
         url = "{}/api/jobs".format(self.deadline_url)
-        kwargs = {}
         auth = instance.data["deadline"]["auth"]
-        if auth:
-            kwargs["auth"] = auth
         response = requests_post(url, json=payload, timeout=10,
-                                 **kwargs)
+                                 auth=auth)
         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 6d288111b7..ce90fc2706 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
@@ -303,12 +303,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         self.log.debug("Submitting Deadline publish job ...")
 
         url = "{}/api/jobs".format(self.deadline_url)
-        kwargs = {}
         auth = instance.data["deadline"]["auth"]
-        if auth:
-            kwargs["auth"] = auth
         response = requests_post(url, json=payload, timeout=10,
-                                 **kwargs)
+                                 auth=auth)
         if not response.ok:
             raise Exception(response.text)
 

From f5e24b642bf940b8277272ad8647e85bb7a6d31f Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 5 Apr 2024 11:30:14 +0200
Subject: [PATCH 40/89] AY-747- update todo

---
 .../hosts/harmony/plugins/publish/collect_farm_render.py      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
index e869de316f..c63eb114e5 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
@@ -178,7 +178,9 @@ class CollectFarmRender(publish.AbstractCollectRender):
                 outputStartFrame=info[3],
                 leadingZeros=info[2],
                 ignoreFrameHandleCheck=True,
-                # deadline=inst.data.get("deadline")  TODO
+                #todo: inst is not available, must be determined, fix when
+                #reworking to Publisher
+                # deadline=inst.data.get("deadline")
 
             )
             render_instance.context = context

From 8499660acbf9dc0317db2cd6010d65022942a47a Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Mon, 15 Apr 2024 12:14:24 +0100
Subject: [PATCH 41/89] Only close previous project if its different to current
 project.

---
 client/ayon_core/hosts/hiero/api/workio.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py
index 4c2416ca38..9d8b1777e7 100644
--- a/client/ayon_core/hosts/hiero/api/workio.py
+++ b/client/ayon_core/hosts/hiero/api/workio.py
@@ -54,10 +54,9 @@ def open_file(filepath):
     # open project file
     hiero.core.openProject(filepath.replace(os.path.sep, "/"))
 
-    # close previous project
-    project.close()
-
-
+    # Close previous project if its different to the current project.
+    if project.path() != filepath:
+        project.close()
 
     return True
 

From 497ce6d0127792af74e0301239c98154e819e5cd Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 16 Apr 2024 11:31:09 +0200
Subject: [PATCH 42/89] Update
 client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py

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

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 2ff50a16b9..2220442dac 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
@@ -195,7 +195,7 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
             instance.data["expectedFiles"]))
 
         response = requests_post(self.deadline_url, json=payload,
-                                 auth=instance.context.data["deadline_auth"])
+                                 auth=instance.data["deadline"]["require_authentication"])
 
         if not response.ok:
             self.log.error(

From f43fbc239c6a46525b203a2deb1bb30d99ab1e4e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 16 Apr 2024 11:32:41 +0200
Subject: [PATCH 43/89] Use collected host name

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index c6b30d3b2a..3927b67d37 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -37,7 +37,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
             instance.data["deadline"] = {}
 
         # todo: separate logic should be removed, all hosts should have same
-        host_name = get_current_host_name()
+        host_name = instance.context.data["hostName"]
         if host_name == "maya":
             deadline_url = self._collect_deadline_url(instance)
         else:

From 48a1dc86ffdb787b7bf4718eb8dcb7e15e577f57 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 16 Apr 2024 11:33:21 +0200
Subject: [PATCH 44/89] Add todo

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../deadline/plugins/publish/collect_user_credentials.py       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 86418387a5..2777cc906a 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
@@ -73,7 +73,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(
             DeadlineModule.name, __version__)
         local_settings = local_settings["local_settings"]

From ff2296def65d9ab262facdab63a97b9c1c3f9573 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 16 Apr 2024 11:33:46 +0200
Subject: [PATCH 45/89] Removed unneeded import

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index 3927b67d37..181b553a61 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -7,7 +7,6 @@ attribute or using default server if that attribute doesn't exists.
 """
 import pyblish.api
 from ayon_core.pipeline.publish import KnownPublishError
-from ayon_core.pipeline.context_tools import get_current_host_name
 
 
 class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):

From 0ebed6d2c9518bb2cde7df8a5316be30b6e7cd93 Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Wed, 17 Apr 2024 11:17:24 +0200
Subject: [PATCH 46/89] support $F in Houdini pointcache Abc product type

---
 .../houdini/plugins/publish/collect_cache_farm.py     |  2 +-
 .../hosts/houdini/plugins/publish/collect_frames.py   |  3 ++-
 .../hosts/houdini/plugins/publish/extract_alembic.py  | 11 ++++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
index 040ad68a1a..2e3447d4a6 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
@@ -7,7 +7,7 @@ from ayon_core.hosts.houdini.api import lib
 class CollectDataforCache(pyblish.api.InstancePlugin):
     """Collect data for caching to Deadline."""
 
-    order = pyblish.api.CollectorOrder + 0.04
+    order = pyblish.api.CollectorOrder + 0.11
     families = ["ass", "pointcache",
                 "mantraifd", "redshiftproxy",
                 "vdbcache"]
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py
index a643ab0d38..7f294560eb 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py
@@ -17,7 +17,7 @@ class CollectFrames(pyblish.api.InstancePlugin):
     label = "Collect Frames"
     families = ["vdbcache", "imagesequence", "ass",
                 "mantraifd", "redshiftproxy", "review",
-                "bgeo"]
+                "pointcache"]
 
     def process(self, instance):
 
@@ -61,6 +61,7 @@ class CollectFrames(pyblish.api.InstancePlugin):
         # todo: `frames` currently conflicts with "explicit frames" for a
         #       for a custom frame list. So this should be refactored.
         instance.data.update({"frames": result})
+        self.log.debug(instance.data["frames"])
 
     @staticmethod
     def create_file_list(match, start_frame, end_frame):
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py
index daf30b26ed..7ae476d2b4 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py
@@ -28,10 +28,15 @@ class ExtractAlembic(publish.Extractor):
         staging_dir = os.path.dirname(output)
         instance.data["stagingDir"] = staging_dir
 
-        file_name = os.path.basename(output)
+        if instance.data.get("frames"):
+            # list of files
+            files = instance.data["frames"]
+        else:
+            # single file
+            files = os.path.basename(output)
 
         # We run the render
-        self.log.info("Writing alembic '%s' to '%s'" % (file_name,
+        self.log.info("Writing alembic '%s' to '%s'" % (files,
                                                         staging_dir))
 
         render_rop(ropnode)
@@ -42,7 +47,7 @@ class ExtractAlembic(publish.Extractor):
         representation = {
             'name': 'abc',
             'ext': 'abc',
-            'files': file_name,
+            'files': files,
             "stagingDir": staging_dir,
         }
         instance.data["representations"].append(representation)

From 03cfed2c7957538a9c72afe4e31c010cb1d606ab Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 17 Apr 2024 20:33:39 +0200
Subject: [PATCH 47/89] Add more family so attribute definitions show in Nuke
 and Fusion for `render`, `image` and `prerender`.

This should be safe because `instance.data.get("farm")` is checked in `process()` and if not true the processing is skipped anyway - so if e.g. a render instance in Fusion is set to render local instead of on the farm the actual attribute definition does show - but the processing of the plug-in is skipped regardless.
---
 .../modules/deadline/plugins/publish/submit_publish_job.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 41445fabc3..99a5f94cf1 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
@@ -88,9 +88,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
     hosts = ["fusion", "max", "maya", "nuke", "houdini",
              "celaction", "aftereffects", "harmony", "blender"]
 
-    families = ["render.farm", "render.frames_farm",
-                "prerender.farm", "prerender.frames_farm",
-                "renderlayer", "imagesequence",
+    families = ["render", "render.farm", "render.frames_farm",
+                "prerender", "prerender.farm", "prerender.frames_farm",
+                "renderlayer", "imagesequence", "image",
                 "vrayscene", "maxrender",
                 "arnold_rop", "mantra_rop",
                 "karma_rop", "vray_rop",
@@ -311,7 +311,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
 
         return deadline_publish_job_id
 
-
     def process(self, instance):
         # type: (pyblish.api.Instance) -> None
         """Process plugin.

From bd42a506cfd8b9c143f18c198e5920459e836124 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 18 Apr 2024 17:14:06 +0800
Subject: [PATCH 48/89] 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 8ff929e7199817eb006e3b5fb4e788268f87ddb1 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Thu, 18 Apr 2024 17:19:32 +0800
Subject: [PATCH 49/89] Revert "make sure the bake animation is boolean option"

This reverts commit bd42a506cfd8b9c143f18c198e5920459e836124.
---
 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 3f1395cb40..939da4011b 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": bool,
+            "bakeComplexAnimation": int,
             "bakeComplexStart": int,
             "bakeComplexEnd": int,
             "bakeComplexStep": int,

From 4bc53958128daa420d96b4bb0627e3175b736163 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 18 Apr 2024 13:06:31 +0200
Subject: [PATCH 50/89] Refactor - updated names for default deadline url

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

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index c6b30d3b2a..9741571e88 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -46,7 +46,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
         if deadline_url:
             instance.data["deadline"]["url"] = deadline_url.strip().rstrip("/")
         else:
-            instance.data["deadline"]["url"] = instance.context.data["deadline"]["defaultDeadline"]  # noqa
+            instance.data["deadline"]["url"] = instance.context.data["deadline"]["defaultUrl"]  # noqa
         self.log.debug(
             "Using {} for submission".format(instance.data["deadline"]["url"]))
 
@@ -74,13 +74,13 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
             ["project_settings"]
             ["deadline"]
         )
-        default_server = (render_instance.context.data["deadline"]
-                                                      ["defaultDeadline"])
+        default_server_url = (render_instance.context.data["deadline"]
+                                                          ["defaultUrl"])
         # QUESTION How and where is this is set? Should be removed?
         instance_server = render_instance.data.get("deadlineServers")
         if not instance_server:
             self.log.debug("Using default server.")
-            return default_server
+            return default_server_url
 
         # Get instance server as sting.
         if isinstance(instance_server, int):
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 6fca97b4ef..dde1043301 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -44,5 +44,5 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
             deadline_url = default_dl_server_info["value"]
 
         context.data["deadline"] = {}
-        context.data["deadline"]["defaultDeadline"] = (
+        context.data["deadline"]["defaultUrl"] = (
             deadline_url.strip().rstrip("/"))

From 090304a4a8ac9e81b6434dd3825a5d1a160bfeeb Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 18 Apr 2024 14:06:37 +0200
Subject: [PATCH 51/89] Refactor - move deadline plugins later

Run them after collect render plugins to better differentiate between local and farm targetted plugins.
---
 .../publish/collect_deadline_server_from_instance.py      | 8 ++++++--
 .../plugins/publish/collect_default_deadline_server.py    | 2 +-
 .../deadline/plugins/publish/collect_user_credentials.py  | 6 +++++-
 .../plugins/publish/validate_deadline_connection.py       | 4 ++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index b769a923fe..22022831a0 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -13,7 +13,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
     """Collect Deadline Webservice URL from instance."""
 
     # Run before collect_render.
-    order = pyblish.api.CollectorOrder + 0.005
+    order = pyblish.api.CollectorOrder + 0.225
     label = "Deadline Webservice from the Instance"
     targets = ["local"]
     families = ["render",
@@ -32,7 +32,11 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
                 "image"]  # for Fusion
 
     def process(self, instance):
-        if not "deadline" in instance.data:
+        if not instance.data.get("farm"):
+            self.log.debug("Should not be processed on farm, skipping.")
+            return
+
+        if not instance.data.get("deadline"):
             instance.data["deadline"] = {}
 
         # todo: separate logic should be removed, all hosts should have same
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index dde1043301..9238e0ed95 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -18,7 +18,7 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
     """
 
     # Run before collect_deadline_server_instance.
-    order = pyblish.api.CollectorOrder + 0.0025
+    order = pyblish.api.CollectorOrder + 0.200
     label = "Default Deadline Webservice"
     targets = ["local"]
 
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 2777cc906a..7a506ab645 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
@@ -20,7 +20,7 @@ from ayon_core.modules.deadline import __version__
 class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
     """Collects user name and password for artist if DL requires authentication
     """
-    order = pyblish.api.CollectorOrder + 0.200
+    order = pyblish.api.CollectorOrder + 0.250
     label = "Collect Deadline User Credentials"
 
     targets = ["local"]
@@ -47,6 +47,10 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
                 "publish.hou"]
 
     def process(self, instance):
+        if not instance.data.get("farm"):
+            self.log.debug("Should not be processed on farm, skipping.")
+            return
+
         collected_deadline_url = instance.data["deadline"]["url"]
         if not collected_deadline_url:
             raise ValueError("Instance doesn't have '[deadline][url]'.")
diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
index e077aedd9b..8fffd47786 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
@@ -17,6 +17,10 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
     responses = {}
 
     def process(self, instance):
+        if not instance.data.get("farm"):
+            self.log.debug("Should not be processed on farm, skipping.")
+            return
+
         deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"
 

From fbc0ee693595123ae233e577bbdad28bb35ef49c Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 18 Apr 2024 14:08:50 +0200
Subject: [PATCH 52/89] Fix - get source_instance directly from instance

It was returning it as list without it
---
 client/ayon_core/pipeline/publish/abstract_collect_render.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/pipeline/publish/abstract_collect_render.py b/client/ayon_core/pipeline/publish/abstract_collect_render.py
index b515d91ae4..17cab876b6 100644
--- a/client/ayon_core/pipeline/publish/abstract_collect_render.py
+++ b/client/ayon_core/pipeline/publish/abstract_collect_render.py
@@ -216,13 +216,12 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
 
             # add additional data
             data = self.add_additional_data(data)
-            render_instance_dict = attr.asdict(render_instance)
 
-            # Merge into source instance if provided, otherwise create instance
-            instance = render_instance_dict.pop("source_instance", None)
+            instance = render_instance.source_instance
             if instance is None:
                 instance = context.create_instance(render_instance.name)
 
+            render_instance_dict = attr.asdict(render_instance)
             instance.data.update(render_instance_dict)
             instance.data.update(data)
 

From c03b9269bfcf4fcfc6f6c2bce2d0498b2cd3105e Mon Sep 17 00:00:00 2001
From: Mustafa Taher <mustafataherzaky@outlook.com>
Date: Fri, 19 Apr 2024 19:45:36 +0200
Subject: [PATCH 53/89] add a note about  plugin order

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

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
index 2e3447d4a6..e931c7bf1b 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
@@ -7,6 +7,7 @@ from ayon_core.hosts.houdini.api import lib
 class CollectDataforCache(pyblish.api.InstancePlugin):
     """Collect data for caching to Deadline."""
 
+    # Run after Collect Frames
     order = pyblish.api.CollectorOrder + 0.11
     families = ["ass", "pointcache",
                 "mantraifd", "redshiftproxy",

From 5132bf08f2b24c9594d2d67d693053558e5229ec Mon Sep 17 00:00:00 2001
From: Mustafa Taher <mustafataherzaky@outlook.com>
Date: Fri, 19 Apr 2024 19:45:49 +0200
Subject: [PATCH 54/89] remove debug code

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

diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py
index 7f294560eb..b38ebc6e2f 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py
@@ -61,7 +61,6 @@ class CollectFrames(pyblish.api.InstancePlugin):
         # todo: `frames` currently conflicts with "explicit frames" for a
         #       for a custom frame list. So this should be refactored.
         instance.data.update({"frames": result})
-        self.log.debug(instance.data["frames"])
 
     @staticmethod
     def create_file_list(match, start_frame, end_frame):

From c260996522872a8bf56f74b52a598f61f9ba3b0e Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 19 Apr 2024 20:07:02 +0200
Subject: [PATCH 55/89] Implement `Reorder` helper for Maya

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

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 321bcbc0b5..e30070c796 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -6,6 +6,7 @@ from pprint import pformat
 import sys
 import uuid
 import re
+import operator
 
 import json
 import logging
@@ -4403,3 +4404,254 @@ def create_rig_animation_instance(
             variant=namespace,
             pre_create_data={"use_selection": True}
         )
+
+
+class Reorder(object):
+    """Helper functions for reordering in Maya outliner"""
+
+    @staticmethod
+    def group_by_parent(nodes):
+        """Groups the given input list of nodes by parent.
+
+        This is a convenience function for the Reorder functionality.
+        This function assumes the nodes are in the `long/fullPath` format.
+        """
+        nodes = cmds.ls(nodes, long=True)
+        nodes_by_parent = defaultdict(list)
+        for node in nodes:
+            parent = node.rsplit("|", 1)[0]
+            nodes_by_parent[parent].append(node)
+        return nodes_by_parent
+
+    @staticmethod
+    def get_children_with_index(parent):
+        """Get children under parent with their indices"""
+        def node_to_index(nodes):
+            return {node: index for index, node in enumerate(nodes)}
+
+        if not parent:
+            return node_to_index(cmds.ls(assemblies=True, long=True))
+        else:
+            return node_to_index(
+                cmds.listRelatives(parent,
+                                   children=True,
+                                   fullPath=True) or []
+            )
+
+    @staticmethod
+    def get_index(node):
+        node = cmds.ls(node, long=True)[0]  # enforce long names
+        parent = node.rsplit("|", 1)[0]
+        if not parent:
+            return cmds.ls(assemblies=True, long=True).index(node)
+        else:
+            return cmds.listRelatives(parent,
+                                      children=True,
+                                      fullPath=True).index(node)
+
+    @staticmethod
+    def get_indices(nodes):
+        """Returns a dictionary with node, index pairs.
+
+        This is preferred over get_index method for larger number of nodes,
+        because it is more optimal in performance.
+
+        eg:
+            {
+                '|side': 3,
+                '|top': 1,
+                '|pSphere1': 4,
+                '|persp': 0,
+                '|front': 2
+            }
+
+        Returns:
+            dict: index by node
+        """
+        nodes = cmds.ls(nodes, long=True)  # enforce long names
+        node_indices = dict()
+        cached_children = dict()
+        for node in nodes:
+            parent = node.rsplit("|", 1)[0]
+            if parent not in cached_children:
+                cached_children[parent] = Reorder.get_children_with_index(parent)  # noqa: E501
+
+            node_indices[node] = cached_children[parent][node]
+        return node_indices
+
+    @staticmethod
+    def set_index(node, index):
+        if not node:
+            return
+        cmds.reorder(node, front=True)
+        cmds.reorder(node, r=index)
+
+    @staticmethod
+    def set_indices(node_indices):
+        """Set node order by node to index dict.
+
+        Args:
+            node_indices (dict): Node name to index dictionary
+
+        """
+        if not isinstance(node_indices, dict):
+            raise TypeError(
+                "Reorder.set_indices() requires a dictionary with "
+                "(node, index) pairs as input. "
+                "`{0}` is an invalid input type.".format(
+                    type(node_indices).__name__)
+            )
+
+        if not node_indices:
+            return
+
+        # force nodes to the back to not influence each other during reorder
+        cmds.reorder(node_indices.keys(), back=True)
+
+        for node, index in sorted(node_indices.items(),
+                                  key=operator.itemgetter(1)):
+            Reorder.set_index(node, index)
+
+    @staticmethod
+    def sort(nodes, key=lambda x: x.rsplit("|", 1)[-1], reverse=False):
+        """Sorts the node in scene by the key function.
+
+        Default sorting key is alphabetically by using the object's short name.
+        """
+        nodes = cmds.ls(nodes, long=True)  # ensure long paths
+        if not nodes:
+            return
+
+        # Group by parent to sort nodes per parent
+        parents = Reorder.group_by_parent(nodes)
+
+        for child_nodes in parents.values():
+
+            node_indices = Reorder.get_indices(child_nodes)
+            indices = sorted(node_indices.values())
+
+            new_indices = {
+                node: indices[i] for i, node in
+                enumerate(sorted(child_nodes, key=key, reverse=reverse))
+            }
+            Reorder.set_indices(new_indices)
+
+    @staticmethod
+    def reverse(nodes):
+        nodes = cmds.ls(nodes, long=True)  # ensure long paths
+        if not nodes:
+            return
+
+        # Group by parent to sort nodes per parent
+        parents = Reorder.group_by_parent(nodes)
+
+        for child_nodes in parents.values():
+
+            node_indices = Reorder.get_indices(child_nodes)
+            indices = sorted(node_indices.values(), reverse=False)
+
+            iterable = enumerate(sorted(node_indices.items(),
+                                        key=operator.itemgetter(1),
+                                        reverse=True))
+            new_indices = {
+                node: indices[i] for i, (node, _old_index) in iterable
+            }
+            Reorder.set_indices(new_indices)
+
+    @staticmethod
+    def align_bottom(nodes):
+        """Reorder to the lowest (most back) of node in `nodes`."""
+        nodes = cmds.ls(nodes, long=True)  # ensure long paths
+        if not nodes:
+            return
+
+        # Group by parent to sort nodes per parent
+        parents = Reorder.group_by_parent(nodes)
+        for child_nodes in parents.values():
+
+            # Reorder.set_index forces to front and then moves all objects
+            # together (so they will be stacked together). Then it applies the
+            # index as relative offset, we can use that here to our advantage.
+            # And it is a lot faster than Reorder.set_indices in that scenario.
+            index_per_node = Reorder.get_indices(child_nodes)
+            back_index = max(index_per_node.values())
+            new_front_index = back_index - len(child_nodes) + 1
+            Reorder.set_index(child_nodes, new_front_index)
+
+    @staticmethod
+    def align_top(nodes):
+        """Reorder to the highest (most front) of node in `nodes`."""
+        nodes = cmds.ls(nodes, long=True)  # ensure long paths
+        if not nodes:
+            return
+
+        # Group by parent to sort nodes per parent
+        parents = Reorder.group_by_parent(nodes)
+        for childNodes in parents.values():
+
+            # Reorder.set_index forces to front and then moves all objects
+            # together (so they will be stacked together). Then it applies the
+            # index as relative offset, we can use that here to our advantage.
+            # And it is a lot faster than Reorder.set_indices in that scenario.
+            index_per_node = Reorder.get_indices(childNodes)
+            front_index = min(index_per_node.values())
+            Reorder.set_index(childNodes, front_index)
+
+    @staticmethod
+    def move(nodes, relative, wrap=True):
+        """ Reorder by the given relative amount. """
+        # TODO: Implement the disabling of wrapping around when at bottom.
+        if not nodes:
+            return
+        cmds.reorder(nodes, r=relative)
+
+    @staticmethod
+    def to_bottom(nodes):
+        """Reorder to all the way to the bottom."""
+        if not nodes:
+            return
+        cmds.reorder(nodes, back=True)
+
+    @staticmethod
+    def to_top(nodes):
+        """Reorder to all the way to the top."""
+        if not nodes:
+            return
+        cmds.reorder(nodes, front=True)
+
+    @staticmethod
+    def order_to(nodes):
+        """Reorder the nodes to the order of the input list.
+
+        Tip:
+            If you pass this your current selection list it will reorder
+            the nodes to the order of your selection.
+
+        """
+        nodes = cmds.ls(nodes, long=True)  # ensure long paths
+        if not nodes:
+            return
+
+        # Make a dictionary of the input order so we can optimize the look-up
+        # of the index in the order of the input `nodes`.
+        selected_order = {node: i for i, node in enumerate(nodes)}
+
+        # Group by parent since we want to sort nodes under its current parent
+        parents = Reorder.group_by_parent(nodes)
+        for child_nodes in parents.values():
+
+            # Get the current indices
+            node_indices = Reorder.get_indices(child_nodes)
+
+            # We get the original indices so we can position to those same
+            # positions, albeit with the new ordering of the nodes.
+            orig_indices = sorted(node_indices.values())
+
+            # Order the nodes by current selection (input list) and then apply
+            # the list of indices from `nodeIndices` in low-to-high order.
+            new_indices = dict(
+                zip(sorted(node_indices.keys(),
+                           key=lambda x: selected_order[x]),
+                    orig_indices)
+            )
+            Reorder.set_indices(new_indices)

From 3db28b74f18441d4db8fd60e3681b34041d7de37 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 19 Apr 2024 20:10:58 +0200
Subject: [PATCH 56/89] Refactor Maya load placeholder, fixes:

- Implement fixes for outliner order of loaded placeholders (always place after placeholder)
- Allow storing more complex data, e.g. EnumDef with multiselection=True
- Change in behavior: This may fix a bug where previously placeholders may sometimes load only one subset when it should have loaded more. It could thus influence the loading behavior on existing templates
- Implements a PlaceholderPlugin base class to be used by others potential plug-ins
---
 .../maya/api/workfile_template_builder.py     | 159 +++++++++++-
 .../maya/plugins/template/load_placeholder.py | 234 ++++--------------
 2 files changed, 208 insertions(+), 185 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/workfile_template_builder.py b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
index cfd416b708..d518d3933c 100644
--- a/client/ayon_core/hosts/maya/api/workfile_template_builder.py
+++ b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
@@ -1,3 +1,5 @@
+import json
+
 from maya import cmds
 
 from ayon_core.pipeline import (
@@ -8,13 +10,15 @@ from ayon_core.pipeline import (
 )
 from ayon_core.pipeline.workfile.workfile_template_builder import (
     TemplateAlreadyImported,
-    AbstractTemplateBuilder
+    AbstractTemplateBuilder,
+    PlaceholderPlugin,
+    PlaceholderItem,
 )
 from ayon_core.tools.workfile_template_build import (
     WorkfileBuildPlaceholderDialog,
 )
 
-from .lib import get_main_window
+from .lib import read, imprint, get_main_window
 
 PLACEHOLDER_SET = "PLACEHOLDERS_SET"
 
@@ -86,6 +90,157 @@ class MayaTemplateBuilder(AbstractTemplateBuilder):
         return True
 
 
+class MayaPlaceholderPlugin(PlaceholderPlugin):
+    """Base Placeholder Plugin for Maya with one unified cache.
+
+    Creates a locator as placeholder node, which during populate provide
+    all of its attributes defined on the locator's transform in
+    `placeholder.data` and where `placeholder.scene_identifier` is the
+    full path to the node.
+
+    Inherited classes must still implement `populate_placeholder`
+
+    """
+
+    use_selection_as_parent = True
+    item_class = PlaceholderItem
+
+    def _create_placeholder_name(self, placeholder_data):
+        return self.identifier.replace(".", "_")
+
+    def _collect_scene_placeholders(self):
+        nodes_by_identifier = self.builder.get_shared_populate_data(
+            "placeholder_nodes"
+        )
+        if nodes_by_identifier is None:
+            # Cache placeholder data to shared data
+            nodes = cmds.ls("*.plugin_identifier", long=True, objectsOnly=True)
+
+            nodes_by_identifier = {}
+            for node in nodes:
+                identifier = cmds.getAttr("{}.plugin_identifier".format(node))
+                nodes_by_identifier.setdefault(identifier, []).append(node)
+
+            # Set the cache
+            self.builder.set_shared_populate_data(
+                "placeholder_nodes", nodes_by_identifier
+            )
+
+        return nodes_by_identifier
+
+    def create_placeholder(self, placeholder_data):
+
+        parent = None
+        if self.use_selection_as_parent:
+            selection = cmds.ls(selection=True)
+            if len(selection) > 1:
+                raise ValueError(
+                    "More than one node is selected. "
+                    "Please select only one to define the parent."
+                )
+            parent = selection[0] if selection else None
+
+        placeholder_data["plugin_identifier"] = self.identifier
+        placeholder_name = self._create_placeholder_name(placeholder_data)
+
+        placeholder = cmds.spaceLocator(name=placeholder_name)[0]
+        if parent:
+            placeholder = cmds.parent(placeholder, selection[0])[0]
+
+        self.imprint(placeholder, placeholder_data)
+
+    def update_placeholder(self, placeholder_item, placeholder_data):
+        node_name = placeholder_item.scene_identifier
+
+        changed_values = {}
+        for key, value in placeholder_data.items():
+            if value != placeholder_item.data.get(key):
+                changed_values[key] = value
+
+        # Delete attributes to ensure we imprint new data with correct type
+        for key in changed_values.keys():
+            placeholder_item.data[key] = value
+            if cmds.attributeQuery(key, node=node_name, exists=True):
+                attribute = "{}.{}".format(node_name, key)
+                cmds.deleteAttr(attribute)
+
+        self.imprint(node_name, changed_values)
+
+    def collect_placeholders(self):
+        placeholders = []
+        nodes_by_identifier = self._collect_scene_placeholders()
+        for node in nodes_by_identifier.get(self.identifier, []):
+            # TODO do data validations and maybe upgrades if they are invalid
+            placeholder_data = self.read(node)
+            placeholders.append(
+                self.item_class(scene_identifier=node,
+                                data=placeholder_data,
+                                plugin=self)
+            )
+
+        return placeholders
+
+    def post_placeholder_process(self, placeholder, failed):
+        """Cleanup placeholder after load of its corresponding representations.
+
+        Hide placeholder, add them to placeholder set.
+        Used only by PlaceholderCreateMixin and PlaceholderLoadMixin
+
+        Args:
+            placeholder (PlaceholderItem): Item which was just used to load
+                representation.
+            failed (bool): Loading of representation failed.
+        """
+        # Hide placeholder and add them to placeholder set
+        node = placeholder.scene_identifier
+
+        cmds.sets(node, addElement=PLACEHOLDER_SET)
+        cmds.hide(node)
+        cmds.setAttr("{}.hiddenInOutliner".format(node), True)
+
+    def delete_placeholder(self, placeholder):
+        """Remove placeholder if building was successful
+
+        Used only by PlaceholderCreateMixin and PlaceholderLoadMixin.
+        """
+        node = placeholder.scene_identifier
+
+        # To avoid that deleting a placeholder node will have Maya delete
+        # any objectSets the node was a member of we will first remove it
+        # from any sets it was a member of. This way the `PLACEHOLDERS_SET`
+        # will survive long enough
+        sets = cmds.listSets(o=node) or []
+        for object_set in sets:
+            cmds.sets(node, remove=object_set)
+
+        cmds.delete(node)
+
+    def imprint(self, node, data):
+        """Imprint call for placeholder node"""
+
+        # Complicated data that can't be represented as flat maya attributes
+        # we write to json strings, e.g. multiselection EnumDef
+        for key, value in data.items():
+            if isinstance(value, (list, tuple, dict)):
+                data[key] = "JSON::{}".format(json.dumps(value))
+
+        imprint(node, data)
+
+    def read(self, node):
+        """Read call for placeholder node"""
+
+        data = read(node)
+
+        # Complicated data that can't be represented as flat maya attributes
+        # we read from json strings, e.g. multiselection EnumDef
+        for key, value in data.items():
+            if isinstance(value, str) and value.startswith("JSON::"):
+                value = value[len("JSON::"):]   # strip of JSON:: prefix
+                data[key] = json.loads(value)
+
+        return data
+
+
 def build_workfile_template(*args):
     builder = MayaTemplateBuilder(registered_host())
     builder.build_template()
diff --git a/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py b/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py
index 5bfaae6500..2de4594f47 100644
--- a/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py
+++ b/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py
@@ -1,87 +1,48 @@
-import json
-
 from maya import cmds
 
 from ayon_core.pipeline.workfile.workfile_template_builder import (
-    PlaceholderPlugin,
-    LoadPlaceholderItem,
     PlaceholderLoadMixin,
+    LoadPlaceholderItem
 )
 from ayon_core.hosts.maya.api.lib import (
-    read,
-    imprint,
-    get_reference_node
+    get_container_transforms,
+    get_node_parent,
+    Reorder
+)
+from ayon_core.hosts.maya.api.workfile_template_builder import (
+    MayaPlaceholderPlugin,
 )
-from ayon_core.hosts.maya.api.workfile_template_builder import PLACEHOLDER_SET
 
 
-class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
+class MayaPlaceholderLoadPlugin(MayaPlaceholderPlugin, PlaceholderLoadMixin):
     identifier = "maya.load"
     label = "Maya load"
 
-    def _collect_scene_placeholders(self):
-        # Cache placeholder data to shared data
-        placeholder_nodes = self.builder.get_shared_populate_data(
-            "placeholder_nodes"
-        )
-        if placeholder_nodes is None:
-            attributes = cmds.ls("*.plugin_identifier", long=True)
-            placeholder_nodes = {}
-            for attribute in attributes:
-                node_name = attribute.rpartition(".")[0]
-                placeholder_nodes[node_name] = (
-                    self._parse_placeholder_node_data(node_name)
-                )
-
-            self.builder.set_shared_populate_data(
-                "placeholder_nodes", placeholder_nodes
-            )
-        return placeholder_nodes
-
-    def _parse_placeholder_node_data(self, node_name):
-        placeholder_data = read(node_name)
-        parent_name = (
-            cmds.getAttr(node_name + ".parent", asString=True)
-            or node_name.rpartition("|")[0]
-            or ""
-        )
-        if parent_name:
-            siblings = cmds.listRelatives(parent_name, children=True)
-        else:
-            siblings = cmds.ls(assemblies=True)
-        node_shortname = node_name.rpartition("|")[2]
-        current_index = cmds.getAttr(node_name + ".index", asString=True)
-        if current_index < 0:
-            current_index = siblings.index(node_shortname)
-
-        placeholder_data.update({
-            "parent": parent_name,
-            "index": current_index
-        })
-        return placeholder_data
+    item_class = LoadPlaceholderItem
 
     def _create_placeholder_name(self, placeholder_data):
-        placeholder_name_parts = placeholder_data["builder_type"].split("_")
 
-        pos = 1
+        # Split builder type: context_assets, linked_assets, all_assets
+        prefix, suffix = placeholder_data["builder_type"].split("_", 1)
+        parts = [prefix]
+
+        # add family if any
         placeholder_product_type = placeholder_data.get("product_type")
         if placeholder_product_type is None:
             placeholder_product_type = placeholder_data.get("family")
 
         if placeholder_product_type:
-            placeholder_name_parts.insert(pos, placeholder_product_type)
-            pos += 1
+            parts.append(placeholder_product_type)
 
         # add loader arguments if any
         loader_args = placeholder_data["loader_args"]
         if loader_args:
-            loader_args = json.loads(loader_args.replace('\'', '\"'))
-            values = [v for v in loader_args.values()]
-            for value in values:
-                placeholder_name_parts.insert(pos, value)
-                pos += 1
+            loader_args = eval(loader_args)
+            for value in loader_args.values():
+                parts.append(str(value))
 
-        placeholder_name = "_".join(placeholder_name_parts)
+        parts.append(suffix)
+        placeholder_name = "_".join(parts)
 
         return placeholder_name.capitalize()
 
@@ -104,68 +65,6 @@ class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
             )
         return loaded_representation_ids
 
-    def create_placeholder(self, placeholder_data):
-        selection = cmds.ls(selection=True)
-        if len(selection) > 1:
-            raise ValueError("More then one item are selected")
-
-        parent = selection[0] if selection else None
-
-        placeholder_data["plugin_identifier"] = self.identifier
-
-        placeholder_name = self._create_placeholder_name(placeholder_data)
-
-        placeholder = cmds.spaceLocator(name=placeholder_name)[0]
-        if parent:
-            placeholder = cmds.parent(placeholder, selection[0])[0]
-
-        imprint(placeholder, placeholder_data)
-
-        # Add helper attributes to keep placeholder info
-        cmds.addAttr(
-            placeholder,
-            longName="parent",
-            hidden=True,
-            dataType="string"
-        )
-        cmds.addAttr(
-            placeholder,
-            longName="index",
-            hidden=True,
-            attributeType="short",
-            defaultValue=-1
-        )
-
-        cmds.setAttr(placeholder + ".parent", "", type="string")
-
-    def update_placeholder(self, placeholder_item, placeholder_data):
-        node_name = placeholder_item.scene_identifier
-        new_values = {}
-        for key, value in placeholder_data.items():
-            placeholder_value = placeholder_item.data.get(key)
-            if value != placeholder_value:
-                new_values[key] = value
-                placeholder_item.data[key] = value
-
-        for key in new_values.keys():
-            cmds.deleteAttr(node_name + "." + key)
-
-        imprint(node_name, new_values)
-
-    def collect_placeholders(self):
-        output = []
-        scene_placeholders = self._collect_scene_placeholders()
-        for node_name, placeholder_data in scene_placeholders.items():
-            if placeholder_data.get("plugin_identifier") != self.identifier:
-                continue
-
-            # TODO do data validations and maybe upgrades if they are invalid
-            output.append(
-                LoadPlaceholderItem(node_name, placeholder_data, self)
-            )
-
-        return output
-
     def populate_placeholder(self, placeholder):
         self.populate_load_placeholder(placeholder)
 
@@ -176,25 +75,6 @@ class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
     def get_placeholder_options(self, options=None):
         return self.get_load_plugin_options(options)
 
-    def post_placeholder_process(self, placeholder, failed):
-        """Cleanup placeholder after load of its corresponding representations.
-
-        Args:
-            placeholder (PlaceholderItem): Item which was just used to load
-                representation.
-            failed (bool): Loading of representation failed.
-        """
-        # Hide placeholder and add them to placeholder set
-        node = placeholder.scene_identifier
-
-        cmds.sets(node, addElement=PLACEHOLDER_SET)
-        cmds.hide(node)
-        cmds.setAttr(node + ".hiddenInOutliner", True)
-
-    def delete_placeholder(self, placeholder):
-        """Remove placeholder if building was successful"""
-        cmds.delete(placeholder.scene_identifier)
-
     def load_succeed(self, placeholder, container):
         self._parent_in_hierarchy(placeholder, container)
 
@@ -210,55 +90,43 @@ class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
         if not container:
             return
 
-        roots = cmds.sets(container, q=True) or []
-        ref_node = None
-        try:
-            ref_node = get_reference_node(roots)
-        except AssertionError as e:
-            self.log.info(e.args[0])
+        # TODO: This currently returns only a single root but a loaded scene
+        #   could technically load more than a single root
+        container_root = get_container_transforms(container, root=True)
 
-        nodes_to_parent = []
-        for root in roots:
-            if ref_node:
-                ref_root = cmds.referenceQuery(root, nodes=True)[0]
-                ref_root = (
-                    cmds.listRelatives(ref_root, parent=True, path=True) or
-                    [ref_root]
-                )
-                nodes_to_parent.extend(ref_root)
-                continue
-            if root.endswith("_RN"):
-                # Backwards compatibility for hardcoded reference names.
-                refRoot = cmds.referenceQuery(root, n=True)[0]
-                refRoot = cmds.listRelatives(refRoot, parent=True) or [refRoot]
-                nodes_to_parent.extend(refRoot)
-            elif root not in cmds.listSets(allSets=True):
-                nodes_to_parent.append(root)
+        # Bugfix: The get_container_transforms does not recognize the load
+        # reference group currently
+        # TODO: Remove this when it does
+        parent = get_node_parent(container_root)
+        if parent:
+            container_root = parent
+        roots = [container_root]
 
-            elif not cmds.sets(root, q=True):
-                return
+        # Add the loaded roots to the holding sets if they exist
+        holding_sets = cmds.listSets(object=placeholder.scene_identifier) or []
+        for holding_set in holding_sets:
+            cmds.sets(roots, forceElement=holding_set)
 
-        # Move loaded nodes to correct index in outliner hierarchy
+        # Parent the roots to the place of the placeholder locator and match
+        # its matrix
         placeholder_form = cmds.xform(
             placeholder.scene_identifier,
-            q=True,
+            query=True,
             matrix=True,
             worldSpace=True
         )
-        scene_parent = cmds.listRelatives(
-            placeholder.scene_identifier, parent=True, fullPath=True
-        )
-        for node in set(nodes_to_parent):
-            cmds.reorder(node, front=True)
-            cmds.reorder(node, relative=placeholder.data["index"])
-            cmds.xform(node, matrix=placeholder_form, ws=True)
-            if scene_parent:
-                cmds.parent(node, scene_parent)
-            else:
-                cmds.parent(node, world=True)
+        scene_parent = get_node_parent(placeholder.scene_identifier)
+        for node in set(roots):
+            cmds.xform(node, matrix=placeholder_form, worldSpace=True)
 
-        holding_sets = cmds.listSets(object=placeholder.scene_identifier)
-        if not holding_sets:
-            return
-        for holding_set in holding_sets:
-            cmds.sets(roots, forceElement=holding_set)
+            if scene_parent != get_node_parent(node):
+                if scene_parent:
+                    node = cmds.parent(node, scene_parent)[0]
+                else:
+                    node = cmds.parent(node, world=True)[0]
+
+            # Move loaded nodes in index order next to their placeholder node
+            cmds.reorder(node, back=True)
+            index = Reorder.get_index(placeholder.scene_identifier)
+            cmds.reorder(node, front=True)
+            cmds.reorder(node, relative=index + 1)

From 93dda6110add3ceb9d1956eec87e1fdbaf6cb9f8 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 19 Apr 2024 20:15:56 +0200
Subject: [PATCH 57/89] Remove bloated `Reorder` class in favor of the only
 used function

---
 client/ayon_core/hosts/maya/api/lib.py        | 261 +-----------------
 .../maya/plugins/template/load_placeholder.py |   4 +-
 2 files changed, 17 insertions(+), 248 deletions(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index e30070c796..2e77fe6c64 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -4406,252 +4406,21 @@ def create_rig_animation_instance(
         )
 
 
-class Reorder(object):
-    """Helper functions for reordering in Maya outliner"""
+def get_node_index_under_parent(node: str) -> int:
+    """Return the index of a DAG node under its parent.
 
-    @staticmethod
-    def group_by_parent(nodes):
-        """Groups the given input list of nodes by parent.
+    Arguments:
+        node (str): A DAG Node path.
 
-        This is a convenience function for the Reorder functionality.
-        This function assumes the nodes are in the `long/fullPath` format.
-        """
-        nodes = cmds.ls(nodes, long=True)
-        nodes_by_parent = defaultdict(list)
-        for node in nodes:
-            parent = node.rsplit("|", 1)[0]
-            nodes_by_parent[parent].append(node)
-        return nodes_by_parent
+    Returns:
+        int: The DAG node's index under its parents or world
 
-    @staticmethod
-    def get_children_with_index(parent):
-        """Get children under parent with their indices"""
-        def node_to_index(nodes):
-            return {node: index for index, node in enumerate(nodes)}
-
-        if not parent:
-            return node_to_index(cmds.ls(assemblies=True, long=True))
-        else:
-            return node_to_index(
-                cmds.listRelatives(parent,
-                                   children=True,
-                                   fullPath=True) or []
-            )
-
-    @staticmethod
-    def get_index(node):
-        node = cmds.ls(node, long=True)[0]  # enforce long names
-        parent = node.rsplit("|", 1)[0]
-        if not parent:
-            return cmds.ls(assemblies=True, long=True).index(node)
-        else:
-            return cmds.listRelatives(parent,
-                                      children=True,
-                                      fullPath=True).index(node)
-
-    @staticmethod
-    def get_indices(nodes):
-        """Returns a dictionary with node, index pairs.
-
-        This is preferred over get_index method for larger number of nodes,
-        because it is more optimal in performance.
-
-        eg:
-            {
-                '|side': 3,
-                '|top': 1,
-                '|pSphere1': 4,
-                '|persp': 0,
-                '|front': 2
-            }
-
-        Returns:
-            dict: index by node
-        """
-        nodes = cmds.ls(nodes, long=True)  # enforce long names
-        node_indices = dict()
-        cached_children = dict()
-        for node in nodes:
-            parent = node.rsplit("|", 1)[0]
-            if parent not in cached_children:
-                cached_children[parent] = Reorder.get_children_with_index(parent)  # noqa: E501
-
-            node_indices[node] = cached_children[parent][node]
-        return node_indices
-
-    @staticmethod
-    def set_index(node, index):
-        if not node:
-            return
-        cmds.reorder(node, front=True)
-        cmds.reorder(node, r=index)
-
-    @staticmethod
-    def set_indices(node_indices):
-        """Set node order by node to index dict.
-
-        Args:
-            node_indices (dict): Node name to index dictionary
-
-        """
-        if not isinstance(node_indices, dict):
-            raise TypeError(
-                "Reorder.set_indices() requires a dictionary with "
-                "(node, index) pairs as input. "
-                "`{0}` is an invalid input type.".format(
-                    type(node_indices).__name__)
-            )
-
-        if not node_indices:
-            return
-
-        # force nodes to the back to not influence each other during reorder
-        cmds.reorder(node_indices.keys(), back=True)
-
-        for node, index in sorted(node_indices.items(),
-                                  key=operator.itemgetter(1)):
-            Reorder.set_index(node, index)
-
-    @staticmethod
-    def sort(nodes, key=lambda x: x.rsplit("|", 1)[-1], reverse=False):
-        """Sorts the node in scene by the key function.
-
-        Default sorting key is alphabetically by using the object's short name.
-        """
-        nodes = cmds.ls(nodes, long=True)  # ensure long paths
-        if not nodes:
-            return
-
-        # Group by parent to sort nodes per parent
-        parents = Reorder.group_by_parent(nodes)
-
-        for child_nodes in parents.values():
-
-            node_indices = Reorder.get_indices(child_nodes)
-            indices = sorted(node_indices.values())
-
-            new_indices = {
-                node: indices[i] for i, node in
-                enumerate(sorted(child_nodes, key=key, reverse=reverse))
-            }
-            Reorder.set_indices(new_indices)
-
-    @staticmethod
-    def reverse(nodes):
-        nodes = cmds.ls(nodes, long=True)  # ensure long paths
-        if not nodes:
-            return
-
-        # Group by parent to sort nodes per parent
-        parents = Reorder.group_by_parent(nodes)
-
-        for child_nodes in parents.values():
-
-            node_indices = Reorder.get_indices(child_nodes)
-            indices = sorted(node_indices.values(), reverse=False)
-
-            iterable = enumerate(sorted(node_indices.items(),
-                                        key=operator.itemgetter(1),
-                                        reverse=True))
-            new_indices = {
-                node: indices[i] for i, (node, _old_index) in iterable
-            }
-            Reorder.set_indices(new_indices)
-
-    @staticmethod
-    def align_bottom(nodes):
-        """Reorder to the lowest (most back) of node in `nodes`."""
-        nodes = cmds.ls(nodes, long=True)  # ensure long paths
-        if not nodes:
-            return
-
-        # Group by parent to sort nodes per parent
-        parents = Reorder.group_by_parent(nodes)
-        for child_nodes in parents.values():
-
-            # Reorder.set_index forces to front and then moves all objects
-            # together (so they will be stacked together). Then it applies the
-            # index as relative offset, we can use that here to our advantage.
-            # And it is a lot faster than Reorder.set_indices in that scenario.
-            index_per_node = Reorder.get_indices(child_nodes)
-            back_index = max(index_per_node.values())
-            new_front_index = back_index - len(child_nodes) + 1
-            Reorder.set_index(child_nodes, new_front_index)
-
-    @staticmethod
-    def align_top(nodes):
-        """Reorder to the highest (most front) of node in `nodes`."""
-        nodes = cmds.ls(nodes, long=True)  # ensure long paths
-        if not nodes:
-            return
-
-        # Group by parent to sort nodes per parent
-        parents = Reorder.group_by_parent(nodes)
-        for childNodes in parents.values():
-
-            # Reorder.set_index forces to front and then moves all objects
-            # together (so they will be stacked together). Then it applies the
-            # index as relative offset, we can use that here to our advantage.
-            # And it is a lot faster than Reorder.set_indices in that scenario.
-            index_per_node = Reorder.get_indices(childNodes)
-            front_index = min(index_per_node.values())
-            Reorder.set_index(childNodes, front_index)
-
-    @staticmethod
-    def move(nodes, relative, wrap=True):
-        """ Reorder by the given relative amount. """
-        # TODO: Implement the disabling of wrapping around when at bottom.
-        if not nodes:
-            return
-        cmds.reorder(nodes, r=relative)
-
-    @staticmethod
-    def to_bottom(nodes):
-        """Reorder to all the way to the bottom."""
-        if not nodes:
-            return
-        cmds.reorder(nodes, back=True)
-
-    @staticmethod
-    def to_top(nodes):
-        """Reorder to all the way to the top."""
-        if not nodes:
-            return
-        cmds.reorder(nodes, front=True)
-
-    @staticmethod
-    def order_to(nodes):
-        """Reorder the nodes to the order of the input list.
-
-        Tip:
-            If you pass this your current selection list it will reorder
-            the nodes to the order of your selection.
-
-        """
-        nodes = cmds.ls(nodes, long=True)  # ensure long paths
-        if not nodes:
-            return
-
-        # Make a dictionary of the input order so we can optimize the look-up
-        # of the index in the order of the input `nodes`.
-        selected_order = {node: i for i, node in enumerate(nodes)}
-
-        # Group by parent since we want to sort nodes under its current parent
-        parents = Reorder.group_by_parent(nodes)
-        for child_nodes in parents.values():
-
-            # Get the current indices
-            node_indices = Reorder.get_indices(child_nodes)
-
-            # We get the original indices so we can position to those same
-            # positions, albeit with the new ordering of the nodes.
-            orig_indices = sorted(node_indices.values())
-
-            # Order the nodes by current selection (input list) and then apply
-            # the list of indices from `nodeIndices` in low-to-high order.
-            new_indices = dict(
-                zip(sorted(node_indices.keys(),
-                           key=lambda x: selected_order[x]),
-                    orig_indices)
-            )
-            Reorder.set_indices(new_indices)
+    """
+    node = cmds.ls(node, long=True)[0]  # enforce long names
+    parent = node.rsplit("|", 1)[0]
+    if not parent:
+        return cmds.ls(assemblies=True, long=True).index(node)
+    else:
+        return cmds.listRelatives(parent,
+                                  children=True,
+                                  fullPath=True).index(node)
diff --git a/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py b/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py
index 2de4594f47..b07c7e9a70 100644
--- a/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py
+++ b/client/ayon_core/hosts/maya/plugins/template/load_placeholder.py
@@ -7,7 +7,7 @@ from ayon_core.pipeline.workfile.workfile_template_builder import (
 from ayon_core.hosts.maya.api.lib import (
     get_container_transforms,
     get_node_parent,
-    Reorder
+    get_node_index_under_parent
 )
 from ayon_core.hosts.maya.api.workfile_template_builder import (
     MayaPlaceholderPlugin,
@@ -127,6 +127,6 @@ class MayaPlaceholderLoadPlugin(MayaPlaceholderPlugin, PlaceholderLoadMixin):
 
             # Move loaded nodes in index order next to their placeholder node
             cmds.reorder(node, back=True)
-            index = Reorder.get_index(placeholder.scene_identifier)
+            index = get_node_index_under_parent(placeholder.scene_identifier)
             cmds.reorder(node, front=True)
             cmds.reorder(node, relative=index + 1)

From 2d0c1062387aec013de1ca7d0e34747e67c90f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 30 Apr 2024 12:55:12 +0200
Subject: [PATCH 58/89] :art: add 3dequalizer support to applications addon

---
 client/ayon_core/resources/app_icons/3de4.png | Bin 0 -> 15879 bytes
 server_addon/applications/package.py          |   2 +-
 .../applications/server/applications.json     |  22 ++++++++++++++++++
 server_addon/applications/server/settings.py  |   2 ++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 client/ayon_core/resources/app_icons/3de4.png

diff --git a/client/ayon_core/resources/app_icons/3de4.png b/client/ayon_core/resources/app_icons/3de4.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd0fe40d37a3ca96444f37644de01fc45ab22106
GIT binary patch
literal 15879
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

literal 0
HcmV?d00001

diff --git a/server_addon/applications/package.py b/server_addon/applications/package.py
index ce312ed662..bcc91f1d84 100644
--- a/server_addon/applications/package.py
+++ b/server_addon/applications/package.py
@@ -1,3 +1,3 @@
 name = "applications"
 title = "Applications"
-version = "0.2.0"
+version = "0.2.1"
diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json
index e4b72fdff9..48a8a66161 100644
--- a/server_addon/applications/server/applications.json
+++ b/server_addon/applications/server/applications.json
@@ -1271,6 +1271,28 @@
                 }
             ]
         },
+        "equalizer": {
+            "enabled": true,
+            "label": "3DEqualizer",
+            "icon": "{}/app_icons/zbrush.png",
+            "host_name": "equalizer",
+            "environment": "{}",
+            "variants": [
+                {
+                    "name": "7-1v2",
+                    "label": "7.1v2",
+                    "use_python_2": false,
+                    "executables": {
+                        "windows": [
+                            "C:\\Program Files\\3DE4_win64_r7.1v2\\bin\\3DE4.exe"
+                        ],
+                        "darwin": [],
+                        "linux": []
+                    },
+
+                }
+            ]
+        },
         "additional_apps": []
     }
 }
diff --git a/server_addon/applications/server/settings.py b/server_addon/applications/server/settings.py
index 5743e9f471..b77686cee0 100644
--- a/server_addon/applications/server/settings.py
+++ b/server_addon/applications/server/settings.py
@@ -190,6 +190,8 @@ class ApplicationsSettings(BaseSettingsModel):
         default_factory=AppGroupWithPython, title="OpenRV")
     zbrush: AppGroup = SettingsField(
         default_factory=AppGroupWithPython, title="Zbrush")
+    equalizer: AppGroup = SettingsField(
+        default_factory=AppGroupWithPython, title="3DEqualizer")
     additional_apps: list[AdditionalAppGroup] = SettingsField(
         default_factory=list, title="Additional Applications")
 

From 678296c1dbab9b84f421504d3cb95bcab7b2bf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 30 Apr 2024 12:56:57 +0200
Subject: [PATCH 59/89] :bug: fix icon

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

diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json
index 48a8a66161..ae3e82794d 100644
--- a/server_addon/applications/server/applications.json
+++ b/server_addon/applications/server/applications.json
@@ -1274,7 +1274,7 @@
         "equalizer": {
             "enabled": true,
             "label": "3DEqualizer",
-            "icon": "{}/app_icons/zbrush.png",
+            "icon": "{}/app_icons/3de4.png",
             "host_name": "equalizer",
             "environment": "{}",
             "variants": [

From 8e2f3235c6ab6704e744ffe2cd977b22940f24b4 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 30 Apr 2024 12:58:08 +0200
Subject: [PATCH 60/89] Remove unused import

---
 client/ayon_core/hosts/maya/api/lib.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index ff94459a31..e7361c6910 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -6,7 +6,6 @@ from pprint import pformat
 import sys
 import uuid
 import re
-import operator
 
 import json
 import logging

From 74bbf91e097c353b44c8e3adc72dcb621c39ec63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 30 Apr 2024 12:59:25 +0200
Subject: [PATCH 61/89] :bug: fix json

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

diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json
index ae3e82794d..84b7fa33cf 100644
--- a/server_addon/applications/server/applications.json
+++ b/server_addon/applications/server/applications.json
@@ -1289,7 +1289,7 @@
                         "darwin": [],
                         "linux": []
                     },
-
+                    "environment": "{}"
                 }
             ]
         },

From 9f4c7018a289a2bd060bd8ad1c25969952e93c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 30 Apr 2024 16:36:08 +0200
Subject: [PATCH 62/89] :recycle: make validator optional

---
 .../maya/plugins/publish/validate_rendersettings.py      | 9 +++++++--
 server_addon/maya/server/settings/publishers.py          | 9 ++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
index 78a247b3f2..987e9eec7c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -10,6 +10,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
     PublishValidationError,
+    OptionalPyblishPluginMixin
 )
 from ayon_core.hosts.maya.api import lib
 from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings
@@ -37,7 +38,8 @@ def get_redshift_image_format_labels():
     return mel.eval("{0}={0}".format(var))
 
 
-class ValidateRenderSettings(pyblish.api.InstancePlugin):
+class ValidateRenderSettings(pyblish.api.InstancePlugin,
+                             OptionalPyblishPluginMixin):
     """Validates the global render settings
 
     * File Name Prefix must start with: `<Scene>`
@@ -55,7 +57,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     * Frame Padding must be:
         * default: 4
 
-    * Animation must be toggle on, in Render Settings - Common tab:
+    * Animation must be toggled on, in Render Settings - Common tab:
         * vray: Animation on standard of specific
         * arnold: Frame / Animation ext: Any choice without "(Single Frame)"
         * redshift: Animation toggled on
@@ -71,6 +73,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["renderlayer"]
     actions = [RepairAction]
+    optional = True
 
     ImagePrefixes = {
         'mentalray': 'defaultRenderGlobals.imageFilePrefix',
@@ -112,6 +115,8 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     DEFAULT_PREFIX = "<Scene>/<RenderLayer>/<RenderLayer>_<RenderPass>"
 
     def process(self, instance):
+        if not self.is_active(instance.data):
+            return
 
         invalid = self.get_invalid(instance)
         if invalid:
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 27288053a2..c29d52f95e 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -184,7 +184,7 @@ class ValidateAttributesModel(BaseSettingsModel):
 
         if not success:
             raise BadRequestException(
-                "The attibutes can't be parsed as json object"
+                "The attributes can't be parsed as json object"
             )
         return value
 
@@ -220,7 +220,7 @@ class ValidateUnrealStaticMeshNameModel(BaseSettingsModel):
     enabled: bool = SettingsField(title="ValidateUnrealStaticMeshName")
     optional: bool = SettingsField(title="Optional")
     validate_mesh: bool = SettingsField(title="Validate mesh names")
-    validate_collision: bool = SettingsField(title="Validate collison names")
+    validate_collision: bool = SettingsField(title="Validate collision names")
 
 
 class ValidateCycleErrorModel(BaseSettingsModel):
@@ -265,6 +265,7 @@ class RendererAttributesModel(BaseSettingsModel):
 
 
 class ValidateRenderSettingsModel(BaseSettingsModel):
+    optional: bool = SettingsField(title="Optional")
     arnold_render_attributes: list[RendererAttributesModel] = SettingsField(
         default_factory=list, title="Arnold Render Attributes")
     vray_render_attributes: list[RendererAttributesModel] = SettingsField(
@@ -392,7 +393,7 @@ class ExtractGPUCacheModel(BaseSettingsModel):
         title="Optimize Animations For Motion Blur"
     )
     writeMaterials: bool = SettingsField(title="Write Materials")
-    useBaseTessellation: bool = SettingsField(title="User Base Tesselation")
+    useBaseTessellation: bool = SettingsField(title="User Based Tessellation")
 
 
 class PublishersModel(BaseSettingsModel):
@@ -942,6 +943,8 @@ DEFAULT_PUBLISH_SETTINGS = {
         ]
     },
     "ValidateRenderSettings": {
+        "enabled": True,
+        "optional": False,
         "arnold_render_attributes": [],
         "vray_render_attributes": [],
         "redshift_render_attributes": [],

From c189d502fd93b9ea29fc115a7573534cae42541c Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Tue, 30 Apr 2024 15:37:08 +0100
Subject: [PATCH 63/89] Fix is_visible

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

diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 1defa3debd..525c156fe1 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -1299,7 +1299,7 @@ def is_visible(node,
             override_enabled = cmds.getAttr('{}.overrideEnabled'.format(node))
             override_visibility = cmds.getAttr('{}.overrideVisibility'.format(
                 node))
-            if override_enabled and override_visibility:
+            if override_enabled and not override_visibility:
                 return False
 
     if parentHidden:

From f943cb98e831476afbfe75f3a41a8b1b6ecda833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Tue, 30 Apr 2024 17:27:03 +0200
Subject: [PATCH 64/89] :recycle: support enabled state

---
 server_addon/maya/server/settings/publishers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index c29d52f95e..30f23904e2 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -265,6 +265,7 @@ class RendererAttributesModel(BaseSettingsModel):
 
 
 class ValidateRenderSettingsModel(BaseSettingsModel):
+    enabled: bool = SettingsField(title="ValidateRenderSettings")
     optional: bool = SettingsField(title="Optional")
     arnold_render_attributes: list[RendererAttributesModel] = SettingsField(
         default_factory=list, title="Arnold Render Attributes")

From 8e4fe3bddec8adb29e8be4f079d6ea735482f56d Mon Sep 17 00:00:00 2001
From: Toke Jepsen <tokejepsen@gmail.com>
Date: Tue, 30 Apr 2024 16:28:15 +0100
Subject: [PATCH 65/89] Update client/ayon_core/hosts/hiero/api/workio.py

Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com>
---
 client/ayon_core/hosts/hiero/api/workio.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py
index 9d8b1777e7..c7b749a9dd 100644
--- a/client/ayon_core/hosts/hiero/api/workio.py
+++ b/client/ayon_core/hosts/hiero/api/workio.py
@@ -56,8 +56,11 @@ def open_file(filepath):
 
     # Close previous project if its different to the current project.
     if project.path() != filepath:
+        # open project file
+        hiero.core.openProject(filepath.replace(os.path.sep, "/"))
         project.close()
 
+
     return True
 
 

From e3619120fff489b36d527f5e195a0827e674e3c8 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Tue, 30 Apr 2024 16:30:11 +0100
Subject: [PATCH 66/89] Remove redundant openProject

---
 client/ayon_core/hosts/hiero/api/workio.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py
index c7b749a9dd..de6f1f4a37 100644
--- a/client/ayon_core/hosts/hiero/api/workio.py
+++ b/client/ayon_core/hosts/hiero/api/workio.py
@@ -51,9 +51,6 @@ def open_file(filepath):
 
     project = hiero.core.projects()[-1]
 
-    # open project file
-    hiero.core.openProject(filepath.replace(os.path.sep, "/"))
-
     # Close previous project if its different to the current project.
     if project.path() != filepath:
         # open project file

From 14df54020b4feae55e995f0ecd396af9b86f842a Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Wed, 1 May 2024 00:02:19 +0200
Subject: [PATCH 67/89] Resolve merge conflict, implement change from `develop`

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

diff --git a/client/ayon_core/hosts/maya/api/workfile_template_builder.py b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
index d518d3933c..f4f9a34983 100644
--- a/client/ayon_core/hosts/maya/api/workfile_template_builder.py
+++ b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
@@ -194,6 +194,11 @@ class MayaPlaceholderPlugin(PlaceholderPlugin):
         # Hide placeholder and add them to placeholder set
         node = placeholder.scene_identifier
 
+        # If we just populate the placeholders from current scene, the
+        # placeholder set will not be created so account for that.
+        if not cmds.objExists(PLACEHOLDER_SET):
+            cmds.sets(name=PLACEHOLDER_SET, empty=True)
+
         cmds.sets(node, addElement=PLACEHOLDER_SET)
         cmds.hide(node)
         cmds.setAttr("{}.hiddenInOutliner".format(node), True)

From 5643cbb9ca5dd2dfcbaee3ff2fb2c7dc23954cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Thu, 2 May 2024 11:25:42 +0200
Subject: [PATCH 68/89] :bug: fix invalid enabled flag

unrelated to the original PR, sorry
---
 server_addon/maya/server/settings/publishers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 30f23904e2..c46aa59453 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -243,7 +243,7 @@ class ValidatePluginPathAttributesModel(BaseSettingsModel):
     and the node attribute is <b>abc_file</b>
     """
 
-    enabled: bool = True
+    enabled: bool = SettingsField(title="Enabled")
     optional: bool = SettingsField(title="Optional")
     active: bool = SettingsField(title="Active")
     attribute: list[ValidatePluginPathAttributesAttrModel] = SettingsField(

From 94ff9d92c33bc06fd39e4c6bb99fc11e8c0a871e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 2 May 2024 11:49:06 +0200
Subject: [PATCH 69/89] Fix validate_unique_names call

validate_unique_names cannot be used on fields that are just regular `list[str]`, they must be `list[SomethingSomething]`.
---
 server_addon/deadline/server/settings/publish_plugins.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
index 9f69143e37..784ad2560b 100644
--- a/server_addon/deadline/server/settings/publish_plugins.py
+++ b/server_addon/deadline/server/settings/publish_plugins.py
@@ -191,7 +191,6 @@ class NukeSubmitDeadlineModel(BaseSettingsModel):
 
     @validator(
         "limit_groups",
-        "env_allowed_keys",
         "env_search_replace_values")
     def validate_unique_names(cls, value):
         ensure_unique_names(value)

From 396c24d9d7f99460167a30c7729fbb8d4480dffe Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Thu, 2 May 2024 11:52:21 +0200
Subject: [PATCH 70/89] Bump up version of deadline

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

diff --git a/server_addon/deadline/package.py b/server_addon/deadline/package.py
index 944797fea6..25ba1c1166 100644
--- a/server_addon/deadline/package.py
+++ b/server_addon/deadline/package.py
@@ -1,3 +1,3 @@
 name = "deadline"
 title = "Deadline"
-version = "0.1.10"
+version = "0.1.11"

From 3fef14e2e738cf0b86e52a5462a6b9e0b496b905 Mon Sep 17 00:00:00 2001
From: Toke Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 May 2024 12:28:27 +0100
Subject: [PATCH 71/89] Update client/ayon_core/hosts/hiero/api/workio.py

Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com>
---
 client/ayon_core/hosts/hiero/api/workio.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py
index de6f1f4a37..2d0874bd07 100644
--- a/client/ayon_core/hosts/hiero/api/workio.py
+++ b/client/ayon_core/hosts/hiero/api/workio.py
@@ -52,9 +52,11 @@ def open_file(filepath):
     project = hiero.core.projects()[-1]
 
     # Close previous project if its different to the current project.
+    # Close previous project if its different to the current project.
+    filepath = filepath.replace(os.path.sep, "/")
     if project.path() != filepath:
         # open project file
-        hiero.core.openProject(filepath.replace(os.path.sep, "/"))
+        hiero.core.openProject(filepath)
         project.close()
 
 

From 65529f3662b1fa3cc2876e65d6ba49fd66e90e4a Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 May 2024 12:41:00 +0100
Subject: [PATCH 72/89] Fix workio

---
 client/ayon_core/hosts/hiero/api/workio.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py
index 2d0874bd07..6e8fc20172 100644
--- a/client/ayon_core/hosts/hiero/api/workio.py
+++ b/client/ayon_core/hosts/hiero/api/workio.py
@@ -51,15 +51,13 @@ def open_file(filepath):
 
     project = hiero.core.projects()[-1]
 
-    # Close previous project if its different to the current project.
     # Close previous project if its different to the current project.
     filepath = filepath.replace(os.path.sep, "/")
-    if project.path() != filepath:
+    if project.path().replace(os.path.sep, "/") != filepath:
         # open project file
         hiero.core.openProject(filepath)
         project.close()
 
-
     return True
 
 

From 399cb47b05499412a1fad4d3030d69f24ada879c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Fri, 3 May 2024 11:43:38 +0200
Subject: [PATCH 73/89] :bug: fix undefined task name

---
 client/ayon_core/pipeline/create/context.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py
index b8618738fb..e66e15b8b1 100644
--- a/client/ayon_core/pipeline/create/context.py
+++ b/client/ayon_core/pipeline/create/context.py
@@ -1987,12 +1987,16 @@ class CreateContext:
                     "Folder '{}' was not found".format(folder_path)
                 )
 
-        task_name = None
         if task_entity is None:
             task_name = self.get_current_task_name()
-            task_entity = ayon_api.get_task_by_name(
-                project_name, folder_entity["id"], task_name
-            )
+            if task_name:
+                task_entity = ayon_api.get_task_by_name(
+                    project_name, folder_entity["id"], task_name
+                )
+
+        task_name = None
+        if task_entity:
+            task_name = task_entity["name"]
 
         if pre_create_data is None:
             pre_create_data = {}
@@ -2022,6 +2026,7 @@ class CreateContext:
             "productType": creator.product_type,
             "variant": variant
         }
+        print("Create instance data", instance_data)
         return creator.create(
             product_name,
             instance_data,

From def2a2c10a574cc96b1dc16ae1601af04c5cbdc7 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Fri, 3 May 2024 11:12:23 +0100
Subject: [PATCH 74/89] Working version

---
 .../create/create_arnold_scene_source.py      |  20 ++-
 .../maya/plugins/load/load_arnold_standin.py  |  51 +++----
 .../publish/collect_arnold_scene_source.py    |  39 +++---
 .../publish/extract_arnold_scene_source.py    | 126 ++++++++++++------
 .../publish/validate_arnold_scene_source.py   |  74 +++++-----
 .../validate_arnold_scene_source_cbid.py      |  14 +-
 client/ayon_core/plugins/publish/integrate.py |   3 +-
 7 files changed, 193 insertions(+), 134 deletions(-)

diff --git a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
index dc0ffb02c1..e321c13ca0 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
@@ -1,3 +1,5 @@
+from maya import cmds
+
 from ayon_core.hosts.maya.api import (
     lib,
     plugin
@@ -87,16 +89,24 @@ class CreateArnoldSceneSource(plugin.MayaCreator):
 
         return defs
 
+
+class CreateArnoldSceneSourceProxy(CreateArnoldSceneSource):
+    """Arnold Scene Source Proxy
+
+    This product type facilitates working with proxy geometry in the viewport.
+    """
+
+    identifier = "io.openpype.creators.maya.assproxy"
+    label = "Arnold Scene Source Proxy"
+    product_type = "assProxy"
+    icon = "cube"
+
     def create(self, product_name, instance_data, pre_create_data):
-
-        from maya import cmds
-
         instance = super(CreateArnoldSceneSource, self).create(
             product_name, instance_data, pre_create_data
         )
 
         instance_node = instance.get("instance_node")
 
-        content = cmds.sets(name=instance_node + "_content_SET", empty=True)
         proxy = cmds.sets(name=instance_node + "_proxy_SET", empty=True)
-        cmds.sets([content, proxy], forceElement=instance_node)
+        cmds.sets([proxy], forceElement=instance_node)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
index 4b7d2f42ab..ae3b68965a 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
@@ -12,6 +12,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace,
     get_attribute_input,
     maintained_selection,
+    get_fps_for_current_context
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
 from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
@@ -29,7 +30,13 @@ class ArnoldStandinLoader(load.LoaderPlugin):
     """Load as Arnold standin"""
 
     product_types = {
-        "ass", "animation", "model", "proxyAbc", "pointcache", "usd"
+        "ass",
+        "assProxy",
+        "animation",
+        "model",
+        "proxyAbc",
+        "pointcache",
+        "usd"
     }
     representations = {"ass", "abc", "usda", "usdc", "usd"}
 
@@ -95,8 +102,10 @@ class ArnoldStandinLoader(load.LoaderPlugin):
             sequence = is_sequence(os.listdir(os.path.dirname(repre_path)))
             cmds.setAttr(standin_shape + ".useFrameExtension", sequence)
 
-            fps = float(version_attributes.get("fps")) or 25
-            cmds.setAttr(standin_shape + ".abcFPS", fps)
+            fps = (
+                version_attributes.get("fps") or get_fps_for_current_context()
+            )
+            cmds.setAttr(standin_shape + ".abcFPS", float(fps))
 
         nodes = [root, standin, standin_shape]
         if operator is not None:
@@ -128,6 +137,18 @@ class ArnoldStandinLoader(load.LoaderPlugin):
         proxy_path = "/".join([os.path.dirname(path), proxy_basename])
         return proxy_basename, proxy_path
 
+    def _update_operators(self, string_replace_operator, proxy_basename, path):
+        cmds.setAttr(
+            string_replace_operator + ".match",
+            proxy_basename.split(".")[0],
+            type="string"
+        )
+        cmds.setAttr(
+            string_replace_operator + ".replace",
+            os.path.basename(path).split(".")[0],
+            type="string"
+        )
+
     def _setup_proxy(self, shape, path, namespace):
         proxy_basename, proxy_path = self._get_proxy_path(path)
 
@@ -150,16 +171,7 @@ class ArnoldStandinLoader(load.LoaderPlugin):
             "*.(@node=='{}')".format(node_type),
             type="string"
         )
-        cmds.setAttr(
-            string_replace_operator + ".match",
-            proxy_basename,
-            type="string"
-        )
-        cmds.setAttr(
-            string_replace_operator + ".replace",
-            os.path.basename(path),
-            type="string"
-        )
+        self._update_operators(string_replace_operator, proxy_basename, path)
 
         cmds.connectAttr(
             string_replace_operator + ".out",
@@ -194,18 +206,9 @@ class ArnoldStandinLoader(load.LoaderPlugin):
         path = get_representation_path(repre_entity)
         proxy_basename, proxy_path = self._get_proxy_path(path)
 
-        # Whether there is proxy or so, we still update the string operator.
+        # Whether there is proxy or not, we still update the string operator.
         # If no proxy exists, the string operator won't replace anything.
-        cmds.setAttr(
-            string_replace_operator + ".match",
-            proxy_basename,
-            type="string"
-        )
-        cmds.setAttr(
-            string_replace_operator + ".replace",
-            os.path.basename(path),
-            type="string"
-        )
+        self._update_operators(string_replace_operator, proxy_basename, path)
 
         dso_path = path
         if os.path.exists(proxy_path):
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
index 0db89bee31..fb71e128eb 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py
@@ -10,21 +10,23 @@ class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
     # Offset to be after renderable camera collection.
     order = pyblish.api.CollectorOrder + 0.2
     label = "Collect Arnold Scene Source"
-    families = ["ass"]
+    families = ["ass", "assProxy"]
 
     def process(self, instance):
-        objsets = instance.data["setMembers"]
+        instance.data["members"] = []
+        for set_member in instance.data["setMembers"]:
+            if cmds.nodeType(set_member) != "objectSet":
+                instance.data["members"].extend(self.get_hierarchy(set_member))
+                continue
 
-        for objset in objsets:
-            objset = str(objset)
-            members = cmds.sets(objset, query=True)
+            members = cmds.sets(set_member, query=True)
             members = cmds.ls(members, long=True)
             if members is None:
-                self.log.warning("Skipped empty instance: \"%s\" " % objset)
+                self.log.warning(
+                    "Skipped empty instance: \"%s\" " % set_member
+                )
                 continue
-            if objset.endswith("content_SET"):
-                instance.data["contentMembers"] = self.get_hierarchy(members)
-            if objset.endswith("proxy_SET"):
+            if set_member.endswith("proxy_SET"):
                 instance.data["proxy"] = self.get_hierarchy(members)
 
         # Use camera in object set if present else default to render globals
@@ -33,7 +35,7 @@ class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
         renderable = [c for c in cameras if cmds.getAttr("%s.renderable" % c)]
         if renderable:
             camera = renderable[0]
-            for node in instance.data["contentMembers"]:
+            for node in instance.data["members"]:
                 camera_shapes = cmds.listRelatives(
                     node, shapes=True, type="camera"
                 )
@@ -46,18 +48,11 @@ class CollectArnoldSceneSource(pyblish.api.InstancePlugin):
         self.log.debug("data: {}".format(instance.data))
 
     def get_hierarchy(self, nodes):
-        """Return nodes with all their children.
-
-        Arguments:
-            nodes (List[str]): List of nodes to collect children hierarchy for
-
-        Returns:
-            list: Input nodes with their children hierarchy
-
-        """
+        """Return nodes with all their children"""
         nodes = cmds.ls(nodes, long=True)
         if not nodes:
             return []
-
-        children = get_all_children(nodes, ignore_intermediate_objects=True)
-        return list(children.union(nodes))
+        children = get_all_children(nodes)
+        # Make sure nodes merged with children only
+        # contains unique entries
+        return list(set(nodes + list(children)))
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py
index ed8f2ad40c..fb4c41f1de 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py
@@ -17,8 +17,7 @@ class ExtractArnoldSceneSource(publish.Extractor):
     families = ["ass"]
     asciiAss = False
 
-    def process(self, instance):
-        staging_dir = self.staging_dir(instance)
+    def _pre_process(self, instance, staging_dir):
         file_path = os.path.join(staging_dir, "{}.ass".format(instance.name))
 
         # Mask
@@ -70,24 +69,38 @@ class ExtractArnoldSceneSource(publish.Extractor):
             "mask": mask
         }
 
-        filenames, nodes_by_id = self._extract(
-            instance.data["contentMembers"], attribute_data, kwargs
-        )
-
         if "representations" not in instance.data:
             instance.data["representations"] = []
 
+        return attribute_data, kwargs
+
+    def process(self, instance):
+        staging_dir = self.staging_dir(instance)
+        attribute_data, kwargs = self._pre_process(instance, staging_dir)
+
+        filenames = self._extract(
+            instance.data["members"], attribute_data, kwargs
+        )
+
+        self._post_process(
+            instance, filenames, staging_dir, kwargs["startFrame"]
+        )
+
+    def _post_process(self, instance, filenames, staging_dir, frame_start):
+        nodes_by_id = self._nodes_by_id(instance[:])
         representation = {
             "name": "ass",
             "ext": "ass",
             "files": filenames if len(filenames) > 1 else filenames[0],
             "stagingDir": staging_dir,
-            "frameStart": kwargs["startFrame"]
+            "frameStart": frame_start
         }
 
         instance.data["representations"].append(representation)
 
-        json_path = os.path.join(staging_dir, "{}.json".format(instance.name))
+        json_path = os.path.join(
+            staging_dir, "{}.json".format(instance.name)
+        )
         with open(json_path, "w") as f:
             json.dump(nodes_by_id, f)
 
@@ -104,13 +117,68 @@ class ExtractArnoldSceneSource(publish.Extractor):
             "Extracted instance {} to: {}".format(instance.name, staging_dir)
         )
 
-        # Extract proxy.
-        if not instance.data.get("proxy", []):
-            return
+    def _nodes_by_id(self, nodes):
+        nodes_by_id = defaultdict(list)
 
-        kwargs["filename"] = file_path.replace(".ass", "_proxy.ass")
+        for node in nodes:
+            id = lib.get_id(node)
 
-        filenames, _ = self._extract(
+            if id is None:
+                continue
+
+            # Converting Maya hierarchy separator "|" to Arnold separator "/".
+            nodes_by_id[id].append(node.replace("|", "/"))
+
+        return nodes_by_id
+
+    def _extract(self, nodes, attribute_data, kwargs):
+        filenames = []
+        with lib.attribute_values(attribute_data):
+            with lib.maintained_selection():
+                self.log.debug(
+                    "Writing: {}".format(nodes)
+                )
+                cmds.select(nodes, noExpand=True)
+
+                self.log.debug(
+                    "Extracting ass sequence with: {}".format(kwargs)
+                )
+
+                exported_files = cmds.arnoldExportAss(**kwargs)
+
+                for file in exported_files:
+                    filenames.append(os.path.split(file)[1])
+
+                self.log.debug("Exported: {}".format(filenames))
+
+        return filenames
+
+
+class ExtractArnoldSceneSourceProxy(ExtractArnoldSceneSource):
+    """Extract the content of the instance to an Arnold Scene Source file."""
+
+    label = "Extract Arnold Scene Source Proxy"
+    hosts = ["maya"]
+    families = ["assProxy"]
+    asciiAss = True
+
+    def process(self, instance):
+        staging_dir = self.staging_dir(instance)
+        attribute_data, kwargs = self._pre_process(instance, staging_dir)
+
+        filenames, _ = self._duplicate_extract(
+            instance.data["members"], attribute_data, kwargs
+        )
+
+        self._post_process(
+            instance, filenames, staging_dir, kwargs["startFrame"]
+        )
+
+        kwargs["filename"] = os.path.join(
+            staging_dir, "{}_proxy.ass".format(instance.name)
+        )
+
+        filenames, _ = self._duplicate_extract(
             instance.data["proxy"], attribute_data, kwargs
         )
 
@@ -125,12 +193,11 @@ class ExtractArnoldSceneSource(publish.Extractor):
 
         instance.data["representations"].append(representation)
 
-    def _extract(self, nodes, attribute_data, kwargs):
+    def _duplicate_extract(self, nodes, attribute_data, kwargs):
         self.log.debug(
             "Writing {} with:\n{}".format(kwargs["filename"], kwargs)
         )
         filenames = []
-        nodes_by_id = defaultdict(list)
         # Duplicating nodes so they are direct children of the world. This
         # makes the hierarchy of any exported ass file the same.
         with lib.delete_after() as delete_bin:
@@ -147,7 +214,9 @@ class ExtractArnoldSceneSource(publish.Extractor):
                 if not shapes:
                     continue
 
-                duplicate_transform = cmds.duplicate(node)[0]
+                basename = cmds.duplicate(node)[0]
+                parents = cmds.ls(node, long=True)[0].split("|")[:-1]
+                duplicate_transform = "|".join(parents + [basename])
 
                 if cmds.listRelatives(duplicate_transform, parent=True):
                     duplicate_transform = cmds.parent(
@@ -172,28 +241,7 @@ class ExtractArnoldSceneSource(publish.Extractor):
                 duplicate_nodes.extend(shapes)
                 delete_bin.append(duplicate_transform)
 
-            # Copy cbId to mtoa_constant.
-            for node in duplicate_nodes:
-                # Converting Maya hierarchy separator "|" to Arnold
-                # separator "/".
-                nodes_by_id[lib.get_id(node)].append(node.replace("|", "/"))
-
-            with lib.attribute_values(attribute_data):
-                with lib.maintained_selection():
-                    self.log.debug(
-                        "Writing: {}".format(duplicate_nodes)
-                    )
-                    cmds.select(duplicate_nodes, noExpand=True)
-
-                    self.log.debug(
-                        "Extracting ass sequence with: {}".format(kwargs)
-                    )
-
-                    exported_files = cmds.arnoldExportAss(**kwargs)
-
-                    for file in exported_files:
-                        filenames.append(os.path.split(file)[1])
-
-                    self.log.debug("Exported: {}".format(filenames))
+            nodes_by_id = self._nodes_by_id(duplicate_nodes)
+            filenames = self._extract(duplicate_nodes, attribute_data, kwargs)
 
         return filenames, nodes_by_id
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py
index 92b4922492..8574b3ecc8 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py
@@ -1,30 +1,56 @@
+from maya import cmds
+
 import pyblish.api
+
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder, PublishValidationError
 )
+from ayon_core.hosts.maya.api.lib import is_visible
 
 
 class ValidateArnoldSceneSource(pyblish.api.InstancePlugin):
     """Validate Arnold Scene Source.
 
-    We require at least 1 root node/parent for the meshes. This is to ensure we
-    can duplicate the nodes and preserve the names.
+    Ensure no nodes are hidden.
+    """
 
-    If using proxies we need the nodes to share the same names and not be
+    order = ValidateContentsOrder
+    hosts = ["maya"]
+    families = ["ass", "assProxy"]
+    label = "Validate Arnold Scene Source"
+
+    def process(self, instance):
+        # Validate against having nodes hidden, which will result in the
+        # extraction to ignore the node.
+        nodes = instance.data["members"] + instance.data.get("proxy", [])
+        nodes = [x for x in nodes if cmds.objectType(x, isAType='dagNode')]
+        hidden_nodes = [
+            x for x in nodes if not is_visible(x, intermediateObject=False)
+        ]
+        if hidden_nodes:
+            raise PublishValidationError(
+                "Found hidden nodes:\n\n{}\n\nPlease unhide for"
+                " publishing.".format("\n".join(hidden_nodes))
+            )
+
+
+class ValidateArnoldSceneSourceProxy(pyblish.api.InstancePlugin):
+    """Validate Arnold Scene Source Proxy.
+
+    When using proxies we need the nodes to share the same names and not be
     parent to the world. This ends up needing at least two groups with content
     nodes and proxy nodes in another.
     """
 
     order = ValidateContentsOrder
     hosts = ["maya"]
-    families = ["ass"]
-    label = "Validate Arnold Scene Source"
+    families = ["assProxy"]
+    label = "Validate Arnold Scene Source Proxy"
 
     def _get_nodes_by_name(self, nodes):
         ungrouped_nodes = []
         nodes_by_name = {}
         parents = []
-        same_named_nodes = {}
         for node in nodes:
             node_split = node.split("|")
             if len(node_split) == 2:
@@ -35,33 +61,16 @@ class ValidateArnoldSceneSource(pyblish.api.InstancePlugin):
                 parents.append(parent)
 
             node_name = node.rsplit("|", 1)[-1].rsplit(":", 1)[-1]
-
-            # Check for same same nodes, which can happen in different
-            # hierarchies.
-            if node_name in nodes_by_name:
-                try:
-                    same_named_nodes[node_name].append(node)
-                except KeyError:
-                    same_named_nodes[node_name] = [
-                        nodes_by_name[node_name], node
-                    ]
-
             nodes_by_name[node_name] = node
 
-        if same_named_nodes:
-            message = "Found nodes with the same name:"
-            for name, nodes in same_named_nodes.items():
-                message += "\n\n\"{}\":\n{}".format(name, "\n".join(nodes))
-
-            raise PublishValidationError(message)
-
         return ungrouped_nodes, nodes_by_name, parents
 
     def process(self, instance):
+        # Validate against nodes directly parented to world.
         ungrouped_nodes = []
 
         nodes, content_nodes_by_name, content_parents = (
-            self._get_nodes_by_name(instance.data["contentMembers"])
+            self._get_nodes_by_name(instance.data["members"])
         )
         ungrouped_nodes.extend(nodes)
 
@@ -70,24 +79,21 @@ class ValidateArnoldSceneSource(pyblish.api.InstancePlugin):
         )
         ungrouped_nodes.extend(nodes)
 
-        # Validate against nodes directly parented to world.
         if ungrouped_nodes:
             raise PublishValidationError(
                 "Found nodes parented to the world: {}\n"
                 "All nodes need to be grouped.".format(ungrouped_nodes)
             )
 
-        # Proxy validation.
-        if not instance.data.get("proxy", []):
-            return
-
         # Validate for content and proxy nodes amount being the same.
-        if len(instance.data["contentMembers"]) != len(instance.data["proxy"]):
+        if len(instance.data["members"]) != len(instance.data["proxy"]):
             raise PublishValidationError(
                 "Amount of content nodes ({}) and proxy nodes ({}) needs to "
-                "be the same.".format(
-                    len(instance.data["contentMembers"]),
-                    len(instance.data["proxy"])
+                "be the same.\nContent nodes: {}\nProxy nodes:{}".format(
+                    len(instance.data["members"]),
+                    len(instance.data["proxy"]),
+                    instance.data["members"],
+                    instance.data["proxy"]
                 )
             )
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py
index a9d896952d..e5dbe178fc 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py
@@ -17,7 +17,7 @@ class ValidateArnoldSceneSourceCbid(pyblish.api.InstancePlugin,
 
     order = ValidateContentsOrder
     hosts = ["maya"]
-    families = ["ass"]
+    families = ["assProxy"]
     label = "Validate Arnold Scene Source CBID"
     actions = [RepairAction]
     optional = False
@@ -40,15 +40,11 @@ class ValidateArnoldSceneSourceCbid(pyblish.api.InstancePlugin,
 
     @classmethod
     def get_invalid_couples(cls, instance):
-        content_nodes_by_name = cls._get_nodes_by_name(
-            instance.data["contentMembers"]
-        )
-        proxy_nodes_by_name = cls._get_nodes_by_name(
-            instance.data.get("proxy", [])
-        )
+        nodes_by_name = cls._get_nodes_by_name(instance.data["members"])
+        proxy_nodes_by_name = cls._get_nodes_by_name(instance.data["proxy"])
 
         invalid_couples = []
-        for content_name, content_node in content_nodes_by_name.items():
+        for content_name, content_node in nodes_by_name.items():
             proxy_node = proxy_nodes_by_name.get(content_name, None)
 
             if not proxy_node:
@@ -70,7 +66,7 @@ class ValidateArnoldSceneSourceCbid(pyblish.api.InstancePlugin,
         if not self.is_active(instance.data):
             return
         # Proxy validation.
-        if not instance.data.get("proxy", []):
+        if not instance.data["proxy"]:
             return
 
         # Validate for proxy nodes sharing the same cbId as content nodes.
diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index 764168edd3..9ae96e1a20 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()):
@@ -121,6 +121,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
                 "setdress",
                 "layout",
                 "ass",
+                "assProxy",
                 "vdbcache",
                 "scene",
                 "vrayproxy",

From f00acb5dd220b81a1f9989deaf3952c9882af5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Fri, 3 May 2024 12:21:10 +0200
Subject: [PATCH 75/89] :recycle: add active flag, change label

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

diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
index 987e9eec7c..7badfdc027 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -69,7 +69,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin,
     """
 
     order = ValidateContentsOrder
-    label = "Render Settings"
+    label = "Validate Render Settings"
     hosts = ["maya"]
     families = ["renderlayer"]
     actions = [RepairAction]
diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 4ad5c9b6d0..460df803f2 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -310,8 +310,9 @@ class RendererAttributesModel(BaseSettingsModel):
 
 
 class ValidateRenderSettingsModel(BaseSettingsModel):
-    enabled: bool = SettingsField(title="ValidateRenderSettings")
+    enabled: bool = SettingsField(title="Enabled")
     optional: bool = SettingsField(title="Optional")
+    active: bool = SettingsField(title="Active")
     arnold_render_attributes: list[RendererAttributesModel] = SettingsField(
         default_factory=list, title="Arnold Render Attributes")
     vray_render_attributes: list[RendererAttributesModel] = SettingsField(

From c5471e409a993758855c7a147e2159c0a16e769e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Fri, 3 May 2024 12:57:21 +0200
Subject: [PATCH 76/89] :art: add default value

---
 server_addon/maya/server/settings/publishers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server_addon/maya/server/settings/publishers.py b/server_addon/maya/server/settings/publishers.py
index 460df803f2..bc38d5f746 100644
--- a/server_addon/maya/server/settings/publishers.py
+++ b/server_addon/maya/server/settings/publishers.py
@@ -1175,6 +1175,7 @@ DEFAULT_PUBLISH_SETTINGS = {
     },
     "ValidateRenderSettings": {
         "enabled": True,
+        "active": True,
         "optional": False,
         "arnold_render_attributes": [],
         "vray_render_attributes": [],

From 5189325225dad5c9ad917496711ab2d4282190ce Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Fri, 3 May 2024 15:58:53 +0200
Subject: [PATCH 77/89] Fix comp repair folder settings

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

diff --git a/client/ayon_core/hosts/fusion/api/lib.py b/client/ayon_core/hosts/fusion/api/lib.py
index 08722463e1..7f7d20010d 100644
--- a/client/ayon_core/hosts/fusion/api/lib.py
+++ b/client/ayon_core/hosts/fusion/api/lib.py
@@ -169,7 +169,7 @@ def validate_comp_prefs(comp=None, force_repair=False):
         def _on_repair():
             attributes = dict()
             for key, comp_key, _label in validations:
-                value = folder_value[key]
+                value = folder_attributes[key]
                 comp_key_full = "Comp.FrameFormat.{}".format(comp_key)
                 attributes[comp_key_full] = value
             comp.SetPrefs(attributes)

From 5fed3d7b2f6ed60739cea1de53c4d2d26d0f01ca Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 16:31:42 +0200
Subject: [PATCH 78/89] AY-745 - added missed blender for credential collection

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

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 7a506ab645..5d03523c89 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
@@ -25,6 +25,7 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin):
 
     targets = ["local"]
     hosts = ["aftereffects",
+             "blender",
              "fusion",
              "harmony",
              "nuke",

From 22d1837db52d55b806765321ecef98e1967b0923 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 3 May 2024 16:36:09 +0200
Subject: [PATCH 79/89] AY-745 - fixe for cache submissions

---
 .../deadline/plugins/publish/submit_publish_cache_job.py  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 c73fb253f1..16fb66a59a 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
@@ -346,15 +346,17 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
 
         deadline_publish_job_id = None
         if submission_type == "deadline":
-            deadline_url = instance.data["deadline"]["url"]
-            assert deadline_url, "Requires Deadline Webservice URL"
+            self.deadline_url = instance.data["deadline"]["url"]
+            assert self.deadline_url, "Requires Deadline Webservice URL"
 
             deadline_publish_job_id = \
                 self._submit_deadline_post_job(instance, render_job)
 
             # Inject deadline url to instances.
             for inst in instances:
-                inst["deadlineUrl"] = self.deadline_url
+                if "deadline" not in inst:
+                    inst["deadline"] = {}
+                inst["deadline"] = instance.data["deadline"]
 
         # publish job file
         publish_job = {

From 004a4feb9dc85472f022cb9501322f7e82c7081d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 6 May 2024 10:58:07 +0200
Subject: [PATCH 80/89] Fix order of collect render

Must be collected before DL metadata
---
 .../hosts/aftereffects/plugins/publish/collect_render.py        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
index 5ef044459d..ebd4b8f944 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
@@ -24,7 +24,7 @@ class AERenderInstance(RenderInstance):
 
 class CollectAERender(publish.AbstractCollectRender):
 
-    order = pyblish.api.CollectorOrder + 0.405
+    order = pyblish.api.CollectorOrder + 0.100
     label = "Collect After Effects Render Layers"
     hosts = ["aftereffects"]
 

From 831e46a9a2cbe40e9799018343b8045a658a5ee4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 12:08:05 +0200
Subject: [PATCH 81/89] added simple api to cache thumbnails

---
 client/ayon_core/pipeline/thumbnails.py | 263 ++++++++++++++++++++++++
 1 file changed, 263 insertions(+)
 create mode 100644 client/ayon_core/pipeline/thumbnails.py

diff --git a/client/ayon_core/pipeline/thumbnails.py b/client/ayon_core/pipeline/thumbnails.py
new file mode 100644
index 0000000000..dbb38615d8
--- /dev/null
+++ b/client/ayon_core/pipeline/thumbnails.py
@@ -0,0 +1,263 @@
+import os
+import time
+import collections
+
+import ayon_api
+
+from ayon_core.lib.local_settings import get_ayon_appdirs
+
+
+FileInfo = collections.namedtuple(
+    "FileInfo",
+    ("path", "size", "modification_time")
+)
+
+
+class ThumbnailsCache:
+    """Cache of thumbnails on local storage.
+
+    Thumbnails are cached to appdirs to predefined directory. Each project has
+    own subfolder with thumbnails -> that's because each project has own
+    thumbnail id validation and file names are thumbnail ids with matching
+    extension. Extensions are predefined (.png and .jpeg).
+
+    Cache has cleanup mechanism which is triggered on initialized by default.
+
+    The cleanup has 2 levels:
+    1. soft cleanup which remove all files that are older then 'days_alive'
+    2. max size cleanup which remove all files until the thumbnails folder
+        contains less then 'max_filesize'
+        - this is time consuming so it's not triggered automatically
+
+    Args:
+        cleanup (bool): Trigger soft cleanup (Cleanup expired thumbnails).
+    """
+
+    # Lifetime of thumbnails (in seconds)
+    # - default 3 days
+    days_alive = 3
+    # Max size of thumbnail directory (in bytes)
+    # - default 2 Gb
+    max_filesize = 2 * 1024 * 1024 * 1024
+
+    def __init__(self, cleanup=True):
+        self._thumbnails_dir = None
+        self._days_alive_secs = self.days_alive * 24 * 60 * 60
+        if cleanup:
+            self.cleanup()
+
+    def get_thumbnails_dir(self):
+        """Root directory where thumbnails are stored.
+
+        Returns:
+            str: Path to thumbnails root.
+        """
+
+        if self._thumbnails_dir is None:
+            self._thumbnails_dir = get_ayon_appdirs("thumbnails")
+        return self._thumbnails_dir
+
+    thumbnails_dir = property(get_thumbnails_dir)
+
+    def get_thumbnails_dir_file_info(self):
+        """Get information about all files in thumbnails directory.
+
+        Returns:
+            List[FileInfo]: List of file information about all files.
+        """
+
+        thumbnails_dir = self.thumbnails_dir
+        files_info = []
+        if not os.path.exists(thumbnails_dir):
+            return files_info
+
+        for root, _, filenames in os.walk(thumbnails_dir):
+            for filename in filenames:
+                path = os.path.join(root, filename)
+                files_info.append(FileInfo(
+                    path, os.path.getsize(path), os.path.getmtime(path)
+                ))
+        return files_info
+
+    def get_thumbnails_dir_size(self, files_info=None):
+        """Got full size of thumbnail directory.
+
+        Args:
+            files_info (List[FileInfo]): Prepared file information about
+                files in thumbnail directory.
+
+        Returns:
+            int: File size of all files in thumbnail directory.
+        """
+
+        if files_info is None:
+            files_info = self.get_thumbnails_dir_file_info()
+
+        if not files_info:
+            return 0
+
+        return sum(
+            file_info.size
+            for file_info in files_info
+        )
+
+    def cleanup(self, check_max_size=False):
+        """Cleanup thumbnails directory.
+
+        Args:
+            check_max_size (bool): Also cleanup files to match max size of
+                thumbnails directory.
+        """
+
+        thumbnails_dir = self.get_thumbnails_dir()
+        # Skip if thumbnails dir does not exist yet
+        if not os.path.exists(thumbnails_dir):
+            return
+
+        self._soft_cleanup(thumbnails_dir)
+        if check_max_size:
+            self._max_size_cleanup(thumbnails_dir)
+
+    def _soft_cleanup(self, thumbnails_dir):
+        current_time = time.time()
+        for root, _, filenames in os.walk(thumbnails_dir):
+            for filename in filenames:
+                path = os.path.join(root, filename)
+                modification_time = os.path.getmtime(path)
+                if current_time - modification_time > self._days_alive_secs:
+                    os.remove(path)
+
+    def _max_size_cleanup(self, thumbnails_dir):
+        files_info = self.get_thumbnails_dir_file_info()
+        size = self.get_thumbnails_dir_size(files_info)
+        if size < self.max_filesize:
+            return
+
+        sorted_file_info = collections.deque(
+            sorted(files_info, key=lambda item: item.modification_time)
+        )
+        diff = size - self.max_filesize
+        while diff > 0:
+            if not sorted_file_info:
+                break
+
+            file_info = sorted_file_info.popleft()
+            diff -= file_info.size
+            os.remove(file_info.path)
+
+    def get_thumbnail_filepath(self, project_name, thumbnail_id):
+        """Get thumbnail by thumbnail id.
+
+        Args:
+            project_name (str): Name of project.
+            thumbnail_id (str): Thumbnail id.
+
+        Returns:
+            Union[str, None]: Path to thumbnail image or None if thumbnail
+                is not cached yet.
+        """
+
+        if not thumbnail_id:
+            return None
+
+        for ext in (
+            ".png",
+            ".jpeg",
+        ):
+            filepath = os.path.join(
+                self.thumbnails_dir, project_name, thumbnail_id + ext
+            )
+            if os.path.exists(filepath):
+                return filepath
+        return None
+
+    def get_project_dir(self, project_name):
+        """Path to root directory for specific project.
+
+        Args:
+            project_name (str): Name of project for which root directory path
+                should be returned.
+
+        Returns:
+            str: Path to root of project's thumbnails.
+        """
+
+        return os.path.join(self.thumbnails_dir, project_name)
+
+    def make_sure_project_dir_exists(self, project_name):
+        project_dir = self.get_project_dir(project_name)
+        if not os.path.exists(project_dir):
+            os.makedirs(project_dir)
+        return project_dir
+
+    def store_thumbnail(self, project_name, thumbnail_id, content, mime_type):
+        """Store thumbnail to cache folder.
+
+        Args:
+            project_name (str): Project where the thumbnail belong to.
+            thumbnail_id (str): Thumbnail id.
+            content (bytes): Byte content of thumbnail file.
+            mime_type (str): Type of content.
+
+        Returns:
+            str: Path to cached thumbnail image file.
+        """
+
+        if mime_type == "image/png":
+            ext = ".png"
+        elif mime_type == "image/jpeg":
+            ext = ".jpeg"
+        else:
+            raise ValueError(
+                "Unknown mime type for thumbnail \"{}\"".format(mime_type))
+
+        project_dir = self.make_sure_project_dir_exists(project_name)
+        thumbnail_path = os.path.join(project_dir, thumbnail_id + ext)
+        with open(thumbnail_path, "wb") as stream:
+            stream.write(content)
+
+        current_time = time.time()
+        os.utime(thumbnail_path, (current_time, current_time))
+
+        return thumbnail_path
+
+
+class _CacheItems:
+    thumbnails_cache = ThumbnailsCache()
+
+
+def get_thumbnail_path(project_name, thumbnail_id):
+    """Get path to thumbnail image.
+
+    Args:
+        project_name (str): Project where thumbnail belongs to.
+        thumbnail_id (Union[str, None]): Thumbnail id.
+
+    Returns:
+        Union[str, None]: Path to thumbnail image or None if thumbnail
+            id is not valid or thumbnail was not possible to receive.
+
+    """
+    if not thumbnail_id:
+        return None
+
+    filepath = _CacheItems.thumbnails_cache.get_thumbnail_filepath(
+        project_name, thumbnail_id
+    )
+    if filepath is not None:
+        return filepath
+
+    # 'ayon_api' had a bug, public function
+    #   'get_thumbnail_by_id' did not return output of
+    #   'ServerAPI' method.
+    con = ayon_api.get_server_api_connection()
+    result = con.get_thumbnail_by_id(project_name, thumbnail_id)
+
+    if result is not None and result.is_valid:
+        return _CacheItems.thumbnails_cache.store_thumbnail(
+            project_name,
+            thumbnail_id,
+            result.content,
+            result.content_type
+        )
+    return None

From 913352cce3445a724fe28a4e1971890ce73720a6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 6 May 2024 12:08:21 +0200
Subject: [PATCH 82/89] use the implementation in common models

---
 .../tools/common_models/thumbnails.py         | 244 +-----------------
 1 file changed, 2 insertions(+), 242 deletions(-)

diff --git a/client/ayon_core/tools/common_models/thumbnails.py b/client/ayon_core/tools/common_models/thumbnails.py
index 6d14783b9a..2fa1e36e5c 100644
--- a/client/ayon_core/tools/common_models/thumbnails.py
+++ b/client/ayon_core/tools/common_models/thumbnails.py
@@ -1,234 +1,15 @@
-import os
-import time
 import collections
 
 import ayon_api
-import appdirs
 
 from ayon_core.lib import NestedCacheItem
-
-FileInfo = collections.namedtuple(
-    "FileInfo",
-    ("path", "size", "modification_time")
-)
-
-
-class ThumbnailsCache:
-    """Cache of thumbnails on local storage.
-
-    Thumbnails are cached to appdirs to predefined directory. Each project has
-    own subfolder with thumbnails -> that's because each project has own
-    thumbnail id validation and file names are thumbnail ids with matching
-    extension. Extensions are predefined (.png and .jpeg).
-
-    Cache has cleanup mechanism which is triggered on initialized by default.
-
-    The cleanup has 2 levels:
-    1. soft cleanup which remove all files that are older then 'days_alive'
-    2. max size cleanup which remove all files until the thumbnails folder
-        contains less then 'max_filesize'
-        - this is time consuming so it's not triggered automatically
-
-    Args:
-        cleanup (bool): Trigger soft cleanup (Cleanup expired thumbnails).
-    """
-
-    # Lifetime of thumbnails (in seconds)
-    # - default 3 days
-    days_alive = 3
-    # Max size of thumbnail directory (in bytes)
-    # - default 2 Gb
-    max_filesize = 2 * 1024 * 1024 * 1024
-
-    def __init__(self, cleanup=True):
-        self._thumbnails_dir = None
-        self._days_alive_secs = self.days_alive * 24 * 60 * 60
-        if cleanup:
-            self.cleanup()
-
-    def get_thumbnails_dir(self):
-        """Root directory where thumbnails are stored.
-
-        Returns:
-            str: Path to thumbnails root.
-        """
-
-        if self._thumbnails_dir is None:
-            # TODO use generic function
-            directory = appdirs.user_data_dir("AYON", "Ynput")
-            self._thumbnails_dir = os.path.join(directory, "thumbnails")
-        return self._thumbnails_dir
-
-    thumbnails_dir = property(get_thumbnails_dir)
-
-    def get_thumbnails_dir_file_info(self):
-        """Get information about all files in thumbnails directory.
-
-        Returns:
-            List[FileInfo]: List of file information about all files.
-        """
-
-        thumbnails_dir = self.thumbnails_dir
-        files_info = []
-        if not os.path.exists(thumbnails_dir):
-            return files_info
-
-        for root, _, filenames in os.walk(thumbnails_dir):
-            for filename in filenames:
-                path = os.path.join(root, filename)
-                files_info.append(FileInfo(
-                    path, os.path.getsize(path), os.path.getmtime(path)
-                ))
-        return files_info
-
-    def get_thumbnails_dir_size(self, files_info=None):
-        """Got full size of thumbnail directory.
-
-        Args:
-            files_info (List[FileInfo]): Prepared file information about
-                files in thumbnail directory.
-
-        Returns:
-            int: File size of all files in thumbnail directory.
-        """
-
-        if files_info is None:
-            files_info = self.get_thumbnails_dir_file_info()
-
-        if not files_info:
-            return 0
-
-        return sum(
-            file_info.size
-            for file_info in files_info
-        )
-
-    def cleanup(self, check_max_size=False):
-        """Cleanup thumbnails directory.
-
-        Args:
-            check_max_size (bool): Also cleanup files to match max size of
-                thumbnails directory.
-        """
-
-        thumbnails_dir = self.get_thumbnails_dir()
-        # Skip if thumbnails dir does not exist yet
-        if not os.path.exists(thumbnails_dir):
-            return
-
-        self._soft_cleanup(thumbnails_dir)
-        if check_max_size:
-            self._max_size_cleanup(thumbnails_dir)
-
-    def _soft_cleanup(self, thumbnails_dir):
-        current_time = time.time()
-        for root, _, filenames in os.walk(thumbnails_dir):
-            for filename in filenames:
-                path = os.path.join(root, filename)
-                modification_time = os.path.getmtime(path)
-                if current_time - modification_time > self._days_alive_secs:
-                    os.remove(path)
-
-    def _max_size_cleanup(self, thumbnails_dir):
-        files_info = self.get_thumbnails_dir_file_info()
-        size = self.get_thumbnails_dir_size(files_info)
-        if size < self.max_filesize:
-            return
-
-        sorted_file_info = collections.deque(
-            sorted(files_info, key=lambda item: item.modification_time)
-        )
-        diff = size - self.max_filesize
-        while diff > 0:
-            if not sorted_file_info:
-                break
-
-            file_info = sorted_file_info.popleft()
-            diff -= file_info.size
-            os.remove(file_info.path)
-
-    def get_thumbnail_filepath(self, project_name, thumbnail_id):
-        """Get thumbnail by thumbnail id.
-
-        Args:
-            project_name (str): Name of project.
-            thumbnail_id (str): Thumbnail id.
-
-        Returns:
-            Union[str, None]: Path to thumbnail image or None if thumbnail
-                is not cached yet.
-        """
-
-        if not thumbnail_id:
-            return None
-
-        for ext in (
-            ".png",
-            ".jpeg",
-        ):
-            filepath = os.path.join(
-                self.thumbnails_dir, project_name, thumbnail_id + ext
-            )
-            if os.path.exists(filepath):
-                return filepath
-        return None
-
-    def get_project_dir(self, project_name):
-        """Path to root directory for specific project.
-
-        Args:
-            project_name (str): Name of project for which root directory path
-                should be returned.
-
-        Returns:
-            str: Path to root of project's thumbnails.
-        """
-
-        return os.path.join(self.thumbnails_dir, project_name)
-
-    def make_sure_project_dir_exists(self, project_name):
-        project_dir = self.get_project_dir(project_name)
-        if not os.path.exists(project_dir):
-            os.makedirs(project_dir)
-        return project_dir
-
-    def store_thumbnail(self, project_name, thumbnail_id, content, mime_type):
-        """Store thumbnail to cache folder.
-
-        Args:
-            project_name (str): Project where the thumbnail belong to.
-            thumbnail_id (str): Id of thumbnail.
-            content (bytes): Byte content of thumbnail file.
-            mime_data (str): Type of content.
-
-        Returns:
-            str: Path to cached thumbnail image file.
-        """
-
-        if mime_type == "image/png":
-            ext = ".png"
-        elif mime_type == "image/jpeg":
-            ext = ".jpeg"
-        else:
-            raise ValueError(
-                "Unknown mime type for thumbnail \"{}\"".format(mime_type))
-
-        project_dir = self.make_sure_project_dir_exists(project_name)
-        thumbnail_path = os.path.join(project_dir, thumbnail_id + ext)
-        with open(thumbnail_path, "wb") as stream:
-            stream.write(content)
-
-        current_time = time.time()
-        os.utime(thumbnail_path, (current_time, current_time))
-
-        return thumbnail_path
+from ayon_core.pipeline.thumbnails import get_thumbnail_path
 
 
 class ThumbnailsModel:
     entity_cache_lifetime = 240  # In seconds
 
     def __init__(self):
-        self._thumbnail_cache = ThumbnailsCache()
         self._paths_cache = collections.defaultdict(dict)
         self._folders_cache = NestedCacheItem(
             levels=2, lifetime=self.entity_cache_lifetime)
@@ -283,28 +64,7 @@ class ThumbnailsModel:
         if thumbnail_id in project_cache:
             return project_cache[thumbnail_id]
 
-        filepath = self._thumbnail_cache.get_thumbnail_filepath(
-            project_name, thumbnail_id
-        )
-        if filepath is not None:
-            project_cache[thumbnail_id] = filepath
-            return filepath
-
-        # 'ayon_api' had a bug, public function
-        #   'get_thumbnail_by_id' did not return output of
-        #   'ServerAPI' method.
-        con = ayon_api.get_server_api_connection()
-        result = con.get_thumbnail_by_id(project_name, thumbnail_id)
-        if result is None:
-            pass
-
-        elif result.is_valid:
-            filepath = self._thumbnail_cache.store_thumbnail(
-                project_name,
-                thumbnail_id,
-                result.content,
-                result.content_type
-            )
+        filepath = get_thumbnail_path(project_name, thumbnail_id)
         project_cache[thumbnail_id] = filepath
         return filepath
 

From 21981205674b7787f457a1134f3fd5b137b52e99 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 6 May 2024 18:27:14 +0800
Subject: [PATCH 83/89] support adding tool group env per task level

---
 .../applications/client/ayon_applications/utils.py        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server_addon/applications/client/ayon_applications/utils.py b/server_addon/applications/client/ayon_applications/utils.py
index 234fa6c683..2487db67ad 100644
--- a/server_addon/applications/client/ayon_applications/utils.py
+++ b/server_addon/applications/client/ayon_applications/utils.py
@@ -281,13 +281,15 @@ def prepare_app_environments(
         app.environment
     ]
 
-    folder_entity = data.get("folder_entity")
+    entity = data.get("task_entity")
+    if not entity:
+        entity = data.get("folder_entity")
     # Add tools environments
     groups_by_name = {}
     tool_by_group_name = collections.defaultdict(dict)
-    if folder_entity:
+    if entity:
         # Make sure each tool group can be added only once
-        for key in folder_entity["attrib"].get("tools") or []:
+        for key in entity["attrib"].get("tools") or []:
             tool = app.manager.tools.get(key)
             if not tool or not tool.is_valid_for_app(app):
                 continue

From 39a3271d0cc5dbca7027a1e67b14c9a5486f6de4 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 6 May 2024 19:02:19 +0800
Subject: [PATCH 84/89] support adding tool group env per task level

---
 .../client/ayon_applications/utils.py         | 64 +++++++++++++------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/server_addon/applications/client/ayon_applications/utils.py b/server_addon/applications/client/ayon_applications/utils.py
index 2487db67ad..751b8c0835 100644
--- a/server_addon/applications/client/ayon_applications/utils.py
+++ b/server_addon/applications/client/ayon_applications/utils.py
@@ -281,28 +281,23 @@ def prepare_app_environments(
         app.environment
     ]
 
-    entity = data.get("task_entity")
-    if not entity:
-        entity = data.get("folder_entity")
+    task_entity = data.get("task_entity")
+    folder_entity = data.get("folder_entity")
     # Add tools environments
     groups_by_name = {}
     tool_by_group_name = collections.defaultdict(dict)
-    if entity:
-        # Make sure each tool group can be added only once
-        for key in entity["attrib"].get("tools") or []:
-            tool = app.manager.tools.get(key)
-            if not tool or not tool.is_valid_for_app(app):
-                continue
-            groups_by_name[tool.group.name] = tool.group
-            tool_by_group_name[tool.group.name][tool.name] = tool
-
-        for group_name in sorted(groups_by_name.keys()):
-            group = groups_by_name[group_name]
-            environments.append(group.environment)
-            for tool_name in sorted(tool_by_group_name[group_name].keys()):
-                tool = tool_by_group_name[group_name][tool_name]
-                environments.append(tool.environment)
-                app_and_tool_labels.append(tool.full_name)
+    if task_entity:
+        groups_by_name, environments, app_and_tool_labels = (
+            get_tool_group_enviornment_by_entities(app, task_entity, groups_by_name,
+                                                   tool_by_group_name, environments,
+                                                    app_and_tool_labels)
+        )
+    elif folder_entity:
+        groups_by_name, environments, app_and_tool_labels = (
+            get_tool_group_enviornment_by_entities(app, folder_entity, groups_by_name,
+                                                   tool_by_group_name, environments,
+                                                   app_and_tool_labels)
+        )
 
     log.debug(
         "Will add environments for apps and tools: {}".format(
@@ -356,6 +351,37 @@ def prepare_app_environments(
         data["env"].pop(key, None)
 
 
+def get_tool_group_enviornment_by_entities(app, entity, groups_by_name,
+                                           tool_by_group_name, environments,
+                                           app_and_tool_labels):
+    """Function to get tool group environment by entities
+
+    Args:
+        app (dict): application
+        entity (dict): entity
+        groups_by_name (dict): group by name
+        tool_by_group_name (dict): tools by group name
+        environments (list): enviornments
+        app_and_tool_labels (list): full name of the application
+    """
+    # Make sure each tool group can be added only once
+    for key in entity["attrib"].get("tools") or []:
+        tool = app.manager.tools.get(key)
+        if not tool or not tool.is_valid_for_app(app):
+            continue
+        groups_by_name[tool.group.name] = tool.group
+        tool_by_group_name[tool.group.name][tool.name] = tool
+
+    for group_name in sorted(groups_by_name.keys()):
+        group = groups_by_name[group_name]
+        environments.append(group.environment)
+        for tool_name in sorted(tool_by_group_name[group_name].keys()):
+            tool = tool_by_group_name[group_name][tool_name]
+            environments.append(tool.environment)
+            app_and_tool_labels.append(tool.full_name)
+    return groups_by_name, environments, app_and_tool_labels
+
+
 def apply_project_environments_value(
     project_name, env, project_settings=None, env_group=None
 ):

From e669ac7ab231b6114d8d289c505af8aaa2a4f65e Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 6 May 2024 19:04:51 +0800
Subject: [PATCH 85/89] support adding tool group env per task level

---
 .../client/ayon_applications/utils.py         | 60 ++++++-------------
 1 file changed, 18 insertions(+), 42 deletions(-)

diff --git a/server_addon/applications/client/ayon_applications/utils.py b/server_addon/applications/client/ayon_applications/utils.py
index 751b8c0835..e05bbee1ca 100644
--- a/server_addon/applications/client/ayon_applications/utils.py
+++ b/server_addon/applications/client/ayon_applications/utils.py
@@ -287,17 +287,24 @@ def prepare_app_environments(
     groups_by_name = {}
     tool_by_group_name = collections.defaultdict(dict)
     if task_entity:
-        groups_by_name, environments, app_and_tool_labels = (
-            get_tool_group_enviornment_by_entities(app, task_entity, groups_by_name,
-                                                   tool_by_group_name, environments,
-                                                    app_and_tool_labels)
-        )
-    elif folder_entity:
-        groups_by_name, environments, app_and_tool_labels = (
-            get_tool_group_enviornment_by_entities(app, folder_entity, groups_by_name,
-                                                   tool_by_group_name, environments,
-                                                   app_and_tool_labels)
-        )
+        # Make sure each tool group can be added only once
+        tools_group_by_entity = task_entity["attrib"].get("tools")
+        if folder_entity and not tools_group_by_entity:
+            tools_group_by_entity = folder_entity["attrib"].get("tools")
+        for key in tools_group_by_entity or []:
+            tool = app.manager.tools.get(key)
+            if not tool or not tool.is_valid_for_app(app):
+                continue
+            groups_by_name[tool.group.name] = tool.group
+            tool_by_group_name[tool.group.name][tool.name] = tool
+
+        for group_name in sorted(groups_by_name.keys()):
+            group = groups_by_name[group_name]
+            environments.append(group.environment)
+            for tool_name in sorted(tool_by_group_name[group_name].keys()):
+                tool = tool_by_group_name[group_name][tool_name]
+                environments.append(tool.environment)
+                app_and_tool_labels.append(tool.full_name)
 
     log.debug(
         "Will add environments for apps and tools: {}".format(
@@ -351,37 +358,6 @@ def prepare_app_environments(
         data["env"].pop(key, None)
 
 
-def get_tool_group_enviornment_by_entities(app, entity, groups_by_name,
-                                           tool_by_group_name, environments,
-                                           app_and_tool_labels):
-    """Function to get tool group environment by entities
-
-    Args:
-        app (dict): application
-        entity (dict): entity
-        groups_by_name (dict): group by name
-        tool_by_group_name (dict): tools by group name
-        environments (list): enviornments
-        app_and_tool_labels (list): full name of the application
-    """
-    # Make sure each tool group can be added only once
-    for key in entity["attrib"].get("tools") or []:
-        tool = app.manager.tools.get(key)
-        if not tool or not tool.is_valid_for_app(app):
-            continue
-        groups_by_name[tool.group.name] = tool.group
-        tool_by_group_name[tool.group.name][tool.name] = tool
-
-    for group_name in sorted(groups_by_name.keys()):
-        group = groups_by_name[group_name]
-        environments.append(group.environment)
-        for tool_name in sorted(tool_by_group_name[group_name].keys()):
-            tool = tool_by_group_name[group_name][tool_name]
-            environments.append(tool.environment)
-            app_and_tool_labels.append(tool.full_name)
-    return groups_by_name, environments, app_and_tool_labels
-
-
 def apply_project_environments_value(
     project_name, env, project_settings=None, env_group=None
 ):

From d6ae1db1b64becb58ac4daef9f2a01fbdbdde707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Mon, 6 May 2024 13:43:14 +0200
Subject: [PATCH 86/89] :recycle: refactor var name and the logic a little bit

---
 client/ayon_core/pipeline/create/context.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py
index e66e15b8b1..dd005d250c 100644
--- a/client/ayon_core/pipeline/create/context.py
+++ b/client/ayon_core/pipeline/create/context.py
@@ -1988,16 +1988,12 @@ class CreateContext:
                 )
 
         if task_entity is None:
-            task_name = self.get_current_task_name()
-            if task_name:
+            current_task_name = self.get_current_task_name()
+            if current_task_name:
                 task_entity = ayon_api.get_task_by_name(
-                    project_name, folder_entity["id"], task_name
+                    project_name, folder_entity["id"], current_task_name
                 )
 
-        task_name = None
-        if task_entity:
-            task_name = task_entity["name"]
-
         if pre_create_data is None:
             pre_create_data = {}
 
@@ -2022,11 +2018,10 @@ class CreateContext:
 
         instance_data = {
             "folderPath": folder_entity["path"],
-            "task": task_name,
+            "task": task_entity["name"] if task_entity else None,
             "productType": creator.product_type,
             "variant": variant
         }
-        print("Create instance data", instance_data)
         return creator.create(
             product_name,
             instance_data,

From 037edc37225b92aae47cb557fa19702d1cef3142 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 6 May 2024 20:01:17 +0800
Subject: [PATCH 87/89] code tweak -Jakub's comment

---
 .../applications/client/ayon_applications/utils.py  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server_addon/applications/client/ayon_applications/utils.py b/server_addon/applications/client/ayon_applications/utils.py
index e05bbee1ca..185779a949 100644
--- a/server_addon/applications/client/ayon_applications/utils.py
+++ b/server_addon/applications/client/ayon_applications/utils.py
@@ -286,12 +286,15 @@ def prepare_app_environments(
     # Add tools environments
     groups_by_name = {}
     tool_by_group_name = collections.defaultdict(dict)
+    tools = None
     if task_entity:
-        # Make sure each tool group can be added only once
-        tools_group_by_entity = task_entity["attrib"].get("tools")
-        if folder_entity and not tools_group_by_entity:
-            tools_group_by_entity = folder_entity["attrib"].get("tools")
-        for key in tools_group_by_entity or []:
+        tools = task_entity["attrib"].get("tools")
+
+    if tools is None and folder_entity:
+        tools = folder_entity["attrib"].get("tools")
+
+    if tools:
+        for key in tools:
             tool = app.manager.tools.get(key)
             if not tool or not tool.is_valid_for_app(app):
                 continue

From f828f5a767321ca37954bacf7db66378cef557f3 Mon Sep 17 00:00:00 2001
From: Kayla Man <moonyuet2008@hotmail.com>
Date: Mon, 6 May 2024 23:27:15 +0800
Subject: [PATCH 88/89] upgrade the patch version

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

diff --git a/server_addon/applications/package.py b/server_addon/applications/package.py
index 500f609fc6..983749355e 100644
--- a/server_addon/applications/package.py
+++ b/server_addon/applications/package.py
@@ -1,6 +1,6 @@
 name = "applications"
 title = "Applications"
-version = "0.2.1"
+version = "0.2.2"
 
 ayon_server_version = ">=1.0.7"
 ayon_launcher_version = ">=1.0.2"

From 5c46ae9e62989778cfe39f0c127e8f3a0f35d832 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Mon, 6 May 2024 16:59:24 +0100
Subject: [PATCH 89/89] Fix deselect all function with context override

---
 client/ayon_core/hosts/blender/api/plugin.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/hosts/blender/api/plugin.py b/client/ayon_core/hosts/blender/api/plugin.py
index 6c9bfb6569..4a13d16805 100644
--- a/client/ayon_core/hosts/blender/api/plugin.py
+++ b/client/ayon_core/hosts/blender/api/plugin.py
@@ -143,13 +143,19 @@ def deselect_all():
         if obj.mode != 'OBJECT':
             modes.append((obj, obj.mode))
             bpy.context.view_layer.objects.active = obj
-            bpy.ops.object.mode_set(mode='OBJECT')
+            context_override = create_blender_context(active=obj)
+            with bpy.context.temp_override(**context_override):
+                bpy.ops.object.mode_set(mode='OBJECT')
 
-    bpy.ops.object.select_all(action='DESELECT')
+    context_override = create_blender_context()
+    with bpy.context.temp_override(**context_override):
+        bpy.ops.object.select_all(action='DESELECT')
 
     for p in modes:
         bpy.context.view_layer.objects.active = p[0]
-        bpy.ops.object.mode_set(mode=p[1])
+        context_override = create_blender_context(active=p[0])
+        with bpy.context.temp_override(**context_override):
+            bpy.ops.object.mode_set(mode=p[1])
 
     bpy.context.view_layer.objects.active = active