diff --git a/server_addon/photoshop/client/ayon_photoshop/api/README.md b/server_addon/photoshop/client/ayon_photoshop/api/README.md index b391131a42..41a26de70a 100644 --- a/server_addon/photoshop/client/ayon_photoshop/api/README.md +++ b/server_addon/photoshop/client/ayon_photoshop/api/README.md @@ -128,7 +128,7 @@ class CollectInstances(pyblish.api.ContextPlugin): import os from ayon_core.pipeline import publish -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class ExtractImage(publish.Extractor): diff --git a/server_addon/photoshop/client/ayon_photoshop/api/launch_script.py b/server_addon/photoshop/client/ayon_photoshop/api/launch_script.py index bb4de80086..de7fc8ba48 100644 --- a/server_addon/photoshop/client/ayon_photoshop/api/launch_script.py +++ b/server_addon/photoshop/client/ayon_photoshop/api/launch_script.py @@ -8,7 +8,7 @@ workfile or others. import os import sys -from ayon_core.hosts.photoshop.api.lib import main as host_main +from ayon_photoshop.api.lib import main as host_main # Get current file to locate start point of sys.argv CURRENT_FILE = os.path.abspath(__file__) diff --git a/server_addon/photoshop/client/ayon_photoshop/api/lib.py b/server_addon/photoshop/client/ayon_photoshop/api/lib.py index af14e6d02f..fd003919ce 100644 --- a/server_addon/photoshop/client/ayon_photoshop/api/lib.py +++ b/server_addon/photoshop/client/ayon_photoshop/api/lib.py @@ -19,7 +19,7 @@ def safe_excepthook(*args): def main(*subprocess_args): - from ayon_core.hosts.photoshop.api import PhotoshopHost + from ayon_photoshop.api import PhotoshopHost host = PhotoshopHost() install_host(host) diff --git a/server_addon/photoshop/client/ayon_photoshop/api/pipeline.py b/server_addon/photoshop/client/ayon_photoshop/api/pipeline.py index 27cfa5a7b5..d399bb25e2 100644 --- a/server_addon/photoshop/client/ayon_photoshop/api/pipeline.py +++ b/server_addon/photoshop/client/ayon_photoshop/api/pipeline.py @@ -21,8 +21,8 @@ from ayon_core.host import ( ) from ayon_core.pipeline.load import any_outdated_containers -from ayon_core.hosts.photoshop import PHOTOSHOP_ADDON_ROOT from ayon_core.tools.utils import get_ayon_qt_app +from ayon_photoshop import PHOTOSHOP_ADDON_ROOT from . import lib diff --git a/server_addon/photoshop/client/ayon_photoshop/lib.py b/server_addon/photoshop/client/ayon_photoshop/lib.py index dd227c5d81..9dc90953c5 100644 --- a/server_addon/photoshop/client/ayon_photoshop/lib.py +++ b/server_addon/photoshop/client/ayon_photoshop/lib.py @@ -2,13 +2,13 @@ import re import ayon_api -import ayon_core.hosts.photoshop.api as api from ayon_core.lib import prepare_template_data from ayon_core.pipeline import ( AutoCreator, CreatedInstance ) -from ayon_core.hosts.photoshop.api.pipeline import cache_and_get_instances +from ayon_photoshop import api +from ayon_photoshop.api.pipeline import cache_and_get_instances class PSAutoCreator(AutoCreator): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_flatten_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_flatten_image.py index a3bc77c640..a467a5ecaa 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_flatten_image.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_flatten_image.py @@ -1,7 +1,7 @@ import ayon_api -import ayon_core.hosts.photoshop.api as api -from ayon_core.hosts.photoshop.lib import PSAutoCreator, clean_product_name +from ayon_photoshop import api +from ayon_photoshop.lib import PSAutoCreator, clean_product_name from ayon_core.lib import BoolDef, prepare_template_data from ayon_core.pipeline.create import get_product_name, CreatedInstance diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_image.py index a44c3490c6..0170306301 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_image.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_image.py @@ -1,6 +1,5 @@ import re -from ayon_core.hosts.photoshop import api from ayon_core.lib import BoolDef from ayon_core.pipeline import ( Creator, @@ -9,8 +8,9 @@ from ayon_core.pipeline import ( ) from ayon_core.lib import prepare_template_data from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS -from ayon_core.hosts.photoshop.api.pipeline import cache_and_get_instances -from ayon_core.hosts.photoshop.lib import clean_product_name +from ayon_photoshop import api +from ayon_photoshop.api.pipeline import cache_and_get_instances +from ayon_photoshop.lib import clean_product_name class ImageCreator(Creator): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_review.py index 229b736801..60c64b3831 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_review.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_review.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.photoshop.lib import PSAutoCreator +from ayon_photoshop.lib import PSAutoCreator class ReviewCreator(PSAutoCreator): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_workfile.py index da0c9d1d12..ce44a1ad2d 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_workfile.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_workfile.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.photoshop.lib import PSAutoCreator +from ayon_photoshop.lib import PSAutoCreator class WorkfileCreator(PSAutoCreator): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image.py index d71067615e..e3d80f6957 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image.py @@ -1,8 +1,8 @@ import re from ayon_core.pipeline import get_representation_path -from ayon_core.hosts.photoshop import api as photoshop -from ayon_core.hosts.photoshop.api import get_unique_layer_name +from ayon_photoshop import api as photoshop +from ayon_photoshop.api import get_unique_layer_name class ImageLoader(photoshop.PhotoshopLoader): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image_from_sequence.py b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image_from_sequence.py index dd14543f3e..f69dce26f6 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image_from_sequence.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image_from_sequence.py @@ -2,8 +2,8 @@ import os import qargparse -from ayon_core.hosts.photoshop import api as photoshop -from ayon_core.hosts.photoshop.api import get_unique_layer_name +from ayon_photoshop import api as photoshop +from ayon_photoshop.api import get_unique_layer_name class ImageFromSequenceLoader(photoshop.PhotoshopLoader): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_reference.py b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_reference.py index b563faff82..21076f6a4f 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_reference.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_reference.py @@ -1,8 +1,8 @@ import re from ayon_core.pipeline import get_representation_path -from ayon_core.hosts.photoshop import api as photoshop -from ayon_core.hosts.photoshop.api import get_unique_layer_name +from ayon_photoshop import api as photoshop +from ayon_photoshop.api import get_unique_layer_name class ReferenceLoader(photoshop.PhotoshopLoader): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/closePS.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/closePS.py index 68c3b5b249..2cdc9fa1e8 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/closePS.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/closePS.py @@ -2,7 +2,7 @@ """Close PS after publish. For Webpublishing only.""" import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class ClosePS(pyblish.api.ContextPlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image.py index adbe02eb74..23a71bdf46 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image.py @@ -1,6 +1,6 @@ import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop from ayon_core.pipeline.create import get_product_name diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image_refresh.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image_refresh.py index 7a5f297c89..108b65232a 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image_refresh.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image_refresh.py @@ -1,6 +1,6 @@ import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class CollectAutoImageRefresh(pyblish.api.ContextPlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_review.py index d7267d253a..8b84e69309 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_review.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_review.py @@ -7,7 +7,7 @@ Provides: """ import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop from ayon_core.pipeline.create import get_product_name diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_workfile.py index af74c76a15..1bf7c1a600 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_workfile.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_workfile.py @@ -1,7 +1,7 @@ import os import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop from ayon_core.pipeline.create import get_product_name diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py index e8f7c7e3df..52df60dd8a 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py @@ -4,8 +4,8 @@ import re import pyblish.api from ayon_core.lib import prepare_template_data, is_in_tests -from ayon_core.hosts.photoshop import api as photoshop from ayon_core.settings import get_project_settings +from ayon_photoshop import api as photoshop class CollectColorCodedInstances(pyblish.api.ContextPlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_current_file.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_current_file.py index 74353d452f..02f2217f75 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_current_file.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_current_file.py @@ -2,7 +2,7 @@ import os import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class CollectCurrentFile(pyblish.api.ContextPlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_extension_version.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_extension_version.py index 2d24a8de15..90415e9245 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_extension_version.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_extension_version.py @@ -2,7 +2,7 @@ import os import re import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class CollectExtensionVersion(pyblish.api.ContextPlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_image.py index bfd73bfc5f..ed6af6f7d3 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_image.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_image.py @@ -1,6 +1,6 @@ import pyblish.api -from ayon_core.hosts.photoshop import api +from ayon_photoshop import api class CollectImage(pyblish.api.InstancePlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py index 7290a1437e..0d8824af2d 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py @@ -2,7 +2,7 @@ import os import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class ExtractImage(pyblish.api.ContextPlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py index 3497e7ad75..11bb47a886 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py @@ -7,7 +7,7 @@ from ayon_core.lib import ( get_ffmpeg_tool_args, ) from ayon_core.pipeline import publish -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class ExtractReview(publish.Extractor): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_save_scene.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_save_scene.py index 962c0722db..22ebbb739d 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_save_scene.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_save_scene.py @@ -1,5 +1,5 @@ from ayon_core.pipeline import publish -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class ExtractSaveScene(publish.Extractor): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/increment_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/increment_workfile.py index 9b25a35ef5..b10645813a 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/increment_workfile.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/increment_workfile.py @@ -3,7 +3,7 @@ import pyblish.api from ayon_core.pipeline.publish import get_errored_plugins_from_context from ayon_core.lib import version_up -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class IncrementWorkfile(pyblish.api.InstancePlugin): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_instance_asset.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_instance_asset.py index c3a6822f32..36ba621dc2 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_instance_asset.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_instance_asset.py @@ -6,7 +6,7 @@ from ayon_core.pipeline.publish import ( PublishXmlValidationError, OptionalPyblishPluginMixin ) -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop class ValidateInstanceFolderRepair(pyblish.api.Action): diff --git a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py index 13c6a54fd2..2b5492d878 100644 --- a/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py @@ -2,7 +2,7 @@ import re import pyblish.api -from ayon_core.hosts.photoshop import api as photoshop +from ayon_photoshop import api as photoshop from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS from ayon_core.pipeline.publish import ( ValidateContentsOrder,