From 5162d8e4074ff46143558984f98283f5208720c4 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Fri, 24 Nov 2023 12:20:38 +0000
Subject: [PATCH] Added Delay option

---
 .../deadline/plugins/publish/submit_blender_deadline.py     | 6 ++++++
 openpype/settings/defaults/project_settings/deadline.json   | 3 ++-
 .../schemas/projects_schema/schema_project_deadline.json    | 5 +++++
 server_addon/deadline/server/settings/publish_plugins.py    | 4 +++-
 server_addon/deadline/server/version.py                     | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
index e1bf5c074a..4c04b4a9c4 100644
--- a/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -40,6 +40,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
     jobInfo = {}
     pluginInfo = {}
     group = None
+    job_delay = "00:00:00:00"
 
     def get_job_info(self):
         job_info = DeadlineJobInfo(Plugin="Blender")
@@ -91,6 +92,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
         job_info.Comment = context.data.get("comment")
         job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
         job_info.Priority = attr_values.get("priority", self.priority)
+        job_info.JobDelay = attr_values.get("job_delay", self.job_delay)
 
         # Add options from RenderGlobals
         render_globals = instance.data.get("renderGlobals", {})
@@ -212,6 +214,10 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             TextDef("group",
                     default=cls.group,
                     label="Group Name"),
+
+            TextDef("job_delay",
+                    default=cls.job_delay,
+                    label="Job Delay"),
         ])
 
         return defs
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index 2c5e0dc65d..50dd5367da 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -107,7 +107,8 @@
             "use_published": true,
             "priority": 50,
             "chunk_size": 10,
-            "group": "none"
+            "group": "none",
+            "job_delay": "00:00:00:00"
         },
         "ProcessSubmittedJobOnFarm": {
             "enabled": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 64db852c89..a3408e9871 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -581,6 +581,11 @@
                             "type": "text",
                             "key": "group",
                             "label": "Group Name"
+                        },
+                        {
+                            "type": "text",
+                            "key": "job_delay",
+                            "label": "Delay job (timecode dd:hh:mm:ss)"
                         }
                     ]
                 },
diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
index 54b7ff57c1..1d8b8c4eb2 100644
--- a/server_addon/deadline/server/settings/publish_plugins.py
+++ b/server_addon/deadline/server/settings/publish_plugins.py
@@ -237,6 +237,7 @@ class BlenderSubmitDeadlineModel(BaseSettingsModel):
     priority: int = Field(title="Priority")
     chunk_size: int = Field(title="Frame per Task")
     group: str = Field("", title="Group Name")
+    job_delay: str = Field("", title="Delay job (timecode dd:hh:mm:ss)")
 
 
 class AOVFilterSubmodel(BaseSettingsModel):
@@ -424,7 +425,8 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
         "use_published": True,
         "priority": 50,
         "chunk_size": 10,
-        "group": "none"
+        "group": "none",
+        "job_delay": "00:00:00:00"
     },
     "ProcessSubmittedJobOnFarm": {
         "enabled": True,
diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
index ae7362549b..bbab0242f6 100644
--- a/server_addon/deadline/server/version.py
+++ b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"