Merge branch 'develop' into enhancement/AY-5186_3dsmax-project-creation

client/ayon_core/addon/base.py

@@ -8,7 +8,6 @@ import inspect
 import logging
 import threading
 import collections
-
 from uuid import uuid4
 from abc import ABCMeta, abstractmethod
 
@@ -54,6 +53,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = {
     "celaction": VersionInfo(0, 2, 0),
     "clockify": VersionInfo(0, 2, 0),
     "flame": VersionInfo(0, 2, 0),
+    "fusion": VersionInfo(0, 2, 0),
     "max": VersionInfo(0, 2, 0),
     "photoshop": VersionInfo(0, 2, 0),
     "traypublisher": VersionInfo(0, 2, 0),
@@ -62,6 +62,7 @@ MOVED_ADDON_MILESTONE_VERSIONS = {
     "nuke": VersionInfo(0, 2, 0),
     "resolve": VersionInfo(0, 2, 0),
     "substancepainter": VersionInfo(0, 2, 0),
+    "houdini": VersionInfo(0, 3, 0),
 }
 
 
@@ -550,6 +551,9 @@ class AYONAddon(object):
     enabled = True
     _id = None
 
+    # Temporary variable for 'version' property
+    _missing_version_warned = False
+
     def __init__(self, manager, settings):
         self.manager = manager
 
@@ -580,6 +584,26 @@ class AYONAddon(object):
 
         pass
 
+    @property
+    def version(self):
+        """Addon version.
+
+        Todo:
+            Should be abstract property (required). Introduced in
+                ayon-core 0.3.3 .
+
+        Returns:
+            str: Addon version as semver compatible string.
+
+        """
+        if not self.__class__._missing_version_warned:
+            self.__class__._missing_version_warned = True
+            print(
+                f"DEV WARNING: Addon '{self.name}' does not have"
+                f" defined version."
+            )
+        return "0.0.0"
+
     def initialize(self, settings):
         """Initialization of addon attributes.
 
@@ -695,6 +719,30 @@ class OpenPypeAddOn(OpenPypeModule):
     enabled = True
 
 
+class _AddonReportInfo:
+    def __init__(
+        self, class_name, name, version, report_value_by_label
+    ):
+        self.class_name = class_name
+        self.name = name
+        self.version = version
+        self.report_value_by_label = report_value_by_label
+
+    @classmethod
+    def from_addon(cls, addon, report):
+        class_name = addon.__class__.__name__
+        report_value_by_label = {
+            label: reported.get(class_name)
+            for label, reported in report.items()
+        }
+        return cls(
+            addon.__class__.__name__,
+            addon.name,
+            addon.version,
+            report_value_by_label
+        )
+
+
 class AddonsManager:
     """Manager of addons that helps to load and prepare them to work.
 
@@ -871,10 +919,6 @@ class AddonsManager:
                 name_alias = getattr(addon, "openpype_alias", None)
                 if name_alias:
                     aliased_names.append((name_alias, addon))
-                enabled_str = "X"
-                if not addon.enabled:
-                    enabled_str = " "
-                self.log.debug("[{}] {}".format(enabled_str, name))
 
                 now = time.time()
                 report[addon.__class__.__name__] = now - prev_start_time
@@ -886,6 +930,13 @@ class AddonsManager:
                     exc_info=True
                 )
 
+        for addon_name in sorted(self._addons_by_name.keys()):
+            addon = self._addons_by_name[addon_name]
+            enabled_str = "X" if addon.enabled else " "
+            self.log.debug(
+                f"[{enabled_str}] {addon.name} ({addon.version})"
+            )
+
         for item in aliased_names:
             name_alias, addon = item
             if name_alias not in self._addons_by_name:
@@ -1174,39 +1225,55 @@ class AddonsManager:
             available_col_names |= set(addon_names.keys())
 
         # Prepare ordered dictionary for columns
