From 8956e70665926ee2c66fd3735bcf554d0f9137a4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 14:33:53 +0100
Subject: [PATCH 01/16] added discover login into openpype pipeline

---
 openpype/pipeline/plugin_discover.py | 208 +++++++++++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 openpype/pipeline/plugin_discover.py

diff --git a/openpype/pipeline/plugin_discover.py b/openpype/pipeline/plugin_discover.py
new file mode 100644
index 0000000000..305a8bab67
--- /dev/null
+++ b/openpype/pipeline/plugin_discover.py
@@ -0,0 +1,208 @@
+import os
+import inspect
+from openpype.lib.python_module_tools import (
+    modules_from_path,
+    classes_from_module,
+)
+
+
+class DiscoverResult:
+    """Hold result of publish plugins discovery.
+
+    Stores discovered plugins duplicated plugins and file paths which
+    crashed on execution of file.
+    """
+
+    def __init__(self):
+        self.plugins = []
+        self.crashed_file_paths = {}
+        self.duplicated_plugins = []
+        self.abstract_plugins = []
+        self.ignored_plugins = set()
+
+    def __iter__(self):
+        for plugin in self.plugins:
+            yield plugin
+
+    def __getitem__(self, item):
+        return self.plugins[item]
+
+    def __setitem__(self, item, value):
+        self.plugins[item] = value
+
+
+class PluginDiscoverContext(object):
+    """Store and discover registered types nad registered paths to types.
+
+    Keeps in memory all registered types and their paths. Paths are dynamically
+    loaded on discover so different discover calls won't return the same
+    class objects even if were loaded from same file.
+    """
+
+    def __init__(self):
+        self._registered_plugins = {}
+        self._registered_plugin_paths = {}
+        self._last_discovered_plugins = {}
+
+    def get_last_discovered_plugins(self, superclass):
+        return self._last_discovered_plugins.get(superclass)
+
+    def discover(
+        self, superclass, allow_duplicates=True, ignore_classes=None
+    ):
+        """Find and return subclasses of `superclass`
+
+        Args:
+            superclass (type): Class which determines discovered subclasses.
+            allow_duplicates (bool): Validate class name duplications.
+            ignore_classes (list): List of classes that will be ignored
+                and not added to result.
+
+        Returns:
+            DiscoverResult: Object holding succesfully discovered plugins,
+                ignored plugins, plugins with missing abstract implementation
+                and duplicated plugin.
+        """
+
+        if not ignore_classes:
+            ignore_classes = []
+
+        result = DiscoverResult()
+        plugin_names = set()
+        registered_classes = self._registered_plugins.get(superclass) or []
+        registered_paths = self._registered_plugin_paths.get(superclass) or []
+        for cls in registered_classes:
+            if cls is superclass or cls in ignore_classes:
+                result.ignored_plugins.add(cls)
+                continue
+
+            if inspect.isabstract(cls):
+                result.abstract_plugins.append(cls)
+                continue
+
+            class_name = cls.__name__
+            if class_name in plugin_names:
+                result.duplicated_plugins.append(cls)
+                continue
+            plugin_names.add(class_name)
+            result.plugins.append(cls)
+
+        # Include plug-ins from registered paths
+        for path in registered_paths:
+            modules, crashed = modules_from_path(path)
+            for item in crashed:
+                filepath, exc_info = item
+                result.crashed_file_paths[filepath] = exc_info
+
+            for item in modules:
+                filepath, module = item
+                for cls in classes_from_module(superclass, module):
+                    if cls is superclass or cls in ignore_classes:
+                        result.ignored_plugins.add(cls)
+                        continue
+
+                    if inspect.isabstract(cls):
+                        result.abstract_plugins.append(cls)
+                        continue
+
+                    if not allow_duplicates:
+                        class_name = cls.__name__
+                        if class_name in plugin_names:
+                            result.duplicated_plugins.append(cls)
+                            continue
+                        plugin_names.add(class_name)
+
+                    result.plugins.append(cls)
+
+        self._last_discovered_plugins[superclass] = list(
+            result.plugins
+        )
+        return result
+
+    def register_plugin(self, superclass, cls):
+        """Register an individual `obj` of type `superclass`
+
+        Arguments:
+            superclass (type): Superclass of plug-in
+            cls (object): Subclass of `superclass`
+        """
+
+        if superclass not in self._registered_plugins:
+            self._registered_plugins[superclass] = list()
+
+        if cls not in self._registered_plugins[superclass]:
+            self._registered_plugins[superclass].append(cls)
+
+    def register_plugin_path(self, superclass, path):
+        """Register a directory of one or more plug-ins
+
+        Arguments:
+            superclass (type): Superclass of plug-ins to look for during discovery
+            path (str): Absolute path to directory in which to discover plug-ins
+
+        """
+
+        if superclass not in self._registered_plugin_paths:
+            self._registered_plugin_paths[superclass] = list()
+
+        path = os.path.normpath(path)
+        if path not in self._registered_plugin_paths[superclass]:
+            self._registered_plugin_paths[superclass].append(path)
+
+    def registered_plugin_paths(self):
+        """Return all currently registered plug-in paths"""
+        # Prohibit editing in-place
+        duplicate = {
+            superclass: paths[:]
+            for superclass, paths in self._registered_plugin_paths.items()
+        }
+        return duplicate
+
+    def deregister_plugin(self, superclass, plugin):
+        """Oppsite of `register_plugin()`"""
+        if superclass in self._registered_plugins:
+            self._registered_plugins[superclass].remove(plugin)
+
+    def deregister_plugin_path(self, superclass, path):
+        """Oppsite of `register_plugin_path()`"""
+        self._registered_plugin_paths[superclass].remove(path)
+
+
+class GlobalDiscover:
+    _context = None
+
+    @classmethod
+    def get_context(cls):
+        if cls._context is None:
+            cls._context = PluginDiscoverContext()
+        return cls._context
+
+
+def discover(superclass, allow_duplicates=True):
+    context = GlobalDiscover.get_context()
+    return context.discover(superclass, allow_duplicates)
+
+
+def get_last_discovered_plugins(superclass):
+    context = GlobalDiscover.get_context()
+    return context.get_last_discovered_plugins(superclass)
+
+
+def register_plugin(superclass, cls):
+    context = GlobalDiscover.get_context()
+    context.register_plugin(superclass, cls)
+
+
+def register_plugin_path(superclass, path):
+    context = GlobalDiscover.get_context()
+    context.register_plugin_path(superclass, path)
+
+
+def deregister_plugin(superclass, cls):
+    context = GlobalDiscover.get_context()
+    context.deregister_plugin(superclass, cls)
+
+
+def deregister_plugin_path(superclass, path):
+    context = GlobalDiscover.get_context()
+    context.deregister_plugin_path(superclass, path)

From 239f70a8f76df1536b19a0f07d6c070b0cf74b3d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 14:51:04 +0100
Subject: [PATCH 02/16] added better check of classes and subclasses

---
 openpype/lib/python_module_tools.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/openpype/lib/python_module_tools.py b/openpype/lib/python_module_tools.py
index f62c848e4a..4ef31b5579 100644
--- a/openpype/lib/python_module_tools.py
+++ b/openpype/lib/python_module_tools.py
@@ -5,8 +5,9 @@ import importlib
 import inspect
 import logging
 
+import six
+
 log = logging.getLogger(__name__)
-PY3 = sys.version_info[0] == 3
 
 
 def import_filepath(filepath, module_name=None):
@@ -28,7 +29,7 @@ def import_filepath(filepath, module_name=None):
     # Prepare module object where content of file will be parsed
     module = types.ModuleType(module_name)
 
