Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 05:42:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AY-745 - refactored format of credentials

Browse source 
Now on instance, in `deadline` dictionary
This commit is contained in:
Petr Kalis 2024-03-26 13:49:20 +01:00
parent 7cf416dc7e
commit 6faa5acdf7
7 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
View file

@ -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):
"""

10
client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
View file

@ -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)

6
client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
View file

@ -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.

8
client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
View file

@ -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

5
client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
View file

@ -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)

5
client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
View file

@ -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:

14
client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
View file

@ -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 = {