Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for multiple deadline servers 🖥️🖥️🖥️

Browse source
This commit is contained in:
Ondrej Samohel 2021-08-05 17:54:58 +02:00 • committed by Ondřej Samohel
parent 5b8387e23e
commit 6a3992a3e1
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
16 changed files with 274 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openpype/modules/deadline/deadline_module.py
View file

@ -10,7 +10,15 @@ class DeadlineModule(PypeModule, IPluginPaths):
# This module is always enabled
deadline_settings = modules_settings[self.name]
self.enabled = deadline_settings["enabled"]
self.deadline_url = deadline_settings["DEADLINE_REST_URL"]
deadline_url = deadline_settings.get("DEADLINE_REST_URL")
if not deadline_url:
deadline_url = deadline_settings.get("deadline_urls", {}).get("default") # noqa: E501
if not deadline_url:
self.enabled = False
self.log.warning(("default Deadline Webservice URL "
"not specified. Disabling module."))
return
self.deadline_url = deadline_url
def get_global_environments(self):
"""Deadline global environments for OpenPype implementation."""

16
openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
View file

@ -36,6 +36,7 @@ from avalon import api
import pyblish.api
from openpype.hosts.maya.api import lib
from openpype.modules import ModulesManager
# Documentation for keys available at:
# https://docs.thinkboxsoftware.com
@ -264,12 +265,15 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
self._instance = instance
self.payload_skeleton = copy.deepcopy(payload_skeleton_template)
self._deadline_url = (
context.data["system_settings"]
["modules"]
["deadline"]
["DEADLINE_REST_URL"]
)
manager = ModulesManager()
deadline_module = manager.modules_by_name["deadline"]
# get default deadline webservice url from deadline module
self.deadline_url = deadline_module.deadline_url
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
self.deadline_url = instance.data.get("deadlineUrl")
assert self.deadline_url, "Requires Deadline Webservice URL"
self._job_info = (
context.data["project_settings"].get(

16
openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
View file

@ -4,6 +4,7 @@ import getpass
from avalon import api
from avalon.vendor import requests
from openpype.modules import ModulesManager
import re
import pyblish.api
import nuke
@ -42,13 +43,14 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
node = instance[0]
context = instance.context
deadline_url = (
context.data["system_settings"]
["modules"]
["deadline"]
["DEADLINE_REST_URL"]
)
assert deadline_url, "Requires DEADLINE_REST_URL"
manager = ModulesManager()
deadline_module = manager.modules_by_name["deadline"]
# get default deadline webservice url from deadline module
self.deadline_url = deadline_module.deadline_url
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
self.deadline_url = instance.data.get("deadlineUrl")
assert self.deadline_url, "Requires Deadline Webservice URL"
self.deadline_url = "{}/api/jobs".format(deadline_url)
self._comment = context.data.get("comment", "")

23
openpype/modules/deadline/plugins/publish/submit_publish_job.py
View file

@ -5,7 +5,7 @@ import os
import json
import re
from copy import copy, deepcopy
import sys
from openpype.modules import ModulesManager
import openpype.api
from avalon import api, io
@ -615,14 +615,16 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
instance["families"] = families
def process(self, instance):
# type: (pyblish.api.Instance) -> None
"""Process plugin.
Detect type of renderfarm submission and create and post dependend job
in case of Deadline. It creates json file with metadata needed for
publishing in directory of render.
:param instance: Instance data
:type instance: dict
Args:
instance (pyblish.api.Instance): Instance data.
"""
data = instance.data.copy()
context = instance.context
@ -908,13 +910,14 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
}
if submission_type == "deadline":
self.deadline_url = (
context.data["system_settings"]
["modules"]
["deadline"]
["DEADLINE_REST_URL"]
)
assert self.deadline_url, "Requires DEADLINE_REST_URL"
manager = ModulesManager()
deadline_module = manager.modules_by_name["deadline"]
# get default deadline webservice url from deadline module
self.deadline_url = deadline_module.deadline_url
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
self.deadline_url = instance.data.get("deadlineUrl")
assert self.deadline_url, "Requires Deadline Webservice URL"
self._submit_deadline_post_job(instance, render_job, instances)

27
openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
View file

@ -1,11 +1,11 @@
import pyblish.api
from avalon.vendor import requests
from openpype.plugin import contextplugin_should_run
from openpype.modules import ModulesManager
import os
class ValidateDeadlineConnection(pyblish.api.ContextPlugin):
class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
"""Validate Deadline Web Service is running"""
label = "Validate Deadline Web Service"
@ -13,18 +13,19 @@ class ValidateDeadlineConnection(pyblish.api.ContextPlugin):
hosts = ["maya", "nuke"]
families = ["renderlayer"]
def process(self, context):
def process(self, instance):
# Workaround bug pyblish-base#250
if not contextplugin_should_run(self, context):
return
deadline_url = (
context.data["system_settings"]
["modules"]
["deadline"]
["DEADLINE_REST_URL"]
)
manager = ModulesManager()
deadline_module = manager.modules_by_name["deadline"]
# get default deadline webservice url from deadline module
deadline_url = deadline_module.deadline_url
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
deadline_url = instance.data.get("deadlineUrl")
self.log.info(
"We have deadline URL on instance {}".format(
deadline_url))
assert deadline_url, "Requires Deadline Webservice URL"
# Check response
response = self._requests_get(deadline_url)

17
openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
View file

@ -4,9 +4,9 @@ import pyblish.api
from avalon.vendor import requests
from openpype.api import get_system_settings
from openpype.lib.abstract_submit_deadline import requests_get
from openpype.lib.delivery import collect_frames
from openpype.modules import ModulesManager
class ValidateExpectedFiles(pyblish.api.InstancePlugin):
@ -129,13 +129,14 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
Might be different than job info saved in metadata.json if user
manually changes job pre/during rendering.
"""
deadline_url = (
get_system_settings()
["modules"]
["deadline"]
["DEADLINE_REST_URL"]
)
assert deadline_url, "Requires DEADLINE_REST_URL"
manager = ModulesManager()
deadline_module = manager.modules_by_name["deadline"]
# get default deadline webservice url from deadline module
deadline_url = deadline_module.deadline_url
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
deadline_url = instance.data.get("deadlineUrl")
assert deadline_url, "Requires Deadline Webservice URL"
url = "{}/api/jobs?JobID={}".format(deadline_url, job_id)
try: