From e16ce8f80c8523e2e74fe32845e94e72833c0f9a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 30 May 2024 17:37:08 +0200
Subject: [PATCH] fixed imports

---
 server_addon/resolve/client/ayon_resolve/__init__.py     | 9 ++++++++-
 server_addon/resolve/client/ayon_resolve/addon.py        | 6 ++++--
 server_addon/resolve/client/ayon_resolve/api/pipeline.py | 6 ++----
 server_addon/resolve/client/ayon_resolve/api/utils.py    | 8 ++++----
 .../client/ayon_resolve/hooks/pre_resolve_setup.py       | 2 +-
 .../client/ayon_resolve/hooks/pre_resolve_startup.py     | 5 ++---
 .../ayon_resolve/plugins/create/create_shot_clip.py      | 4 ++--
 .../client/ayon_resolve/plugins/load/load_clip.py        | 4 ++--
 .../ayon_resolve/plugins/load/load_editorial_package.py  | 2 +-
 .../ayon_resolve/plugins/publish/extract_workfile.py     | 2 +-
 .../ayon_resolve/plugins/publish/precollect_instances.py | 2 +-
 .../ayon_resolve/plugins/publish/precollect_workfile.py  | 4 ++--
 server_addon/resolve/client/ayon_resolve/startup.py      | 6 +++---
 .../client/ayon_resolve/utility_scripts/AYON__Menu.py    | 2 +-
 .../ayon_resolve/utility_scripts/develop/OTIO_export.py  | 2 +-
 .../ayon_resolve/utility_scripts/develop/OTIO_import.py  | 2 +-
 .../develop/OpenPype_sync_util_scripts.py                | 4 ++--
 server_addon/resolve/client/ayon_resolve/utils.py        | 4 ++--
 server_addon/resolve/client/ayon_resolve/version.py      | 3 +++
 19 files changed, 43 insertions(+), 34 deletions(-)
 create mode 100644 server_addon/resolve/client/ayon_resolve/version.py

diff --git a/server_addon/resolve/client/ayon_resolve/__init__.py b/server_addon/resolve/client/ayon_resolve/__init__.py
index b4a994bbaa..ba9afb67d5 100644
--- a/server_addon/resolve/client/ayon_resolve/__init__.py
+++ b/server_addon/resolve/client/ayon_resolve/__init__.py
@@ -1,6 +1,13 @@
-from .addon import ResolveAddon
+from .version import __version__
+from .addon import (
+    RESOLVE_ADDON_ROOT,
+    ResolveAddon,
+)
 
 
 __all__ = (
+    "__version__",
+
+    "RESOLVE_ADDON_ROOT",
     "ResolveAddon",
 )
diff --git a/server_addon/resolve/client/ayon_resolve/addon.py b/server_addon/resolve/client/ayon_resolve/addon.py
index 1354caabb2..706d2802b0 100644
--- a/server_addon/resolve/client/ayon_resolve/addon.py
+++ b/server_addon/resolve/client/ayon_resolve/addon.py
@@ -2,18 +2,20 @@ import os
 
 from ayon_core.addon import AYONAddon, IHostAddon
 
-from .utils import RESOLVE_ROOT_DIR
+from .version import __version__
+from .utils import RESOLVE_ADDON_ROOT
 
 
 class ResolveAddon(AYONAddon, IHostAddon):
     name = "resolve"
+    version = __version__
     host_name = "resolve"
 
     def get_launch_hook_paths(self, app):
         if app.host_name != self.host_name:
             return []
         return [
-            os.path.join(RESOLVE_ROOT_DIR, "hooks")
+            os.path.join(RESOLVE_ADDON_ROOT, "hooks")
         ]
 
     def get_workfile_extensions(self):