-        cols = collections.OrderedDict()
-        # Add addon names to first columnt
-        cols["Addon name"] = list(sorted(
-            addon.__class__.__name__
+        addons_info = [
+            _AddonReportInfo.from_addon(addon, self._report)
             for addon in self.addons
             if addon.__class__.__name__ in available_col_names
-        ))
+        ]
+        addons_info.sort(key=lambda x: x.name)
+
+        addon_name_rows = [
+            addon_info.name
+            for addon_info in addons_info
+        ]
+        addon_version_rows = [
+            addon_info.version
+            for addon_info in addons_info
+        ]
+
         # Add total key (as last addon)
-        cols["Addon name"].append(self._report_total_key)
+        addon_name_rows.append(self._report_total_key)
+        addon_version_rows.append(f"({len(addons_info)})")
+
+        cols = collections.OrderedDict()
+        # Add addon names to first columnt
+        cols["Addon name"] = addon_name_rows
+        cols["Version"] = addon_version_rows
 
         # Add columns from report
+        total_by_addon = {
+            row: 0
+            for row in addon_name_rows
+        }
         for label in self._report.keys():
-            cols[label] = []
-
-        total_addon_times = {}
-        for addon_name in cols["Addon name"]:
-            total_addon_times[addon_name] = 0
-
-        for label, reported in self._report.items():
-            for addon_name in cols["Addon name"]:
-                col_time = reported.get(addon_name)
-                if col_time is None:
-                    cols[label].append("N/A")
+            rows = []
+            col_total = 0
+            for addon_info in addons_info:
+                value = addon_info.report_value_by_label.get(label)
+                if value is None:
+                    rows.append("N/A")
                     continue
-                cols[label].append("{:.3f}".format(col_time))
-                total_addon_times[addon_name] += col_time
-
+                rows.append("{:.3f}".format(value))
+                total_by_addon[addon_info.name] += value
+                col_total += value
+            total_by_addon[self._report_total_key] += col_total
+            rows.append("{:.3f}".format(col_total))
+            cols[label] = rows
         # Add to also total column that should sum the row
-        cols[self._report_total_key] = []
-        for addon_name in cols["Addon name"]:
-            cols[self._report_total_key].append(
-                "{:.3f}".format(total_addon_times[addon_name])
-            )
+        cols[self._report_total_key] = [
+            "{:.3f}".format(total_by_addon[addon_name])
+            for addon_name in cols["Addon name"]
+        ]
 
         # Prepare column widths and total row count
         # - column width is by

client/ayon_core/modules/deadline/deadline_module.py

@@ -7,6 +7,8 @@ import six
 from ayon_core.lib import Logger
 from ayon_core.modules import AYONAddon, IPluginPaths
 
