From 66dc0e36f3504cf206c0b4dd0c32b0077eb2efb2 Mon Sep 17 00:00:00 2001 From: MustafaJafar Date: Wed, 2 Oct 2024 17:24:41 +0300 Subject: [PATCH] Add LimitGroups and MachineLimit to Houdini Deadline settings --- server/settings/publish_plugins.py | 55 ++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py index 42521371a8..19687a9741 100644 --- a/server/settings/publish_plugins.py +++ b/server/settings/publish_plugins.py @@ -219,10 +219,40 @@ class HoudiniSubmitDeadlineModel(BaseSettingsModel): priority: int = SettingsField(title="Priority") chunk_size: int = SettingsField(title="Chunk Size") group: str = SettingsField(title="Group") + limits: str = SettingsField( + title="Limit Groups", + description=( + "Enter a comma separated list of limits.\n" + "Specifies the limit groups that this job is a member of (default = blank)." + ) + ) + machine_limit: int = SettingsField( + title="Machine Limit", + description=( + "Specifies the maximum number of machines this job can be" + " rendered on at the same time (default = 0, which means" + " unlimited)." + ) + ) export_priority: int = SettingsField(title="Export Priority") export_chunk_size: int = SettingsField(title="Export Chunk Size") export_group: str = SettingsField(title="Export Group") + export_limits: str = SettingsField( + title="Export Limit Groups", + description=( + "Enter a comma separated list of limits.\n" + "Specifies the limit groups that this job is a member of (default = blank)." + ) + ) + export_machine_limit: int = SettingsField( + title="Export Machine Limit", + description=( + "Specifies the maximum number of machines this job can be" + " rendered on at the same time (default = 0, which means" + " unlimited)." + ) + ) class HoudiniCacheSubmitDeadlineModel(BaseSettingsModel): @@ -234,6 +264,21 @@ class HoudiniCacheSubmitDeadlineModel(BaseSettingsModel): priority: int = SettingsField(title="Priority") chunk_size: int = SettingsField(title="Chunk Size") group: str = SettingsField(title="Group") + limits: str = SettingsField( + title="Limit Groups", + description=( + "Enter a comma separated list of limits.\n" + "Specifies the limit groups that this job is a member of (default = blank)." + ) + ) + machine_limit: int = SettingsField( + title="Machine Limit", + description=( + "Specifies the maximum number of machines this job can be" + " rendered on at the same time (default = 0, which means" + " unlimited)." + ) + ) class AfterEffectsSubmitDeadlineModel(BaseSettingsModel): @@ -452,7 +497,9 @@ class PublishPluginsModel(BaseSettingsModel): "active": True, "priority": 50, "chunk_size": 999999, - "group": "" + "group": "", + "limits": "", + "machine_limit": 0 }, "HoudiniSubmitDeadline": { "enabled": True, @@ -461,9 +508,13 @@ class PublishPluginsModel(BaseSettingsModel): "priority": 50, "chunk_size": 1, "group": "", + "limits": "", + "machine_limit": 0, "export_priority": 50, "export_chunk_size": 10, - "export_group": "" + "export_group": "", + "export_limits": "", + "export_machine_limit": 0 }, "MaxSubmitDeadline": { "enabled": True,