first step of pype's reorganization

pype/__init__.py

@@ -2,8 +2,8 @@ import os
 
 from pyblish import api as pyblish
 from avalon import api as avalon
+from .api import config, Anatomy
 from .lib import filter_pyblish_plugins
-from pypeapp import config, Anatomy
 
 
 import logging

pype/api.py

@@ -1,5 +1,12 @@
-from .plugin import (
+from pypeapp import (
+    Logger,
+    Anatomy,
+    project_overrides_dir_path,
+    config,
+    execute
+)
 
+from .plugin import (
     Extractor,
 
     ValidatePipelineOrder,
@@ -16,8 +23,6 @@ from .action import (
     RepairContextAction
 )
 
-from pypeapp import Logger
-
 from .lib import (
     version_up,
     get_asset,
@@ -33,6 +38,12 @@ from .lib import (
 from .lib import _subprocess as subprocess
 
 __all__ = [
+    "Logger",
+    "Anatomy",
+    "project_overrides_dir_path",
+    "config",
+    "execute",
+
     # plugin classes
     "Extractor",
     # ordering

pype/hooks/premiere/prelaunch.py

@@ -1,8 +1,8 @@
 import os
 import traceback
 from pype.lib import PypeHook
-from pypeapp import Logger
-from pype.premiere import lib as prlib
+from pype.api import Logger
+from pype.hosts.premiere import lib as prlib
 
 
 class PremierePrelaunch(PypeHook):
@@ -27,7 +27,7 @@ class PremierePrelaunch(PypeHook):
             env = os.environ
 
         try:
-            __import__("pype.premiere")
+            __import__("pype.hosts.premiere")
             __import__("pyblish")
 
         except ImportError as e:

pype/hooks/unreal/unreal_prelaunch.py

@@ -2,8 +2,8 @@ import logging
 import os
 
 from pype.lib import PypeHook
-from pype.unreal import lib as unreal_lib
-from pypeapp import Logger
+from pype.hosts.unreal import lib as unreal_lib
+from pype.api import Logger
 
 log = logging.getLogger(__name__)
 

pype/hosts/blender/__init__.py

@@ -5,9 +5,7 @@ import traceback
 from avalon import api as avalon
 from pyblish import api as pyblish
 
-PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
+from pype import PLUGINS_DIR
 
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "blender", "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "blender", "load")

pype/hosts/blender/action.py

@@ -2,7 +2,7 @@ import bpy
 
 import pyblish.api
 
-from ..action import get_errored_instances_from_context
+from ...action import get_errored_instances_from_context
 
 
 class SelectInvalidAction(pyblish.api.Action):

pype/hosts/fusion/__init__.py

@@ -2,11 +2,7 @@ import os
 
 from avalon import api as avalon
 from pyblish import api as pyblish
-
-
-PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
+from pype import PLUGINS_DIR
 
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "fusion", "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "fusion", "load")

pype/hosts/fusion/scripts/fusion_switch_shot.py

@@ -8,8 +8,8 @@ from avalon import api, io, pipeline
 import avalon.fusion
 
 # Config imports
-import pype.lib pype
-import pype.fusion.lib as fusion_lib
+import pype.lib as pype
+import pype.hosts.fusion.lib as fusion_lib
 
 log = logging.getLogger("Update Slap Comp")
 

pype/hosts/houdini/__init__.py

@@ -8,20 +8,16 @@ from pyblish import api as pyblish
 from avalon import api as avalon
 from avalon.houdini import pipeline as houdini
 
-from pype.houdini import lib
+from pype.hosts.houdini import lib
 
 from pype.lib import any_outdated
-
-
-PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
+from pype import PLUGINS_DIR
 
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "houdini", "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "houdini", "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "houdini", "create")
 
-log = logging.getLogger("pype.houdini")
+log = logging.getLogger("pype.hosts.houdini")
 
 
 def install():

pype/hosts/houdini/lib.py

@@ -210,7 +210,7 @@ def validate_fps():
 
     if current_fps != fps:
 
-        from ..widgets import popup
+        from ...widgets import popup
 
         # Find main window
         parent = hou.ui.mainQtWindow()

pype/hosts/maya/__init__.py

@@ -9,17 +9,13 @@ from avalon.maya.pipeline import IS_HEADLESS
 from avalon.tools import workfiles
 from pyblish import api as pyblish
 
-from ..lib import (
-    any_outdated
-)
+from ...lib import any_outdated
+from pype import PLUGINS_DIR
+
 from . import menu
 from . import lib
 
-log = logging.getLogger("pype.maya")
-
-PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
+log = logging.getLogger("pype.hosts.maya")
 
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "maya", "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "maya", "load")
@@ -30,7 +26,7 @@ def install():
     pyblish.register_plugin_path(PUBLISH_PATH)
     avalon.register_plugin_path(avalon.Loader, LOAD_PATH)
     avalon.register_plugin_path(avalon.Creator, CREATE_PATH)
-
+    log.info(PUBLISH_PATH)
     menu.install()
 
     log.info("Installing callbacks ... ")
@@ -153,14 +149,14 @@ def on_open(_):
     """On scene open let's assume the containers have changed."""
 
     from avalon.vendor.Qt import QtWidgets
-    from ..widgets import popup
+    from ...widgets import popup
 
     cmds.evalDeferred(
-        "from pype.maya import lib;lib.remove_render_layer_observer()")
+        "from pype.hosts.maya import lib;lib.remove_render_layer_observer()")
     cmds.evalDeferred(
-        "from pype.maya import lib;lib.add_render_layer_observer()")
+        "from pype.hosts.maya import lib;lib.add_render_layer_observer()")
     cmds.evalDeferred(
-        "from pype.maya import lib;lib.add_render_layer_change_observer()")
+        "from pype.hosts.maya import lib;lib.add_render_layer_change_observer()")
     # # Update current task for the current scene
     # update_task_from_path(cmds.file(query=True, sceneName=True))
 
@@ -200,11 +196,11 @@ def on_new(_):
     avalon.logger.info("Running callback on new..")
     with maya.suspended_refresh():
         cmds.evalDeferred(
-            "from pype.maya import lib;lib.remove_render_layer_observer()")
+            "from pype.hosts.maya import lib;lib.remove_render_layer_observer()")
         cmds.evalDeferred(
-            "from pype.maya import lib;lib.add_render_layer_observer()")
+            "from pype.hosts.maya import lib;lib.add_render_layer_observer()")
         cmds.evalDeferred(
-            "from pype.maya import lib;lib.add_render_layer_change_observer()")
+            "from pype.hosts.maya import lib;lib.add_render_layer_change_observer()")
         lib.set_context_settings()
 
 