+from .version import __version__
+
 
 class DeadlineWebserviceError(Exception):
     """
@@ -16,6 +18,7 @@ class DeadlineWebserviceError(Exception):
 
 class DeadlineModule(AYONAddon, IPluginPaths):
     name = "deadline"
+    version = __version__
 
     def initialize(self, studio_settings):
         # This module is always enabled

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

@@ -79,7 +79,7 @@ class FusionSubmitDeadline(
         else:
             context.data[key] = True
 
-        from ayon_core.hosts.fusion.api.lib import get_frame_path
+        from ayon_fusion.api.lib import get_frame_path
 
         deadline_url = instance.data["deadline"]["url"]
         assert deadline_url, "Requires Deadline Webservice URL"

client/ayon_core/modules/job_queue/__init__.py

@@ -1,6 +1,9 @@
+from .version import __version__
 from .addon import JobQueueAddon
 
 
 __all__ = (
+    "__version__",
+
     "JobQueueAddon",
 )

client/ayon_core/modules/job_queue/addon.py

@@ -44,9 +44,12 @@ import platform
 from ayon_core.addon import AYONAddon, click_wrap
 from ayon_core.settings import get_studio_settings
 
+from .version import __version__
+
 
 class JobQueueAddon(AYONAddon):
     name = "job_queue"
+    version = __version__
 
     def initialize(self, studio_settings):
         addon_settings = studio_settings.get(self.name) or {}

client/ayon_core/modules/job_queue/version.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

client/ayon_core/modules/launcher_action.py

@@ -7,6 +7,7 @@ from ayon_core.addon import AYONAddon, ITrayAction
 class LauncherAction(AYONAddon, ITrayAction):
     label = "Launcher"
     name = "launcher_tool"
+    version = "1.0.0"
 
     def initialize(self, settings):
 

client/ayon_core/modules/loader_action.py

@@ -3,6 +3,7 @@ from ayon_core.addon import AYONAddon, ITrayAddon
 
 class LoaderAddon(AYONAddon, ITrayAddon):
     name = "loader_tool"
+    version = "1.0.0"
 
     def initialize(self, settings):
         # Tray attributes

client/ayon_core/modules/python_console_interpreter/addon.py

@@ -4,6 +4,7 @@ from ayon_core.addon import AYONAddon, ITrayAction
 class PythonInterpreterAction(AYONAddon, ITrayAction):
     label = "Console"
     name = "python_interpreter"
+    version = "1.0.0"
     admin_action = True
 
     def initialize(self, settings):

client/ayon_core/modules/royalrender/__init__.py

@@ -1,6 +1,9 @@
+from .version import __version__
 from .addon import RoyalRenderAddon
 
 
 __all__ = (
+    "__version__",
+
     "RoyalRenderAddon",
 )

client/ayon_core/modules/royalrender/addon.py

@@ -4,10 +4,13 @@ import os
 
 from ayon_core.addon import AYONAddon, IPluginPaths
 
+from .version import __version__
+
 
 class RoyalRenderAddon(AYONAddon, IPluginPaths):
     """Class providing basic Royal Render implementation logic."""
     name = "royalrender"
+    version = __version__
 
     # _rr_api = None
     # @property

client/ayon_core/modules/royalrender/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.1"

client/ayon_core/modules/timers_manager/__init__.py

@@ -1,7 +1,10 @@
+from .version import __version__
 from .timers_manager import (
     TimersManager
 )
 
 __all__ = (
+    "__version__",
+
     "TimersManager",
 )

client/ayon_core/modules/timers_manager/timers_manager.py

@@ -10,6 +10,7 @@ from ayon_core.addon import (
 )
 from ayon_core.lib.events import register_event_callback
 
+from .version import __version__
 from .exceptions import InvalidContextError
 
 TIMER_MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -96,6 +97,7 @@ class TimersManager(
     See `ExampleTimersManagerConnector`.
     """
     name = "timers_manager"
+    version = __version__
     label = "Timers Service"
 
     _required_methods = (

client/ayon_core/modules/timers_manager/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.1"

client/ayon_core/modules/webserver/__init__.py

@@ -1,8 +1,11 @@
+from .version import __version__
 from .webserver_module import (
     WebServerAddon
 )
 
 
 __all__ = (
+    "__version__",
+
     "WebServerAddon",
 )

client/ayon_core/modules/webserver/version.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

client/ayon_core/modules/webserver/webserver_module.py

@@ -26,9 +26,12 @@ import socket
 from ayon_core import resources
 from ayon_core.addon import AYONAddon, ITrayService
 
+from .version import __version__
+
 
 class WebServerAddon(AYONAddon, ITrayService):
     name = "webserver"
+    version = __version__
     label = "WebServer"
 
     webserver_url_env = "AYON_WEBSERVER_URL"

client/ayon_core/pipeline/publish/lib.py

@@ -336,17 +336,16 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
     settings_category = getattr(plugin, "settings_category", None)
     if settings_category:
         try:
-            return (
-                project_settings
-                [settings_category]
-                ["publish"]
-                [plugin.__name__]
-            )
+            category_settings = project_settings[settings_category]
         except KeyError:
             log.warning((
-                "Couldn't find plugin '{}' settings"
-                " under settings category '{}'"
-            ).format(plugin.__name__, settings_category))
+                "Couldn't find settings category '{}' in project settings"
+            ).format(settings_category))
+            return {}
+
+        try:
+            return category_settings["publish"][plugin.__name__]
+        except KeyError:
             return {}
 
     # Use project settings based on a category name

