From 5aaf8eb18a021b76249c561d499e3e664c983886 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 23 Feb 2023 16:13:10 +0100
Subject: [PATCH] nuke: publishing with new settings

---
 .../hosts/nuke/plugins/publish/collect_writes.py | 16 ++++++++--------
 .../plugins/publish/submit_nuke_deadline.py      | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 3054e5a30c..0aa044f06d 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -132,14 +132,14 @@ class CollectNukeWrites(pyblish.api.InstancePlugin):
             self.log.info("Publishing rendered frames ...")
 
         elif render_target == "farm":
-            farm_priority = creator_attributes.get("farm_priority")
-            farm_chunk = creator_attributes.get("farm_chunk")
-            farm_concurency = creator_attributes.get("farm_concurency")
-            instance.data.update({
-                "deadlineChunkSize": farm_chunk or 1,
-                "deadlinePriority": farm_priority or 50,
-                "deadlineConcurrentTasks": farm_concurency or 0
-            })
+            farm_keys = ["farm_chunk", "farm_priority", "farm_concurrency"]
+            for key in farm_keys:
+                # Skip if key is not in creator attributes
+                if key not in creator_attributes:
+                    continue
+                # Add farm attributes to instance
+                instance.data[key] = creator_attributes[key]
+
             # Farm rendering
             instance.data["transfer"] = False
             instance.data["farm"] = True
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index faa66effbd..0f8c69629e 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -162,16 +162,16 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
             pass
 
         # define chunk and priority
-        chunk_size = instance.data["deadlineChunkSize"]
-        if chunk_size == 0 and self.chunk_size:
+        chunk_size = instance.data.get("farm_chunk")
+        if not chunk_size:
             chunk_size = self.chunk_size
 
         # define chunk and priority
-        concurrent_tasks = instance.data["deadlineConcurrentTasks"]
-        if concurrent_tasks == 0 and self.concurrent_tasks:
+        concurrent_tasks = instance.data.get("farm_concurrency")
+        if not concurrent_tasks:
             concurrent_tasks = self.concurrent_tasks
 
-        priority = instance.data["deadlinePriority"]
+        priority = instance.data.get("farm_priority")
         if not priority:
             priority = self.priority