pype/hosts/maya/action.py

@@ -4,7 +4,7 @@ from __future__ import absolute_import
 import pyblish.api
 
 
-from ..action import get_errored_instances_from_context
+from ...action import get_errored_instances_from_context
 
 
 class GenerateUUIDsOnInvalidAction(pyblish.api.Action):
@@ -72,7 +72,7 @@ class GenerateUUIDsOnInvalidAction(pyblish.api.Action):
             nodes (list): all nodes to regenerate ids on
         """
 
-        import pype.maya.lib as lib
+        from pype.hosts.maya import lib
         import avalon.io as io
 
         asset = instance.data['asset']

pype/hosts/maya/lib.py

@@ -1899,7 +1899,7 @@ def validate_fps():
     if current_fps != fps:
 
         from avalon.vendor.Qt import QtWidgets
-        from ..widgets import popup
+        from ...widgets import popup
 
         # Find maya main window
         top_level_widgets = {w.objectName(): w for w in
@@ -2622,7 +2622,7 @@ def update_content_on_context_change():
 
 def show_message(title, msg):
     from avalon.vendor.Qt import QtWidgets
-    from ..widgets import message_window
+    from ...widgets import message_window
 
     # Find maya main window
     top_level_widgets = {w.objectName(): w for w in

pype/hosts/maya/menu.py

@@ -4,7 +4,7 @@ import logging
 
 from avalon.vendor.Qt import QtWidgets, QtGui
 from avalon.maya import pipeline
-from ..lib import BuildWorkfile
+from ...lib import BuildWorkfile
 import maya.cmds as cmds
 
 self = sys.modules[__name__]

pype/hosts/nuke/__init__.py

@@ -7,8 +7,9 @@ import nuke
 from avalon import api as avalon
 from avalon.tools import workfiles
 from pyblish import api as pyblish
-from pype.nuke import menu
-from pypeapp import Logger
+from pype.hosts.nuke import menu
+from pype.api import Logger
+from pype import PLUGINS_DIR
 from . import lib
 
 
@@ -18,10 +19,6 @@ log = Logger().get_logger(__name__, "nuke")
 
 AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype")
 
-PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
-
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "nuke", "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "nuke", "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "nuke", "create")
@@ -44,11 +41,11 @@ def reload_config():
 
     for module in (
         "{}.api".format(AVALON_CONFIG),
-        "{}.nuke.actions".format(AVALON_CONFIG),
-        "{}.nuke.presets".format(AVALON_CONFIG),
-        "{}.nuke.menu".format(AVALON_CONFIG),
-        "{}.nuke.plugin".format(AVALON_CONFIG),
-        "{}.nuke.lib".format(AVALON_CONFIG),
+        "{}.hosts.nuke.actions".format(AVALON_CONFIG),
+        "{}.hosts.nuke.presets".format(AVALON_CONFIG),
+        "{}.hosts.nuke.menu".format(AVALON_CONFIG),
+        "{}.hosts.nuke.plugin".format(AVALON_CONFIG),
+        "{}.hosts.nuke.lib".format(AVALON_CONFIG),
     ):
         log.info("Reloading module: {}...".format(module))
 

pype/hosts/nuke/actions.py

@@ -5,7 +5,7 @@ from avalon.nuke.lib import (
     select_nodes
 )
 
-from ..action import get_errored_instances_from_context
+from ...action import get_errored_instances_from_context
 
 
 class SelectInvalidAction(pyblish.api.Action):

pype/hosts/nuke/lib.py

@@ -21,8 +21,7 @@ from .presets import (
 
 from .utils import set_context_favorites
 
-from pypeapp import Logger
-log = Logger().get_logger(__name__, "nuke")
+log = pype.Logger().get_logger(__name__, "nuke")
 
 self = sys.modules[__name__]
 self._project = None

pype/hosts/nuke/menu.py

@@ -1,8 +1,8 @@
 import nuke
 from avalon.api import Session
 
-from pype.nuke import lib
-from pypeapp import Logger
+from pype.hosts.nuke import lib
+from pype.api import Logger
 
 log = Logger().get_logger(__name__, "nuke")
 

pype/hosts/nuke/plugin.py

@@ -1,8 +1,7 @@
 import re
 import avalon.api
 import avalon.nuke
-from pype import api as pype
-from pypeapp import config
+from pype.api import config
 
 class PypeCreator(avalon.nuke.pipeline.Creator):
     """Pype Nuke Creator class wrapper