client/ayon_core/tools/tray/tray.py

@@ -447,8 +447,10 @@ class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
 
     def initialize_addons(self):
         self._initializing_addons = True
-        self.tray_man.initialize_addons()
-        self._initializing_addons = False
+        try:
+            self.tray_man.initialize_addons()
+        finally:
+            self._initializing_addons = False
 
     def _click_timer_timeout(self):
         self._click_timer.stop()

server_addon/fusion/client/ayon_fusion/__init__.py

@@ -1,14 +1,17 @@
+from .version import __version__
 from .addon import (
     get_fusion_version,
     FusionAddon,
-    FUSION_HOST_DIR,
+    FUSION_ADDON_ROOT,
     FUSION_VERSIONS_DICT,
 )
 
 
 __all__ = (
+    "__version__",
+
     "get_fusion_version",
     "FusionAddon",
-    "FUSION_HOST_DIR",
+    "FUSION_ADDON_ROOT",
     "FUSION_VERSIONS_DICT",
 )

server_addon/fusion/client/ayon_fusion/addon.py

@@ -3,7 +3,9 @@ import re
 from ayon_core.addon import AYONAddon, IHostAddon
 from ayon_core.lib import Logger
 
-FUSION_HOST_DIR = os.path.dirname(os.path.abspath(__file__))
+from .version import __version__
+
+FUSION_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__))
 
 # FUSION_VERSIONS_DICT is used by the pre-launch hooks
 # The keys correspond to all currently supported Fusion versions
@@ -50,12 +52,13 @@ def get_fusion_version(app_name):
 
 class FusionAddon(AYONAddon, IHostAddon):
     name = "fusion"
+    version = __version__
     host_name = "fusion"
 
     def get_launch_hook_paths(self, app):
         if app.host_name != self.host_name:
             return []
-        return [os.path.join(FUSION_HOST_DIR, "hooks")]
+        return [os.path.join(FUSION_ADDON_ROOT, "hooks")]
 
     def add_implementation_envs(self, env, app):
         # Set default values if are not already set via settings

server_addon/fusion/client/ayon_fusion/api/action.py

@@ -1,7 +1,7 @@
 import pyblish.api
 
 
-from ayon_core.hosts.fusion.api.lib import get_current_comp
+from ayon_fusion.api.lib import get_current_comp
 from ayon_core.pipeline.publish import get_errored_instances_from_context
 
 

server_addon/fusion/client/ayon_fusion/api/menu.py

@@ -6,10 +6,10 @@ from qtpy import QtWidgets, QtCore, QtGui
 from ayon_core.tools.utils import host_tools
 from ayon_core.style import load_stylesheet
 from ayon_core.lib import register_event_callback
