From 6bcceba013415ab6406cce6edd0fa2a8d5268ab9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:04:54 +0200 Subject: [PATCH 01/11] move deadline integration next to server codebase --- .../deadline/client/ayon_deadline}/__init__.py | 0 .../ayon_deadline}/abstract_submit_deadline.py | 0 .../client/ayon_deadline}/deadline_module.py | 0 .../collect_deadline_server_from_instance.py | 0 .../publish/collect_default_deadline_server.py | 0 .../ayon_deadline}/plugins/publish/collect_pools.py | 0 .../plugins/publish/collect_user_credentials.py | 0 .../publish/help/validate_deadline_connection.xml | 0 .../publish/help/validate_deadline_pools.xml | 0 .../plugins/publish/submit_aftereffects_deadline.py | 0 .../plugins/publish/submit_blender_deadline.py | 0 .../plugins/publish/submit_celaction_deadline.py | 0 .../plugins/publish/submit_fusion_deadline.py | 0 .../plugins/publish/submit_harmony_deadline.py | 0 .../publish/submit_houdini_cache_deadline.py | 0 .../publish/submit_houdini_render_deadline.py | 0 .../plugins/publish/submit_max_deadline.py | 0 .../plugins/publish/submit_maya_deadline.py | 0 .../plugins/publish/submit_nuke_deadline.py | 0 .../plugins/publish/submit_publish_cache_job.py | 0 .../plugins/publish/submit_publish_job.py | 0 .../plugins/publish/validate_deadline_connection.py | 0 .../plugins/publish/validate_deadline_pools.py | 0 .../publish/validate_expected_and_rendered_files.py | 0 .../repository/custom/plugins/Ayon/Ayon.ico | Bin .../repository/custom/plugins/Ayon/Ayon.options | 0 .../repository/custom/plugins/Ayon/Ayon.param | 0 .../repository/custom/plugins/Ayon/Ayon.py | 0 .../custom/plugins/CelAction/CelAction.ico | Bin .../custom/plugins/CelAction/CelAction.param | 0 .../custom/plugins/CelAction/CelAction.py | 0 .../repository/custom/plugins/GlobalJobPreLoad.py | 0 .../custom/plugins/HarmonyAYON/HarmonyAYON.ico | Bin .../custom/plugins/HarmonyAYON/HarmonyAYON.options | 0 .../custom/plugins/HarmonyAYON/HarmonyAYON.param | 0 .../custom/plugins/HarmonyAYON/HarmonyAYON.py | 0 .../OpenPypeTileAssembler/OpenPypeTileAssembler.ico | Bin .../OpenPypeTileAssembler.options | 0 .../OpenPypeTileAssembler.param | 0 .../OpenPypeTileAssembler/OpenPypeTileAssembler.py | 0 .../client/ayon_deadline}/repository/readme.md | 0 .../deadline/client/ayon_deadline}/version.py | 0 42 files changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/__init__.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/abstract_submit_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/deadline_module.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/collect_deadline_server_from_instance.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/collect_default_deadline_server.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/collect_pools.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/collect_user_credentials.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/help/validate_deadline_connection.xml (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/help/validate_deadline_pools.xml (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_aftereffects_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_blender_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_celaction_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_fusion_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_harmony_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_houdini_cache_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_houdini_render_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_max_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_maya_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_nuke_deadline.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_publish_cache_job.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/submit_publish_job.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/validate_deadline_connection.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/validate_deadline_pools.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/plugins/publish/validate_expected_and_rendered_files.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/Ayon/Ayon.ico (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/Ayon/Ayon.options (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/Ayon/Ayon.param (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/Ayon/Ayon.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/CelAction/CelAction.ico (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/CelAction/CelAction.param (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/CelAction/CelAction.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/GlobalJobPreLoad.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/repository/readme.md (100%) rename {client/ayon_core/modules/deadline => server_addon/deadline/client/ayon_deadline}/version.py (100%) diff --git a/client/ayon_core/modules/deadline/__init__.py b/server_addon/deadline/client/ayon_deadline/__init__.py similarity index 100% rename from client/ayon_core/modules/deadline/__init__.py rename to server_addon/deadline/client/ayon_deadline/__init__.py diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/abstract_submit_deadline.py rename to server_addon/deadline/client/ayon_deadline/abstract_submit_deadline.py diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/server_addon/deadline/client/ayon_deadline/deadline_module.py similarity index 100% rename from client/ayon_core/modules/deadline/deadline_module.py rename to server_addon/deadline/client/ayon_deadline/deadline_module.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_deadline_server_from_instance.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/collect_pools.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/collect_user_credentials.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml b/server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_connection.xml similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_connection.xml rename to server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_connection.xml diff --git a/client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_pools.xml b/server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_pools.xml similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/help/validate_deadline_pools.xml rename to server_addon/deadline/client/ayon_deadline/plugins/publish/help/validate_deadline_pools.xml diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py diff --git a/client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py similarity index 100% rename from client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py rename to server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.ico similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.ico rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.ico diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.options b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.options similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.options rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.options diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.param similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.param rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.param diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.py similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/Ayon/Ayon.py rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/Ayon/Ayon.py diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.ico similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.ico rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.ico diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.param similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.param rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.param diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.py similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/CelAction.py rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/CelAction.py diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.ico diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.options diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.param diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/HarmonyAYON.py diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py similarity index 100% rename from client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py rename to server_addon/deadline/client/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py diff --git a/client/ayon_core/modules/deadline/repository/readme.md b/server_addon/deadline/client/ayon_deadline/repository/readme.md similarity index 100% rename from client/ayon_core/modules/deadline/repository/readme.md rename to server_addon/deadline/client/ayon_deadline/repository/readme.md diff --git a/client/ayon_core/modules/deadline/version.py b/server_addon/deadline/client/ayon_deadline/version.py similarity index 100% rename from client/ayon_core/modules/deadline/version.py rename to server_addon/deadline/client/ayon_deadline/version.py From 9202f0e765129509fbc8c359f2cc1b9808657c93 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:18:34 +0200 Subject: [PATCH 02/11] bump version and define milestone --- client/ayon_core/addon/base.py | 1 + server_addon/deadline/client/ayon_deadline/version.py | 4 +++- server_addon/deadline/package.py | 9 ++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index c4407424cc..56298e0d06 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -54,6 +54,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = { "blender": VersionInfo(0, 2, 0), "celaction": VersionInfo(0, 2, 0), "clockify": VersionInfo(0, 2, 0), + "deadline": VersionInfo(0, 2, 0), "flame": VersionInfo(0, 2, 0), "fusion": VersionInfo(0, 2, 0), "harmony": VersionInfo(0, 2, 0), diff --git a/server_addon/deadline/client/ayon_deadline/version.py b/server_addon/deadline/client/ayon_deadline/version.py index 74acd0efba..5baf5122fb 100644 --- a/server_addon/deadline/client/ayon_deadline/version.py +++ b/server_addon/deadline/client/ayon_deadline/version.py @@ -1 +1,3 @@ -__version__ = "0.1.12" +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'deadline' version.""" +__version__ = "0.2.0" diff --git a/server_addon/deadline/package.py b/server_addon/deadline/package.py index e26734c813..7e7bae8bd6 100644 --- a/server_addon/deadline/package.py +++ b/server_addon/deadline/package.py @@ -1,3 +1,10 @@ name = "deadline" title = "Deadline" -version = "0.1.12" +version = "0.2.0" + +client_dir = "ayon_deadline" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} From 3668a7f66fd867ad520ca2e4b89b9f0d0c302823 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:28:53 +0200 Subject: [PATCH 03/11] fix imports --- server_addon/deadline/client/ayon_deadline/deadline_module.py | 2 +- .../ayon_deadline/plugins/publish/collect_user_credentials.py | 3 +-- .../ayon_deadline/plugins/publish/validate_deadline_pools.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/deadline_module.py b/server_addon/deadline/client/ayon_deadline/deadline_module.py index ea0350d2d9..7715e58687 100644 --- a/server_addon/deadline/client/ayon_deadline/deadline_module.py +++ b/server_addon/deadline/client/ayon_deadline/deadline_module.py @@ -5,7 +5,7 @@ import requests import six from ayon_core.lib import Logger -from ayon_core.modules import AYONAddon, IPluginPaths +from ayon_core.addon import AYONAddon, IPluginPaths from .version import __version__ diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py index 99d75ecb9e..2b5762e3df 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py @@ -13,8 +13,7 @@ Provides: import pyblish.api from ayon_api import get_server_api_connection -from ayon_core.modules.deadline.deadline_module import DeadlineModule -from ayon_core.modules.deadline import __version__ +from ayon_deadline import __version__, DeadlineModule class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin): diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py index 2fb511bf51..e1cd99fea3 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py @@ -4,7 +4,7 @@ from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) -from ayon_core.modules.deadline.deadline_module import DeadlineModule +from ayon_deadline import DeadlineModule class ValidateDeadlinePools(OptionalPyblishPluginMixin, From 8eddd5991058a4457bbd208787ed11244cb8d2ba Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:12:48 +0200 Subject: [PATCH 04/11] use deadline addon from ayonAddonsManager during publishing --- .../publish/collect_user_credentials.py | 8 +++++--- .../plugins/publish/validate_deadline_pools.py | 18 +++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py index 2b5762e3df..e45b0090a7 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_user_credentials.py @@ -13,7 +13,6 @@ Provides: import pyblish.api from ayon_api import get_server_api_connection -from ayon_deadline import __version__, DeadlineModule class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin): @@ -80,10 +79,13 @@ class CollectDeadlineUserCredentials(pyblish.api.InstancePlugin): if not deadline_info["require_authentication"]: return - # TODO import 'get_addon_site_settings' when available + + addons_manager = instance.context.data["ayonAddonsManager"] + deadline_addon = addons_manager["deadline"] + # TODO import 'get_addon_site_settings' when available # in public 'ayon_api' local_settings = get_server_api_connection().get_addon_site_settings( - DeadlineModule.name, __version__) + deadline_addon.name, deadline_addon.version) local_settings = local_settings["local_settings"] for server_info in local_settings: if deadline_server_name == server_info["server_name"]: diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py index e1cd99fea3..c7445465c4 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_pools.py @@ -4,7 +4,6 @@ from ayon_core.pipeline import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) -from ayon_deadline import DeadlineModule class ValidateDeadlinePools(OptionalPyblishPluginMixin, @@ -38,8 +37,13 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin, return deadline_url = instance.data["deadline"]["url"] - pools = self.get_pools(deadline_url, - instance.data["deadline"].get("auth")) + addons_manager = instance.context.data["ayonAddonsManager"] + deadline_addon = addons_manager["deadline"] + pools = self.get_pools( + deadline_addon, + deadline_url, + instance.data["deadline"].get("auth") + ) invalid_pools = {} primary_pool = instance.data.get("primaryPool") @@ -62,15 +66,15 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin, formatting_data={"pools_str": ", ".join(pools)} ) - def get_pools(self, deadline_url, auth): + def get_pools(self, deadline_addon, deadline_url, auth): if deadline_url not in self.pools_per_url: self.log.debug( "Querying available pools for Deadline url: {}".format( deadline_url) ) - pools = DeadlineModule.get_deadline_pools(deadline_url, - auth=auth, - log=self.log) + pools = deadline_addon.get_deadline_pools( + deadline_url, auth=auth, log=self.log + ) # some DL return "none" as a pool name if "none" not in pools: pools.append("none") From 1d6d241818e6af184e40dc7809a8c7529d97b96d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:13:43 +0200 Subject: [PATCH 05/11] use addon naming --- server_addon/deadline/client/ayon_deadline/__init__.py | 4 ++-- .../deadline/client/ayon_deadline/deadline_module.py | 2 +- .../plugins/publish/collect_default_deadline_server.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/__init__.py b/server_addon/deadline/client/ayon_deadline/__init__.py index 683d8dbe4a..f37032f297 100644 --- a/server_addon/deadline/client/ayon_deadline/__init__.py +++ b/server_addon/deadline/client/ayon_deadline/__init__.py @@ -1,8 +1,8 @@ -from .deadline_module import DeadlineModule +from .deadline_module import DeadlineAddon from .version import __version__ __all__ = ( - "DeadlineModule", + "DeadlineAddon", "__version__" ) diff --git a/server_addon/deadline/client/ayon_deadline/deadline_module.py b/server_addon/deadline/client/ayon_deadline/deadline_module.py index 7715e58687..54ed6dc8d3 100644 --- a/server_addon/deadline/client/ayon_deadline/deadline_module.py +++ b/server_addon/deadline/client/ayon_deadline/deadline_module.py @@ -16,7 +16,7 @@ class DeadlineWebserviceError(Exception): """ -class DeadlineModule(AYONAddon, IPluginPaths): +class DeadlineAddon(AYONAddon, IPluginPaths): name = "deadline" version = __version__ diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py index 9238e0ed95..77d03c713f 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_default_deadline_server.py @@ -24,7 +24,7 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin): def process(self, context): try: - deadline_module = context.data["ayonAddonsManager"]["deadline"] + deadline_addon = context.data["ayonAddonsManager"]["deadline"] except AttributeError: self.log.error("Cannot get AYON Deadline addon.") raise AssertionError("AYON Deadline addon not found.") @@ -34,13 +34,13 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin): dl_server_info = None if deadline_server_name: - dl_server_info = deadline_module.deadline_servers_info.get( + dl_server_info = deadline_addon.deadline_servers_info.get( deadline_server_name) if dl_server_info: deadline_url = dl_server_info["value"] else: - default_dl_server_info = deadline_module.deadline_servers_info[0] + default_dl_server_info = deadline_addon.deadline_servers_info[0] deadline_url = default_dl_server_info["value"] context.data["deadline"] = {} From a1cd2e19ca01dfacf57e4661477ab731589b1039 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:15:15 +0200 Subject: [PATCH 06/11] renamed deadline_module.py to addon.py --- server_addon/deadline/client/ayon_deadline/__init__.py | 2 +- .../client/ayon_deadline/{deadline_module.py => addon.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename server_addon/deadline/client/ayon_deadline/{deadline_module.py => addon.py} (100%) diff --git a/server_addon/deadline/client/ayon_deadline/__init__.py b/server_addon/deadline/client/ayon_deadline/__init__.py index f37032f297..6fec1006e6 100644 --- a/server_addon/deadline/client/ayon_deadline/__init__.py +++ b/server_addon/deadline/client/ayon_deadline/__init__.py @@ -1,4 +1,4 @@ -from .deadline_module import DeadlineAddon +from .addon import DeadlineAddon from .version import __version__ diff --git a/server_addon/deadline/client/ayon_deadline/deadline_module.py b/server_addon/deadline/client/ayon_deadline/addon.py similarity index 100% rename from server_addon/deadline/client/ayon_deadline/deadline_module.py rename to server_addon/deadline/client/ayon_deadline/addon.py From d8f553943f9acc831286b2618534dd477b32a5f4 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:20:34 +0200 Subject: [PATCH 07/11] added settings category to publish plugins --- .../ayon_deadline/plugins/publish/submit_blender_deadline.py | 1 + .../ayon_deadline/plugins/publish/submit_celaction_deadline.py | 1 + .../ayon_deadline/plugins/publish/submit_fusion_deadline.py | 1 + .../ayon_deadline/plugins/publish/submit_harmony_deadline.py | 1 + .../plugins/publish/submit_houdini_cache_deadline.py | 1 + .../plugins/publish/submit_houdini_render_deadline.py | 1 + .../client/ayon_deadline/plugins/publish/submit_max_deadline.py | 1 + .../client/ayon_deadline/plugins/publish/submit_maya_deadline.py | 1 + .../client/ayon_deadline/plugins/publish/submit_nuke_deadline.py | 1 + .../ayon_deadline/plugins/publish/submit_publish_cache_job.py | 1 + .../client/ayon_deadline/plugins/publish/submit_publish_job.py | 1 + 11 files changed, 11 insertions(+) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py index 311dbcedd5..a6d697a9e8 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py @@ -31,6 +31,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, label = "Submit Render to Deadline" hosts = ["blender"] families = ["render"] + settings_category = "deadline" use_published = True priority = 50 diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py index a17bf0c3ef..f58fb31919 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py @@ -18,6 +18,7 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin): order = pyblish.api.IntegratorOrder + 0.1 hosts = ["celaction"] families = ["render.farm"] + settings_category = "deadline" deadline_department = "" deadline_priority = 50 diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py index 9eea4d6549..e26a6b8fb2 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py @@ -27,6 +27,7 @@ class FusionSubmitDeadline( hosts = ["fusion"] families = ["render"] targets = ["local"] + settings_category = "deadline" # presets plugin = None diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py index d52b16b27d..e7223dc699 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py @@ -240,6 +240,7 @@ class HarmonySubmitDeadline( hosts = ["harmony"] families = ["render.farm"] targets = ["local"] + settings_category = "deadline" optional = True use_published = False diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py index 5826607ff4..8857e4778f 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py @@ -43,6 +43,7 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline hosts = ["houdini"] families = ["publish.hou"] targets = ["local"] + settings_category = "deadline" priority = 50 chunk_size = 999999 diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py index 590abc3f12..cc682614d8 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py @@ -76,6 +76,7 @@ class HoudiniSubmitDeadline( "karma_rop", "vray_rop"] targets = ["local"] + settings_category = "deadline" use_published = True # presets diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py index 4cb510f1cb..6455474f77 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py @@ -39,6 +39,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, hosts = ["max"] families = ["maxrender"] targets = ["local"] + settings_category = "deadline" use_published = True priority = 50 diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py index b1193fb914..e2e12d2f06 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py @@ -105,6 +105,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, hosts = ["maya"] families = ["renderlayer"] targets = ["local"] + settings_category = "deadline" tile_assembler_plugin = "OpenPypeTileAssembler" priority = 50 diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py index db35c2ae67..bdbbc926ac 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py @@ -32,6 +32,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin, families = ["render", "prerender"] optional = True targets = ["local"] + settings_category = "deadline" # presets priority = 50 diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py index 103f1355da..30fab9b1e6 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py @@ -54,6 +54,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, label = "Submit cache jobs to Deadline" order = pyblish.api.IntegratorOrder + 0.2 icon = "tractor" + settings_category = "deadline" targets = ["local"] diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py index 64313c5c4d..756975e266 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py @@ -95,6 +95,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, "arnold_rop", "mantra_rop", "karma_rop", "vray_rop", "redshift_rop"] + settings_category = "deadline" aov_filter = [ { From 9b258490148671e9f37413ad9e483e30c09ab544 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:38:49 +0200 Subject: [PATCH 08/11] fix more imports --- .../client/ayon_deadline/plugins/publish/collect_pools.py | 2 +- .../plugins/publish/submit_aftereffects_deadline.py | 4 ++-- .../ayon_deadline/plugins/publish/submit_blender_deadline.py | 4 ++-- .../plugins/publish/submit_celaction_deadline.py | 2 +- .../ayon_deadline/plugins/publish/submit_fusion_deadline.py | 2 +- .../ayon_deadline/plugins/publish/submit_harmony_deadline.py | 4 ++-- .../plugins/publish/submit_houdini_cache_deadline.py | 4 ++-- .../plugins/publish/submit_houdini_render_deadline.py | 4 ++-- .../ayon_deadline/plugins/publish/submit_max_deadline.py | 4 ++-- .../ayon_deadline/plugins/publish/submit_maya_deadline.py | 5 +++-- .../ayon_deadline/plugins/publish/submit_nuke_deadline.py | 2 +- .../plugins/publish/submit_publish_cache_job.py | 3 +-- .../ayon_deadline/plugins/publish/submit_publish_job.py | 2 +- .../plugins/publish/validate_deadline_connection.py | 2 +- .../plugins/publish/validate_expected_and_rendered_files.py | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py index 2592d358e5..49e247e872 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/collect_pools.py @@ -86,7 +86,7 @@ class CollectDeadlinePools(pyblish.api.InstancePlugin, # but the Deadline server URL can be dynamic and # can be set per render instance. Since get_attribute_defs # can't be dynamic unfortunately EnumDef isn't possible (yet?) - # pool_names = self.deadline_module.get_deadline_pools(deadline_url, + # pool_names = self.deadline_addon.get_deadline_pools(deadline_url, # self.log) # secondary_pool_names = ["-"] + pool_names diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py index 675346105c..9ca077d162 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py @@ -9,8 +9,8 @@ from ayon_core.lib import ( collect_frames, is_in_tests, ) -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo @attr.s diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py index a6d697a9e8..a5e2398838 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py @@ -15,8 +15,8 @@ from ayon_core.lib import ( from ayon_core.pipeline.publish import AYONPyblishPluginMixin from ayon_core.pipeline.farm.tools import iter_expected_files -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo @attr.s diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py index f58fb31919..e9313e3f2f 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_celaction_deadline.py @@ -4,7 +4,7 @@ import json import getpass import pyblish.api -from openpype_modules.deadline.abstract_submit_deadline import requests_post +from ayon_deadline.abstract_submit_deadline import requests_post class CelactionSubmitDeadline(pyblish.api.InstancePlugin): diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py index e26a6b8fb2..f90bb9b597 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py @@ -4,7 +4,7 @@ import getpass import pyblish.api -from openpype_modules.deadline.abstract_submit_deadline import requests_post +from ayon_deadline.abstract_submit_deadline import requests_post from ayon_core.pipeline.publish import ( AYONPyblishPluginMixin ) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py index e7223dc699..1a40f6f302 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py @@ -10,8 +10,8 @@ from datetime import datetime import attr import pyblish.api -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.lib import is_in_tests diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py index 8857e4778f..ac9ad570c3 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_cache_deadline.py @@ -12,8 +12,8 @@ from ayon_core.lib import ( from ayon_core.pipeline import ( AYONPyblishPluginMixin ) -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo @attr.s diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py index cc682614d8..d3fbe62963 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_houdini_render_deadline.py @@ -6,13 +6,13 @@ from datetime import datetime import pyblish.api from ayon_core.pipeline import AYONPyblishPluginMixin -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.lib import ( is_in_tests, TextDef, NumberDef ) +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo @attr.s diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py index 6455474f77..61d02c9b54 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py @@ -20,8 +20,8 @@ from ayon_max.api.lib import ( get_multipass_setting ) from ayon_max.api.lib_rendersettings import RenderSettings -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo @attr.s diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py index e2e12d2f06..957146cb79 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py @@ -42,10 +42,11 @@ from ayon_core.lib import ( from ayon_maya.api.lib_rendersettings import RenderSettings from ayon_maya.api.lib import get_attr_in_layer -from openpype_modules.deadline import abstract_submit_deadline -from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo from ayon_core.pipeline.farm.tools import iter_expected_files +from ayon_deadline import abstract_submit_deadline +from ayon_deadline.abstract_submit_deadline import DeadlineJobInfo + def _validate_deadline_bool_value(instance, attribute, value): if not isinstance(value, (str, bool)): diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py index bdbbc926ac..7ead5142cf 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_nuke_deadline.py @@ -6,7 +6,6 @@ from datetime import datetime import pyblish.api -from openpype_modules.deadline.abstract_submit_deadline import requests_post from ayon_core.pipeline.publish import ( AYONPyblishPluginMixin ) @@ -15,6 +14,7 @@ from ayon_core.lib import ( BoolDef, NumberDef ) +from ayon_deadline.abstract_submit_deadline import requests_post class NukeSubmitDeadline(pyblish.api.InstancePlugin, diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py index 30fab9b1e6..2bb138d849 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py @@ -8,11 +8,9 @@ from copy import deepcopy import ayon_api import pyblish.api -from openpype_modules.deadline.abstract_submit_deadline import requests_post from ayon_core.pipeline import publish from ayon_core.lib import EnumDef, is_in_tests from ayon_core.pipeline.version_start import get_versioning_start - from ayon_core.pipeline.farm.pyblish_functions import ( create_skeleton_instance_cache, create_instances_for_cache, @@ -20,6 +18,7 @@ from ayon_core.pipeline.farm.pyblish_functions import ( prepare_cache_representations, create_metadata_path ) +from ayon_deadline.abstract_submit_deadline import requests_post class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py index 756975e266..721cd682ea 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py @@ -9,7 +9,6 @@ import clique import ayon_api import pyblish.api -from openpype_modules.deadline.abstract_submit_deadline import requests_post from ayon_core.pipeline import publish from ayon_core.lib import EnumDef, is_in_tests from ayon_core.pipeline.version_start import get_versioning_start @@ -21,6 +20,7 @@ from ayon_core.pipeline.farm.pyblish_functions import ( prepare_representations, create_metadata_path ) +from ayon_deadline.abstract_submit_deadline import requests_post def get_resource_files(resources, frame_range=None): diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py index 8fffd47786..fd89e3a2a7 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_deadline_connection.py @@ -2,7 +2,7 @@ import pyblish.api from ayon_core.pipeline import PublishXmlValidationError -from openpype_modules.deadline.abstract_submit_deadline import requests_get +from ayon_deadline.abstract_submit_deadline import requests_get class ValidateDeadlineConnection(pyblish.api.InstancePlugin): diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py index 83e867408c..3fd13cfa10 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/validate_expected_and_rendered_files.py @@ -4,7 +4,7 @@ import requests import pyblish.api from ayon_core.lib import collect_frames -from openpype_modules.deadline.abstract_submit_deadline import requests_get +from ayon_deadline.abstract_submit_deadline import requests_get class ValidateExpectedFiles(pyblish.api.InstancePlugin): From 9703feb2d0fdbf4ffebb1c3b1b54dc0b1d09fd6b Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:39:05 +0200 Subject: [PATCH 09/11] simplified initialization --- .../deadline/client/ayon_deadline/addon.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/addon.py b/server_addon/deadline/client/ayon_deadline/addon.py index 54ed6dc8d3..87fc2ad665 100644 --- a/server_addon/deadline/client/ayon_deadline/addon.py +++ b/server_addon/deadline/client/ayon_deadline/addon.py @@ -21,23 +21,18 @@ class DeadlineAddon(AYONAddon, IPluginPaths): version = __version__ def initialize(self, studio_settings): - # This module is always enabled - deadline_servers_info = {} - enabled = self.name in studio_settings - if enabled: - deadline_settings = studio_settings[self.name] - deadline_servers_info = { - url_item["name"]: url_item - for url_item in deadline_settings["deadline_urls"] - } + deadline_settings = studio_settings[self.name] + deadline_servers_info = { + url_item["name"]: url_item + for url_item in deadline_settings["deadline_urls"] + } - if enabled and not deadline_servers_info: - enabled = False + if not deadline_servers_info: + self.enabled = False self.log.warning(( "Deadline Webservice URLs are not specified. Disabling addon." )) - self.enabled = enabled self.deadline_servers_info = deadline_servers_info def get_plugin_paths(self): From ace0a733c4059c57edd1cfffa77cd15a2ca32aa7 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:39:53 +0200 Subject: [PATCH 10/11] modify formatting in site settings model --- .../deadline/server/settings/site_settings.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/server_addon/deadline/server/settings/site_settings.py b/server_addon/deadline/server/settings/site_settings.py index a77a6edc7e..92c092324e 100644 --- a/server_addon/deadline/server/settings/site_settings.py +++ b/server_addon/deadline/server/settings/site_settings.py @@ -2,25 +2,27 @@ from ayon_server.settings import ( BaseSettingsModel, SettingsField, ) + from .main import defined_deadline_ws_name_enum_resolver class CredentialPerServerModel(BaseSettingsModel): """Provide credentials for configured DL servers""" _layout = "expanded" - server_name: str = SettingsField("", + server_name: str = SettingsField( + "", title="DL server name", - enum_resolver=defined_deadline_ws_name_enum_resolver) - username: str = SettingsField("", - title="Username") - password: str = SettingsField("", - title="Password") + enum_resolver=defined_deadline_ws_name_enum_resolver + ) + username: str = SettingsField("", title="Username") + password: str = SettingsField("", title="Password") class DeadlineSiteSettings(BaseSettingsModel): local_settings: list[CredentialPerServerModel] = SettingsField( default_factory=list, title="Local setting", - description="Please provide credentials for configured Deadline servers", + description=( + "Please provide credentials for configured Deadline servers" + ), ) - From d606dec5ad42c1095183833d3b12f3bea91ed6a6 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:31:47 +0200 Subject: [PATCH 11/11] fix ruff ignore paths --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2f30778519..5fb7935f62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,10 +79,10 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" exclude = [ "client/ayon_core/hosts/unreal/integration/*", - "client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/*", - "client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/*", "client/ayon_core/modules/click_wrap.py", "client/ayon_core/scripts/slates/__init__.py", + "server_addon/deadline/client/ayon_deadline/repository/custom/plugins/CelAction/*", + "server_addon/deadline/client/ayon_deadline/repository/custom/plugins/HarmonyAYON/*", "server_addon/hiero/client/ayon_hiero/api/startup/*", "server_addon/aftereffects/client/ayon_aftereffects/api/extension/js/libs/*" ]