From 6e487c6739eb9bf48fe49444f8caf47b837e41dd Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 10 Jun 2024 17:01:11 +0200 Subject: [PATCH 1/2] Move auth and verify to submit only submit requires these two arguments, if one needs to override process_submission, they can get auth and verify themselves. --- .../client/ayon_deadline/abstract_submit_deadline.py | 10 ++++++---- .../plugins/publish/submit_blender_deadline.py | 4 ++-- .../plugins/publish/submit_max_deadline.py | 4 ++-- .../plugins/publish/submit_maya_deadline.py | 8 +++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py b/server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py index 564966b6a0..ba50aaccf7 100644 --- a/server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py @@ -454,9 +454,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin, self.plugin_info = self.get_plugin_info() self.aux_files = self.get_aux_files() - auth = instance.data["deadline"]["auth"] - verify = instance.data["deadline"]["verify"] - job_id = self.process_submission(auth, verify) + job_id = self.process_submission() self.log.info("Submitted job to Deadline: {}.".format(job_id)) # TODO: Find a way that's more generic and not render type specific @@ -469,10 +467,12 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin, job_info=render_job_info, plugin_info=render_plugin_info ) + auth = instance.data["deadline"]["auth"] + verify = instance.data["deadline"]["verify"] render_job_id = self.submit(payload, auth, verify) self.log.info("Render job id: %s", render_job_id) - def process_submission(self, auth=None, verify=True): + def process_submission(self): """Process data for submission. This takes Deadline JobInfo, PluginInfo, AuxFile, creates payload @@ -483,6 +483,8 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin, """ payload = self.assemble_payload() + auth = self._instance.data["deadline"]["auth"] + verify = self._instance.data["deadline"]["verify"] return self.submit(payload, auth, verify) @abstractmethod diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py index a5e2398838..28bcc1e080 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py @@ -175,8 +175,8 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, instance.data["toBeRenderedOn"] = "deadline" payload = self.assemble_payload() - auth = instance.data["deadline"]["auth"] - verify = instance.data["deadline"]["verify"] + auth = self._instance.data["deadline"]["auth"] + verify = self._instance.data["deadline"]["verify"] return self.submit(payload, auth=auth, verify=verify) def from_published_scene(self): diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py index 61d02c9b54..a287630dc5 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py @@ -182,8 +182,8 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, self.log.debug("Submitting 3dsMax render..") project_settings = instance.context.data["project_settings"] - auth = instance.data["deadline"]["auth"] - verify = instance.data["deadline"]["verify"] + auth = self._instance.data["deadline"]["auth"] + verify = self._instance.data["deadline"]["verify"] if instance.data.get("multiCamera"): self.log.debug("Submitting jobs for multiple cameras..") payload = self._use_published_name_for_multiples( diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py index 957146cb79..53362514f1 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py @@ -294,7 +294,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, return plugin_payload - def process_submission(self, auth=None, verify=True): + def process_submission(self): from maya import cmds instance = self._instance @@ -331,10 +331,11 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, for x in ['vrayscene', 'assscene']), ( "Vray Scene and Ass Scene options are mutually exclusive") + auth = self._instance.data["deadline"]["auth"] + verify = self._instance.data["deadline"]["verify"] 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, auth=auth, verify=verify) @@ -459,7 +460,8 @@ 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.data["deadline"]["auth"]) + instance.data["deadline"]["auth"], + instance.data["deadline"]["verify"]) frame_tile_job_id[frame] = job_id # Define assembly payloads From 7ea8d42d96379df3a138affd5b22e9faf26bdf93 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 11 Jun 2024 13:29:08 +0200 Subject: [PATCH 2/2] Used variables --- .../plugins/publish/submit_maya_deadline.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py index 53362514f1..beed19e007 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py @@ -410,6 +410,9 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, files = exp assembly_files = files + auth = instance.data["deadline"]["auth"] + verify = instance.data["deadline"]["verify"] + # Define frame tile jobs frame_file_hash = {} frame_payloads = {} @@ -459,9 +462,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, - instance.data["deadline"]["auth"], - instance.data["deadline"]["verify"]) + job_id = self.submit( + tile_job_payload, auth, verify) frame_tile_job_id[frame] = job_id # Define assembly payloads @@ -564,8 +566,6 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, # Submit assembly jobs assembly_job_ids = [] num_assemblies = len(assembly_payloads) - auth = instance.data["deadline"]["auth"] - verify = instance.data["deadline"]["verify"] for i, payload in enumerate(assembly_payloads): self.log.debug( "submitting assembly job {} of {}".format(i + 1,