-    if PY3:
+    if six.PY3:
         # Use loader so module has full specs
         module_loader = importlib.machinery.SourceFileLoader(
             module_name, filepath
@@ -38,7 +39,7 @@ def import_filepath(filepath, module_name=None):
         # Execute module code and store content to module
         with open(filepath) as _stream:
             # Execute content and store it to module object
-            exec(_stream.read(), module.__dict__)
+            six.exec_(_stream.read(), module.__dict__)
 
         module.__file__ = filepath
     return module
@@ -129,20 +130,14 @@ def classes_from_module(superclass, module):
     for name in dir(module):
         # It could be anything at this point
         obj = getattr(module, name)
-        if not inspect.isclass(obj):
-            continue
-
-        # These are subclassed from nothing, not even `object`
-        if not len(obj.__bases__) > 0:
+        if not inspect.isclass(obj) or obj is superclass:
             continue
 
         # Use string comparison rather than `issubclass`
         # in order to support reloading of this module.
-        bases = recursive_bases_from_class(obj)
-        if not any(base.__name__ == superclass.__name__ for base in bases):
-            continue
+        if issubclass(obj, superclass):
+            classes.append(obj)
 
-        classes.append(obj)
     return classes
 
 
@@ -228,7 +223,7 @@ def import_module_from_dirpath(dirpath, folder_name, dst_module_name=None):
         dst_module_name(str): Parent module name under which can be loaded
             module added.
     """
-    if PY3:
+    if six.PY3:
         module = _import_module_from_dirpath_py3(
             dirpath, folder_name, dst_module_name
         )

From dc9852a0d6fde1c40b33bdb1508156738affae02 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 14:53:14 +0100
Subject: [PATCH 03/16] use new register and discover functions for load,
 thumbnail and actions

---
 openpype/pipeline/actions.py      | 43 ++++++++++++-------------------
 openpype/pipeline/load/plugins.py | 40 ++++++++++++++--------------
 openpype/pipeline/thumbnail.py    | 17 ++++++------
 3 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/openpype/pipeline/actions.py b/openpype/pipeline/actions.py
index a045c92aa7..6cb2e9a5a4 100644
--- a/openpype/pipeline/actions.py
+++ b/openpype/pipeline/actions.py
@@ -1,4 +1,11 @@
 import logging
+from openpype.pipeline.plugin_discover import (
+    discover,
+    register_plugin,
+    register_plugin_path,
+    deregister_plugin,
+    deregister_plugin_path
+)
 
 
 class LauncherAction(object):
@@ -90,57 +97,39 @@ class InventoryAction(object):
 
 # Launcher action
 def discover_launcher_actions():
-    import avalon.api
-
-    return avalon.api.discover(LauncherAction)
+    return discover(LauncherAction).plugins
 
 
 def register_launcher_action(plugin):
-    import avalon.api
-
-    return avalon.api.register_plugin(LauncherAction, plugin)
+    return register_plugin(LauncherAction, plugin)
 
 
 def register_launcher_action_path(path):
-    import avalon.api
-
-    return avalon.api.register_plugin_path(LauncherAction, path)
+    return register_plugin_path(LauncherAction, path)
 
 
 # Inventory action
 def discover_inventory_actions():
-    import avalon.api
-
-    actions = avalon.api.discover(InventoryAction)
+    actions = discover(InventoryAction).plugins
     filtered_actions = []
     for action in actions:
         if action is not InventoryAction:
-            print("DISCOVERED", action)
             filtered_actions.append(action)
-        else:
-            print("GOT SOURCE")
+
     return filtered_actions
 
 
 def register_inventory_action(plugin):
-    import avalon.api
-
-    return avalon.api.register_plugin(InventoryAction, plugin)
+    return register_plugin(InventoryAction, plugin)
 
 
 def deregister_inventory_action(plugin):
-    import avalon.api
-
-    avalon.api.deregister_plugin(InventoryAction, plugin)
+    deregister_plugin(InventoryAction, plugin)
 
 
 def register_inventory_action_path(path):
-    import avalon.api
-
-    return avalon.api.register_plugin_path(InventoryAction, path)
+    return register_plugin_path(InventoryAction, path)
 
 
 def deregister_inventory_action_path(path):
-    import avalon.api
-
-    return avalon.api.deregister_plugin_path(InventoryAction, path)
+    return deregister_plugin_path(InventoryAction, path)
diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py
index 9b2b6bb084..fb5d1df9b5 100644
--- a/openpype/pipeline/load/plugins.py
+++ b/openpype/pipeline/load/plugins.py
@@ -1,5 +1,13 @@
 import logging
 
+from openpype.lib import set_plugin_attributes_from_settings
+from openpype.pipeline.plugin_discover import (
+    discover,
+    register_plugin,
+    register_plugin_path,
+    deregister_plugin,
+    deregister_plugin_path
+)
 from .utils import get_representation_path_from_context
 
 
@@ -102,30 +110,22 @@ class SubsetLoaderPlugin(LoaderPlugin):
 
 
 def discover_loader_plugins():
-    import avalon.api
-
-    return avalon.api.discover(LoaderPlugin)
+    plugins = discover(LoaderPlugin).plugins
+    set_plugin_attributes_from_settings(plugins, LoaderPlugin)
+    return plugins
 
 
 def register_loader_plugin(plugin):
-    import avalon.api
-
-    return avalon.api.register_plugin(LoaderPlugin, plugin)
-
-
-def deregister_loader_plugin_path(path):
-    import avalon.api
-
-    avalon.api.deregister_plugin_path(LoaderPlugin, path)
-
-
-def register_loader_plugin_path(path):
-    import avalon.api
-
-    return avalon.api.register_plugin_path(LoaderPlugin, path)
+    return register_plugin(LoaderPlugin, plugin)
 
 
 def deregister_loader_plugin(plugin):
-    import avalon.api
+    deregister_plugin(LoaderPlugin, plugin)
 
-    avalon.api.deregister_plugin(LoaderPlugin, plugin)
+
+def deregister_loader_plugin_path(path):
+    deregister_plugin_path(LoaderPlugin, path)
+
+
+def register_loader_plugin_path(path):
+    return register_plugin_path(LoaderPlugin, path)
diff --git a/openpype/pipeline/thumbnail.py b/openpype/pipeline/thumbnail.py
index 12bab83be6..47452b21e7 100644
--- a/openpype/pipeline/thumbnail.py
+++ b/openpype/pipeline/thumbnail.py
@@ -2,6 +2,11 @@ import os
 import copy
 import logging
 
+from .plugin_discover import (
+    discover,
+    register_plugin,
+    register_plugin_path,
+)
 log = logging.getLogger(__name__)
 
 
@@ -126,21 +131,15 @@ class BinaryThumbnail(ThumbnailResolver):
 
 # Thumbnail resolvers
 def discover_thumbnail_resolvers():
-    import avalon.api
-
-    return avalon.api.discover(ThumbnailResolver)
+    return discover(ThumbnailResolver).plugins
 
 
 def register_thumbnail_resolver(plugin):
-    import avalon.api
-
-    return avalon.api.register_plugin(ThumbnailResolver, plugin)
+    register_plugin(ThumbnailResolver, plugin)
 
 
 def register_thumbnail_resolver_path(path):
-    import avalon.api
-
-    return avalon.api.register_plugin_path(ThumbnailResolver, path)
+    register_plugin_path(ThumbnailResolver, path)
 
 
 register_thumbnail_resolver(TemplateResolver)

From 645531f4025f7606c90f92f6ce846876e9e05c51 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:05:10 +0100
Subject: [PATCH 04/16] creators have their specific functions

---
 openpype/pipeline/__init__.py               | 14 ++++++
 openpype/pipeline/create/__init__.py        | 16 ++++++-
 openpype/pipeline/create/creator_plugins.py | 51 ++++++++++++++++++++-
 3 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/openpype/pipeline/__init__.py b/openpype/pipeline/__init__.py
index d44fbad33e..eaee180619 100644
--- a/openpype/pipeline/__init__.py
+++ b/openpype/pipeline/__init__.py
@@ -15,6 +15,13 @@ from .create import (
 
     LegacyCreator,
     legacy_create,
+
+    discover_creator_plugins,
+    discover_legacy_creator_plugins,
+    register_creator_plugin,
+    deregister_creator_plugin,
+    register_creator_plugin_path,
+    deregister_creator_plugin_path,
 )
 
 from .load import (
@@ -81,6 +88,13 @@ __all__ = (
     "LegacyCreator",
     "legacy_create",
 
+    "discover_creator_plugins",
+    "discover_legacy_creator_plugins",
+    "register_creator_plugin",
+    "deregister_creator_plugin",
+    "register_creator_plugin_path",
+    "deregister_creator_plugin_path",
+
     # --- Load ---
     "HeroVersionType",
     "IncompatibleLoaderError",
diff --git a/openpype/pipeline/create/__init__.py b/openpype/pipeline/create/__init__.py
index 9571f56b8f..1beeb4267b 100644
--- a/openpype/pipeline/create/__init__.py
+++ b/openpype/pipeline/create/__init__.py
@@ -6,7 +6,14 @@ from .creator_plugins import (
 
     BaseCreator,
     Creator,
-    AutoCreator
+    AutoCreator,
+
+    discover_creator_plugins,
+    discover_legacy_creator_plugins,
+    register_creator_plugin,
+    deregister_creator_plugin,
+    register_creator_plugin_path,
+    deregister_creator_plugin_path,
 )
 
 from .context import (
@@ -29,6 +36,13 @@ __all__ = (
     "Creator",
     "AutoCreator",
 
+    "discover_creator_plugins",
+    "discover_legacy_creator_plugins",
+    "register_creator_plugin",
+    "deregister_creator_plugin",
+    "register_creator_plugin_path",
+    "deregister_creator_plugin_path",
+
     "CreatedInstance",
     "CreateContext",
 
diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 1ac2c420a2..dbeeb94050 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -8,7 +8,19 @@ from abc import (
 )
 import six
 
-from openpype.lib import get_subset_name_with_asset_doc
+from openpype.lib import (
+    get_subset_name_with_asset_doc,
+    set_plugin_attributes_from_settings,
+)
+from openpype.pipeline.plugin_discover import (
+    discover,
+    register_plugin,
+    register_plugin_path,
+    deregister_plugin,
+    deregister_plugin_path
+)
+
+from .legacy_create import LegacyCreator
 
 
 class CreatorError(Exception):
@@ -284,6 +296,43 @@ class AutoCreator(BaseCreator):
 
     Can be used e.g. for `workfile`.
     """
+
     def remove_instances(self, instances):
         """Skip removement."""
         pass
+
+
+def discover_creator_plugins():
+    return discover(BaseCreator).plugins
+
+
+def discover_legacy_creator_plugins():
+    plugins = discover(LegacyCreator).plugins
+    set_plugin_attributes_from_settings(plugins, LegacyCreator)
+    return plugins
+
+
+def register_creator_plugin(plugin):
+    if issubclass(plugin, BaseCreator):
+        register_plugin(BaseCreator, plugin)
+
+    elif issubclass(plugin, LegacyCreator):
+        register_plugin(LegacyCreator, plugin)
+
+
+def deregister_creator_plugin(plugin):
+    if issubclass(plugin, BaseCreator):
+        deregister_plugin(BaseCreator, plugin)
+
+    elif issubclass(plugin, LegacyCreator):
+        deregister_plugin(LegacyCreator, plugin)
+
+
+def register_creator_plugin_path(path):
+    register_plugin_path(BaseCreator, path)
+    register_plugin_path(LegacyCreator, path)
+
+
+def deregister_creator_plugin_path(path):
+    deregister_plugin_path(BaseCreator, path)
+    deregister_plugin_path(LegacyCreator, path)

From 77e2f6eb8d40315dd84cade6a40828e120f8811b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:11:43 +0100
Subject: [PATCH 05/16] use create register/discover functions in code

---
 openpype/hosts/aftereffects/api/pipeline.py         |  8 ++++----
 openpype/hosts/blender/api/pipeline.py              |  7 ++++---
 openpype/hosts/flame/api/pipeline.py                |  8 ++++----
 openpype/hosts/fusion/api/pipeline.py               | 10 +++++-----
 openpype/hosts/harmony/api/pipeline.py              |  7 ++++---
 openpype/hosts/hiero/api/pipeline.py                |  8 ++++----
 openpype/hosts/houdini/api/pipeline.py              |  4 ++--
 openpype/hosts/maya/api/pipeline.py                 |  6 ++++--
 openpype/hosts/nuke/api/lib.py                      |  3 ++-
 openpype/hosts/nuke/api/pipeline.py                 |  8 ++++----
 .../nuke/plugins/publish/validate_write_legacy.py   |  5 ++---
 openpype/hosts/photoshop/api/pipeline.py            |  7 ++++---
 openpype/hosts/resolve/api/pipeline.py              | 13 ++++++++-----
 openpype/hosts/tvpaint/api/pipeline.py              |  7 ++++---
 openpype/hosts/unreal/api/pipeline.py               |  7 ++++---
 openpype/lib/avalon_context.py                      |  4 ++--
 openpype/pipeline/create/context.py                 |  5 +++--
 openpype/tools/creator/model.py                     |  5 ++---
 18 files changed, 66 insertions(+), 56 deletions(-)

diff --git a/openpype/hosts/aftereffects/api/pipeline.py b/openpype/hosts/aftereffects/api/pipeline.py
index bb9affc9b6..94bc369856 100644
--- a/openpype/hosts/aftereffects/api/pipeline.py
+++ b/openpype/hosts/aftereffects/api/pipeline.py
@@ -5,15 +5,15 @@ from Qt import QtWidgets
 from bson.objectid import ObjectId
 
 import pyblish.api
-import avalon.api
 from avalon import io
 
 from openpype import lib
 from openpype.api import Logger
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 import openpype.hosts.aftereffects
@@ -73,7 +73,7 @@ def install():
     pyblish.api.register_plugin_path(PUBLISH_PATH)
 
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     log.info(PUBLISH_PATH)
 
     pyblish.api.register_callback(
@@ -86,7 +86,7 @@ def install():
 def uninstall():
     pyblish.api.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
 
 def on_pyblish_instance_toggled(instance, old_value, new_value):
diff --git a/openpype/hosts/blender/api/pipeline.py b/openpype/hosts/blender/api/pipeline.py
index 8c580cf214..b9ec2cfea4 100644
--- a/openpype/hosts/blender/api/pipeline.py
+++ b/openpype/hosts/blender/api/pipeline.py
@@ -14,9 +14,10 @@ import avalon.api
 from avalon import io, schema
 
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 from openpype.api import Logger
@@ -54,7 +55,7 @@ def install():
     pyblish.api.register_plugin_path(str(PUBLISH_PATH))
 
     register_loader_plugin_path(str(LOAD_PATH))
-    avalon.api.register_plugin_path(LegacyCreator, str(CREATE_PATH))
+    register_creator_plugin_path(str(CREATE_PATH))
 
     lib.append_user_scripts()
 
@@ -76,7 +77,7 @@ def uninstall():
     pyblish.api.deregister_plugin_path(str(PUBLISH_PATH))
 
     deregister_loader_plugin_path(str(LOAD_PATH))
-    avalon.api.deregister_plugin_path(LegacyCreator, str(CREATE_PATH))
+    deregister_creator_plugin_path(str(CREATE_PATH))
 
     if not IS_HEADLESS:
         ops.unregister()
diff --git a/openpype/hosts/flame/api/pipeline.py b/openpype/hosts/flame/api/pipeline.py
index ca3f38c1bc..da44be1b15 100644
--- a/openpype/hosts/flame/api/pipeline.py
+++ b/openpype/hosts/flame/api/pipeline.py
@@ -3,14 +3,14 @@ Basic avalon integration
 """
 import os
 import contextlib
-from avalon import api as avalon
 from pyblish import api as pyblish
 
 from openpype.api import Logger
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 from .lib import (
@@ -37,7 +37,7 @@ def install():
     pyblish.register_host("flame")
     pyblish.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     log.info("OpenPype Flame plug-ins registred ...")
 
     # register callback for switching publishable
@@ -52,7 +52,7 @@ def uninstall():
     log.info("Deregistering Flame plug-ins..")
     pyblish.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
     # register callback for switching publishable
     pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled)
diff --git a/openpype/hosts/fusion/api/pipeline.py b/openpype/hosts/fusion/api/pipeline.py
index c9cd76770a..0867b464d5 100644
--- a/openpype/hosts/fusion/api/pipeline.py
+++ b/openpype/hosts/fusion/api/pipeline.py
@@ -7,14 +7,14 @@ import logging
 import contextlib
 
 import pyblish.api
-import avalon.api
 
 from openpype.api import Logger
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
-    deregister_loader_plugin_path,
+    register_creator_plugin_path,
     register_inventory_action_path,
+    deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     deregister_inventory_action_path,
     AVALON_CONTAINER_ID,
 )
@@ -70,7 +70,7 @@ def install():
     log.info("Registering Fusion plug-ins..")
 
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     register_inventory_action_path(INVENTORY_PATH)
 
     pyblish.api.register_callback(
@@ -94,7 +94,7 @@ def uninstall():
     log.info("Deregistering Fusion plug-ins..")
 
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
     deregister_inventory_action_path(INVENTORY_PATH)
 
     pyblish.api.deregister_callback(
diff --git a/openpype/hosts/harmony/api/pipeline.py b/openpype/hosts/harmony/api/pipeline.py
index 420e9720db..b7d5941182 100644
--- a/openpype/hosts/harmony/api/pipeline.py
+++ b/openpype/hosts/harmony/api/pipeline.py
@@ -11,9 +11,10 @@ import avalon.api
 from openpype import lib
 from openpype.lib import register_event_callback
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 import openpype.hosts.harmony
@@ -186,7 +187,7 @@ def install():
     pyblish.api.register_host("harmony")
     pyblish.api.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     log.info(PUBLISH_PATH)
 
     # Register callbacks.
@@ -200,7 +201,7 @@ def install():
 def uninstall():
     pyblish.api.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
 
 def on_pyblish_instance_toggled(instance, old_value, new_value):
diff --git a/openpype/hosts/hiero/api/pipeline.py b/openpype/hosts/hiero/api/pipeline.py
index 0d3c8914ce..b334102129 100644
--- a/openpype/hosts/hiero/api/pipeline.py
+++ b/openpype/hosts/hiero/api/pipeline.py
@@ -5,13 +5,13 @@ import os
 import contextlib
 from collections import OrderedDict
 
-from avalon import api as avalon
 from avalon import schema
 from pyblish import api as pyblish
 from openpype.api import Logger
 from openpype.pipeline import (
-    LegacyCreator,
+    register_creator_plugin_path,
     register_loader_plugin_path,
+    deregister_creator_plugin_path,
     deregister_loader_plugin_path,
     AVALON_CONTAINER_ID,
 )
@@ -50,7 +50,7 @@ def install():
     pyblish.register_host("hiero")
     pyblish.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
 
     # register callback for switching publishable
     pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled)
@@ -71,7 +71,7 @@ def uninstall():
     pyblish.deregister_host("hiero")
     pyblish.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
     # register callback for switching publishable
     pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled)
diff --git a/openpype/hosts/houdini/api/pipeline.py b/openpype/hosts/houdini/api/pipeline.py
index d079c9ea81..8e093a89bc 100644
--- a/openpype/hosts/houdini/api/pipeline.py
+++ b/openpype/hosts/houdini/api/pipeline.py
@@ -11,7 +11,7 @@ import avalon.api
 from avalon.lib import find_submodule
 
 from openpype.pipeline import (
-    LegacyCreator,
+    register_creator_plugin_path,
     register_loader_plugin_path,
     AVALON_CONTAINER_ID,
 )
@@ -54,7 +54,7 @@ def install():
 
     pyblish.api.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
 
     log.info("Installing callbacks ... ")
     # register_event_callback("init", on_init)
diff --git a/openpype/hosts/maya/api/pipeline.py b/openpype/hosts/maya/api/pipeline.py
index bb61128178..a8834d1ea3 100644
--- a/openpype/hosts/maya/api/pipeline.py
+++ b/openpype/hosts/maya/api/pipeline.py
@@ -23,8 +23,10 @@ from openpype.pipeline import (
     LegacyCreator,
     register_loader_plugin_path,
     register_inventory_action_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
     deregister_inventory_action_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 from openpype.hosts.maya.lib import copy_workspace_mel
@@ -60,7 +62,7 @@ def install():
     pyblish.api.register_host("maya")
 
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     register_inventory_action_path(INVENTORY_PATH)
     log.info(PUBLISH_PATH)
 
@@ -189,7 +191,7 @@ def uninstall():
     pyblish.api.deregister_host("maya")
 
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
     deregister_inventory_action_path(INVENTORY_PATH)
 
     menu.uninstall()
diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 3c8ba3e77c..c22488f728 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -26,6 +26,7 @@ from openpype.tools.utils import host_tools
 from openpype.lib.path_tools import HostDirmap
 from openpype.settings import get_project_settings
 from openpype.modules import ModulesManager
+from openpype.pipeline import discover_legacy_creator_plugins
 
 from .workio import (
     save_file,
@@ -1902,7 +1903,7 @@ def recreate_instance(origin_node, avalon_data=None):
     # create new node
     # get appropriate plugin class
     creator_plugin = None
-    for Creator in api.discover(api.Creator):
+    for Creator in discover_legacy_creator_plugins():
         if Creator.__name__ == data["creator"]:
             creator_plugin = Creator
             break
diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 1d110cb94a..6ee3d2ce05 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -5,7 +5,6 @@ from collections import OrderedDict
 import nuke
 
 import pyblish.api
-import avalon.api
 
 import openpype
 from openpype.api import (
@@ -15,10 +14,11 @@ from openpype.api import (
 )
 from openpype.lib import register_event_callback
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     register_inventory_action_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     deregister_inventory_action_path,
     AVALON_CONTAINER_ID,
 )
@@ -106,7 +106,7 @@ def install():
     log.info("Registering Nuke plug-ins..")
     pyblish.api.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     register_inventory_action_path(INVENTORY_PATH)
 
     # Register Avalon event for workfiles loading.
@@ -132,7 +132,7 @@ def uninstall():
     pyblish.deregister_host("nuke")
     pyblish.api.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
     deregister_inventory_action_path(INVENTORY_PATH)
 
     pyblish.api.deregister_callback(
diff --git a/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py b/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py
index 08f09f8097..9fb57c1698 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py
@@ -1,11 +1,10 @@
-import os
 import toml
 
 import nuke
 
-from avalon import api
 import pyblish.api
 import openpype.api
+from openpype.pipeline import discover_creator_plugins
 from openpype.hosts.nuke.api.lib import get_avalon_knob_data
 
 
@@ -79,7 +78,7 @@ class ValidateWriteLegacy(pyblish.api.InstancePlugin):
 
         # get appropriate plugin class
         creator_plugin = None
-        for Creator in api.discover(api.Creator):
+        for Creator in discover_creator_plugins():
             if Creator.__name__ != Create_name:
                 continue
 
diff --git a/openpype/hosts/photoshop/api/pipeline.py b/openpype/hosts/photoshop/api/pipeline.py
index c2ad0ac7b0..7fdaa61b40 100644
--- a/openpype/hosts/photoshop/api/pipeline.py
+++ b/openpype/hosts/photoshop/api/pipeline.py
@@ -9,9 +9,10 @@ from avalon import io
 from openpype.api import Logger
 from openpype.lib import register_event_callback
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 import openpype.hosts.photoshop
@@ -75,7 +76,7 @@ def install():
 
     pyblish.api.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
     log.info(PUBLISH_PATH)
 
     pyblish.api.register_callback(
@@ -88,7 +89,7 @@ def install():
 def uninstall():
     pyblish.api.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
 
 def ls():
diff --git a/openpype/hosts/resolve/api/pipeline.py b/openpype/hosts/resolve/api/pipeline.py
index e8b017ead5..636c826a11 100644
--- a/openpype/hosts/resolve/api/pipeline.py
+++ b/openpype/hosts/resolve/api/pipeline.py
@@ -4,14 +4,17 @@ Basic avalon integration
 import os
 import contextlib
 from collections import OrderedDict
-from avalon import api as avalon
-from avalon import schema
+
 from pyblish import api as pyblish
+
+from avalon import schema
+
 from openpype.api import Logger
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 from . import lib
@@ -46,7 +49,7 @@ def install():
     log.info("Registering DaVinci Resovle plug-ins..")
 
     register_loader_plugin_path(LOAD_PATH)
-    avalon.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
 
     # register callback for switching publishable
     pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled)
@@ -70,7 +73,7 @@ def uninstall():
     log.info("Deregistering DaVinci Resovle plug-ins..")
 
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
     # register callback for switching publishable
     pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled)
diff --git a/openpype/hosts/tvpaint/api/pipeline.py b/openpype/hosts/tvpaint/api/pipeline.py
index ec880a1abc..cafdf0701d 100644
--- a/openpype/hosts/tvpaint/api/pipeline.py
+++ b/openpype/hosts/tvpaint/api/pipeline.py
@@ -15,9 +15,10 @@ from openpype.hosts import tvpaint
 from openpype.api import get_current_project_settings
 from openpype.lib import register_event_callback
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 
@@ -82,7 +83,7 @@ def install():
     pyblish.api.register_host("tvpaint")
     pyblish.api.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
-    avalon.api.register_plugin_path(LegacyCreator, CREATE_PATH)
+    register_creator_plugin_path(CREATE_PATH)
 
     registered_callbacks = (
         pyblish.api.registered_callbacks().get("instanceToggled") or []
@@ -104,7 +105,7 @@ def uninstall():
     pyblish.api.deregister_host("tvpaint")
     pyblish.api.deregister_plugin_path(PUBLISH_PATH)
     deregister_loader_plugin_path(LOAD_PATH)
-    avalon.api.deregister_plugin_path(LegacyCreator, CREATE_PATH)
+    deregister_creator_plugin_path(CREATE_PATH)
 
 
 def containerise(
diff --git a/openpype/hosts/unreal/api/pipeline.py b/openpype/hosts/unreal/api/pipeline.py
index 713c588976..6d7a6ad1e2 100644
--- a/openpype/hosts/unreal/api/pipeline.py
+++ b/openpype/hosts/unreal/api/pipeline.py
@@ -7,9 +7,10 @@ import pyblish.api
 from avalon import api
 
 from openpype.pipeline import (
-    LegacyCreator,
     register_loader_plugin_path,
+    register_creator_plugin_path,
     deregister_loader_plugin_path,
+    deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
 )
 from openpype.tools.utils import host_tools
@@ -49,7 +50,7 @@ def install():
     logger.info("installing OpenPype for Unreal")
     pyblish.api.register_plugin_path(str(PUBLISH_PATH))
     register_loader_plugin_path(str(LOAD_PATH))
-    api.register_plugin_path(LegacyCreator, str(CREATE_PATH))
+    register_creator_plugin_path(str(CREATE_PATH))
     _register_callbacks()
     _register_events()
 
@@ -58,7 +59,7 @@ def uninstall():
     """Uninstall Unreal configuration for Avalon."""
     pyblish.api.deregister_plugin_path(str(PUBLISH_PATH))
     deregister_loader_plugin_path(str(LOAD_PATH))
-    api.deregister_plugin_path(LegacyCreator, str(CREATE_PATH))
+    deregister_creator_plugin_path(str(CREATE_PATH))
 
 
 def _register_callbacks():
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 05d2ffd821..26e05ecd63 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -1604,13 +1604,13 @@ def get_creator_by_name(creator_name, case_sensitive=False):
     Returns:
         Creator: Return first matching plugin or `None`.
     """
-    from openpype.pipeline import LegacyCreator
+    from openpype.pipeline import discover_legacy_creator_plugins
 
     # Lower input creator name if is not case sensitive
     if not case_sensitive:
         creator_name = creator_name.lower()
 
-    for creator_plugin in avalon.api.discover(LegacyCreator):
+    for creator_plugin in discover_legacy_creator_plugins():
         _creator_name = creator_plugin.__name__
 
         # Lower creator plugin name if is not case sensitive
diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index c2757a4502..21e726e060 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -10,7 +10,8 @@ from ..lib import UnknownDef
 from .creator_plugins import (
     BaseCreator,
     Creator,
-    AutoCreator
+    AutoCreator,
+    discover_creator_plugins,
 )
 
 from openpype.api import (
@@ -842,7 +843,7 @@ class CreateContext:
         creators = {}
         autocreators = {}
         manual_creators = {}
-        for creator_class in avalon.api.discover(BaseCreator):
+        for creator_class in discover_creator_plugins(BaseCreator):
             if inspect.isabstract(creator_class):
                 self.log.info(
                     "Skipping abstract Creator {}".format(str(creator_class))
diff --git a/openpype/tools/creator/model.py b/openpype/tools/creator/model.py
index ef61c6e0f0..d3d60b96f2 100644
--- a/openpype/tools/creator/model.py
+++ b/openpype/tools/creator/model.py
@@ -1,8 +1,7 @@
 import uuid
 from Qt import QtGui, QtCore
 
-from avalon import api
-from openpype.pipeline import LegacyCreator
+from openpype.pipeline import discover_legacy_creator_plugins
 
 from . constants import (
     FAMILY_ROLE,
@@ -22,7 +21,7 @@ class CreatorsModel(QtGui.QStandardItemModel):
         self._creators_by_id = {}
 
         items = []
-        creators = api.discover(LegacyCreator)
+        creators = discover_legacy_creator_plugins()
         for creator in creators:
             item_id = str(uuid.uuid4())
             self._creators_by_id[item_id] = creator

From 1612ad0f96d7a9778df9130dece9a29dae6fae8e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:12:18 +0100
Subject: [PATCH 06/16] call 'ls' directly in harmony

---
 openpype/hosts/harmony/api/pipeline.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/openpype/hosts/harmony/api/pipeline.py b/openpype/hosts/harmony/api/pipeline.py
index b7d5941182..88f11dd16f 100644
--- a/openpype/hosts/harmony/api/pipeline.py
+++ b/openpype/hosts/harmony/api/pipeline.py
@@ -6,7 +6,6 @@ from bson.objectid import ObjectId
 import pyblish.api
 
 from avalon import io
-import avalon.api
 
 from openpype import lib
 from openpype.lib import register_event_callback
@@ -109,9 +108,8 @@ def check_inventory():
     if not lib.any_outdated():
         return
 
-    host = avalon.api.registered_host()
     outdated_containers = []
-    for container in host.ls():
+    for container in ls():
         representation = container['representation']
         representation_doc = io.find_one(
             {

From b767458bff9573e221303ce6c9d0e7d4137596e7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:12:42 +0100
Subject: [PATCH 07/16] use direct imports of LegacyCreator

---
 .../hosts/aftereffects/plugins/create/create_render.py    | 8 +++++---
 openpype/hosts/fusion/plugins/create/create_exr_saver.py  | 4 ++--
 openpype/hosts/photoshop/plugins/create/create_image.py   | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index 41efb4b0ba..831085a5f1 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -1,12 +1,14 @@
-from openpype.pipeline import create
-from openpype.pipeline import CreatorError
+from openpype.pipeline import (
+    CreatorError,
+    LegacyCreator
+)
 from openpype.hosts.aftereffects.api import (
     get_stub,
     list_instances
 )
 
 
-class CreateRender(create.LegacyCreator):
+class CreateRender(LegacyCreator):
     """Render folder for publish.
 
         Creates subsets in format 'familyTaskSubsetname',
diff --git a/openpype/hosts/fusion/plugins/create/create_exr_saver.py b/openpype/hosts/fusion/plugins/create/create_exr_saver.py
index ff8bdb21ef..8bab5ee9b1 100644
--- a/openpype/hosts/fusion/plugins/create/create_exr_saver.py
+++ b/openpype/hosts/fusion/plugins/create/create_exr_saver.py
@@ -1,13 +1,13 @@
 import os
 
-from openpype.pipeline import create
+from openpype.pipeline import LegacyCreator
 from openpype.hosts.fusion.api import (
     get_current_comp,
     comp_lock_and_undo_chunk
 )
 
 
-class CreateOpenEXRSaver(create.LegacyCreator):
+class CreateOpenEXRSaver(LegacyCreator):
 
     name = "openexrDefault"
     label = "Create OpenEXR Saver"
diff --git a/openpype/hosts/photoshop/plugins/create/create_image.py b/openpype/hosts/photoshop/plugins/create/create_image.py
index a001b5f171..5078cbb587 100644
--- a/openpype/hosts/photoshop/plugins/create/create_image.py
+++ b/openpype/hosts/photoshop/plugins/create/create_image.py
@@ -1,9 +1,9 @@
 from Qt import QtWidgets
-from openpype.pipeline import create
+from openpype.pipeline import LegacyCreator
 from openpype.hosts.photoshop import api as photoshop
 
 
-class CreateImage(create.LegacyCreator):
+class CreateImage(LegacyCreator):
     """Image folder for publish."""
 
     name = "imageDefault"

From ea79f0908b9070cc8a9301183a8a0432b272a508 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:14:22 +0100
Subject: [PATCH 08/16] fix test

---
 openpype/tests/test_avalon_plugin_presets.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openpype/tests/test_avalon_plugin_presets.py b/openpype/tests/test_avalon_plugin_presets.py
index f1b1a94713..c491be1c05 100644
--- a/openpype/tests/test_avalon_plugin_presets.py
+++ b/openpype/tests/test_avalon_plugin_presets.py
@@ -1,6 +1,10 @@
 import avalon.api as api
 import openpype
-from openpype.pipeline import LegacyCreator
+from openpype.pipeline import (
+    LegacyCreator,
+    register_creator_plugin,
+    discover_creator_plugins,
+)
 
 
 class MyTestCreator(LegacyCreator):
@@ -27,8 +31,8 @@ def test_avalon_plugin_presets(monkeypatch, printer):
 
     openpype.install()
     api.register_host(Test())
-    api.register_plugin(LegacyCreator, MyTestCreator)
-    plugins = api.discover(LegacyCreator)
+    register_creator_plugin(MyTestCreator)
+    plugins = discover_creator_plugins()
     printer("Test if we got our test plugin")
     assert MyTestCreator in plugins
     for p in plugins:

From aac580bda4d77b4862ca99e61366955e73d8bf3f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:15:00 +0100
Subject: [PATCH 09/16] removed patched discover logic

---
 openpype/__init__.py | 75 +++++++-------------------------------------
 1 file changed, 11 insertions(+), 64 deletions(-)

diff --git a/openpype/__init__.py b/openpype/__init__.py
index 8b94b2dc3f..2820091bcc 100644
--- a/openpype/__init__.py
+++ b/openpype/__init__.py
@@ -2,20 +2,16 @@
 """Pype module."""
 import os
 import platform
-import functools
 import logging
 
 from .settings import get_project_settings
 from .lib import (
     Anatomy,
     filter_pyblish_plugins,
-    set_plugin_attributes_from_settings,
     change_timer_to_current_context,
     register_event_callback,
 )
 
-pyblish = avalon = _original_discover = None
-
 log = logging.getLogger(__name__)
 
 
@@ -27,60 +23,17 @@ PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
 
 
-def import_wrapper(func):
-    """Wrap module imports to specific functions."""
-    @functools.wraps(func)
-    def decorated(*args, **kwargs):
-        global pyblish
-        global avalon
-        global _original_discover
-        if pyblish is None:
-            from pyblish import api as pyblish
-            from avalon import api as avalon
-
-            # we are monkey patching `avalon.api.discover()` to allow us to
-            # load plugin presets on plugins being discovered by avalon.
-            # Little bit of hacking, but it allows us to add out own features
-            # without need to modify upstream code.
-
-            _original_discover = avalon.discover
-
-        return func(*args, **kwargs)
-
-    return decorated
-
-
-@import_wrapper
-def patched_discover(superclass):
-    """Patch `avalon.api.discover()`.
-
-    Monkey patched version of :func:`avalon.api.discover()`. It allows
-    us to load presets on plugins being discovered.
-    """
-    # run original discover and get plugins
-    plugins = _original_discover(superclass)
-    filtered_plugins = [
-        plugin
-        for plugin in plugins
-        if issubclass(plugin, superclass)
-    ]
-
-    set_plugin_attributes_from_settings(filtered_plugins, superclass)
-
-    return filtered_plugins
-
-
-@import_wrapper
 def install():
     """Install Pype to Avalon."""
+    import avalon.api
+    import pyblish.api
     from pyblish.lib import MessageHandler
     from openpype.modules import load_modules
     from openpype.pipeline import (
-        LegacyCreator,
         register_loader_plugin_path,
         register_inventory_action,
+        register_creator_plugin_path,
     )
-    from avalon import pipeline
 
     # Make sure modules are loaded
     load_modules()
@@ -93,8 +46,8 @@ def install():
     MessageHandler.emit = modified_emit
 
     log.info("Registering global plug-ins..")
-    pyblish.register_plugin_path(PUBLISH_PATH)
-    pyblish.register_discovery_filter(filter_pyblish_plugins)
+    pyblish.api.register_plugin_path(PUBLISH_PATH)
+    pyblish.api.register_discovery_filter(filter_pyblish_plugins)
     register_loader_plugin_path(LOAD_PATH)
 
     project_name = os.environ.get("AVALON_PROJECT")
@@ -103,7 +56,7 @@ def install():
     if project_name:
         anatomy = Anatomy(project_name)
         anatomy.set_root_environments()
-        avalon.register_root(anatomy.roots)
+        avalon.api.register_root(anatomy.roots)
 
         project_settings = get_project_settings(project_name)
         platform_name = platform.system().lower()
@@ -122,17 +75,14 @@ def install():
             if not path or not os.path.exists(path):
                 continue
 
-            pyblish.register_plugin_path(path)
+            pyblish.api.register_plugin_path(path)
             register_loader_plugin_path(path)
-            avalon.register_plugin_path(LegacyCreator, path)
+            register_creator_plugin_path(path)
             register_inventory_action(path)
 
     # apply monkey patched discover to original one
     log.info("Patching discovery")
 
-    avalon.discover = patched_discover
-    pipeline.discover = patched_discover
-
     register_event_callback("taskChanged", _on_task_change)
 
 
@@ -140,16 +90,13 @@ def _on_task_change():
     change_timer_to_current_context()
 
 
-@import_wrapper
 def uninstall():
     """Uninstall Pype from Avalon."""
+    import pyblish.api
     from openpype.pipeline import deregister_loader_plugin_path
 
     log.info("Deregistering global plug-ins..")
-    pyblish.deregister_plugin_path(PUBLISH_PATH)
-    pyblish.deregister_discovery_filter(filter_pyblish_plugins)
+    pyblish.api.deregister_plugin_path(PUBLISH_PATH)
+    pyblish.api.deregister_discovery_filter(filter_pyblish_plugins)
     deregister_loader_plugin_path(LOAD_PATH)
     log.info("Global plug-ins unregistred")
-
-    # restore original discover
-    avalon.discover = _original_discover

From cd4e01f400344a0351246f70a7ef09b9e0b1cbba Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 15:54:43 +0100
Subject: [PATCH 10/16] print report of failed parts of discover

---
 openpype/pipeline/plugin_discover.py | 56 ++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/openpype/pipeline/plugin_discover.py b/openpype/pipeline/plugin_discover.py
index 305a8bab67..f4a133b0aa 100644
--- a/openpype/pipeline/plugin_discover.py
+++ b/openpype/pipeline/plugin_discover.py
@@ -1,5 +1,7 @@
 import os
 import inspect
+import traceback
+
 from openpype.lib.python_module_tools import (
     modules_from_path,
     classes_from_module,
@@ -30,6 +32,59 @@ class DiscoverResult:
     def __setitem__(self, item, value):
         self.plugins[item] = value
 
+    def get_report(self, only_errors=True, exc_info=True, full_report=False):
+        lines = []
+        if not only_errors:
+            # Successfully discovered plugins
+            if self.plugins or full_report:
+                lines.append(
+                    "*** Discovered {} plugins".format(len(self.plugins))
+                )
+                for cls in self.plugins:
+                    lines.append("- {}".format(cls.__class__.__name__))
+
+            # Plugin that were defined to be ignored
+            if self.ignored_plugins or full_report:
+                lines.append("*** Ignored plugins {}".format(len(
+                    self.ignored_plugins
+                )))
+                for cls in self.ignored_plugins:
+                    lines.append("- {}".format(cls.__class__.__name__))
+
+        # Abstract classes
+        if self.abstract_plugins or full_report:
+            lines.append("*** Discovered {} abstract plugins".format(len(
+                self.abstract_plugins
+            )))
+            for cls in self.abstract_plugins:
+                lines.append("- {}".format(cls.__class__.__name__))
+
+        # Abstract classes
+        if self.duplicated_plugins or full_report:
+            lines.append("*** There were {} duplicated plugins".format(len(
+                self.duplicated_plugins
+            )))
+            for cls in self.duplicated_plugins:
+                lines.append("- {}".format(cls.__class__.__name__))
+
+        if self.crashed_file_paths or full_report:
+            lines.append("*** Failed to load {} files".format(len(
+                self.crashed_file_paths
+            )))
+            for path, exc_info_args in self.crashed_file_paths.items():
+                lines.append("- {}".format(path))
+                if exc_info:
+                    lines.append(10 * "*")
+                    lines.extend(traceback.format_exception(*exc_info_args))
+                    lines.append(10 * "*")
+
+        return "\n".join(lines)
+
+    def print_report(self, only_errors=True, exc_info=True):
+        report = self.get_report(only_errors, exc_info)
+        if report:
+            print(report)
+
 
 class PluginDiscoverContext(object):
     """Store and discover registered types nad registered paths to types.
@@ -117,6 +172,7 @@ class PluginDiscoverContext(object):
         self._last_discovered_plugins[superclass] = list(
             result.plugins
         )
+        result.print_report()
         return result
 
     def register_plugin(self, superclass, cls):

From 6bb10852f5aaee9a85a66c83d5a66aeab439d6d1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:18:59 +0100
Subject: [PATCH 11/16] Fix creator discover

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/pipeline/create/context.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 21e726e060..d833e6f686 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -843,7 +843,7 @@ class CreateContext:
         creators = {}
         autocreators = {}
         manual_creators = {}
-        for creator_class in discover_creator_plugins(BaseCreator):
+        for creator_class in discover_creator_plugins():
             if inspect.isabstract(creator_class):
                 self.log.info(
                     "Skipping abstract Creator {}".format(str(creator_class))

From e3196a40236e4eb1540019333fc30c3a2b5b0cc7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 23 Mar 2022 18:30:28 +0100
Subject: [PATCH 12/16] Fix docstring

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
---
 openpype/pipeline/plugin_discover.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/plugin_discover.py b/openpype/pipeline/plugin_discover.py
index f4a133b0aa..a657df7994 100644
--- a/openpype/pipeline/plugin_discover.py
+++ b/openpype/pipeline/plugin_discover.py
@@ -190,7 +190,7 @@ class PluginDiscoverContext(object):
             self._registered_plugins[superclass].append(cls)
 
     def register_plugin_path(self, superclass, path):
-        """Register a directory of one or more plug-ins
+        """Register a directory containing plug-ins of type `superclass`
 
         Arguments:
             superclass (type): Superclass of plug-ins to look for during discovery

From 89d61723de876c02b061198e9462feb7f52d98ba Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 23 Mar 2022 19:20:37 +0100
Subject: [PATCH 13/16] applied comments

---
 openpype/lib/python_module_tools.py         |  2 -
 openpype/pipeline/actions.py                |  4 +-
 openpype/pipeline/create/creator_plugins.py |  4 +-
 openpype/pipeline/load/plugins.py           |  2 +-
 openpype/pipeline/plugin_discover.py        | 88 ++++++++++++++-------
 5 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/openpype/lib/python_module_tools.py b/openpype/lib/python_module_tools.py
index 4ef31b5579..6fad3b547f 100644
--- a/openpype/lib/python_module_tools.py
+++ b/openpype/lib/python_module_tools.py
@@ -133,8 +133,6 @@ def classes_from_module(superclass, module):
         if not inspect.isclass(obj) or obj is superclass:
             continue
 
-        # Use string comparison rather than `issubclass`
-        # in order to support reloading of this module.
         if issubclass(obj, superclass):
             classes.append(obj)
 
diff --git a/openpype/pipeline/actions.py b/openpype/pipeline/actions.py
index 6cb2e9a5a4..b488fe3e1f 100644
--- a/openpype/pipeline/actions.py
+++ b/openpype/pipeline/actions.py
@@ -97,7 +97,7 @@ class InventoryAction(object):
 
 # Launcher action
 def discover_launcher_actions():
-    return discover(LauncherAction).plugins
+    return discover(LauncherAction)
 
 
 def register_launcher_action(plugin):
@@ -110,7 +110,7 @@ def register_launcher_action_path(path):
 
 # Inventory action
 def discover_inventory_actions():
-    actions = discover(InventoryAction).plugins
+    actions = discover(InventoryAction)
     filtered_actions = []
     for action in actions:
         if action is not InventoryAction:
diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index dbeeb94050..c3ba8b1d1c 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -303,11 +303,11 @@ class AutoCreator(BaseCreator):
 
 
 def discover_creator_plugins():
-    return discover(BaseCreator).plugins
+    return discover(BaseCreator)
 
 
 def discover_legacy_creator_plugins():
-    plugins = discover(LegacyCreator).plugins
+    plugins = discover(LegacyCreator)
     set_plugin_attributes_from_settings(plugins, LegacyCreator)
     return plugins
 
diff --git a/openpype/pipeline/load/plugins.py b/openpype/pipeline/load/plugins.py
index fb5d1df9b5..d60aed0083 100644
--- a/openpype/pipeline/load/plugins.py
+++ b/openpype/pipeline/load/plugins.py
@@ -110,7 +110,7 @@ class SubsetLoaderPlugin(LoaderPlugin):
 
 
 def discover_loader_plugins():
-    plugins = discover(LoaderPlugin).plugins
+    plugins = discover(LoaderPlugin)
     set_plugin_attributes_from_settings(plugins, LoaderPlugin)
     return plugins
 
diff --git a/openpype/pipeline/plugin_discover.py b/openpype/pipeline/plugin_discover.py
index a657df7994..b5edda7e9d 100644
--- a/openpype/pipeline/plugin_discover.py
+++ b/openpype/pipeline/plugin_discover.py
@@ -2,25 +2,31 @@ import os
 import inspect
 import traceback
 
+from openpype.lib import Logger
 from openpype.lib.python_module_tools import (
     modules_from_path,
     classes_from_module,
 )
 
+log = Logger.get_logger(__name__)
+
 
 class DiscoverResult:
-    """Hold result of publish plugins discovery.
+    """Result of Plug-ins discovery of a single superclass type.
 
-    Stores discovered plugins duplicated plugins and file paths which
-    crashed on execution of file.
+    Stores discovered, duplicated, ignored and abstract plugins and file paths
+    which crashed on execution of file.
     """
 
-    def __init__(self):
+    def __init__(self, superclass):
+        self.superclass = superclass
         self.plugins = []
         self.crashed_file_paths = {}
         self.duplicated_plugins = []
         self.abstract_plugins = []
         self.ignored_plugins = set()
+        # Store loaded modules to keep them in memory
+        self._modules = set()
 
     def __iter__(self):
         for plugin in self.plugins:
@@ -32,6 +38,10 @@ class DiscoverResult:
     def __setitem__(self, item, value):
         self.plugins[item] = value
 
+    def add_module(self, module):
+        """Add dynamically loaded python module to keep it in memory."""
+        self._modules.add(module)
+
     def get_report(self, only_errors=True, exc_info=True, full_report=False):
         lines = []
         if not only_errors:
@@ -80,10 +90,10 @@ class DiscoverResult:
 
         return "\n".join(lines)
 
-    def print_report(self, only_errors=True, exc_info=True):
+    def log_report(self, only_errors=True, exc_info=True):
         report = self.get_report(only_errors, exc_info)
         if report:
-            print(report)
+            log.info(report)
 
 
 class PluginDiscoverContext(object):
@@ -98,12 +108,25 @@ class PluginDiscoverContext(object):
         self._registered_plugins = {}
         self._registered_plugin_paths = {}
         self._last_discovered_plugins = {}
+        # Store the last result to memory
+        self._last_discovered_results = {}
 
     def get_last_discovered_plugins(self, superclass):
+        """Access last discovered plugin by a subperclass.
+
+        Returns:
+            None: When superclass was not discovered yet.
+            list: Lastly discovered plugins of the superclass.
+        """
+
         return self._last_discovered_plugins.get(superclass)
 
     def discover(
-        self, superclass, allow_duplicates=True, ignore_classes=None
+        self,
+        superclass,
+        allow_duplicates=True,
+        ignore_classes=None,
+        return_report=False
     ):
         """Find and return subclasses of `superclass`
 
@@ -122,7 +145,7 @@ class PluginDiscoverContext(object):
         if not ignore_classes:
             ignore_classes = []
 
-        result = DiscoverResult()
+        result = DiscoverResult(superclass)
         plugin_names = set()
         registered_classes = self._registered_plugins.get(superclass) or []
         registered_paths = self._registered_plugin_paths.get(superclass) or []
@@ -151,6 +174,7 @@ class PluginDiscoverContext(object):
 
             for item in modules:
                 filepath, module = item
+                result.add_module(module)
                 for cls in classes_from_module(superclass, module):
                     if cls is superclass or cls in ignore_classes:
                         result.ignored_plugins.add(cls)
@@ -169,14 +193,18 @@ class PluginDiscoverContext(object):
 
                     result.plugins.append(cls)
 
+        # Store in memory last result to keep in memory loaded modules
+        self._last_discovered_results[superclass] = result
         self._last_discovered_plugins[superclass] = list(
             result.plugins
         )
-        result.print_report()
-        return result
+        result.log_report()
+        if return_report:
+            return result
+        return result.plugins
 
     def register_plugin(self, superclass, cls):
-        """Register an individual `obj` of type `superclass`
+        """Register a directory containing plug-ins of type `superclass`
 
         Arguments:
             superclass (type): Superclass of plug-in
@@ -190,12 +218,13 @@ class PluginDiscoverContext(object):
             self._registered_plugins[superclass].append(cls)
 
     def register_plugin_path(self, superclass, path):
-        """Register a directory containing plug-ins of type `superclass`
+        """Register a directory of one or more plug-ins
 
         Arguments:
-            superclass (type): Superclass of plug-ins to look for during discovery
-            path (str): Absolute path to directory in which to discover plug-ins
-
+            superclass (type): Superclass of plug-ins to look for during
+                discovery
+            path (str): Absolute path to directory in which to discover
+                plug-ins
         """
 
         if superclass not in self._registered_plugin_paths:
@@ -207,24 +236,29 @@ class PluginDiscoverContext(object):
 
     def registered_plugin_paths(self):
         """Return all currently registered plug-in paths"""
-        # Prohibit editing in-place
-        duplicate = {
+        # Return shallow copy so we the original data can't be changed
+        return {
             superclass: paths[:]
             for superclass, paths in self._registered_plugin_paths.items()
         }
-        return duplicate
 
     def deregister_plugin(self, superclass, plugin):
-        """Oppsite of `register_plugin()`"""
+        """Opposite of `register_plugin()`"""
         if superclass in self._registered_plugins:
             self._registered_plugins[superclass].remove(plugin)
 
     def deregister_plugin_path(self, superclass, path):
-        """Oppsite of `register_plugin_path()`"""
+        """Opposite of `register_plugin_path()`"""
         self._registered_plugin_paths[superclass].remove(path)
 
 
-class GlobalDiscover:
+class _GlobalDiscover:
+    """Access to global object of PluginDiscoverContext.
+
+    Using singleton object to register/deregister plugins and plugin paths
+    and then discover them by superclass.
+    """
+
     _context = None
 
     @classmethod
@@ -235,30 +269,30 @@ class GlobalDiscover:
 
 
 def discover(superclass, allow_duplicates=True):
-    context = GlobalDiscover.get_context()
+    context = _GlobalDiscover.get_context()
     return context.discover(superclass, allow_duplicates)
 
 
 def get_last_discovered_plugins(superclass):
-    context = GlobalDiscover.get_context()
+    context = _GlobalDiscover.get_context()
     return context.get_last_discovered_plugins(superclass)
 
 
 def register_plugin(superclass, cls):
-    context = GlobalDiscover.get_context()
+    context = _GlobalDiscover.get_context()
     context.register_plugin(superclass, cls)
 
 
 def register_plugin_path(superclass, path):
-    context = GlobalDiscover.get_context()
+    context = _GlobalDiscover.get_context()
     context.register_plugin_path(superclass, path)
 
 
 def deregister_plugin(superclass, cls):
-    context = GlobalDiscover.get_context()
+    context = _GlobalDiscover.get_context()
     context.deregister_plugin(superclass, cls)
 
 
 def deregister_plugin_path(superclass, path):
-    context = GlobalDiscover.get_context()
+    context = _GlobalDiscover.get_context()
     context.deregister_plugin_path(superclass, path)

From 2621225046ac8b60942834b03fd6c68655d48c31 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 24 Mar 2022 10:18:31 +0100
Subject: [PATCH 14/16] fix logger import

---
 openpype/pipeline/plugin_discover.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/plugin_discover.py b/openpype/pipeline/plugin_discover.py
index b5edda7e9d..fb860fe5f2 100644
--- a/openpype/pipeline/plugin_discover.py
+++ b/openpype/pipeline/plugin_discover.py
@@ -2,7 +2,7 @@ import os
 import inspect
 import traceback
 
-from openpype.lib import Logger
+from openpype.api import Logger
 from openpype.lib.python_module_tools import (
     modules_from_path,
     classes_from_module,

From d6b423e2082f0cc3e0cff7a4b3d8730ca44533d4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 31 Mar 2022 11:15:34 +0200
Subject: [PATCH 15/16] Change Pype to OpenPype
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
---
 openpype/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/__init__.py b/openpype/__init__.py
index 2820091bcc..7fc7e63e61 100644
--- a/openpype/__init__.py
+++ b/openpype/__init__.py
@@ -24,7 +24,7 @@ LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
 
 
 def install():
-    """Install Pype to Avalon."""
+    """Install OpenPype to Avalon."""
     import avalon.api
     import pyblish.api
     from pyblish.lib import MessageHandler

From 1499fecc73af170f095b1bdd3bd244e63413a54d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 31 Mar 2022 11:18:32 +0200
Subject: [PATCH 16/16] fix thumbnail discovery

---
 openpype/pipeline/thumbnail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/thumbnail.py b/openpype/pipeline/thumbnail.py
index 47452b21e7..c09dab70eb 100644
--- a/openpype/pipeline/thumbnail.py
+++ b/openpype/pipeline/thumbnail.py
@@ -131,7 +131,7 @@ class BinaryThumbnail(ThumbnailResolver):
 
 # Thumbnail resolvers
 def discover_thumbnail_resolvers():
-    return discover(ThumbnailResolver).plugins
+    return discover(ThumbnailResolver)
 
 
 def register_thumbnail_resolver(plugin):