diff --git a/server_addon/resolve/client/ayon_resolve/api/pipeline.py b/server_addon/resolve/client/ayon_resolve/api/pipeline.py
index 15e4f1203d..d6d6dc799e 100644
--- a/server_addon/resolve/client/ayon_resolve/api/pipeline.py
+++ b/server_addon/resolve/client/ayon_resolve/api/pipeline.py
@@ -57,7 +57,7 @@ class ResolveHost(HostBase, IWorkfileHost, ILoadHost):
 
         """
 
-        log.info("ayon_core.hosts.resolve installed")
+        log.info("ayon_resolve installed")
 
         pyblish.register_host(self.name)
         pyblish.register_plugin_path(PUBLISH_PATH)
@@ -246,9 +246,7 @@ def on_pyblish_instance_toggled(instance, old_value, new_value):
     log.info("instance toggle: {}, old_value: {}, new_value:{} ".format(
         instance, old_value, new_value))
 
-    from ayon_core.hosts.resolve.api import (
-        set_publish_attribute
-    )
+    from ayon_resolve.api import set_publish_attribute
 
     # Whether instances should be passthrough based on new value
     timeline_item = instance.data["item"]
diff --git a/server_addon/resolve/client/ayon_resolve/api/utils.py b/server_addon/resolve/client/ayon_resolve/api/utils.py
index 030534370b..d63ade9d51 100644
--- a/server_addon/resolve/client/ayon_resolve/api/utils.py
+++ b/server_addon/resolve/client/ayon_resolve/api/utils.py
@@ -13,11 +13,11 @@ log = Logger.get_logger(__name__)
 
 
 def get_resolve_module():
-    from ayon_core.hosts.resolve import api
+    from ayon_resolve import api
     # dont run if already loaded
     if api.bmdvr:
         log.info(("resolve module is assigned to "
-                  f"`ayon_core.hosts.resolve.api.bmdvr`: {api.bmdvr}"))
+                  f"`ayon_resolve.api.bmdvr`: {api.bmdvr}"))
         return api.bmdvr
     try:
         """
@@ -78,6 +78,6 @@ def get_resolve_module():
     api.bmdvr = bmdvr
     api.bmdvf = bmdvf
     log.info(("Assigning resolve module to "
-              f"`ayon_core.hosts.resolve.api.bmdvr`: {api.bmdvr}"))
+              f"`ayon_resolve.api.bmdvr`: {api.bmdvr}"))
     log.info(("Assigning resolve module to "
-              f"`ayon_core.hosts.resolve.api.bmdvf`: {api.bmdvf}"))
+              f"`ayon_resolve.api.bmdvf`: {api.bmdvf}"))
diff --git a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py
index f45e28d5ab..ffd34d7b8d 100644
--- a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py
+++ b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py
@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 import platform
 from ayon_applications import PreLaunchHook, LaunchTypes
-from ayon_core.hosts.resolve.utils import setup
+from ayon_resolve.utils import setup
 
 
 class PreLaunchResolveSetup(PreLaunchHook):
diff --git a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py
index 300564f7cc..b357b10056 100644
--- a/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py
+++ b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py
@@ -1,7 +1,7 @@
 import os
 
 from ayon_applications import PreLaunchHook, LaunchTypes
-import ayon_core.hosts.resolve
+from ayon_resolve import RESOLVE_ADDON_ROOT
 
 
 class PreLaunchResolveStartup(PreLaunchHook):
@@ -15,8 +15,7 @@ class PreLaunchResolveStartup(PreLaunchHook):
     def execute(self):
         # Set the openpype prelaunch startup script path for easy access
         # in the LUA .scriptlib code
-        op_resolve_root = os.path.dirname(ayon_core.hosts.resolve.__file__)
-        script_path = os.path.join(op_resolve_root, "startup.py")
+        script_path = os.path.join(RESOLVE_ADDON_ROOT, "startup.py")
         key = "AYON_RESOLVE_STARTUP_SCRIPT"
         self.launch_context.env[key] = script_path
 
diff --git a/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py
index cbc03da3b6..da98c8de7d 100644
--- a/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py
+++ b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py
@@ -1,6 +1,6 @@
 # from pprint import pformat