pype/hosts/nuke/presets.py

@@ -1,8 +1,7 @@
-from pype import api as pype
-from pypeapp import Anatomy, config
+from pype.api import Anatomy, config, Logger
 import nuke
 
-log = pype.Logger().get_logger(__name__, "nuke")
+log = Logger().get_logger(__name__, "nuke")
 
 
 def get_anatomy(**kwarg):

pype/hosts/nukestudio/__init__.py

@@ -1,7 +1,8 @@
 import os
-from pypeapp import Logger
+from pype.api import Logger
 from avalon import api as avalon
 from pyblish import api as pyblish
+from pype import PLUGINS_DIR
 
 from .workio import (
     open_file,
@@ -37,10 +38,6 @@ log = Logger().get_logger(__name__, "nukestudio")
 AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype")
 
 # plugin root path
-PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
-
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "load")
 CREATE_PATH = os.path.join(PLUGINS_DIR, "nukestudio", "create")

pype/hosts/nukestudio/events.py

@@ -1,6 +1,6 @@
 import os
 import hiero.core.events
-from pypeapp import Logger
+from pype.api import Logger
 from .lib import sync_avalon_data_to_workfile, launch_workfiles_app
 from .tags import add_tags_from_presets
 

pype/hosts/nukestudio/lib.py

@@ -6,7 +6,7 @@ import pyblish.api
 import avalon.api as avalon
 from avalon.vendor.Qt import (QtWidgets, QtGui)
 import pype.api as pype
-from pypeapp import Logger, Anatomy
+from pype.api import Logger, Anatomy
 
 log = Logger().get_logger(__name__, "nukestudio")
 
