Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

few bugs and cosmetics

Browse source
This commit is contained in:
Ondřej Samohel 2020-11-06 18:54:05 +01:00
parent 739baf70f5
commit 79eb50c656
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
3 changed files with 81 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

47
pype/lib/abstract_collect_render.py
View file

@ -34,45 +34,52 @@ class RenderInstance(object):
attachTo = attr.ib(init=False)
setMembers = attr.ib()
publish = attr.ib()
review = attr.ib(default=False)
renderer = attr.ib()
priority = attr.ib(default=50)
name = attr.ib()
family = attr.ib(default="renderlayer")
families = attr.ib(default=["renderlayer"])
# format settings
resolutionWidth = attr.ib()
resolutionHeight = attr.ib()
pixelAspect = attr.ib()
multipartExr = attr.ib(default=False)
tileRendering = attr.ib()
tilesX = attr.ib()
tilesY = attr.ib()
convertToScanline = attr.ib(default=False)
# time settings
frameStart = attr.ib()
frameEnd = attr.ib()
frameStep = attr.ib()
# --------------------
# With default values
# metadata
review = attr.ib(default=False)
priority = attr.ib(default=50)
family = attr.ib(default="renderlayer")
families = attr.ib(default=["renderlayer"])
# format settings
multipartExr = attr.ib(default=False)
convertToScanline = attr.ib(default=False)
@frameStart.validator
def check_frame_start(self, attribute, value):
def check_frame_start(self, _, value):
"""Validate if frame start is not larger then end."""
if value >= self.frameEnd:
raise ValueError("frameStart must be smaller "
"or equal then frameEnd")
@frameEnd.validator
def check_frame_end(self, attribute, value):
def check_frame_end(self, _, value):
"""Validate if frame end is not less then start."""
if value <= self.frameStart:
raise ValueError("frameEnd must be smaller "
"or equal then frameStart")
@tilesX.validator
def check_tiles_x(self, attribute, value):
def check_tiles_x(self, _, value):
"""Validate if tile x isn't less then 1."""
if not self.tileRendering:
return
@ -83,7 +90,7 @@ class RenderInstance(object):
raise ValueError("both tiles X a Y sizes are set to 1")
@tilesY.validator
def check_tiles_y(self, attribute, value):
def check_tiles_y(self, _, value):
"""Validate if tile y isn't less then 1."""
if not self.tileRendering:
return
@ -102,6 +109,13 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
label = "Collect Render"
sync_workfile_version = False
def __init__(self, *args, **kwargs):
"""Constructor."""
super(AbstractCollectRender, self).__init__(*args, **kwargs)
self._file_path = None
self._asset = api.Session["AVALON_ASSET"]
def process(self, context):
"""Entry point to collector."""
rendering_instance = None
@ -121,8 +135,7 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
)
return
self._filepath = context.data["currentFile"].replace("\\", "/")
self._asset = api.Session["AVALON_ASSET"]
self._file_path = context.data["currentFile"].replace("\\", "/")
render_instances = self.get_instances()
for render_instance in render_instances:
@ -207,7 +220,12 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
pass
def _get_expected_files(self, render_instance):
"""Get list of expected files."""
"""Get list of expected files.
Returns:
list: expected files.
"""
# return all expected files for all cameras and aovs in given
# frame range
ef = ExpectedFiles()
@ -223,6 +241,7 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
"attaching multiple AOVs or renderable cameras to "
"subset is not supported"
)
return exp_files
def add_additional_data(self, data):
"""Add additional data to collected instance.

2
pype/lib/abstract_expected_files.py
View file

@ -40,7 +40,7 @@ class ExpectedFiles:
Args:
renderer_instance (:class:`RenderInstance`): Data passed from
render_instance (:class:`RenderInstance`): Data passed from
collector to determine files. This should be instance of
:class:`abstract_collect_render.RenderInstance`

90
pype/lib/abstract_submit_deadline.py
View file

@ -179,11 +179,9 @@ class DeadlineJobInfo:
dict: as `{'EnvironmentKeyValue0', 'key=value'}`
"""
out = []
index = 0
for v in self._environmentKeyValue:
out = {}
for index, v in enumerate(self._environmentKeyValue):
out["EnvironmentKeyValue{}".format(index)] = v
index += 1
return out
@EnvironmentKeyValue.setter
@ -207,11 +205,9 @@ class DeadlineJobInfo:
dict: as `{'ExtraInfo0': 'value'}`
"""
out = []
index = 0
for v in self._extraInfos:
out = {}
for index, v in enumerate(self._extraInfos):
out["ExtraInfo{}".format(index)] = v
index += 1
return out
@ExtraInfo.setter
@ -226,11 +222,9 @@ class DeadlineJobInfo:
dict: as {'ExtraInfoKeyValue0': 'key=value'}`
"""
out = []
index = 0
for v in self._extraInfoKeyValues:
out = {}
for index, v in enumerate(self._extraInfoKeyValues):
out["ExtraInfoKeyValue{}".format(index)] = v
index += 1
return out
@ExtraInfoKeyValue.setter
@ -250,11 +244,9 @@ class DeadlineJobInfo:
dict: as `{'TaskExtraInfoName0': 'value'}`
"""
out = []
index = 0
for v in self._taskExtraInfos:
out = {}
for index, v in enumerate(self._taskExtraInfos):
out["TaskExtraInfoName{}".format(index)] = v
index += 1
return out
@TaskExtraInfoName.setter
@ -275,11 +267,9 @@ class DeadlineJobInfo:
dict: as `{'OutputFilename0': 'filename'}`
"""
out = []
index = 0
for v in self._outputFilename:
out = {}
for index, v in enumerate(self._outputFilename):
out["OutputFilename{}".format(index)] = v
index += 1
return out
@OutputFilename.setter
@ -294,11 +284,9 @@ class DeadlineJobInfo:
dict: as `{'OutputFilenme#Tile': 'tile'}`
"""
out = []
index = 0
for v in self._outputFilenameTile:
out = {}
for index, v in enumerate(self._outputFilenameTile):
out["OutputFilename{}Tile".format(index)] = v
index += 1
return out
@OutputFilenameTile.setter
@ -313,11 +301,9 @@ class DeadlineJobInfo:
dict: as `{'OutputDirectory0': 'dir'}`
"""
out = []
index = 0
for v in self._outputDirectory:
out = {}
for index, v in enumerate(self._outputDirectory):
out["OutputDirectory{}".format(index)] = v
index += 1
return out
@OutputDirectory.setter
@ -338,18 +324,22 @@ class DeadlineJobInfo:
MaintenanceJobStartFrame = attr.ib(default=None) # Default: 0
MaintenanceJobEndFrame = attr.ib(default=None) # Default: 0
def render(self):
def serialize(self):
"""Return all data serialized as dictionary.
Returns:
OrderedDict: all serialized data.
"""
def no_privates(a, _):
return not a.name.startswith("_")
def filter_data(a, v):
if a.name.startswith("_"):
return False
if v is None:
return False
return True
serialized = attr.asdict(
self, dict_factory=OrderedDict, filter=no_privates)
self, dict_factory=OrderedDict, filter=filter_data)
serialized.update(self.EnvironmentKeyValue)
serialized.update(self.ExtraInfo)
serialized.update(self.ExtraInfoKeyValue)
@ -369,6 +359,15 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
use_published = True
asset_dependencies = False
def __init__(self, *args, **kwargs):
super(AbstractSubmitDeadline, self).__init__(*args, **kwargs)
self._instance = None
self._deadline_url = None
self.scene_path = None
self.job_info = None
self.plugin_info = None
self.aux_files = None
def process(self, instance):
"""Plugin entry point."""
self._instance = instance
@ -393,6 +392,8 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
self.plugin_info = self.get_plugin_info()
self.aux_files = self.get_aux_files()
self.process_submission()
def process_submission(self):
"""Process data for submission.
@ -416,7 +417,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
:class:`DeadlineJobInfo`
Returns:
dict: Filled Deadline JobInfo.
:class:`DeadlineJobInfo`: Filled Deadline JobInfo.
"""
pass
@ -461,6 +462,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
Returns:
str: Published scene path.
None: if no published scene is found.
Note:
Published scene path is actually determined from project Anatomy
@ -469,6 +471,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
"""
anatomy = self._instance.context.data['anatomy']
file_path = None
for i in self._instance.context:
if "workfile" in i.data["families"]:
# test if there is instance of workfile waiting
@ -483,23 +486,23 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
template_data["comment"] = None
anatomy_filled = anatomy.format(template_data)
template_filled = anatomy_filled["publish"]["path"]
filepath = os.path.normpath(template_filled)
file_path = os.path.normpath(template_filled)
self.log.info("Using published scene for render {}".format(
filepath))
file_path))
if not os.path.exists(filepath):
if not os.path.exists(file_path):
self.log.error("published scene does not exist!")
raise
if not replace_in_path:
return filepath
return file_path
# now we need to switch scene in expected files
# because <scene> token will now point to published
# scene file and that might differ from current one
new_scene = os.path.splitext(
os.path.basename(filepath))[0]
os.path.basename(file_path))[0]
orig_scene = os.path.splitext(
os.path.basename(
self._instance.context.data["currentFile"]))[0]
@ -527,14 +530,14 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
orig_scene, new_scene
))
return filepath
return file_path
def assemble_payload(
self, job_info=None, plugin_info=None, aux_files=None):
"""Assemble payload data from its various parts.
Args:
job_info (dict): Deadline JobInfo. You can use
job_info (DeadlineJobInfo): Deadline JobInfo. You can use
:class:`DeadlineJobInfo` for it.
plugin_info (dict): Deadline PluginInfo. Plugin specific options.
aux_files (list, optional): List of auxiliary file to submit with
@ -544,8 +547,9 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
dict: Deadline Payload.
"""
job = job_info or self.job_info
return {
"JobInfo": job_info or self.job_info,
"JobInfo": job.serialize(),
"PluginInfo": plugin_info or self.plugin_info,
"AuxFiles": aux_files or self.aux_files
}
@ -557,7 +561,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
Deadline jobs end-point.
Args:
payload (str): string encoded json with job payload.
payload (dict): dict to become json in deadline submission.
Returns:
str: resulting Deadline job id.
@ -569,7 +573,7 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
url = "{}/api/jobs".format(self._deadline_url)
response = self._requests_post(url, json=payload)
if not response.ok:
self.log.error("Submition failed!")
self.log.error("Submission failed!")
self.log.error(response.status_code)
self.log.error(response.content)
self.log.debug(payload)