-from ayon_core.hosts.resolve.api import plugin, lib
-from ayon_core.hosts.resolve.api.lib import (
+from ayon_resolve.api import plugin, lib
+from ayon_resolve.api.lib import (
     get_video_track_names,
     create_bin,
 )
diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py
index 2ce1c43957..7e3a5a254e 100644
--- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py
+++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py
@@ -1,7 +1,7 @@
 import ayon_api
 
-from ayon_core.hosts.resolve.api import lib, plugin
-from ayon_core.hosts.resolve.api.pipeline import (
+from ayon_resolve.api import lib, plugin
+from ayon_resolve.api.pipeline import (
     containerise,
     update_container,
 )
diff --git a/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py
index 33395534fa..234e7b7f71 100644
--- a/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py
+++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     get_representation_path,
 )
 
-from ayon_core.hosts.resolve.api import lib
+from ayon_resolve.api import lib
 
 
 class LoadEditorialPackage(load.LoaderPlugin):
diff --git a/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py
index 48ebdee7e3..77d14ccdc5 100644
--- a/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py
+++ b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py
@@ -2,7 +2,7 @@ import os
 import pyblish.api
 
 from ayon_core.pipeline import publish
-from ayon_core.hosts.resolve.api.lib import get_project_manager
+from ayon_resolve.api.lib import get_project_manager
 
 
 class ExtractWorkfile(publish.Extractor):
diff --git a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py
index caa79c85c0..10e1eba3e3 100644
--- a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py
+++ b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py
@@ -3,7 +3,7 @@ from pprint import pformat
 import pyblish
 
 from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
-from ayon_core.hosts.resolve.api.lib import (
+from ayon_resolve.api.lib import (
     get_current_timeline_items,
     get_timeline_item_pype_tag,
     publish_clip_color,
diff --git a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py
index 6158cf1d61..a388d4bc59 100644
--- a/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py
+++ b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py
@@ -3,8 +3,8 @@ from pprint import pformat
 
 from ayon_core.pipeline import get_current_folder_path
 
-from ayon_core.hosts.resolve import api as rapi
-from ayon_core.hosts.resolve.otio import davinci_export
+from ayon_resolve import api as rapi
+from ayon_resolve.otio import davinci_export
 
 
 class PrecollectWorkfile(pyblish.api.ContextPlugin):
diff --git a/server_addon/resolve/client/ayon_resolve/startup.py b/server_addon/resolve/client/ayon_resolve/startup.py
index 3ad0a6bf7b..7f0bd59055 100644
--- a/server_addon/resolve/client/ayon_resolve/startup.py
+++ b/server_addon/resolve/client/ayon_resolve/startup.py
@@ -11,7 +11,7 @@ This code runs in a separate process to the main Resolve process.
 """
 import os
 from ayon_core.lib import Logger
-import ayon_core.hosts.resolve.api
+import ayon_resolve.api
 
 log = Logger.get_logger(__name__)
 
@@ -27,7 +27,7 @@ def ensure_installed_host():
     if host:
         return host
 
-    host = ayon_core.hosts.resolve.api.ResolveHost()
+    host = ayon_resolve.api.ResolveHost()
     install_host(host)
     return registered_host()
 
@@ -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_ayon_menu()
+    ayon_resolve.api.launch_ayon_menu()
 
 
 def open_workfile(path):
diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py
index b10b477beb..670544d605 100644
--- a/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py
+++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py
@@ -8,7 +8,7 @@ log = Logger.get_logger(__name__)
 
 
 def main(env):
-    from ayon_core.hosts.resolve.api import ResolveHost, launch_ayon_menu
+    from ayon_resolve.api import ResolveHost, launch_ayon_menu
 
     # activate resolve from openpype
     host = ResolveHost()
diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py
index c1c83eb060..4572d1354d 100644
--- a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py
+++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import os
-from ayon_core.hosts.resolve.otio import davinci_export as otio_export
+from ayon_resolve.otio import davinci_export as otio_export
 
 resolve = bmd.scriptapp("Resolve")  # noqa
 fu = resolve.Fusion()
diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py
index 5bbdd73402..17de1b6fc3 100644
--- a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py
+++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 import os
-from ayon_core.hosts.resolve.otio import davinci_import as otio_import
+from ayon_resolve.otio import davinci_import as otio_import
 
 resolve = bmd.scriptapp("Resolve")  # noqa
 fu = resolve.Fusion()
diff --git a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
index c394238860..5a069aff9e 100644
--- a/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
+++ b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py
@@ -6,8 +6,8 @@ from ayon_core.pipeline import install_host
 
 
 def main(env):
-    from ayon_core.hosts.resolve.utils import setup
-    import ayon_core.hosts.resolve.api as bmdvr
+    from ayon_resolve.utils import setup
+    import ayon_resolve.api as bmdvr
     # Registers openpype's Global pyblish plugins
     install_host(bmdvr)
     setup(env)
diff --git a/server_addon/resolve/client/ayon_resolve/utils.py b/server_addon/resolve/client/ayon_resolve/utils.py
index 4ef6ea4f40..d256fda18d 100644
--- a/server_addon/resolve/client/ayon_resolve/utils.py
+++ b/server_addon/resolve/client/ayon_resolve/utils.py
@@ -2,7 +2,7 @@ import os
 import shutil
 from ayon_core.lib import Logger, is_running_from_build
 
-RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
+RESOLVE_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__))
 
 
 def setup(env):
@@ -12,7 +12,7 @@ def setup(env):
     util_scripts_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"]
 
     util_scripts_paths = [os.path.join(
-        RESOLVE_ROOT_DIR,
+        RESOLVE_ADDON_ROOT,
         "utility_scripts"
     )]
 
diff --git a/server_addon/resolve/client/ayon_resolve/version.py b/server_addon/resolve/client/ayon_resolve/version.py
new file mode 100644
index 0000000000..c8f8df554c
--- /dev/null
+++ b/server_addon/resolve/client/ayon_resolve/version.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+"""Package declaring AYON addon 'resolve' version."""
+__version__ = "0.2.0"