Merge branch 'develop' into feature/maya_testing

client/ayon_core/addon/README.md

@@ -27,7 +27,7 @@ AYON addons should contain separated logic of specific kind of implementation, s
 - default interfaces are defined in `interfaces.py`
 
 ## IPluginPaths
-- addon wants to add directory path/s to avalon or publish plugins
+- addon wants to add directory path/s to publish, load, create or inventory plugins
 - addon must implement `get_plugin_paths` which must return dictionary with possible keys `"publish"`, `"load"`, `"create"` or `"actions"`
  - each key may contain list or string with a path to directory with plugins
 
@@ -89,4 +89,4 @@ AYON addons should contain separated logic of specific kind of implementation, s
 
 ### TrayAddonsManager
 - inherits from `AddonsManager`
-- has specific implementation for Pype Tray tool and handle `ITrayAddon` methods
+- has specific implementation for AYON Tray and handle `ITrayAddon` methods

client/ayon_core/addon/base.py

@@ -741,7 +741,7 @@ class AddonsManager:
 
         addon_classes = []
         for module in openpype_modules:
-            # Go through globals in `pype.modules`
+            # Go through globals in `ayon_core.modules`
             for name in dir(module):
                 modules_item = getattr(module, name, None)
                 # Filter globals that are not classes which inherit from

client/ayon_core/cli_commands.py

@@ -67,8 +67,6 @@ class Commands:
             install_ayon_plugins,
             get_global_context,
         )
-        from ayon_core.tools.utils.host_tools import show_publish
-        from ayon_core.tools.utils.lib import qt_app_context
 
         # Register target and host
         import pyblish.api
@@ -134,6 +132,8 @@ class Commands:
             print(plugin)
 
         if gui:
+            from ayon_core.tools.utils.host_tools import show_publish
+            from ayon_core.tools.utils.lib import qt_app_context
             with qt_app_context():
                 show_publish()
         else:

client/ayon_core/hosts/blender/plugins/publish/validate_model_uv_map1.py

@@ -0,0 +1,94 @@
+import inspect
+from typing import List
+
+import bpy
+
+import pyblish.api
+
+from ayon_core.pipeline.publish import (
+    ValidateContentsOrder,
+    OptionalPyblishPluginMixin,
+    PublishValidationError,
+    RepairAction
+)
+import ayon_core.hosts.blender.api.action
+
+
+class ValidateModelMeshUvMap1(
+        pyblish.api.InstancePlugin,
+        OptionalPyblishPluginMixin,
+):
+    """Validate model mesh uvs are named `map1`.
+
+    This is solely to get them to work nicely for the Maya pipeline.
+    """
+
+    order = ValidateContentsOrder
+    hosts = ["blender"]
+    families = ["model"]
+    label = "Mesh UVs named map1"
+    actions = [ayon_core.hosts.blender.api.action.SelectInvalidAction,
+               RepairAction]
+    optional = True
+    enabled = False
+
+    @classmethod
+    def get_invalid(cls, instance) -> List:
+
+        invalid = []
+        for obj in instance:
+            if obj.mode != "OBJECT":
+                cls.log.warning(
+                    f"Mesh object {obj.name} should be in 'OBJECT' mode"
+                    " to be properly checked."
+                )
+
+            obj_data = obj.data
+            if isinstance(obj_data, bpy.types.Mesh):
+                mesh = obj_data
+
+                # Ignore mesh without UVs
+                if not mesh.uv_layers:
+                    continue
+
+                # If mesh has map1 all is ok
+                if mesh.uv_layers.get("map1"):
+                    continue
+
+                cls.log.warning(
+                    f"Mesh object {obj.name} should be in 'OBJECT' mode"
+                    " to be properly checked."
+                )
+                invalid.append(obj)
+
+        return invalid
+
+    @classmethod
+    def repair(cls, instance):
+        for obj in cls.get_invalid(instance):
+            mesh = obj.data
+
+            # Rename the first UV set to map1
+            mesh.uv_layers[0].name = "map1"
+
+    def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
+        invalid = self.get_invalid(instance)
+        if invalid:
+            raise PublishValidationError(
+                f"Meshes found in instance without valid UV's: {invalid}",
+                description=self.get_description()
+            )
+
+    def get_description(self):
+        return inspect.cleandoc(
+            """## Meshes must have map1 uv set
+
+            To accompany a better Maya-focused pipeline with Alembics it is
+            expected that a Mesh has a `map1` UV set. Blender defaults to
+            a UV set named `UVMap` and thus needs to be renamed.
+
+            """
+        )

client/ayon_core/hosts/blender/plugins/publish/validate_transform_zero.py

@@ -1,3 +1,4 @@
+import inspect
 from typing import List
 
 import mathutils
@@ -5,29 +6,26 @@ import bpy
 
 import pyblish.api
 
+from ayon_core.hosts.blender.api import plugin, lib
 import ayon_core.hosts.blender.api.action
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     OptionalPyblishPluginMixin,
-    PublishValidationError
+    PublishValidationError,
+    RepairAction
 )
 
 
 class ValidateTransformZero(pyblish.api.InstancePlugin,
                             OptionalPyblishPluginMixin):
-    """Transforms can't have any values
-
-    To solve this issue, try freezing the transforms. So long
-    as the transforms, rotation and scale values are zero,
-    you're all good.
-
-    """
+    """Transforms can't have any values"""
 
     order = ValidateContentsOrder
     hosts = ["blender"]
     families = ["model"]
     label = "Transform Zero"
-    actions = [ayon_core.hosts.blender.api.action.SelectInvalidAction]
+    actions = [ayon_core.hosts.blender.api.action.SelectInvalidAction,
+               RepairAction]
 
     _identity = mathutils.Matrix()
 
