change openpype imports to ayon_core

This commit is contained in:
Jakub Trllo 2024-02-05 15:46:47 +01:00
parent a4f2f76fbf
commit ee6e42ec6c
1247 changed files with 3341 additions and 3343 deletions

View file

@ -1,7 +1,9 @@
import os
PACKAGE_DIR = os.path.dirname(os.path.abspath(__file__))
PLUGINS_DIR = os.path.join(PACKAGE_DIR, "plugins")
AYON_CORE_ROOT = os.path.dirname(os.path.abspath(__file__))
AYON_SERVER_ENABLED = os.environ.get("USE_AYON_SERVER") == "1"
# TODO remove after '1.x.x'
PACKAGE_DIR = AYON_CORE_ROOT
PLUGINS_DIR = os.path.join(AYON_CORE_ROOT, "plugins")
AYON_SERVER_ENABLED = True

View file

@ -5,7 +5,7 @@ import sys
import code
import click
from openpype import AYON_SERVER_ENABLED
from ayon_core import AYON_SERVER_ENABLED
from .pype_commands import PypeCommands
@ -205,7 +205,7 @@ def projectmanager():
@main.command(context_settings={"ignore_unknown_options": True})
def publish_report_viewer():
from openpype.tools.publisher.publish_report_viewer import main
from ayon_core.tools.publisher.publish_report_viewer import main
sys.exit(main())
@ -335,7 +335,7 @@ def syncserver(ctx, active_site):
if AYON_SERVER_ENABLED:
raise RuntimeError("AYON does not support 'syncserver' command.")
from openpype.modules.sync_server.sync_server_module import (
from ayon_core.modules.sync_server.sync_server_module import (
syncservice)
ctx.invoke(syncservice, active_site=active_site)
@ -399,7 +399,7 @@ def interactive():
f"AYON launcher {version}\nPython {sys.version} on {sys.platform}"
)
else:
from openpype.version import __version__
from ayon_core.version import __version__
banner = (
f"OpenPype {__version__}\nPython {sys.version} on {sys.platform}"
@ -416,7 +416,7 @@ def version(build):
print(os.environ["AYON_VERSION"])
return
from openpype.version import __version__
from ayon_core.version import __version__
from igniter.bootstrap_repos import BootstrapRepos, OpenPypeVersion
from pathlib import Path

View file

@ -1,4 +1,4 @@
from openpype import AYON_SERVER_ENABLED
from ayon_core import AYON_SERVER_ENABLED
if not AYON_SERVER_ENABLED:
from .mongo.entities import *

View file

@ -1,4 +1,4 @@
from openpype import AYON_SERVER_ENABLED
from ayon_core import AYON_SERVER_ENABLED
if not AYON_SERVER_ENABLED:
from .mongo.entity_links import *

View file

@ -11,7 +11,7 @@ from bson.json_util import (
CANONICAL_JSON_OPTIONS
)
from openpype import AYON_SERVER_ENABLED
from ayon_core import AYON_SERVER_ENABLED
if sys.version_info[0] == 2:
from urlparse import urlparse, parse_qs
else:

View file

@ -5,7 +5,7 @@ import collections
from bson.objectid import ObjectId
from pymongo import DeleteOne, InsertOne, UpdateOne
from openpype.client.operations_base import (
from ayon_core.client.operations_base import (
REMOVED_VALUE,
CreateOperation,
UpdateOperation,
@ -572,8 +572,8 @@ def create_project(
dict: Created project document.
"""
from openpype.settings import ProjectSettings, SaveWarningExc
from openpype.pipeline.schema import validate
from ayon_core.settings import ProjectSettings, SaveWarningExc
from ayon_core.pipeline.schema import validate
if get_project(project_name, fields=["name"]):
raise ValueError("Project with name \"{}\" already exists".format(

View file

@ -1,4 +1,4 @@
from openpype import AYON_SERVER_ENABLED
from ayon_core import AYON_SERVER_ENABLED
from .operations_base import REMOVED_VALUE
if not AYON_SERVER_ENABLED:

View file

@ -5,8 +5,8 @@ import json
import six
from openpype.client.operations_base import REMOVED_VALUE
from openpype.client.mongo.operations import (
from ayon_core.client.operations_base import REMOVED_VALUE
from ayon_core.client.mongo.operations import (
CURRENT_PROJECT_SCHEMA,
CURRENT_ASSET_DOC_SCHEMA,
CURRENT_SUBSET_SCHEMA,

View file

@ -1,6 +1,6 @@
import collections
from openpype.client.mongo.operations import CURRENT_THUMBNAIL_SCHEMA
from ayon_core.client.mongo.operations import CURRENT_THUMBNAIL_SCHEMA
from .utils import get_ayon_server_api_connection
from .openpype_comp import get_folders_with_tasks

View file

@ -6,7 +6,7 @@ import datetime
from bson.objectid import ObjectId
from openpype.client.operations_base import (
from ayon_core.client.operations_base import (
REMOVED_VALUE,
CreateOperation,
UpdateOperation,
@ -14,7 +14,7 @@ from openpype.client.operations_base import (
BaseOperationsSession
)
from openpype.client.mongo.operations import (
from ayon_core.client.mongo.operations import (
CURRENT_THUMBNAIL_SCHEMA,
CURRENT_REPRESENTATION_SCHEMA,
CURRENT_HERO_VERSION_SCHEMA,

View file

@ -3,7 +3,7 @@ import uuid
import ayon_api
from openpype.client.operations_base import REMOVED_VALUE
from ayon_core.client.operations_base import REMOVED_VALUE
class _GlobalCache:
@ -14,7 +14,7 @@ def get_ayon_server_api_connection():
if _GlobalCache.initialized:
con = ayon_api.get_server_api_connection()
else:
from openpype.lib.local_settings import get_local_site_id
from ayon_core.lib.local_settings import get_local_site_id
_GlobalCache.initialized = True
site_id = get_local_site_id()

View file

@ -1,6 +1,6 @@
import os
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
class AddLastWorkfileToLaunchArgs(PreLaunchHook):

View file

@ -1,8 +1,8 @@
import os
import shutil
from openpype.settings import get_project_settings
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from openpype.pipeline.workfile import (
from ayon_core.settings import get_project_settings
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.pipeline.workfile import (
get_custom_workfile_template,
get_custom_workfile_template_by_string_context
)

View file

@ -1,6 +1,6 @@
import os
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from openpype.pipeline.workfile import create_workdir_extra_folders
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.pipeline.workfile import create_workdir_extra_folders
class CreateWorkdirExtraFolders(PreLaunchHook):

View file

@ -1,11 +1,11 @@
from openpype.client import get_project, get_asset_by_name
from openpype.lib.applications import (
from ayon_core.client import get_project, get_asset_by_name
from ayon_core.lib.applications import (
PreLaunchHook,
EnvironmentPrepData,
prepare_app_environments,
prepare_context_environments
)
from openpype.pipeline import Anatomy
from ayon_core.pipeline import Anatomy
class GlobalHostDataHook(PreLaunchHook):

View file

@ -1,5 +1,5 @@
import os
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
class LaunchWithTerminal(PreLaunchHook):

View file

@ -1,5 +1,5 @@
import subprocess
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
class LaunchNewConsoleApps(PreLaunchHook):

View file

@ -1,13 +1,13 @@
import os
from openpype.lib import get_openpype_execute_args
from openpype.lib.applications import (
from ayon_core.lib import get_openpype_execute_args
from ayon_core.lib.applications import (
get_non_python_host_kwargs,
PreLaunchHook,
LaunchTypes,
)
from openpype import PACKAGE_DIR as OPENPYPE_DIR
from ayon_core import AYON_CORE_ROOT
class NonPythonHostHook(PreLaunchHook):
@ -32,7 +32,7 @@ class NonPythonHostHook(PreLaunchHook):
remainders.append(self.launch_context.launch_args.pop(0))
script_path = os.path.join(
OPENPYPE_DIR,
AYON_CORE_ROOT,
"scripts",
"non_python_host_launch.py"
)

View file

@ -1,7 +1,7 @@
from openpype.lib.applications import PreLaunchHook
from ayon_core.lib.applications import PreLaunchHook
from openpype.pipeline.colorspace import get_imageio_config
from openpype.pipeline.template_data import get_template_data_with_names
from ayon_core.pipeline.colorspace import get_imageio_config
from ayon_core.pipeline.template_data import get_template_data_with_names
class OCIOEnvHook(PreLaunchHook):

View file

@ -12,10 +12,10 @@ import platform
import six
from openpype.lib import Logger
from openpype.modules import ModulesManager
from openpype.settings import get_project_settings
from openpype.settings.lib import get_site_local_overrides
from ayon_core.lib import Logger
from ayon_core.modules import ModulesManager
from ayon_core.settings import get_project_settings
from ayon_core.settings.lib import get_site_local_overrides
@six.add_metaclass(ABCMeta)

View file

@ -31,16 +31,16 @@ class HostBase(object):
# Installation of host before (avalon concept):
```python
from openpype.pipeline import install_host
import openpype.hosts.maya.api as host
from ayon_core.pipeline import install_host
import ayon_core.hosts.maya.api as host
install_host(host)
```
# Installation of host now:
```python
from openpype.pipeline import install_host
from openpype.hosts.maya.api import MayaHost
from ayon_core.pipeline import install_host
from ayon_core.hosts.maya.api import MayaHost
host = MayaHost()
install_host(host)

View file

@ -1,4 +1,4 @@
from openpype.modules import OpenPypeModule, IHostAddon
from ayon_core.modules import OpenPypeModule, IHostAddon
class AfterEffectsAddon(OpenPypeModule, IHostAddon):

View file

@ -25,7 +25,7 @@ download [Anastasiys Extension Manager](https://install.anastasiy.com/)
The easiest way to get the server and After Effects launch is with:
```
python -c ^"import openpype.hosts.photoshop;openpype.hosts..aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
python -c ^"import ayon_core.hosts.photoshop;openpype.hosts..aftereffects.launch(""c:\Program Files\Adobe\Adobe After Effects 2020\Support Files\AfterFX.exe"")^"
```
`avalon.aftereffects.launch` launches the application and server, and also closes the server when After Effects exists.

View file

@ -15,12 +15,12 @@ from wsrpc_aiohttp import (
from qtpy import QtCore
from openpype.lib import Logger
from openpype.tests.lib import is_in_tests
from openpype.pipeline import install_host, legacy_io
from openpype.modules import ModulesManager
from openpype.tools.utils import host_tools, get_openpype_qt_app
from openpype.tools.adobe_webserver.app import WebServerTool
from ayon_core.lib import Logger
from ayon_core.tests.lib import is_in_tests
from ayon_core.pipeline import install_host, legacy_io
from ayon_core.modules import ModulesManager
from ayon_core.tools.utils import host_tools, get_openpype_qt_app
from ayon_core.tools.adobe_webserver.app import WebServerTool
from .ws_stub import get_stub
from .lib import set_settings
@ -37,7 +37,7 @@ def main(*subprocess_args):
"""Main entrypoint to AE launching, called from pre hook."""
sys.excepthook = safe_excepthook
from openpype.hosts.aftereffects.api import AfterEffectsHost
from ayon_core.hosts.aftereffects.api import AfterEffectsHost
host = AfterEffectsHost()
install_host(host)
@ -359,7 +359,7 @@ class AfterEffectsRoute(WebSocketRoute):
return "nothing"
def create_placeholder_route(self):
from openpype.hosts.aftereffects.api.workfile_template_builder import \
from ayon_core.hosts.aftereffects.api.workfile_template_builder import \
create_placeholder
partial_method = functools.partial(create_placeholder)
@ -369,7 +369,7 @@ class AfterEffectsRoute(WebSocketRoute):
return "nothing"
def update_placeholder_route(self):
from openpype.hosts.aftereffects.api.workfile_template_builder import \
from ayon_core.hosts.aftereffects.api.workfile_template_builder import \
update_placeholder
partial_method = functools.partial(update_placeholder)
@ -379,7 +379,7 @@ class AfterEffectsRoute(WebSocketRoute):
return "nothing"
def build_workfile_template_route(self):
from openpype.hosts.aftereffects.api.workfile_template_builder import \
from ayon_core.hosts.aftereffects.api.workfile_template_builder import \
build_workfile_template
partial_method = functools.partial(build_workfile_template)

View file

@ -4,8 +4,8 @@ import json
import contextlib
import logging
from openpype.pipeline.context_tools import get_current_context
from openpype.client import get_asset_by_name
from ayon_core.pipeline.context_tools import get_current_context
from ayon_core.client import get_asset_by_name
from .ws_stub import get_stub
log = logging.getLogger(__name__)

View file

@ -4,26 +4,26 @@ from qtpy import QtWidgets
import pyblish.api
from openpype.lib import Logger, register_event_callback
from openpype.pipeline import (
from ayon_core.lib import Logger, register_event_callback
from ayon_core.pipeline import (
register_loader_plugin_path,
register_creator_plugin_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.aftereffects.api.workfile_template_builder import (
from ayon_core.hosts.aftereffects.api.workfile_template_builder import (
AEPlaceholderLoadPlugin,
AEPlaceholderCreatePlugin
)
from openpype.pipeline.load import any_outdated_containers
import openpype.hosts.aftereffects
from ayon_core.pipeline.load import any_outdated_containers
import ayon_core.hosts.aftereffects
from openpype.host import (
from ayon_core.host import (
HostBase,
IWorkfileHost,
ILoadHost,
IPublishHost
)
from openpype.tools.utils import get_openpype_qt_app
from ayon_core.tools.utils import get_openpype_qt_app
from .launch_logic import get_stub
from .ws_stub import ConnectionNotEstablishedYet

View file

@ -1,7 +1,7 @@
import six
from abc import ABCMeta
from openpype.pipeline import LoaderPlugin
from ayon_core.pipeline import LoaderPlugin
from .launch_logic import get_stub

View file

@ -2,11 +2,11 @@ import os.path
import uuid
import shutil
from openpype.pipeline import registered_host
from openpype.tools.workfile_template_build import (
from ayon_core.pipeline import registered_host
from ayon_core.tools.workfile_template_build import (
WorkfileBuildPlaceholderDialog,
)
from openpype.pipeline.workfile.workfile_template_builder import (
from ayon_core.pipeline.workfile.workfile_template_builder import (
AbstractTemplateBuilder,
PlaceholderPlugin,
LoadPlaceholderItem,
@ -14,8 +14,8 @@ from openpype.pipeline.workfile.workfile_template_builder import (
PlaceholderLoadMixin,
PlaceholderCreateMixin
)
from openpype.hosts.aftereffects.api import get_stub
from openpype.hosts.aftereffects.api.lib import set_settings
from ayon_core.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api.lib import set_settings
PLACEHOLDER_SET = "PLACEHOLDERS_SET"
PLACEHOLDER_ID = "openpype.placeholder"

View file

@ -8,7 +8,7 @@ import logging
import attr
from wsrpc_aiohttp import WebSocketAsync
from openpype.tools.adobe_webserver.app import WebServerTool
from ayon_core.tools.adobe_webserver.app import WebServerTool
class ConnectionNotEstablishedYet(Exception):

View file

@ -1,17 +1,17 @@
import re
from openpype import resources
from openpype.lib import BoolDef, UISeparatorDef
from openpype.hosts.aftereffects import api
from openpype.pipeline import (
from ayon_core import resources
from ayon_core.lib import BoolDef, UISeparatorDef
from ayon_core.hosts.aftereffects import api
from ayon_core.pipeline import (
Creator,
CreatedInstance,
CreatorError
)
from openpype.hosts.aftereffects.api.pipeline import cache_and_get_instances
from openpype.hosts.aftereffects.api.lib import set_settings
from openpype.lib import prepare_template_data
from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances
from ayon_core.hosts.aftereffects.api.lib import set_settings
from ayon_core.lib import prepare_template_data
from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
class RenderCreator(Creator):

View file

@ -1,11 +1,11 @@
from openpype import AYON_SERVER_ENABLED
import openpype.hosts.aftereffects.api as api
from openpype.client import get_asset_by_name
from openpype.pipeline import (
from ayon_core import AYON_SERVER_ENABLED
import ayon_core.hosts.aftereffects.api as api
from ayon_core.client import get_asset_by_name
from ayon_core.pipeline import (
AutoCreator,
CreatedInstance
)
from openpype.hosts.aftereffects.api.pipeline import cache_and_get_instances
from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances
class AEWorkfileCreator(AutoCreator):

View file

@ -1,9 +1,9 @@
import re
from openpype.pipeline import get_representation_path
from openpype.hosts.aftereffects import api
from ayon_core.pipeline import get_representation_path
from ayon_core.hosts.aftereffects import api
from openpype.hosts.aftereffects.api.lib import (
from ayon_core.hosts.aftereffects.api.lib import (
get_background_layers,
get_unique_layer_name,
)

View file

@ -1,8 +1,8 @@
import re
from openpype.pipeline import get_representation_path
from openpype.hosts.aftereffects import api
from openpype.hosts.aftereffects.api.lib import get_unique_layer_name
from ayon_core.pipeline import get_representation_path
from ayon_core.hosts.aftereffects import api
from ayon_core.hosts.aftereffects.api.lib import get_unique_layer_name
class FileLoader(api.AfterEffectsLoader):

View file

@ -1,6 +1,6 @@
import pyblish.api
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class AddPublishHighlight(pyblish.api.InstancePlugin):

View file

@ -2,7 +2,7 @@
"""Close AE after publish. For Webpublishing only."""
import pyblish.api
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class CloseAE(pyblish.api.ContextPlugin):

View file

@ -2,7 +2,7 @@ import os
import pyblish.api
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class CollectAudio(pyblish.api.ContextPlugin):

View file

@ -2,7 +2,7 @@ import os
import pyblish.api
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class CollectCurrentFile(pyblish.api.ContextPlugin):

View file

@ -2,7 +2,7 @@ import os
import re
import pyblish.api
from openpype.hosts.aftereffects.api import (
from ayon_core.hosts.aftereffects.api import (
get_stub,
get_extension_manifest_path
)

View file

@ -5,11 +5,11 @@ import attr
import pyblish.api
from openpype.settings import get_project_settings
from openpype.pipeline import publish
from openpype.pipeline.publish import RenderInstance
from ayon_core.settings import get_project_settings
from ayon_core.pipeline import publish
from ayon_core.pipeline.publish import RenderInstance
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
@attr.s

View file

@ -2,8 +2,8 @@ import os
import pyblish.api
from openpype.client import get_asset_name_identifier
from openpype.pipeline.create import get_subset_name
from ayon_core.client import get_asset_name_identifier
from ayon_core.pipeline.create import get_subset_name
class CollectWorkfile(pyblish.api.ContextPlugin):

View file

@ -1,7 +1,7 @@
import os
from openpype.pipeline import publish
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.pipeline import publish
from ayon_core.hosts.aftereffects.api import get_stub
class ExtractLocalRender(publish.Extractor):

View file

@ -1,7 +1,7 @@
import pyblish.api
from openpype.pipeline import publish
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.pipeline import publish
from ayon_core.hosts.aftereffects.api import get_stub
class ExtractSaveScene(pyblish.api.ContextPlugin):

View file

@ -1,8 +1,8 @@
import pyblish.api
from openpype.lib import version_up
from openpype.pipeline.publish import get_errored_plugins_from_context
from ayon_core.lib import version_up
from ayon_core.pipeline.publish import get_errored_plugins_from_context
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class IncrementWorkfile(pyblish.api.InstancePlugin):

View file

@ -1,6 +1,6 @@
import json
import pyblish.api
from openpype.hosts.aftereffects.api import AfterEffectsHost
from ayon_core.hosts.aftereffects.api import AfterEffectsHost
class PreCollectRender(pyblish.api.ContextPlugin):

View file

@ -1,5 +1,5 @@
from openpype.pipeline import publish
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.pipeline import publish
from ayon_core.hosts.aftereffects.api import get_stub
class RemovePublishHighlight(publish.Extractor):

View file

@ -6,10 +6,10 @@ import os
import pyblish.api
from openpype.pipeline import (
from ayon_core.pipeline import (
PublishXmlValidationError
)
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class ValidateFootageItems(pyblish.api.InstancePlugin):

View file

@ -1,11 +1,11 @@
import pyblish.api
from openpype.pipeline import get_current_asset_name
from openpype.pipeline.publish import (
from ayon_core.pipeline import get_current_asset_name
from ayon_core.pipeline.publish import (
ValidateContentsOrder,
PublishXmlValidationError,
)
from openpype.hosts.aftereffects.api import get_stub
from ayon_core.hosts.aftereffects.api import get_stub
class ValidateInstanceAssetRepair(pyblish.api.Action):

View file

@ -9,11 +9,11 @@ import re
import pyblish.api
from openpype.pipeline import (
from ayon_core.pipeline import (
PublishXmlValidationError,
OptionalPyblishPluginMixin
)
from openpype.hosts.aftereffects.api import get_asset_settings
from ayon_core.hosts.aftereffects.api import get_asset_settings
class ValidateSceneSettings(OptionalPyblishPluginMixin,

View file

@ -1,5 +1,5 @@
import os
from openpype.modules import OpenPypeModule, IHostAddon
from ayon_core.modules import OpenPypeModule, IHostAddon
BLENDER_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))

View file

@ -2,7 +2,7 @@ import bpy
import pyblish.api
from openpype.pipeline.publish import get_errored_instances_from_context
from ayon_core.pipeline.publish import get_errored_instances_from_context
class SelectInvalidAction(pyblish.api.Action):

View file

@ -6,7 +6,7 @@ from typing import Dict, List, Union
import bpy
import addon_utils
from openpype.lib import Logger
from ayon_core.lib import Logger
from . import pipeline

View file

@ -15,10 +15,10 @@ from qtpy import QtWidgets, QtCore
import bpy
import bpy.utils.previews
from openpype import style
from openpype import AYON_SERVER_ENABLED
from openpype.pipeline import get_current_asset_name, get_current_task_name
from openpype.tools.utils import host_tools
from ayon_core import style
from ayon_core import AYON_SERVER_ENABLED
from ayon_core.pipeline import get_current_asset_name, get_current_task_name
from ayon_core.tools.utils import host_tools
from .workio import OpenFileCacher
from . import pipeline

View file

@ -10,14 +10,14 @@ from . import ops
import pyblish.api
from openpype.host import (
from ayon_core.host import (
HostBase,
IWorkfileHost,
IPublishHost,
ILoadHost
)
from openpype.client import get_asset_by_name
from openpype.pipeline import (
from ayon_core.client import get_asset_by_name
from ayon_core.pipeline import (
schema,
legacy_io,
get_current_project_name,
@ -28,13 +28,13 @@ from openpype.pipeline import (
deregister_creator_plugin_path,
AVALON_CONTAINER_ID,
)
from openpype.lib import (
from ayon_core.lib import (
Logger,
register_event_callback,
emit_event
)
import openpype.hosts.blender
from openpype.settings import get_project_settings
import ayon_core.hosts.blender
from ayon_core.settings import get_project_settings
from .workio import (
open_file,
save_file,
@ -198,7 +198,7 @@ def uninstall():
def show_message(title, message):
from openpype.widgets.message_window import Window
from ayon_core.widgets.message_window import Window
from .ops import BlenderApplication
BlenderApplication.get_app()

View file

@ -6,13 +6,13 @@ from typing import Dict, List, Optional
import bpy
from openpype import AYON_SERVER_ENABLED
from openpype.pipeline import (
from ayon_core import AYON_SERVER_ENABLED
from ayon_core.pipeline import (
Creator,
CreatedInstance,
LoaderPlugin,
)
from openpype.lib import BoolDef
from ayon_core.lib import BoolDef
from .pipeline import (
AVALON_CONTAINERS,
@ -497,7 +497,7 @@ class AssetLoader(LoaderPlugin):
# Only containerise if it's not already a collection from a .blend file.
# representation = context["representation"]["name"]
# if representation != "blend":
# from openpype.hosts.blender.api.pipeline import containerise
# from ayon_core.hosts.blender.api.pipeline import containerise
# return containerise(
# name=name,
# namespace=namespace,

View file

@ -2,8 +2,8 @@ from pathlib import Path
import bpy
from openpype.settings import get_project_settings
from openpype.pipeline import get_current_project_name
from ayon_core.settings import get_project_settings
from ayon_core.pipeline import get_current_project_name
def get_default_render_folder(settings):

View file

@ -1,5 +1,5 @@
from openpype.pipeline import install_host
from openpype.hosts.blender.api import BlenderHost
from ayon_core.pipeline import install_host
from ayon_core.hosts.blender.api import BlenderHost
def register():

View file

@ -1,6 +1,6 @@
from pathlib import Path
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
class AddPythonScriptToLaunchArgs(PreLaunchHook):

View file

@ -2,7 +2,7 @@ import os
import re
import subprocess
from platform import system
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
class InstallPySideToBlender(PreLaunchHook):

View file

@ -1,5 +1,5 @@
import subprocess
from openpype.lib.applications import PreLaunchHook, LaunchTypes
from ayon_core.lib.applications import PreLaunchHook, LaunchTypes
class BlenderConsoleWindows(PreLaunchHook):

View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Converter for legacy Houdini subsets."""
from openpype.pipeline.create.creator_plugins import SubsetConvertorPlugin
from openpype.hosts.blender.api.lib import imprint
from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin
from ayon_core.hosts.blender.api.lib import imprint
class BlenderLegacyConvertor(SubsetConvertorPlugin):

View file

@ -2,7 +2,7 @@
import bpy
from openpype.hosts.blender.api import lib, plugin
from ayon_core.hosts.blender.api import lib, plugin
class CreateAction(plugin.BaseCreator):

View file

@ -1,6 +1,6 @@
"""Create an animation asset."""
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreateAnimation(plugin.BaseCreator):

View file

@ -2,7 +2,7 @@
import bpy
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreateBlendScene(plugin.BaseCreator):

View file

@ -2,8 +2,8 @@
import bpy
from openpype.hosts.blender.api import plugin, lib
from openpype.hosts.blender.api.pipeline import AVALON_INSTANCES
from ayon_core.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api.pipeline import AVALON_INSTANCES
class CreateCamera(plugin.BaseCreator):

View file

@ -2,7 +2,7 @@
import bpy
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreateLayout(plugin.BaseCreator):

View file

@ -2,7 +2,7 @@
import bpy
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreateModel(plugin.BaseCreator):

View file

@ -1,6 +1,6 @@
"""Create a pointcache asset."""
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreatePointcache(plugin.BaseCreator):

View file

@ -1,8 +1,8 @@
"""Create render."""
import bpy
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.render_lib import prepare_rendering
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.render_lib import prepare_rendering
class CreateRenderlayer(plugin.BaseCreator):

View file

@ -1,6 +1,6 @@
"""Create review."""
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreateReview(plugin.BaseCreator):

View file

@ -2,7 +2,7 @@
import bpy
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CreateRig(plugin.BaseCreator):

View file

@ -1,10 +1,10 @@
import bpy
from openpype import AYON_SERVER_ENABLED
from openpype.pipeline import CreatedInstance, AutoCreator
from openpype.client import get_asset_by_name
from openpype.hosts.blender.api.plugin import BaseCreator
from openpype.hosts.blender.api.pipeline import (
from ayon_core import AYON_SERVER_ENABLED
from ayon_core.pipeline import CreatedInstance, AutoCreator
from ayon_core.client import get_asset_by_name
from ayon_core.hosts.blender.api.plugin import BaseCreator
from ayon_core.hosts.blender.api.pipeline import (
AVALON_PROPERTY,
AVALON_CONTAINERS
)

View file

@ -1,6 +1,6 @@
import bpy
from openpype.hosts.blender.api import plugin
from ayon_core.hosts.blender.api import plugin
def append_workfile(context, fname, do_import):

View file

@ -6,16 +6,16 @@ from typing import Dict, List, Optional
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)
from openpype.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api import plugin, lib
class CacheModelLoader(plugin.AssetLoader):

View file

@ -6,9 +6,9 @@ from pprint import pformat
from typing import Dict, List, Optional
import bpy
from openpype.pipeline import get_representation_path
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import (
from ayon_core.pipeline import get_representation_path
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import (
containerise_existing,
AVALON_PROPERTY,
)

View file

@ -4,8 +4,8 @@ from typing import Dict, List, Optional
import bpy
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY
class BlendAnimationLoader(plugin.AssetLoader):

View file

@ -6,12 +6,12 @@ from typing import Dict, List, Optional
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)

View file

@ -3,15 +3,15 @@ from pathlib import Path
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
registered_host
)
from openpype.pipeline.create import CreateContext
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.lib import imprint
from openpype.hosts.blender.api.pipeline import (
from ayon_core.pipeline.create import CreateContext
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.lib import imprint
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)

View file

@ -3,13 +3,13 @@ from pathlib import Path
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.lib import imprint
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.lib import imprint
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)

View file

@ -6,12 +6,12 @@ from typing import Dict, List, Optional
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api import plugin, lib
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)

View file

@ -6,12 +6,12 @@ from typing import Dict, List, Optional
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api import plugin, lib
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)

