diff --git a/server_addon/unreal/client/ayon_unreal/api/pipeline.py b/server_addon/unreal/client/ayon_unreal/api/pipeline.py index 9f8502669d..f04d8e10a4 100644 --- a/server_addon/unreal/client/ayon_unreal/api/pipeline.py +++ b/server_addon/unreal/client/ayon_unreal/api/pipeline.py @@ -323,7 +323,7 @@ def show_tools_popup(): Popup will disappear on click or losing focus. """ - from ayon_core.hosts.unreal.api import tools_ui + from ayon_unreal.api import tools_ui tools_ui.show_tools_popup() @@ -333,7 +333,7 @@ def show_tools_dialog(): Dialog will stay visible. """ - from ayon_core.hosts.unreal.api import tools_ui + from ayon_unreal.api import tools_ui tools_ui.show_tools_dialog() diff --git a/server_addon/unreal/client/ayon_unreal/api/rendering.py b/server_addon/unreal/client/ayon_unreal/api/rendering.py index 395513aefa..6ae9fee26d 100644 --- a/server_addon/unreal/client/ayon_unreal/api/rendering.py +++ b/server_addon/unreal/client/ayon_unreal/api/rendering.py @@ -4,8 +4,8 @@ import unreal from ayon_core.settings import get_project_settings from ayon_core.pipeline import Anatomy -from ayon_core.hosts.unreal.api import pipeline from ayon_core.tools.utils import show_message_dialog +from ayon_unreal.api import pipeline queue = None diff --git a/server_addon/unreal/client/ayon_unreal/api/tools_ui.py b/server_addon/unreal/client/ayon_unreal/api/tools_ui.py index efae5bb702..f464d39b92 100644 --- a/server_addon/unreal/client/ayon_unreal/api/tools_ui.py +++ b/server_addon/unreal/client/ayon_unreal/api/tools_ui.py @@ -7,7 +7,7 @@ from ayon_core import ( ) from ayon_core.tools.utils import host_tools from ayon_core.tools.utils.lib import qt_app_context -from ayon_core.hosts.unreal.api import rendering +from ayon_unreal.api import rendering class ToolsBtnsWidget(QtWidgets.QWidget): diff --git a/server_addon/unreal/client/ayon_unreal/hooks/pre_workfile_preparation.py b/server_addon/unreal/client/ayon_unreal/hooks/pre_workfile_preparation.py index e38591f65d..e70b3131b3 100644 --- a/server_addon/unreal/client/ayon_unreal/hooks/pre_workfile_preparation.py +++ b/server_addon/unreal/client/ayon_unreal/hooks/pre_workfile_preparation.py @@ -15,12 +15,12 @@ from ayon_applications import ( LaunchTypes, ) from ayon_core.pipeline.workfile import get_workfile_template_key -import ayon_core.hosts.unreal.lib as unreal_lib -from ayon_core.hosts.unreal.ue_workers import ( +import ayon_unreal.lib as unreal_lib +from ayon_unreal.ue_workers import ( UEProjectGenerationWorker, UEPluginInstallWorker ) -from ayon_core.hosts.unreal.ui import SplashScreen +from ayon_unreal.ui import SplashScreen class UnrealPrelaunchHook(PreLaunchHook): diff --git a/server_addon/unreal/client/ayon_unreal/plugins/create/create_camera.py b/server_addon/unreal/client/ayon_unreal/plugins/create/create_camera.py index 3ffb9dd70b..d9a66215db 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/create/create_camera.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/create/create_camera.py @@ -2,8 +2,8 @@ import unreal from ayon_core.pipeline import CreatorError -from ayon_core.hosts.unreal.api.pipeline import UNREAL_VERSION -from ayon_core.hosts.unreal.api.plugin import ( +from ayon_unreal.api.pipeline import UNREAL_VERSION +from ayon_unreal.api.plugin import ( UnrealAssetCreator, ) diff --git a/server_addon/unreal/client/ayon_unreal/plugins/create/create_layout.py b/server_addon/unreal/client/ayon_unreal/plugins/create/create_layout.py index 9bcddfe507..fa4fc072ae 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/create/create_layout.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/create/create_layout.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from ayon_core.hosts.unreal.api.plugin import ( +from ayon_unreal.api.plugin import ( UnrealActorCreator, ) diff --git a/server_addon/unreal/client/ayon_unreal/plugins/create/create_look.py b/server_addon/unreal/client/ayon_unreal/plugins/create/create_look.py index edc6d45f2f..9017997864 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/create/create_look.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/create/create_look.py @@ -2,10 +2,10 @@ import unreal from ayon_core.pipeline import CreatorError -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api.pipeline import ( create_folder ) -from ayon_core.hosts.unreal.api.plugin import ( +from ayon_unreal.api.plugin import ( UnrealAssetCreator ) from ayon_core.lib import UILabelDef diff --git a/server_addon/unreal/client/ayon_unreal/plugins/create/create_render.py b/server_addon/unreal/client/ayon_unreal/plugins/create/create_render.py index 5a96d9809c..e1999e5385 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/create/create_render.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/create/create_render.py @@ -3,12 +3,12 @@ from pathlib import Path import unreal -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api.pipeline import ( UNREAL_VERSION, create_folder, get_subsequences, ) -from ayon_core.hosts.unreal.api.plugin import ( +from ayon_unreal.api.plugin import ( UnrealAssetCreator ) from ayon_core.lib import ( diff --git a/server_addon/unreal/client/ayon_unreal/plugins/create/create_staticmeshfbx.py b/server_addon/unreal/client/ayon_unreal/plugins/create/create_staticmeshfbx.py index 603b852873..79cc249083 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/create/create_staticmeshfbx.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/create/create_staticmeshfbx.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from ayon_core.hosts.unreal.api.plugin import ( +from ayon_unreal.api.plugin import ( UnrealAssetCreator, ) diff --git a/server_addon/unreal/client/ayon_unreal/plugins/create/create_uasset.py b/server_addon/unreal/client/ayon_unreal/plugins/create/create_uasset.py index 1cd532c63d..f053503c45 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/create/create_uasset.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/create/create_uasset.py @@ -4,7 +4,7 @@ from pathlib import Path import unreal from ayon_core.pipeline import CreatorError -from ayon_core.hosts.unreal.api.plugin import ( +from ayon_unreal.api.plugin import ( UnrealAssetCreator, ) diff --git a/server_addon/unreal/client/ayon_unreal/plugins/inventory/delete_unused_assets.py b/server_addon/unreal/client/ayon_unreal/plugins/inventory/delete_unused_assets.py index 1f63a1697a..1892f8ab14 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/inventory/delete_unused_assets.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/inventory/delete_unused_assets.py @@ -1,7 +1,7 @@ import unreal -from ayon_core.hosts.unreal.api.tools_ui import qt_app_context -from ayon_core.hosts.unreal.api.pipeline import delete_asset_if_unused +from ayon_unreal.api.tools_ui import qt_app_context +from ayon_unreal.api.pipeline import delete_asset_if_unused from ayon_core.pipeline import InventoryAction diff --git a/server_addon/unreal/client/ayon_unreal/plugins/inventory/update_actors.py b/server_addon/unreal/client/ayon_unreal/plugins/inventory/update_actors.py index 96965d68e6..3ca861f0c7 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/inventory/update_actors.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/inventory/update_actors.py @@ -1,6 +1,6 @@ import unreal -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api.pipeline import ( ls, replace_static_mesh_actors, replace_skeletal_mesh_actors, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_alembic_animation.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_alembic_animation.py index a12f4f41b4..109daf86c4 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_alembic_animation.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_alembic_animation.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_unreal.api import plugin +from ayon_unreal.api import pipeline as unreal_pipeline import unreal # noqa diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_animation.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_animation.py index f6a612ce53..1cb5c58ea4 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_animation.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_animation.py @@ -13,8 +13,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_unreal.api import plugin +from ayon_unreal.api import pipeline as unreal_pipeline class AnimationFBXLoader(plugin.Loader): diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_camera.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_camera.py index 681c83c6a1..10172094b6 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_camera.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_camera.py @@ -16,8 +16,8 @@ from ayon_core.pipeline import ( get_current_project_name, get_representation_path, ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( generate_sequence, set_sequence_hierarchy, create_container, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_geometrycache_abc.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_geometrycache_abc.py index ae7d41192a..1262ade9af 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_geometrycache_abc.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_geometrycache_abc.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout.py index 49d95c6459..25883a1ffb 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout.py @@ -27,8 +27,8 @@ from ayon_core.pipeline import ( ) from ayon_core.pipeline.context_tools import get_current_folder_entity from ayon_core.settings import get_current_project_settings -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( generate_sequence, set_sequence_hierarchy, create_container, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout_existing.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout_existing.py index f9d438367b..df5f154d7c 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout_existing.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_layout_existing.py @@ -12,8 +12,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID, ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api import pipeline as upipeline +from ayon_unreal.api import plugin +from ayon_unreal.api import pipeline as upipeline class ExistingLayoutLoader(plugin.Loader): diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_abc.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_abc.py index dfc5d58708..5db3e364f1 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_abc.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_abc.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_fbx.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_fbx.py index 513404ab98..6f1ebc1d51 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_fbx.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_skeletalmesh_fbx.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_abc.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_abc.py index 0bf6ce9eaa..f60a173cf6 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_abc.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_abc.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_fbx.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_fbx.py index b7bb57ac23..914f0e23f2 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_fbx.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_staticmesh_fbx.py @@ -6,8 +6,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api.pipeline import ( +from ayon_unreal.api import plugin +from ayon_unreal.api.pipeline import ( AYON_ASSET_DIR, create_container, imprint, diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_uasset.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_uasset.py index 63f23ecc11..31c13aa9ee 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_uasset.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_uasset.py @@ -7,8 +7,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_unreal.api import plugin +from ayon_unreal.api import pipeline as unreal_pipeline import unreal # noqa diff --git a/server_addon/unreal/client/ayon_unreal/plugins/load/load_yeticache.py b/server_addon/unreal/client/ayon_unreal/plugins/load/load_yeticache.py index 708fc83745..79cf8e21f7 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/load/load_yeticache.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/load/load_yeticache.py @@ -7,8 +7,8 @@ from ayon_core.pipeline import ( get_representation_path, AYON_CONTAINER_ID ) -from ayon_core.hosts.unreal.api import plugin -from ayon_core.hosts.unreal.api import pipeline as unreal_pipeline +from ayon_unreal.api import plugin +from ayon_unreal.api import pipeline as unreal_pipeline import unreal # noqa diff --git a/server_addon/unreal/client/ayon_unreal/plugins/publish/collect_render_instances.py b/server_addon/unreal/client/ayon_unreal/plugins/publish/collect_render_instances.py index ce2a03155b..a93bca70da 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/publish/collect_render_instances.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/publish/collect_render_instances.py @@ -5,7 +5,7 @@ import pyblish.api from ayon_core.pipeline import get_current_project_name from ayon_core.pipeline import Anatomy -from ayon_core.hosts.unreal.api import pipeline +from ayon_unreal.api import pipeline class CollectRenderInstances(pyblish.api.InstancePlugin): diff --git a/server_addon/unreal/client/ayon_unreal/plugins/publish/extract_camera.py b/server_addon/unreal/client/ayon_unreal/plugins/publish/extract_camera.py index ebc5452011..85f9cb0eaa 100644 --- a/server_addon/unreal/client/ayon_unreal/plugins/publish/extract_camera.py +++ b/server_addon/unreal/client/ayon_unreal/plugins/publish/extract_camera.py @@ -5,7 +5,7 @@ import os import unreal from ayon_core.pipeline import publish -from ayon_core.hosts.unreal.api.pipeline import UNREAL_VERSION +from ayon_unreal.api.pipeline import UNREAL_VERSION class ExtractCamera(publish.Extractor): diff --git a/server_addon/unreal/client/ayon_unreal/ue_workers.py b/server_addon/unreal/client/ayon_unreal/ue_workers.py index 256c0557be..1be1287901 100644 --- a/server_addon/unreal/client/ayon_unreal/ue_workers.py +++ b/server_addon/unreal/client/ayon_unreal/ue_workers.py @@ -11,7 +11,7 @@ from typing import List, Union from qtpy import QtCore -import ayon_core.hosts.unreal.lib as ue_lib +import ayon_unreal.lib as ue_lib from ayon_core.settings import get_project_settings