Merge pull request #17 from ynput/enhancement/re-arrange_deadline_set…

…tings_alphabetically
ynput · Feb 12, 2024 · c88a4bb · c88a4bb
2 parents 64043c2 + 4da6f25
commit c88a4bb
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 69 deletions.
diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
@@ -306,36 +306,38 @@ class PublishPluginsModel(BaseSettingsModel):
  default_factory=ValidateExpectedFilesModel,
  title="Validate Expected Files"
  )
- MayaSubmitDeadline: MayaSubmitDeadlineModel = SettingsField(
- default_factory=MayaSubmitDeadlineModel,
- title="Maya Submit to deadline")
- MaxSubmitDeadline: MaxSubmitDeadlineModel = SettingsField(
- default_factory=MaxSubmitDeadlineModel,
- title="Max Submit to deadline")
- FusionSubmitDeadline: FusionSubmitDeadlineModel = SettingsField(
- default_factory=FusionSubmitDeadlineModel,
- title="Fusion submit to Deadline")
- NukeSubmitDeadline: NukeSubmitDeadlineModel = SettingsField(
- default_factory=NukeSubmitDeadlineModel,
- title="Nuke Submit to deadline")
- HarmonySubmitDeadline: HarmonySubmitDeadlineModel = SettingsField(
- default_factory=HarmonySubmitDeadlineModel,
- title="Harmony Submit to deadline")
  AfterEffectsSubmitDeadline: AfterEffectsSubmitDeadlineModel = (
  SettingsField(
  default_factory=AfterEffectsSubmitDeadlineModel,
- title="After Effects to deadline"
+ title="After Effects to deadline",
+ section="Hosts"
  )
  )
- CelactionSubmitDeadline: CelactionSubmitDeadlineModel = SettingsField(
- default_factory=CelactionSubmitDeadlineModel,
- title="Celaction Submit Deadline")
  BlenderSubmitDeadline: BlenderSubmitDeadlineModel = SettingsField(
  default_factory=BlenderSubmitDeadlineModel,
  title="Blender Submit Deadline")
+ CelactionSubmitDeadline: CelactionSubmitDeadlineModel = SettingsField(
+ default_factory=CelactionSubmitDeadlineModel,
+ title="Celaction Submit Deadline")
+ FusionSubmitDeadline: FusionSubmitDeadlineModel = SettingsField(
+ default_factory=FusionSubmitDeadlineModel,
+ title="Fusion submit to Deadline")
+ HarmonySubmitDeadline: HarmonySubmitDeadlineModel = SettingsField(
+ default_factory=HarmonySubmitDeadlineModel,
+ title="Harmony Submit to deadline")
+ MaxSubmitDeadline: MaxSubmitDeadlineModel = SettingsField(
+ default_factory=MaxSubmitDeadlineModel,
+ title="Max Submit to deadline")
+ MayaSubmitDeadline: MayaSubmitDeadlineModel = SettingsField(
+ default_factory=MayaSubmitDeadlineModel,
+ title="Maya Submit to deadline")
+ NukeSubmitDeadline: NukeSubmitDeadlineModel = SettingsField(
+ default_factory=NukeSubmitDeadlineModel,
+ title="Nuke Submit to deadline")
  ProcessSubmittedCacheJobOnFarm: ProcessCacheJobFarmModel = SettingsField(
  default_factory=ProcessCacheJobFarmModel,
- title="Process submitted cache Job on farm.")
+ title="Process submitted cache Job on farm.",
+ section="Publish Jobs")
  ProcessSubmittedJobOnFarm: ProcessSubmittedJobOnFarmModel = SettingsField(
  default_factory=ProcessSubmittedJobOnFarmModel,
  title="Process submitted job on farm.")
@@ -357,58 +359,45 @@ class PublishPluginsModel(BaseSettingsModel):
  "deadline"
  ]
  },
