Merge pull request #2935 from pypeclub/enhancement/OP-2855_move-plugins-register-and-discover

General: Move plugins register and discover

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):

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',

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()

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)

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(

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"

openpype/hosts/harmony/api/pipeline.py

@@ -6,14 +6,14 @@ 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
 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
@@ -108,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(
             {
@@ -186,7 +185,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 +199,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):

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)

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)

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()

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

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(

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
 

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():

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"

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)

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(

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():