From c3c4951a31e0f8b1d1002ed7eb82fef0efa4b706 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:11:46 +0200 Subject: [PATCH 1/9] move client code next to server codebase --- .../celaction/client/ayon_celaction}/__init__.py | 0 .../celaction/client/ayon_celaction}/addon.py | 0 .../ayon_celaction}/hooks/pre_celaction_setup.py | 0 .../client/ayon_celaction}/plugins/__init__.py | 0 .../plugins/publish/collect_celaction_cli_kwargs.py | 0 .../plugins/publish/collect_celaction_instances.py | 0 .../plugins/publish/collect_render_path.py | 0 .../plugins/publish/integrate_version_up.py | 0 .../resources/celaction_template_scene.scn | Bin .../client/ayon_celaction}/scripts/__init__.py | 0 .../client/ayon_celaction}/scripts/publish_cli.py | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/__init__.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/addon.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/hooks/pre_celaction_setup.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/plugins/__init__.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/plugins/publish/collect_celaction_cli_kwargs.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/plugins/publish/collect_celaction_instances.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/plugins/publish/collect_render_path.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/plugins/publish/integrate_version_up.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/resources/celaction_template_scene.scn (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/scripts/__init__.py (100%) rename {client/ayon_core/hosts/celaction => server_addon/celaction/client/ayon_celaction}/scripts/publish_cli.py (100%) diff --git a/client/ayon_core/hosts/celaction/__init__.py b/server_addon/celaction/client/ayon_celaction/__init__.py similarity index 100% rename from client/ayon_core/hosts/celaction/__init__.py rename to server_addon/celaction/client/ayon_celaction/__init__.py diff --git a/client/ayon_core/hosts/celaction/addon.py b/server_addon/celaction/client/ayon_celaction/addon.py similarity index 100% rename from client/ayon_core/hosts/celaction/addon.py rename to server_addon/celaction/client/ayon_celaction/addon.py diff --git a/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py similarity index 100% rename from client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py rename to server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py diff --git a/client/ayon_core/hosts/celaction/plugins/__init__.py b/server_addon/celaction/client/ayon_celaction/plugins/__init__.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/__init__.py rename to server_addon/celaction/client/ayon_celaction/plugins/__init__.py diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_cli_kwargs.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_cli_kwargs.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_cli_kwargs.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_cli_kwargs.py diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_instances.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_instances.py diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py diff --git a/client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/integrate_version_up.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/integrate_version_up.py diff --git a/client/ayon_core/hosts/celaction/resources/celaction_template_scene.scn b/server_addon/celaction/client/ayon_celaction/resources/celaction_template_scene.scn similarity index 100% rename from client/ayon_core/hosts/celaction/resources/celaction_template_scene.scn rename to server_addon/celaction/client/ayon_celaction/resources/celaction_template_scene.scn diff --git a/client/ayon_core/hosts/celaction/scripts/__init__.py b/server_addon/celaction/client/ayon_celaction/scripts/__init__.py similarity index 100% rename from client/ayon_core/hosts/celaction/scripts/__init__.py rename to server_addon/celaction/client/ayon_celaction/scripts/__init__.py diff --git a/client/ayon_core/hosts/celaction/scripts/publish_cli.py b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py similarity index 100% rename from client/ayon_core/hosts/celaction/scripts/publish_cli.py rename to server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py From fb7dc5b07a6279f3668d9674c9d0344041b87fd3 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:12:24 +0200 Subject: [PATCH 2/9] removed unnecessary __init__ file --- server_addon/celaction/client/ayon_celaction/plugins/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 server_addon/celaction/client/ayon_celaction/plugins/__init__.py diff --git a/server_addon/celaction/client/ayon_celaction/plugins/__init__.py b/server_addon/celaction/client/ayon_celaction/plugins/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 From 0af0545f533f2112e8f352a374c81d67c673814f Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:13:04 +0200 Subject: [PATCH 3/9] fix imports --- .../client/ayon_celaction/hooks/pre_celaction_setup.py | 2 +- .../celaction/client/ayon_celaction/scripts/publish_cli.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py index 8350c7b7c8..2b76b30015 100644 --- a/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py +++ b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py @@ -4,7 +4,7 @@ import winreg import subprocess from ayon_core.lib import get_ayon_launcher_args from ayon_applications import PreLaunchHook, LaunchTypes -from ayon_core.hosts.celaction import CELACTION_ROOT_DIR +from ayon_celaction import CELACTION_ROOT_DIR class CelactionPrelaunchHook(PreLaunchHook): diff --git a/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py index 92019b8702..9888244d6f 100644 --- a/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py +++ b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py @@ -4,7 +4,7 @@ import sys import pyblish.api import pyblish.util -import ayon_core.hosts.celaction +from ayon_celaction import CELACTION_ROOT_DIR from ayon_core.lib import Logger from ayon_core.tools.utils import host_tools from ayon_core.pipeline import install_ayon_plugins @@ -13,8 +13,7 @@ from ayon_core.pipeline import install_ayon_plugins log = Logger.get_logger("celaction") PUBLISH_HOST = "celaction" -HOST_DIR = os.path.dirname(os.path.abspath(ayon_core.hosts.celaction.__file__)) -PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PLUGINS_DIR = os.path.join(CELACTION_ROOT_DIR, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") From 7bd81a83e649b3e02a11af592d0642e904355c58 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:13:17 +0200 Subject: [PATCH 4/9] added settings category --- .../ayon_celaction/plugins/publish/collect_render_path.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py index 1bb4d54831..36a033ebb0 100644 --- a/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py +++ b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py @@ -10,6 +10,8 @@ class CollectRenderPath(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.495 families = ["render.farm"] + settings_category = "celaction" + # Presets output_extension = "png" anatomy_template_key_render_files = None From 4267252a36f8ba0841e0cfe909dcb7538dd8295d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:13:27 +0200 Subject: [PATCH 5/9] formatting changes --- .../client/ayon_celaction/hooks/pre_celaction_setup.py | 8 +++----- .../ayon_celaction/plugins/publish/collect_render_path.py | 2 +- .../client/ayon_celaction/scripts/publish_cli.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py index 2b76b30015..52622d43b8 100644 --- a/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py +++ b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py @@ -8,9 +8,7 @@ from ayon_celaction import CELACTION_ROOT_DIR class CelactionPrelaunchHook(PreLaunchHook): - """ - Bootstrap celacion with pype - """ + """Bootstrap celacion with AYON""" app_groups = {"celaction"} platforms = {"windows"} launch_types = {LaunchTypes.local} @@ -39,7 +37,7 @@ class CelactionPrelaunchHook(PreLaunchHook): CELACTION_ROOT_DIR, "scripts", "publish_cli.py" ) subprocess_args = get_ayon_launcher_args("run", path_to_cli) - openpype_executable = subprocess_args.pop(0) + executable = subprocess_args.pop(0) workfile_settings = self.get_workfile_settings() winreg.SetValueEx( @@ -47,7 +45,7 @@ class CelactionPrelaunchHook(PreLaunchHook): "SubmitAppTitle", 0, winreg.REG_SZ, - openpype_executable + executable ) # add required arguments for workfile path diff --git a/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py index 36a033ebb0..3bcd1c69b3 100644 --- a/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py +++ b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py @@ -1,6 +1,6 @@ import os -import pyblish.api import copy +import pyblish.api class CollectRenderPath(pyblish.api.InstancePlugin): diff --git a/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py index 9888244d6f..4e54aa253a 100644 --- a/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py +++ b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py @@ -18,7 +18,7 @@ PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") def main(): - # Registers pype's Global pyblish plugins + # Registers global pyblish plugins install_ayon_plugins() if os.path.exists(PUBLISH_PATH): From 438230bf5cdcaccf5506eebee1bac8fec917825b Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:13:33 +0200 Subject: [PATCH 6/9] update package.py --- server_addon/celaction/package.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/server_addon/celaction/package.py b/server_addon/celaction/package.py index 2b11a8630f..8b9069d019 100644 --- a/server_addon/celaction/package.py +++ b/server_addon/celaction/package.py @@ -1,3 +1,12 @@ name = "celaction" title = "CelAction" -version = "0.1.0" +version = "0.2.0" + +client_dir = "ayon_celaction" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = { + "applications": ">=0.2.0", +} From 04126feff2919110755258aa141821ef625a7825 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:15:26 +0200 Subject: [PATCH 7/9] added milestone version --- client/ayon_core/addon/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index 939fab68b8..865c6a56a3 100644 --- a/client/ayon_core/addon/base.py +++ b/client/ayon_core/addon/base.py @@ -51,6 +51,7 @@ IGNORED_MODULES_IN_AYON = set() # - this is used to log the missing addon MOVED_ADDON_MILESTONE_VERSIONS = { "applications": VersionInfo(0, 2, 0), + "celaction": VersionInfo(0, 2, 0), "clockify": VersionInfo(0, 2, 0), "traypublisher": VersionInfo(0, 2, 0), "tvpaint": VersionInfo(0, 2, 0), From cfb06c9a9be33b6f472263200a5f9db26bd4a66a Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:36:13 +0200 Subject: [PATCH 8/9] added version.py --- server_addon/celaction/client/ayon_celaction/version.py | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 server_addon/celaction/client/ayon_celaction/version.py diff --git a/server_addon/celaction/client/ayon_celaction/version.py b/server_addon/celaction/client/ayon_celaction/version.py new file mode 100644 index 0000000000..ceed47c3a0 --- /dev/null +++ b/server_addon/celaction/client/ayon_celaction/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'celaction' version.""" +__version__ = "0.2.0" From ddb4da0e869ed00ed8ac09cf382431cc58e328cb Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 30 May 2024 11:36:59 +0200 Subject: [PATCH 9/9] added version to cealaction addon class --- server_addon/celaction/client/ayon_celaction/__init__.py | 3 +++ server_addon/celaction/client/ayon_celaction/addon.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/server_addon/celaction/client/ayon_celaction/__init__.py b/server_addon/celaction/client/ayon_celaction/__init__.py index 8983d48d7d..0df0224125 100644 --- a/server_addon/celaction/client/ayon_celaction/__init__.py +++ b/server_addon/celaction/client/ayon_celaction/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( CELACTION_ROOT_DIR, CelactionAddon, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "CELACTION_ROOT_DIR", "CelactionAddon", ) diff --git a/server_addon/celaction/client/ayon_celaction/addon.py b/server_addon/celaction/client/ayon_celaction/addon.py index d00401a2e0..ad04a54088 100644 --- a/server_addon/celaction/client/ayon_celaction/addon.py +++ b/server_addon/celaction/client/ayon_celaction/addon.py @@ -1,11 +1,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + CELACTION_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) class CelactionAddon(AYONAddon, IHostAddon): name = "celaction" + version = __version__ host_name = "celaction" def get_launch_hook_paths(self, app):