-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1905 from pypeclub/feature/maya-multiple-deadline…
…-servers
- Loading branch information
Showing
20 changed files
with
476 additions
and
175 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
openpype/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
# -*- coding: utf-8 -*- | ||
"""Collect Deadline servers from instance. | ||
This is resolving index of server lists stored in `deadlineServers` instance | ||
attribute or using default server if that attribute doesn't exists. | ||
""" | ||
import pyblish.api | ||
|
||
|
||
class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin): | ||
"""Collect Deadline Webservice URL from instance.""" | ||
|
||
order = pyblish.api.CollectorOrder | ||
label = "Deadline Webservice from the Instance" | ||
families = ["rendering"] | ||
|
||
def process(self, instance): | ||
instance.data["deadlineUrl"] = self._collect_deadline_url(instance) | ||
self.log.info( | ||
"Using {} for submission.".format(instance.data["deadlineUrl"])) | ||
|
||
@staticmethod | ||
def _collect_deadline_url(render_instance): | ||
# type: (pyblish.api.Instance) -> str | ||
"""Get Deadline Webservice URL from render instance. | ||
This will get all configured Deadline Webservice URLs and create | ||
subset of them based upon project configuration. It will then take | ||
`deadlineServers` from render instance that is now basically `int` | ||
index of that list. | ||
Args: | ||
render_instance (pyblish.api.Instance): Render instance created | ||
by Creator in Maya. | ||
Returns: | ||
str: Selected Deadline Webservice URL. | ||
""" | ||
|
||
deadline_settings = ( | ||
render_instance.context.data | ||
["system_settings"] | ||
["modules"] | ||
["deadline"] | ||
) | ||
|
||
try: | ||
default_servers = deadline_settings["deadline_urls"] | ||
project_servers = ( | ||
render_instance.context.data | ||
["project_settings"] | ||
["deadline"] | ||
["deadline_servers"] | ||
) | ||
deadline_servers = { | ||
k: default_servers[k] | ||
for k in project_servers | ||
if k in default_servers | ||
} | ||
|
||
except AttributeError: | ||
# Handle situation were we had only one url for deadline. | ||
return render_instance.context.data["defaultDeadline"] | ||
|
||
return deadline_servers[ | ||
list(deadline_servers.keys())[ | ||
int(render_instance.data.get("deadlineServers")) | ||
] | ||
] |
21 changes: 21 additions & 0 deletions
21
openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# -*- coding: utf-8 -*- | ||
"""Collect default Deadline server.""" | ||
import pyblish.api | ||
|
||
|
||
class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin): | ||
"""Collect default Deadline Webservice URL.""" | ||
|
||
order = pyblish.api.CollectorOrder + 0.01 | ||
label = "Default Deadline Webservice" | ||
|
||
def process(self, context): | ||
try: | ||
deadline_module = context.data.get("openPypeModules")["deadline"] | ||
except AttributeError: | ||
self.log.error("Cannot get OpenPype Deadline module.") | ||
raise AssertionError("OpenPype Deadline module not found.") | ||
|
||
# get default deadline webservice url from deadline module | ||
self.log.debug(deadline_module.deadline_urls) | ||
context.data["defaultDeadline"] = deadline_module.deadline_urls["default"] # noqa: E501 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 11 additions & 14 deletions
25
openpype/modules/deadline/plugins/publish/validate_deadline_connection.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.