From afdb5a8f59d252d0f9f6938896820472ad15b891 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Wed, 7 Jul 2021 19:17:34 +0200 Subject: [PATCH 1/4] add pluginInfo and jobInfo custom settings --- .../plugins/publish/submit_maya_deadline.py | 19 +++++++++++++++++++ .../defaults/project_settings/maya.json | 4 ++++ .../schemas/schema_maya_publish.json | 18 ++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index a5841f406cf..0e096412008 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -271,6 +271,21 @@ def process(self, instance): ["DEADLINE_REST_URL"] ) + self._job_info = ( + context.data["project_settings"] + ["maya"] + ["publish"] + ["deadline"] + ["jobInfo"] + ) + self._plugin_info = ( + context.data["project_settings"] + ["maya"] + ["publish"] + ["deadline"] + ["pluginInfo"] + ) + assert self._deadline_url, "Requires DEADLINE_REST_URL" context = instance.context @@ -536,6 +551,10 @@ def process(self, instance): self.preflight_check(instance) + # add jobInfo and pluginInfo variables from Settings + payload["JobInfo"].update(self._job_info) + payload["PluginInfo"].update(self._plugin_info) + # Prepare tiles data ------------------------------------------------ if instance.data.get("tileRendering"): # if we have sequence of files, we need to create tile job for diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 284a1a00409..62d8a74670b 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -391,6 +391,10 @@ } } }, + "deadline": { + "jobInfo": {}, + "pluginInfo": {} + }, "ExtractCameraAlembic": { "enabled": true, "optional": true, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 5ca7059ee54..7e50682f5dc 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -309,6 +309,24 @@ "type": "schema", "name": "schema_maya_capture" }, + { + "type": "dict", + "collapsible": true, + "key": "deadline", + "label": "Additional Deadline Settings", + "children": [ + { + "type": "raw-json", + "key": "jobInfo", + "label": "Additional JobInfo data" + }, + { + "type": "raw-json", + "key": "pluginInfo", + "label": "Additional PluginInfo data" + } + ] + }, { "type": "dict", "collapsible": true, From 4b2aba2f450dfc1a9a46142d8b6df441ac8bd2f6 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Mon, 12 Jul 2021 12:59:19 +0200 Subject: [PATCH 2/4] change settings retrieval --- .../plugins/publish/submit_maya_deadline.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index 0e096412008..c0c39a52b60 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -272,18 +272,19 @@ def process(self, instance): ) self._job_info = ( - context.data["project_settings"] - ["maya"] - ["publish"] - ["deadline"] - ["jobInfo"] + context.data["project_settings"].get( + "maya", {}).get( + "publish", {}).get( + "deadline", {}).get( + "jobInfo", {}) ) + self._plugin_info = ( - context.data["project_settings"] - ["maya"] - ["publish"] - ["deadline"] - ["pluginInfo"] + context.data["project_settings"].get( + "maya", {}).get( + "publish", {}).get( + "deadline", {}).get( + "pluginInfo", {}) ) assert self._deadline_url, "Requires DEADLINE_REST_URL" From 0551d76fb6ad74e38de35ada406e41c1acb614c7 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Mon, 12 Jul 2021 13:16:38 +0200 Subject: [PATCH 3/4] move settings to deadline --- .../plugins/publish/submit_maya_deadline.py | 8 ++++---- .../defaults/project_settings/deadline.json | 14 ++++++++++---- .../defaults/project_settings/maya.json | 4 ---- .../schema_project_deadline.json | 10 ++++++++++ .../schemas/schema_maya_publish.json | 18 ------------------ 5 files changed, 24 insertions(+), 30 deletions(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index c0c39a52b60..5cb6dbbd88b 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -273,17 +273,17 @@ def process(self, instance): self._job_info = ( context.data["project_settings"].get( - "maya", {}).get( - "publish", {}).get( "deadline", {}).get( + "publish", {}).get( + "MayaSubmitDeadline", {}).get( "jobInfo", {}) ) self._plugin_info = ( context.data["project_settings"].get( - "maya", {}).get( - "publish", {}).get( "deadline", {}).get( + "publish", {}).get( + "MayaSubmitDeadline", {}).get( "pluginInfo", {}) ) diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json index 5861015f2cb..2dba20d63c7 100644 --- a/openpype/settings/defaults/project_settings/deadline.json +++ b/openpype/settings/defaults/project_settings/deadline.json @@ -3,9 +3,13 @@ "ValidateExpectedFiles": { "enabled": true, "active": true, - "families": ["render"], - "targets": ["deadline"], - "allow_user_override": true + "allow_user_override": true, + "families": [ + "render" + ], + "targets": [ + "deadline" + ] }, "MayaSubmitDeadline": { "enabled": true, @@ -15,7 +19,9 @@ "use_published": true, "asset_dependencies": true, "group": "none", - "limit": [] + "limit": [], + "jobInfo": {}, + "pluginInfo": {} }, "NukeSubmitDeadline": { "enabled": true, diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json index 62d8a74670b..284a1a00409 100644 --- a/openpype/settings/defaults/project_settings/maya.json +++ b/openpype/settings/defaults/project_settings/maya.json @@ -391,10 +391,6 @@ } } }, - "deadline": { - "jobInfo": {}, - "pluginInfo": {} - }, "ExtractCameraAlembic": { "enabled": true, "optional": 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 3281c9ce4dd..27eeaef5591 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json @@ -108,6 +108,16 @@ "key": "limit", "label": "Limit Groups", "object_type": "text" + }, + { + "type": "raw-json", + "key": "jobInfo", + "label": "Additional JobInfo data" + }, + { + "type": "raw-json", + "key": "pluginInfo", + "label": "Additional PluginInfo data" } ] }, diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json index 7e50682f5dc..5ca7059ee54 100644 --- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json +++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json @@ -309,24 +309,6 @@ "type": "schema", "name": "schema_maya_capture" }, - { - "type": "dict", - "collapsible": true, - "key": "deadline", - "label": "Additional Deadline Settings", - "children": [ - { - "type": "raw-json", - "key": "jobInfo", - "label": "Additional JobInfo data" - }, - { - "type": "raw-json", - "key": "pluginInfo", - "label": "Additional PluginInfo data" - } - ] - }, { "type": "dict", "collapsible": true, From 4d96cdc7200808c6accbb190e4ffea3f59a74cd6 Mon Sep 17 00:00:00 2001 From: Ondrej Samohel Date: Mon, 12 Jul 2021 13:34:19 +0200 Subject: [PATCH 4/4] fix check for Group defaults --- .../modules/deadline/plugins/publish/submit_maya_deadline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py index 5cb6dbbd88b..a652da77865 100644 --- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -423,7 +423,7 @@ def process(self, instance): self.payload_skeleton["JobInfo"]["Priority"] = \ self._instance.data.get("priority", 50) - if self.group != "none": + if self.group != "none" and self.group: self.payload_skeleton["JobInfo"]["Group"] = self.group if self.limit_groups: