Skip to content

Commit

Permalink
Merge pull request 'feat/abc_sequential' (ynput#6) from feat/abc_sequ…
Browse files Browse the repository at this point in the history
…ential into develop

Reviewed-on: http://bepic-docker01:3090/ayon/ayon-deadline/pulls/6
  • Loading branch information
AlSzab committed Sep 17, 2024
2 parents d6b4984 + bee3231 commit 7c72e70
Showing 1 changed file with 30 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
NumberDef,
is_in_tests,
)
from ayon_core.pipeline import (
AYONPyblishPluginMixin
)
from ayon_core.pipeline import AYONPyblishPluginMixin
from ayon_deadline import abstract_submit_deadline
from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo

Expand All @@ -21,16 +19,17 @@ class HoudiniPluginInfo(object):
Build = attr.ib(default=None)
IgnoreInputs = attr.ib(default=True)
ScriptJob = attr.ib(default=True)
SceneFile = attr.ib(default=None) # Input
SceneFile = attr.ib(default=None) # Input
SaveFile = attr.ib(default=True)
ScriptFilename = attr.ib(default=None)
OutputDriver = attr.ib(default=None)
Version = attr.ib(default=None) # Mandatory for Deadline
ProjectPath = attr.ib(default=None)


class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, # noqa
AYONPyblishPluginMixin):
class HoudiniCacheSubmitDeadline(
abstract_submit_deadline.AbstractSubmitDeadline, AYONPyblishPluginMixin # noqa
):
"""Submit Houdini scene to perform a local publish in Deadline.
Publishing in Deadline can be helpful for scenes that publish very slow.
Expand All @@ -51,7 +50,6 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline
jobInfo = {}
pluginInfo = {}


def get_job_info(self):
job_info = DeadlineJobInfo(Plugin="Houdini")

Expand All @@ -66,9 +64,9 @@ def get_job_info(self):
filepath = context.data["currentFile"]
scenename = os.path.basename(filepath)
job_name = "{scene} - {instance} [PUBLISH]".format(
scene=scenename, instance=instance.name)
batch_name = "{code} - {scene}".format(code=project_name,
scene=scenename)
scene=scenename, instance=instance.name
)
batch_name = "{code} - {scene}".format(code=project_name, scene=scenename)
if is_in_tests():
batch_name += datetime.now().strftime("%d%m%Y%H%M%S")

Expand All @@ -77,14 +75,13 @@ def get_job_info(self):
job_info.Plugin = instance.data["plugin"]
job_info.UserName = context.data.get("deadlineUser", getpass.getuser())
rop_node = self.get_rop_node(instance)
if rop_node.type().name() != "alembic":
frames = "{start}-{end}x{step}".format(
start=int(instance.data["frameStart"]),
end=int(instance.data["frameEnd"]),
step=int(instance.data["byFrameStep"]),
)

job_info.Frames = frames
frames = "{start}-{end}x{step}".format(
start=int(instance.data["frameStart"]),
end=int(instance.data["frameEnd"]),
step=int(instance.data["byFrameStep"]),
)
job_info.Frames = frames

job_info.Pool = instance.data.get("primaryPool")
job_info.SecondaryPool = instance.data.get("secondaryPool")
Expand All @@ -109,14 +106,10 @@ def get_job_info(self):
"AYON_WORKDIR",
"AYON_APP_NAME",
"AYON_LOG_NO_COLORS",
"AYON_IN_TESTS"
"AYON_IN_TESTS",
]

environment = {
key: os.environ[key]
for key in keys
if key in os.environ
}
environment = {key: os.environ[key] for key in keys if key in os.environ}

for key in keys:
value = environment.get(key)
Expand Down Expand Up @@ -144,7 +137,7 @@ def get_plugin_info(self):
SaveFile=True,
OutputDriver=rop.path(),
Version=version,
ProjectPath=os.path.dirname(self.scene_path)
ProjectPath=os.path.dirname(self.scene_path),
)

plugin_payload = attr.asdict(plugin_info)
Expand All @@ -169,16 +162,18 @@ def get_rop_node(self, instance):
@classmethod
def get_attribute_defs(cls):
defs = super(HoudiniCacheSubmitDeadline, cls).get_attribute_defs()
defs.extend([
NumberDef("priority",
minimum=1,
maximum=250,
decimals=0,
default=cls.priority,
label="Priority"),
TextDef("group",
default=cls.group,
label="Group Name"),
])
defs.extend(
[
NumberDef(
"priority",
minimum=1,
maximum=250,
decimals=0,
default=cls.priority,
label="Priority",
),
TextDef("group", default=cls.group, label="Group Name"),
]
)

return defs

0 comments on commit 7c72e70

Please sign in to comment.