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

Added Delay option

Browse source
This commit is contained in:
Simone Barbieri 2023-11-24 12:20:38 +00:00
parent 75519b0a95
commit 5162d8e407
5 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openpype/modules/deadline/plugins/publish/submit_blender_deadline.py
View file

@ -40,6 +40,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
jobInfo = {} jobInfo = {}
pluginInfo = {} pluginInfo = {}
group = None group = None
job_delay = "00:00:00:00"
def get_job_info(self): def get_job_info(self):
job_info = DeadlineJobInfo(Plugin="Blender") job_info = DeadlineJobInfo(Plugin="Blender")
@ -91,6 +92,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
job_info.Comment = context.data.get("comment") job_info.Comment = context.data.get("comment")
job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size) job_info.ChunkSize = attr_values.get("chunkSize", self.chunk_size)
job_info.Priority = attr_values.get("priority", self.priority) job_info.Priority = attr_values.get("priority", self.priority)
job_info.JobDelay = attr_values.get("job_delay", self.job_delay)
# Add options from RenderGlobals # Add options from RenderGlobals
render_globals = instance.data.get("renderGlobals", {}) render_globals = instance.data.get("renderGlobals", {})
@ -212,6 +214,10 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
TextDef("group", TextDef("group",
default=cls.group, default=cls.group,
label="Group Name"), label="Group Name"),
TextDef("job_delay",
default=cls.job_delay,
label="Job Delay"),
]) ])
return defs return defs

3
openpype/settings/defaults/project_settings/deadline.json
View file

@ -107,7 +107,8 @@
"use_published": true, "use_published": true,
"priority": 50, "priority": 50,
"chunk_size": 10, "chunk_size": 10,
"group": "none" "group": "none",
"job_delay": "00:00:00:00"
}, },
"ProcessSubmittedJobOnFarm": { "ProcessSubmittedJobOnFarm": {
"enabled": true, "enabled": true,

5
openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
View file

@ -581,6 +581,11 @@
"type": "text", "type": "text",
"key": "group", "key": "group",
"label": "Group Name" "label": "Group Name"
},
{
"type": "text",
"key": "job_delay",
"label": "Delay job (timecode dd:hh:mm:ss)"
} }
] ]
}, },

4
server_addon/deadline/server/settings/publish_plugins.py
View file

@ -237,6 +237,7 @@ class BlenderSubmitDeadlineModel(BaseSettingsModel):
priority: int = Field(title="Priority") priority: int = Field(title="Priority")
chunk_size: int = Field(title="Frame per Task") chunk_size: int = Field(title="Frame per Task")
group: str = Field("", title="Group Name") group: str = Field("", title="Group Name")
job_delay: str = Field("", title="Delay job (timecode dd:hh:mm:ss)")
class AOVFilterSubmodel(BaseSettingsModel): class AOVFilterSubmodel(BaseSettingsModel):
@ -424,7 +425,8 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
"use_published": True, "use_published": True,
"priority": 50, "priority": 50,
"chunk_size": 10, "chunk_size": 10,
"group": "none" "group": "none",
"job_delay": "00:00:00:00"
}, },
"ProcessSubmittedJobOnFarm": { "ProcessSubmittedJobOnFarm": {
"enabled": True, "enabled": True,

2
server_addon/deadline/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.3" __version__ = "0.1.4"