From f5d69e8d8dfa8210f7a8db17b2c2a1e41454fbb5 Mon Sep 17 00:00:00 2001 From: "Sveinbjorn J. Tryggvason" Date: Tue, 1 Jul 2025 09:29:48 +0000 Subject: [PATCH 1/6] add gaffer to plugin hosts list --- client/ayon_core/hooks/pre_add_last_workfile_arg.py | 3 ++- client/ayon_core/hooks/pre_ocio_hook.py | 3 ++- client/ayon_core/plugins/publish/validate_file_saved.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/hooks/pre_add_last_workfile_arg.py b/client/ayon_core/hooks/pre_add_last_workfile_arg.py index bafc075888..d671e136d7 100644 --- a/client/ayon_core/hooks/pre_add_last_workfile_arg.py +++ b/client/ayon_core/hooks/pre_add_last_workfile_arg.py @@ -30,8 +30,9 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): "aftereffects", "wrap", "openrv", - "cinema4d", + "cinema4d" "silhouette", + "gaffer", } launch_types = {LaunchTypes.local} diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py index d1a02e613d..1e33ea7805 100644 --- a/client/ayon_core/hooks/pre_ocio_hook.py +++ b/client/ayon_core/hooks/pre_ocio_hook.py @@ -21,8 +21,9 @@ class OCIOEnvHook(PreLaunchHook): "hiero", "resolve", "openrv", - "cinema4d", + "cinema4d" "silhouette", + "gaffer", } launch_types = set() diff --git a/client/ayon_core/plugins/publish/validate_file_saved.py b/client/ayon_core/plugins/publish/validate_file_saved.py index 4f9e84aee0..7656687b4f 100644 --- a/client/ayon_core/plugins/publish/validate_file_saved.py +++ b/client/ayon_core/plugins/publish/validate_file_saved.py @@ -37,7 +37,7 @@ class ValidateCurrentSaveFile(pyblish.api.ContextPlugin): label = "Validate File Saved" order = pyblish.api.ValidatorOrder - 0.1 hosts = ["fusion", "houdini", "max", "maya", "nuke", "substancepainter", - "cinema4d", "silhouette"] + "cinema4d", "silhouette", "gaffer"] actions = [SaveByVersionUpAction, ShowWorkfilesAction] def process(self, context): From 2c9d579a4bf50450c3cc232d57f10c9be8eb4360 Mon Sep 17 00:00:00 2001 From: "Sveinbjorn J. Tryggvason" Date: Tue, 1 Jul 2025 09:38:01 +0000 Subject: [PATCH 2/6] list items are separated by commas, duh --- client/ayon_core/hooks/pre_add_last_workfile_arg.py | 2 +- client/ayon_core/hooks/pre_ocio_hook.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/hooks/pre_add_last_workfile_arg.py b/client/ayon_core/hooks/pre_add_last_workfile_arg.py index d671e136d7..d6110ea367 100644 --- a/client/ayon_core/hooks/pre_add_last_workfile_arg.py +++ b/client/ayon_core/hooks/pre_add_last_workfile_arg.py @@ -30,7 +30,7 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook): "aftereffects", "wrap", "openrv", - "cinema4d" + "cinema4d", "silhouette", "gaffer", } diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py index 1e33ea7805..12f9454a88 100644 --- a/client/ayon_core/hooks/pre_ocio_hook.py +++ b/client/ayon_core/hooks/pre_ocio_hook.py @@ -21,7 +21,7 @@ class OCIOEnvHook(PreLaunchHook): "hiero", "resolve", "openrv", - "cinema4d" + "cinema4d", "silhouette", "gaffer", } From f26f69eae6a0afce08e0ae73e8a4b402d962ae80 Mon Sep 17 00:00:00 2001 From: Roy Nieterau Date: Tue, 1 Jul 2025 16:08:48 +0200 Subject: [PATCH 3/6] Fix `IPublishHost` import --- client/ayon_core/pipeline/create/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index d997f464fb..05531afd05 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -24,7 +24,7 @@ from ayon_core.settings import get_project_settings from ayon_core.lib import is_func_signature_supported from ayon_core.lib.events import QueuedEventSystem from ayon_core.lib.attribute_definitions import get_default_values -from ayon_core.host import IWorkfileHost +from ayon_core.host import IWorkfileHost, IPublishHost from ayon_core.pipeline import Anatomy from ayon_core.pipeline.template_data import get_template_data from ayon_core.pipeline.plugin_discover import DiscoverResult @@ -49,7 +49,7 @@ from .creator_plugins import ( discover_convertor_plugins, ) if typing.TYPE_CHECKING: - from ayon_core.host import HostBase, IPublishHost + from ayon_core.host import HostBase from ayon_core.lib import AbstractAttrDef from ayon_core.lib.events import EventCallback, Event From aed5a5e6e09088801b8c1968e3c769efd18c32d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= Date: Wed, 2 Jul 2025 10:54:55 +0200 Subject: [PATCH 4/6] :recycle: add env tool functions to `ayon.lib` init --- client/ayon_core/lib/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/ayon_core/lib/__init__.py b/client/ayon_core/lib/__init__.py index 477eb29c28..5ccc8d03e5 100644 --- a/client/ayon_core/lib/__init__.py +++ b/client/ayon_core/lib/__init__.py @@ -50,8 +50,10 @@ from .attribute_definitions import ( ) from .env_tools import ( + compute_env_variables_structure, env_value_to_bool, get_paths_from_environ, + merge_env_variables, ) from .terminal import Terminal @@ -166,8 +168,10 @@ __all__ = [ "path_to_subprocess_arg", "CREATE_NO_WINDOW", + "compute_env_variables_structure", "env_value_to_bool", "get_paths_from_environ", + "merge_env_variables", "ToolNotFoundError", "find_executable", From b1e0a925059eb5c077a35c60e663bb61bd58a27d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 3 Jul 2025 13:05:31 +0200 Subject: [PATCH 5/6] define logging config for AYON processes --- client/ayon_core/cli.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/ayon_core/cli.py b/client/ayon_core/cli.py index 2340696ad9..5978e8ba19 100644 --- a/client/ayon_core/cli.py +++ b/client/ayon_core/cli.py @@ -2,6 +2,7 @@ """Package for handling AYON command line arguments.""" import os import sys +import logging import code import traceback from pathlib import Path @@ -23,6 +24,9 @@ from ayon_core.lib.env_tools import ( merge_env_variables, ) +logging.basicConfig() +log = logging.getLogger() + @click.group(invoke_without_command=True) @click.pass_context From 54ecd2b834ec773b75e600beb13445df5fa7799e Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 7 Jul 2025 12:40:34 +0200 Subject: [PATCH 6/6] move basicconfig to main --- client/ayon_core/cli.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/ayon_core/cli.py b/client/ayon_core/cli.py index 5978e8ba19..ca3dcc86ee 100644 --- a/client/ayon_core/cli.py +++ b/client/ayon_core/cli.py @@ -24,9 +24,6 @@ from ayon_core.lib.env_tools import ( merge_env_variables, ) -logging.basicConfig() -log = logging.getLogger() - @click.group(invoke_without_command=True) @click.pass_context @@ -310,6 +307,8 @@ def _add_addons(addons_manager): def main(*args, **kwargs): + logging.basicConfig() + initialize_ayon_connection() python_path = os.getenv("PYTHONPATH", "") split_paths = python_path.split(os.pathsep)