-from ayon_core.hosts.fusion.scripts import (
+from ayon_fusion.scripts import (
     duplicate_with_inputs,
 )
-from ayon_core.hosts.fusion.api.lib import (
+from ayon_fusion.api.lib import (
     set_current_context_framerange,
     set_current_context_resolution,
 )

server_addon/fusion/client/ayon_fusion/api/pipeline.py

@@ -22,9 +22,9 @@ from ayon_core.pipeline import (
     AVALON_CONTAINER_ID,
 )
 from ayon_core.pipeline.load import any_outdated_containers
-from ayon_core.hosts.fusion import FUSION_HOST_DIR
 from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost
 from ayon_core.tools.utils import host_tools
+from ayon_fusion import FUSION_ADDON_ROOT
 
 
 from .lib import (
@@ -35,7 +35,7 @@ from .lib import (
 
 log = Logger.get_logger(__name__)
 
-PLUGINS_DIR = os.path.join(FUSION_HOST_DIR, "plugins")
+PLUGINS_DIR = os.path.join(FUSION_ADDON_ROOT, "plugins")
 
 PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish")
 LOAD_PATH = os.path.join(PLUGINS_DIR, "load")
@@ -80,7 +80,7 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         and loaders into fusion.
 
         It is called automatically when installing via
-        `ayon_core.pipeline.install_host(ayon_core.hosts.fusion.api)`
+        `ayon_core.pipeline.install_host(ayon_fusion.api)`
 
         See the Maya equivalent for inspiration on how to implement this.
 
@@ -127,7 +127,7 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
 
     def open_workfile(self, filepath):
         # Hack to get fusion, see
-        #   ayon_core.hosts.fusion.api.pipeline.get_current_comp()
+        #   ayon_fusion.api.pipeline.get_current_comp()
         fusion = getattr(sys.modules["__main__"], "fusion", None)
 
         return fusion.LoadComp(filepath)

server_addon/fusion/client/ayon_fusion/api/plugin.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 import os
 
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     get_current_comp,
     comp_lock_and_undo_chunk,
 )

server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py

@@ -5,10 +5,9 @@ if sys.version_info < (3, 7):
     # hack to handle discrepancy between distributed libraries and Python 3.6
     # mostly because wrong version of urllib3
     # TODO remove when not necessary
-    from ayon_core import AYON_CORE_ROOT
-    FUSION_HOST_DIR = os.path.join(AYON_CORE_ROOT, "hosts", "fusion")
+    from ayon_fusion import FUSION_ADDON_ROOT
 
-    vendor_path = os.path.join(FUSION_HOST_DIR, "vendor")
+    vendor_path = os.path.join(FUSION_ADDON_ROOT, "vendor")
     if vendor_path not in sys.path:
         sys.path.insert(0, vendor_path)
 
@@ -26,8 +25,8 @@ def main(env):
     # However the contents of that folder can conflict with Qt library dlls
     # so we make sure to move out of it to avoid DLL Load Failed errors.
     os.chdir("..")
-    from ayon_core.hosts.fusion.api import FusionHost
-    from ayon_core.hosts.fusion.api import menu
+    from ayon_fusion.api import FusionHost
+    from ayon_fusion.api import menu
 
     # activate resolve from pype
     install_host(FusionHost())

server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py

@@ -1,6 +1,6 @@
 import os
 from ayon_applications import PreLaunchHook
-from ayon_core.hosts.fusion import FUSION_HOST_DIR
+from ayon_fusion import FUSION_ADDON_ROOT
 
 
 class FusionLaunchMenuHook(PreLaunchHook):
@@ -28,7 +28,7 @@ class FusionLaunchMenuHook(PreLaunchHook):
                   "Validation for Fusion version 18+ for /execute "
                   "prelaunch argument skipped.")
 
-        path = os.path.join(FUSION_HOST_DIR,
+        path = os.path.join(FUSION_ADDON_ROOT,
                             "deploy",
                             "MenuScripts",
                             "launch_menu.py").replace("\\", "/")

server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py

@@ -2,8 +2,8 @@ import os
 import shutil
 import platform
 from pathlib import Path
-from ayon_core.hosts.fusion import (
-    FUSION_HOST_DIR,
+from ayon_fusion import (
+    FUSION_ADDON_ROOT,
     FUSION_VERSIONS_DICT,
     get_fusion_version,
 )
@@ -163,7 +163,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook):
         master_prefs_variable = f"FUSION{profile_version}_MasterPrefs"
 
         master_prefs = Path(
-            FUSION_HOST_DIR, "deploy", "ayon", "fusion_shared.prefs")
+            FUSION_ADDON_ROOT, "deploy", "ayon", "fusion_shared.prefs")
 
         self.log.info(f"Setting {master_prefs_variable}: {master_prefs}")
         self.launch_context.env[master_prefs_variable] = str(master_prefs)

server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py

@@ -4,8 +4,8 @@ from ayon_applications import (
     LaunchTypes,
     ApplicationLaunchFailed,
 )
-from ayon_core.hosts.fusion import (
-    FUSION_HOST_DIR,
+from ayon_fusion import (
+    FUSION_ADDON_ROOT,
     FUSION_VERSIONS_DICT,
     get_fusion_version,
 )
@@ -67,5 +67,5 @@ class FusionPrelaunch(PreLaunchHook):
         # for hook installing PySide2
         self.data["fusion_python3_home"] = py3_dir
 
-        self.log.info(f"Setting AYON_FUSION_ROOT: {FUSION_HOST_DIR}")
-        self.launch_context.env["AYON_FUSION_ROOT"] = FUSION_HOST_DIR
+        self.log.info(f"Setting AYON_FUSION_ROOT: {FUSION_ADDON_ROOT}")
+        self.launch_context.env["AYON_FUSION_ROOT"] = FUSION_ADDON_ROOT

server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py

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

server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py

@@ -4,8 +4,8 @@ from ayon_core.lib import (
     EnumDef
 )
 
-from ayon_core.hosts.fusion.api.plugin import GenericCreateSaver
-from ayon_core.hosts.fusion.api.lib import get_current_comp
+from ayon_fusion.api.plugin import GenericCreateSaver
+from ayon_fusion.api.lib import get_current_comp
 
 
 class CreateSaver(GenericCreateSaver):

server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py

@@ -1,6 +1,6 @@
 import ayon_api
 
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     get_current_comp
 )
 from ayon_core.pipeline import (

server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py

@@ -8,7 +8,7 @@ class FusionSelectContainers(InventoryAction):
     color = "#d8d8d8"
 
     def process(self, containers):
-        from ayon_core.hosts.fusion.api import (
+        from ayon_fusion.api import (
             get_current_comp,
             comp_lock_and_undo_chunk
         )

server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py

@@ -2,7 +2,7 @@ from qtpy import QtGui, QtWidgets
 
 from ayon_core.pipeline import InventoryAction
 from ayon_core import style
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     get_current_comp,
     comp_lock_and_undo_chunk
 )

server_addon/fusion/client/ayon_fusion/plugins/load/actions.py

@@ -27,7 +27,7 @@ class FusionSetFrameRangeLoader(load.LoaderPlugin):
 
     def load(self, context, name, namespace, data):
 
-        from ayon_core.hosts.fusion.api import lib
+        from ayon_fusion.api import lib
 
         version_attributes = context["version"]["attrib"]
 
@@ -63,7 +63,7 @@ class FusionSetFrameRangeWithHandlesLoader(load.LoaderPlugin):
 
     def load(self, context, name, namespace, data):
 
-        from ayon_core.hosts.fusion.api import lib
+        from ayon_fusion.api import lib
 
         version_attributes = context["version"]["attrib"]
         start = version_attributes.get("frameStart", None)

server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py

@@ -2,7 +2,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     imprint_container,
     get_current_comp,
     comp_lock_and_undo_chunk

server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py

@@ -2,7 +2,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     imprint_container,
     get_current_comp,
     comp_lock_and_undo_chunk,

server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py

@@ -1,7 +1,7 @@
 import contextlib
 
 import ayon_core.pipeline.load as load
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     imprint_container,
     get_current_comp,
     comp_lock_and_undo_chunk,

server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py

@@ -2,12 +2,12 @@ from ayon_core.pipeline import (
     load,
     get_representation_path,
 )
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     imprint_container,
     get_current_comp,
     comp_lock_and_undo_chunk
 )
-from ayon_core.hosts.fusion.api.lib import get_fusion_module
+from ayon_fusion.api.lib import get_fusion_module
 
 
 class FusionLoadUSD(load.LoaderPlugin):

server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py

@@ -5,7 +5,7 @@ is no update or reload function added for this plugin
 
 from ayon_core.pipeline import load
 
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     get_current_comp,
     get_bmd_library,
 )

server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py

@@ -1,6 +1,6 @@
 import pyblish.api
 
-from ayon_core.hosts.fusion.api import get_current_comp
+from ayon_fusion.api import get_current_comp
 
 
 class CollectCurrentCompFusion(pyblish.api.ContextPlugin):

server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py

@@ -4,7 +4,7 @@ import pyblish.api
 
 from ayon_core.pipeline import publish
 from ayon_core.pipeline.publish import RenderInstance
-from ayon_core.hosts.fusion.api.lib import get_frame_path
+from ayon_fusion.api.lib import get_frame_path
 
 
 @attr.s

server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py

@@ -5,8 +5,8 @@ import collections
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.fusion.api import comp_lock_and_undo_chunk
-from ayon_core.hosts.fusion.api.lib import get_frame_path, maintained_comp_range
+from ayon_fusion.api import comp_lock_and_undo_chunk
+from ayon_fusion.api.lib import get_frame_path, maintained_comp_range
 
 log = logging.getLogger(__name__)
 

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py

@@ -6,7 +6,7 @@ from ayon_core.pipeline import (
     PublishValidationError,
 )
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateBackgroundDepth(

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py

@@ -3,7 +3,7 @@ import pyblish.api
 from ayon_core.pipeline.publish import RepairAction
 from ayon_core.pipeline import PublishValidationError
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateCreateFolderChecked(pyblish.api.InstancePlugin):

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py

@@ -4,7 +4,7 @@ import pyblish.api
 from ayon_core.pipeline.publish import RepairAction
 from ayon_core.pipeline import PublishValidationError
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateLocalFramesExistence(pyblish.api.InstancePlugin):

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py

@@ -3,7 +3,7 @@ import os
 import pyblish.api
 from ayon_core.pipeline import PublishValidationError
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateFilenameHasExtension(pyblish.api.InstancePlugin):

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py

@@ -2,7 +2,7 @@
 """Validate if instance context is the same as publish context."""
 
 import pyblish.api
-from ayon_core.hosts.fusion.api.action import SelectToolAction
+from ayon_fusion.api.action import SelectToolAction
 from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py

@@ -1,7 +1,7 @@
 import pyblish.api
 from ayon_core.pipeline import PublishValidationError
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateSaverHasInput(pyblish.api.InstancePlugin):

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py

@@ -1,7 +1,7 @@
 import pyblish.api
 from ayon_core.pipeline import PublishValidationError
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateSaverPassthrough(pyblish.api.ContextPlugin):

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py

@@ -4,8 +4,8 @@ from ayon_core.pipeline import (
     OptionalPyblishPluginMixin,
 )
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
-from ayon_core.hosts.fusion.api import comp_lock_and_undo_chunk
+from ayon_fusion.api.action import SelectInvalidAction
+from ayon_fusion.api import comp_lock_and_undo_chunk
 
 
 class ValidateSaverResolution(

server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py

@@ -3,7 +3,7 @@ from collections import defaultdict
 import pyblish.api
 from ayon_core.pipeline import PublishValidationError
 
-from ayon_core.hosts.fusion.api.action import SelectInvalidAction
+from ayon_fusion.api.action import SelectInvalidAction
 
 
 class ValidateUniqueSubsets(pyblish.api.ContextPlugin):

server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py

@@ -1,4 +1,4 @@
-from ayon_core.hosts.fusion.api import (
+from ayon_fusion.api import (
     comp_lock_and_undo_chunk,
     get_current_comp
 )