- "MayaSubmitDeadline": {
+ "AfterEffectsSubmitDeadline": {
  "enabled": True,
  "optional": False,
  "active": True,
- "tile_assembler_plugin": "DraftTileAssembler",
  "use_published": True,
- "import_reference": False,
- "asset_dependencies": True,
- "strict_error_checking": True,
  "priority": 50,
- "tile_priority": 50,
- "group": "none",
- "limit": [],
- # this used to be empty dict
- "jobInfo": "",
- # this used to be empty dict
- "pluginInfo": "",
- "scene_patches": []
+ "chunk_size": 10000,
+ "group": "",
+ "department": "",
+ "multiprocess": True
  },
- "MaxSubmitDeadline": {
+ "BlenderSubmitDeadline": {
  "enabled": True,
  "optional": False,
  "active": True,
  "use_published": True,
  "priority": 50,
  "chunk_size": 10,
- "group": "none"
+ "group": "none",
+ "job_delay": "00:00:00:00"
  },
- "FusionSubmitDeadline": {
+ "CelactionSubmitDeadline": {
  "enabled": True,
- "optional": False,
- "active": True,
- "priority": 50,
- "chunk_size": 10,
- "concurrent_tasks": 1,
- "group": ""
+ "deadline_department": "",
+ "deadline_priority": 50,
+ "deadline_pool": "",
+ "deadline_pool_secondary": "",
+ "deadline_group": "",
+ "deadline_chunk_size": 10,
+ "deadline_job_delay": "00:00:00:00"
  },
- "NukeSubmitDeadline": {
+ "FusionSubmitDeadline": {
  "enabled": True,
  "optional": False,
  "active": True,
  "priority": 50,
  "chunk_size": 10,
  "concurrent_tasks": 1,
- "group": "",
- "department": "",
- "use_gpu": True,
- "workfile_dependency": True,
- "use_published_workfile": True,
- "env_allowed_keys": [],
- "env_search_replace_values": [],
- "limit_groups": []
+ "group": ""
  },
  "HarmonySubmitDeadline": {
  "enabled": True,
@@ -420,36 +409,49 @@ class PublishPluginsModel(BaseSettingsModel):
  "group": "",
  "department": ""
  },
- "AfterEffectsSubmitDeadline": {
+ "MaxSubmitDeadline": {
  "enabled": True,
  "optional": False,
  "active": True,
  "use_published": True,
  "priority": 50,
- "chunk_size": 10000,
- "group": "",
- "department": "",
- "multiprocess": True
+ "chunk_size": 10,
+ "group": "none"
  },
- "CelactionSubmitDeadline": {
+ "MayaSubmitDeadline": {
  "enabled": True,
- "deadline_department": "",
- "deadline_priority": 50,
- "deadline_pool": "",
- "deadline_pool_secondary": "",
- "deadline_group": "",
- "deadline_chunk_size": 10,
- "deadline_job_delay": "00:00:00:00"
+ "optional": False,
+ "active": True,
+ "tile_assembler_plugin": "DraftTileAssembler",
+ "use_published": True,
+ "import_reference": False,
+ "asset_dependencies": True,
+ "strict_error_checking": True,
+ "priority": 50,
+ "tile_priority": 50,
+ "group": "none",
+ "limit": [],
+ # this used to be empty dict
+ "jobInfo": "",
+ # this used to be empty dict
+ "pluginInfo": "",
+ "scene_patches": []
  },
- "BlenderSubmitDeadline": {
+ "NukeSubmitDeadline": {
  "enabled": True,
  "optional": False,
  "active": True,
- "use_published": True,
  "priority": 50,
  "chunk_size": 10,
- "group": "none",
- "job_delay": "00:00:00:00"
+ "concurrent_tasks": 1,
+ "group": "",
+ "department": "",
+ "use_gpu": True,
+ "workfile_dependency": True,
+ "use_published_workfile": True,
+ "env_allowed_keys": [],
+ "env_search_replace_values": [],
+ "limit_groups": []
  },
  "ProcessSubmittedCacheJobOnFarm": {
  "enabled": True,

diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.9"