View file

@ -6,12 +6,12 @@ from typing import Dict, List, Optional
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
get_representation_path,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api import plugin, lib
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api import plugin, lib
from ayon_core.hosts.blender.api.pipeline import (
AVALON_CONTAINERS,
AVALON_PROPERTY,
)

View file

@ -7,7 +7,7 @@ from typing import Dict, Optional
import bpy
from openpype.pipeline import (
from ayon_core.pipeline import (
discover_loader_plugins,
remove_container,
load_container,
@ -15,12 +15,12 @@ from openpype.pipeline import (
loaders_from_representation,
AVALON_CONTAINER_ID,
)
from openpype.hosts.blender.api.pipeline import (
from ayon_core.hosts.blender.api.pipeline import (
AVALON_INSTANCES,
AVALON_CONTAINERS,
AVALON_PROPERTY,
)
from openpype.hosts.blender.api import plugin
from ayon_core.hosts.blender.api import plugin
class JsonLayoutLoader(plugin.AssetLoader):

View file

@ -8,9 +8,9 @@ import os
import json
import bpy
from openpype.pipeline import get_representation_path
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import (
from ayon_core.pipeline import get_representation_path
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import (
containerise_existing,
AVALON_PROPERTY
)

View file

@ -1,5 +1,5 @@
import pyblish.api
from openpype.hosts.blender.api import workio
from ayon_core.hosts.blender.api import workio
class CollectBlenderCurrentFile(pyblish.api.ContextPlugin):

View file

@ -2,8 +2,8 @@ import bpy
import pyblish.api
from openpype.pipeline.publish import KnownPublishError
from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
from ayon_core.pipeline.publish import KnownPublishError
from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY
class CollectBlenderInstanceData(pyblish.api.InstancePlugin):

View file

@ -6,7 +6,7 @@ import re
import bpy
from openpype.hosts.blender.api import colorspace
from ayon_core.hosts.blender.api import colorspace
import pyblish.api

View file

@ -2,8 +2,8 @@ import os
import bpy
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
class ExtractABC(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -2,8 +2,8 @@ import os
import bpy
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
class ExtractAnimationABC(

View file

@ -2,7 +2,7 @@ import os
import bpy
from openpype.pipeline import publish
from ayon_core.pipeline import publish
class ExtractBlend(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -2,7 +2,7 @@ import os
import bpy
from openpype.pipeline import publish
from ayon_core.pipeline import publish
class ExtractBlendAnimation(

View file

@ -2,9 +2,9 @@ import os
import bpy
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY
class ExtractCameraABC(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -2,8 +2,8 @@ import os
import bpy
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
class ExtractCamera(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -2,9 +2,9 @@ import os
import bpy
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY
class ExtractFBX(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -5,9 +5,9 @@ import bpy
import bpy_extras
import bpy_extras.anim_utils
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY
def get_all_parents(obj):

View file

@ -5,10 +5,10 @@ import bpy
import bpy_extras
import bpy_extras.anim_utils
from openpype.client import get_representation_by_name
from openpype.pipeline import publish
from openpype.hosts.blender.api import plugin
from openpype.hosts.blender.api.pipeline import AVALON_PROPERTY
from ayon_core.client import get_representation_by_name
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import plugin
from ayon_core.hosts.blender.api.pipeline import AVALON_PROPERTY
class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -4,9 +4,9 @@ import clique
import bpy
import pyblish.api
from openpype.pipeline import publish
from openpype.hosts.blender.api import capture
from openpype.hosts.blender.api.lib import maintained_time
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import capture
from ayon_core.hosts.blender.api.lib import maintained_time
class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin):

View file

@ -2,9 +2,9 @@ import os
import glob
import pyblish.api
from openpype.pipeline import publish
from openpype.hosts.blender.api import capture
from openpype.hosts.blender.api.lib import maintained_time
from ayon_core.pipeline import publish
from ayon_core.hosts.blender.api import capture
from ayon_core.hosts.blender.api.lib import maintained_time
import bpy

View file

@ -1,6 +1,6 @@
import pyblish.api
from openpype.pipeline.publish import OptionalPyblishPluginMixin
from openpype.hosts.blender.api.workio import save_file
from ayon_core.pipeline.publish import OptionalPyblishPluginMixin
from ayon_core.hosts.blender.api.workio import save_file
class IncrementWorkfileVersion(
@ -23,7 +23,7 @@ class IncrementWorkfileVersion(
assert all(result["success"] for result in context.data["results"]), (
"Publishing not successful so version is not increased.")
from openpype.lib import version_up
from ayon_core.lib import version_up
path = context.data["currentFile"]
filepath = version_up(path)

View file

@ -1,7 +1,7 @@
import json
import pyblish.api
from openpype.pipeline.publish import OptionalPyblishPluginMixin
from ayon_core.pipeline.publish import OptionalPyblishPluginMixin
class IntegrateAnimation(

View file

@ -4,8 +4,8 @@ import bpy
import pyblish.api
import openpype.hosts.blender.api.action
from openpype.pipeline.publish import (
import ayon_core.hosts.blender.api.action
from ayon_core.pipeline.publish import (
ValidateContentsOrder,
PublishValidationError,
OptionalPyblishPluginMixin

Some files were not shown because too many files have changed in this diff Show more