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

Kuba's comment - remove unnecessary logic, stick to code style

Browse source
This commit is contained in:
MustafaJafar 2024-02-09 20:16:38 +02:00
parent 80e3246410
commit 08413a80bb
3 changed files with 41 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
View file

@ -46,17 +46,11 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline
targets = ["local"]
priority = 50
ChunkSize = 999999
chunk_size = 999999
group = None
jobInfo = {}
pluginInfo = {}
@classmethod
def apply_settings(cls, project_settings, system_settings):
settings = project_settings["deadline"]["publish"]["HoudiniSubmitDeadline"]["HoudiniSubmitCacheDeadline"] # noqa
cls.priority = settings.get("priority", cls.priority)
cls.ChunkSize = settings.get("chunk_size", cls.ChunkSize)
cls.group = settings.get("group", cls.group)
def get_job_info(self):
job_info = DeadlineJobInfo(Plugin="Houdini")
@ -97,7 +91,7 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline
attr_values = self.get_attr_values_from_data(instance.data)
job_info.ChunkSize = instance.data.get("chunkSize", self.ChunkSize)
job_info.ChunkSize = instance.data.get("chunk_size", self.chunk_size)
job_info.Comment = context.data.get("comment")
job_info.Priority = attr_values.get("priority", self.priority)
job_info.Group = attr_values.get("group", self.group)

14
client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
View file

@ -83,19 +83,7 @@ class HoudiniSubmitDeadline(
priority = 50
chunk_size = 1
group = ""
@classmethod
def apply_settings(cls, project_settings, system_settings):
export_settings = project_settings["deadline"]["publish"]["HoudiniSubmitDeadline"]["HoudiniSubmitExportDeadline"] # noqa
cls.export_priority = export_settings.get("priority", cls.export_priority)
cls.export_chunk_size = export_settings.get("chunk_size", cls.export_chunk_size)
cls.export_group = export_settings.get("group", cls.export_group)
render_settings = project_settings["deadline"]["publish"]["HoudiniSubmitDeadline"]["HoudiniSubmitRenderDeadline"] # noqa
cls.priority = render_settings.get("priority", cls.priority)
cls.chunk_size = render_settings.get("chunk_size", cls.chunk_size)
cls.group = render_settings.get("group", cls.group)
@classmethod
def get_attribute_defs(cls):
return [

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

@ -211,47 +211,30 @@ class HarmonySubmitDeadlineModel(BaseSettingsModel):
department: str = SettingsField(title="Department")
class HoudiniSubmitCacheDeadlineModel(BaseSettingsModel):
priority: int = SettingsField(title="Priority")
chunk_size: int = SettingsField(title="Chunk Size")
group: str = SettingsField(title="Group")
class HoudiniSubmitExportDeadlineModel(BaseSettingsModel):
priority: int = SettingsField(title="Priority")
chunk_size: int = SettingsField(title="Chunk Size")
group: str = SettingsField(title="Group")
class HoudiniSubmitRenderDeadlineModel(BaseSettingsModel):
priority: int = SettingsField(title="Priority")
chunk_size: int = SettingsField(title="Chunk Size")
group: str = SettingsField(title="Group")
class HoudiniSubmitDeadlineModel(BaseSettingsModel):
"""Houdini deadline submitter settings."""
"""Houdini deadline render submitter settings."""
enabled: bool = SettingsField(title="Enabled")
optional: bool = SettingsField(title="Optional")
active: bool = SettingsField(title="Active")
HoudiniSubmitCacheDeadline: HoudiniSubmitCacheDeadlineModel = (
SettingsField(
default_factory=HoudiniSubmitCacheDeadlineModel,
title="Submit Cache"
)
)
HoudiniSubmitExportDeadline: HoudiniSubmitExportDeadlineModel = (
SettingsField(
default_factory=HoudiniSubmitExportDeadlineModel,
title="Submit Export Job"
)
)
HoudiniSubmitRenderDeadline: HoudiniSubmitRenderDeadlineModel = (
SettingsField(
default_factory=HoudiniSubmitRenderDeadlineModel,
title="Submit Render"
)
)
priority: int = SettingsField(title="Priority")
chunk_size: int = SettingsField(title="Chunk Size")
group: str = SettingsField(title="Group")
export_priority: int = SettingsField(title="Export Priority")
export_chunk_size: int = SettingsField(title="Export Chunk Size")
export_group: str = SettingsField(title="Export Group")
class HoudiniCacheSubmitDeadlineModel(BaseSettingsModel):
"""Houdini deadline cache submitter settings."""
enabled: bool = SettingsField(title="Enabled")
optional: bool = SettingsField(title="Optional")
active: bool = SettingsField(title="Active")
priority: int = SettingsField(title="Priority")
chunk_size: int = SettingsField(title="Chunk Size")
group: str = SettingsField(title="Group")
class AfterEffectsSubmitDeadlineModel(BaseSettingsModel):
@ -357,7 +340,10 @@ class PublishPluginsModel(BaseSettingsModel):
title="Max Submit to deadline")
HoudiniSubmitDeadline: HoudiniSubmitDeadlineModel = SettingsField(
default_factory=HoudiniSubmitDeadlineModel,
title="Houdini Submit to deadline")
title="Houdini Submit render to deadline")
HoudiniCacheSubmitDeadline: HoudiniCacheSubmitDeadlineModel = SettingsField(
default_factory=HoudiniCacheSubmitDeadlineModel,
title="Houdini Submit cache to deadline")
FusionSubmitDeadline: FusionSubmitDeadlineModel = SettingsField(
default_factory=FusionSubmitDeadlineModel,
title="Fusion submit to Deadline")
@ -435,21 +421,20 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
"enabled": True,
"optional": False,
"active": True,
"HoudiniSubmitCacheDeadline":{
"priority": 50,
"chunk_size":999999,
"group": ""
},
"HoudiniSubmitExportDeadline":{
"priority": 50,
"chunk_size":10,
"group": ""
},
"HoudiniSubmitRenderDeadline":{
"priority": 50,
"chunk_size":1,
"group": ""
}
"priority": 50,
"chunk_size":1,
"group": "",
"export_priority": 50,
"export_chunk_size":10,
"export_group": ""
},
"HoudiniCacheSubmitDeadline": {
"enabled": True,
"optional": False,
"active": True,
"priority": 50,
"chunk_size":999999,
"group": ""
},
"FusionSubmitDeadline": {
"enabled": True,