@@ -51,5 +49,46 @@ class ValidateTransformZero(pyblish.api.InstancePlugin,
             names = ", ".join(obj.name for obj in invalid)
             raise PublishValidationError(
                 "Objects found in instance which do not"
-                f" have transform set to zero: {names}"
+                f" have transform set to zero: {names}",
+                description=self.get_description()
             )
+
+    @classmethod
+    def repair(cls, instance):
+
+        invalid = cls.get_invalid(instance)
+        if not invalid:
+            return
+
+        context = plugin.create_blender_context(
+            active=invalid[0], selected=invalid
+        )
+        with lib.maintained_selection():
+            with bpy.context.temp_override(**context):
+                plugin.deselect_all()
+                for obj in invalid:
+                    obj.select_set(True)
+
+                # TODO: Preferably this does allow custom pivot point locations
+                #  and if so, this should likely apply to the delta instead
+                #  using `bpy.ops.object.transforms_to_deltas(mode="ALL")`
+                bpy.ops.object.transform_apply(location=True,
+                                               rotation=True,
+                                               scale=True)
+
+    def get_description(self):
+        return inspect.cleandoc(
+            """## Transforms can't have any values.
+
+            The location, rotation and scale on the transform must be at
+            the default values. This also goes for the delta transforms.
+
+            To solve this issue, try freezing the transforms:
+            - `Object` > `Apply` > `All Transforms`
+
+            Using the Repair action directly will do the same.
+
+            So long as the transforms, rotation and scale values are zero,
+            you're all good.
+            """
+        )

client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py

@@ -18,7 +18,7 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
     def process(self, instance):
         anatomy = instance.context.data["anatomy"]
         anatomy_data = copy.deepcopy(instance.data["anatomyData"])
-        padding = anatomy.templates.get("frame_padding", 4)
+        padding = anatomy.templates_obj.frame_padding
         product_type = "render"
         anatomy_data.update({
             "frame": f"%0{padding}d",
@@ -28,15 +28,14 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
         })
         anatomy_data["product"]["type"] = product_type
 
-        anatomy_filled = anatomy.format(anatomy_data)
-
         # get anatomy rendering keys
         r_anatomy_key = self.anatomy_template_key_render_files
         m_anatomy_key = self.anatomy_template_key_metadata
 
         # get folder and path for rendering images from celaction
-        render_dir = anatomy_filled[r_anatomy_key]["folder"]
-        render_path = anatomy_filled[r_anatomy_key]["path"]
+        r_template_item = anatomy.get_template_item("publish", r_anatomy_key)
+        render_dir = r_template_item["directory"].format_strict(anatomy_data)
+        render_path = r_template_item["path"].format_strict(anatomy_data)
         self.log.debug("__ render_path: `{}`".format(render_path))
 
         # create dir if it doesnt exists
@@ -51,11 +50,14 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
         instance.data["path"] = render_path
 
         # get anatomy for published renders folder path
-        if anatomy_filled.get(m_anatomy_key):
-            instance.data["publishRenderMetadataFolder"] = anatomy_filled[
-                m_anatomy_key]["folder"]
-            self.log.info("Metadata render path: `{}`".format(
-                instance.data["publishRenderMetadataFolder"]
-            ))
+        m_template_item = anatomy.get_template_item(
+            "publish", m_anatomy_key, default=None
+        )
+        if m_template_item is not None:
+            metadata_path = m_template_item["directory"].format_strict(
+                anatomy_data
+            )
+            instance.data["publishRenderMetadataFolder"] = metadata_path
+            self.log.info("Metadata render path: `{}`".format(metadata_path))
 
         self.log.info(f"Render output path set to: `{render_path}`")

client/ayon_core/hosts/flame/api/__init__.py

@@ -1,5 +1,5 @@
 """
-OpenPype Autodesk Flame api
+AYON Autodesk Flame api
 """
 from .constants import (
     COLOR_MAP,

client/ayon_core/hosts/flame/api/constants.py

@@ -1,14 +1,14 @@
 
 """
-OpenPype Flame api constances
+AYON Flame api constances
 """
-# OpenPype marker workflow variables
+# AYON marker workflow variables
 MARKER_NAME = "OpenPypeData"
 MARKER_DURATION = 0
 MARKER_COLOR = "cyan"
 MARKER_PUBLISH_DEFAULT = False
 
-# OpenPype color definitions
+# AYON color definitions
 COLOR_MAP = {
     "red": (1.0, 0.0, 0.0),
     "orange": (1.0, 0.5, 0.0),

client/ayon_core/hosts/flame/api/pipeline.py

@@ -38,12 +38,12 @@ def install():
     pyblish.register_plugin_path(PUBLISH_PATH)
     register_loader_plugin_path(LOAD_PATH)
     register_creator_plugin_path(CREATE_PATH)
-    log.info("OpenPype Flame plug-ins registered ...")
+    log.info("AYON Flame plug-ins registered ...")
 
     # register callback for switching publishable
     pyblish.register_callback("instanceToggled", on_pyblish_instance_toggled)
 
-    log.info("OpenPype Flame host installed ...")
+    log.info("AYON Flame host installed ...")
 
 
 def uninstall():
@@ -57,7 +57,7 @@ def uninstall():
     # register callback for switching publishable
     pyblish.deregister_callback("instanceToggled", on_pyblish_instance_toggled)
 
-    log.info("OpenPype Flame host uninstalled ...")
+    log.info("AYON Flame host uninstalled ...")
 
 
 def containerise(flame_clip_segment,

client/ayon_core/hosts/flame/api/plugin.py

@@ -38,7 +38,7 @@ class CreatorWidget(QtWidgets.QDialog):
             | QtCore.Qt.WindowCloseButtonHint
             | QtCore.Qt.WindowStaysOnTopHint
         )
-        self.setWindowTitle(name or "Pype Creator Input")
+        self.setWindowTitle(name or "AYON Creator Input")
         self.resize(500, 700)
 
         # Where inputs and labels are set

client/ayon_core/hosts/flame/api/scripts/wiretap_com.py

@@ -61,7 +61,7 @@ class WireTapCom(object):
 
     def get_launch_args(
             self, project_name, project_data, user_name, *args, **kwargs):
-        """Forming launch arguments for OpenPype launcher.
+        """Forming launch arguments for AYON launcher.
 
         Args:
             project_name (str): name of project

client/ayon_core/hosts/flame/api/utils.py

@@ -11,7 +11,7 @@ log = Logger.get_logger(__name__)
 def _sync_utility_scripts(env=None):
     """ Synchronizing basic utlility scripts for flame.
 
-    To be able to run start OpenPype within Flame we have to copy
+    To be able to run start AYON within Flame we have to copy
     all utility_scripts and additional FLAME_SCRIPT_DIR into
     `/opt/Autodesk/shared/python`. This will be always synchronizing those
     folders.
@@ -124,7 +124,7 @@ def setup(env=None):
     # synchronize resolve utility scripts
     _sync_utility_scripts(env)
 
-    log.info("Flame OpenPype wrapper has been installed")
+    log.info("Flame AYON wrapper has been installed")
 
 
 def get_flame_version():

client/ayon_core/hosts/flame/hooks/pre_flame_setup.py

@@ -72,7 +72,7 @@ class FlamePrelaunch(PreLaunchHook):
         project_data = {
             "Name": project_entity["name"],
             "Nickname": project_entity["code"],
-            "Description": "Created by OpenPype",
+            "Description": "Created by AYON",
             "SetupDir": project_entity["name"],
             "FrameWidth": int(width),
             "FrameHeight": int(height),

client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/panel_app.py

@@ -79,7 +79,7 @@ class FlameBabyPublisherPanel(object):
 
         # creating ui
         self.window.setMinimumSize(1500, 600)
-        self.window.setWindowTitle('OpenPype: Baby-publisher')
+        self.window.setWindowTitle('AYON: Baby-publisher')
         self.window.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
         self.window.setAttribute(QtCore.Qt.WA_DeleteOnClose)
         self.window.setFocusPolicy(QtCore.Qt.StrongFocus)

client/ayon_core/hosts/flame/startup/openpype_babypublisher/openpype_babypublisher.py

@@ -31,7 +31,7 @@ def scope_sequence(selection):
 def get_media_panel_custom_ui_actions():
     return [
         {
-            "name": "OpenPype: Baby-publisher",
+            "name": "AYON: Baby-publisher",
             "actions": [
                 {
                     "name": "Create Shots",

client/ayon_core/hosts/flame/startup/openpype_in_flame.py

@@ -12,7 +12,7 @@ from ayon_core.pipeline import (
 
 
 def openpype_install():
-    """Registering OpenPype in context
+    """Registering AYON in context
     """
     install_host(opfapi)
     print("Registered host: {}".format(registered_host()))
@@ -28,7 +28,7 @@ def exeption_handler(exctype, value, _traceback):
         tb (str): traceback to show
     """
     import traceback
-    msg = "OpenPype: Python exception {} in {}".format(value, exctype)
+    msg = "AYON: Python exception {} in {}".format(value, exctype)
     mbox = QtWidgets.QMessageBox()
     mbox.setText(msg)
     mbox.setDetailedText(

client/ayon_core/hosts/fusion/api/__init__.py

@@ -15,7 +15,7 @@ from .lib import (
     comp_lock_and_undo_chunk
 )
 
-from .menu import launch_openpype_menu
+from .menu import launch_ayon_menu
 
 
 __all__ = [
@@ -35,5 +35,5 @@ __all__ = [
     "comp_lock_and_undo_chunk",
 
     # menu
-    "launch_openpype_menu",
+    "launch_ayon_menu",
 ]

client/ayon_core/hosts/fusion/api/menu.py

@@ -28,9 +28,9 @@ self = sys.modules[__name__]
 self.menu = None
 
 
-class OpenPypeMenu(QtWidgets.QWidget):
+class AYONMenu(QtWidgets.QWidget):
     def __init__(self, *args, **kwargs):
-        super(OpenPypeMenu, self).__init__(*args, **kwargs)
+        super(AYONMenu, self).__init__(*args, **kwargs)
 
         self.setObjectName(f"{MENU_LABEL}Menu")
 
@@ -125,7 +125,7 @@ class OpenPypeMenu(QtWidgets.QWidget):
         self._pulse = FusionPulse(parent=self)
         self._pulse.start()
 
-        # Detect Fusion events as OpenPype events
+        # Detect Fusion events as AYON events
         self._event_handler = FusionEventHandler(parent=self)
         self._event_handler.start()
 
@@ -174,16 +174,16 @@ class OpenPypeMenu(QtWidgets.QWidget):
         set_current_context_framerange()
 
 
-def launch_openpype_menu():
+def launch_ayon_menu():
     app = get_qt_app()
 
-    pype_menu = OpenPypeMenu()
+    ayon_menu = AYONMenu()
 
     stylesheet = load_stylesheet()
-    pype_menu.setStyleSheet(stylesheet)
+    ayon_menu.setStyleSheet(stylesheet)
 
-    pype_menu.show()
-    self.menu = pype_menu
+    ayon_menu.show()
+    self.menu = ayon_menu
 
     result = app.exec_()
     print("Shutting down..")

client/ayon_core/hosts/fusion/api/pipeline.py

@@ -70,7 +70,7 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
     name = "fusion"
 
     def install(self):
-        """Install fusion-specific functionality of OpenPype.
+        """Install fusion-specific functionality of AYON.
 
         This is where you install menus and register families, data
         and loaders into fusion.
@@ -177,7 +177,7 @@ def on_after_open(event):
     if any_outdated_containers():
         log.warning("Scene has outdated content.")
 
-        # Find OpenPype menu to attach to
+        # Find AYON menu to attach to
         from . import menu
 
         def _on_show_scene_inventory():
@@ -326,9 +326,9 @@ class FusionEventThread(QtCore.QThread):
 
 
 class FusionEventHandler(QtCore.QObject):
-    """Emits OpenPype events based on Fusion events captured in a QThread.
+    """Emits AYON events based on Fusion events captured in a QThread.
 
-    This will emit the following OpenPype events based on Fusion actions:
+    This will emit the following AYON events based on Fusion actions:
         save: Comp_Save, Comp_SaveAs
         open: Comp_Opened
         new: Comp_New
@@ -374,7 +374,7 @@ class FusionEventHandler(QtCore.QObject):
         self._event_thread.stop()
 
     def _on_event(self, event):
-        """Handle Fusion events to emit OpenPype events"""
+        """Handle Fusion events to emit AYON events"""
         if not event:
             return
 

client/ayon_core/hosts/fusion/api/plugin.py

@@ -133,7 +133,7 @@ class GenericCreateSaver(Creator):
         formatting_data = deepcopy(data)
 
         # get frame padding from anatomy templates
-        frame_padding = self.project_anatomy.templates["frame_padding"]
+        frame_padding = self.project_anatomy.templates_obj.frame_padding
 
         # get output format
         ext = data["creator_attributes"]["image_format"]

client/ayon_core/hosts/fusion/deploy/MenuScripts/README.md

@@ -1,6 +1,6 @@
-### OpenPype deploy MenuScripts
+### AYON deploy MenuScripts
 
 Note that this `MenuScripts` is not an official Fusion folder.
-OpenPype only uses this folder in `{fusion}/deploy/` to trigger the OpenPype menu actions.
+AYON only uses this folder in `{fusion}/deploy/` to trigger the AYON menu actions.
 
 They are used in the actions defined in `.fu` files in `{fusion}/deploy/Config`.

client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py

@@ -35,7 +35,7 @@ def main(env):
     log = Logger.get_logger(__name__)
     log.info(f"Registered host: {registered_host()}")
 
-    menu.launch_openpype_menu()
+    menu.launch_ayon_menu()
 
     # Initiate a QTimer to check if Fusion is still alive every X interval
     # If Fusion is not found - kill itself

client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py

@@ -19,7 +19,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook):
     Prepares local Fusion profile directory, copies existing Fusion profile.
     This also sets FUSION MasterPrefs variable, which is used
     to apply Master.prefs file to override some Fusion profile settings to:
-        - enable the OpenPype menu
+        - enable the AYON menu
         - force Python 3 over Python 2
         - force English interface
     Master.prefs is defined in openpype/hosts/fusion/deploy/fusion_shared.prefs

client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py

@@ -13,7 +13,7 @@ from ayon_core.hosts.fusion import (
 
 class FusionPrelaunch(PreLaunchHook):
     """
-    Prepares OpenPype Fusion environment.
+    Prepares AYON Fusion environment.
     Requires correct Python home variable to be defined in the environment
     settings for Fusion to point at a valid Python 3 build for Fusion.
     Python3 versions that are supported by Fusion:

client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py

@@ -1,7 +1,6 @@
 from ayon_core.lib import NumberDef
 
 from ayon_core.hosts.fusion.api.plugin import GenericCreateSaver
-from ayon_core.hosts.fusion.api import get_current_comp
 
 
 class CreateImageSaver(GenericCreateSaver):

client/ayon_core/hosts/harmony/api/README.md

@@ -204,7 +204,7 @@ class CreateComposite(harmony.Creator):
 
     name = "compositeDefault"
     label = "Composite"
-    product_type = "mindbender.template"
+    product_type = "template"
 
     def __init__(self, *args, **kwargs):
         super(CreateComposite, self).__init__(*args, **kwargs)
@@ -221,7 +221,7 @@ class CreateRender(harmony.Creator):
 
     name = "writeDefault"
     label = "Write"
-    product_type = "mindbender.imagesequence"
+    product_type = "render"
     node_type = "WRITE"
 
     def __init__(self, *args, **kwargs):
@@ -304,7 +304,7 @@ class ExtractImage(pyblish.api.InstancePlugin):
     label = "Extract Image Sequence"
     order = pyblish.api.ExtractorOrder
     hosts = ["harmony"]
-    families = ["mindbender.imagesequence"]
+    families = ["render"]
 
     def process(self, instance):
         project_path = harmony.send(
@@ -582,8 +582,16 @@ class ImageSequenceLoader(load.LoaderPlugin):
     """Load images
     Stores the imported asset in a container named after the asset.
     """
-    product_types = {"mindbender.imagesequence"}
+    product_types = {
+        "shot",
+        "render",
+        "image",
+        "plate",
+        "reference",
+        "review",
+    }
     representations = ["*"]
+    extensions = {"jpeg", "png", "jpg"}
 
     def load(self, context, name=None, namespace=None, data=None):
         files = []

client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py

@@ -50,11 +50,11 @@ class ImportTemplateLoader(load.LoaderPlugin):
             self.__class__.__name__
         )
 
-        def update(self, container, context):
-            pass
+    def update(self, container, context):
+        pass
 
-        def remove(self, container):
-            pass
+    def remove(self, container):
+        pass
 
 
 class ImportWorkfileLoader(ImportTemplateLoader):

client/ayon_core/hosts/hiero/api/lib.py

@@ -632,7 +632,9 @@ def sync_avalon_data_to_workfile():
     project_name = get_current_project_name()
 
     anatomy = Anatomy(project_name)
-    work_template = anatomy.templates["work"]["path"]
+    work_template = anatomy.get_template_item(
+        "work", "default", "path"
+    )
     work_root = anatomy.root_value_for_template(work_template)
     active_project_root = (
         os.path.join(work_root, project_name)
@@ -825,7 +827,7 @@ class PublishAction(QtWidgets.QAction):
 #     root_node = hiero.core.nuke.RootNode()
 #
 #     anatomy = Anatomy(get_current_project_name())
-#     work_template = anatomy.templates["work"]["path"]
+#     work_template = anatomy.get_template_item("work", "default", "path")
 #     root_path = anatomy.root_value_for_template(work_template)
 #
 #     nuke_script.addNode(root_node)

client/ayon_core/hosts/hiero/api/plugin.py

@@ -45,7 +45,7 @@ class CreatorWidget(QtWidgets.QDialog):
             | QtCore.Qt.WindowCloseButtonHint
             | QtCore.Qt.WindowStaysOnTopHint
         )
-        self.setWindowTitle(name or "Pype Creator Input")
+        self.setWindowTitle(name or "AYON Creator Input")
         self.resize(500, 700)
 
         # Where inputs and labels are set

client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py

@@ -16,7 +16,7 @@ class CreateShotClip(phiero.Creator):
 
     gui_tracks = [track.name()
                   for track in phiero.get_current_sequence().videoTracks()]
-    gui_name = "Pype publish attributes creator"
+    gui_name = "AYON publish attributes creator"
     gui_info = "Define sequential rename and fill hierarchy data."
     gui_inputs = {
         "renameHierarchy": {

client/ayon_core/hosts/houdini/api/plugin.py

@@ -19,10 +19,6 @@ from ayon_core.lib import BoolDef
 from .lib import imprint, read, lsattr, add_self_publish_button
 
 
-class OpenPypeCreatorError(CreatorError):
-    pass
-
-
 class Creator(LegacyCreator):
     """Creator plugin to create instances in Houdini
 
@@ -92,8 +88,8 @@ class Creator(LegacyCreator):
 
         except hou.Error as er:
             six.reraise(
-                OpenPypeCreatorError,
-                OpenPypeCreatorError("Creator error: {}".format(er)),
+                CreatorError,
+                CreatorError("Creator error: {}".format(er)),
                 sys.exc_info()[2])
 
 
@@ -147,7 +143,6 @@ class HoudiniCreatorBase(object):
     def create_instance_node(
         folder_path, node_name, parent, node_type="geometry"
     ):
-        # type: (str, str, str) -> hou.Node
         """Create node representing instance.
 
         Arguments:
@@ -210,8 +205,8 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
 
         except hou.Error as er:
             six.reraise(
-                OpenPypeCreatorError,
-                OpenPypeCreatorError("Creator error: {}".format(er)),
+                CreatorError,
+                CreatorError("Creator error: {}".format(er)),
                 sys.exc_info()[2])
 
     def lock_parameters(self, node, parameters):

client/ayon_core/hosts/houdini/plugins/create/create_hda.py

@@ -2,6 +2,7 @@
 """Creator plugin for creating publishable Houdini Digital Assets."""
 import ayon_api
 
+from ayon_core.pipeline import CreatorError
 from ayon_core.hosts.houdini.api import plugin
 import hou
 
@@ -16,7 +17,7 @@ class CreateHDA(plugin.HoudiniCreator):
     maintain_selection = False
 
     def _check_existing(self, folder_path, product_name):
-        # type: (str) -> bool
+        # type: (str, str) -> bool
         """Check if existing product name versions already exists."""
         # Get all products of the current folder
         project_name = self.project_name
@@ -52,7 +53,7 @@ class CreateHDA(plugin.HoudiniCreator):
             # if node type has not its definition, it is not user
             # created hda. We test if hda can be created from the node.
             if not to_hda.canCreateDigitalAsset():
-                raise plugin.OpenPypeCreatorError(
+                raise CreatorError(
                     "cannot create hda from node {}".format(to_hda))
 
             hda_node = to_hda.createDigitalAsset(
@@ -61,7 +62,7 @@ class CreateHDA(plugin.HoudiniCreator):
             )
             hda_node.layoutChildren()
         elif self._check_existing(folder_path, node_name):
-            raise plugin.OpenPypeCreatorError(
+            raise CreatorError(
                 ("product {} is already published with different HDA"
                  "definition.").format(node_name))
         else:

client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py

@@ -2,6 +2,7 @@
 """Creator plugin to create Redshift ROP."""
 import hou  # noqa
 
+from ayon_core.pipeline import CreatorError
 from ayon_core.hosts.houdini.api import plugin
 from ayon_core.lib import EnumDef, BoolDef
 
@@ -42,7 +43,7 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
                 "Redshift_IPR", node_name=f"{basename}_IPR"
             )
         except hou.OperationFailed as e:
-            raise plugin.OpenPypeCreatorError(
+            raise CreatorError(
                 (
                     "Cannot create Redshift node. Is Redshift "
                     "installed and enabled?"

client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py

@@ -3,7 +3,7 @@
 import hou
 
 from ayon_core.hosts.houdini.api import plugin
-from ayon_core.pipeline import CreatedInstance
+from ayon_core.pipeline import CreatedInstance, CreatorError
 from ayon_core.lib import EnumDef, BoolDef
 
 
@@ -42,7 +42,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
                 "vray", node_name=basename + "_IPR"
             )
         except hou.OperationFailed:
-            raise plugin.OpenPypeCreatorError(
+            raise CreatorError(
                 "Cannot create Vray render node. "
                 "Make sure Vray installed and enabled!"
             )

client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mainMenu>
     <menuBar>
-        <subMenu id="openpype_menu">
+        <subMenu id="ayon_menu">
             <labelExpression><![CDATA[
 import os
 return os.environ.get("AYON_MENU_LABEL") or "AYON"

client/ayon_core/hosts/max/api/menu.py

@@ -8,8 +8,8 @@ from ayon_core.tools.utils import host_tools
 from ayon_core.hosts.max.api import lib
 
 
-class OpenPypeMenu(object):
-    """Object representing OpenPype/AYON menu.
+class AYONMenu(object):
+    """Object representing AYON menu.
 
     This is using "hack" to inject itself before "Help" menu of 3dsmax.
     For some reason `postLoadingMenus` event doesn't fire, and main menu
@@ -39,7 +39,7 @@ class OpenPypeMenu(object):
 
         self._counter = 0
         self._timer.stop()
-        self.build_openpype_menu()
+        self._build_ayon_menu()
 
     @staticmethod
     def get_main_widget():
@@ -50,8 +50,8 @@ class OpenPypeMenu(object):
         """Get main Menubar by 3dsmax main window."""
         return list(self.main_widget.findChildren(QtWidgets.QMenuBar))[0]
 
-    def get_or_create_openpype_menu(
-            self, name: str = "&Openpype",
+    def _get_or_create_ayon_menu(
+            self, name: str = "&AYON",
             before: str = "&Help") -> QtWidgets.QAction:
         """Create AYON menu.
 
@@ -73,7 +73,7 @@ class OpenPypeMenu(object):
         help_action = None
         for item in menu_items:
             if name in item.title():
-                # we already have OpenPype menu
+                # we already have AYON menu
                 return item
 
             if before in item.title():
@@ -85,50 +85,50 @@ class OpenPypeMenu(object):
         self.menu = op_menu
         return op_menu
 
-    def build_openpype_menu(self) -> QtWidgets.QAction:
+    def _build_ayon_menu(self) -> QtWidgets.QAction:
         """Build items in AYON menu."""
-        openpype_menu = self.get_or_create_openpype_menu()
-        load_action = QtWidgets.QAction("Load...", openpype_menu)
+        ayon_menu = self._get_or_create_ayon_menu()
+        load_action = QtWidgets.QAction("Load...", ayon_menu)
         load_action.triggered.connect(self.load_callback)
-        openpype_menu.addAction(load_action)
+        ayon_menu.addAction(load_action)
 
-        publish_action = QtWidgets.QAction("Publish...", openpype_menu)
+        publish_action = QtWidgets.QAction("Publish...", ayon_menu)
         publish_action.triggered.connect(self.publish_callback)
-        openpype_menu.addAction(publish_action)
+        ayon_menu.addAction(publish_action)
 
-        manage_action = QtWidgets.QAction("Manage...", openpype_menu)
+        manage_action = QtWidgets.QAction("Manage...", ayon_menu)
         manage_action.triggered.connect(self.manage_callback)
-        openpype_menu.addAction(manage_action)
+        ayon_menu.addAction(manage_action)
 
-        library_action = QtWidgets.QAction("Library...", openpype_menu)
+        library_action = QtWidgets.QAction("Library...", ayon_menu)
         library_action.triggered.connect(self.library_callback)
-        openpype_menu.addAction(library_action)
+        ayon_menu.addAction(library_action)
 
-        openpype_menu.addSeparator()
+        ayon_menu.addSeparator()
 
-        workfiles_action = QtWidgets.QAction("Work Files...", openpype_menu)
+        workfiles_action = QtWidgets.QAction("Work Files...", ayon_menu)
         workfiles_action.triggered.connect(self.workfiles_callback)
-        openpype_menu.addAction(workfiles_action)
+        ayon_menu.addAction(workfiles_action)
 
-        openpype_menu.addSeparator()
+        ayon_menu.addSeparator()
 
-        res_action = QtWidgets.QAction("Set Resolution", openpype_menu)
+        res_action = QtWidgets.QAction("Set Resolution", ayon_menu)
         res_action.triggered.connect(self.resolution_callback)
-        openpype_menu.addAction(res_action)
+        ayon_menu.addAction(res_action)
 
-        frame_action = QtWidgets.QAction("Set Frame Range", openpype_menu)
+        frame_action = QtWidgets.QAction("Set Frame Range", ayon_menu)
         frame_action.triggered.connect(self.frame_range_callback)
-        openpype_menu.addAction(frame_action)
+        ayon_menu.addAction(frame_action)
 
-        colorspace_action = QtWidgets.QAction("Set Colorspace", openpype_menu)
+        colorspace_action = QtWidgets.QAction("Set Colorspace", ayon_menu)
         colorspace_action.triggered.connect(self.colorspace_callback)
-        openpype_menu.addAction(colorspace_action)
+        ayon_menu.addAction(colorspace_action)
 
-        unit_scale_action = QtWidgets.QAction("Set Unit Scale", openpype_menu)
+        unit_scale_action = QtWidgets.QAction("Set Unit Scale", ayon_menu)
         unit_scale_action.triggered.connect(self.unit_scale_callback)
-        openpype_menu.addAction(unit_scale_action)
+        ayon_menu.addAction(unit_scale_action)
 
-        return openpype_menu
+        return ayon_menu
 
     def load_callback(self):
         """Callback to show Loader tool."""

client/ayon_core/hosts/max/api/pipeline.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Pipeline tools for OpenPype Houdini integration."""
+"""Pipeline tools for AYON 3ds max integration."""
 import os
 import logging
 from operator import attrgetter
@@ -14,7 +14,7 @@ from ayon_core.pipeline import (
     AVALON_CONTAINER_ID,
     AYON_CONTAINER_ID,
 )
-from ayon_core.hosts.max.api.menu import OpenPypeMenu
+from ayon_core.hosts.max.api.menu import AYONMenu
 from ayon_core.hosts.max.api import lib
 from ayon_core.hosts.max.api.plugin import MS_CUSTOM_ATTRIB
 from ayon_core.hosts.max import MAX_HOST_DIR
@@ -48,7 +48,7 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         register_creator_plugin_path(CREATE_PATH)
 
         # self._register_callbacks()
-        self.menu = OpenPypeMenu()
+        self.menu = AYONMenu()
 
         self._has_been_setup = True
 
@@ -94,7 +94,7 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
 
     def _deferred_menu_creation(self):
         self.log.info("Building menu ...")
-        self.menu = OpenPypeMenu()
+        self.menu = AYONMenu()
 
     @staticmethod
     def create_context_node():
@@ -148,7 +148,7 @@ attributes "OpenPypeContext"
 
 
 def ls() -> list:
-    """Get all OpenPype instances."""
+    """Get all AYON containers."""
     objs = rt.objects
     containers = [
         obj for obj in objs

client/ayon_core/hosts/max/api/plugin.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""3dsmax specific Avalon/Pyblish plugin definitions."""
+"""3dsmax specific AYON/Pyblish plugin definitions."""
 from abc import ABCMeta
 
 import six
@@ -156,10 +156,6 @@ MS_CUSTOM_ATTRIB = """attributes "openPypeData"
 )"""
 
 
-class OpenPypeCreatorError(CreatorError):
-    pass
-
-
 class MaxCreatorBase(object):
 
     @staticmethod

client/ayon_core/hosts/max/hooks/force_startup_script.py

@@ -6,7 +6,7 @@ from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
 
 
 class ForceStartupScript(PreLaunchHook):
-    """Inject OpenPype environment to 3ds max.
+    """Inject AYON environment to 3ds max.
 
     Note that this works in combination whit 3dsmax startup script that
     is translating it back to PYTHONPATH for cases when 3dsmax drops PYTHONPATH

client/ayon_core/hosts/max/hooks/inject_python.py

@@ -5,7 +5,7 @@ from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
 
 
 class InjectPythonPath(PreLaunchHook):
-    """Inject OpenPype environment to 3dsmax.
+    """Inject AYON environment to 3dsmax.
 
     Note that this works in combination whit 3dsmax startup script that
     is translating it back to PYTHONPATH for cases when 3dsmax drops PYTHONPATH

client/ayon_core/hosts/max/startup/startup.ms

@@ -1,4 +1,4 @@
--- OpenPype Init Script
+-- AYON Init Script
 (
     local sysPath = dotNetClass "System.IO.Path"
 	local sysDir = dotNetClass "System.IO.Directory"

client/ayon_core/hosts/maya/api/commands.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""OpenPype script commands to be used directly in Maya."""
+"""AYON script commands to be used directly in Maya."""
 from maya import cmds
 
 from ayon_api import get_project, get_folder_by_path

client/ayon_core/hosts/maya/api/customize.py

@@ -109,7 +109,7 @@ def override_toolbox_ui():
 
     controls.append(
         cmds.iconTextButton(
-            "pype_toolbox_lookmanager",
+            "ayon_toolbox_lookmanager",
             annotation="Look Manager",
             label="Look Manager",
             image=os.path.join(icons, "lookmanager.png"),
@@ -122,7 +122,7 @@ def override_toolbox_ui():
 
     controls.append(
         cmds.iconTextButton(
-            "pype_toolbox_workfiles",
+            "ayon_toolbox_workfiles",
             annotation="Work Files",
             label="Work Files",
             image=os.path.join(icons, "workfiles.png"),
@@ -137,7 +137,7 @@ def override_toolbox_ui():
 
     controls.append(
         cmds.iconTextButton(
-            "pype_toolbox_loader",
+            "ayon_toolbox_loader",
             annotation="Loader",
             label="Loader",
             image=os.path.join(icons, "loader.png"),
@@ -152,7 +152,7 @@ def override_toolbox_ui():
 
     controls.append(
         cmds.iconTextButton(
-            "pype_toolbox_manager",
+            "ayon_toolbox_manager",
             annotation="Inventory",
             label="Inventory",
             image=os.path.join(icons, "inventory.png"),

client/ayon_core/hosts/maya/api/lib.py

@@ -2931,13 +2931,13 @@ def bake_to_world_space(nodes,
 
 
 def load_capture_preset(data):
-    """Convert OpenPype Extract Playblast settings to `capture` arguments
+    """Convert AYON Extract Playblast settings to `capture` arguments
 
     Input data is the settings from:
         `project_settings/maya/publish/ExtractPlayblast/capture_preset`
 
     Args:
-        data (dict): Capture preset settings from OpenPype settings
+        data (dict): Capture preset settings from AYON settings
 
     Returns:
         dict: `capture.capture` compatible keyword arguments
@@ -3288,7 +3288,7 @@ def set_colorspace():
     else:
         # TODO: deprecated code from 3.15.5 - remove
         # Maya 2022+ introduces new OCIO v2 color management settings that
-        # can override the old color management preferences. OpenPype has
+        # can override the old color management preferences. AYON has
         # separate settings for both so we fall back when necessary.
         use_ocio_v2 = imageio["colorManagementPreference_v2"]["enabled"]
         if use_ocio_v2 and not ocio_v2_support:

client/ayon_core/hosts/maya/api/lib_rendersetup.py

@@ -3,7 +3,7 @@
 
 https://github.com/Colorbleed/colorbleed-config/blob/acre/colorbleed/maya/lib_rendersetup.py
 Credits: Roy Nieterau (BigRoy) / Colorbleed
-Modified for use in OpenPype
+Modified for use in AYON
 
 """
 

client/ayon_core/hosts/maya/api/menu.py

@@ -60,7 +60,7 @@ def get_context_label():
 
 def install(project_settings):
     if cmds.about(batch=True):
-        log.info("Skipping openpype.menu initialization in batch mode..")
+        log.info("Skipping AYON menu initialization in batch mode..")
         return
 
     def add_menu():
@@ -319,7 +319,7 @@ def popup():
 
 
 def update_menu_task_label():
-    """Update the task label in Avalon menu to current session"""
+    """Update the task label in AYON menu to current session"""
 
     if IS_HEADLESS:
         return

client/ayon_core/hosts/maya/api/pipeline.py

@@ -361,13 +361,13 @@ def parse_container(container):
 
 
 def _ls():
-    """Yields Avalon container node names.
+    """Yields AYON container node names.
 
     Used by `ls()` to retrieve the nodes and then query the full container's
     data.
 
     Yields:
-        str: Avalon container node name (objectSet)
+        str: AYON container node name (objectSet)
 
     """
 
@@ -384,7 +384,7 @@ def _ls():
     }
 
     # Iterate over all 'set' nodes in the scene to detect whether
-    # they have the avalon container ".id" attribute.
+    # they have the ayon container ".id" attribute.
     fn_dep = om.MFnDependencyNode()
     iterator = om.MItDependencyNodes(om.MFn.kSet)
     for mobject in _maya_iterate(iterator):
@@ -673,7 +673,7 @@ def workfile_save_before_xgen(event):
     switching context.
 
     Args:
-        event (Event) - openpype/lib/events.py
+        event (Event) - ayon_core/lib/events.py
     """
     if not cmds.pluginInfo("xgenToolkit", query=True, loaded=True):
         return

client/ayon_core/hosts/maya/api/plugin.py

@@ -903,7 +903,7 @@ class ReferenceLoader(Loader):
                             cmds.disconnectAttr(input, node_attr)
                         cmds.setAttr(node_attr, data["value"])
 
-        # Fix PLN-40 for older containers created with Avalon that had the
+        # Fix PLN-40 for older containers created with AYON that had the
         # `.verticesOnlySet` set to True.
         if cmds.getAttr("{}.verticesOnlySet".format(node)):
             self.log.info("Setting %s.verticesOnlySet to False", node)

client/ayon_core/hosts/maya/api/render_setup_tools.py

@@ -5,7 +5,7 @@ Export Maya nodes from Render Setup layer as if flattened in that layer instead
 of exporting the defaultRenderLayer as Maya forces by default
 
 Credits: Roy Nieterau (BigRoy) / Colorbleed
-Modified for use in OpenPype
+Modified for use in AYON
 
 """
 

client/ayon_core/hosts/maya/api/setdress.py

@@ -150,7 +150,7 @@ def load_package(filepath, name, namespace=None):
             containers.append(container)
 
     # TODO: Do we want to cripple? Or do we want to add a 'parent' parameter?
-    # Cripple the original avalon containers so they don't show up in the
+    # Cripple the original AYON containers so they don't show up in the
     # manager
     # for container in containers:
     #     cmds.setAttr("%s.id" % container,
@@ -175,7 +175,7 @@ def _add(instance, representation_id, loaders, namespace, root="|"):
         namespace (str):
 
     Returns:
-        str: The created Avalon container.
+        str: The created AYON container.
 
     """
 
@@ -244,7 +244,7 @@ def _instances_by_namespace(data):
 
 
 def get_contained_containers(container):
-    """Get the Avalon containers in this container
+    """Get the AYON containers in this container
 
     Args:
         container (dict): The container dict.
@@ -256,7 +256,7 @@ def get_contained_containers(container):
 
     from .pipeline import parse_container
 
-    # Get avalon containers in this package setdress container
+    # Get AYON containers in this package setdress container
     containers = []
     members = cmds.sets(container['objectName'], query=True)
     for node in cmds.ls(members, type="objectSet"):

client/ayon_core/hosts/maya/plugins/create/convert_legacy.py

@@ -19,7 +19,7 @@ class MayaLegacyConvertor(ProductConvertorPlugin,
 
     Its limitation is that you can have multiple creators creating product
     of the same type and there is no way to handle it. This code should
-    nevertheless cover all creators that came with OpenPype.
+    nevertheless cover all creators that came with AYON.
 
     """
     identifier = "io.openpype.creators.maya.legacy"

client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py

@@ -108,7 +108,7 @@ class LoadVDBtoArnold(load.LoaderPlugin):
 
         from maya import cmds
 
-        # Get all members of the avalon container, ensure they are unlocked
+        # Get all members of the AYON container, ensure they are unlocked
         # and delete everything
         members = cmds.sets(container['objectName'], query=True)
         cmds.lockNode(members, lock=False)

client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py

@@ -115,7 +115,7 @@ class LoadVDBtoRedShift(load.LoaderPlugin):
     def remove(self, container):
         from maya import cmds
 
-        # Get all members of the avalon container, ensure they are unlocked
+        # Get all members of the AYON container, ensure they are unlocked
         # and delete everything
         members = cmds.sets(container['objectName'], query=True)
         cmds.lockNode(members, lock=False)

client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py

@@ -277,7 +277,7 @@ class LoadVDBtoVRay(load.LoaderPlugin):
 
     def remove(self, container):
 
-        # Get all members of the avalon container, ensure they are unlocked
+        # Get all members of the AYON container, ensure they are unlocked
         # and delete everything
         members = cmds.sets(container['objectName'], query=True)
         cmds.lockNode(members, lock=False)

client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py

@@ -79,12 +79,12 @@ def iter_history(nodes,
 def collect_input_containers(containers, nodes):
     """Collect containers that contain any of the node in `nodes`.
 
-    This will return any loaded Avalon container that contains at least one of
-    the nodes. As such, the Avalon container is an input for it. Or in short,
+    This will return any loaded AYON container that contains at least one of
+    the nodes. As such, the AYON container is an input for it. Or in short,
     there are member nodes of that container.
 
     Returns:
-        list: Input avalon containers
+        list: Input loaded containers
 
     """
     # Assume the containers have collected their cached '_members' data

client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py

@@ -40,9 +40,11 @@ class _NodeTypeAttrib(object):
         return "{}.{}".format(node, self.colour_space)
 
     def __str__(self):
-        return "_NodeTypeAttrib(name={}, fname={}, "
-        "computed_fname={}, colour_space={})".format(
-            self.name, self.fname, self.computed_fname, self.colour_space)
+        return (
+            "_NodeTypeAttrib(name={}, fname={}, "
+            "computed_fname={}, colour_space={})".format(
+                self.name, self.fname, self.computed_fname, self.colour_space)
+        )
 
 
 NODETYPES = {

client/ayon_core/hosts/maya/plugins/publish/extract_look.py

@@ -106,10 +106,10 @@ class TextureProcessor:
         self.log = log
 
     def apply_settings(self, project_settings):
-        """Apply OpenPype system/project settings to the TextureProcessor
+        """Apply AYON system/project settings to the TextureProcessor
 
         Args:
-            project_settings (dict): OpenPype project settings
+            project_settings (dict): AYON project settings
 
         Returns:
             None
@@ -278,7 +278,7 @@ class MakeTX(TextureProcessor):
         """Process the texture.
 
         This function requires the `maketx` executable to be available in an
-        OpenImageIO toolset detectable by OpenPype.
+        OpenImageIO toolset detectable by AYON.
 
         Args:
             source (str): Path to source file.

client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py

@@ -128,9 +128,11 @@ class ExtractWorkfileXgen(publish.Extractor):
             alembic_files.append(alembic_file)
 
         template_data = copy.deepcopy(instance.data["anatomyData"])
-        published_maya_path = StringTemplate(
-            instance.context.data["anatomy"].templates["publish"]["file"]
-        ).format(template_data)
+        anatomy = instance.context.data["anatomy"]
+        publish_template = anatomy.get_template_item(
+            "publish", "default", "file"
+        )
+        published_maya_path = publish_template.format(template_data)
         published_basename, _ = os.path.splitext(published_maya_path)
 
         for source in alembic_files:

client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py

@@ -39,8 +39,9 @@ class ExtractXgen(publish.Extractor):
         # Get published xgen file name.
         template_data = copy.deepcopy(instance.data["anatomyData"])
         template_data.update({"ext": "xgen"})
-        templates = instance.context.data["anatomy"].templates["publish"]
-        xgen_filename = StringTemplate(templates["file"]).format(template_data)
+        anatomy = instance.context.data["anatomy"]
+        file_template = anatomy.get_template_item("publish", "default", "file")
+        xgen_filename = file_template.format(template_data)
 
         xgen_path = os.path.join(
             self.staging_dir(instance), xgen_filename

client/ayon_core/hosts/maya/plugins/publish/validate_instancer_content.py

@@ -1,81 +0,0 @@
-import maya.cmds as cmds
-import pyblish.api
-
-from ayon_core.hosts.maya.api import lib
-from ayon_core.pipeline.publish import (
-    PublishValidationError,
-    OptionalPyblishPluginMixin
-)
-
-
-class ValidateInstancerContent(pyblish.api.InstancePlugin,
-                               OptionalPyblishPluginMixin):
-    """Validates that all meshes in the instance have object IDs.
-
-    This skips a check on intermediate objects because we consider them
-    not important.
-    """
-    order = pyblish.api.ValidatorOrder
-    label = 'Instancer Content'
-    families = ['instancer']
-    optional = False
-
-    def process(self, instance):
-        if not self.is_active(instance.data):
-            return
-        error = False
-        members = instance.data['setMembers']
-        export_members = instance.data['exactExportMembers']
-
-        self.log.debug("Contents {0}".format(members))
-
-        if not len(members) == len(cmds.ls(members, type="instancer")):
-            self.log.error("Instancer can only contain instancers")
-            error = True
-
-        # TODO: Implement better check for particles are cached
-        if not cmds.ls(export_members, type="nucleus"):
-            self.log.error("Instancer must have a connected nucleus")
-            error = True
-
-        if not cmds.ls(export_members, type="cacheFile"):
-            self.log.error("Instancer must be cached")
-            error = True
-
-        hidden = self.check_geometry_hidden(export_members)
-        if not hidden:
-            error = True
-            self.log.error("Instancer input geometry must be hidden "
-                           "the scene. Invalid: {0}".format(hidden))
-
-        # Ensure all in one group
-        parents = cmds.listRelatives(members,
-                                     allParents=True,
-                                     fullPath=True) or []
-        roots = list(set(cmds.ls(parents, assemblies=True, long=True)))
-        if len(roots) > 1:
-            self.log.error("Instancer should all be contained in a single "
-                           "group. Current roots: {0}".format(roots))
-            error = True
-
-        if error:
-            raise PublishValidationError(
-                "Instancer Content is invalid. See log.")
-
-    def check_geometry_hidden(self, export_members):
-
-        # Ensure all instanced geometry is hidden
-        shapes = cmds.ls(export_members,
-                         dag=True,
-                         shapes=True,
-                         noIntermediate=True)
-        meshes = cmds.ls(shapes, type="mesh")
-
-        visible = [node for node in meshes
-                   if lib.is_visible(node,
-                                     displayLayer=False,
-                                     intermediateObject=False)]
-        if visible:
-            return False
-
-        return True

client/ayon_core/hosts/maya/plugins/publish/validate_instancer_frame_ranges.py

@@ -1,172 +0,0 @@
-import os
-import re
-
-import pyblish.api
-
-from ayon_core.pipeline.publish import (
-    PublishValidationError,
-    OptionalPyblishPluginMixin
-)
-
-def is_cache_resource(resource):
-    """Return whether resource is a cacheFile resource"""
-    required = set(["maya", "node", "cacheFile"])
-    tags = resource.get("tags", [])
-    return required.issubset(tags)
-
-
-def valdidate_files(files):
-    for f in files:
-        assert os.path.exists(f)
-        assert f.endswith(".mcx") or f.endswith(".mcc")
-
-    return True
-
-
-def filter_ticks(files):
-    tick_files = set()
-    ticks = set()
-    for path in files:
-        match = re.match(".+Tick([0-9]+).mcx$", os.path.basename(path))
-        if match:
-            tick_files.add(path)
-            num = match.group(1)
-            ticks.add(int(num))
-
-    return tick_files, ticks
-
-
-class ValidateInstancerFrameRanges(pyblish.api.InstancePlugin,
-                                   OptionalPyblishPluginMixin):
-    """Validates all instancer particle systems are cached correctly.
-
-    This means they should have the files/frames as required by the start-end
-    frame (including handles).
-
-    This also checks the files exist and checks the "ticks" (substeps) files.
-
-    """
-    order = pyblish.api.ValidatorOrder
-    label = 'Instancer Cache Frame Ranges'
-    families = ['instancer']
-    optional = False
-
-    @classmethod
-    def get_invalid(cls, instance):
-        if not self.is_active(instance.data):
-            return
-        import pyseq
-
-        start_frame = instance.data.get("frameStart", 0)
-        end_frame = instance.data.get("frameEnd", 0)
-        required = range(int(start_frame), int(end_frame) + 1)
-
-        invalid = list()
-        resources = instance.data.get("resources", [])
-
-        for resource in resources:
-            if not is_cache_resource(resource):
-                continue
-
-            node = resource['node']
-            all_files = resource['files'][:]
-            all_lookup = set(all_files)
-
-            # The first file is usually the .xml description file.
-            xml = all_files.pop(0)
-            assert xml.endswith(".xml")
-
-            # Ensure all files exist (including ticks)
-            # The remainder file paths should be the .mcx or .mcc files
-            valdidate_files(all_files)
-
-            # Maya particle caches support substeps by saving out additional
-            # files that end with a Tick60.mcx, Tick120.mcx, etc. suffix.
-            # To avoid `pyseq` getting confused we filter those out and then
-            # for each file (except the last frame) check that at least all
-            # ticks exist.
-
-            tick_files, ticks = filter_ticks(all_files)
-            if tick_files:
-                files = [f for f in all_files if f not in tick_files]
-            else:
-                files = all_files
-
-            sequences = pyseq.get_sequences(files)
-            if len(sequences) != 1:
-                invalid.append(node)
-                cls.log.warning("More than one sequence found? "
-                                "{0} {1}".format(node, files))
-                cls.log.warning("Found caches: {0}".format(sequences))
-                continue
-
-            sequence = sequences[0]
-            cls.log.debug("Found sequence: {0}".format(sequence))
-
-            start = sequence.start()
-            end = sequence.end()
-
-            if start > start_frame or end < end_frame:
-                invalid.append(node)
-                cls.log.warning("Sequence does not have enough "
-                                "frames: {0}-{1} (requires: {2}-{3})"
-                                "".format(start, end,
-                                          start_frame,
-                                          end_frame))
-                continue
-
-            # Ensure all frames are present
-            missing = set(sequence.missing())
-            if missing:
-                required_missing = [x for x in required if x in missing]
-                if required_missing:
-                    invalid.append(node)
-                    cls.log.warning("Sequence is missing required frames: "
-                                    "{0}".format(required_missing))
-                    continue
-
-            # Ensure all tick files (substep) exist for the files in the folder
-            # for the frames required by the time range.
-            if ticks:
-                ticks = list(sorted(ticks))
-                cls.log.debug("Found ticks: {0} "
-                              "(substeps: {1})".format(ticks, len(ticks)))
-
-                # Check all frames except the last since we don't
-                # require subframes after our time range.
-                tick_check_frames = set(required[:-1])
-
-                # Check all frames
-                for item in sequence:
-                    frame = item.frame
-                    if not frame:
-                        invalid.append(node)
-                        cls.log.error("Path is not a frame in sequence: "
-                                      "{0}".format(item))
-                        continue
-
-                    # Not required for our time range
-                    if frame not in tick_check_frames:
-                        continue
-
-                    path = item.path
-                    for num in ticks:
-                        base, ext = os.path.splitext(path)
-                        tick_file = base + "Tick{0}".format(num) + ext
-                        if tick_file not in all_lookup:
-                            invalid.append(node)
-                            cls.log.warning("Tick file found that is not "
-                                            "in cache query filenames: "
-                                            "{0}".format(tick_file))
-
-        return invalid
-
-    def process(self, instance):
-
-        invalid = self.get_invalid(instance)
-
-        if invalid:
-            self.log.error("Invalid nodes: {0}".format(invalid))
-            raise PublishValidationError(
-                ("Invalid particle caches in instance. "
-                 "See logs for details."))

client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py

@@ -24,7 +24,7 @@ class ValidateLoadedPlugin(pyblish.api.ContextPlugin,
 
         invalid = []
         loaded_plugin = cmds.pluginInfo(query=True, listPlugins=True)
-        # get variable from OpenPype settings
+        # get variable from AYON settings
         whitelist_native_plugins = cls.whitelist_native_plugins
         authorized_plugins = cls.authorized_plugins or []
 

client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py

@@ -45,7 +45,7 @@ class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin,
                 self.log.warning((
                     "Referenced AOVs are enabled in Vray "
                     "Render Settings and are detected in scene, but "
-                    "Pype render instance option for referenced AOVs is "
+                    "AYON render instance option for referenced AOVs is "
                     "disabled. Those AOVs will be rendered but not published "
                     "by Pype."
                 ))

client/ayon_core/hosts/maya/startup/userSetup.py

@@ -10,7 +10,7 @@ from maya import cmds
 host = MayaHost()
 install_host(host)
 
-print("Starting OpenPype usersetup...")
+print("Starting AYON usersetup...")
 
 project_name = get_current_project_name()
 settings = get_project_settings(project_name)
@@ -47,4 +47,4 @@ if bool(int(os.environ.get(key, "0"))):
     )
 
 
-print("Finished OpenPype usersetup.")
+print("Finished AYON usersetup.")

client/ayon_core/hosts/nuke/api/lib.py

@@ -982,26 +982,18 @@ def format_anatomy(data):
 
     project_name = get_current_project_name()
     anatomy = Anatomy(project_name)
-    log.debug("__ anatomy.templates: {}".format(anatomy.templates))
 
-    padding = None
-    if "frame_padding" in anatomy.templates.keys():
-        padding = int(anatomy.templates["frame_padding"])
-    elif "render" in anatomy.templates.keys():
-        padding = int(
-            anatomy.templates["render"].get(
-                "frame_padding"
-            )
-        )
+    frame_padding = anatomy.templates_obj.frame_padding
 
-    version = data.get("version", None)
-    if not version:
+    version = data.get("version")
+    if version is None:
         file = script_name()
         data["version"] = get_version_from_path(file)
 
     folder_path = data["folderPath"]
     task_name = data["task"]
     host_name = get_current_host_name()
+
     context_data = get_template_data_with_names(
         project_name, folder_path, task_name, host_name
     )
@@ -1013,7 +1005,7 @@ def format_anatomy(data):
             "name": data["productName"],
             "type": data["productType"],
         },
-        "frame": "#" * padding,
+        "frame": "#" * frame_padding,
     })
     return anatomy.format(data)
 
@@ -1171,7 +1163,9 @@ def create_write_node(
     anatomy_filled = format_anatomy(data)
 
     # build file path to workfiles
-    fdir = str(anatomy_filled["work"]["folder"]).replace("\\", "/")
+    fdir = str(
+        anatomy_filled["work"]["default"]["directory"]
+    ).replace("\\", "/")
     data["work"] = fdir
     fpath = StringTemplate(data["fpath_template"]).format_strict(data)
 

client/ayon_core/hosts/nuke/api/pipeline.py

@@ -128,7 +128,7 @@ class NukeHost(
         register_creator_plugin_path(CREATE_PATH)
         register_inventory_action_path(INVENTORY_PATH)
 
-        # Register Avalon event for workfiles loading.
+        # Register AYON event for workfiles loading.
         register_event_callback("workio.open_file", check_inventory_versions)
         register_event_callback("taskChanged", change_context_label)
 
@@ -230,9 +230,9 @@ def get_context_label():
 
 
 def _install_menu():
-    """Install Avalon menu into Nuke's main menu bar."""
+    """Install AYON menu into Nuke's main menu bar."""
 
-    # uninstall original avalon menu
+    # uninstall original AYON menu
     main_window = get_main_window()
     menubar = nuke.menu("Nuke")
     menu = menubar.addMenu(MENU_LABEL)

client/ayon_core/hosts/nuke/startup/custom_write_node.py

@@ -1,8 +1,8 @@
-""" OpenPype custom script for setting up write nodes for non-publish """
+""" AYON custom script for setting up write nodes for non-publish """
 import os
 import nuke
 import nukescripts
-from ayon_core.pipeline import Anatomy
+from ayon_core.pipeline import Anatomy, get_current_project_name
 from ayon_core.hosts.nuke.api.lib import (
     set_node_knobs_from_settings,
     get_nuke_imageio_settings
@@ -102,13 +102,9 @@ class WriteNodeKnobSettingPanel(nukescripts.PythonPanel):
             for knob in ext_knob_list:
                 ext = knob["value"]
 
-        anatomy = Anatomy()
+        anatomy = Anatomy(get_current_project_name())
 
-        frame_padding = int(
-            anatomy.templates["render"].get(
-                "frame_padding"
-            )
-        )
+        frame_padding = anatomy.templates_obj.frame_padding
         for write_node in write_selected_nodes:
             # data for mapping the path
             # TODO add more fill data

client/ayon_core/hosts/nuke/startup/frame_setting_for_read_nodes.py

@@ -1,4 +1,4 @@
-""" OpenPype custom script for resetting read nodes start frame values """
+""" AYON custom script for resetting read nodes start frame values """
 
 import nuke
 import nukescripts

client/ayon_core/hosts/photoshop/api/launch_logic.py

@@ -392,15 +392,13 @@ class PhotoshopRoute(WebSocketRoute):
         )
         data["root"] = anatomy.roots
 
-        file_template = anatomy.templates[template_key]["file"]
+        work_template = anatomy.get_template_item("work", template_key)
 
         # Define saving file extension
         extensions = host.get_workfile_extensions()
 
-        folder_template = anatomy.templates[template_key]["folder"]
-        work_root = StringTemplate.format_strict_template(
-            folder_template, data
-        )
+        work_root = work_template["directory"].format_strict(data)
+        file_template = work_template["file"].template
         last_workfile_path = get_last_workfile(
             work_root, file_template, data, extensions, True
         )

client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py

@@ -9,7 +9,6 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
     """
 
     label = "Collect Auto Image"
-    order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.2
 

client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py

@@ -8,7 +8,6 @@ class CollectAutoImageRefresh(pyblish.api.ContextPlugin):
     """
 
     label = "Collect Auto Image Refresh"
-    order = pyblish.api.CollectorOrder
     hosts = ["photoshop"]
     order = pyblish.api.CollectorOrder + 0.2
 

client/ayon_core/hosts/resolve/README.markdown

@@ -18,7 +18,7 @@ This is how it looks on my testing project timeline
 ![image](https://user-images.githubusercontent.com/40640033/102637638-96ec6600-4156-11eb-9656-6e8e3ce4baf8.png)
 Notice I had renamed tracks to `main` (holding metadata markers) and `review` used for generating review data with ffmpeg confersion to jpg sequence.
 
-1.  you need to start OpenPype menu from Resolve/EditTab/Menu/Workspace/Scripts/Comp/**__OpenPype_Menu__**
+1.  you need to start AYON menu from Resolve/EditTab/Menu/Workspace/Scripts/Comp/**__OpenPype_Menu__**
 2.  then select any clips in `main` track and change their color to `Chocolate`
 3.  in OpenPype Menu select `Create`
 4.  in Creator select `Create Publishable Clip [New]` (temporary name)

client/ayon_core/hosts/resolve/api/__init__.py

@@ -44,7 +44,7 @@ from .lib import (
     get_reformated_path
 )
 
-from .menu import launch_pype_menu
+from .menu import launch_ayon_menu
 
 from .plugin import (
     ClipLoader,
@@ -113,7 +113,7 @@ __all__ = [
     "get_reformated_path",
 
     # menu
-    "launch_pype_menu",
+    "launch_ayon_menu",
 
     # plugin
     "ClipLoader",

client/ayon_core/hosts/resolve/api/menu.py

@@ -38,9 +38,9 @@ class Spacer(QtWidgets.QWidget):
         self.setLayout(layout)
 
 
-class OpenPypeMenu(QtWidgets.QWidget):
+class AYONMenu(QtWidgets.QWidget):
     def __init__(self, *args, **kwargs):
-        super(OpenPypeMenu, self).__init__(*args, **kwargs)
+        super(AYONMenu, self).__init__(*args, **kwargs)
 
         self.setObjectName(f"{MENU_LABEL}Menu")
 
@@ -170,14 +170,14 @@ class OpenPypeMenu(QtWidgets.QWidget):
         host_tools.show_experimental_tools_dialog()
 
 
-def launch_pype_menu():
+def launch_ayon_menu():
     app = QtWidgets.QApplication(sys.argv)
 
-    pype_menu = OpenPypeMenu()
+    ayon_menu = AYONMenu()
 
     stylesheet = load_stylesheet()
-    pype_menu.setStyleSheet(stylesheet)
+    ayon_menu.setStyleSheet(stylesheet)
 
-    pype_menu.show()
+    ayon_menu.show()
 
     sys.exit(app.exec_())

client/ayon_core/hosts/resolve/api/menu_style.qss

@@ -51,7 +51,7 @@ QLineEdit {
   qproperty-alignment: AlignCenter;
 }
 
-#OpenPypeMenu {
+#AYONMenu {
     qproperty-alignment: AlignLeft;
     min-width: 10em;
     border: 1px solid #fef9ef;

client/ayon_core/hosts/resolve/startup.py

@@ -35,7 +35,7 @@ def ensure_installed_host():
 def launch_menu():
     print("Launching Resolve AYON menu..")
     ensure_installed_host()
-    ayon_core.hosts.resolve.api.launch_pype_menu()
+    ayon_core.hosts.resolve.api.launch_ayon_menu()
 
 
 def open_workfile(path):

client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py

@@ -8,13 +8,13 @@ log = Logger.get_logger(__name__)
 
 
 def main(env):
-    from ayon_core.hosts.resolve.api import ResolveHost, launch_pype_menu
+    from ayon_core.hosts.resolve.api import ResolveHost, launch_ayon_menu
 
     # activate resolve from openpype
     host = ResolveHost()
     install_host(host)
 
-    launch_pype_menu()
+    launch_ayon_menu()
 
 
 if __name__ == "__main__":

client/ayon_core/hosts/tvpaint/plugins/load/load_sound.py

@@ -54,7 +54,7 @@ class ImportSound(plugin.Loader):
     def load(self, context, name, namespace, options):
         # Create temp file for output
         output_file = tempfile.NamedTemporaryFile(
-            mode="w", prefix="pype_tvp_", suffix=".txt", delete=False
+            mode="w", prefix="ayon_tvp_", suffix=".txt", delete=False
         )
         output_file.close()
         output_filepath = output_file.name.replace("\\", "/")

client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py

@@ -80,7 +80,7 @@ class LoadWorkfile(plugin.Loader):
         )
         data["root"] = anatomy.roots
 
-        file_template = anatomy.templates[template_key]["file"]
+        work_template = anatomy.get_template_item("work", template_key)
 
         # Define saving file extension
         extensions = host.get_workfile_extensions()
@@ -91,14 +91,11 @@ class LoadWorkfile(plugin.Loader):
             # Fall back to the first extension supported for this host.
             extension = extensions[0]
 
-        data["ext"] = extension
+        data["ext"] = extension.lstrip(".")
 
-        folder_template = anatomy.templates[template_key]["folder"]
-        work_root = StringTemplate.format_strict_template(
-            folder_template, data
-        )
+        work_root = work_template["directory"].format_strict(data)
         version = get_last_workfile_with_version(
-            work_root, file_template, data, extensions
+            work_root, work_template["file"].template, data, extensions
         )[1]
 
         if version is None:

client/ayon_core/hosts/unreal/api/pipeline.py

@@ -98,7 +98,7 @@ class UnrealHost(HostBase, ILoadHost, IPublishHost):
 
 
 def install():
-    """Install Unreal configuration for OpenPype."""
+    """Install Unreal configuration for AYON."""
     print("-=" * 40)
     logo = '''.
 .

client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py

@@ -66,7 +66,9 @@ class UnrealPrelaunchHook(PreLaunchHook):
             self.host_name,
         )
         # Fill templates
-        template_obj = anatomy.templates_obj[workfile_template_key]["file"]
+        template_obj = anatomy.get_template_item(
+            "work", workfile_template_key, "file"
+        )
 
         # Return filename
         return template_obj.format_strict(workdir_data)

client/ayon_core/lib/__init__.py

@@ -81,11 +81,8 @@ from .log import (
 )
 
 from .path_templates import (
-    merge_dict,
-    TemplateMissingKey,
     TemplateUnsolved,
     StringTemplate,
-    TemplatesDict,
     FormatObject,
 )
 
@@ -259,11 +256,8 @@ __all__ = [
     "get_version_from_path",
     "get_last_version_from_path",
 
-    "merge_dict",
-    "TemplateMissingKey",
     "TemplateUnsolved",
     "StringTemplate",
-    "TemplatesDict",
     "FormatObject",
 
     "terminal",

client/ayon_core/lib/applications.py

@@ -204,7 +204,7 @@ class ApplicationGroup:
     Application group wraps different versions(variants) of application.
     e.g. "maya" is group and "maya_2020" is variant.
 
-    Group hold `host_name` which is implementation name used in pype. Also
+    Group hold `host_name` which is implementation name used in AYON. Also
     holds `enabled` if whole app group is enabled or `icon` for application
     icon path in resources.
 
@@ -1862,7 +1862,9 @@ def _prepare_last_workfile(data, workdir, addons_manager):
                 project_settings=project_settings
             )
             # Find last workfile
-            file_template = str(anatomy.templates[template_key]["file"])
+            file_template = anatomy.get_template_item(
+                "work", template_key, "file"
+            ).template
 
             workdir_data.update({
                 "version": 1,
@@ -1897,12 +1899,12 @@ def should_start_last_workfile(
     `"0", "1", "true", "false", "yes", "no"`.
 
     Args:
-        project_name (str): Name of project.
-        host_name (str): Name of host which is launched. In avalon's
-            application context it's value stored in app definition under
-            key `"application_dir"`. Is not case sensitive.
-        task_name (str): Name of task which is used for launching the host.
-            Task name is not case sensitive.
+        project_name (str): Project name.
+        host_name (str): Host name.
+        task_name (str): Task name.
+        task_type (str): Task type.
+        default_output (Optional[bool]): Default output if no profile is
+            found.
 
     Returns:
         bool: True if host should start workfile.
@@ -1947,12 +1949,12 @@ def should_workfile_tool_start(
     `"0", "1", "true", "false", "yes", "no"`.
 
     Args:
-        project_name (str): Name of project.
-        host_name (str): Name of host which is launched. In avalon's
-            application context it's value stored in app definition under
-            key `"application_dir"`. Is not case sensitive.
-        task_name (str): Name of task which is used for launching the host.
-            Task name is not case sensitive.
+        project_name (str): Project name.
+        host_name (str): Host name.
+        task_name (str): Task name.
+        task_type (str): Task type.
+        default_output (Optional[bool]): Default output if no profile is
+            found.
 
     Returns:
         bool: True if host should start workfile.

client/ayon_core/lib/ayon_info.py

@@ -102,8 +102,8 @@ def get_all_current_info():
 def extract_ayon_info_to_file(dirpath, filename=None):
     """Extract all current info to a file.
 
-    It is possible to define only directory path. Filename is concatenated with
-    pype version, workstation site id and timestamp.
+    It is possible to define only directory path. Filename is concatenated
+    with AYON version, workstation site id and timestamp.
 
     Args:
         dirpath (str): Path to directory where file will be stored.

client/ayon_core/lib/path_templates.py

@@ -1,8 +1,6 @@
 import os
 import re
-import copy
 import numbers
-import collections
 
 import six
 
@@ -12,44 +10,6 @@ SUB_DICT_PATTERN = re.compile(r"([^\[\]]+)")
 OPTIONAL_PATTERN = re.compile(r"(<.*?[^{0]*>)[^0-9]*?")
 
 
-def merge_dict(main_dict, enhance_dict):
-    """Merges dictionaries by keys.
-
-    Function call itself if value on key is again dictionary.
-
-    Args:
-        main_dict (dict): First dict to merge second one into.
-        enhance_dict (dict): Second dict to be merged.
-
-    Returns:
-        dict: Merged result.
-
-    .. note:: does not overrides whole value on first found key
-              but only values differences from enhance_dict
-
-    """
-    for key, value in enhance_dict.items():
-        if key not in main_dict:
-            main_dict[key] = value
-        elif isinstance(value, dict) and isinstance(main_dict[key], dict):
-            main_dict[key] = merge_dict(main_dict[key], value)
-        else:
-            main_dict[key] = value
-    return main_dict
-
-
-class TemplateMissingKey(Exception):
-    """Exception for cases when key does not exist in template."""
-
-    msg = "Template key does not exist: `{}`."
-
-    def __init__(self, parents):
-        parent_join = "".join(["[\"{0}\"]".format(key) for key in parents])
-        super(TemplateMissingKey, self).__init__(
-            self.msg.format(parent_join)
-        )
-
-
 class TemplateUnsolved(Exception):
     """Exception for unsolved template when strict is set to True."""
 
@@ -240,137 +200,6 @@ class StringTemplate(object):
                 new_parts.extend(tmp_parts[idx])
         return new_parts
 
-
-class TemplatesDict(object):
-    def __init__(self, templates=None):
-        self._raw_templates = None
-        self._templates = None
-        self._objected_templates = None
-        self.set_templates(templates)
-
-    def set_templates(self, templates):
-        if templates is None:
-            self._raw_templates = None
-            self._templates = None
-            self._objected_templates = None
-        elif isinstance(templates, dict):
-            self._raw_templates = copy.deepcopy(templates)
-            self._templates = templates
-            self._objected_templates = self.create_objected_templates(
-                templates)
-        else:
-            raise TypeError("<{}> argument must be a dict, not {}.".format(
-                self.__class__.__name__, str(type(templates))
-            ))
-
-    def __getitem__(self, key):
-        return self.objected_templates[key]
-
-    def get(self, key, *args, **kwargs):
-        return self.objected_templates.get(key, *args, **kwargs)
-
-    @property
-    def raw_templates(self):
-        return self._raw_templates
-
-    @property
-    def templates(self):
-        return self._templates
-
-    @property
-    def objected_templates(self):
-        return self._objected_templates
-
-    def _create_template_object(self, template):
-        """Create template object from a template string.
-
-        Separated into method to give option change class of templates.
-
-        Args:
-            template (str): Template string.
-
-        Returns:
-            StringTemplate: Object of template.
-        """
-
-        return StringTemplate(template)
-
-    def create_objected_templates(self, templates):
-        if not isinstance(templates, dict):
-            raise TypeError("Expected dict object, got {}".format(
-                str(type(templates))
-            ))
-
-        objected_templates = copy.deepcopy(templates)
-        inner_queue = collections.deque()
-        inner_queue.append(objected_templates)
-        while inner_queue:
-            item = inner_queue.popleft()
-            if not isinstance(item, dict):
-                continue
-            for key in tuple(item.keys()):
-                value = item[key]
-                if isinstance(value, six.string_types):
-                    item[key] = self._create_template_object(value)
-                elif isinstance(value, dict):
-                    inner_queue.append(value)
-        return objected_templates
-
-    def _format_value(self, value, data):
-        if isinstance(value, StringTemplate):
-            return value.format(data)
-
-        if isinstance(value, dict):
-            return self._solve_dict(value, data)
-        return value
-
-    def _solve_dict(self, templates, data):
-        """ Solves templates with entered data.
-
-        Args:
-            templates (dict): All templates which will be formatted.
-            data (dict): Containing keys to be filled into template.
-
-        Returns:
-            dict: With `TemplateResult` in values containing filled or
-                partially filled templates.
-        """
-        output = collections.defaultdict(dict)
-        for key, value in templates.items():
-            output[key] = self._format_value(value, data)
-
-        return output
-
-    def format(self, in_data, only_keys=True, strict=True):
-        """ Solves templates based on entered data.
-
-        Args:
-            data (dict): Containing keys to be filled into template.
-            only_keys (bool, optional): Decides if environ will be used to
-                fill templates or only keys in data.
-
-        Returns:
-            TemplatesResultDict: Output `TemplateResult` have `strict`
-                attribute set to True so accessing unfilled keys in templates
-                will raise exceptions with explaned error.
-        """
-        # Create a copy of inserted data
-        data = copy.deepcopy(in_data)
-
-        # Add environment variable to data
-        if only_keys is False:
-            for key, val in os.environ.items():
-                env_key = "$" + key
-                if env_key not in data:
-                    data[env_key] = val
-
-        solved = self._solve_dict(self.objected_templates, data)
-
-        output = TemplatesResultDict(solved)
-        output.strict = strict
-        return output
-
-
 class TemplateResult(str):
     """Result of template format with most of information in.
 
@@ -379,8 +208,8 @@ class TemplateResult(str):
             only used keys.
         solved (bool): For check if all required keys were filled.
         template (str): Original template.
-        missing_keys (list): Missing keys that were not in the data. Include
-            missing optional keys.
+        missing_keys (Iterable[str]): Missing keys that were not in the data.
+            Include missing optional keys.
         invalid_types (dict): When key was found in data, but value had not
             allowed DataType. Allowed data types are `numbers`,
             `str`(`basestring`) and `dict`. Dictionary may cause invalid type
@@ -445,99 +274,6 @@ class TemplateResult(str):
         )
 
 
-class TemplatesResultDict(dict):
-    """Holds and wrap TemplateResults for easy bug report."""
-
-    def __init__(self, in_data, key=None, parent=None, strict=None):
-        super(TemplatesResultDict, self).__init__()
-        for _key, _value in in_data.items():
-            if isinstance(_value, dict):
-                _value = self.__class__(_value, _key, self)
-            self[_key] = _value
-
-        self.key = key
-        self.parent = parent
-        self.strict = strict
-        if self.parent is None and strict is None:
-            self.strict = True
-
-    def __getitem__(self, key):
-        if key not in self.keys():
-            hier = self.hierarchy()
-            hier.append(key)
-            raise TemplateMissingKey(hier)
-
-        value = super(TemplatesResultDict, self).__getitem__(key)
-        if isinstance(value, self.__class__):
-            return value
-
-        # Raise exception when expected solved templates and it is not.
-        if self.raise_on_unsolved and hasattr(value, "validate"):
-            value.validate()
-        return value
-
-    @property
-    def raise_on_unsolved(self):
-        """To affect this change `strict` attribute."""
-        if self.strict is not None:
-            return self.strict
-        return self.parent.raise_on_unsolved
-
-    def hierarchy(self):
-        """Return dictionary keys one by one to root parent."""
-        if self.parent is None:
-            return []
-
-        hier_keys = []
-        par_hier = self.parent.hierarchy()
-        if par_hier:
-            hier_keys.extend(par_hier)
-        hier_keys.append(self.key)
-
-        return hier_keys
-
-    @property
-    def missing_keys(self):
-        """Return missing keys of all children templates."""
-        missing_keys = set()
-        for value in self.values():
-            missing_keys |= value.missing_keys
-        return missing_keys
-
-    @property
-    def invalid_types(self):
-        """Return invalid types of all children templates."""
-        invalid_types = {}
-        for value in self.values():
-            invalid_types = merge_dict(invalid_types, value.invalid_types)
-        return invalid_types
-
-    @property
-    def used_values(self):
-        """Return used values for all children templates."""
-        used_values = {}
-        for value in self.values():
-            used_values = merge_dict(used_values, value.used_values)
-        return used_values
-
-    def get_solved(self):
-        """Get only solved key from templates."""
-        result = {}
-        for key, value in self.items():
-            if isinstance(value, self.__class__):
-                value = value.get_solved()
-                if not value:
-                    continue
-                result[key] = value
-
-            elif (
-                not hasattr(value, "solved") or
-                value.solved
-            ):
-                result[key] = value
-        return self.__class__(result, key=self.key, parent=self.parent)
-
-
 class TemplatePartResult:
     """Result to store result of template parts."""
     def __init__(self, optional=False):

client/ayon_core/lib/python_module_tools.py

@@ -118,8 +118,8 @@ def classes_from_module(superclass, module):
 
     Arguments:
         superclass (superclass): Superclass of subclasses to look for
-        module (types.ModuleType): Imported module from which to
-            parse valid Avalon plug-ins.
+        module (types.ModuleType): Imported module where to look for
+            'superclass' subclasses.
 
     Returns:
         List of plug-ins, or empty list if none is found.

client/ayon_core/lib/terminal.py

@@ -69,7 +69,7 @@ class Terminal:
             Terminal.use_colors = False
             print(
                 "Module `blessed` failed on import or terminal creation."
-                " Pype terminal won't use colors."
+                " AYON terminal won't use colors."
             )
             Terminal._initialized = True
             return

client/ayon_core/modules/clockify/ftrack/server/action_clockify_sync_server.py

@@ -11,7 +11,7 @@ class SyncClockifyServer(ServerAction):
     label = "Sync To Clockify (server)"
     description = "Synchronise data to Clockify workspace"
 
-    role_list = ["Pypeclub", "Administrator", "project Manager"]
+    role_list = ["Administrator", "project Manager"]
 
     def __init__(self, *args, **kwargs):
         super(SyncClockifyServer, self).__init__(*args, **kwargs)

client/ayon_core/modules/clockify/ftrack/user/action_clockify_sync_local.py

@@ -13,7 +13,7 @@ class SyncClockifyLocal(BaseAction):
     #: Action description.
     description = 'Synchronise data to Clockify workspace'
     #: roles that are allowed to register this action
-    role_list = ["Pypeclub", "Administrator", "project Manager"]
+    role_list = ["Administrator", "project Manager"]
     #: icon
     icon = statics_icon("app_icons", "clockify-white.png")
 

client/ayon_core/modules/deadline/deadline_module.py

@@ -46,7 +46,6 @@ class DeadlineModule(AYONAddon, IPluginPaths):
 
     @staticmethod
     def get_deadline_pools(webservice, log=None):
-        # type: (str) -> list
         """Get pools from Deadline.
         Args:
             webservice (str): Server url.

client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py

@@ -9,11 +9,11 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
     DL webservice addresses must be configured first in System Settings for
     project settings enum to work.
 
-    Default webservice could be overriden by
+    Default webservice could be overridden by
     `project_settings/deadline/deadline_servers`. Currently only single url
     is expected.
 
-    This url could be overriden by some hosts directly on instances with
+    This url could be overridden by some hosts directly on instances with
     `CollectDeadlineServerFromInstance`.
     """
 

client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py

@@ -74,6 +74,10 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
         render_path = os.path.normpath(render_path)
         script_name = os.path.basename(script_path)
 
+        anatomy = instance.context.data["anatomy"]
+        publish_template = anatomy.get_template_item(
+            "publish", "default", "path"
+        )
         for item in instance.context:
             if "workfile" in item.data["productType"]:
                 msg = "Workfile (scene) must be published along"
@@ -84,9 +88,9 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
                 template_data["representation"] = rep
                 template_data["ext"] = rep
                 template_data["comment"] = None
-                anatomy_filled = instance.context.data["anatomy"].format(
-                    template_data)
-                template_filled = anatomy_filled["publish"]["path"]
+                template_filled = publish_template.format_strict(
+                    template_data
+                )
                 script_path = os.path.normpath(template_filled)
 
                 self.log.info(

client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py

@@ -123,6 +123,10 @@ class FusionSubmitDeadline(
 
         script_path = context.data["currentFile"]
 
+        anatomy = instance.context.data["anatomy"]
+        publish_template = anatomy.get_template_item(
+            "publish", "default", "path"
+        )
         for item in context:
             if "workfile" in item.data["families"]:
                 msg = "Workfile (scene) must be published along"
@@ -133,8 +137,9 @@ class FusionSubmitDeadline(
                 template_data["representation"] = rep
                 template_data["ext"] = rep
                 template_data["comment"] = None
-                anatomy_filled = context.data["anatomy"].format(template_data)
-                template_filled = anatomy_filled["publish"]["path"]
+                template_filled = publish_template.format_strict(
+                    template_data
+                )
                 script_path = os.path.normpath(template_filled)
 
                 self.log.info(

client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py

@@ -196,6 +196,11 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
     def _get_published_workfile_path(self, context):
         """This method is temporary while the class is not inherited from
         AbstractSubmitDeadline"""
+        anatomy = context.data["anatomy"]
+        # WARNING Hardcoded template name 'default' > may not be used
+        publish_template = anatomy.get_template_item(
+            "publish", "default", "path"
+        )
         for instance in context:
             if (
                 instance.data["productType"] != "workfile"
@@ -216,11 +221,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
             template_data["ext"] = ext
             template_data["comment"] = None
 
-            anatomy = context.data["anatomy"]
-            # WARNING Hardcoded template name 'publish' > may not be used
-            template_obj = anatomy.templates_obj["publish"]["path"]
-
-            template_filled = template_obj.format(template_data)
+            template_filled = publish_template.format(template_data)
             script_path = os.path.normpath(template_filled)
             self.log.info(
                 "Using published scene for render {}".format(

client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py

@@ -450,23 +450,10 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             "type": product_type,
         }
 
-        render_templates = anatomy.templates_obj[template_name]
-        if "folder" in render_templates:
-            publish_folder = render_templates["folder"].format_strict(
-                template_data
-            )
-        else:
-            # solve deprecated situation when `folder` key is not underneath
-            # `publish` anatomy
-            self.log.warning((
-                "Deprecation warning: Anatomy does not have set `folder`"
-                " key underneath `publish` (in global of for project `{}`)."
-            ).format(project_name))
-
-            file_path = render_templates["path"].format_strict(template_data)
-            publish_folder = os.path.dirname(file_path)
-
-        return publish_folder
+        render_dir_template = anatomy.get_template_item(
+            "publish", template_name, "directory"
+        )
+        return render_dir_template.format_strict(template_data)
 
     @classmethod
     def get_attribute_defs(cls):

client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py

@@ -573,23 +573,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             "type": product_type,
         }
 
-        render_templates = anatomy.templates_obj[template_name]
-        if "folder" in render_templates:
-            publish_folder = render_templates["folder"].format_strict(
-                template_data
-            )
-        else:
-            # solve deprecated situation when `folder` key is not underneath
-            # `publish` anatomy
-            self.log.warning((
-                "Deprecation warning: Anatomy does not have set `folder`"
-                " key underneath `publish` (in global of for project `{}`)."
-            ).format(project_name))
-
-            file_path = render_templates["path"].format_strict(template_data)
-            publish_folder = os.path.dirname(file_path)
-
-        return publish_folder
+        render_dir_template = anatomy.get_template_item(
+            "publish", template_name, "directory"
+        )
+        return render_dir_template.format_strict(template_data)
 
     @classmethod
     def get_attribute_defs(cls):

client/ayon_core/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py

@@ -149,7 +149,7 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
         """
         # no frames in file name at all, eg 'renderCompositingMain.withLut.mov'
         if not frame_placeholder:
-            return set([file_name_template])
+            return {file_name_template}
 
         real_expected_rendered = set()
         src_padding_exp = "%0{}d".format(len(frame_placeholder))

client/ayon_core/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py

@@ -404,7 +404,7 @@ class OpenPypeTileAssembler(DeadlinePlugin):
         Args:
             output_width (int): Width of output image.
             output_height (int): Height of output image.
-            tiles_info (list): List of tile items, each item must be
+            tile_info (list): List of tile items, each item must be
                 dictionary with `filepath`, `pos_x` and `pos_y` keys
                 representing path to file and x, y coordinates on output
                 image where top-left point of tile item should start.

client/ayon_core/pipeline/anatomy/__init__.py

@@ -0,0 +1,17 @@
+from .exceptions import (
+    ProjectNotSet,
+    RootCombinationError,
+    TemplateMissingKey,
+    AnatomyTemplateUnsolved,
+)
+from .anatomy import Anatomy
+
+
+__all__ = (
+    "ProjectNotSet",
+    "RootCombinationError",
+    "TemplateMissingKey",
+    "AnatomyTemplateUnsolved",
+
+    "Anatomy",
+)