Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-02 00:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved usage of hooks out of UI actions to utils

Browse source 
It is assumed that utils could be used in some kind 'load API', `actions` are tightly bound to UI loading.
This commit is contained in:
Petr Kalis 2025-04-04 15:39:32 +02:00
parent 7ec99b3715
commit e76691ea6e
2 changed files with 72 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

74
client/ayon_core/pipeline/load/utils.py
View file

@ -288,7 +288,13 @@ def get_representation_context(project_name, representation):
def load_with_repre_context(
Loader, repre_context, namespace=None, name=None, options=None, **kwargs
Loader,
repre_context,
namespace=None,
name=None,
options=None,
hooks=None,
**kwargs
):
# Ensure the Loader is compatible for the representation
@ -322,11 +328,24 @@ def load_with_repre_context(
# Deprecated - to be removed in OpenPype 3.16.6 or 3.17.0.
loader._fname = get_representation_path_from_context(repre_context)
return loader.load(repre_context, name, namespace, options)
return _load_context(
Loader,
repre_context,
name,
namespace,
options,
hooks
)
def load_with_product_context(
Loader, product_context, namespace=None, name=None, options=None, **kwargs
Loader,
product_context,
namespace=None,
name=None,
options=None,
hooks=None,
**kwargs
):
# Ensure options is a dictionary when no explicit options provided
@ -344,12 +363,24 @@ def load_with_product_context(
Loader.__name__, product_context["folder"]["path"]
)
)
return Loader().load(product_context, name, namespace, options)
return _load_context(
Loader,
product_context,
name,
namespace,
options,
hooks
)
def load_with_product_contexts(
Loader, product_contexts, namespace=None, name=None, options=None, **kwargs
Loader,
product_contexts,
namespace=None,
name=None,
options=None,
hooks=None,
**kwargs
):
# Ensure options is a dictionary when no explicit options provided
@ -371,8 +402,37 @@ def load_with_product_contexts(
Loader.__name__, joined_product_names
)
)
return _load_context(
Loader,
product_contexts,
name,
namespace,
options,
hooks
)
return Loader().load(product_contexts, name, namespace, options)
def _load_context(Loader, contexts, hooks, name, namespace, options):
"""Helper function to wrap hooks around generic load function.
Only dynamic part is different context(s) to be loaded.
"""
for hook_plugin in hooks.get("pre", []):
hook_plugin.process(
contexts,
name,
namespace,
options,
)
load_return = Loader().load(contexts, name, namespace, options)
for hook_plugin in hooks.get("post", []):
hook_plugin.process(
contexts,
name,
namespace,
options,
)
return load_return
def load_container(

49
client/ayon_core/tools/loader/models/actions.py
View file

@ -781,26 +781,14 @@ class LoaderActionsModel:
if version < 0:
version = "Hero"
try:
for hook_plugin in hooks.get("pre", []):
hook_plugin.process(
loader,
repre_context,
options=options
)
load_with_repre_context(
loader,
repre_context,
options=options
options=options,
hooks=hooks
)
for hook_plugin in hooks.get("post", []):
hook_plugin.process(
loader,
repre_context,
options=options
)
except IncompatibleLoaderError as exc:
print(exc)
error_info.append((
@ -855,26 +843,12 @@ class LoaderActionsModel:
product_name = context.get("product", {}).get("name") or "N/A"
product_names.append(product_name)
try:
for hook_plugin in hooks.get("pre", []):
hook_plugin.process(
loader,
version_contexts,
options=options
)
load_with_product_contexts(
loader,
version_contexts,
options=options,
hooks=hooks
)
for hook_plugin in hooks.get("post", []):
hook_plugin.process(
loader,
version_contexts,
options=options
)
except Exception as exc:
formatted_traceback = None
if not isinstance(exc, LoadError):
@ -895,26 +869,13 @@ class LoaderActionsModel:
version_context.get("product", {}).get("name") or "N/A"
)
try:
for hook_plugin in hooks.get("pre", []):
hook_plugin.process(
loader,
version_contexts,
options=options
)
load_with_product_context(
loader,
version_context,
options=options
options=options,
hooks=hooks
)
for hook_plugin in hooks.get("post", []):
hook_plugin.process(
loader,
version_context,
options=options
)
except Exception as exc:
formatted_traceback = None
if not isinstance(exc, LoadError):