@@ -109,9 +109,9 @@ def reload_config():
         "pypeapp",
         "{}.api".format(AVALON_CONFIG),
         "{}.templates".format(AVALON_CONFIG),
-        "{}.nukestudio.lib".format(AVALON_CONFIG),
-        "{}.nukestudio.menu".format(AVALON_CONFIG),
-        "{}.nukestudio.tags".format(AVALON_CONFIG)
+        "{}.hosts.nukestudio.lib".format(AVALON_CONFIG),
+        "{}.hosts.nukestudio.menu".format(AVALON_CONFIG),
+        "{}.hosts.nukestudio.tags".format(AVALON_CONFIG)
     ):
         log.info("Reloading module: {}...".format(module))
         try:
@@ -332,7 +332,7 @@ def CreateNukeWorkfile(nodes=None,
     '''
     import hiero.core
     from avalon.nuke import imprint
-    from pype.nuke import (
+    from pype.hosts.nuke import (
         lib as nklib
         )
 
@@ -361,7 +361,7 @@ def CreateNukeWorkfile(nodes=None,
 
     nuke_script.addNode(root_node)
 
-    # here to call pype.nuke.lib.BuildWorkfile
+    # here to call pype.hosts.nuke.lib.BuildWorkfile
     script_builder = nklib.BuildWorkfile(
         root_node=root_node,
         root_path=root_path,

pype/hosts/nukestudio/menu.py

@@ -1,7 +1,7 @@
 import os
 import sys
 import hiero.core
-from pypeapp import Logger
+from pype.api import Logger
 from avalon.api import Session
 from hiero.ui import findMenuAction
 

pype/hosts/nukestudio/tags.py

@@ -2,7 +2,7 @@ import re
 import os
 import hiero
 
-from pypeapp import (
+from pype.api import (
     config,
     Logger
 )

pype/hosts/nukestudio/workio.py

@@ -1,7 +1,7 @@
 import os
 import hiero
 from avalon import api
-from pypeapp import Logger
+from pype.api import Logger
 
 
 log = Logger().get_logger(__name__, "nukestudio")

pype/hosts/premiere/__init__.py

@@ -1,7 +1,7 @@
 import os
 from avalon import api as avalon
 from pyblish import api as pyblish
-from pypeapp import Logger
+from pype.api import Logger
 
 
 from .lib import (
@@ -42,7 +42,7 @@ def install():
     avalon.data["familiesStateDefault"] = False
     avalon.data["familiesStateToggled"] = family_states
 
-    log.info("pype.premiere installed")
+    log.info("pype.hosts.premiere installed")
 
     pyblish.register_host("premiere")
     pyblish.register_plugin_path(PUBLISH_PATH)

pype/hosts/premiere/lib.py

@@ -7,8 +7,8 @@ import requests
 
 from avalon import api
 from pype.widgets.message_window import message
-from pypeapp import Logger
-
+from pype import PLUGINS_DIR
+from pype.api import Logger
 
 log = Logger().get_logger(__name__, "premiere")
 
@@ -19,8 +19,6 @@ self._registered_gui = None
 AVALON_CONFIG = os.environ["AVALON_CONFIG"]
 
 PARENT_DIR = os.path.dirname(__file__)
-PACKAGE_DIR = os.path.dirname(PARENT_DIR)
-PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
 
 self.EXTENSIONS_PATH_REMOTE = os.path.join(PARENT_DIR, "extensions")
 self.EXTENSIONS_PATH_LOCAL = None
@@ -58,7 +56,7 @@ def reload_pipeline():
     """
 
     import importlib
-    import pype.premiere
+    import pype.hosts.premiere
 
     api.uninstall()
 
@@ -79,7 +77,7 @@ def reload_pipeline():
         except Exception as e:
             log.warning("Cannot reload module: {}".format(e))
 
-    api.install(pype.premiere)
+    api.install(pype.hosts.premiere)
 
 
 def setup(env=None):
@@ -121,7 +119,7 @@ def extensions_sync():
     # https://helpx.adobe.com/extension-manager/using/command-line.html
 
     process_pairs = list()
-    # get extensions dir in pype.premiere.extensions
+    # get extensions dir in pype.hosts.premiere.extensions
     # build dir path to premiere cep extensions
 
     for name in os.listdir(self.EXTENSIONS_PATH_REMOTE):