diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py index 939fab68b8..bc55b47a0c 100644 --- a/client/ayon_core/addon/base.py +++ b/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 @@ -51,10 +50,20 @@ IGNORED_MODULES_IN_AYON = set() # - this is used to log the missing addon MOVED_ADDON_MILESTONE_VERSIONS = { "applications": VersionInfo(0, 2, 0), + "celaction": VersionInfo(0, 2, 0), "clockify": VersionInfo(0, 2, 0), + "flame": VersionInfo(0, 2, 0), + "fusion": VersionInfo(0, 2, 0), + "hiero": VersionInfo(0, 2, 0), + "max": VersionInfo(0, 2, 0), + "photoshop": VersionInfo(0, 2, 0), "traypublisher": VersionInfo(0, 2, 0), "tvpaint": VersionInfo(0, 2, 0), + "maya": VersionInfo(0, 2, 0), "nuke": VersionInfo(0, 2, 0), + "resolve": VersionInfo(0, 2, 0), + "substancepainter": VersionInfo(0, 2, 0), + "houdini": VersionInfo(0, 3, 0), } @@ -543,6 +552,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 @@ -573,6 +585,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. @@ -688,6 +720,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. @@ -864,10 +920,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 @@ -879,6 +931,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: @@ -1167,39 +1226,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 @@ -1326,7 +1401,7 @@ class TrayAddonsManager(AddonsManager): self.doubleclick_callback = None def add_doubleclick_callback(self, addon, callback): - """Register doubleclick callbacks on tray icon. + """Register double-click callbacks on tray icon. Currently, there is no way how to determine which is launched. Name of callback can be defined with `doubleclick_callback` attribute. diff --git a/client/ayon_core/hosts/flame/__init__.py b/client/ayon_core/hosts/flame/__init__.py deleted file mode 100644 index b45f107747..0000000000 --- a/client/ayon_core/hosts/flame/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -from .addon import ( - HOST_DIR, - FlameAddon, -) - - -__all__ = ( - "HOST_DIR", - "FlameAddon", -) diff --git a/client/ayon_core/hosts/hiero/__init__.py b/client/ayon_core/hosts/hiero/__init__.py deleted file mode 100644 index e6744d5aec..0000000000 --- a/client/ayon_core/hosts/hiero/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -from .addon import ( - HIERO_ROOT_DIR, - HieroAddon, -) - - -__all__ = ( - "HIERO_ROOT_DIR", - "HieroAddon", -) diff --git a/client/ayon_core/hosts/resolve/__init__.py b/client/ayon_core/hosts/resolve/__init__.py deleted file mode 100644 index b4a994bbaa..0000000000 --- a/client/ayon_core/hosts/resolve/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -from .addon import ResolveAddon - - -__all__ = ( - "ResolveAddon", -) diff --git a/client/ayon_core/hosts/resolve/otio/__init__.py b/client/ayon_core/hosts/resolve/otio/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py index b1089bbfe2..ea0350d2d9 100644 --- a/client/ayon_core/modules/deadline/deadline_module.py +++ b/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 diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py index 6c70119628..9eea4d6549 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py +++ b/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" diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py index ababb01285..4cb510f1cb 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py @@ -15,11 +15,11 @@ from ayon_core.pipeline.publish.lib import ( replace_with_published_scene_path ) from ayon_core.pipeline.publish import KnownPublishError -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api.lib import ( get_current_renderer, get_multipass_setting ) -from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_max.api.lib_rendersettings import RenderSettings from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo @@ -205,11 +205,11 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, def _use_published_name(self, data, project_settings): # Not all hosts can import these modules. - from ayon_core.hosts.max.api.lib import ( + from ayon_max.api.lib import ( get_current_renderer, get_multipass_setting ) - from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings + from ayon_max.api.lib_rendersettings import RenderSettings instance = self._instance job_info = copy.deepcopy(self.job_info) diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py index f1bc1cb2be..b1193fb914 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py @@ -39,8 +39,8 @@ from ayon_core.lib import ( EnumDef, is_in_tests, ) -from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings -from ayon_core.hosts.maya.api.lib import get_attr_in_layer +from ayon_maya.api.lib_rendersettings import RenderSettings +from ayon_maya.api.lib import get_attr_in_layer from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo diff --git a/client/ayon_core/modules/deadline/version.py b/client/ayon_core/modules/deadline/version.py index 569b1212f7..74acd0efba 100644 --- a/client/ayon_core/modules/deadline/version.py +++ b/client/ayon_core/modules/deadline/version.py @@ -1 +1 @@ -__version__ = "0.1.10" +__version__ = "0.1.12" diff --git a/client/ayon_core/modules/job_queue/__init__.py b/client/ayon_core/modules/job_queue/__init__.py index 0a4c62abfb..041782dd29 100644 --- a/client/ayon_core/modules/job_queue/__init__.py +++ b/client/ayon_core/modules/job_queue/__init__.py @@ -1,6 +1,9 @@ +from .version import __version__ from .addon import JobQueueAddon __all__ = ( + "__version__", + "JobQueueAddon", ) diff --git a/client/ayon_core/modules/job_queue/addon.py b/client/ayon_core/modules/job_queue/addon.py index 0fa54eb2f0..96f6ff0d4d 100644 --- a/client/ayon_core/modules/job_queue/addon.py +++ b/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 {} diff --git a/client/ayon_core/modules/job_queue/version.py b/client/ayon_core/modules/job_queue/version.py new file mode 100644 index 0000000000..5becc17c04 --- /dev/null +++ b/client/ayon_core/modules/job_queue/version.py @@ -0,0 +1 @@ +__version__ = "1.0.0" diff --git a/client/ayon_core/modules/launcher_action.py b/client/ayon_core/modules/launcher_action.py index 38e88d36ca..344b0bc389 100644 --- a/client/ayon_core/modules/launcher_action.py +++ b/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): diff --git a/client/ayon_core/modules/loader_action.py b/client/ayon_core/modules/loader_action.py index 1e45db05dc..a58d7fd456 100644 --- a/client/ayon_core/modules/loader_action.py +++ b/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 diff --git a/client/ayon_core/modules/python_console_interpreter/addon.py b/client/ayon_core/modules/python_console_interpreter/addon.py index ffad3ce707..b0dce2585e 100644 --- a/client/ayon_core/modules/python_console_interpreter/addon.py +++ b/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): diff --git a/client/ayon_core/modules/royalrender/__init__.py b/client/ayon_core/modules/royalrender/__init__.py index 121530beda..8bf207e7db 100644 --- a/client/ayon_core/modules/royalrender/__init__.py +++ b/client/ayon_core/modules/royalrender/__init__.py @@ -1,6 +1,9 @@ +from .version import __version__ from .addon import RoyalRenderAddon __all__ = ( + "__version__", + "RoyalRenderAddon", ) diff --git a/client/ayon_core/modules/royalrender/addon.py b/client/ayon_core/modules/royalrender/addon.py index e69cf9feec..264d3516c1 100644 --- a/client/ayon_core/modules/royalrender/addon.py +++ b/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 diff --git a/client/ayon_core/modules/royalrender/version.py b/client/ayon_core/modules/royalrender/version.py new file mode 100644 index 0000000000..485f44ac21 --- /dev/null +++ b/client/ayon_core/modules/royalrender/version.py @@ -0,0 +1 @@ +__version__ = "0.1.1" diff --git a/client/ayon_core/modules/timers_manager/__init__.py b/client/ayon_core/modules/timers_manager/__init__.py index 5d7a4166d3..1ec0d9b74b 100644 --- a/client/ayon_core/modules/timers_manager/__init__.py +++ b/client/ayon_core/modules/timers_manager/__init__.py @@ -1,7 +1,10 @@ +from .version import __version__ from .timers_manager import ( TimersManager ) __all__ = ( + "__version__", + "TimersManager", ) diff --git a/client/ayon_core/modules/timers_manager/timers_manager.py b/client/ayon_core/modules/timers_manager/timers_manager.py index 4212ff6b25..2aac7b2a49 100644 --- a/client/ayon_core/modules/timers_manager/timers_manager.py +++ b/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 = ( diff --git a/client/ayon_core/modules/timers_manager/version.py b/client/ayon_core/modules/timers_manager/version.py new file mode 100644 index 0000000000..485f44ac21 --- /dev/null +++ b/client/ayon_core/modules/timers_manager/version.py @@ -0,0 +1 @@ +__version__ = "0.1.1" diff --git a/client/ayon_core/modules/webserver/__init__.py b/client/ayon_core/modules/webserver/__init__.py index 0d3f767638..a978b94bc4 100644 --- a/client/ayon_core/modules/webserver/__init__.py +++ b/client/ayon_core/modules/webserver/__init__.py @@ -1,8 +1,11 @@ +from .version import __version__ from .webserver_module import ( WebServerAddon ) __all__ = ( + "__version__", + "WebServerAddon", ) diff --git a/client/ayon_core/modules/webserver/version.py b/client/ayon_core/modules/webserver/version.py new file mode 100644 index 0000000000..5becc17c04 --- /dev/null +++ b/client/ayon_core/modules/webserver/version.py @@ -0,0 +1 @@ +__version__ = "1.0.0" diff --git a/client/ayon_core/modules/webserver/webserver_module.py b/client/ayon_core/modules/webserver/webserver_module.py index c324e0dd18..997b6f754c 100644 --- a/client/ayon_core/modules/webserver/webserver_module.py +++ b/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" diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 7615ce6aee..45846553a4 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -681,7 +681,7 @@ class PublishAttributeValues(AttributeValues): @property def parent(self): - self.publish_attributes.parent + return self.publish_attributes.parent class PublishAttributes: diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py index 8d3644637b..7f63089d33 100644 --- a/client/ayon_core/pipeline/publish/lib.py +++ b/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 diff --git a/client/ayon_core/plugins/publish/validate_version.py b/client/ayon_core/plugins/publish/validate_version.py index 25a5757330..0359f8fb53 100644 --- a/client/ayon_core/plugins/publish/validate_version.py +++ b/client/ayon_core/plugins/publish/validate_version.py @@ -1,7 +1,11 @@ import pyblish.api + +from ayon_core.lib import filter_profiles from ayon_core.pipeline.publish import ( - PublishValidationError, OptionalPyblishPluginMixin + PublishValidationError, + OptionalPyblishPluginMixin ) +from ayon_core.pipeline import get_current_host_name class ValidateVersion(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin): @@ -13,12 +17,35 @@ class ValidateVersion(pyblish.api.InstancePlugin, OptionalPyblishPluginMixin): order = pyblish.api.ValidatorOrder label = "Validate Version" - hosts = ["nuke", "maya", "houdini", "blender", - "photoshop", "aftereffects"] optional = False active = True + @classmethod + def apply_settings(cls, settings): + # Disable if no profile is found for the current host + profiles = ( + settings + ["core"] + ["publish"] + ["ValidateVersion"] + ["plugin_state_profiles"] + ) + profile = filter_profiles( + profiles, {"host_names": get_current_host_name()} + ) + if not profile: + cls.enabled = False + return + + # Apply settings from profile + for attr_name in { + "enabled", + "optional", + "active", + }: + setattr(cls, attr_name, profile[attr_name]) + def process(self, instance): if not self.is_active(instance.data): return diff --git a/client/ayon_core/tools/common_models/__init__.py b/client/ayon_core/tools/common_models/__init__.py index 8895515b1a..f09edfeab2 100644 --- a/client/ayon_core/tools/common_models/__init__.py +++ b/client/ayon_core/tools/common_models/__init__.py @@ -14,6 +14,7 @@ from .hierarchy import ( ) from .thumbnails import ThumbnailsModel from .selection import HierarchyExpectedSelection +from .users import UsersModel __all__ = ( @@ -32,4 +33,6 @@ __all__ = ( "ThumbnailsModel", "HierarchyExpectedSelection", + + "UsersModel", ) diff --git a/client/ayon_core/tools/common_models/users.py b/client/ayon_core/tools/common_models/users.py new file mode 100644 index 0000000000..f8beb31aa1 --- /dev/null +++ b/client/ayon_core/tools/common_models/users.py @@ -0,0 +1,84 @@ +import ayon_api + +from ayon_core.lib import CacheItem + + +class UserItem: + def __init__( + self, + username, + full_name, + email, + avatar_url, + active, + ): + self.username = username + self.full_name = full_name + self.email = email + self.avatar_url = avatar_url + self.active = active + + @classmethod + def from_entity_data(cls, user_data): + return cls( + user_data["name"], + user_data["attrib"]["fullName"], + user_data["attrib"]["email"], + user_data["attrib"]["avatarUrl"], + user_data["active"], + ) + + +class UsersModel: + def __init__(self, controller): + self._controller = controller + self._users_cache = CacheItem(default_factory=list) + + def get_user_items(self): + """Get user items. + + Returns: + List[UserItem]: List of user items. + + """ + self._invalidate_cache() + return self._users_cache.get_data() + + def get_user_items_by_name(self): + """Get user items by name. + + Implemented as most of cases using this model will need to find + user information by username. + + Returns: + Dict[str, UserItem]: Dictionary of user items by name. + + """ + return { + user_item.username: user_item + for user_item in self.get_user_items() + } + + def get_user_item_by_username(self, username): + """Get user item by username. + + Args: + username (str): Username. + + Returns: + Union[UserItem, None]: User item or None if not found. + + """ + self._invalidate_cache() + for user_item in self.get_user_items(): + if user_item.username == username: + return user_item + return None + + def _invalidate_cache(self): + if self._users_cache.is_valid: + return + self._users_cache.update_data([ + UserItem.from_entity_data(user) + for user in ayon_api.get_users() + ]) diff --git a/client/ayon_core/tools/loader/ui/products_delegates.py b/client/ayon_core/tools/loader/ui/products_delegates.py index 1ac19b53eb..cedac6199b 100644 --- a/client/ayon_core/tools/loader/ui/products_delegates.py +++ b/client/ayon_core/tools/loader/ui/products_delegates.py @@ -6,9 +6,6 @@ from ayon_core.tools.utils.lib import format_version from .products_model import ( PRODUCT_ID_ROLE, VERSION_NAME_EDIT_ROLE, - VERSION_STATUS_NAME_ROLE, - VERSION_STATUS_SHORT_ROLE, - VERSION_STATUS_COLOR_ROLE, VERSION_ID_ROLE, PRODUCT_IN_SCENE_ROLE, ACTIVE_SITE_ICON_ROLE, @@ -205,57 +202,6 @@ class LoadedInSceneDelegate(QtWidgets.QStyledItemDelegate): option.palette.setBrush(QtGui.QPalette.Text, color) -class StatusDelegate(QtWidgets.QStyledItemDelegate): - """Delegate showing status name and short name.""" - - def paint(self, painter, option, index): - if option.widget: - style = option.widget.style() - else: - style = QtWidgets.QApplication.style() - - style.drawControl( - QtWidgets.QCommonStyle.CE_ItemViewItem, - option, - painter, - option.widget - ) - - painter.save() - - text_rect = style.subElementRect( - QtWidgets.QCommonStyle.SE_ItemViewItemText, - option - ) - text_margin = style.proxy().pixelMetric( - QtWidgets.QCommonStyle.PM_FocusFrameHMargin, - option, - option.widget - ) + 1 - padded_text_rect = text_rect.adjusted( - text_margin, 0, - text_margin, 0 - ) - - fm = QtGui.QFontMetrics(option.font) - text = index.data(VERSION_STATUS_NAME_ROLE) - if padded_text_rect.width() < fm.width(text): - text = index.data(VERSION_STATUS_SHORT_ROLE) - - status_color = index.data(VERSION_STATUS_COLOR_ROLE) - fg_color = QtGui.QColor(status_color) - pen = painter.pen() - pen.setColor(fg_color) - painter.setPen(pen) - - painter.drawText( - padded_text_rect, - option.displayAlignment, - text - ) - - painter.restore() - - class SiteSyncDelegate(QtWidgets.QStyledItemDelegate): """Paints icons and downloaded representation ration for both sites.""" diff --git a/client/ayon_core/tools/loader/ui/products_model.py b/client/ayon_core/tools/loader/ui/products_model.py index fc7375d8c1..7b9124608b 100644 --- a/client/ayon_core/tools/loader/ui/products_model.py +++ b/client/ayon_core/tools/loader/ui/products_model.py @@ -25,18 +25,19 @@ VERSION_PUBLISH_TIME_ROLE = QtCore.Qt.UserRole + 14 VERSION_STATUS_NAME_ROLE = QtCore.Qt.UserRole + 15 VERSION_STATUS_SHORT_ROLE = QtCore.Qt.UserRole + 16 VERSION_STATUS_COLOR_ROLE = QtCore.Qt.UserRole + 17 -VERSION_AUTHOR_ROLE = QtCore.Qt.UserRole + 18 -VERSION_FRAME_RANGE_ROLE = QtCore.Qt.UserRole + 19 -VERSION_DURATION_ROLE = QtCore.Qt.UserRole + 20 -VERSION_HANDLES_ROLE = QtCore.Qt.UserRole + 21 -VERSION_STEP_ROLE = QtCore.Qt.UserRole + 22 -VERSION_AVAILABLE_ROLE = QtCore.Qt.UserRole + 23 -VERSION_THUMBNAIL_ID_ROLE = QtCore.Qt.UserRole + 24 -ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 25 -REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 26 -REPRESENTATIONS_COUNT_ROLE = QtCore.Qt.UserRole + 27 -SYNC_ACTIVE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 28 -SYNC_REMOTE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 29 +VERSION_STATUS_ICON_ROLE = QtCore.Qt.UserRole + 18 +VERSION_AUTHOR_ROLE = QtCore.Qt.UserRole + 19 +VERSION_FRAME_RANGE_ROLE = QtCore.Qt.UserRole + 20 +VERSION_DURATION_ROLE = QtCore.Qt.UserRole + 21 +VERSION_HANDLES_ROLE = QtCore.Qt.UserRole + 22 +VERSION_STEP_ROLE = QtCore.Qt.UserRole + 23 +VERSION_AVAILABLE_ROLE = QtCore.Qt.UserRole + 24 +VERSION_THUMBNAIL_ID_ROLE = QtCore.Qt.UserRole + 25 +ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 26 +REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 27 +REPRESENTATIONS_COUNT_ROLE = QtCore.Qt.UserRole + 28 +SYNC_ACTIVE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 29 +SYNC_REMOTE_SITE_AVAILABILITY = QtCore.Qt.UserRole + 30 class ProductsModel(QtGui.QStandardItemModel): diff --git a/client/ayon_core/tools/loader/ui/products_widget.py b/client/ayon_core/tools/loader/ui/products_widget.py index 3a30d83d52..61ddd690e9 100644 --- a/client/ayon_core/tools/loader/ui/products_widget.py +++ b/client/ayon_core/tools/loader/ui/products_widget.py @@ -6,7 +6,7 @@ from ayon_core.tools.utils import ( RecursiveSortFilterProxyModel, DeselectableTreeView, ) -from ayon_core.tools.utils.delegates import PrettyTimeDelegate +from ayon_core.tools.utils.delegates import PrettyTimeDelegate, StatusDelegate from .products_model import ( ProductsModel, @@ -17,12 +17,15 @@ from .products_model import ( FOLDER_ID_ROLE, PRODUCT_ID_ROLE, VERSION_ID_ROLE, + VERSION_STATUS_NAME_ROLE, + VERSION_STATUS_SHORT_ROLE, + VERSION_STATUS_COLOR_ROLE, + VERSION_STATUS_ICON_ROLE, VERSION_THUMBNAIL_ID_ROLE, ) from .products_delegates import ( VersionDelegate, LoadedInSceneDelegate, - StatusDelegate, SiteSyncDelegate, ) from .actions_utils import show_actions_menu @@ -131,7 +134,12 @@ class ProductsWidget(QtWidgets.QWidget): version_delegate = VersionDelegate() time_delegate = PrettyTimeDelegate() - status_delegate = StatusDelegate() + status_delegate = StatusDelegate( + VERSION_STATUS_NAME_ROLE, + VERSION_STATUS_SHORT_ROLE, + VERSION_STATUS_COLOR_ROLE, + VERSION_STATUS_ICON_ROLE, + ) in_scene_delegate = LoadedInSceneDelegate() sitesync_delegate = SiteSyncDelegate() diff --git a/client/ayon_core/tools/sceneinventory/control.py b/client/ayon_core/tools/sceneinventory/control.py index 592113455c..b890462506 100644 --- a/client/ayon_core/tools/sceneinventory/control.py +++ b/client/ayon_core/tools/sceneinventory/control.py @@ -1,14 +1,14 @@ import ayon_api from ayon_core.lib.events import QueuedEventSystem -from ayon_core.host import ILoadHost +from ayon_core.host import HostBase from ayon_core.pipeline import ( registered_host, get_current_context, ) -from ayon_core.tools.common_models import HierarchyModel +from ayon_core.tools.common_models import HierarchyModel, ProjectsModel -from .models import SiteSyncModel +from .models import SiteSyncModel, ContainersModel class SceneInventoryController: @@ -28,11 +28,16 @@ class SceneInventoryController: self._current_folder_id = None self._current_folder_set = False + self._containers_model = ContainersModel(self) self._sitesync_model = SiteSyncModel(self) # Switch dialog requirements self._hierarchy_model = HierarchyModel(self) + self._projects_model = ProjectsModel(self) self._event_system = self._create_event_system() + def get_host(self) -> HostBase: + return self._host + def emit_event(self, topic, data=None, source=None): if data is None: data = {} @@ -47,6 +52,7 @@ class SceneInventoryController: self._current_folder_id = None self._current_folder_set = False + self._containers_model.reset() self._sitesync_model.reset() self._hierarchy_model.reset() @@ -80,13 +86,32 @@ class SceneInventoryController: self._current_folder_set = True return self._current_folder_id + def get_project_status_items(self): + project_name = self.get_current_project_name() + return self._projects_model.get_project_status_items( + project_name, None + ) + + # Containers methods def get_containers(self): - host = self._host - if isinstance(host, ILoadHost): - return list(host.get_containers()) - elif hasattr(host, "ls"): - return list(host.ls()) - return [] + return self._containers_model.get_containers() + + def get_containers_by_item_ids(self, item_ids): + return self._containers_model.get_containers_by_item_ids(item_ids) + + def get_container_items(self): + return self._containers_model.get_container_items() + + def get_container_items_by_id(self, item_ids): + return self._containers_model.get_container_items_by_id(item_ids) + + def get_representation_info_items(self, representation_ids): + return self._containers_model.get_representation_info_items( + representation_ids + ) + + def get_version_items(self, product_ids): + return self._containers_model.get_version_items(product_ids) # Site Sync methods def is_sitesync_enabled(self): diff --git a/client/ayon_core/tools/sceneinventory/delegates.py b/client/ayon_core/tools/sceneinventory/delegates.py index 2126fa1cbe..6f91587613 100644 --- a/client/ayon_core/tools/sceneinventory/delegates.py +++ b/client/ayon_core/tools/sceneinventory/delegates.py @@ -1,38 +1,10 @@ -import numbers - -import ayon_api - -from ayon_core.pipeline import HeroVersionType -from ayon_core.tools.utils.models import TreeModel -from ayon_core.tools.utils.lib import format_version - from qtpy import QtWidgets, QtCore, QtGui +from .model import VERSION_LABEL_ROLE + class VersionDelegate(QtWidgets.QStyledItemDelegate): """A delegate that display version integer formatted as version string.""" - - version_changed = QtCore.Signal() - first_run = False - lock = False - - def __init__(self, controller, *args, **kwargs): - self._controller = controller - super(VersionDelegate, self).__init__(*args, **kwargs) - - def get_project_name(self): - return self._controller.get_current_project_name() - - def displayText(self, value, locale): - if isinstance(value, HeroVersionType): - return format_version(value) - if not isinstance(value, numbers.Integral): - # For cases where no version is resolved like NOT FOUND cases - # where a representation might not exist in current database - return - - return format_version(value) - def paint(self, painter, option, index): fg_color = index.data(QtCore.Qt.ForegroundRole) if fg_color: @@ -44,7 +16,7 @@ class VersionDelegate(QtWidgets.QStyledItemDelegate): fg_color = None if not fg_color: - return super(VersionDelegate, self).paint(painter, option, index) + return super().paint(painter, option, index) if option.widget: style = option.widget.style() @@ -60,9 +32,7 @@ class VersionDelegate(QtWidgets.QStyledItemDelegate): painter.save() - text = self.displayText( - index.data(QtCore.Qt.DisplayRole), option.locale - ) + text = index.data(VERSION_LABEL_ROLE) pen = painter.pen() pen.setColor(fg_color) painter.setPen(pen) @@ -82,77 +52,3 @@ class VersionDelegate(QtWidgets.QStyledItemDelegate): ) painter.restore() - - def createEditor(self, parent, option, index): - item = index.data(TreeModel.ItemRole) - if item.get("isGroup") or item.get("isMerged"): - return - - editor = QtWidgets.QComboBox(parent) - - def commit_data(): - if not self.first_run: - self.commitData.emit(editor) # Update model data - self.version_changed.emit() # Display model data - editor.currentIndexChanged.connect(commit_data) - - self.first_run = True - self.lock = False - - return editor - - def setEditorData(self, editor, index): - if self.lock: - # Only set editor data once per delegation - return - - editor.clear() - - # Current value of the index - item = index.data(TreeModel.ItemRole) - value = index.data(QtCore.Qt.DisplayRole) - - project_name = self.get_project_name() - # Add all available versions to the editor - product_id = item["version_entity"]["productId"] - version_entities = list(sorted( - ayon_api.get_versions( - project_name, product_ids={product_id}, active=True - ), - key=lambda item: abs(item["version"]) - )) - - selected = None - items = [] - is_hero_version = value < 0 - for version_entity in version_entities: - version = version_entity["version"] - label = format_version(version) - item = QtGui.QStandardItem(label) - item.setData(version_entity, QtCore.Qt.UserRole) - items.append(item) - - if ( - version == value - or is_hero_version and version < 0 - ): - selected = item - - # Reverse items so latest versions be upper - items.reverse() - for item in items: - editor.model().appendRow(item) - - index = 0 - if selected: - index = selected.row() - - # Will trigger index-change signal - editor.setCurrentIndex(index) - self.first_run = False - self.lock = True - - def setModelData(self, editor, model, index): - """Apply the integer version back in the model""" - version = editor.itemData(editor.currentIndex()) - model.setData(index, version["name"]) diff --git a/client/ayon_core/tools/sceneinventory/model.py b/client/ayon_core/tools/sceneinventory/model.py index 330b174218..1c51b7a98b 100644 --- a/client/ayon_core/tools/sceneinventory/model.py +++ b/client/ayon_core/tools/sceneinventory/model.py @@ -1,57 +1,113 @@ import re import logging -import uuid -from collections import defaultdict +import collections -import ayon_api from qtpy import QtCore, QtGui import qtawesome -from ayon_core.pipeline import ( - get_current_project_name, - HeroVersionType, -) from ayon_core.style import get_default_entity_icon_color from ayon_core.tools.utils import get_qt_icon -from ayon_core.tools.utils.models import TreeModel, Item +from ayon_core.tools.utils.lib import format_version + +ITEM_ID_ROLE = QtCore.Qt.UserRole + 1 +NAME_COLOR_ROLE = QtCore.Qt.UserRole + 2 +COUNT_ROLE = QtCore.Qt.UserRole + 3 +IS_CONTAINER_ITEM_ROLE = QtCore.Qt.UserRole + 4 +VERSION_IS_LATEST_ROLE = QtCore.Qt.UserRole + 5 +VERSION_IS_HERO_ROLE = QtCore.Qt.UserRole + 6 +VERSION_LABEL_ROLE = QtCore.Qt.UserRole + 7 +VERSION_COLOR_ROLE = QtCore.Qt.UserRole + 8 +STATUS_NAME_ROLE = QtCore.Qt.UserRole + 9 +STATUS_COLOR_ROLE = QtCore.Qt.UserRole + 10 +STATUS_SHORT_ROLE = QtCore.Qt.UserRole + 11 +STATUS_ICON_ROLE = QtCore.Qt.UserRole + 12 +PRODUCT_ID_ROLE = QtCore.Qt.UserRole + 13 +PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 14 +PRODUCT_TYPE_ICON_ROLE = QtCore.Qt.UserRole + 15 +PRODUCT_GROUP_NAME_ROLE = QtCore.Qt.UserRole + 16 +PRODUCT_GROUP_ICON_ROLE = QtCore.Qt.UserRole + 17 +LOADER_NAME_ROLE = QtCore.Qt.UserRole + 18 +OBJECT_NAME_ROLE = QtCore.Qt.UserRole + 19 +ACTIVE_SITE_PROGRESS_ROLE = QtCore.Qt.UserRole + 20 +REMOTE_SITE_PROGRESS_ROLE = QtCore.Qt.UserRole + 21 +ACTIVE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 22 +REMOTE_SITE_ICON_ROLE = QtCore.Qt.UserRole + 23 +# This value hold unique value of container that should be used to identify +# containers inbetween refresh. +ITEM_UNIQUE_NAME_ROLE = QtCore.Qt.UserRole + 24 -def walk_hierarchy(node): - """Recursively yield group node.""" - for child in node.children(): - if child.get("isGroupNode"): - yield child - - for _child in walk_hierarchy(child): - yield _child - - -class InventoryModel(TreeModel): +class InventoryModel(QtGui.QStandardItemModel): """The model for the inventory""" - Columns = [ + column_labels = [ "Name", - "version", - "count", - "productType", - "group", - "loader", - "objectName", - "active_site", - "remote_site", + "Version", + "Status", + "Count", + "Product type", + "Group", + "Loader", + "Object name", + "Active site", + "Remote site", ] - active_site_col = Columns.index("active_site") - remote_site_col = Columns.index("remote_site") + name_col = column_labels.index("Name") + version_col = column_labels.index("Version") + status_col = column_labels.index("Status") + count_col = column_labels.index("Count") + product_type_col = column_labels.index("Product type") + product_group_col = column_labels.index("Group") + loader_col = column_labels.index("Loader") + object_name_col = column_labels.index("Object name") + active_site_col = column_labels.index("Active site") + remote_site_col = column_labels.index("Remote site") + display_role_by_column = { + name_col: QtCore.Qt.DisplayRole, + version_col: VERSION_LABEL_ROLE, + status_col: STATUS_NAME_ROLE, + count_col: COUNT_ROLE, + product_type_col: PRODUCT_TYPE_ROLE, + product_group_col: PRODUCT_GROUP_NAME_ROLE, + loader_col: LOADER_NAME_ROLE, + object_name_col: OBJECT_NAME_ROLE, + active_site_col: ACTIVE_SITE_PROGRESS_ROLE, + remote_site_col: REMOTE_SITE_PROGRESS_ROLE, + } + decoration_role_by_column = { + name_col: QtCore.Qt.DecorationRole, + product_type_col: PRODUCT_TYPE_ICON_ROLE, + product_group_col: PRODUCT_GROUP_ICON_ROLE, + active_site_col: ACTIVE_SITE_ICON_ROLE, + remote_site_col: REMOTE_SITE_ICON_ROLE, + } + foreground_role_by_column = { + name_col: NAME_COLOR_ROLE, + version_col: VERSION_COLOR_ROLE, + status_col: STATUS_COLOR_ROLE + } + width_by_column = { + name_col: 250, + version_col: 55, + status_col: 100, + count_col: 55, + product_type_col: 150, + product_group_col: 120, + loader_col: 150, + } OUTDATED_COLOR = QtGui.QColor(235, 30, 30) CHILD_OUTDATED_COLOR = QtGui.QColor(200, 160, 30) GRAYOUT_COLOR = QtGui.QColor(160, 160, 160) - UniqueRole = QtCore.Qt.UserRole + 2 # unique label role - def __init__(self, controller, parent=None): - super(InventoryModel, self).__init__(parent) + super().__init__(parent) + + self.setColumnCount(len(self.column_labels)) + for idx, label in enumerate(self.column_labels): + self.setHeaderData(idx, QtCore.Qt.Horizontal, label) + self.log = logging.getLogger(self.__class__.__name__) self._controller = controller @@ -60,103 +116,217 @@ class InventoryModel(TreeModel): self._default_icon_color = get_default_entity_icon_color() - site_icons = self._controller.get_site_provider_icons() - - self._site_icons = { - provider: get_qt_icon(icon_def) - for provider, icon_def in site_icons.items() - } - def outdated(self, item): return item.get("isOutdated", True) + def refresh(self, selected=None): + """Refresh the model""" + # for debugging or testing, injecting items from outside + container_items = self._controller.get_container_items() + + self._clear_items() + + items_by_repre_id = {} + for container_item in container_items: + # if ( + # selected is not None + # and container_item.item_id not in selected + # ): + # continue + repre_id = container_item.representation_id + items = items_by_repre_id.setdefault(repre_id, []) + items.append(container_item) + + repre_id = set(items_by_repre_id.keys()) + repre_info_by_id = self._controller.get_representation_info_items( + repre_id + ) + product_ids = { + repre_info.product_id + for repre_info in repre_info_by_id.values() + } + version_items_by_product_id = self._controller.get_version_items( + product_ids + ) + # SiteSync addon information + progress_by_id = self._controller.get_representations_site_progress( + repre_id + ) + sites_info = self._controller.get_sites_information() + site_icons = { + provider: get_qt_icon(icon_def) + for provider, icon_def in ( + self._controller.get_site_provider_icons().items() + ) + } + status_items_by_name = { + status_item.name: status_item + for status_item in self._controller.get_project_status_items() + } + + group_item_icon = qtawesome.icon( + "fa.folder", color=self._default_icon_color + ) + valid_item_icon = qtawesome.icon( + "fa.file-o", color=self._default_icon_color + ) + invalid_item_icon = qtawesome.icon( + "fa.exclamation-circle", color=self._default_icon_color + ) + group_icon = qtawesome.icon( + "fa.object-group", color=self._default_icon_color + ) + product_type_icon = qtawesome.icon( + "fa.folder", color="#0091B2" + ) + group_item_font = QtGui.QFont() + group_item_font.setBold(True) + + active_site_icon = site_icons.get(sites_info["active_site_provider"]) + remote_site_icon = site_icons.get(sites_info["remote_site_provider"]) + + root_item = self.invisibleRootItem() + + group_items = [] + for repre_id, container_items in items_by_repre_id.items(): + repre_info = repre_info_by_id[repre_id] + version_label = "N/A" + version_color = None + is_latest = False + is_hero = False + status_name = None + status_color = None + status_short = None + if not repre_info.is_valid: + group_name = "< Entity N/A >" + item_icon = invalid_item_icon + + else: + group_name = "{}_{}: ({})".format( + repre_info.folder_path.rsplit("/")[-1], + repre_info.product_name, + repre_info.representation_name + ) + item_icon = valid_item_icon + + version_items = ( + version_items_by_product_id[repre_info.product_id] + ) + version_item = version_items[repre_info.version_id] + version_label = format_version(version_item.version) + is_hero = version_item.version < 0 + is_latest = version_item.is_latest + if not is_latest: + version_color = self.OUTDATED_COLOR + status_name = version_item.status + status_item = status_items_by_name.get(status_name) + if status_item: + status_short = status_item.short + status_color = status_item.color + + container_model_items = [] + for container_item in container_items: + unique_name = ( + repre_info.representation_name + + container_item.object_name or "" + ) + + item = QtGui.QStandardItem() + item.setColumnCount(root_item.columnCount()) + item.setData(container_item.namespace, QtCore.Qt.DisplayRole) + item.setData(self.GRAYOUT_COLOR, NAME_COLOR_ROLE) + item.setData(self.GRAYOUT_COLOR, VERSION_COLOR_ROLE) + item.setData(item_icon, QtCore.Qt.DecorationRole) + item.setData(repre_info.product_id, PRODUCT_ID_ROLE) + item.setData(container_item.item_id, ITEM_ID_ROLE) + item.setData(version_label, VERSION_LABEL_ROLE) + item.setData(container_item.loader_name, LOADER_NAME_ROLE) + item.setData(container_item.object_name, OBJECT_NAME_ROLE) + item.setData(True, IS_CONTAINER_ITEM_ROLE) + item.setData(unique_name, ITEM_UNIQUE_NAME_ROLE) + container_model_items.append(item) + + if not container_model_items: + continue + + progress = progress_by_id[repre_id] + active_site_progress = "{}%".format( + max(progress["active_site"], 0) * 100 + ) + remote_site_progress = "{}%".format( + max(progress["remote_site"], 0) * 100 + ) + + group_item = QtGui.QStandardItem() + group_item.setColumnCount(root_item.columnCount()) + group_item.setData(group_name, QtCore.Qt.DisplayRole) + group_item.setData(group_name, ITEM_UNIQUE_NAME_ROLE) + group_item.setData(group_item_icon, QtCore.Qt.DecorationRole) + group_item.setData(group_item_font, QtCore.Qt.FontRole) + group_item.setData(repre_info.product_id, PRODUCT_ID_ROLE) + group_item.setData(repre_info.product_type, PRODUCT_TYPE_ROLE) + group_item.setData(product_type_icon, PRODUCT_TYPE_ICON_ROLE) + group_item.setData(is_latest, VERSION_IS_LATEST_ROLE) + group_item.setData(is_hero, VERSION_IS_HERO_ROLE) + group_item.setData(version_label, VERSION_LABEL_ROLE) + group_item.setData(len(container_items), COUNT_ROLE) + group_item.setData(status_name, STATUS_NAME_ROLE) + group_item.setData(status_short, STATUS_SHORT_ROLE) + group_item.setData(status_color, STATUS_COLOR_ROLE) + + group_item.setData( + active_site_progress, ACTIVE_SITE_PROGRESS_ROLE + ) + group_item.setData( + remote_site_progress, REMOTE_SITE_PROGRESS_ROLE + ) + group_item.setData(active_site_icon, ACTIVE_SITE_ICON_ROLE) + group_item.setData(remote_site_icon, REMOTE_SITE_ICON_ROLE) + group_item.setData(False, IS_CONTAINER_ITEM_ROLE) + + if version_color is not None: + group_item.setData(version_color, VERSION_COLOR_ROLE) + + if repre_info.product_group: + group_item.setData( + repre_info.product_group, PRODUCT_GROUP_NAME_ROLE + ) + group_item.setData(group_icon, PRODUCT_GROUP_ICON_ROLE) + + group_item.appendRows(container_model_items) + group_items.append(group_item) + + if group_items: + root_item.appendRows(group_items) + + def flags(self, index): + return QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable + def data(self, index, role): if not index.isValid(): return - item = index.internalPointer() + col = index.column() + if role == QtCore.Qt.DisplayRole: + role = self.display_role_by_column.get(col) + if role is None: + print(col, role) + return None - if role == QtCore.Qt.FontRole: - # Make top-level entries bold - if item.get("isGroupNode") or item.get("isNotSet"): # group-item - font = QtGui.QFont() - font.setBold(True) - return font + elif role == QtCore.Qt.DecorationRole: + role = self.decoration_role_by_column.get(col) + if role is None: + return None - if role == QtCore.Qt.ForegroundRole: - # Set the text color to the OUTDATED_COLOR when the - # collected version is not the same as the highest version - key = self.Columns[index.column()] - if key == "version": # version - if item.get("isGroupNode"): # group-item - if self.outdated(item): - return self.OUTDATED_COLOR + elif role == QtCore.Qt.ForegroundRole: + role = self.foreground_role_by_column.get(col) + if role is None: + return None - if self._hierarchy_view: - # If current group is not outdated, check if any - # outdated children. - for _node in walk_hierarchy(item): - if self.outdated(_node): - return self.CHILD_OUTDATED_COLOR - else: + if col != 0: + index = self.index(index.row(), 0, index.parent()) - if self._hierarchy_view: - # Although this is not a group item, we still need - # to distinguish which one contain outdated child. - for _node in walk_hierarchy(item): - if self.outdated(_node): - return self.CHILD_OUTDATED_COLOR.darker(150) - - return self.GRAYOUT_COLOR - - if key == "Name" and not item.get("isGroupNode"): - return self.GRAYOUT_COLOR - - # Add icons - if role == QtCore.Qt.DecorationRole: - if index.column() == 0: - # Override color - color = item.get("color", self._default_icon_color) - if item.get("isGroupNode"): # group-item - return qtawesome.icon("fa.folder", color=color) - if item.get("isNotSet"): - return qtawesome.icon("fa.exclamation-circle", color=color) - - return qtawesome.icon("fa.file-o", color=color) - - if index.column() == 3: - # Product type icon - return item.get("productTypeIcon", None) - - column_name = self.Columns[index.column()] - - if column_name == "group" and item.get("group"): - return qtawesome.icon("fa.object-group", - color=get_default_entity_icon_color()) - - if item.get("isGroupNode"): - if column_name == "active_site": - provider = item.get("active_site_provider") - return self._site_icons.get(provider) - - if column_name == "remote_site": - provider = item.get("remote_site_provider") - return self._site_icons.get(provider) - - if role == QtCore.Qt.DisplayRole and item.get("isGroupNode"): - column_name = self.Columns[index.column()] - progress = None - if column_name == "active_site": - progress = item.get("active_site_progress", 0) - elif column_name == "remote_site": - progress = item.get("remote_site_progress", 0) - if progress is not None: - return "{}%".format(max(progress, 0) * 100) - - if role == self.UniqueRole: - return item["representation"] + item.get("objectName", "") - - return super(InventoryModel, self).data(index, role) + return super().data(index, role) def set_hierarchy_view(self, state): """Set whether to display products in hierarchy view.""" @@ -165,299 +335,34 @@ class InventoryModel(TreeModel): if state != self._hierarchy_view: self._hierarchy_view = state - def refresh(self, selected=None, containers=None): - """Refresh the model""" - - # for debugging or testing, injecting items from outside - if containers is None: - containers = self._controller.get_containers() - - self.clear() - if not selected or not self._hierarchy_view: - self._add_containers(containers) - return - - # Filter by cherry-picked items - self._add_containers(( - container - for container in containers - if container["objectName"] in selected - )) - - def _add_containers(self, containers, parent=None): - """Add the items to the model. - - The items should be formatted similar to `api.ls()` returns, an item - is then represented as: - {"filename_v001.ma": [full/filename/of/loaded/filename_v001.ma, - full/filename/of/loaded/filename_v001.ma], - "nodetype" : "reference", - "node": "referenceNode1"} - - Note: When performing an additional call to `add_items` it will *not* - group the new items with previously existing item groups of the - same type. - - Args: - containers (generator): Container items. - parent (Item, optional): Set this item as parent for the added - items when provided. Defaults to the root of the model. - - Returns: - node.Item: root node which has children added based on the data - """ - - project_name = get_current_project_name() - - self.beginResetModel() - - # Group by representation - grouped = defaultdict(lambda: {"containers": list()}) - for container in containers: - repre_id = container["representation"] - grouped[repre_id]["containers"].append(container) - - ( - repres_by_id, - versions_by_id, - products_by_id, - folders_by_id, - ) = self._query_entities(project_name, set(grouped.keys())) - # Add to model - not_found = defaultdict(list) - not_found_ids = [] - for repre_id, group_dict in sorted(grouped.items()): - group_containers = group_dict["containers"] - representation = repres_by_id.get(repre_id) - if not representation: - not_found["representation"].extend(group_containers) - not_found_ids.append(repre_id) + def get_outdated_item_ids(self, ignore_hero=True): + outdated_item_ids = [] + root_item = self.invisibleRootItem() + for row in range(root_item.rowCount()): + group_item = root_item.child(row) + if group_item.data(VERSION_IS_LATEST_ROLE): continue - version_entity = versions_by_id.get(representation["versionId"]) - if not version_entity: - not_found["version"].extend(group_containers) - not_found_ids.append(repre_id) + if ignore_hero and group_item.data(VERSION_IS_HERO_ROLE): continue - product_entity = products_by_id.get(version_entity["productId"]) - if not product_entity: - not_found["product"].extend(group_containers) - not_found_ids.append(repre_id) - continue + for idx in range(group_item.rowCount()): + item = group_item.child(idx) + outdated_item_ids.append(item.data(ITEM_ID_ROLE)) + return outdated_item_ids - folder_entity = folders_by_id.get(product_entity["folderId"]) - if not folder_entity: - not_found["folder"].extend(group_containers) - not_found_ids.append(repre_id) - continue - - group_dict.update({ - "representation": representation, - "version": version_entity, - "product": product_entity, - "folder": folder_entity - }) - - for _repre_id in not_found_ids: - grouped.pop(_repre_id) - - for where, group_containers in not_found.items(): - # create the group header - group_node = Item() - name = "< NOT FOUND - {} >".format(where) - group_node["Name"] = name - group_node["representation"] = name - group_node["count"] = len(group_containers) - group_node["isGroupNode"] = False - group_node["isNotSet"] = True - - self.add_child(group_node, parent=parent) - - for container in group_containers: - item_node = Item() - item_node.update(container) - item_node["Name"] = container.get("objectName", "NO NAME") - item_node["isNotFound"] = True - self.add_child(item_node, parent=group_node) - - # TODO Use product icons - product_type_icon = qtawesome.icon( - "fa.folder", color="#0091B2" - ) - # Prepare site sync specific data - progress_by_id = self._controller.get_representations_site_progress( - set(grouped.keys()) - ) - sites_info = self._controller.get_sites_information() - - # Query the highest available version so the model can know - # whether current version is currently up-to-date. - highest_version_by_product_id = ayon_api.get_last_versions( - project_name, - product_ids={ - group["version"]["productId"] for group in grouped.values() - }, - fields={"productId", "version"} - ) - # Map value to `version` key - highest_version_by_product_id = { - product_id: version["version"] - for product_id, version in highest_version_by_product_id.items() - } - - for repre_id, group_dict in sorted(grouped.items()): - group_containers = group_dict["containers"] - repre_entity = group_dict["representation"] - version_entity = group_dict["version"] - folder_entity = group_dict["folder"] - product_entity = group_dict["product"] - - product_type = product_entity["productType"] - - # create the group header - group_node = Item() - group_node["Name"] = "{}_{}: ({})".format( - folder_entity["name"], - product_entity["name"], - repre_entity["name"] - ) - group_node["representation"] = repre_id - - # Detect hero version type - version = version_entity["version"] - if version < 0: - version = HeroVersionType(version) - group_node["version"] = version - - # Check if the version is outdated. - # Hero versions are never considered to be outdated. - is_outdated = False - if not isinstance(version, HeroVersionType): - last_version = highest_version_by_product_id.get( - version_entity["productId"]) - if last_version is not None: - is_outdated = version_entity["version"] != last_version - group_node["isOutdated"] = is_outdated - - group_node["productType"] = product_type or "" - group_node["productTypeIcon"] = product_type_icon - group_node["count"] = len(group_containers) - group_node["isGroupNode"] = True - group_node["group"] = product_entity["attrib"].get("productGroup") - - # Site sync specific data - progress = progress_by_id[repre_id] - group_node.update(sites_info) - group_node["active_site_progress"] = progress["active_site"] - group_node["remote_site_progress"] = progress["remote_site"] - - self.add_child(group_node, parent=parent) - - for container in group_containers: - item_node = Item() - item_node.update(container) - - # store the current version on the item - item_node["version"] = version_entity["version"] - item_node["version_entity"] = version_entity - - # Remapping namespace to item name. - # Noted that the name key is capital "N", by doing this, we - # can view namespace in GUI without changing container data. - item_node["Name"] = container["namespace"] - - self.add_child(item_node, parent=group_node) - - self.endResetModel() - - return self._root_item - - def _query_entities(self, project_name, repre_ids): - """Query entities for representations from containers. - - Returns: - tuple[dict, dict, dict, dict]: Representation, version, product - and folder documents by id. - """ - - repres_by_id = {} - versions_by_id = {} - products_by_id = {} - folders_by_id = {} - output = ( - repres_by_id, - versions_by_id, - products_by_id, - folders_by_id, - ) - - filtered_repre_ids = set() - for repre_id in repre_ids: - # Filter out invalid representation ids - # NOTE: This is added because scenes from OpenPype did contain - # ObjectId from mongo. - try: - uuid.UUID(repre_id) - filtered_repre_ids.add(repre_id) - except ValueError: - continue - if not filtered_repre_ids: - return output - - repre_entities = ayon_api.get_representations(project_name, repre_ids) - repres_by_id.update({ - repre_entity["id"]: repre_entity - for repre_entity in repre_entities - }) - version_ids = { - repre_entity["versionId"] - for repre_entity in repres_by_id.values() - } - if not version_ids: - return output - - versions_by_id.update({ - version_entity["id"]: version_entity - for version_entity in ayon_api.get_versions( - project_name, version_ids=version_ids - ) - }) - - product_ids = { - version_entity["productId"] - for version_entity in versions_by_id.values() - } - if not product_ids: - return output - - products_by_id.update({ - product_entity["id"]: product_entity - for product_entity in ayon_api.get_products( - project_name, product_ids=product_ids - ) - }) - folder_ids = { - product_entity["folderId"] - for product_entity in products_by_id.values() - } - if not folder_ids: - return output - - folders_by_id.update({ - folder_entity["id"]: folder_entity - for folder_entity in ayon_api.get_folders( - project_name, folder_ids=folder_ids - ) - }) - return output + def _clear_items(self): + root_item = self.invisibleRootItem() + root_item.removeRows(0, root_item.rowCount()) class FilterProxyModel(QtCore.QSortFilterProxyModel): """Filter model to where key column's value is in the filtered tags""" def __init__(self, *args, **kwargs): - super(FilterProxyModel, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) + self.setDynamicSortFilter(True) + self.setFilterCaseSensitivity(QtCore.Qt.CaseInsensitive) self._filter_outdated = False self._hierarchy_view = False @@ -467,28 +372,23 @@ class FilterProxyModel(QtCore.QSortFilterProxyModel): # Always allow bottom entries (individual containers), since their # parent group hidden if it wouldn't have been validated. - rows = model.rowCount(source_index) - if not rows: + if source_index.data(IS_CONTAINER_ITEM_ROLE): return True - # Filter by regex - if hasattr(self, "filterRegExp"): - regex = self.filterRegExp() - else: - regex = self.filterRegularExpression() - pattern = regex.pattern() - if pattern: - pattern = re.escape(pattern) - - if not self._matches(row, parent, pattern): - return False - if self._filter_outdated: # When filtering to outdated we filter the up to date entries # thus we "allow" them when they are outdated - if not self._is_outdated(row, parent): + if source_index.data(VERSION_IS_LATEST_ROLE): return False + # Filter by regex + if hasattr(self, "filterRegularExpression"): + regex = self.filterRegularExpression() + else: + regex = self.filterRegExp() + + if not self._matches(row, parent, regex.pattern()): + return False return True def set_filter_outdated(self, state): @@ -505,37 +405,6 @@ class FilterProxyModel(QtCore.QSortFilterProxyModel): if state != self._hierarchy_view: self._hierarchy_view = state - def _is_outdated(self, row, parent): - """Return whether row is outdated. - - A row is considered outdated if `isOutdated` data is true or not set. - - """ - def outdated(node): - return node.get("isOutdated", True) - - index = self.sourceModel().index(row, self.filterKeyColumn(), parent) - - # The scene contents are grouped by "representation", e.g. the same - # "representation" loaded twice is grouped under the same header. - # Since the version check filters these parent groups we skip that - # check for the individual children. - has_parent = index.parent().isValid() - if has_parent and not self._hierarchy_view: - return True - - # Filter to those that have the different version numbers - node = index.internalPointer() - if outdated(node): - return True - - if self._hierarchy_view: - for _node in walk_hierarchy(node): - if outdated(_node): - return True - - return False - def _matches(self, row, parent, pattern): """Return whether row matches regex pattern. @@ -548,38 +417,31 @@ class FilterProxyModel(QtCore.QSortFilterProxyModel): bool """ + if not pattern: + return True + + flags = 0 + if self.sortCaseSensitivity() == QtCore.Qt.CaseInsensitive: + flags = re.IGNORECASE + + regex = re.compile(re.escape(pattern), flags=flags) + model = self.sourceModel() column = self.filterKeyColumn() role = self.filterRole() - def matches(row, parent, pattern): + matches_queue = collections.deque() + matches_queue.append((row, parent)) + while matches_queue: + queue_item = matches_queue.popleft() + row, parent = queue_item + index = model.index(row, column, parent) - key = model.data(index, role) - if re.search(pattern, key, re.IGNORECASE): + value = model.data(index, role) + if regex.search(value): return True - if matches(row, parent, pattern): - return True + for idx in range(model.rowCount(index)): + matches_queue.append((idx, index)) - # Also allow if any of the children matches - source_index = model.index(row, column, parent) - rows = model.rowCount(source_index) - - if any( - matches(idx, source_index, pattern) - for idx in range(rows) - ): - return True - - if not self._hierarchy_view: - return False - - for idx in range(rows): - child_index = model.index(idx, column, source_index) - child_rows = model.rowCount(child_index) - return any( - self._matches(child_idx, child_index, pattern) - for child_idx in range(child_rows) - ) - - return True + return False diff --git a/client/ayon_core/tools/sceneinventory/models/__init__.py b/client/ayon_core/tools/sceneinventory/models/__init__.py index f840a45aa8..28bc7be4d4 100644 --- a/client/ayon_core/tools/sceneinventory/models/__init__.py +++ b/client/ayon_core/tools/sceneinventory/models/__init__.py @@ -1,6 +1,8 @@ +from .containers import ContainersModel from .sitesync import SiteSyncModel __all__ = ( + "ContainersModel", "SiteSyncModel", ) diff --git a/client/ayon_core/tools/sceneinventory/models/containers.py b/client/ayon_core/tools/sceneinventory/models/containers.py new file mode 100644 index 0000000000..5230827ef6 --- /dev/null +++ b/client/ayon_core/tools/sceneinventory/models/containers.py @@ -0,0 +1,343 @@ +import uuid +import collections + +import ayon_api +from ayon_api.graphql import GraphQlQuery +from ayon_core.host import ILoadHost + + +# --- Implementation that should be in ayon-python-api --- +# The implementation is not available in all versions of ayon-python-api. +RepresentationHierarchy = collections.namedtuple( + "RepresentationHierarchy", + ("folder", "product", "version", "representation") +) + + +def representations_parent_ids_qraphql_query(): + query = GraphQlQuery("RepresentationsHierarchyQuery") + + project_name_var = query.add_variable("projectName", "String!") + repre_ids_var = query.add_variable("representationIds", "[String!]") + + project_field = query.add_field("project") + project_field.set_filter("name", project_name_var) + + repres_field = project_field.add_field_with_edges("representations") + repres_field.add_field("id") + repres_field.add_field("name") + repres_field.set_filter("ids", repre_ids_var) + version_field = repres_field.add_field("version") + version_field.add_field("id") + product_field = version_field.add_field("product") + product_field.add_field("id") + product_field.add_field("name") + product_field.add_field("productType") + product_attrib_field = product_field.add_field("attrib") + product_attrib_field.add_field("productGroup") + folder_field = product_field.add_field("folder") + folder_field.add_field("id") + folder_field.add_field("path") + return query + + +def get_representations_hierarchy(project_name, representation_ids): + """Find representations parents by representation id. + + Representation parent entities up to project. + + Args: + project_name (str): Project where to look for entities. + representation_ids (Iterable[str]): Representation ids. + + Returns: + dict[str, RepresentationParents]: Parent entities by + representation id. + + """ + if not representation_ids: + return {} + + repre_ids = set(representation_ids) + output = { + repre_id: RepresentationHierarchy(None, None, None, None) + for repre_id in representation_ids + } + + query = representations_parent_ids_qraphql_query() + query.set_variable_value("projectName", project_name) + query.set_variable_value("representationIds", list(repre_ids)) + + con = ayon_api.get_server_api_connection() + parsed_data = query.query(con) + for repre in parsed_data["project"]["representations"]: + repre_id = repre["id"] + version = repre.pop("version") + product = version.pop("product") + folder = product.pop("folder") + + output[repre_id] = RepresentationHierarchy( + folder, product, version, repre + ) + + return output +# --- END of ayon-python-api implementation --- + + +class ContainerItem: + def __init__( + self, + representation_id, + loader_name, + namespace, + name, + object_name, + item_id + ): + self.representation_id = representation_id + self.loader_name = loader_name + self.object_name = object_name + self.namespace = namespace + self.name = name + self.item_id = item_id + + @classmethod + def from_container_data(cls, container): + return cls( + representation_id=container["representation"], + loader_name=container["loader"], + namespace=container["namespace"], + name=container["name"], + object_name=container["objectName"], + item_id=uuid.uuid4().hex, + ) + + +class RepresentationInfo: + def __init__( + self, + folder_id, + folder_path, + product_id, + product_name, + product_type, + product_group, + version_id, + representation_name, + ): + self.folder_id = folder_id + self.folder_path = folder_path + self.product_id = product_id + self.product_name = product_name + self.product_type = product_type + self.product_group = product_group + self.version_id = version_id + self.representation_name = representation_name + self._is_valid = None + + @property + def is_valid(self): + if self._is_valid is None: + self._is_valid = ( + self.folder_id is not None + and self.product_id is not None + and self.version_id is not None + and self.representation_name is not None + ) + return self._is_valid + + @classmethod + def new_invalid(cls): + return cls(None, None, None, None, None, None, None, None) + + +class VersionItem: + def __init__(self, version_id, product_id, version, status, is_latest): + self.version = version + self.version_id = version_id + self.product_id = product_id + self.version = version + self.status = status + self.is_latest = is_latest + + @property + def is_hero(self): + return self.version < 0 + + @classmethod + def from_entity(cls, version_entity, is_latest): + return cls( + version_id=version_entity["id"], + product_id=version_entity["productId"], + version=version_entity["version"], + status=version_entity["status"], + is_latest=is_latest, + ) + + +class ContainersModel: + def __init__(self, controller): + self._controller = controller + self._items_cache = None + self._containers_by_id = {} + self._container_items_by_id = {} + self._version_items_by_product_id = {} + self._repre_info_by_id = {} + + def reset(self): + self._items_cache = None + self._containers_by_id = {} + self._container_items_by_id = {} + self._version_items_by_product_id = {} + self._repre_info_by_id = {} + + def get_containers(self): + self._update_cache() + return list(self._containers_by_id.values()) + + def get_containers_by_item_ids(self, item_ids): + return { + item_id: self._containers_by_id.get(item_id) + for item_id in item_ids + } + + def get_container_items(self): + self._update_cache() + return list(self._items_cache) + + def get_container_items_by_id(self, item_ids): + return { + item_id: self._container_items_by_id.get(item_id) + for item_id in item_ids + } + + def get_representation_info_items(self, representation_ids): + output = {} + missing_repre_ids = set() + for repre_id in representation_ids: + try: + uuid.UUID(repre_id) + except ValueError: + output[repre_id] = RepresentationInfo.new_invalid() + continue + + repre_info = self._repre_info_by_id.get(repre_id) + if repre_info is None: + missing_repre_ids.add(repre_id) + else: + output[repre_id] = repre_info + + if not missing_repre_ids: + return output + + project_name = self._controller.get_current_project_name() + repre_hierarchy_by_id = get_representations_hierarchy( + project_name, missing_repre_ids + ) + for repre_id, repre_hierarchy in repre_hierarchy_by_id.items(): + kwargs = { + "folder_id": None, + "folder_path": None, + "product_id": None, + "product_name": None, + "product_type": None, + "product_group": None, + "version_id": None, + "representation_name": None, + } + folder = repre_hierarchy.folder + product = repre_hierarchy.product + version = repre_hierarchy.version + repre = repre_hierarchy.representation + if folder: + kwargs["folder_id"] = folder["id"] + kwargs["folder_path"] = folder["path"] + if product: + group = product["attrib"]["productGroup"] + kwargs["product_id"] = product["id"] + kwargs["product_name"] = product["name"] + kwargs["product_type"] = product["productType"] + kwargs["product_group"] = group + if version: + kwargs["version_id"] = version["id"] + if repre: + kwargs["representation_name"] = repre["name"] + + repre_info = RepresentationInfo(**kwargs) + self._repre_info_by_id[repre_id] = repre_info + output[repre_id] = repre_info + return output + + def get_version_items(self, product_ids): + if not product_ids: + return {} + + missing_ids = { + product_id + for product_id in product_ids + if product_id not in self._version_items_by_product_id + } + if missing_ids: + def version_sorted(entity): + return entity["version"] + + project_name = self._controller.get_current_project_name() + version_entities_by_product_id = { + product_id: [] + for product_id in missing_ids + } + + version_entities = list(ayon_api.get_versions( + project_name, + product_ids=missing_ids, + fields={"id", "version", "productId", "status"} + )) + version_entities.sort(key=version_sorted) + for version_entity in version_entities: + product_id = version_entity["productId"] + version_entities_by_product_id[product_id].append( + version_entity + ) + + for product_id, version_entities in ( + version_entities_by_product_id.items() + ): + last_version = abs(version_entities[-1]["version"]) + version_items_by_id = { + entity["id"]: VersionItem.from_entity( + entity, abs(entity["version"]) == last_version + ) + for entity in version_entities + } + self._version_items_by_product_id[product_id] = ( + version_items_by_id + ) + + return { + product_id: dict(self._version_items_by_product_id[product_id]) + for product_id in product_ids + } + + def _update_cache(self): + if self._items_cache is not None: + return + + host = self._controller.get_host() + if isinstance(host, ILoadHost): + containers = list(host.get_containers()) + elif hasattr(host, "ls"): + containers = list(host.ls()) + else: + containers = [] + container_items = [] + containers_by_id = {} + container_items_by_id = {} + for container in containers: + item = ContainerItem.from_container_data(container) + containers_by_id[item.item_id] = container + container_items_by_id[item.item_id] = item + container_items.append(item) + + self._containers_by_id = containers_by_id + self._container_items_by_id = container_items_by_id + self._items_cache = container_items diff --git a/client/ayon_core/tools/sceneinventory/select_version_dialog.py b/client/ayon_core/tools/sceneinventory/select_version_dialog.py new file mode 100644 index 0000000000..1945d71a6d --- /dev/null +++ b/client/ayon_core/tools/sceneinventory/select_version_dialog.py @@ -0,0 +1,216 @@ +import uuid + +from qtpy import QtWidgets, QtCore, QtGui + +from ayon_core.tools.utils.delegates import StatusDelegate + +from .model import ( + ITEM_ID_ROLE, + STATUS_NAME_ROLE, + STATUS_SHORT_ROLE, + STATUS_COLOR_ROLE, + STATUS_ICON_ROLE, +) + + +class VersionOption: + def __init__( + self, + version, + label, + status_name, + status_short, + status_color + ): + self.version = version + self.label = label + self.status_name = status_name + self.status_short = status_short + self.status_color = status_color + + +class SelectVersionModel(QtGui.QStandardItemModel): + def data(self, index, role=None): + if role is None: + role = QtCore.Qt.DisplayRole + + index = self.index(index.row(), 0, index.parent()) + return super().data(index, role) + + +class SelectVersionComboBox(QtWidgets.QComboBox): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + combo_model = SelectVersionModel(0, 2) + + self.setModel(combo_model) + + combo_view = QtWidgets.QTreeView(self) + combo_view.setHeaderHidden(True) + combo_view.setIndentation(0) + + self.setView(combo_view) + + header = combo_view.header() + header.setSectionResizeMode(0, QtWidgets.QHeaderView.ResizeToContents) + header.setSectionResizeMode(1, QtWidgets.QHeaderView.Stretch) + + status_delegate = StatusDelegate( + STATUS_NAME_ROLE, + STATUS_SHORT_ROLE, + STATUS_COLOR_ROLE, + STATUS_ICON_ROLE, + ) + combo_view.setItemDelegateForColumn(1, status_delegate) + + self._combo_model = combo_model + self._combo_view = combo_view + self._status_delegate = status_delegate + self._items_by_id = {} + + def paintEvent(self, event): + painter = QtWidgets.QStylePainter(self) + option = QtWidgets.QStyleOptionComboBox() + self.initStyleOption(option) + painter.drawComplexControl(QtWidgets.QStyle.CC_ComboBox, option) + idx = self.currentIndex() + status_name = self.itemData(idx, STATUS_NAME_ROLE) + if status_name is None: + painter.drawControl(QtWidgets.QStyle.CE_ComboBoxLabel, option) + return + + painter.save() + text_field_rect = self.style().subControlRect( + QtWidgets.QStyle.CC_ComboBox, + option, + QtWidgets.QStyle.SC_ComboBoxEditField + ) + adj_rect = text_field_rect.adjusted(1, 0, -1, 0) + painter.drawText( + adj_rect, + QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter, + option.currentText + ) + metrics = QtGui.QFontMetrics(self.font()) + text_width = metrics.width(option.currentText) + x_offset = text_width + 2 + diff_width = adj_rect.width() - x_offset + if diff_width <= 0: + return + + status_rect = adj_rect.adjusted(x_offset + 2, 0, 0, 0) + if diff_width < metrics.width(status_name): + status_name = self.itemData(idx, STATUS_SHORT_ROLE) + + color = QtGui.QColor(self.itemData(idx, STATUS_COLOR_ROLE)) + + pen = painter.pen() + pen.setColor(color) + painter.setPen(pen) + painter.drawText( + status_rect, + QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter, + status_name + ) + + def set_current_index(self, index): + model = self._combo_view.model() + if index > model.rowCount(): + return + + self.setCurrentIndex(index) + + def get_item_by_id(self, item_id): + return self._items_by_id[item_id] + + def set_versions(self, version_options): + self._items_by_id = {} + model = self._combo_model + root_item = model.invisibleRootItem() + root_item.removeRows(0, root_item.rowCount()) + + new_items = [] + for version_option in version_options: + item_id = uuid.uuid4().hex + item = QtGui.QStandardItem(version_option.label) + item.setColumnCount(root_item.columnCount()) + item.setData( + version_option.status_name, STATUS_NAME_ROLE + ) + item.setData( + version_option.status_short, STATUS_SHORT_ROLE + ) + item.setData( + version_option.status_color, STATUS_COLOR_ROLE + ) + item.setData(item_id, ITEM_ID_ROLE) + + new_items.append(item) + self._items_by_id[item_id] = version_option + + if new_items: + root_item.appendRows(new_items) + + +class SelectVersionDialog(QtWidgets.QDialog): + def __init__(self, parent=None): + super().__init__(parent=parent) + + self.setWindowTitle("Select version") + + label_widget = QtWidgets.QLabel("Set version number to", self) + versions_combobox = SelectVersionComboBox(self) + + btns_widget = QtWidgets.QWidget(self) + + confirm_btn = QtWidgets.QPushButton("OK", btns_widget) + cancel_btn = QtWidgets.QPushButton("Cancel", btns_widget) + + btns_layout = QtWidgets.QHBoxLayout(btns_widget) + btns_layout.setContentsMargins(0, 0, 0, 0) + btns_layout.addStretch(1) + btns_layout.addWidget(confirm_btn, 0) + btns_layout.addWidget(cancel_btn, 0) + + main_layout = QtWidgets.QVBoxLayout(self) + main_layout.addWidget(label_widget, 0) + main_layout.addWidget(versions_combobox, 0) + main_layout.addWidget(btns_widget, 0) + + confirm_btn.clicked.connect(self._on_confirm) + cancel_btn.clicked.connect(self._on_cancel) + + self._selected_item = None + self._cancelled = False + self._versions_combobox = versions_combobox + + def get_selected_item(self): + if self._cancelled: + return None + return self._selected_item + + def set_versions(self, version_options): + self._versions_combobox.set_versions(version_options) + + def select_index(self, index): + self._versions_combobox.set_current_index(index) + + @classmethod + def ask_for_version(cls, version_options, index=None, parent=None): + dialog = cls(parent) + dialog.set_versions(version_options) + if index is not None: + dialog.select_index(index) + dialog.exec_() + return dialog.get_selected_item() + + def _on_confirm(self): + self._cancelled = False + index = self._versions_combobox.currentIndex() + item_id = self._versions_combobox.itemData(index, ITEM_ID_ROLE) + self._selected_item = self._versions_combobox.get_item_by_id(item_id) + self.accept() + + def _on_cancel(self): + self._cancelled = True + self.reject() diff --git a/client/ayon_core/tools/sceneinventory/view.py b/client/ayon_core/tools/sceneinventory/view.py index 5cbd4daf70..770d0d903d 100644 --- a/client/ayon_core/tools/sceneinventory/view.py +++ b/client/ayon_core/tools/sceneinventory/view.py @@ -1,10 +1,7 @@ -import uuid import collections import logging -import itertools from functools import partial -import ayon_api from qtpy import QtWidgets, QtCore import qtawesome @@ -17,12 +14,27 @@ from ayon_core.pipeline import ( ) from ayon_core.tools.utils.lib import ( iter_model_rows, - format_version + format_version, + preserve_expanded_rows, + preserve_selection, ) +from ayon_core.tools.utils.delegates import StatusDelegate from .switch_dialog import SwitchAssetDialog -from .model import InventoryModel - +from .model import ( + InventoryModel, + FilterProxyModel, + ITEM_UNIQUE_NAME_ROLE, + OBJECT_NAME_ROLE, + ITEM_ID_ROLE, + IS_CONTAINER_ITEM_ROLE, + STATUS_NAME_ROLE, + STATUS_SHORT_ROLE, + STATUS_COLOR_ROLE, + STATUS_ICON_ROLE, +) +from .delegates import VersionDelegate +from .select_version_dialog import SelectVersionDialog, VersionOption DEFAULT_COLOR = "#fb9c15" @@ -43,185 +55,199 @@ class SceneInventoryView(QtWidgets.QTreeView): self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) + model = InventoryModel(controller) + proxy_model = FilterProxyModel() + proxy_model.setSourceModel(model) + proxy_model.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive) + + self.setModel(proxy_model) + + version_delegate = VersionDelegate() + status_delegate = StatusDelegate( + STATUS_NAME_ROLE, + STATUS_SHORT_ROLE, + STATUS_COLOR_ROLE, + STATUS_ICON_ROLE, + ) + for col, delegate in ( + (model.version_col, version_delegate), + (model.status_col, status_delegate), + ): + self.setItemDelegateForColumn(col, delegate) + + # set some nice default widths for the view + for col, width in model.width_by_column.items(): + self.setColumnWidth(col, width) + + sync_enabled = controller.is_sitesync_enabled() + self.setColumnHidden(model.active_site_col, not sync_enabled) + self.setColumnHidden(model.remote_site_col, not sync_enabled) + self.customContextMenuRequested.connect(self._show_right_mouse_menu) + self._model = model + self._proxy_model = proxy_model + self._version_delegate = version_delegate + self._status_delegate = status_delegate + self._hierarchy_view = False self._selected = None self._controller = controller + def refresh(self): + with preserve_expanded_rows( + tree_view=self, + role=ITEM_UNIQUE_NAME_ROLE + ): + with preserve_selection( + tree_view=self, + role=ITEM_UNIQUE_NAME_ROLE, + current_index=False + ): + kwargs = {} + # TODO do not touch view's inner attribute + if self._hierarchy_view: + kwargs["selected"] = self._selected + self._model.refresh(**kwargs) + + def set_hierarchy_view(self, enabled): + self._proxy_model.set_hierarchy_view(enabled) + self._model.set_hierarchy_view(enabled) + + def set_text_filter(self, text_filter): + if hasattr(self._proxy_model, "setFilterRegularExpression"): + self._proxy_model.setFilterRegularExpression(text_filter) + else: + self._proxy_model.setFilterRegExp(text_filter) + + def set_filter_outdated(self, enabled): + self._proxy_model.set_filter_outdated(enabled) + + def get_selected_indexes(self): + """Get the selected rows""" + indexes, _ = self._get_selected_indexes() + return indexes + + def get_selected_item_ids(self): + return self._get_item_ids_from_indexes( + self.get_selected_indexes() + ) + + def get_selected_container_indexes(self): + return self._get_container_indexes( + self.get_selected_indexes() + ) + + def _get_selected_indexes(self): + selection_model = self.selectionModel() + indexes = selection_model.selectedRows() + active = self.currentIndex() + active = active.sibling(active.row(), 0) + if active not in indexes: + indexes.append(active) + return indexes, active + + def _get_item_ids_from_indexes(self, indexes): + return { + index.data(ITEM_ID_ROLE) + for index in self._get_container_indexes(indexes) + } + def _set_hierarchy_view(self, enabled): if enabled == self._hierarchy_view: return self._hierarchy_view = enabled self.hierarchy_view_changed.emit(enabled) - def _enter_hierarchy(self, items): - self._selected = set(i["objectName"] for i in items) + def _enter_hierarchy(self, item_ids): + self._selected = set(item_ids) self._set_hierarchy_view(True) self.data_changed.emit() self.expandToDepth(1) - self.setStyleSheet(""" - QTreeView { - border-color: #fb9c15; - } - """) + self.setStyleSheet("border-color: #fb9c15;") def _leave_hierarchy(self): self._set_hierarchy_view(False) self.data_changed.emit() - self.setStyleSheet("QTreeView {}") + self.setStyleSheet("") - def _build_item_menu_for_selection(self, items, menu): - # Exclude items that are "NOT FOUND" since setting versions, updating - # and removal won't work for those items. - items = [item for item in items if not item.get("isNotFound")] - if not items: + def _build_item_menu_for_selection(self, menu, indexes, active_index): + item_ids = { + index.data(ITEM_ID_ROLE) + for index in indexes + } + item_ids.discard(None) + if not item_ids: return - # An item might not have a representation, for example when an item - # is listed as "NOT FOUND" - repre_ids = set() - for item in items: - repre_id = item["representation"] - try: - uuid.UUID(repre_id) - repre_ids.add(repre_id) - except ValueError: - pass - - project_name = self._controller.get_current_project_name() - repre_entities = ayon_api.get_representations( - project_name, - representation_ids=repre_ids, - fields={"versionId"} + container_items_by_id = self._controller.get_container_items_by_id( + item_ids ) - version_ids = { - repre_entity["versionId"] - for repre_entity in repre_entities + active_repre_id = None + if active_index is not None: + for index in self._get_container_indexes({active_index}): + item_id = index.data(ITEM_ID_ROLE) + container_item = container_items_by_id[item_id] + active_repre_id = container_item.representation_id + break + + repre_info_by_id = self._controller.get_representation_info_items({ + container_item.representation_id + for container_item in container_items_by_id.values() + }) + valid_repre_ids = { + repre_id + for repre_id, repre_info in repre_info_by_id.items() + if repre_info.is_valid } - loaded_versions = ayon_api.get_versions( - project_name, version_ids=version_ids - ) - - loaded_hero_versions = [] - versions_by_product_id = collections.defaultdict(list) + # Exclude items that are "NOT FOUND" since setting versions, updating + # and removal won't work for those items. + filtered_items = [] product_ids = set() - for version_entity in loaded_versions: - version = version_entity["version"] - if version < 0: - loaded_hero_versions.append(version_entity) - else: - product_id = version_entity["productId"] - versions_by_product_id[product_id].append(version_entity) - product_ids.add(product_id) + version_ids = set() + for container_item in container_items_by_id.values(): + repre_id = container_item.representation_id + repre_info = repre_info_by_id.get(repre_id) + if repre_info and repre_info.is_valid: + filtered_items.append(container_item) + version_ids.add(repre_info.version_id) + product_ids.add(repre_info.product_id) - all_versions = ayon_api.get_versions( - project_name, product_ids=product_ids + # remove + remove_icon = qtawesome.icon("fa.remove", color=DEFAULT_COLOR) + remove_action = QtWidgets.QAction(remove_icon, "Remove items", menu) + remove_action.triggered.connect( + lambda: self._show_remove_warning_dialog(item_ids)) + + if not filtered_items: + # Keep remove action for invalid items + menu.addAction(remove_action) + return + + version_items_by_product_id = self._controller.get_version_items( + product_ids ) - hero_versions = [] - version_entities = [] - for version_entity in all_versions: - version = version_entity["version"] - if version < 0: - hero_versions.append(version_entity) - else: - version_entities.append(version_entity) - - has_loaded_hero_versions = len(loaded_hero_versions) > 0 - has_available_hero_version = len(hero_versions) > 0 has_outdated = False + has_loaded_hero_versions = False + has_available_hero_version = False + for version_items_by_id in version_items_by_product_id.values(): + for version_item in version_items_by_id.values(): + if version_item.is_hero: + has_available_hero_version = True - for version_entity in version_entities: - product_id = version_entity["productId"] - current_versions = versions_by_product_id[product_id] - for current_version in current_versions: - if current_version["version"] < version_entity["version"]: + if version_item.version_id not in version_ids: + continue + if version_item.is_hero: + has_loaded_hero_versions = True + + elif not version_item.is_latest: has_outdated = True - break - - if has_outdated: - break switch_to_versioned = None if has_loaded_hero_versions: - def _on_switch_to_versioned(items): - repre_ids = { - item["representation"] - for item in items - } - - repre_entities = ayon_api.get_representations( - project_name, - representation_ids=repre_ids, - fields={"id", "versionId"} - ) - - version_id_by_repre_id = {} - for repre_entity in repre_entities: - repre_id = repre_entity["id"] - version_id = repre_entity["versionId"] - version_id_by_repre_id[repre_id] = version_id - version_ids = set(version_id_by_repre_id.values()) - - src_version_entity_by_id = { - version_entity["id"]: version_entity - for version_entity in ayon_api.get_versions( - project_name, - version_ids, - fields={"productId", "version"} - ) - } - hero_versions_by_product_id = {} - for version_entity in src_version_entity_by_id.values(): - version = version_entity["version"] - if version < 0: - product_id = version_entity["productId"] - hero_versions_by_product_id[product_id] = abs(version) - - if not hero_versions_by_product_id: - return - - standard_versions = ayon_api.get_versions( - project_name, - product_ids=hero_versions_by_product_id.keys(), - versions=hero_versions_by_product_id.values() - ) - standard_version_by_product_id = { - product_id: {} - for product_id in hero_versions_by_product_id.keys() - } - for version_entity in standard_versions: - product_id = version_entity["productId"] - version = version_entity["version"] - standard_version_by_product_id[product_id][version] = ( - version_entity - ) - - # Specify version per item to update to - update_items = [] - update_versions = [] - for item in items: - repre_id = item["representation"] - version_id = version_id_by_repre_id.get(repre_id) - version_entity = src_version_entity_by_id.get(version_id) - if not version_entity or version_entity["version"] >= 0: - continue - product_id = version_entity["productId"] - version_entities_by_version = ( - standard_version_by_product_id[product_id] - ) - new_version = hero_versions_by_product_id.get(product_id) - new_version_entity = version_entities_by_version.get( - new_version - ) - if new_version_entity is not None: - update_items.append(item) - update_versions.append(new_version) - self._update_containers(update_items, update_versions) - update_icon = qtawesome.icon( "fa.asterisk", color=DEFAULT_COLOR @@ -232,7 +258,7 @@ class SceneInventoryView(QtWidgets.QTreeView): menu ) switch_to_versioned.triggered.connect( - lambda: _on_switch_to_versioned(items) + lambda: self._on_switch_to_versioned(item_ids) ) update_to_latest_action = None @@ -247,7 +273,9 @@ class SceneInventoryView(QtWidgets.QTreeView): menu ) update_to_latest_action.triggered.connect( - lambda: self._update_containers(items, version=-1) + lambda: self._update_containers_to_version( + item_ids, version=-1 + ) ) change_to_hero = None @@ -263,20 +291,23 @@ class SceneInventoryView(QtWidgets.QTreeView): menu ) change_to_hero.triggered.connect( - lambda: self._update_containers( - items, version=HeroVersionType(-1) + lambda: self._update_containers_to_version( + item_ids, version=HeroVersionType(-1) ) ) # set version - set_version_icon = qtawesome.icon("fa.hashtag", color=DEFAULT_COLOR) - set_version_action = QtWidgets.QAction( - set_version_icon, - "Set version", - menu - ) - set_version_action.triggered.connect( - lambda: self._show_version_dialog(items)) + set_version_action = None + if active_repre_id is not None: + set_version_icon = qtawesome.icon("fa.hashtag", color=DEFAULT_COLOR) + set_version_action = QtWidgets.QAction( + set_version_icon, + "Set version", + menu + ) + set_version_action.triggered.connect( + lambda: self._show_version_dialog(item_ids, active_repre_id) + ) # switch folder switch_folder_icon = qtawesome.icon("fa.sitemap", color=DEFAULT_COLOR) @@ -286,13 +317,7 @@ class SceneInventoryView(QtWidgets.QTreeView): menu ) switch_folder_action.triggered.connect( - lambda: self._show_switch_dialog(items)) - - # remove - remove_icon = qtawesome.icon("fa.remove", color=DEFAULT_COLOR) - remove_action = QtWidgets.QAction(remove_icon, "Remove items", menu) - remove_action.triggered.connect( - lambda: self._show_remove_warning_dialog(items)) + lambda: self._show_switch_dialog(item_ids)) # add the actions if switch_to_versioned: @@ -304,14 +329,15 @@ class SceneInventoryView(QtWidgets.QTreeView): if change_to_hero: menu.addAction(change_to_hero) - menu.addAction(set_version_action) + if set_version_action is not None: + menu.addAction(set_version_action) menu.addAction(switch_folder_action) menu.addSeparator() menu.addAction(remove_action) - self._handle_sitesync(menu, repre_ids) + self._handle_sitesync(menu, valid_repre_ids) def _handle_sitesync(self, menu, repre_ids): """Adds actions for download/upload when SyncServer is enabled @@ -327,6 +353,9 @@ class SceneInventoryView(QtWidgets.QTreeView): if not self._controller.is_sitesync_enabled(): return + if not repre_ids: + return + menu.addSeparator() download_icon = qtawesome.icon("fa.download", color=DEFAULT_COLOR) @@ -365,30 +394,35 @@ class SceneInventoryView(QtWidgets.QTreeView): self.data_changed.emit() - def _build_item_menu(self, items=None): + def _build_item_menu(self, indexes=None, active_index=None): """Create menu for the selected items""" - - if not items: - items = [] - menu = QtWidgets.QMenu(self) - # add the actions - self._build_item_menu_for_selection(items, menu) - # These two actions should be able to work without selection # expand all items - expandall_action = QtWidgets.QAction(menu, text="Expand all items") - expandall_action.triggered.connect(self.expandAll) + expand_all_action = QtWidgets.QAction(menu, text="Expand all items") + expand_all_action.triggered.connect(self.expandAll) # collapse all items collapse_action = QtWidgets.QAction(menu, text="Collapse all items") collapse_action.triggered.connect(self.collapseAll) - menu.addAction(expandall_action) + if not indexes: + indexes = [] + + item_ids = { + index.data(ITEM_ID_ROLE) + for index in indexes + } + item_ids.discard(None) + + # add the actions + self._build_item_menu_for_selection(menu, indexes, active_index) + + menu.addAction(expand_all_action) menu.addAction(collapse_action) - custom_actions = self._get_custom_actions(containers=items) + custom_actions = self._get_custom_actions(item_ids) if custom_actions: submenu = QtWidgets.QMenu("Actions", self) for action in custom_actions: @@ -396,7 +430,10 @@ class SceneInventoryView(QtWidgets.QTreeView): icon = qtawesome.icon("fa.%s" % action.icon, color=color) action_item = QtWidgets.QAction(icon, action.label, submenu) action_item.triggered.connect( - partial(self._process_custom_action, action, items)) + partial( + self._process_custom_action, action, item_ids + ) + ) submenu.addAction(action_item) @@ -421,9 +458,9 @@ class SceneInventoryView(QtWidgets.QTreeView): menu ) enter_hierarchy_action.triggered.connect( - lambda: self._enter_hierarchy(items)) + lambda: self._enter_hierarchy(item_ids)) - if items: + if indexes: menu.addAction(enter_hierarchy_action) if back_to_flat_action is not None: @@ -431,11 +468,11 @@ class SceneInventoryView(QtWidgets.QTreeView): return menu - def _get_custom_actions(self, containers): + def _get_custom_actions(self, item_ids): """Get the registered Inventory Actions Args: - containers(list): collection of containers + item_ids (Iterable[str]): collection of containers Returns: list: collection of filter and initialized actions @@ -448,29 +485,40 @@ class SceneInventoryView(QtWidgets.QTreeView): # Fedd an empty dict if no selection, this will ensure the compat # lookup always work, so plugin can interact with Scene Inventory # reversely. - containers = containers or [dict()] + if not item_ids: + containers = [dict()] + else: + containers_by_id = self._controller.get_containers_by_item_ids( + item_ids + ) + containers = list(containers_by_id.values()) # Check which action will be available in the menu Plugins = discover_inventory_actions() - compatible = [p() for p in Plugins if - any(p.is_compatible(c) for c in containers)] + compatible = [ + p() + for p in Plugins + if any(p.is_compatible(c) for c in containers) + ] return sorted(compatible, key=sorter) - def _process_custom_action(self, action, containers): + def _process_custom_action(self, action, item_ids): """Run action and if results are returned positive update the view If the result is list or dict, will select view items by the result. Args: action (InventoryAction): Inventory Action instance - containers (list): Data of currently selected items + item_ids (Iterable[str]): Data of currently selected items Returns: None """ - - result = action.process(containers) + containers_by_id = self._controller.get_containers_by_item_ids( + item_ids + ) + result = action.process(list(containers_by_id.values())) if result: self.data_changed.emit() @@ -498,17 +546,24 @@ class SceneInventoryView(QtWidgets.QTreeView): if options.get("clear", True): self.clearSelection() - object_names = set(object_names) - if ( - self._hierarchy_view - and not self._selected.issuperset(object_names) - ): - # If any container not in current cherry-picked view, update - # view before selecting them. - self._selected.update(object_names) - self.data_changed.emit() - model = self.model() + object_names = set(object_names) + if self._hierarchy_view: + item_ids = set() + for index in iter_model_rows(model): + if not index.data(IS_CONTAINER_ITEM_ROLE): + continue + if index.data(OBJECT_NAME_ROLE) in object_names: + item_id = index.data(ITEM_ID_ROLE) + if item_id: + item_ids.add(item_id) + + if not self._selected.issuperset(item_ids): + # If any container not in current cherry-picked view, update + # view before selecting them. + self._selected.update(item_ids) + self.data_changed.emit() + selection_model = self.selectionModel() select_mode = { @@ -517,12 +572,10 @@ class SceneInventoryView(QtWidgets.QTreeView): "toggle": QtCore.QItemSelectionModel.Toggle, }[options.get("mode", "select")] - for index in iter_model_rows(model, 0): - item = index.data(InventoryModel.ItemRole) - if item.get("isGroupNode"): + for index in iter_model_rows(model): + if not index.data(IS_CONTAINER_ITEM_ROLE): continue - - name = item.get("objectName") + name = index.data(OBJECT_NAME_ROLE) if name in object_names: self.scrollTo(index) # Ensure item is visible flags = select_mode | QtCore.QItemSelectionModel.Rows @@ -539,177 +592,194 @@ class SceneInventoryView(QtWidgets.QTreeView): globalpos = self.viewport().mapToGlobal(pos) if not self.selectionModel().hasSelection(): - print("No selection") # Build menu without selection, feed an empty list menu = self._build_item_menu() menu.exec_(globalpos) return - active = self.currentIndex() # index under mouse - active = active.sibling(active.row(), 0) # get first column - - # move index under mouse - indices = self.get_indices() - if active in indices: - indices.remove(active) - - indices.append(active) + indexes, active_index = self._get_selected_indexes() # Extend to the sub-items - all_indices = self._extend_to_children(indices) - items = [dict(i.data(InventoryModel.ItemRole)) for i in all_indices - if i.parent().isValid()] + all_indexes = self._extend_to_children(indexes) - if self._hierarchy_view: - # Ensure no group item - items = [n for n in items if not n.get("isGroupNode")] - - menu = self._build_item_menu(items) + menu = self._build_item_menu(all_indexes, active_index) menu.exec_(globalpos) - def get_indices(self): - """Get the selected rows""" - selection_model = self.selectionModel() - return selection_model.selectedRows() + def _get_container_indexes(self, indexes): + container_indexes = [] + indexes_queue = collections.deque() + indexes_queue.extend(indexes) + # Ignore already added containers + items_ids = set() + while indexes_queue: + index = indexes_queue.popleft() + if index.data(IS_CONTAINER_ITEM_ROLE): + item_id = index.data(ITEM_ID_ROLE) + if item_id in items_ids: + continue + items_ids.add(item_id) + container_indexes.append(index) + continue + model = index.model() + for row in range(model.rowCount(index)): + child = model.index(row, 0, parent=index) + indexes_queue.append(child) + return container_indexes - def _extend_to_children(self, indices): + def _extend_to_children(self, indexes): """Extend the indices to the children indices. Top-level indices are extended to its children indices. Sub-items are kept as is. Args: - indices (list): The indices to extend. + indexes (list): The indices to extend. Returns: list: The children indices """ - def get_children(i): - model = i.model() - rows = model.rowCount(parent=i) - for row in range(rows): - child = model.index(row, 0, parent=i) - yield child + def get_children(index): + model = index.model() + for row in range(model.rowCount(index)): + yield model.index(row, 0, parent=index) subitems = set() - for i in indices: - valid_parent = i.parent().isValid() - if valid_parent and i not in subitems: - subitems.add(i) + for index in indexes: + if index.parent().isValid() and index not in subitems: + subitems.add(index) if self._hierarchy_view: # Assume this is a group item - for child in get_children(i): + for child in get_children(index): subitems.add(child) else: # is top level item - for child in get_children(i): + for child in get_children(index): subitems.add(child) return list(subitems) - def _show_version_dialog(self, items): + def _show_version_dialog(self, item_ids, active_repre_id): """Create a dialog with the available versions for the selected file Args: - items (list): list of items to run the "set_version" for + item_ids (Iterable[str]): List of item ids to run the + "set_version" for. + active_repre_id (Union[str, None]): Active representation id. Returns: None + """ - - active = items[-1] - - project_name = self._controller.get_current_project_name() - # Get available versions for active representation - repre_entity = ayon_api.get_representation_by_id( - project_name, - active["representation"], - fields={"versionId"} + container_items_by_id = self._controller.get_container_items_by_id( + item_ids + ) + repre_ids = { + container_item.representation_id + for container_item in container_items_by_id.values() + } + repre_info_by_id = self._controller.get_representation_info_items( + repre_ids ) - repre_version_entity = ayon_api.get_version_by_id( - project_name, - repre_entity["versionId"], - fields={"productId"} + active_repre_info = repre_info_by_id[active_repre_id] + active_product_id = active_repre_info.product_id + active_version_id = active_repre_info.version_id + filtered_repre_info_by_id = { + repre_id: repre_info + for repre_id, repre_info in repre_info_by_id.items() + if repre_info.product_id == active_product_id + } + filtered_container_item_ids = { + item_id + for item_id, container_item in container_items_by_id.items() + if container_item.representation_id in filtered_repre_info_by_id + } + version_items_by_id = self._controller.get_version_items( + {active_product_id} + )[active_product_id] + + def version_sorter(item): + hero_value = 0 + version = item.version + if version < 0: + hero_value = 1 + version = abs(version) + return version, hero_value + + version_items = list(version_items_by_id.values()) + version_items.sort(key=version_sorter, reverse=True) + status_items_by_name = { + status_item.name: status_item + for status_item in self._controller.get_project_status_items() + } + + version_options = [] + active_version_idx = 0 + for idx, version_item in enumerate(version_items): + version = version_item.version + label = format_version(version) + if version_item.version_id == active_version_id: + active_version_idx = idx + + status_name = version_item.status + status_short = None + status_color = None + status_item = status_items_by_name.get(status_name) + if status_item: + status_short = status_item.short + status_color = status_item.color + version_options.append( + VersionOption( + version, + label, + status_name, + status_short, + status_color, + ) + ) + + version_option = SelectVersionDialog.ask_for_version( + version_options, + active_version_idx, + parent=self ) - - version_entities = list(ayon_api.get_versions( - project_name, - product_ids={repre_version_entity["productId"]}, - )) - hero_version = None - standard_versions = [] - for version_entity in version_entities: - if version_entity["version"] < 0: - hero_version = version_entity - else: - standard_versions.append(version_entity) - standard_versions.sort(key=lambda item: item["version"]) - standard_versions.reverse() - - # Get index among the listed versions - current_item = None - current_version = active["version"] - if isinstance(current_version, HeroVersionType): - current_item = hero_version - else: - for version_entity in standard_versions: - if version_entity["version"] == current_version: - current_item = version_entity - break - - all_versions = [] - if hero_version: - all_versions.append(hero_version) - all_versions.extend(standard_versions) - - if current_item: - index = all_versions.index(current_item) - else: - index = 0 - - versions_by_label = dict() - labels = [] - for version_entity in all_versions: - label = format_version(version_entity["version"]) - labels.append(label) - versions_by_label[label] = version_entity["version"] - - label, state = QtWidgets.QInputDialog.getItem( - self, - "Set version..", - "Set version number to", - labels, - current=index, - editable=False - ) - if not state: + if version_option is None: return - if label: - version = versions_by_label[label] - if version < 0: - version = HeroVersionType(version) - self._update_containers(items, version) + version = version_option.version + if version < 0: + version = HeroVersionType(version) - def _show_switch_dialog(self, items): + self._update_containers_to_version( + filtered_container_item_ids, version + ) + + def _show_switch_dialog(self, item_ids): """Display Switch dialog""" - dialog = SwitchAssetDialog(self._controller, self, items) + containers_by_id = self._controller.get_containers_by_item_ids( + item_ids + ) + dialog = SwitchAssetDialog( + self._controller, self, list(containers_by_id.values()) + ) dialog.switched.connect(self.data_changed.emit) dialog.show() - def _show_remove_warning_dialog(self, items): + def _show_remove_warning_dialog(self, item_ids): """Prompt a dialog to inform the user the action will remove items""" - + containers_by_id = self._controller.get_containers_by_item_ids( + item_ids + ) + containers = list(containers_by_id.values()) accept = QtWidgets.QMessageBox.Ok buttons = accept | QtWidgets.QMessageBox.Cancel state = QtWidgets.QMessageBox.question( self, "Are you sure?", - "Are you sure you want to remove {} item(s)".format(len(items)), + f"Are you sure you want to remove {len(containers)} item(s)", buttons=buttons, defaultButton=accept ) @@ -717,15 +787,15 @@ class SceneInventoryView(QtWidgets.QTreeView): if state != accept: return - for item in items: - remove_container(item) + for container in containers: + remove_container(container) self.data_changed.emit() - def _show_version_error_dialog(self, version, items): + def _show_version_error_dialog(self, version, item_ids): """Shows QMessageBox when version switch doesn't work - Args: - version: str or int or None + Args: + version: str or int or None """ if version == -1: version_str = "latest" @@ -745,7 +815,7 @@ class SceneInventoryView(QtWidgets.QTreeView): "Switch Folder", QtWidgets.QMessageBox.ActionRole ) - switch_btn.clicked.connect(lambda: self._show_switch_dialog(items)) + switch_btn.clicked.connect(lambda: self._show_switch_dialog(item_ids)) dialog.addButton(QtWidgets.QMessageBox.Cancel) @@ -760,69 +830,115 @@ class SceneInventoryView(QtWidgets.QTreeView): def update_all(self): """Update all items that are currently 'outdated' in the view""" # Get the source model through the proxy model - model = self.model().sourceModel() - - # Get all items from outdated groups - outdated_items = [] - for index in iter_model_rows(model, - column=0, - include_root=False): - item = index.data(model.ItemRole) - - if not item.get("isGroupNode"): - continue - - # Only the group nodes contain the "highest_version" data and as - # such we find only the groups and take its children. - if not model.outdated(item): - continue - - # Collect all children which we want to update - children = item.children() - outdated_items.extend(children) - - if not outdated_items: + item_ids = self._model.get_outdated_item_ids() + if not item_ids: log.info("Nothing to update.") return # Trigger update to latest - self._update_containers(outdated_items, version=-1) + self._update_containers_to_version(item_ids, version=-1) - def _update_containers(self, items, version): + def _on_switch_to_versioned(self, item_ids): + containers_items_by_id = self._controller.get_container_items_by_id( + item_ids + ) + repre_ids = { + container_item.representation_id + for container_item in containers_items_by_id.values() + } + repre_info_by_id = self._controller.get_representation_info_items( + repre_ids + ) + product_ids = { + repre_info.product_id + for repre_info in repre_info_by_id.values() + if repre_info.is_valid + } + version_items_by_product_id = self._controller.get_version_items( + product_ids + ) + + update_containers = [] + update_versions = [] + for item_id, container_item in containers_items_by_id.items(): + repre_id = container_item.representation_id + repre_info = repre_info_by_id[repre_id] + product_id = repre_info.product_id + version_items_id = version_items_by_product_id[product_id] + version_item = version_items_id.get(repre_info.version_id, {}) + if not version_item or not version_item.is_hero: + continue + version = abs(version_item.version) + version_found = False + for version_item in version_items_id.values(): + if version_item.is_hero: + continue + if version_item.version == version: + version_found = True + break + + if not version_found: + continue + + update_containers.append(container_item.item_id) + update_versions.append(version) + + # Specify version per item to update to + self._update_containers(update_containers, update_versions) + + def _update_containers(self, item_ids, versions): """Helper to update items to given version (or version per item) If at least one item is specified this will always try to refresh the inventory even if errors occurred on any of the items. Arguments: - items (list): Items to update - version (int or list): Version to set to. + item_ids (Iterable[str]): Items to update + versions (Iterable[Union[int, HeroVersion]]): Version to set to. This can be a list specifying a version for each item. Like `update_container` version -1 sets the latest version and HeroTypeVersion instances set the hero version. """ - if isinstance(version, (list, tuple)): - # We allow a unique version to be specified per item. In that case - # the length must match with the items - assert len(items) == len(version), ( - "Number of items mismatches number of versions: " - "{} items - {} versions".format(len(items), len(version)) - ) - versions = version - else: - # Repeat the same version infinitely - versions = itertools.repeat(version) + # We allow a unique version to be specified per item. In that case + # the length must match with the items + assert len(item_ids) == len(versions), ( + "Number of items mismatches number of versions: " + f"{len(item_ids)} items - {len(versions)} versions" + ) # Trigger update to latest + containers_by_id = self._controller.get_containers_by_item_ids( + item_ids + ) try: - for item, item_version in zip(items, versions): + for item_id, item_version in zip(item_ids, versions): + container = containers_by_id[item_id] try: - update_container(item, item_version) + update_container(container, item_version) except AssertionError: - self._show_version_error_dialog(item_version, [item]) log.warning("Update failed", exc_info=True) + self._show_version_error_dialog( + item_version, [item_id] + ) finally: # Always update the scene inventory view, even if errors occurred self.data_changed.emit() + + def _update_containers_to_version(self, item_ids, version): + """Helper to update items to given version (or version per item) + + If at least one item is specified this will always try to refresh + the inventory even if errors occurred on any of the items. + + Arguments: + item_ids (Iterable[str]): Items to update + version (Union[int, HeroVersion]): Version to set to. + This can be a list specifying a version for each item. + Like `update_container` version -1 sets the latest version + and HeroTypeVersion instances set the hero version. + + """ + versions = [version for _ in range(len(item_ids))] + self._update_containers(item_ids, versions) diff --git a/client/ayon_core/tools/sceneinventory/window.py b/client/ayon_core/tools/sceneinventory/window.py index 555db3a17c..58ff0c3b6d 100644 --- a/client/ayon_core/tools/sceneinventory/window.py +++ b/client/ayon_core/tools/sceneinventory/window.py @@ -2,17 +2,10 @@ from qtpy import QtWidgets, QtCore, QtGui import qtawesome from ayon_core import style, resources -from ayon_core.tools.utils.lib import ( - preserve_expanded_rows, - preserve_selection, -) +from ayon_core.tools.utils import PlaceholderLineEdit + from ayon_core.tools.sceneinventory import SceneInventoryController -from .delegates import VersionDelegate -from .model import ( - InventoryModel, - FilterProxyModel -) from .view import SceneInventoryView @@ -20,7 +13,7 @@ class SceneInventoryWindow(QtWidgets.QDialog): """Scene Inventory window""" def __init__(self, controller=None, parent=None): - super(SceneInventoryWindow, self).__init__(parent) + super().__init__(parent) if controller is None: controller = SceneInventoryController() @@ -33,10 +26,9 @@ class SceneInventoryWindow(QtWidgets.QDialog): self.resize(1100, 480) - # region control - filter_label = QtWidgets.QLabel("Search", self) - text_filter = QtWidgets.QLineEdit(self) + text_filter = PlaceholderLineEdit(self) + text_filter.setPlaceholderText("Filter by name...") outdated_only_checkbox = QtWidgets.QCheckBox( "Filter to outdated", self @@ -44,52 +36,30 @@ class SceneInventoryWindow(QtWidgets.QDialog): outdated_only_checkbox.setToolTip("Show outdated files only") outdated_only_checkbox.setChecked(False) - icon = qtawesome.icon("fa.arrow-up", color="white") + update_all_icon = qtawesome.icon("fa.arrow-up", color="white") update_all_button = QtWidgets.QPushButton(self) update_all_button.setToolTip("Update all outdated to latest version") - update_all_button.setIcon(icon) + update_all_button.setIcon(update_all_icon) - icon = qtawesome.icon("fa.refresh", color="white") + refresh_icon = qtawesome.icon("fa.refresh", color="white") refresh_button = QtWidgets.QPushButton(self) refresh_button.setToolTip("Refresh") - refresh_button.setIcon(icon) + refresh_button.setIcon(refresh_icon) - control_layout = QtWidgets.QHBoxLayout() - control_layout.addWidget(filter_label) - control_layout.addWidget(text_filter) - control_layout.addWidget(outdated_only_checkbox) - control_layout.addWidget(update_all_button) - control_layout.addWidget(refresh_button) - - model = InventoryModel(controller) - proxy = FilterProxyModel() - proxy.setSourceModel(model) - proxy.setDynamicSortFilter(True) - proxy.setFilterCaseSensitivity(QtCore.Qt.CaseInsensitive) + headers_widget = QtWidgets.QWidget(self) + headers_layout = QtWidgets.QHBoxLayout(headers_widget) + headers_layout.setContentsMargins(0, 0, 0, 0) + headers_layout.addWidget(filter_label, 0) + headers_layout.addWidget(text_filter, 1) + headers_layout.addWidget(outdated_only_checkbox, 0) + headers_layout.addWidget(update_all_button, 0) + headers_layout.addWidget(refresh_button, 0) view = SceneInventoryView(controller, self) - view.setModel(proxy) - sync_enabled = controller.is_sitesync_enabled() - view.setColumnHidden(model.active_site_col, not sync_enabled) - view.setColumnHidden(model.remote_site_col, not sync_enabled) - - # set some nice default widths for the view - view.setColumnWidth(0, 250) # name - view.setColumnWidth(1, 55) # version - view.setColumnWidth(2, 55) # count - view.setColumnWidth(3, 150) # product type - view.setColumnWidth(4, 120) # group - view.setColumnWidth(5, 150) # loader - - # apply delegates - version_delegate = VersionDelegate(controller, self) - column = model.Columns.index("version") - view.setItemDelegateForColumn(column, version_delegate) - - layout = QtWidgets.QVBoxLayout(self) - layout.addLayout(control_layout) - layout.addWidget(view) + main_layout = QtWidgets.QVBoxLayout(self) + main_layout.addWidget(headers_widget, 0) + main_layout.addWidget(view, 1) show_timer = QtCore.QTimer() show_timer.setInterval(0) @@ -114,12 +84,8 @@ class SceneInventoryWindow(QtWidgets.QDialog): self._update_all_button = update_all_button self._outdated_only_checkbox = outdated_only_checkbox self._view = view - self._model = model - self._proxy = proxy - self._version_delegate = version_delegate self._first_show = True - self._first_refresh = True def showEvent(self, event): super(SceneInventoryWindow, self).showEvent(event) @@ -139,29 +105,16 @@ class SceneInventoryWindow(QtWidgets.QDialog): whilst trying to name an instance. """ + pass def _on_refresh_request(self): """Signal callback to trigger 'refresh' without any arguments.""" self.refresh() - def refresh(self, containers=None): - self._first_refresh = False + def refresh(self): self._controller.reset() - with preserve_expanded_rows( - tree_view=self._view, - role=self._model.UniqueRole - ): - with preserve_selection( - tree_view=self._view, - role=self._model.UniqueRole, - current_index=False - ): - kwargs = {"containers": containers} - # TODO do not touch view's inner attribute - if self._view._hierarchy_view: - kwargs["selected"] = self._view._selected - self._model.refresh(**kwargs) + self._view.refresh() def _on_show_timer(self): if self._show_counter < 3: @@ -171,17 +124,13 @@ class SceneInventoryWindow(QtWidgets.QDialog): self.refresh() def _on_hierarchy_view_change(self, enabled): - self._proxy.set_hierarchy_view(enabled) - self._model.set_hierarchy_view(enabled) + self._view.set_hierarchy_view(enabled) def _on_text_filter_change(self, text_filter): - if hasattr(self._proxy, "setFilterRegExp"): - self._proxy.setFilterRegExp(text_filter) - else: - self._proxy.setFilterRegularExpression(text_filter) + self._view.set_text_filter(text_filter) def _on_outdated_state_change(self): - self._proxy.set_filter_outdated( + self._view.set_filter_outdated( self._outdated_only_checkbox.isChecked() ) diff --git a/client/ayon_core/tools/tray/tray.py b/client/ayon_core/tools/tray/tray.py index 957518afe4..eca87eb11d 100644 --- a/client/ayon_core/tools/tray/tray.py +++ b/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() diff --git a/client/ayon_core/tools/utils/delegates.py b/client/ayon_core/tools/utils/delegates.py index 1147074b77..b296f952e0 100644 --- a/client/ayon_core/tools/utils/delegates.py +++ b/client/ayon_core/tools/utils/delegates.py @@ -2,7 +2,7 @@ import time from datetime import datetime import logging -from qtpy import QtWidgets +from qtpy import QtWidgets, QtGui log = logging.getLogger(__name__) @@ -106,3 +106,80 @@ class PrettyTimeDelegate(QtWidgets.QStyledItemDelegate): def displayText(self, value, locale): if value is not None: return pretty_timestamp(value) + + +class StatusDelegate(QtWidgets.QStyledItemDelegate): + """Delegate showing status name and short name.""" + def __init__( + self, + status_name_role, + status_short_name_role, + status_color_role, + status_icon_role, + *args, **kwargs + ): + super().__init__(*args, **kwargs) + self.status_name_role = status_name_role + self.status_short_name_role = status_short_name_role + self.status_color_role = status_color_role + self.status_icon_role = status_icon_role + + def paint(self, painter, option, index): + if option.widget: + style = option.widget.style() + else: + style = QtWidgets.QApplication.style() + + style.drawControl( + QtWidgets.QCommonStyle.CE_ItemViewItem, + option, + painter, + option.widget + ) + + painter.save() + + text_rect = style.subElementRect( + QtWidgets.QCommonStyle.SE_ItemViewItemText, + option + ) + text_margin = style.proxy().pixelMetric( + QtWidgets.QCommonStyle.PM_FocusFrameHMargin, + option, + option.widget + ) + 1 + padded_text_rect = text_rect.adjusted( + text_margin, 0, - text_margin, 0 + ) + + fm = QtGui.QFontMetrics(option.font) + text = self._get_status_name(index) + if padded_text_rect.width() < fm.width(text): + text = self._get_status_short_name(index) + + fg_color = self._get_status_color(index) + pen = painter.pen() + pen.setColor(fg_color) + painter.setPen(pen) + + painter.drawText( + padded_text_rect, + option.displayAlignment, + text + ) + + painter.restore() + + def _get_status_name(self, index): + return index.data(self.status_name_role) + + def _get_status_short_name(self, index): + return index.data(self.status_short_name_role) + + def _get_status_color(self, index): + return QtGui.QColor(index.data(self.status_color_role)) + + def _get_status_icon(self, index): + if self.status_icon_role is not None: + return index.data(self.status_icon_role) + return None diff --git a/client/ayon_core/tools/utils/lib.py b/client/ayon_core/tools/utils/lib.py index d56b370d75..323b5c07e1 100644 --- a/client/ayon_core/tools/utils/lib.py +++ b/client/ayon_core/tools/utils/lib.py @@ -1,6 +1,7 @@ import os import sys import contextlib +import collections from functools import partial from qtpy import QtWidgets, QtCore, QtGui @@ -196,16 +197,16 @@ def get_openpype_qt_app(): return get_ayon_qt_app() -def iter_model_rows(model, column, include_root=False): +def iter_model_rows(model, column=0, include_root=False): """Iterate over all row indices in a model""" - indices = [QtCore.QModelIndex()] # start iteration at root - - for index in indices: + indexes_queue = collections.deque() + # start iteration at root + indexes_queue.append(QtCore.QModelIndex()) + while indexes_queue: + index = indexes_queue.popleft() # Add children to the iterations - child_rows = model.rowCount(index) - for child_row in range(child_rows): - child_index = model.index(child_row, column, index) - indices.append(child_index) + for child_row in range(model.rowCount(index)): + indexes_queue.append(model.index(child_row, column, index)) if not include_root and not index.isValid(): continue diff --git a/client/ayon_core/tools/workfiles/abstract.py b/client/ayon_core/tools/workfiles/abstract.py index c9eb9004e3..f345e20dca 100644 --- a/client/ayon_core/tools/workfiles/abstract.py +++ b/client/ayon_core/tools/workfiles/abstract.py @@ -13,8 +13,10 @@ class WorkfileInfo: task_id (str): Task id. filepath (str): Filepath. filesize (int): File size. - creation_time (int): Creation time (timestamp). - modification_time (int): Modification time (timestamp). + creation_time (float): Creation time (timestamp). + modification_time (float): Modification time (timestamp). + created_by (Union[str, none]): User who created the file. + updated_by (Union[str, none]): User who last updated the file. note (str): Note. """ @@ -26,6 +28,8 @@ class WorkfileInfo: filesize, creation_time, modification_time, + created_by, + updated_by, note, ): self.folder_id = folder_id @@ -34,6 +38,8 @@ class WorkfileInfo: self.filesize = filesize self.creation_time = creation_time self.modification_time = modification_time + self.created_by = created_by + self.updated_by = updated_by self.note = note def to_data(self): @@ -50,6 +56,8 @@ class WorkfileInfo: "filesize": self.filesize, "creation_time": self.creation_time, "modification_time": self.modification_time, + "created_by": self.created_by, + "updated_by": self.updated_by, "note": self.note, } @@ -212,6 +220,7 @@ class FileItem: dirpath (str): Directory path of file. filename (str): Filename. modified (float): Modified timestamp. + created_by (Optional[str]): Username. representation_id (Optional[str]): Representation id of published workfile. filepath (Optional[str]): Prepared filepath. @@ -223,6 +232,8 @@ class FileItem: dirpath, filename, modified, + created_by=None, + updated_by=None, representation_id=None, filepath=None, exists=None @@ -230,6 +241,8 @@ class FileItem: self.filename = filename self.dirpath = dirpath self.modified = modified + self.created_by = created_by + self.updated_by = updated_by self.representation_id = representation_id self._filepath = filepath self._exists = exists @@ -269,6 +282,7 @@ class FileItem: "filename": self.filename, "dirpath": self.dirpath, "modified": self.modified, + "created_by": self.created_by, "representation_id": self.representation_id, "filepath": self.filepath, "exists": self.exists, @@ -522,6 +536,16 @@ class AbstractWorkfilesFrontend(AbstractWorkfilesCommon): pass + @abstractmethod + def get_user_items_by_name(self): + """Get user items available on AYON server. + + Returns: + Dict[str, UserItem]: User items by username. + + """ + pass + # Host information @abstractmethod def get_workfile_extensions(self): diff --git a/client/ayon_core/tools/workfiles/control.py b/client/ayon_core/tools/workfiles/control.py index 3048e6be94..8fa9135bc0 100644 --- a/client/ayon_core/tools/workfiles/control.py +++ b/client/ayon_core/tools/workfiles/control.py @@ -19,6 +19,7 @@ from ayon_core.tools.common_models import ( HierarchyModel, HierarchyExpectedSelection, ProjectsModel, + UsersModel, ) from .abstract import ( @@ -161,6 +162,7 @@ class BaseWorkfileController( self._save_is_enabled = True # Expected selected folder and task + self._users_model = self._create_users_model() self._expected_selection = self._create_expected_selection_obj() self._selection_model = self._create_selection_model() self._projects_model = self._create_projects_model() @@ -176,6 +178,12 @@ class BaseWorkfileController( def is_host_valid(self): return self._host_is_valid + def _create_users_model(self): + return UsersModel(self) + + def _create_workfiles_model(self): + return WorkfilesModel(self) + def _create_expected_selection_obj(self): return WorkfilesToolExpectedSelection(self) @@ -188,9 +196,6 @@ class BaseWorkfileController( def _create_hierarchy_model(self): return HierarchyModel(self) - def _create_workfiles_model(self): - return WorkfilesModel(self) - @property def event_system(self): """Inner event system for workfiles tool controller. @@ -272,6 +277,9 @@ class BaseWorkfileController( {"enabled": enabled} ) + def get_user_items_by_name(self): + return self._users_model.get_user_items_by_name() + # Host information def get_workfile_extensions(self): host = self._host diff --git a/client/ayon_core/tools/workfiles/models/workfiles.py b/client/ayon_core/tools/workfiles/models/workfiles.py index 5f59b99b22..c93bbb6637 100644 --- a/client/ayon_core/tools/workfiles/models/workfiles.py +++ b/client/ayon_core/tools/workfiles/models/workfiles.py @@ -6,6 +6,7 @@ import arrow import ayon_api from ayon_api.operations import OperationsSession +from ayon_core.lib import get_ayon_username from ayon_core.pipeline.template_data import ( get_template_data, get_task_template_data, @@ -23,6 +24,8 @@ from ayon_core.tools.workfiles.abstract import ( WorkfileInfo, ) +_NOT_SET = object() + class CommentMatcher(object): """Use anatomy and work file data to parse comments from filenames. @@ -188,10 +191,17 @@ class WorkareaModel: if ext not in self._extensions: continue - modified = os.path.getmtime(filepath) - items.append( - FileItem(workdir, filename, modified) + workfile_info = self._controller.get_workfile_info( + folder_id, task_id, filepath ) + modified = os.path.getmtime(filepath) + items.append(FileItem( + workdir, + filename, + modified, + workfile_info.created_by, + workfile_info.updated_by, + )) return items def _get_template_key(self, fill_data): @@ -439,6 +449,7 @@ class WorkfileEntitiesModel: self._controller = controller self._cache = {} self._items = {} + self._current_username = _NOT_SET def _get_workfile_info_identifier( self, folder_id, task_id, rootless_path @@ -459,8 +470,12 @@ class WorkfileEntitiesModel: self, folder_id, task_id, workfile_info, filepath ): note = "" + created_by = None + updated_by = None if workfile_info: note = workfile_info["attrib"].get("description") or "" + created_by = workfile_info.get("createdBy") + updated_by = workfile_info.get("updatedBy") filestat = os.stat(filepath) return WorkfileInfo( @@ -470,6 +485,8 @@ class WorkfileEntitiesModel: filesize=filestat.st_size, creation_time=filestat.st_ctime, modification_time=filestat.st_mtime, + created_by=created_by, + updated_by=updated_by, note=note ) @@ -481,7 +498,7 @@ class WorkfileEntitiesModel: for workfile_info in ayon_api.get_workfiles_info( self._controller.get_current_project_name(), task_ids=[task_id], - fields=["id", "path", "attrib"], + fields=["id", "path", "attrib", "createdBy", "updatedBy"], ): workfile_identifier = self._get_workfile_info_identifier( folder_id, task_id, workfile_info["path"] @@ -525,18 +542,32 @@ class WorkfileEntitiesModel: self._items.pop(identifier, None) return - if note is None: - return - old_note = workfile_info.get("attrib", {}).get("note") new_workfile_info = copy.deepcopy(workfile_info) - attrib = new_workfile_info.setdefault("attrib", {}) - attrib["description"] = note + update_data = {} + if note is not None and old_note != note: + update_data["attrib"] = {"description": note} + attrib = new_workfile_info.setdefault("attrib", {}) + attrib["description"] = note + + username = self._get_current_username() + # Automatically fix 'createdBy' and 'updatedBy' fields + # NOTE both fields were not automatically filled by server + # until 1.1.3 release. + if workfile_info.get("createdBy") is None: + update_data["createdBy"] = username + new_workfile_info["createdBy"] = username + + if workfile_info.get("updatedBy") != username: + update_data["updatedBy"] = username + new_workfile_info["updatedBy"] = username + + if not update_data: + return + self._cache[identifier] = new_workfile_info self._items.pop(identifier, None) - if old_note == note: - return project_name = self._controller.get_current_project_name() @@ -545,7 +576,7 @@ class WorkfileEntitiesModel: project_name, "workfile", workfile_info["id"], - {"attrib": {"description": note}}, + update_data, ) session.commit() @@ -554,13 +585,18 @@ class WorkfileEntitiesModel: project_name = self._controller.get_current_project_name() + username = self._get_current_username() workfile_info = { "path": rootless_path, "taskId": task_id, "attrib": { "extension": extension, "description": note - } + }, + # TODO remove 'createdBy' and 'updatedBy' fields when server is + # or above 1.1.3 . + "createdBy": username, + "updatedBy": username, } session = OperationsSession() @@ -568,6 +604,11 @@ class WorkfileEntitiesModel: session.commit() return workfile_info + def _get_current_username(self): + if self._current_username is _NOT_SET: + self._current_username = get_ayon_username() + return self._current_username + class PublishWorkfilesModel: """Model for handling of published workfiles. @@ -599,7 +640,7 @@ class PublishWorkfilesModel: return self._cached_repre_extensions def _file_item_from_representation( - self, repre_entity, project_anatomy, task_name=None + self, repre_entity, project_anatomy, author, task_name=None ): if task_name is not None: task_info = repre_entity["context"].get("task") @@ -634,6 +675,8 @@ class PublishWorkfilesModel: dirpath, filename, created_at.float_timestamp, + author, + None, repre_entity["id"] ) @@ -643,9 +686,9 @@ class PublishWorkfilesModel: # Get subset docs of folder product_entities = ayon_api.get_products( project_name, - folder_ids=[folder_id], - product_types=["workfile"], - fields=["id", "name"] + folder_ids={folder_id}, + product_types={"workfile"}, + fields={"id", "name"} ) output = [] @@ -657,25 +700,33 @@ class PublishWorkfilesModel: version_entities = ayon_api.get_versions( project_name, product_ids=product_ids, - fields=["id", "productId"] + fields={"id", "author"} ) - version_ids = {version["id"] for version in version_entities} - if not version_ids: + versions_by_id = { + version["id"]: version + for version in version_entities + } + if not versions_by_id: return output # Query representations of filtered versions and add filter for # extension repre_entities = ayon_api.get_representations( project_name, - version_ids=version_ids + version_ids=set(versions_by_id) ) project_anatomy = self._controller.project_anatomy # Filter queried representations by task name if task is set file_items = [] for repre_entity in repre_entities: + version_id = repre_entity["versionId"] + version_entity = versions_by_id[version_id] file_item = self._file_item_from_representation( - repre_entity, project_anatomy, task_name + repre_entity, + project_anatomy, + version_entity["author"], + task_name, ) if file_item is not None: file_items.append(file_item) diff --git a/client/ayon_core/tools/workfiles/widgets/files_widget_published.py b/client/ayon_core/tools/workfiles/widgets/files_widget_published.py index bf36d790e9..2ce8569a9b 100644 --- a/client/ayon_core/tools/workfiles/widgets/files_widget_published.py +++ b/client/ayon_core/tools/workfiles/widgets/files_widget_published.py @@ -13,7 +13,8 @@ from .utils import BaseOverlayFrame REPRE_ID_ROLE = QtCore.Qt.UserRole + 1 FILEPATH_ROLE = QtCore.Qt.UserRole + 2 -DATE_MODIFIED_ROLE = QtCore.Qt.UserRole + 3 +AUTHOR_ROLE = QtCore.Qt.UserRole + 3 +DATE_MODIFIED_ROLE = QtCore.Qt.UserRole + 4 class PublishedFilesModel(QtGui.QStandardItemModel): @@ -23,13 +24,19 @@ class PublishedFilesModel(QtGui.QStandardItemModel): controller (AbstractWorkfilesFrontend): The control object. """ + columns = [ + "Name", + "Author", + "Date Modified", + ] + date_modified_col = columns.index("Date Modified") + def __init__(self, controller): super(PublishedFilesModel, self).__init__() - self.setColumnCount(2) - - self.setHeaderData(0, QtCore.Qt.Horizontal, "Name") - self.setHeaderData(1, QtCore.Qt.Horizontal, "Date Modified") + self.setColumnCount(len(self.columns)) + for idx, label in enumerate(self.columns): + self.setHeaderData(idx, QtCore.Qt.Horizontal, label) controller.register_event_callback( "selection.task.changed", @@ -185,6 +192,8 @@ class PublishedFilesModel(QtGui.QStandardItemModel): self._remove_empty_item() self._remove_missing_context_item() + user_items_by_name = self._controller.get_user_items_by_name() + items_to_remove = set(self._items_by_id.keys()) new_items = [] for file_item in file_items: @@ -205,8 +214,15 @@ class PublishedFilesModel(QtGui.QStandardItemModel): else: flags = QtCore.Qt.NoItemFlags + author = file_item.created_by + user_item = user_items_by_name.get(author) + if user_item is not None and user_item.full_name: + author = user_item.full_name + item.setFlags(flags) + item.setData(file_item.filepath, FILEPATH_ROLE) + item.setData(author, AUTHOR_ROLE) item.setData(file_item.modified, DATE_MODIFIED_ROLE) self._items_by_id[repre_id] = item @@ -225,22 +241,30 @@ class PublishedFilesModel(QtGui.QStandardItemModel): # Use flags of first column for all columns if index.column() != 0: index = self.index(index.row(), 0, index.parent()) - return super(PublishedFilesModel, self).flags(index) + return super().flags(index) def data(self, index, role=None): if role is None: role = QtCore.Qt.DisplayRole # Handle roles for first column - if index.column() == 1: - if role == QtCore.Qt.DecorationRole: - return None + col = index.column() + if col != 1: + return super().data(index, role) - if role in (QtCore.Qt.DisplayRole, QtCore.Qt.EditRole): + if role == QtCore.Qt.DecorationRole: + return None + + if role in (QtCore.Qt.DisplayRole, QtCore.Qt.EditRole): + if col == 1: + role = AUTHOR_ROLE + elif col == 2: role = DATE_MODIFIED_ROLE - index = self.index(index.row(), 0, index.parent()) + else: + return None + index = self.index(index.row(), 0, index.parent()) - return super(PublishedFilesModel, self).data(index, role) + return super().data(index, role) class SelectContextOverlay(BaseOverlayFrame): @@ -295,7 +319,7 @@ class PublishedFilesWidget(QtWidgets.QWidget): view.setModel(proxy_model) time_delegate = PrettyTimeDelegate() - view.setItemDelegateForColumn(1, time_delegate) + view.setItemDelegateForColumn(model.date_modified_col, time_delegate) # Default to a wider first filename column it is what we mostly care # about and the date modified is relatively small anyway. diff --git a/client/ayon_core/tools/workfiles/widgets/files_widget_workarea.py b/client/ayon_core/tools/workfiles/widgets/files_widget_workarea.py index fe6abee951..5c102dcdd4 100644 --- a/client/ayon_core/tools/workfiles/widgets/files_widget_workarea.py +++ b/client/ayon_core/tools/workfiles/widgets/files_widget_workarea.py @@ -10,7 +10,8 @@ from ayon_core.tools.utils.delegates import PrettyTimeDelegate FILENAME_ROLE = QtCore.Qt.UserRole + 1 FILEPATH_ROLE = QtCore.Qt.UserRole + 2 -DATE_MODIFIED_ROLE = QtCore.Qt.UserRole + 3 +AUTHOR_ROLE = QtCore.Qt.UserRole + 3 +DATE_MODIFIED_ROLE = QtCore.Qt.UserRole + 4 class WorkAreaFilesModel(QtGui.QStandardItemModel): @@ -21,14 +22,20 @@ class WorkAreaFilesModel(QtGui.QStandardItemModel): """ refreshed = QtCore.Signal() + columns = [ + "Name", + "Author", + "Date Modified", + ] + date_modified_col = columns.index("Date Modified") def __init__(self, controller): super(WorkAreaFilesModel, self).__init__() - self.setColumnCount(2) + self.setColumnCount(len(self.columns)) - self.setHeaderData(0, QtCore.Qt.Horizontal, "Name") - self.setHeaderData(1, QtCore.Qt.Horizontal, "Date Modified") + for idx, label in enumerate(self.columns): + self.setHeaderData(idx, QtCore.Qt.Horizontal, label) controller.register_event_callback( "selection.folder.changed", @@ -186,6 +193,7 @@ class WorkAreaFilesModel(QtGui.QStandardItemModel): return self._remove_empty_item() self._remove_missing_context_item() + user_items_by_name = self._controller.get_user_items_by_name() items_to_remove = set(self._items_by_filename.keys()) new_items = [] @@ -205,7 +213,13 @@ class WorkAreaFilesModel(QtGui.QStandardItemModel): item.setData(file_item.filename, QtCore.Qt.DisplayRole) item.setData(file_item.filename, FILENAME_ROLE) + updated_by = file_item.updated_by + user_item = user_items_by_name.get(updated_by) + if user_item is not None and user_item.full_name: + updated_by = user_item.full_name + item.setData(file_item.filepath, FILEPATH_ROLE) + item.setData(updated_by, AUTHOR_ROLE) item.setData(file_item.modified, DATE_MODIFIED_ROLE) self._items_by_filename[file_item.filename] = item @@ -224,22 +238,30 @@ class WorkAreaFilesModel(QtGui.QStandardItemModel): # Use flags of first column for all columns if index.column() != 0: index = self.index(index.row(), 0, index.parent()) - return super(WorkAreaFilesModel, self).flags(index) + return super().flags(index) def data(self, index, role=None): if role is None: role = QtCore.Qt.DisplayRole # Handle roles for first column - if index.column() == 1: - if role == QtCore.Qt.DecorationRole: - return None + col = index.column() + if col == 0: + return super().data(index, role) - if role in (QtCore.Qt.DisplayRole, QtCore.Qt.EditRole): + if role == QtCore.Qt.DecorationRole: + return None + + if role in (QtCore.Qt.DisplayRole, QtCore.Qt.EditRole): + if col == 1: + role = AUTHOR_ROLE + elif col == 2: role = DATE_MODIFIED_ROLE - index = self.index(index.row(), 0, index.parent()) + else: + return None + index = self.index(index.row(), 0, index.parent()) - return super(WorkAreaFilesModel, self).data(index, role) + return super().data(index, role) def set_published_mode(self, published_mode): if self._published_mode == published_mode: @@ -279,7 +301,7 @@ class WorkAreaFilesWidget(QtWidgets.QWidget): view.setModel(proxy_model) time_delegate = PrettyTimeDelegate() - view.setItemDelegateForColumn(1, time_delegate) + view.setItemDelegateForColumn(model.date_modified_col, time_delegate) # Default to a wider first filename column it is what we mostly care # about and the date modified is relatively small anyway. diff --git a/client/ayon_core/tools/workfiles/widgets/side_panel.py b/client/ayon_core/tools/workfiles/widgets/side_panel.py index 5085f4701e..53fdf0e0ac 100644 --- a/client/ayon_core/tools/workfiles/widgets/side_panel.py +++ b/client/ayon_core/tools/workfiles/widgets/side_panel.py @@ -147,13 +147,38 @@ class SidePanelWidget(QtWidgets.QWidget): workfile_info.creation_time) modification_time = datetime.datetime.fromtimestamp( workfile_info.modification_time) + + user_items_by_name = self._controller.get_user_items_by_name() + + def convert_username(username): + user_item = user_items_by_name.get(username) + if user_item is not None and user_item.full_name: + return user_item.full_name + return username + + created_lines = [ + creation_time.strftime(datetime_format) + ] + if workfile_info.created_by: + created_lines.insert( + 0, convert_username(workfile_info.created_by) + ) + + modified_lines = [ + modification_time.strftime(datetime_format) + ] + if workfile_info.updated_by: + modified_lines.insert( + 0, convert_username(workfile_info.updated_by) + ) + lines = ( "Size:", size_value, "Created:", - creation_time.strftime(datetime_format), + "
".join(created_lines), "Modified:", - modification_time.strftime(datetime_format) + "
".join(modified_lines), ) self._orig_note = note self._note_input.setPlainText(note) diff --git a/client/ayon_core/tools/workfiles/widgets/window.py b/client/ayon_core/tools/workfiles/widgets/window.py index 1cfae7ec90..8bcff66f50 100644 --- a/client/ayon_core/tools/workfiles/widgets/window.py +++ b/client/ayon_core/tools/workfiles/widgets/window.py @@ -107,7 +107,7 @@ class WorkfilesToolWindow(QtWidgets.QWidget): split_widget.addWidget(tasks_widget) split_widget.addWidget(col_3_widget) split_widget.addWidget(side_panel) - split_widget.setSizes([255, 160, 455, 175]) + split_widget.setSizes([255, 175, 550, 190]) body_layout.addWidget(split_widget) @@ -169,7 +169,7 @@ class WorkfilesToolWindow(QtWidgets.QWidget): # Force focus on the open button by default, required for Houdini. self._files_widget.setFocus() - self.resize(1200, 600) + self.resize(1260, 600) def _create_col_1_widget(self, controller, parent): col_widget = QtWidgets.QWidget(parent) diff --git a/pyproject.toml b/pyproject.toml index 4726bef41a..ca887f2299 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -80,11 +80,11 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" exclude = [ "client/ayon_core/hosts/unreal/integration/*", "client/ayon_core/hosts/aftereffects/api/extension/js/libs/*", - "client/ayon_core/hosts/hiero/api/startup/*", "client/ayon_core/modules/deadline/repository/custom/plugins/CelAction/*", "client/ayon_core/modules/deadline/repository/custom/plugins/HarmonyAYON/*", "client/ayon_core/modules/click_wrap.py", - "client/ayon_core/scripts/slates/__init__.py" + "client/ayon_core/scripts/slates/__init__.py", + "server_addon/hiero/client/ayon_hiero/api/startup/*" ] [tool.ruff.lint.per-file-ignores] @@ -108,6 +108,10 @@ line-ending = "auto" # Ignore words that are not in the dictionary. ignore-words-list = "ayon,ynput,parms,parm,hda,developpement,ue" +# Ignore lines that contain this regex. This is hack for missing inline ignore. +# Remove with next codespell release (>2.2.6) +ignore-regex = ".*codespell:ignore.*" + skip = "./.*,./package/*,*/vendor/*,*/unreal/integration/*,*/aftereffects/api/extension/js/libs/*" count = true quiet-level = 3 diff --git a/server/__init__.py b/server/__init__.py index 79f505ccd5..d60f50f471 100644 --- a/server/__init__.py +++ b/server/__init__.py @@ -2,7 +2,11 @@ from typing import Any from ayon_server.addons import BaseServerAddon -from .settings import CoreSettings, DEFAULT_VALUES +from .settings import ( + CoreSettings, + DEFAULT_VALUES, + convert_settings_overrides, +) class CoreAddon(BaseServerAddon): @@ -17,47 +21,8 @@ class CoreAddon(BaseServerAddon): source_version: str, overrides: dict[str, Any], ) -> dict[str, Any]: - self._convert_imagio_configs_0_3_1(overrides) + convert_settings_overrides(source_version, overrides) # Use super conversion return await super().convert_settings_overrides( source_version, overrides ) - - def _convert_imagio_configs_0_3_1(self, overrides): - """Imageio config settings did change to profiles since 0.3.1. .""" - imageio_overrides = overrides.get("imageio") or {} - if ( - "ocio_config" not in imageio_overrides - or "filepath" not in imageio_overrides["ocio_config"] - ): - return - - ocio_config = imageio_overrides.pop("ocio_config") - - filepath = ocio_config["filepath"] - if not filepath: - return - first_filepath = filepath[0] - ocio_config_profiles = imageio_overrides.setdefault( - "ocio_config_profiles", [] - ) - base_value = { - "type": "builtin_path", - "product_name": "", - "host_names": [], - "task_names": [], - "task_types": [], - "custom_path": "", - "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio" - } - if first_filepath in ( - "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio", - "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio", - ): - base_value["type"] = "builtin_path" - base_value["builtin_path"] = first_filepath - else: - base_value["type"] = "custom_path" - base_value["custom_path"] = first_filepath - - ocio_config_profiles.append(base_value) diff --git a/server/settings/__init__.py b/server/settings/__init__.py index 527a2bdc0c..4bb21a9644 100644 --- a/server/settings/__init__.py +++ b/server/settings/__init__.py @@ -1,7 +1,10 @@ from .main import CoreSettings, DEFAULT_VALUES +from .conversion import convert_settings_overrides __all__ = ( "CoreSettings", "DEFAULT_VALUES", + + "convert_settings_overrides", ) diff --git a/server/settings/conversion.py b/server/settings/conversion.py new file mode 100644 index 0000000000..f513738603 --- /dev/null +++ b/server/settings/conversion.py @@ -0,0 +1,86 @@ +import copy +from typing import Any + +from .publish_plugins import DEFAULT_PUBLISH_VALUES + + +def _convert_imageio_configs_0_3_1(overrides): + """Imageio config settings did change to profiles since 0.3.1. .""" + imageio_overrides = overrides.get("imageio") or {} + if ( + "ocio_config" not in imageio_overrides + or "filepath" not in imageio_overrides["ocio_config"] + ): + return + + ocio_config = imageio_overrides.pop("ocio_config") + + filepath = ocio_config["filepath"] + if not filepath: + return + first_filepath = filepath[0] + ocio_config_profiles = imageio_overrides.setdefault( + "ocio_config_profiles", [] + ) + base_value = { + "type": "builtin_path", + "product_name": "", + "host_names": [], + "task_names": [], + "task_types": [], + "custom_path": "", + "builtin_path": "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio" + } + if first_filepath in ( + "{BUILTIN_OCIO_ROOT}/aces_1.2/config.ocio", + "{BUILTIN_OCIO_ROOT}/nuke-default/config.ocio", + ): + base_value["type"] = "builtin_path" + base_value["builtin_path"] = first_filepath + else: + base_value["type"] = "custom_path" + base_value["custom_path"] = first_filepath + + ocio_config_profiles.append(base_value) + + +def _convert_validate_version_0_3_3(publish_overrides): + """ValidateVersion plugin changed in 0.3.3.""" + if "ValidateVersion" not in publish_overrides: + return + + validate_version = publish_overrides["ValidateVersion"] + # Already new settings + if "plugin_state_profiles" in validate_version: + return + + # Use new default profile as base + profile = copy.deepcopy( + DEFAULT_PUBLISH_VALUES["ValidateVersion"]["plugin_state_profiles"][0] + ) + # Copy values from old overrides to new overrides + for key in { + "enabled", + "optional", + "active", + }: + if key not in validate_version: + continue + profile[key] = validate_version.pop(key) + + validate_version["plugin_state_profiles"] = [profile] + + +def _conver_publish_plugins(overrides): + if "publish" not in overrides: + return + _convert_validate_version_0_3_3(overrides["publish"]) + + +def convert_settings_overrides( + source_version: str, + overrides: dict[str, Any], +) -> dict[str, Any]: + _convert_imageio_configs_0_3_1(overrides) + _conver_publish_plugins(overrides) + return overrides diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py index 61e73ce912..2640a3db37 100644 --- a/server/settings/publish_plugins.py +++ b/server/settings/publish_plugins.py @@ -59,7 +59,7 @@ class CollectFramesFixDefModel(BaseSettingsModel): ) -class ValidateOutdatedContainersProfile(BaseSettingsModel): +class PluginStateByHostModelProfile(BaseSettingsModel): _layout = "expanded" # Filtering host_names: list[str] = SettingsField( @@ -72,17 +72,12 @@ class ValidateOutdatedContainersProfile(BaseSettingsModel): active: bool = SettingsField(True, title="Active") -class ValidateOutdatedContainersModel(BaseSettingsModel): - """Validate if Publishing intent was selected. - - It is possible to disable validation for specific publishing context - with profiles. - """ - +class PluginStateByHostModel(BaseSettingsModel): _isGroup = True - plugin_state_profiles: list[ValidateOutdatedContainersProfile] = SettingsField( + plugin_state_profiles: list[PluginStateByHostModelProfile] = SettingsField( default_factory=list, title="Plugin enable state profiles", + description="Change plugin state based on host name." ) @@ -563,7 +558,7 @@ class ExtractBurninProfile(BaseSettingsModel): _layout = "expanded" product_types: list[str] = SettingsField( default_factory=list, - title="Produt types" + title="Product types" ) hosts: list[str] = SettingsField( default_factory=list, @@ -793,12 +788,16 @@ class PublishPuginsModel(BaseSettingsModel): default_factory=ValidateBaseModel, title="Validate Editorial Asset Name" ) - ValidateVersion: ValidateBaseModel = SettingsField( - default_factory=ValidateBaseModel, - title="Validate Version" + ValidateVersion: PluginStateByHostModel = SettingsField( + default_factory=PluginStateByHostModel, + title="Validate Version", + description=( + "Validate that product version to integrate" + " is newer than latest version in AYON." + ) ) - ValidateOutdatedContainers: ValidateOutdatedContainersModel = SettingsField( - default_factory=ValidateOutdatedContainersModel, + ValidateOutdatedContainers: PluginStateByHostModel = SettingsField( + default_factory=PluginStateByHostModel, title="Validate Containers" ) ValidateIntent: ValidateIntentModel = SettingsField( @@ -882,9 +881,21 @@ DEFAULT_PUBLISH_VALUES = { "active": True }, "ValidateVersion": { - "enabled": True, - "optional": False, - "active": True + "plugin_state_profiles": [ + { + "host_names": [ + "aftereffects", + "blender", + "houdini", + "maya", + "nuke", + "photoshop", + ], + "enabled": True, + "optional": False, + "active": True + } + ] }, "ValidateOutdatedContainers": { "plugin_state_profiles": [ diff --git a/server_addon/applications/server/settings.py b/server_addon/applications/server/settings.py index b77686cee0..3f9d90ef5b 100644 --- a/server_addon/applications/server/settings.py +++ b/server_addon/applications/server/settings.py @@ -212,7 +212,13 @@ class ApplicationsAddonSettings(BaseSettingsModel): scope=["studio"] ) only_available: bool = SettingsField( - True, title="Show only available applications") + True, + title="Show only available applications", + description="Enable to show only applications in AYON Launcher" + " for which the executable paths are found on the running machine." + " This applies as an additional filter to the applications defined in a " + " project's anatomy settings to ignore unavailable applications." + ) @validator("tool_groups") def validate_unique_name(cls, value): diff --git a/client/ayon_core/hosts/celaction/__init__.py b/server_addon/celaction/client/ayon_celaction/__init__.py similarity index 71% rename from client/ayon_core/hosts/celaction/__init__.py rename to server_addon/celaction/client/ayon_celaction/__init__.py index 8983d48d7d..0df0224125 100644 --- a/client/ayon_core/hosts/celaction/__init__.py +++ b/server_addon/celaction/client/ayon_celaction/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( CELACTION_ROOT_DIR, CelactionAddon, @@ -5,6 +6,8 @@ from .addon import ( __all__ = ( + "__version__", + "CELACTION_ROOT_DIR", "CelactionAddon", ) diff --git a/client/ayon_core/hosts/celaction/addon.py b/server_addon/celaction/client/ayon_celaction/addon.py similarity index 92% rename from client/ayon_core/hosts/celaction/addon.py rename to server_addon/celaction/client/ayon_celaction/addon.py index d00401a2e0..ad04a54088 100644 --- a/client/ayon_core/hosts/celaction/addon.py +++ b/server_addon/celaction/client/ayon_celaction/addon.py @@ -1,11 +1,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + CELACTION_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) class CelactionAddon(AYONAddon, IHostAddon): name = "celaction" + version = __version__ host_name = "celaction" def get_launch_hook_paths(self, app): diff --git a/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py similarity index 96% rename from client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py rename to server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py index 8350c7b7c8..52622d43b8 100644 --- a/client/ayon_core/hosts/celaction/hooks/pre_celaction_setup.py +++ b/server_addon/celaction/client/ayon_celaction/hooks/pre_celaction_setup.py @@ -4,13 +4,11 @@ import winreg import subprocess from ayon_core.lib import get_ayon_launcher_args from ayon_applications import PreLaunchHook, LaunchTypes -from ayon_core.hosts.celaction import CELACTION_ROOT_DIR +from ayon_celaction import CELACTION_ROOT_DIR class CelactionPrelaunchHook(PreLaunchHook): - """ - Bootstrap celacion with pype - """ + """Bootstrap celacion with AYON""" app_groups = {"celaction"} platforms = {"windows"} launch_types = {LaunchTypes.local} @@ -39,7 +37,7 @@ class CelactionPrelaunchHook(PreLaunchHook): CELACTION_ROOT_DIR, "scripts", "publish_cli.py" ) subprocess_args = get_ayon_launcher_args("run", path_to_cli) - openpype_executable = subprocess_args.pop(0) + executable = subprocess_args.pop(0) workfile_settings = self.get_workfile_settings() winreg.SetValueEx( @@ -47,7 +45,7 @@ class CelactionPrelaunchHook(PreLaunchHook): "SubmitAppTitle", 0, winreg.REG_SZ, - openpype_executable + executable ) # add required arguments for workfile path diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_cli_kwargs.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_cli_kwargs.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_cli_kwargs.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_cli_kwargs.py diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_instances.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/collect_celaction_instances.py diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py similarity index 98% rename from client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py index 1bb4d54831..3bcd1c69b3 100644 --- a/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py +++ b/server_addon/celaction/client/ayon_celaction/plugins/publish/collect_render_path.py @@ -1,6 +1,6 @@ import os -import pyblish.api import copy +import pyblish.api class CollectRenderPath(pyblish.api.InstancePlugin): @@ -10,6 +10,8 @@ class CollectRenderPath(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.495 families = ["render.farm"] + settings_category = "celaction" + # Presets output_extension = "png" anatomy_template_key_render_files = None diff --git a/client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py b/server_addon/celaction/client/ayon_celaction/plugins/publish/integrate_version_up.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/publish/integrate_version_up.py rename to server_addon/celaction/client/ayon_celaction/plugins/publish/integrate_version_up.py diff --git a/client/ayon_core/hosts/celaction/resources/celaction_template_scene.scn b/server_addon/celaction/client/ayon_celaction/resources/celaction_template_scene.scn similarity index 100% rename from client/ayon_core/hosts/celaction/resources/celaction_template_scene.scn rename to server_addon/celaction/client/ayon_celaction/resources/celaction_template_scene.scn diff --git a/client/ayon_core/hosts/celaction/plugins/__init__.py b/server_addon/celaction/client/ayon_celaction/scripts/__init__.py similarity index 100% rename from client/ayon_core/hosts/celaction/plugins/__init__.py rename to server_addon/celaction/client/ayon_celaction/scripts/__init__.py diff --git a/client/ayon_core/hosts/celaction/scripts/publish_cli.py b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py similarity index 77% rename from client/ayon_core/hosts/celaction/scripts/publish_cli.py rename to server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py index 92019b8702..4e54aa253a 100644 --- a/client/ayon_core/hosts/celaction/scripts/publish_cli.py +++ b/server_addon/celaction/client/ayon_celaction/scripts/publish_cli.py @@ -4,7 +4,7 @@ import sys import pyblish.api import pyblish.util -import ayon_core.hosts.celaction +from ayon_celaction import CELACTION_ROOT_DIR from ayon_core.lib import Logger from ayon_core.tools.utils import host_tools from ayon_core.pipeline import install_ayon_plugins @@ -13,13 +13,12 @@ from ayon_core.pipeline import install_ayon_plugins log = Logger.get_logger("celaction") PUBLISH_HOST = "celaction" -HOST_DIR = os.path.dirname(os.path.abspath(ayon_core.hosts.celaction.__file__)) -PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PLUGINS_DIR = os.path.join(CELACTION_ROOT_DIR, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") def main(): - # Registers pype's Global pyblish plugins + # Registers global pyblish plugins install_ayon_plugins() if os.path.exists(PUBLISH_PATH): diff --git a/server_addon/celaction/client/ayon_celaction/version.py b/server_addon/celaction/client/ayon_celaction/version.py new file mode 100644 index 0000000000..ceed47c3a0 --- /dev/null +++ b/server_addon/celaction/client/ayon_celaction/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'celaction' version.""" +__version__ = "0.2.0" diff --git a/server_addon/celaction/package.py b/server_addon/celaction/package.py index 2b11a8630f..8b9069d019 100644 --- a/server_addon/celaction/package.py +++ b/server_addon/celaction/package.py @@ -1,3 +1,12 @@ name = "celaction" title = "CelAction" -version = "0.1.0" +version = "0.2.0" + +client_dir = "ayon_celaction" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = { + "applications": ">=0.2.0", +} diff --git a/server_addon/flame/client/ayon_flame/__init__.py b/server_addon/flame/client/ayon_flame/__init__.py new file mode 100644 index 0000000000..d2d89bdb01 --- /dev/null +++ b/server_addon/flame/client/ayon_flame/__init__.py @@ -0,0 +1,13 @@ +from .version import __version__ +from .addon import ( + FLAME_ADDON_ROOT, + FlameAddon, +) + + +__all__ = ( + "__version__", + + "FLAME_ADDON_ROOT", + "FlameAddon", +) diff --git a/client/ayon_core/hosts/flame/addon.py b/server_addon/flame/client/ayon_flame/addon.py similarity index 74% rename from client/ayon_core/hosts/flame/addon.py rename to server_addon/flame/client/ayon_flame/addon.py index f5560cde7a..5a96a9332e 100644 --- a/client/ayon_core/hosts/flame/addon.py +++ b/server_addon/flame/client/ayon_flame/addon.py @@ -1,16 +1,19 @@ import os from ayon_core.addon import AYONAddon, IHostAddon -HOST_DIR = os.path.dirname(os.path.abspath(__file__)) +from .version import __version__ + +FLAME_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__)) class FlameAddon(AYONAddon, IHostAddon): name = "flame" + version = __version__ host_name = "flame" def add_implementation_envs(self, env, _app): # Add requirements to DL_PYTHON_HOOK_PATH - env["DL_PYTHON_HOOK_PATH"] = os.path.join(HOST_DIR, "startup") + env["DL_PYTHON_HOOK_PATH"] = os.path.join(FLAME_ADDON_ROOT, "startup") env.pop("QT_AUTO_SCREEN_SCALE_FACTOR", None) # Set default values if are not already set via settings @@ -25,7 +28,7 @@ class FlameAddon(AYONAddon, IHostAddon): if app.host_name != self.host_name: return [] return [ - os.path.join(HOST_DIR, "hooks") + os.path.join(FLAME_ADDON_ROOT, "hooks") ] def get_workfile_extensions(self): diff --git a/client/ayon_core/hosts/flame/api/__init__.py b/server_addon/flame/client/ayon_flame/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/flame/api/__init__.py rename to server_addon/flame/client/ayon_flame/api/__init__.py diff --git a/client/ayon_core/hosts/flame/api/batch_utils.py b/server_addon/flame/client/ayon_flame/api/batch_utils.py similarity index 100% rename from client/ayon_core/hosts/flame/api/batch_utils.py rename to server_addon/flame/client/ayon_flame/api/batch_utils.py diff --git a/client/ayon_core/hosts/flame/api/constants.py b/server_addon/flame/client/ayon_flame/api/constants.py similarity index 100% rename from client/ayon_core/hosts/flame/api/constants.py rename to server_addon/flame/client/ayon_flame/api/constants.py diff --git a/client/ayon_core/hosts/flame/api/lib.py b/server_addon/flame/client/ayon_flame/api/lib.py similarity index 100% rename from client/ayon_core/hosts/flame/api/lib.py rename to server_addon/flame/client/ayon_flame/api/lib.py diff --git a/client/ayon_core/hosts/flame/api/menu.py b/server_addon/flame/client/ayon_flame/api/menu.py similarity index 99% rename from client/ayon_core/hosts/flame/api/menu.py rename to server_addon/flame/client/ayon_flame/api/menu.py index 7e880483f5..83d75d18d3 100644 --- a/client/ayon_core/hosts/flame/api/menu.py +++ b/server_addon/flame/client/ayon_flame/api/menu.py @@ -28,7 +28,7 @@ default_flame_export_presets = { def callback_selection(selection, function): - import ayon_core.hosts.flame.api as opfapi + import ayon_flame.api as opfapi opfapi.CTX.selection = selection print("Hook Selection: \n\t{}".format( pformat({ diff --git a/client/ayon_core/hosts/flame/api/pipeline.py b/server_addon/flame/client/ayon_flame/api/pipeline.py similarity index 95% rename from client/ayon_core/hosts/flame/api/pipeline.py rename to server_addon/flame/client/ayon_flame/api/pipeline.py index 4578d7bb4b..121b925920 100644 --- a/client/ayon_core/hosts/flame/api/pipeline.py +++ b/server_addon/flame/client/ayon_flame/api/pipeline.py @@ -13,6 +13,7 @@ from ayon_core.pipeline import ( deregister_creator_plugin_path, AVALON_CONTAINER_ID, ) +from ayon_flame import FLAME_ADDON_ROOT from .lib import ( set_segment_data_marker, set_publish_attribute, @@ -20,10 +21,8 @@ from .lib import ( get_current_sequence, reset_segment_selection ) -from .. import HOST_DIR -API_DIR = os.path.join(HOST_DIR, "api") -PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PLUGINS_DIR = os.path.join(FLAME_ADDON_ROOT, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") LOAD_PATH = os.path.join(PLUGINS_DIR, "load") CREATE_PATH = os.path.join(PLUGINS_DIR, "create") @@ -113,10 +112,6 @@ 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 import ( - # set_publish_attribute - # ) - # # Whether instances should be passthrough based on new value # timeline_item = instance.data["item"] # set_publish_attribute(timeline_item, new_value) diff --git a/client/ayon_core/hosts/flame/api/plugin.py b/server_addon/flame/client/ayon_flame/api/plugin.py similarity index 100% rename from client/ayon_core/hosts/flame/api/plugin.py rename to server_addon/flame/client/ayon_flame/api/plugin.py diff --git a/client/ayon_core/hosts/flame/api/render_utils.py b/server_addon/flame/client/ayon_flame/api/render_utils.py similarity index 100% rename from client/ayon_core/hosts/flame/api/render_utils.py rename to server_addon/flame/client/ayon_flame/api/render_utils.py diff --git a/client/ayon_core/hosts/flame/api/scripts/wiretap_com.py b/server_addon/flame/client/ayon_flame/api/scripts/wiretap_com.py similarity index 100% rename from client/ayon_core/hosts/flame/api/scripts/wiretap_com.py rename to server_addon/flame/client/ayon_flame/api/scripts/wiretap_com.py diff --git a/client/ayon_core/hosts/flame/api/utils.py b/server_addon/flame/client/ayon_flame/api/utils.py similarity index 98% rename from client/ayon_core/hosts/flame/api/utils.py rename to server_addon/flame/client/ayon_flame/api/utils.py index b76dd92ada..03a694c25c 100644 --- a/client/ayon_core/hosts/flame/api/utils.py +++ b/server_addon/flame/client/ayon_flame/api/utils.py @@ -5,6 +5,8 @@ Flame utils for syncing scripts import os import shutil from ayon_core.lib import Logger +from ayon_flame import FLAME_ADDON_ROOT + log = Logger.get_logger(__name__) @@ -16,7 +18,6 @@ def _sync_utility_scripts(env=None): `/opt/Autodesk/shared/python`. This will be always synchronizing those folders. """ - from .. import HOST_DIR env = env or os.environ @@ -26,7 +27,7 @@ def _sync_utility_scripts(env=None): flame_shared_dir = "/opt/Autodesk/shared/python" fsd_paths = [os.path.join( - HOST_DIR, + FLAME_ADDON_ROOT, "api", "utility_scripts" )] diff --git a/client/ayon_core/hosts/flame/api/workio.py b/server_addon/flame/client/ayon_flame/api/workio.py similarity index 100% rename from client/ayon_core/hosts/flame/api/workio.py rename to server_addon/flame/client/ayon_flame/api/workio.py diff --git a/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py b/server_addon/flame/client/ayon_flame/hooks/pre_flame_setup.py similarity index 98% rename from client/ayon_core/hosts/flame/hooks/pre_flame_setup.py rename to server_addon/flame/client/ayon_flame/hooks/pre_flame_setup.py index 77a9435205..e9e9aca3f4 100644 --- a/client/ayon_core/hosts/flame/hooks/pre_flame_setup.py +++ b/server_addon/flame/client/ayon_flame/hooks/pre_flame_setup.py @@ -10,7 +10,7 @@ from ayon_core.lib import ( run_subprocess, ) from ayon_applications import PreLaunchHook, LaunchTypes -from ayon_core.hosts import flame as opflame +from ayon_flame import FLAME_ADDON_ROOT class FlamePrelaunch(PreLaunchHook): @@ -23,7 +23,8 @@ class FlamePrelaunch(PreLaunchHook): permissions = 0o777 wtc_script_path = os.path.join( - opflame.HOST_DIR, "api", "scripts", "wiretap_com.py") + FLAME_ADDON_ROOT, "api", "scripts", "wiretap_com.py" + ) launch_types = {LaunchTypes.local} def __init__(self, *args, **kwargs): diff --git a/client/ayon_core/hosts/celaction/scripts/__init__.py b/server_addon/flame/client/ayon_flame/otio/__init__.py similarity index 100% rename from client/ayon_core/hosts/celaction/scripts/__init__.py rename to server_addon/flame/client/ayon_flame/otio/__init__.py diff --git a/client/ayon_core/hosts/flame/otio/flame_export.py b/server_addon/flame/client/ayon_flame/otio/flame_export.py similarity index 99% rename from client/ayon_core/hosts/flame/otio/flame_export.py rename to server_addon/flame/client/ayon_flame/otio/flame_export.py index cb038f9e9a..bebe9be1c1 100644 --- a/client/ayon_core/hosts/flame/otio/flame_export.py +++ b/server_addon/flame/client/ayon_flame/otio/flame_export.py @@ -275,7 +275,7 @@ def create_otio_reference(clip_data, fps=None): def create_otio_clip(clip_data): - from ayon_core.hosts.flame.api import MediaInfoFile, TimeEffectMetadata + from ayon_flame.api import MediaInfoFile, TimeEffectMetadata segment = clip_data["PySegment"] diff --git a/client/ayon_core/hosts/flame/otio/utils.py b/server_addon/flame/client/ayon_flame/otio/utils.py similarity index 100% rename from client/ayon_core/hosts/flame/otio/utils.py rename to server_addon/flame/client/ayon_flame/otio/utils.py diff --git a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py b/server_addon/flame/client/ayon_flame/plugins/create/create_shot_clip.py similarity index 99% rename from client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py rename to server_addon/flame/client/ayon_flame/plugins/create/create_shot_clip.py index 56f5319f21..120c8c559d 100644 --- a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py +++ b/server_addon/flame/client/ayon_flame/plugins/create/create_shot_clip.py @@ -1,5 +1,5 @@ from copy import deepcopy -import ayon_core.hosts.flame.api as opfapi +import ayon_flame.api as opfapi class CreateShotClip(opfapi.Creator): diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip.py b/server_addon/flame/client/ayon_flame/plugins/load/load_clip.py similarity index 99% rename from client/ayon_core/hosts/flame/plugins/load/load_clip.py rename to server_addon/flame/client/ayon_flame/plugins/load/load_clip.py index 40ab9c038b..c8ec7b36c9 100644 --- a/client/ayon_core/hosts/flame/plugins/load/load_clip.py +++ b/server_addon/flame/client/ayon_flame/plugins/load/load_clip.py @@ -2,7 +2,7 @@ from copy import deepcopy import os import flame from pprint import pformat -import ayon_core.hosts.flame.api as opfapi +import ayon_flame.api as opfapi from ayon_core.lib import StringTemplate from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py b/server_addon/flame/client/ayon_flame/plugins/load/load_clip_batch.py similarity index 99% rename from client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py rename to server_addon/flame/client/ayon_flame/plugins/load/load_clip_batch.py index 1b23a8b465..0d7a125af7 100644 --- a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py +++ b/server_addon/flame/client/ayon_flame/plugins/load/load_clip_batch.py @@ -2,7 +2,7 @@ from copy import deepcopy import os import flame from pprint import pformat -import ayon_core.hosts.flame.api as opfapi +import ayon_flame.api as opfapi from ayon_core.lib import StringTemplate from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py b/server_addon/flame/client/ayon_flame/plugins/publish/collect_test_selection.py similarity index 94% rename from client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py rename to server_addon/flame/client/ayon_flame/plugins/publish/collect_test_selection.py index 7442e7df48..dac2c862e6 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py +++ b/server_addon/flame/client/ayon_flame/plugins/publish/collect_test_selection.py @@ -1,8 +1,8 @@ import os import pyblish.api import tempfile -import ayon_core.hosts.flame.api as opfapi -from ayon_core.hosts.flame.otio import flame_export as otio_export +import ayon_flame.api as opfapi +from ayon_flame.otio import flame_export as otio_export import opentimelineio as otio from pprint import pformat reload(otio_export) # noqa diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py b/server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_instances.py similarity index 99% rename from client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py rename to server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_instances.py index ca5475824d..35591f1a0d 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py +++ b/server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_instances.py @@ -1,8 +1,8 @@ import re from types import NoneType import pyblish -import ayon_core.hosts.flame.api as opfapi -from ayon_core.hosts.flame.otio import flame_export +import ayon_flame.api as opfapi +from ayon_flame.otio import flame_export from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID from ayon_core.pipeline.editorial import ( is_overlapping_otio_ranges, @@ -24,6 +24,8 @@ class CollectTimelineInstances(pyblish.api.ContextPlugin): label = "Collect timeline Instances" hosts = ["flame"] + settings_category = "flame" + audio_track_items = [] # settings diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py b/server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_otio.py similarity index 95% rename from client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py rename to server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_otio.py index 7609ea7879..139ac5b875 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py +++ b/server_addon/flame/client/ayon_flame/plugins/publish/collect_timeline_otio.py @@ -1,7 +1,7 @@ import pyblish.api -import ayon_core.hosts.flame.api as opfapi -from ayon_core.hosts.flame.otio import flame_export +import ayon_flame.api as opfapi +from ayon_flame.otio import flame_export from ayon_core.pipeline.create import get_product_name diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py b/server_addon/flame/client/ayon_flame/plugins/publish/extract_otio_file.py similarity index 100% rename from client/ayon_core/hosts/flame/plugins/publish/extract_otio_file.py rename to server_addon/flame/client/ayon_flame/plugins/publish/extract_otio_file.py diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py b/server_addon/flame/client/ayon_flame/plugins/publish/extract_subset_resources.py similarity index 99% rename from client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py rename to server_addon/flame/client/ayon_flame/plugins/publish/extract_subset_resources.py index cae08cd76b..66c6181ffb 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py +++ b/server_addon/flame/client/ayon_flame/plugins/publish/extract_subset_resources.py @@ -5,8 +5,8 @@ from copy import deepcopy import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.flame import api as opfapi -from ayon_core.hosts.flame.api import MediaInfoFile +from ayon_flame import api as opfapi +from ayon_flame.api import MediaInfoFile from ayon_core.pipeline.editorial import ( get_media_range_with_retimes ) @@ -24,6 +24,8 @@ class ExtractProductResources(publish.Extractor): families = ["clip"] hosts = ["flame"] + settings_category = "flame" + # plugin defaults keep_original_representation = False diff --git a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py b/server_addon/flame/client/ayon_flame/plugins/publish/integrate_batch_group.py similarity index 99% rename from client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py rename to server_addon/flame/client/ayon_flame/plugins/publish/integrate_batch_group.py index d8669f836d..f77c9e9116 100644 --- a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py +++ b/server_addon/flame/client/ayon_flame/plugins/publish/integrate_batch_group.py @@ -3,7 +3,7 @@ import copy from collections import OrderedDict from pprint import pformat import pyblish -import ayon_core.hosts.flame.api as opfapi +import ayon_flame.api as opfapi import ayon_core.pipeline as op_pipeline from ayon_core.pipeline.workfile import get_workdir @@ -16,6 +16,8 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin): hosts = ["flame"] families = ["clip"] + settings_category = "flame" + # settings default_loader = "LoadClip" diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_thumbnails_jpg.xml diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/export_preset/openpype_seg_video_h264.xml diff --git a/client/ayon_core/hosts/flame/otio/__init__.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/__init__.py similarity index 100% rename from client/ayon_core/hosts/flame/otio/__init__.py rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/__init__.py diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/app_utils.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/app_utils.py similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/app_utils.py rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/app_utils.py diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/ftrack_lib.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/ftrack_lib.py similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/ftrack_lib.py rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/ftrack_lib.py diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/panel_app.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/panel_app.py similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/panel_app.py rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/panel_app.py diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/uiwidgets.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/uiwidgets.py similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/uiwidgets.py rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/modules/uiwidgets.py diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/openpype_babypublisher.py b/server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/openpype_babypublisher.py similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/openpype_babypublisher.py rename to server_addon/flame/client/ayon_flame/startup/openpype_babypublisher/openpype_babypublisher.py diff --git a/client/ayon_core/hosts/flame/startup/openpype_in_flame.py b/server_addon/flame/client/ayon_flame/startup/openpype_in_flame.py similarity index 99% rename from client/ayon_core/hosts/flame/startup/openpype_in_flame.py rename to server_addon/flame/client/ayon_flame/startup/openpype_in_flame.py index b9cbf9700b..8f319a88eb 100644 --- a/client/ayon_core/hosts/flame/startup/openpype_in_flame.py +++ b/server_addon/flame/client/ayon_flame/startup/openpype_in_flame.py @@ -4,7 +4,7 @@ from qtpy import QtWidgets from pprint import pformat import atexit -import ayon_core.hosts.flame.api as opfapi +import ayon_flame.api as opfapi from ayon_core.pipeline import ( install_host, registered_host, diff --git a/server_addon/flame/client/ayon_flame/version.py b/server_addon/flame/client/ayon_flame/version.py new file mode 100644 index 0000000000..0004797e59 --- /dev/null +++ b/server_addon/flame/client/ayon_flame/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'flame' version.""" +__version__ = "0.2.0" diff --git a/server_addon/flame/package.py b/server_addon/flame/package.py index 8c077ed91d..f228e61f8e 100644 --- a/server_addon/flame/package.py +++ b/server_addon/flame/package.py @@ -1,3 +1,10 @@ name = "flame" title = "Flame" -version = "0.1.0" +version = "0.2.0" + +client_dir = "ayon_flame" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/client/ayon_core/hosts/fusion/__init__.py b/server_addon/fusion/client/ayon_fusion/__init__.py similarity index 63% rename from client/ayon_core/hosts/fusion/__init__.py rename to server_addon/fusion/client/ayon_fusion/__init__.py index 1da11ba9d1..f2ddccdd87 100644 --- a/client/ayon_core/hosts/fusion/__init__.py +++ b/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", ) diff --git a/client/ayon_core/hosts/fusion/addon.py b/server_addon/fusion/client/ayon_fusion/addon.py similarity index 91% rename from client/ayon_core/hosts/fusion/addon.py rename to server_addon/fusion/client/ayon_fusion/addon.py index 54e48ea7bf..ffc70b6ff4 100644 --- a/client/ayon_core/hosts/fusion/addon.py +++ b/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 diff --git a/client/ayon_core/hosts/fusion/api/__init__.py b/server_addon/fusion/client/ayon_fusion/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/__init__.py rename to server_addon/fusion/client/ayon_fusion/api/__init__.py diff --git a/client/ayon_core/hosts/fusion/api/action.py b/server_addon/fusion/client/ayon_fusion/api/action.py similarity index 98% rename from client/ayon_core/hosts/fusion/api/action.py rename to server_addon/fusion/client/ayon_fusion/api/action.py index a0c6aafcb5..02cd96f56c 100644 --- a/client/ayon_core/hosts/fusion/api/action.py +++ b/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 diff --git a/client/ayon_core/hosts/fusion/api/lib.py b/server_addon/fusion/client/ayon_fusion/api/lib.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/lib.py rename to server_addon/fusion/client/ayon_fusion/api/lib.py diff --git a/client/ayon_core/hosts/fusion/api/menu.py b/server_addon/fusion/client/ayon_fusion/api/menu.py similarity index 98% rename from client/ayon_core/hosts/fusion/api/menu.py rename to server_addon/fusion/client/ayon_fusion/api/menu.py index 6a64ad2120..38d8c36bb1 100644 --- a/client/ayon_core/hosts/fusion/api/menu.py +++ b/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, ) diff --git a/client/ayon_core/hosts/fusion/api/pipeline.py b/server_addon/fusion/client/ayon_fusion/api/pipeline.py similarity index 98% rename from client/ayon_core/hosts/fusion/api/pipeline.py rename to server_addon/fusion/client/ayon_fusion/api/pipeline.py index 2d1073ec7d..04f0d3db9a 100644 --- a/client/ayon_core/hosts/fusion/api/pipeline.py +++ b/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) diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/server_addon/fusion/client/ayon_fusion/api/plugin.py similarity index 99% rename from client/ayon_core/hosts/fusion/api/plugin.py rename to server_addon/fusion/client/ayon_fusion/api/plugin.py index efe8269120..48e133cc63 100644 --- a/client/ayon_core/hosts/fusion/api/plugin.py +++ b/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, ) diff --git a/client/ayon_core/hosts/fusion/api/pulse.py b/server_addon/fusion/client/ayon_fusion/api/pulse.py similarity index 100% rename from client/ayon_core/hosts/fusion/api/pulse.py rename to server_addon/fusion/client/ayon_fusion/api/pulse.py diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/README.md b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/README.md similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/MenuScripts/README.md rename to server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/README.md diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/install_pyside2.py b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/install_pyside2.py similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/MenuScripts/install_pyside2.py rename to server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/install_pyside2.py diff --git a/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py b/server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py similarity index 81% rename from client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py rename to server_addon/fusion/client/ayon_fusion/deploy/MenuScripts/launch_menu.py index 640f78eeb8..0c5010f6a7 100644 --- a/client/ayon_core/hosts/fusion/deploy/MenuScripts/launch_menu.py +++ b/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()) diff --git a/client/ayon_core/hosts/fusion/deploy/ayon/Config/menu.fu b/server_addon/fusion/client/ayon_fusion/deploy/ayon/Config/menu.fu similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/ayon/Config/menu.fu rename to server_addon/fusion/client/ayon_fusion/deploy/ayon/Config/menu.fu diff --git a/client/ayon_core/hosts/fusion/deploy/ayon/fusion_shared.prefs b/server_addon/fusion/client/ayon_fusion/deploy/ayon/fusion_shared.prefs similarity index 100% rename from client/ayon_core/hosts/fusion/deploy/ayon/fusion_shared.prefs rename to server_addon/fusion/client/ayon_fusion/deploy/ayon/fusion_shared.prefs diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py similarity index 93% rename from client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_launch_menu_hook.py index 113a1ffe59..035cbb8d97 100644 --- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_launch_menu_hook.py +++ b/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("\\", "/") diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py similarity index 98% rename from client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_profile_hook.py index 1064d0a83a..7758798bb6 100644 --- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py +++ b/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) diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py similarity index 92% rename from client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_fusion_setup.py index ef084b0483..25cf40f18d 100644 --- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py +++ b/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 diff --git a/client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py b/server_addon/fusion/client/ayon_fusion/hooks/pre_pyside_install.py similarity index 100% rename from client/ayon_core/hosts/fusion/hooks/pre_pyside_install.py rename to server_addon/fusion/client/ayon_fusion/hooks/pre_pyside_install.py diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py similarity index 96% rename from client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py rename to server_addon/fusion/client/ayon_fusion/plugins/create/create_image_saver.py index 729843d078..d88219b268 100644 --- a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py similarity index 97% rename from client/ayon_core/hosts/fusion/plugins/create/create_saver.py rename to server_addon/fusion/client/ayon_fusion/plugins/create/create_saver.py index 20c7b99851..3e7d9486ce 100644 --- a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py similarity index 99% rename from client/ayon_core/hosts/fusion/plugins/create/create_workfile.py rename to server_addon/fusion/client/ayon_fusion/plugins/create/create_workfile.py index a2fe027ef4..3dc14861df 100644 --- a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py +++ b/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 ( diff --git a/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py b/server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py similarity index 92% rename from client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py rename to server_addon/fusion/client/ayon_fusion/plugins/inventory/select_containers.py index 167cd3be1f..e863c58ab3 100644 --- a/client/ayon_core/hosts/fusion/plugins/inventory/select_containers.py +++ b/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 ) diff --git a/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py b/server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py similarity index 97% rename from client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py rename to server_addon/fusion/client/ayon_fusion/plugins/inventory/set_tool_color.py index 7167cf0fc5..2c02afe32c 100644 --- a/client/ayon_core/hosts/fusion/plugins/inventory/set_tool_color.py +++ b/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 ) diff --git a/client/ayon_core/hosts/fusion/plugins/load/actions.py b/server_addon/fusion/client/ayon_fusion/plugins/load/actions.py similarity index 95% rename from client/ayon_core/hosts/fusion/plugins/load/actions.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/actions.py index 95400ea41c..dfa73e0b7a 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/actions.py +++ b/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) diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py similarity index 98% rename from client/ayon_core/hosts/fusion/plugins/load/load_alembic.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_alembic.py index 312362caca..2e763b5330 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_alembic.py +++ b/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 diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py similarity index 98% rename from client/ayon_core/hosts/fusion/plugins/load/load_fbx.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_fbx.py index a84e7e0914..a080fa3983 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_fbx.py +++ b/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, diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py similarity index 99% rename from client/ayon_core/hosts/fusion/plugins/load/load_sequence.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_sequence.py index 7c70b54e48..233f1d7021 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py +++ b/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, diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py similarity index 96% rename from client/ayon_core/hosts/fusion/plugins/load/load_usd.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_usd.py index 309b0c094c..42ce339faf 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py similarity index 95% rename from client/ayon_core/hosts/fusion/plugins/load/load_workfile.py rename to server_addon/fusion/client/ayon_fusion/plugins/load/load_workfile.py index 818fbcb187..c728f6b4aa 100644 --- a/client/ayon_core/hosts/fusion/plugins/load/load_workfile.py +++ b/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, ) diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py similarity index 91% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp.py index 591c460d5a..2e5bcd63db 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp_frame_range.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_comp_frame_range.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_comp_frame_range.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_inputs.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_inputs.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_inputs.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_instances.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_instances.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py similarity index 99% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_render.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_render.py index 9c04e59717..af52aee861 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py +++ b/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 diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_workfile.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/collect_workfile.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/collect_workfile.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/collect_workfile.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py similarity index 97% rename from client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/extract_render_local.py index 39fa20cfc0..bbcba5366d 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py +++ b/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__) diff --git a/client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/increment_current_file.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/increment_current_file.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/increment_current_file.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/save_scene.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/save_scene.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/save_scene.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/save_scene.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py similarity index 95% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_background_depth.py index d588748cfa..90b6b110a4 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_background_depth.py +++ b/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( diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_comp_saved.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_comp_saved.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_comp_saved.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py similarity index 95% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_create_folder_checked.py index 13ea85b48c..1b910123f0 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_create_folder_checked.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py similarity index 96% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_expected_frames_existence.py index 83d1feaefd..6dc9642581 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_expected_frames_existence.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py similarity index 94% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_filename_has_extension.py index 17b1aa47c8..471c0ca31a 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_filename_has_extension.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_image_frame.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_image_frame.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_image_frame.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_frame_range.py similarity index 100% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_instance_frame_range.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_frame_range.py diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py similarity index 97% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_instance_in_context.py index 3aa6fb452f..7b8b70b2fb 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_instance_in_context.py +++ b/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, diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py similarity index 93% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_has_input.py index a8977e4747..de2cd1d862 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_has_input.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py similarity index 96% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_passthrough.py index acafe3308f..caa17168bc 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_passthrough.py +++ b/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): diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py similarity index 96% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_saver_resolution.py index 17992b123c..15d96a9afc 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_saver_resolution.py +++ b/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( diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py b/server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py similarity index 97% rename from client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py rename to server_addon/fusion/client/ayon_fusion/plugins/publish/validate_unique_subsets.py index bcd9abd8b0..dd7df54da5 100644 --- a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py +++ b/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): diff --git a/client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/__init__.py b/server_addon/fusion/client/ayon_fusion/scripts/__init__.py similarity index 100% rename from client/ayon_core/hosts/flame/startup/openpype_babypublisher/modules/__init__.py rename to server_addon/fusion/client/ayon_fusion/scripts/__init__.py diff --git a/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py b/server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py similarity index 97% rename from client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py rename to server_addon/fusion/client/ayon_fusion/scripts/duplicate_with_inputs.py index 727fd335ea..78edb1b3ba 100644 --- a/client/ayon_core/hosts/fusion/scripts/duplicate_with_inputs.py +++ b/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 ) diff --git a/client/ayon_core/hosts/fusion/vendor/attr/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/__init__.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/__init__.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/__init__.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_cmp.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_cmp.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_cmp.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_cmp.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_cmp.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_compat.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_compat.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_compat.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_compat.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_config.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_config.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_config.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_config.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_funcs.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_funcs.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_funcs.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_funcs.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_make.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_make.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_make.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_make.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_next_gen.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_next_gen.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_next_gen.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_next_gen.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_version_info.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_version_info.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/_version_info.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/_version_info.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/_version_info.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/converters.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/converters.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/converters.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/converters.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/converters.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/converters.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/converters.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/converters.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/exceptions.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/exceptions.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/exceptions.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/exceptions.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/exceptions.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/filters.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/filters.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/filters.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/filters.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/filters.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/filters.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/filters.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/filters.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/py.typed b/server_addon/fusion/client/ayon_fusion/vendor/attr/py.typed similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/py.typed rename to server_addon/fusion/client/ayon_fusion/vendor/attr/py.typed diff --git a/client/ayon_core/hosts/fusion/vendor/attr/setters.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/setters.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/setters.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/setters.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/setters.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/setters.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/setters.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/setters.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/attr/validators.py b/server_addon/fusion/client/ayon_fusion/vendor/attr/validators.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/validators.py rename to server_addon/fusion/client/ayon_fusion/vendor/attr/validators.py diff --git a/client/ayon_core/hosts/fusion/vendor/attr/validators.pyi b/server_addon/fusion/client/ayon_fusion/vendor/attr/validators.pyi similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/attr/validators.pyi rename to server_addon/fusion/client/ayon_fusion/vendor/attr/validators.pyi diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/_collections.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/_collections.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/_collections.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/_collections.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/_version.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/_version.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/_version.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/_version.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/connection.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/connection.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/connection.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/connection.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/connectionpool.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/connectionpool.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/connectionpool.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/connectionpool.py diff --git a/client/ayon_core/hosts/fusion/scripts/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/scripts/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_appengine_environ.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_appengine_environ.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_appengine_environ.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_appengine_environ.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/bindings.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/bindings.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/bindings.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/bindings.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/low_level.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/low_level.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/low_level.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/_securetransport/low_level.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/appengine.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/appengine.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/appengine.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/appengine.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/ntlmpool.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/ntlmpool.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/ntlmpool.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/ntlmpool.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/pyopenssl.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/pyopenssl.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/pyopenssl.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/pyopenssl.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/securetransport.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/securetransport.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/securetransport.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/securetransport.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/socks.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/socks.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/socks.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/contrib/socks.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/exceptions.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/exceptions.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/exceptions.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/exceptions.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/fields.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/fields.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/fields.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/fields.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/filepost.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/filepost.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/filepost.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/filepost.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/contrib/_securetransport/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/makefile.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/makefile.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/makefile.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/backports/makefile.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/six.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/six.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/six.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/six.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/packages/ssl_match_hostname/_implementation.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/poolmanager.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/poolmanager.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/poolmanager.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/poolmanager.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/request.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/request.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/request.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/request.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/response.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/response.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/response.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/response.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/__init__.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/__init__.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/__init__.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/connection.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/connection.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/connection.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/connection.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/proxy.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/proxy.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/proxy.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/proxy.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/queue.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/queue.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/queue.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/queue.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/request.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/request.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/request.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/request.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/response.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/response.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/response.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/response.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/retry.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/retry.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/retry.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/retry.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/ssl_.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssl_.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/ssl_.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssl_.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/ssltransport.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssltransport.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/ssltransport.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/ssltransport.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/timeout.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/timeout.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/timeout.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/timeout.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/url.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/url.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/url.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/url.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/util/wait.py b/server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/wait.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/util/wait.py rename to server_addon/fusion/client/ayon_fusion/vendor/urllib3/util/wait.py diff --git a/server_addon/fusion/client/ayon_fusion/version.py b/server_addon/fusion/client/ayon_fusion/version.py new file mode 100644 index 0000000000..209eddcdb6 --- /dev/null +++ b/server_addon/fusion/client/ayon_fusion/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'fusion' version.""" +__version__ = "0.2.0" diff --git a/server_addon/fusion/package.py b/server_addon/fusion/package.py index 9e7a46df2c..e82e9bf0f6 100644 --- a/server_addon/fusion/package.py +++ b/server_addon/fusion/package.py @@ -1,3 +1,10 @@ name = "fusion" title = "Fusion" -version = "0.1.5" +version = "0.2.0" + +client_dir = "ayon_fusion" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/server_addon/hiero/client/ayon_hiero/__init__.py b/server_addon/hiero/client/ayon_hiero/__init__.py new file mode 100644 index 0000000000..2dc490c1e9 --- /dev/null +++ b/server_addon/hiero/client/ayon_hiero/__init__.py @@ -0,0 +1,13 @@ +from .version import __version__ +from .addon import ( + HIERO_ADDON_ROOT, + HieroAddon, +) + + +__all__ = ( + "__version__", + + "HIERO_ADDON_ROOT", + "HieroAddon", +) diff --git a/client/ayon_core/hosts/hiero/addon.py b/server_addon/hiero/client/ayon_hiero/addon.py similarity index 89% rename from client/ayon_core/hosts/hiero/addon.py rename to server_addon/hiero/client/ayon_hiero/addon.py index f612493ca1..671e29151b 100644 --- a/client/ayon_core/hosts/hiero/addon.py +++ b/server_addon/hiero/client/ayon_hiero/addon.py @@ -2,17 +2,20 @@ import os import platform from ayon_core.addon import AYONAddon, IHostAddon -HIERO_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) +from .version import __version__ + +HIERO_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__)) class HieroAddon(AYONAddon, IHostAddon): name = "hiero" + version = __version__ host_name = "hiero" def add_implementation_envs(self, env, _app): # Add requirements to HIERO_PLUGIN_PATH new_hiero_paths = [ - os.path.join(HIERO_ROOT_DIR, "api", "startup") + os.path.join(HIERO_ADDON_ROOT, "api", "startup") ] old_hiero_path = env.get("HIERO_PLUGIN_PATH") or "" for path in old_hiero_path.split(os.pathsep): @@ -36,7 +39,7 @@ class HieroAddon(AYONAddon, IHostAddon): python_path_parts = [] if python_path: python_path_parts = python_path.split(os.pathsep) - vendor_path = os.path.join(HIERO_ROOT_DIR, "vendor") + vendor_path = os.path.join(HIERO_ADDON_ROOT, "vendor") python_path_parts.insert(0, vendor_path) env["PYTHONPATH"] = os.pathsep.join(python_path_parts) diff --git a/client/ayon_core/hosts/hiero/api/__init__.py b/server_addon/hiero/client/ayon_hiero/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/__init__.py rename to server_addon/hiero/client/ayon_hiero/api/__init__.py diff --git a/client/ayon_core/hosts/hiero/api/constants.py b/server_addon/hiero/client/ayon_hiero/api/constants.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/constants.py rename to server_addon/hiero/client/ayon_hiero/api/constants.py diff --git a/client/ayon_core/hosts/hiero/api/events.py b/server_addon/hiero/client/ayon_hiero/api/events.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/events.py rename to server_addon/hiero/client/ayon_hiero/api/events.py diff --git a/client/ayon_core/hosts/hiero/api/launchforhiero.py b/server_addon/hiero/client/ayon_hiero/api/launchforhiero.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/launchforhiero.py rename to server_addon/hiero/client/ayon_hiero/api/launchforhiero.py diff --git a/client/ayon_core/hosts/hiero/api/lib.py b/server_addon/hiero/client/ayon_hiero/api/lib.py similarity index 99% rename from client/ayon_core/hosts/hiero/api/lib.py rename to server_addon/hiero/client/ayon_hiero/api/lib.py index 456a68f125..2a6038fb98 100644 --- a/client/ayon_core/hosts/hiero/api/lib.py +++ b/server_addon/hiero/client/ayon_hiero/api/lib.py @@ -453,19 +453,19 @@ def get_track_openpype_data(track, container_name=None): ) -@deprecated("ayon_core.hosts.hiero.api.lib.get_trackitem_openpype_tag") +@deprecated("ayon_hiero.api.lib.get_trackitem_openpype_tag") def get_track_item_pype_tag(track_item): # backward compatibility alias return get_trackitem_openpype_tag(track_item) -@deprecated("ayon_core.hosts.hiero.api.lib.set_trackitem_openpype_tag") +@deprecated("ayon_hiero.api.lib.set_trackitem_openpype_tag") def set_track_item_pype_tag(track_item, data=None): # backward compatibility alias return set_trackitem_openpype_tag(track_item, data) -@deprecated("ayon_core.hosts.hiero.api.lib.get_trackitem_openpype_data") +@deprecated("ayon_hiero.api.lib.get_trackitem_openpype_data") def get_track_item_pype_data(track_item): # backward compatibility alias return get_trackitem_openpype_data(track_item) @@ -802,7 +802,7 @@ class PublishAction(QtWidgets.QAction): # # ''' # import hiero.core -# from ayon_core.hosts.nuke.api.lib import ( +# from ayon_nuke.api.lib import ( # BuildWorkfile, # imprint # ) diff --git a/client/ayon_core/hosts/hiero/api/menu.py b/server_addon/hiero/client/ayon_hiero/api/menu.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/menu.py rename to server_addon/hiero/client/ayon_hiero/api/menu.py diff --git a/client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/__init__.py b/server_addon/hiero/client/ayon_hiero/api/otio/__init__.py similarity index 100% rename from client/ayon_core/hosts/fusion/vendor/urllib3/packages/backports/__init__.py rename to server_addon/hiero/client/ayon_hiero/api/otio/__init__.py diff --git a/client/ayon_core/hosts/hiero/api/otio/hiero_export.py b/server_addon/hiero/client/ayon_hiero/api/otio/hiero_export.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/otio/hiero_export.py rename to server_addon/hiero/client/ayon_hiero/api/otio/hiero_export.py diff --git a/client/ayon_core/hosts/hiero/api/otio/hiero_import.py b/server_addon/hiero/client/ayon_hiero/api/otio/hiero_import.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/otio/hiero_import.py rename to server_addon/hiero/client/ayon_hiero/api/otio/hiero_import.py diff --git a/client/ayon_core/hosts/hiero/api/otio/utils.py b/server_addon/hiero/client/ayon_hiero/api/otio/utils.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/otio/utils.py rename to server_addon/hiero/client/ayon_hiero/api/otio/utils.py diff --git a/client/ayon_core/hosts/hiero/api/pipeline.py b/server_addon/hiero/client/ayon_hiero/api/pipeline.py similarity index 96% rename from client/ayon_core/hosts/hiero/api/pipeline.py rename to server_addon/hiero/client/ayon_hiero/api/pipeline.py index 327a4ae29c..58045c4331 100644 --- a/client/ayon_core/hosts/hiero/api/pipeline.py +++ b/server_addon/hiero/client/ayon_hiero/api/pipeline.py @@ -6,7 +6,9 @@ import os import contextlib from collections import OrderedDict +import hiero from pyblish import api as pyblish + from ayon_core.lib import Logger from ayon_core.pipeline import ( schema, @@ -18,15 +20,14 @@ from ayon_core.pipeline import ( AYON_CONTAINER_ID, ) from ayon_core.tools.utils import host_tools +from ayon_hiero import HIERO_ADDON_ROOT + from . import lib, menu, events -import hiero log = Logger.get_logger(__name__) # plugin paths -API_DIR = os.path.dirname(os.path.abspath(__file__)) -HOST_DIR = os.path.dirname(API_DIR) -PLUGINS_DIR = os.path.join(HOST_DIR, "plugins") +PLUGINS_DIR = os.path.join(HIERO_ADDON_ROOT, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish").replace("\\", "/") LOAD_PATH = os.path.join(PLUGINS_DIR, "load").replace("\\", "/") CREATE_PATH = os.path.join(PLUGINS_DIR, "create").replace("\\", "/") @@ -308,9 +309,9 @@ def reload_config(): import importlib for module in ( - "ayon_core.hosts.hiero.lib", - "ayon_core.hosts.hiero.menu", - "ayon_core.hosts.hiero.tags" + "ayon_hiero.lib", + "ayon_hiero.menu", + "ayon_hiero.tags" ): log.info("Reloading module: {}...".format(module)) try: @@ -328,7 +329,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.hiero.api import ( + from ayon_hiero.api import ( get_trackitem_openpype_tag, set_publish_attribute ) diff --git a/client/ayon_core/hosts/hiero/api/plugin.py b/server_addon/hiero/client/ayon_hiero/api/plugin.py similarity index 99% rename from client/ayon_core/hosts/hiero/api/plugin.py rename to server_addon/hiero/client/ayon_hiero/api/plugin.py index 1353673b31..16eb1d55f3 100644 --- a/client/ayon_core/hosts/hiero/api/plugin.py +++ b/server_addon/hiero/client/ayon_hiero/api/plugin.py @@ -550,7 +550,8 @@ class ClipLoader: log.debug("__ self.timeline_out: {}".format(self.timeline_out)) # check if slate is included - slate_on = "slate" in self.context["version"]["data"]["families"] + slate_on = "slate" in self.context["version"]["data"].get( + "families", []) log.debug("__ slate_on: {}".format(slate_on)) # if slate is on then remove the slate frame from beginning @@ -600,7 +601,7 @@ class Creator(LegacyCreator): def __init__(self, *args, **kwargs): super(Creator, self).__init__(*args, **kwargs) - import ayon_core.hosts.hiero.api as phiero + import ayon_hiero.api as phiero self.presets = get_current_project_settings()[ "hiero"]["create"].get(self.__class__.__name__, {}) diff --git a/client/ayon_core/hosts/hiero/api/startup/HieroPlayer/PlayerPresets.hrox b/server_addon/hiero/client/ayon_hiero/api/startup/HieroPlayer/PlayerPresets.hrox similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/HieroPlayer/PlayerPresets.hrox rename to server_addon/hiero/client/ayon_hiero/api/startup/HieroPlayer/PlayerPresets.hrox diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/1_add_handles_end.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/1_add_handles_end.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/1_add_handles_end.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/1_add_handles_end.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/2_add_handles.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/2_add_handles.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/2_add_handles.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/2_add_handles.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/3D.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/3D.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/3D.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/3D.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/3_add_handles_start.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/3_add_handles_start.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/3_add_handles_start.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/3_add_handles_start.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/4_2D.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/4_2D.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/4_2D.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/4_2D.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/edit.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/edit.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/edit.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/edit.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/fusion.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/fusion.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/fusion.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/fusion.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/hierarchy.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/hierarchy.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/hierarchy.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/hierarchy.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/houdini.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/houdini.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/houdini.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/houdini.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/layers.psd b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/layers.psd similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/layers.psd rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/layers.psd diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/lense.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/lense.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/lense.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/lense.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/lense1.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/lense1.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/lense1.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/lense1.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/maya.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/maya.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/maya.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/maya.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/nuke.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/nuke.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/nuke.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/nuke.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/pype_icon.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/pype_icon.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/pype_icon.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/pype_icon.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/resolution.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/resolution.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/resolution.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/resolution.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/resolution.psd b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/resolution.psd similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/resolution.psd rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/resolution.psd diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/retiming.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/retiming.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/retiming.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/retiming.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/retiming.psd b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/retiming.psd similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/retiming.psd rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/retiming.psd diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/review.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/review.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/review.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/review.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/review.psd b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/review.psd similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/review.psd rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/review.psd diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/volume.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/volume.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/volume.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/volume.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/z_layer_bg.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/z_layer_bg.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/z_layer_bg.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/z_layer_bg.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/z_layer_fg.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/z_layer_fg.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/z_layer_fg.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/z_layer_fg.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Icons/z_layer_main.png b/server_addon/hiero/client/ayon_hiero/api/startup/Icons/z_layer_main.png similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Icons/z_layer_main.png rename to server_addon/hiero/client/ayon_hiero/api/startup/Icons/z_layer_main.png diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/SpreadsheetExport.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/SpreadsheetExport.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/SpreadsheetExport.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/SpreadsheetExport.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/Startup.py similarity index 70% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/Startup.py index cffab8067c..c916bf37e9 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/Startup.py +++ b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/Startup.py @@ -2,11 +2,11 @@ import traceback # activate hiero from pype from ayon_core.pipeline import install_host -import ayon_core.hosts.hiero.api as phiero +import ayon_hiero.api as phiero install_host(phiero) try: - __import__("ayon_core.hosts.hiero.api") + __import__("ayon_hiero.api") __import__("pyblish") except ImportError as e: @@ -15,5 +15,5 @@ except ImportError as e: else: # Setup integration - import ayon_core.hosts.hiero.api as phiero + import ayon_hiero.api as phiero phiero.lib.setup() diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py similarity index 97% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py index bd5048a832..d4cb342c72 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py +++ b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/OTIOExportTask.py @@ -8,7 +8,7 @@ import hiero.core from hiero.core import util import opentimelineio as otio -from ayon_core.hosts.hiero.api.otio import hiero_export +from ayon_hiero.api.otio import hiero_export class OTIOExportTask(hiero.core.TaskBase): diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py similarity index 97% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py index 25aa8bb0cf..131b385f53 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py +++ b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/OTIOExportUI.py @@ -22,7 +22,7 @@ except ImportError: FormLayout = QFormLayout # lint:ok -from ayon_core.hosts.hiero.api.otio import hiero_export +from ayon_hiero.api.otio import hiero_export class OTIOExportUI(hiero.ui.TaskUIBase): def __init__(self, preset): diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/__init__.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/otioexporter/__init__.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/otioexporter/__init__.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/project_helpers.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/project_helpers.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/project_helpers.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/project_helpers.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/selection_tracker.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/selection_tracker.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/selection_tracker.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/selection_tracker.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/Startup/setFrameRate.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/setFrameRate.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/Startup/setFrameRate.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/Startup/setFrameRate.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/PimpMySpreadsheet.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/PimpMySpreadsheet.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/PimpMySpreadsheet.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/PimpMySpreadsheet.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/Purge.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/Purge.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/Purge.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/Purge.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/nukeStyleKeyboardShortcuts.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/nukeStyleKeyboardShortcuts.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/nukeStyleKeyboardShortcuts.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/nukeStyleKeyboardShortcuts.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/OTIOImport.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/otioimporter/OTIOImport.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/OTIOImport.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/otioimporter/OTIOImport.py diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/otioimporter/__init__.py similarity index 98% rename from client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/otioimporter/__init__.py index 29507db975..c0f1cc9c67 100644 --- a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/otioimporter/__init__.py +++ b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/otioimporter/__init__.py @@ -9,7 +9,7 @@ import hiero.core import PySide2.QtWidgets as qw -from ayon_core.hosts.hiero.api.otio.hiero_import import load_otio +from ayon_hiero.api.otio.hiero_import import load_otio class OTIOProjectSelect(qw.QDialog): diff --git a/client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/setPosterFrame.py b/server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/setPosterFrame.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/Python/StartupUI/setPosterFrame.py rename to server_addon/hiero/client/ayon_hiero/api/startup/Python/StartupUI/setPosterFrame.py diff --git a/client/ayon_core/hosts/hiero/api/startup/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/server_addon/hiero/client/ayon_hiero/api/startup/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml rename to server_addon/hiero/client/ayon_hiero/api/startup/TaskPresets/10.5/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml diff --git a/client/ayon_core/hosts/hiero/api/startup/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/server_addon/hiero/client/ayon_hiero/api/startup/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml rename to server_addon/hiero/client/ayon_hiero/api/startup/TaskPresets/11.1/Processors/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml diff --git a/client/ayon_core/hosts/hiero/api/startup/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml b/server_addon/hiero/client/ayon_hiero/api/startup/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml similarity index 100% rename from client/ayon_core/hosts/hiero/api/startup/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml rename to server_addon/hiero/client/ayon_hiero/api/startup/TaskPresets/11.2/hiero.exporters.FnShotProcessor.ShotProcessor/pipeline.xml diff --git a/client/ayon_core/hosts/hiero/api/style.css b/server_addon/hiero/client/ayon_hiero/api/style.css similarity index 100% rename from client/ayon_core/hosts/hiero/api/style.css rename to server_addon/hiero/client/ayon_hiero/api/style.css diff --git a/client/ayon_core/hosts/hiero/api/tags.py b/server_addon/hiero/client/ayon_hiero/api/tags.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/tags.py rename to server_addon/hiero/client/ayon_hiero/api/tags.py diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/server_addon/hiero/client/ayon_hiero/api/workio.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/workio.py rename to server_addon/hiero/client/ayon_hiero/api/workio.py diff --git a/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py b/server_addon/hiero/client/ayon_hiero/plugins/create/create_shot_clip.py similarity index 99% rename from client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py rename to server_addon/hiero/client/ayon_hiero/plugins/create/create_shot_clip.py index 1fc808fdd1..201cf382e2 100644 --- a/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/create/create_shot_clip.py @@ -1,6 +1,6 @@ from copy import deepcopy -import ayon_core.hosts.hiero.api as phiero -# from ayon_core.hosts.hiero.api import plugin, lib +import ayon_hiero.api as phiero +# from ayon_hiero.api import plugin, lib # reload(lib) # reload(plugin) # reload(phiero) diff --git a/client/ayon_core/hosts/hiero/plugins/load/load_clip.py b/server_addon/hiero/client/ayon_hiero/plugins/load/load_clip.py similarity index 99% rename from client/ayon_core/hosts/hiero/plugins/load/load_clip.py rename to server_addon/hiero/client/ayon_hiero/plugins/load/load_clip.py index 715e8c508e..d93730c735 100644 --- a/client/ayon_core/hosts/hiero/plugins/load/load_clip.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/load/load_clip.py @@ -5,7 +5,7 @@ from ayon_core.lib.transcoding import ( VIDEO_EXTENSIONS, IMAGE_EXTENSIONS ) -import ayon_core.hosts.hiero.api as phiero +import ayon_hiero.api as phiero class LoadClip(phiero.SequenceLoader): diff --git a/client/ayon_core/hosts/hiero/plugins/load/load_effects.py b/server_addon/hiero/client/ayon_hiero/plugins/load/load_effects.py similarity index 99% rename from client/ayon_core/hosts/hiero/plugins/load/load_effects.py rename to server_addon/hiero/client/ayon_hiero/plugins/load/load_effects.py index 92aa2de325..24130f7485 100644 --- a/client/ayon_core/hosts/hiero/plugins/load/load_effects.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/load/load_effects.py @@ -7,7 +7,7 @@ from ayon_core.pipeline import ( load, get_representation_path, ) -from ayon_core.hosts.hiero import api as phiero +from ayon_hiero import api as phiero from ayon_core.lib import Logger diff --git a/client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/collect_clip_effects.py similarity index 99% rename from client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/collect_clip_effects.py index bfc63f2551..bd8af3b51a 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/publish/collect_clip_effects.py @@ -9,6 +9,7 @@ class CollectClipEffects(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder - 0.078 label = "Collect Clip Effects Instances" families = ["clip"] + settings_category = "hiero" effect_categories = [] diff --git a/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/collect_frame_tag_instances.py similarity index 100% rename from client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/collect_frame_tag_instances.py diff --git a/client/ayon_core/hosts/hiero/plugins/publish/collect_tag_tasks.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/collect_tag_tasks.py similarity index 100% rename from client/ayon_core/hosts/hiero/plugins/publish/collect_tag_tasks.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/collect_tag_tasks.py diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/extract_clip_effects.py similarity index 99% rename from client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/extract_clip_effects.py index 25b52968fa..7ee979c37a 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/publish/extract_clip_effects.py @@ -1,4 +1,3 @@ -# from ayon_core import plugins import os import json import pyblish.api diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_frames.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/extract_frames.py similarity index 100% rename from client/ayon_core/hosts/hiero/plugins/publish/extract_frames.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/extract_frames.py diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_thumbnail.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/extract_thumbnail.py similarity index 100% rename from client/ayon_core/hosts/hiero/plugins/publish/extract_thumbnail.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/extract_thumbnail.py diff --git a/client/ayon_core/hosts/hiero/plugins/publish/integrate_version_up_workfile.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/integrate_version_up_workfile.py similarity index 100% rename from client/ayon_core/hosts/hiero/plugins/publish/integrate_version_up_workfile.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/integrate_version_up_workfile.py diff --git a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/precollect_instances.py similarity index 99% rename from client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/precollect_instances.py index b7a508f0b5..fa2c56182e 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/publish/precollect_instances.py @@ -3,8 +3,8 @@ import pyblish from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID from ayon_core.pipeline.editorial import is_overlapping_otio_ranges -from ayon_core.hosts.hiero import api as phiero -from ayon_core.hosts.hiero.api.otio import hiero_export +from ayon_hiero import api as phiero +from ayon_hiero.api.otio import hiero_export import hiero # # developer reload modules diff --git a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py b/server_addon/hiero/client/ayon_hiero/plugins/publish/precollect_workfile.py similarity index 98% rename from client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish/precollect_workfile.py index 0b6b34ea6c..1dd21b3f21 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/publish/precollect_workfile.py @@ -7,7 +7,7 @@ from qtpy.QtGui import QPixmap import hiero.ui -from ayon_core.hosts.hiero.api.otio import hiero_export +from ayon_hiero.api.otio import hiero_export class PrecollectWorkfile(pyblish.api.ContextPlugin): diff --git a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_tag_comments.py b/server_addon/hiero/client/ayon_hiero/plugins/publish_old_workflow/collect_tag_comments.py similarity index 100% rename from client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_tag_comments.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish_old_workflow/collect_tag_comments.py diff --git a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py b/server_addon/hiero/client/ayon_hiero/plugins/publish_old_workflow/precollect_retime.py similarity index 98% rename from client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py rename to server_addon/hiero/client/ayon_hiero/plugins/publish_old_workflow/precollect_retime.py index 8503a0b6a7..c511b40abc 100644 --- a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/precollect_retime.py +++ b/server_addon/hiero/client/ayon_hiero/plugins/publish_old_workflow/precollect_retime.py @@ -1,7 +1,7 @@ from pyblish import api import hiero import math -from ayon_core.hosts.hiero.api.otio.hiero_export import create_otio_time_range +from ayon_hiero.api.otio.hiero_export import create_otio_time_range class PrecollectRetime(api.InstancePlugin): """Calculate Retiming of selected track items.""" diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/__init__.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/__init__.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/__init__.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/any_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/any_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/any_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/any_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/api_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/api_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/api_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/api_pb2.py diff --git a/client/ayon_core/hosts/hiero/api/otio/__init__.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/compiler/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/api/otio/__init__.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/compiler/__init__.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/compiler/plugin_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/compiler/plugin_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/compiler/plugin_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/compiler/plugin_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor_database.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor_database.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor_database.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor_database.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor_pool.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor_pool.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor_pool.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/descriptor_pool.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/duration_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/duration_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/duration_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/duration_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/empty_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/empty_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/empty_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/empty_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/field_mask_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/field_mask_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/field_mask_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/field_mask_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/compiler/__init__.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/compiler/__init__.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/__init__.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/_parameterized.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/_parameterized.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/_parameterized.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/_parameterized.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/api_implementation.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/api_implementation.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/api_implementation.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/api_implementation.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/builder.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/builder.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/builder.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/builder.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/containers.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/containers.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/containers.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/containers.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/decoder.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/decoder.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/decoder.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/decoder.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/encoder.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/encoder.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/encoder.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/encoder.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/enum_type_wrapper.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/enum_type_wrapper.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/enum_type_wrapper.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/enum_type_wrapper.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/extension_dict.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/extension_dict.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/extension_dict.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/extension_dict.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/message_listener.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/message_listener.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/message_listener.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/message_listener.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/message_set_extensions_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/message_set_extensions_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/message_set_extensions_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/message_set_extensions_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/missing_enum_values_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/missing_enum_values_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/missing_enum_values_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/missing_enum_values_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/more_extensions_dynamic_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/more_extensions_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/more_extensions_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/more_extensions_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/more_extensions_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/more_messages_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/more_messages_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/more_messages_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/more_messages_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/no_package_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/no_package_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/no_package_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/no_package_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/python_message.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/python_message.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/python_message.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/python_message.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/type_checkers.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/type_checkers.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/type_checkers.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/type_checkers.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/well_known_types.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/well_known_types.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/well_known_types.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/well_known_types.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/wire_format.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/wire_format.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/wire_format.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/internal/wire_format.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/json_format.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/json_format.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/json_format.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/json_format.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/message.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/message.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/message.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/message.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/message_factory.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/message_factory.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/message_factory.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/message_factory.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/proto_builder.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/proto_builder.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/proto_builder.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/proto_builder.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/__init__.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/pyext/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/internal/__init__.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/pyext/__init__.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/pyext/cpp_message.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/pyext/cpp_message.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/pyext/cpp_message.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/pyext/cpp_message.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/pyext/python_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/pyext/python_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/pyext/python_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/pyext/python_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/reflection.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/reflection.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/reflection.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/reflection.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/service.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/service.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/service.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/service.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/service_reflection.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/service_reflection.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/service_reflection.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/service_reflection.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/source_context_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/source_context_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/source_context_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/source_context_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/struct_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/struct_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/struct_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/struct_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/symbol_database.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/symbol_database.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/symbol_database.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/symbol_database.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/text_encoding.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_encoding.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/text_encoding.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_encoding.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/text_format.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/text_format.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/text_format.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/timestamp_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/timestamp_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/timestamp_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/timestamp_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/type_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/type_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/type_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/type_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/pyext/__init__.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/util/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/pyext/__init__.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/util/__init__.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/util/json_format_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/util/json_format_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/util/json_format_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/util/json_format_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/util/json_format_proto3_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/util/json_format_proto3_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/util/json_format_proto3_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/util/json_format_proto3_pb2.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/wrappers_pb2.py b/server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/wrappers_pb2.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/wrappers_pb2.py rename to server_addon/hiero/client/ayon_hiero/vendor/google/protobuf/wrappers_pb2.py diff --git a/server_addon/hiero/client/ayon_hiero/version.py b/server_addon/hiero/client/ayon_hiero/version.py new file mode 100644 index 0000000000..6a2d180afb --- /dev/null +++ b/server_addon/hiero/client/ayon_hiero/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'hiero' version.""" +__version__ = "0.2.0" diff --git a/server_addon/hiero/package.py b/server_addon/hiero/package.py index 54c2f74fa7..1948d50e6d 100644 --- a/server_addon/hiero/package.py +++ b/server_addon/hiero/package.py @@ -1,3 +1,9 @@ name = "hiero" title = "Hiero" -version = "0.1.3" +version = "0.2.0" +client_dir = "ayon_hiero" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/server_addon/hiero/server/settings/publish_plugins.py b/server_addon/hiero/server/settings/publish_plugins.py index 0e43d4ce3a..632bb15241 100644 --- a/server_addon/hiero/server/settings/publish_plugins.py +++ b/server_addon/hiero/server/settings/publish_plugins.py @@ -7,13 +7,6 @@ from ayon_server.settings import ( ) -class CollectInstanceVersionModel(BaseSettingsModel): - enabled: bool = SettingsField( - True, - title="Enabled" - ) - - class CollectClipEffectsDefModel(BaseSettingsModel): _layout = "expanded" name: str = SettingsField("", title="Name") @@ -38,46 +31,14 @@ class CollectClipEffectsModel(BaseSettingsModel): return value -class ExtractReviewCutUpVideoModel(BaseSettingsModel): - enabled: bool = SettingsField( - True, - title="Enabled" - ) - tags_addition: list[str] = SettingsField( - default_factory=list, - title="Additional tags" - ) - - class PublishPluginsModel(BaseSettingsModel): - CollectInstanceVersion: CollectInstanceVersionModel = SettingsField( - default_factory=CollectInstanceVersionModel, - title="Collect Instance Version" - ) CollectClipEffects: CollectClipEffectsModel = SettingsField( default_factory=CollectClipEffectsModel, title="Collect Clip Effects" ) - """# TODO: enhance settings with host api: - Rename class name and plugin name - to match title (it makes more sense) - """ - ExtractReviewCutUpVideo: ExtractReviewCutUpVideoModel = SettingsField( - default_factory=ExtractReviewCutUpVideoModel, - title="Exctract Review Trim" - ) DEFAULT_PUBLISH_PLUGIN_SETTINGS = { - "CollectInstanceVersion": { - "enabled": False, - }, - "ExtractReviewCutUpVideo": { - "enabled": True, - "tags_addition": [ - "review" - ] - }, "CollectClipEffectsModel": { "effect_categories": [] } diff --git a/client/ayon_core/hosts/houdini/__init__.py b/server_addon/houdini/client/ayon_houdini/__init__.py similarity index 100% rename from client/ayon_core/hosts/houdini/__init__.py rename to server_addon/houdini/client/ayon_houdini/__init__.py diff --git a/client/ayon_core/hosts/houdini/addon.py b/server_addon/houdini/client/ayon_houdini/addon.py similarity index 100% rename from client/ayon_core/hosts/houdini/addon.py rename to server_addon/houdini/client/ayon_houdini/addon.py diff --git a/client/ayon_core/hosts/houdini/api/__init__.py b/server_addon/houdini/client/ayon_houdini/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/houdini/api/__init__.py rename to server_addon/houdini/client/ayon_houdini/api/__init__.py diff --git a/client/ayon_core/hosts/houdini/api/action.py b/server_addon/houdini/client/ayon_houdini/api/action.py similarity index 100% rename from client/ayon_core/hosts/houdini/api/action.py rename to server_addon/houdini/client/ayon_houdini/api/action.py diff --git a/client/ayon_core/hosts/houdini/api/colorspace.py b/server_addon/houdini/client/ayon_houdini/api/colorspace.py similarity index 95% rename from client/ayon_core/hosts/houdini/api/colorspace.py rename to server_addon/houdini/client/ayon_houdini/api/colorspace.py index 66581d6f20..ec6e4c2091 100644 --- a/client/ayon_core/hosts/houdini/api/colorspace.py +++ b/server_addon/houdini/client/ayon_houdini/api/colorspace.py @@ -1,6 +1,6 @@ import attr import hou -from ayon_core.hosts.houdini.api.lib import get_color_management_preferences +from ayon_houdini.api.lib import get_color_management_preferences from ayon_core.pipeline.colorspace import get_display_view_colorspace_name @attr.s diff --git a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py b/server_addon/houdini/client/ayon_houdini/api/creator_node_shelves.py similarity index 98% rename from client/ayon_core/hosts/houdini/api/creator_node_shelves.py rename to server_addon/houdini/client/ayon_houdini/api/creator_node_shelves.py index 72c157f187..4d5a706749 100644 --- a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py +++ b/server_addon/houdini/client/ayon_houdini/api/creator_node_shelves.py @@ -35,7 +35,7 @@ CATEGORY_GENERIC_TOOL = { CREATE_SCRIPT = """ -from ayon_core.hosts.houdini.api.creator_node_shelves import create_interactive +from ayon_houdini.api.creator_node_shelves import create_interactive create_interactive("{identifier}", **kwargs) """ @@ -153,7 +153,7 @@ def install(): This function is re-entrant and can be called again to reinstall and update the node definitions. For example during development it can be useful to call it manually: - >>> from ayon_core.hosts.houdini.api.creator_node_shelves import install + >>> from ayon_houdini.api.creator_node_shelves import install >>> install() Returns: diff --git a/client/ayon_core/hosts/houdini/api/lib.py b/server_addon/houdini/client/ayon_houdini/api/lib.py similarity index 99% rename from client/ayon_core/hosts/houdini/api/lib.py rename to server_addon/houdini/client/ayon_houdini/api/lib.py index 7ca8f7f8f0..671265fae9 100644 --- a/client/ayon_core/hosts/houdini/api/lib.py +++ b/server_addon/houdini/client/ayon_houdini/api/lib.py @@ -1027,7 +1027,7 @@ def add_self_publish_button(node): button_parm = hou.ButtonParmTemplate( "ayon_self_publish", "{} Publish".format(label), - script_callback="from ayon_core.hosts.houdini.api.lib import " + script_callback="from ayon_houdini.api.lib import " "self_publish; self_publish()", script_callback_language=hou.scriptLanguage.Python, join_with_next=True @@ -1070,7 +1070,7 @@ def sceneview_snapshot( Example: This is how the function can be used:: - from ayon_core.hosts.houdini.api import lib + from ayon_houdini.api import lib sceneview = hou.ui.paneTabOfType(hou.paneTabType.SceneViewer) lib.sceneview_snapshot(sceneview) diff --git a/client/ayon_core/hosts/houdini/api/pipeline.py b/server_addon/houdini/client/ayon_houdini/api/pipeline.py similarity index 98% rename from client/ayon_core/hosts/houdini/api/pipeline.py rename to server_addon/houdini/client/ayon_houdini/api/pipeline.py index 4797cf36a0..6af4993d25 100644 --- a/client/ayon_core/hosts/houdini/api/pipeline.py +++ b/server_addon/houdini/client/ayon_houdini/api/pipeline.py @@ -17,8 +17,8 @@ from ayon_core.pipeline import ( AYON_CONTAINER_ID, ) from ayon_core.pipeline.load import any_outdated_containers -from ayon_core.hosts.houdini import HOUDINI_HOST_DIR -from ayon_core.hosts.houdini.api import lib, shelves, creator_node_shelves +from ayon_houdini import HOUDINI_HOST_DIR +from ayon_houdini.api import lib, shelves, creator_node_shelves from ayon_core.lib import ( register_event_callback, @@ -26,7 +26,7 @@ from ayon_core.lib import ( ) -log = logging.getLogger("ayon_core.hosts.houdini") +log = logging.getLogger("ayon_houdini") AVALON_CONTAINERS = "/obj/AVALON_CONTAINERS" CONTEXT_CONTAINER = "/obj/OpenPypeContext" diff --git a/client/ayon_core/hosts/houdini/api/plugin.py b/server_addon/houdini/client/ayon_houdini/api/plugin.py similarity index 90% rename from client/ayon_core/hosts/houdini/api/plugin.py rename to server_addon/houdini/client/ayon_houdini/api/plugin.py index a9c8c313b9..9c6bba925a 100644 --- a/client/ayon_core/hosts/houdini/api/plugin.py +++ b/server_addon/houdini/client/ayon_houdini/api/plugin.py @@ -7,6 +7,7 @@ from abc import ( import six import hou +import pyblish.api from ayon_core.pipeline import ( CreatorError, LegacyCreator, @@ -14,11 +15,17 @@ from ayon_core.pipeline import ( CreatedInstance, AYON_INSTANCE_ID, AVALON_INSTANCE_ID, + load, + publish ) from ayon_core.lib import BoolDef + from .lib import imprint, read, lsattr, add_self_publish_button +SETTINGS_CATEGORY = "houdini" + + class Creator(LegacyCreator): """Creator plugin to create instances in Houdini @@ -169,6 +176,8 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase): settings_name = None add_publish_button = False + settings_category = SETTINGS_CATEGORY + def create(self, product_name, instance_data, pre_create_data): try: self.selected_nodes = [] @@ -347,3 +356,39 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase): for key, value in settings.items(): setattr(self, key, value) + + +class HoudiniLoader(load.LoaderPlugin): + """Base class for Houdini load plugins.""" + + hosts = ["houdini"] + settings_category = SETTINGS_CATEGORY + + +class HoudiniInstancePlugin(pyblish.api.InstancePlugin): + """Base class for Houdini instance publish plugins.""" + + hosts = ["houdini"] + settings_category = SETTINGS_CATEGORY + + +class HoudiniContextPlugin(pyblish.api.ContextPlugin): + """Base class for Houdini context publish plugins.""" + + hosts = ["houdini"] + settings_category = SETTINGS_CATEGORY + + +class HoudiniExtractorPlugin(publish.Extractor): + """Base class for Houdini extract plugins. + + Note: + The `HoudiniExtractorPlugin` is a subclass of `publish.Extractor`, + which in turn is a subclass of `pyblish.api.InstancePlugin`. + Should there be a requirement to create an extractor that operates + as a context plugin, it would be beneficial to incorporate + the functionalities present in `publish.Extractor`. + """ + + hosts = ["houdini"] + settings_category = SETTINGS_CATEGORY diff --git a/client/ayon_core/hosts/houdini/api/shelves.py b/server_addon/houdini/client/ayon_houdini/api/shelves.py similarity index 99% rename from client/ayon_core/hosts/houdini/api/shelves.py rename to server_addon/houdini/client/ayon_houdini/api/shelves.py index b178139020..2987568af1 100644 --- a/client/ayon_core/hosts/houdini/api/shelves.py +++ b/server_addon/houdini/client/ayon_houdini/api/shelves.py @@ -12,7 +12,7 @@ import hou from .lib import get_current_context_template_data_with_folder_attrs -log = logging.getLogger("ayon_core.hosts.houdini.shelves") +log = logging.getLogger("ayon_houdini.shelves") def generate_shelves(): diff --git a/client/ayon_core/hosts/houdini/api/usd.py b/server_addon/houdini/client/ayon_houdini/api/usd.py similarity index 100% rename from client/ayon_core/hosts/houdini/api/usd.py rename to server_addon/houdini/client/ayon_houdini/api/usd.py diff --git a/client/ayon_core/hosts/houdini/hooks/set_default_display_and_view.py b/server_addon/houdini/client/ayon_houdini/hooks/set_default_display_and_view.py similarity index 100% rename from client/ayon_core/hosts/houdini/hooks/set_default_display_and_view.py rename to server_addon/houdini/client/ayon_houdini/hooks/set_default_display_and_view.py diff --git a/client/ayon_core/hosts/houdini/hooks/set_paths.py b/server_addon/houdini/client/ayon_houdini/hooks/set_paths.py similarity index 100% rename from client/ayon_core/hosts/houdini/hooks/set_paths.py rename to server_addon/houdini/client/ayon_houdini/hooks/set_paths.py diff --git a/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py b/server_addon/houdini/client/ayon_houdini/plugins/create/convert_legacy.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/convert_legacy.py index 1a4761172a..4c8c8062ce 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/convert_legacy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Converter for legacy Houdini products.""" from ayon_core.pipeline.create.creator_plugins import ProductConvertorPlugin -from ayon_core.hosts.houdini.api.lib import imprint +from ayon_houdini.api.lib import imprint class HoudiniLegacyConvertor(ProductConvertorPlugin): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_alembic_camera.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_alembic_camera.py index 0ab5e2794e..4a92e24671 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_alembic_camera.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating alembic camera products.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.pipeline import CreatorError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_arnold_ass.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_arnold_ass.py index be5604c01c..4f5fb5833e 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_arnold_ass.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating Arnold ASS files.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_arnold_rop.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_arnold_rop.py index 1208cfc1ea..43875ccbd6 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_arnold_rop.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import EnumDef, BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_bgeo.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_bgeo.py index 3749598b1d..93cf0e0998 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_bgeo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache bgeo files.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.pipeline import CreatorError import hou from ayon_core.lib import EnumDef, BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_composite.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/create/create_composite.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_composite.py index a25faf0e8e..8c0ee8a099 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_composite.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating composite sequences.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.pipeline import CreatorError import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_hda.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/create_hda.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_hda.py index d399aa5e15..6a1adce8cc 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_hda.py @@ -3,7 +3,7 @@ import ayon_api from ayon_core.pipeline import CreatorError -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_karma_rop.py similarity index 99% rename from client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_karma_rop.py index 48cf5057ab..693e6295e2 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_karma_rop.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin to create Karma ROP.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef, EnumDef, NumberDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_mantra_ifd.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_mantra_ifd.py index e0cf035c35..fc5c4819d0 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_mantra_ifd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache alembics.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_mantra_rop.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_mantra_rop.py index 05b4431aba..ce1c96f8b2 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_mantra_rop.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin to create Mantra ROP.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import EnumDef, BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_model.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_model.py similarity index 99% rename from client/ayon_core/hosts/houdini/plugins/create/create_model.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_model.py index 74d067b133..ed6b2096c5 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_model.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_model.py @@ -11,7 +11,7 @@ Note: It's considered to support multiple representations in the future. """ -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_pointcache.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_pointcache.py index 9e0a335c3a..6a63659053 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_pointcache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache alembics.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef import hou @@ -105,7 +105,7 @@ class CreatePointCache(plugin.HoudiniCreator): elif len(outputs) == 1: return outputs[0] - # if there are more than one, then it have multiple ouput nodes + # if there are more than one, then it have multiple output nodes # return the one with the minimum 'outputidx' else: return min(outputs, diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_redshift_proxy.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_redshift_proxy.py index 6a9321b95a..0e3eb03ddd 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_redshift_proxy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating Redshift proxies.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin import hou from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_redshift_rop.py similarity index 99% rename from client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_redshift_rop.py index 3ecb09ee9b..d63e584692 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_redshift_rop.py @@ -3,7 +3,7 @@ import hou # noqa from ayon_core.pipeline import CreatorError -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import EnumDef, BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_review.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_review.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/create/create_review.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_review.py index f5e4d4ce64..b27264f400 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_review.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_review.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating openGL reviews.""" -from ayon_core.hosts.houdini.api import lib, plugin +from ayon_houdini.api import lib, plugin from ayon_core.lib import EnumDef, BoolDef, NumberDef import os @@ -103,7 +103,7 @@ class CreateReview(plugin.HoudiniCreator): # cls.review_color_space is an empty string # when the imageio/workfile setting is disabled or # when the Review colorspace setting is empty. - from ayon_core.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa + from ayon_houdini.api.colorspace import get_default_display_view_colorspace # noqa self.review_color_space = get_default_display_view_colorspace() lib.set_review_color_space(instance_node, diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_staticmesh.py similarity index 99% rename from client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_staticmesh.py index 3271107c6e..17b646040c 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_staticmesh.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator for Unreal Static Meshes.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef, EnumDef import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_usd.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/create/create_usd.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_usd.py index 700f7eefd6..b8aede677b 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_usd.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating USDs.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_usdrender.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_usdrender.py index 36197e349e..a34de1fec4 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_usdrender.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating USD renders.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin class CreateUSDRender(plugin.HoudiniCreator): diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_vbd_cache.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_vbd_cache.py index c34cd2b4b5..e8c0920ec8 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_vbd_cache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating VDB Caches.""" -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.lib import BoolDef import hou diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_vray_rop.py similarity index 99% rename from client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_vray_rop.py index 9e4633e745..d15ee23825 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_vray_rop.py @@ -2,7 +2,7 @@ """Creator plugin to create VRay ROP.""" import hou -from ayon_core.hosts.houdini.api import plugin +from ayon_houdini.api import plugin from ayon_core.pipeline import CreatorError from ayon_core.lib import EnumDef, BoolDef diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py b/server_addon/houdini/client/ayon_houdini/plugins/create/create_workfile.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/create/create_workfile.py rename to server_addon/houdini/client/ayon_houdini/plugins/create/create_workfile.py index 40a607e81a..babf602855 100644 --- a/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/create/create_workfile.py @@ -2,9 +2,9 @@ """Creator plugin for creating workfiles.""" import ayon_api -from ayon_core.hosts.houdini.api import plugin -from ayon_core.hosts.houdini.api.lib import read, imprint -from ayon_core.hosts.houdini.api.pipeline import CONTEXT_CONTAINER +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import read, imprint +from ayon_houdini.api.pipeline import CONTEXT_CONTAINER from ayon_core.pipeline import CreatedInstance, AutoCreator import hou diff --git a/client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py b/server_addon/houdini/client/ayon_houdini/plugins/inventory/set_camera_resolution.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py rename to server_addon/houdini/client/ayon_houdini/plugins/inventory/set_camera_resolution.py index 4cebd537bb..e2f8fcfa9b 100644 --- a/client/ayon_core/hosts/houdini/plugins/inventory/set_camera_resolution.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/inventory/set_camera_resolution.py @@ -1,5 +1,5 @@ from ayon_core.pipeline import InventoryAction -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api.lib import ( get_camera_from_container, set_camera_resolution ) diff --git a/client/ayon_core/hosts/houdini/plugins/load/actions.py b/server_addon/houdini/client/ayon_houdini/plugins/load/actions.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/load/actions.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/actions.py index 3e9cc35504..5fe545ced9 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/actions.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/actions.py @@ -2,10 +2,10 @@ """ -from ayon_core.pipeline import load +from ayon_houdini.api import plugin -class SetFrameRangeLoader(load.LoaderPlugin): +class SetFrameRangeLoader(plugin.HoudiniLoader): """Set frame range excluding pre- and post-handles""" product_types = { @@ -42,7 +42,7 @@ class SetFrameRangeLoader(load.LoaderPlugin): hou.playbar.setPlaybackRange(start, end) -class SetFrameRangeWithHandlesLoader(load.LoaderPlugin): +class SetFrameRangeWithHandlesLoader(plugin.HoudiniLoader): """Set frame range including pre- and post-handles""" product_types = { diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_alembic.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_alembic.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/load/load_alembic.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_alembic.py index 5f04781501..7db2fe93ed 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_alembic.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_alembic.py @@ -1,12 +1,12 @@ import os -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class AbcLoader(load.LoaderPlugin): +class AbcLoader(plugin.HoudiniLoader): """Load Alembic""" product_types = {"model", "animation", "pointcache", "gpuCache"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_alembic_archive.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_alembic_archive.py index a231bd9993..a34a43e48a 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_alembic_archive.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_alembic_archive.py @@ -1,12 +1,13 @@ + import os -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class AbcArchiveLoader(load.LoaderPlugin): +class AbcArchiveLoader(plugin.HoudiniLoader): """Load Alembic as full geometry network hierarchy """ product_types = {"model", "animation", "pointcache", "gpuCache"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_ass.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_ass.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/load/load_ass.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_ass.py index 6e0922e305..5fd97bc2a6 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_ass.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_ass.py @@ -1,14 +1,14 @@ import os import re -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class AssLoader(load.LoaderPlugin): +class AssLoader(plugin.HoudiniLoader): """Load .ass with Arnold Procedural""" product_types = {"ass"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_bgeo.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_bgeo.py index a318b71963..7119612cda 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_bgeo.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_bgeo.py @@ -2,14 +2,14 @@ import os import re -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class BgeoLoader(load.LoaderPlugin): +class BgeoLoader(plugin.HoudiniLoader): """Load bgeo files to Houdini.""" label = "Load bgeo" diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_camera.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_camera.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/load/load_camera.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_camera.py index b7912f88f1..b597519813 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_camera.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_camera.py @@ -1,16 +1,15 @@ -from ayon_core.pipeline import ( - load, - get_representation_path, -) -from ayon_core.hosts.houdini.api import pipeline +import hou +from ayon_core.pipeline import get_representation_path -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api import ( + pipeline, + plugin +) +from ayon_houdini.api.lib import ( set_camera_resolution, get_camera_from_container ) -import hou - ARCHIVE_EXPRESSION = ('__import__("_alembic_hom_extensions")' '.alembicGetCameraDict') @@ -84,7 +83,7 @@ def transfer_non_default_values(src, dest, ignore=None): dest_parm.setFromParm(parm) -class CameraLoader(load.LoaderPlugin): +class CameraLoader(plugin.HoudiniLoader): """Load camera from an Alembic file""" product_types = {"camera"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_fbx.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/load/load_fbx.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_fbx.py index 398019a3bd..273ca43bc4 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_fbx.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- """Fbx Loader for houdini. """ -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class FbxLoader(load.LoaderPlugin): +class FbxLoader(plugin.HoudiniLoader): """Load fbx files. """ label = "Load FBX" diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_filepath.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_filepath.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/load/load_filepath.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_filepath.py index d189a027fd..2ce9bd7ffb 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_filepath.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_filepath.py @@ -1,13 +1,14 @@ import os import re - -from ayon_core.pipeline import load -from ayon_core.hosts.houdini.api import pipeline - import hou +from ayon_houdini.api import ( + pipeline, + plugin +) -class FilePathLoader(load.LoaderPlugin): + +class FilePathLoader(plugin.HoudiniLoader): """Load a managed filepath to a null node. This is useful if for a particular workflow there is no existing loader diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_hda.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_hda.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/load/load_hda.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_hda.py index 10fc03be03..b04e211aa4 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_hda.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_hda.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- import os -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class HdaLoader(load.LoaderPlugin): +class HdaLoader(plugin.HoudiniLoader): """Load Houdini Digital Asset file.""" product_types = {"hda"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_image.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_image.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/load/load_image.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_image.py index dfbd3c11eb..9d4cd2fb18 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_image.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_image.py @@ -1,14 +1,16 @@ import os import re +import hou from ayon_core.pipeline import ( - load, get_representation_path, AVALON_CONTAINER_ID, ) -from ayon_core.hosts.houdini.api import lib, pipeline - -import hou +from ayon_houdini.api import ( + pipeline, + plugin, + lib +) def get_image_avalon_container(): @@ -42,7 +44,7 @@ def get_image_avalon_container(): return image_container -class ImageLoader(load.LoaderPlugin): +class ImageLoader(plugin.HoudiniLoader): """Load images into COP2""" product_types = { diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_redshift_proxy.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_redshift_proxy.py index f09856a970..514dbe109f 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_redshift_proxy.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_redshift_proxy.py @@ -1,16 +1,17 @@ import os import re -from ayon_core.pipeline import ( - load, - get_representation_path, -) -from ayon_core.hosts.houdini.api import pipeline -from ayon_core.pipeline.load import LoadError - import hou +from ayon_core.pipeline import get_representation_path +from ayon_core.pipeline.load import LoadError -class RedshiftProxyLoader(load.LoaderPlugin): +from ayon_houdini.api import ( + pipeline, + plugin +) + + +class RedshiftProxyLoader(plugin.HoudiniLoader): """Load Redshift Proxy""" product_types = {"redshiftproxy"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_layer.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_layer.py index 4e6954c531..fb302fd943 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_usd_layer.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_layer.py @@ -1,12 +1,14 @@ from ayon_core.pipeline import ( - load, get_representation_path, AVALON_CONTAINER_ID, ) -from ayon_core.hosts.houdini.api import lib +from ayon_houdini.api import ( + plugin, + lib +) -class USDSublayerLoader(load.LoaderPlugin): +class USDSublayerLoader(plugin.HoudiniLoader): """Sublayer USD file in Solaris""" product_types = { diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_reference.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_reference.py index 7e82a6abd0..690f6ce187 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_usd_reference.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_reference.py @@ -1,12 +1,14 @@ from ayon_core.pipeline import ( - load, get_representation_path, AVALON_CONTAINER_ID, ) -from ayon_core.hosts.houdini.api import lib +from ayon_houdini.api import ( + plugin, + lib +) -class USDReferenceLoader(load.LoaderPlugin): +class USDReferenceLoader(plugin.HoudiniLoader): """Reference USD file in Solaris""" product_types = { diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_usd_sop.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_sop.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/load/load_usd_sop.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_sop.py index 506f6140bf..347e3283de 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_usd_sop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_usd_sop.py @@ -1,10 +1,12 @@ import os -from ayon_core.pipeline import load -from ayon_core.hosts.houdini.api import pipeline +from ayon_houdini.api import ( + pipeline, + plugin +) -class SopUsdImportLoader(load.LoaderPlugin): +class SopUsdImportLoader(plugin.HoudiniLoader): """Load USD to SOPs via `usdimport`""" label = "Load USD to SOPs" diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_vdb.py b/server_addon/houdini/client/ayon_houdini/plugins/load/load_vdb.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/load/load_vdb.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/load_vdb.py index 0008f0d5f8..9014f4c5e2 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/load_vdb.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/load_vdb.py @@ -1,14 +1,14 @@ import os import re -from ayon_core.pipeline import ( - load, - get_representation_path, +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import ( + pipeline, + plugin ) -from ayon_core.hosts.houdini.api import pipeline -class VdbLoader(load.LoaderPlugin): +class VdbLoader(plugin.HoudiniLoader): """Load VDB""" product_types = {"vdbcache"} diff --git a/client/ayon_core/hosts/houdini/plugins/load/show_usdview.py b/server_addon/houdini/client/ayon_houdini/plugins/load/show_usdview.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/load/show_usdview.py rename to server_addon/houdini/client/ayon_houdini/plugins/load/show_usdview.py index 0158a6b963..4e18bc038a 100644 --- a/client/ayon_core/hosts/houdini/plugins/load/show_usdview.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/load/show_usdview.py @@ -3,10 +3,10 @@ import platform import subprocess from ayon_core.lib.vendor_bin_utils import find_executable -from ayon_core.pipeline import load +from ayon_houdini.api import plugin -class ShowInUsdview(load.LoaderPlugin): +class ShowInUsdview(plugin.HoudiniLoader): """Open USD file in usdview""" label = "Show in usdview" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_active_state.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_active_state.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_active_state.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_active_state.py index 7fda94b288..e09a347e9f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_active_state.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_active_state.py @@ -1,8 +1,10 @@ -import pyblish.api import hou +import pyblish.api +from ayon_houdini.api import plugin -class CollectInstanceActiveState(pyblish.api.InstancePlugin): + +class CollectInstanceActiveState(plugin.HoudiniInstancePlugin): """Collect default active state for instance from its node bypass state. This is done at the very end of the CollectorOrder so that any required @@ -14,7 +16,6 @@ class CollectInstanceActiveState(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.299 families = ["*"] - hosts = ["houdini"] label = "Instance Active State" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_arnold_rop.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_arnold_rop.py index 53a3e52717..10c6d91d26 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_arnold_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_arnold_rop.py @@ -4,12 +4,14 @@ import re import hou import pyblish.api -from ayon_core.hosts.houdini.api import colorspace -from ayon_core.hosts.houdini.api.lib import ( - evalParmNoFrame, get_color_management_preferences) +from ayon_houdini.api import colorspace, plugin +from ayon_houdini.api.lib import ( + get_color_management_preferences, + evalParmNoFrame +) -class CollectArnoldROPRenderProducts(pyblish.api.InstancePlugin): +class CollectArnoldROPRenderProducts(plugin.HoudiniInstancePlugin): """Collect Arnold ROP Render Products Collects the instance.data["files"] for the render products. @@ -23,7 +25,6 @@ class CollectArnoldROPRenderProducts(pyblish.api.InstancePlugin): # This specific order value is used so that # this plugin runs after CollectFrames order = pyblish.api.CollectorOrder + 0.11 - hosts = ["houdini"] families = ["arnold_rop"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_asset_handles.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_asset_handles.py index 943a29952e..db9bde8595 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_asset_handles.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """Collector plugin for frames data on ROP instances.""" -import hou # noqa import pyblish.api from ayon_core.lib import BoolDef from ayon_core.pipeline import AYONPyblishPluginMixin +from ayon_houdini.api import plugin -class CollectAssetHandles(pyblish.api.InstancePlugin, +class CollectAssetHandles(plugin.HoudiniInstancePlugin, AYONPyblishPluginMixin): """Apply folder handles. @@ -23,8 +23,6 @@ class CollectAssetHandles(pyblish.api.InstancePlugin, the exclusive frame range and actual handle ranges. """ - hosts = ["houdini"] - # This specific order value is used so that # this plugin runs after CollectAnatomyInstanceData order = pyblish.api.CollectorOrder + 0.499 diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_cache_farm.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_cache_farm.py index e1782b2bb3..ecfebccfef 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_cache_farm.py @@ -1,10 +1,13 @@ import os -import pyblish.api import hou -from ayon_core.hosts.houdini.api import lib +import pyblish.api +from ayon_houdini.api import ( + lib, + plugin +) -class CollectDataforCache(pyblish.api.InstancePlugin): +class CollectDataforCache(plugin.HoudiniInstancePlugin): """Collect data for caching to Deadline.""" # Run after Collect Frames @@ -12,7 +15,6 @@ class CollectDataforCache(pyblish.api.InstancePlugin): families = ["ass", "pointcache", "mantraifd", "redshiftproxy", "vdbcache", "model"] - hosts = ["houdini"] targets = ["local", "remote"] label = "Collect Data for Cache" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_chunk_size.py similarity index 91% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_chunk_size.py index f0913f2f0a..6ff53b7695 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_chunk_size.py @@ -1,9 +1,10 @@ import pyblish.api from ayon_core.lib import NumberDef from ayon_core.pipeline import AYONPyblishPluginMixin +from ayon_houdini.api import plugin -class CollectChunkSize(pyblish.api.InstancePlugin, +class CollectChunkSize(plugin.HoudiniInstancePlugin, AYONPyblishPluginMixin): """Collect chunk size for cache submission to Deadline.""" @@ -11,7 +12,6 @@ class CollectChunkSize(pyblish.api.InstancePlugin, families = ["ass", "pointcache", "vdbcache", "mantraifd", "redshiftproxy", "model"] - hosts = ["houdini"] targets = ["local", "remote"] label = "Collect Chunk Size" chunk_size = 999999 diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_current_file.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_current_file.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_current_file.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_current_file.py index 7b55778803..8e339e0e04 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_current_file.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_current_file.py @@ -2,14 +2,14 @@ import os import hou import pyblish.api +from ayon_houdini.api import plugin -class CollectHoudiniCurrentFile(pyblish.api.ContextPlugin): +class CollectHoudiniCurrentFile(plugin.HoudiniContextPlugin): """Inject the current working file into context""" order = pyblish.api.CollectorOrder - 0.1 label = "Houdini Current File" - hosts = ["houdini"] def process(self, context): """Inject the current working file""" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_farm_instances.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_farm_instances.py similarity index 90% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_farm_instances.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_farm_instances.py index 586aa2da57..8fdae06f90 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_farm_instances.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_farm_instances.py @@ -1,7 +1,8 @@ import pyblish.api +from ayon_houdini.api import plugin -class CollectFarmInstances(pyblish.api.InstancePlugin): +class CollectFarmInstances(plugin.HoudiniInstancePlugin): """Collect instances for farm render.""" order = pyblish.api.CollectorOrder @@ -11,7 +12,6 @@ class CollectFarmInstances(pyblish.api.InstancePlugin): "arnold_rop", "vray_rop"] - hosts = ["houdini"] targets = ["local", "remote"] label = "Collect farm instances" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py index b38ebc6e2f..3378657bfd 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_frames.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_frames.py @@ -5,10 +5,10 @@ import re import hou # noqa import pyblish.api -from ayon_core.hosts.houdini.api import lib +from ayon_houdini.api import lib, plugin -class CollectFrames(pyblish.api.InstancePlugin): +class CollectFrames(plugin.HoudiniInstancePlugin): """Collect all frames which would be saved from the ROP nodes""" # This specific order value is used so that diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_inputs.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_inputs.py index 6cf6bbf430..f2904a68f6 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_inputs.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_inputs.py @@ -1,8 +1,8 @@ from collections import deque import pyblish.api - from ayon_core.pipeline import registered_host +from ayon_houdini.api import plugin def get_container_members(container): @@ -80,7 +80,7 @@ def iter_upstream(node): collected.update(ancestors) -class CollectUpstreamInputs(pyblish.api.InstancePlugin): +class CollectUpstreamInputs(plugin.HoudiniInstancePlugin): """Collect source input containers used for this publish. This will include `inputs` data of which loaded publishes were used in the @@ -91,7 +91,6 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin): label = "Collect Inputs" order = pyblish.api.CollectorOrder + 0.4 - hosts = ["houdini"] def process(self, instance): # We can't get the "inputAncestors" directly from the ROP diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_type.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_instances_type.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_instances_type.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_instances_type.py index 07851387fe..542abf8139 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_type.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_instances_type.py @@ -10,7 +10,6 @@ class CollectPointcacheType(pyblish.api.InstancePlugin): """Collect data type for different instances.""" order = pyblish.api.CollectorOrder - hosts = ["houdini"] families = ["pointcache", "model"] label = "Collect instances types" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_instances_usd_layered.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_instances_usd_layered.py index 9377a9fcd0..4f85a629fb 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_instances_usd_layered.py @@ -1,11 +1,11 @@ import hou import pyblish.api -from ayon_core.hosts.houdini.api import lib -import ayon_core.hosts.houdini.api.usd as hou_usdlib from ayon_core.pipeline import usdlib +from ayon_houdini.api import lib, plugin +import ayon_houdini.api.usd as hou_usdlib -class CollectInstancesUsdLayered(pyblish.api.ContextPlugin): +class CollectInstancesUsdLayered(plugin.HoudiniContextPlugin): """Collect Instances from a ROP Network and its configured layer paths. The output nodes of the ROP node will only be published when *any* of the @@ -32,7 +32,6 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder - 0.01 label = "Collect Instances (USD Configured Layers)" - hosts = ["houdini"] def process(self, context): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_karma_rop.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_karma_rop.py index 662ed7ae30..60fec9d2e0 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_karma_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_karma_rop.py @@ -4,16 +4,17 @@ import os import hou import pyblish.api -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from ayon_core.hosts.houdini.api import ( - colorspace +from ayon_houdini.api import ( + colorspace, + plugin ) -class CollectKarmaROPRenderProducts(pyblish.api.InstancePlugin): +class CollectKarmaROPRenderProducts(plugin.HoudiniInstancePlugin): """Collect Karma Render Products Collects the instance.data["files"] for the multipart render product. @@ -27,7 +28,6 @@ class CollectKarmaROPRenderProducts(pyblish.api.InstancePlugin): # This specific order value is used so that # this plugin runs after CollectFrames order = pyblish.api.CollectorOrder + 0.11 - hosts = ["houdini"] families = ["karma_rop"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_local_render_instances.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_local_render_instances.py index 474002e1ee..259b2378bb 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_local_render_instances.py @@ -6,9 +6,10 @@ from ayon_core.pipeline.publish import ( get_plugin_settings, apply_plugin_settings_automatically ) +from ayon_houdini.api import plugin -class CollectLocalRenderInstances(pyblish.api.InstancePlugin): +class CollectLocalRenderInstances(plugin.HoudiniInstancePlugin): """Collect instances for local render. Agnostic Local Render Collector. @@ -22,7 +23,6 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin): "arnold_rop", "vray_rop"] - hosts = ["houdini"] label = "Collect local render instances" use_deadline_aov_filter = False diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_mantra_rop.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_mantra_rop.py index 7b247768fc..f7feeee63b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_mantra_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_mantra_rop.py @@ -4,16 +4,17 @@ import os import hou import pyblish.api -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from ayon_core.hosts.houdini.api import ( - colorspace +from ayon_houdini.api import ( + colorspace, + plugin ) -class CollectMantraROPRenderProducts(pyblish.api.InstancePlugin): +class CollectMantraROPRenderProducts(plugin.HoudiniInstancePlugin): """Collect Mantra Render Products Collects the instance.data["files"] for the render products. @@ -27,7 +28,6 @@ class CollectMantraROPRenderProducts(pyblish.api.InstancePlugin): # This specific order value is used so that # this plugin runs after CollectFrames order = pyblish.api.CollectorOrder + 0.11 - hosts = ["houdini"] families = ["mantra_rop"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_output_node.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_output_node.py index 289222f32b..ff51669376 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_output_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_output_node.py @@ -1,9 +1,9 @@ import pyblish.api - from ayon_core.pipeline.publish import KnownPublishError +from ayon_houdini.api import plugin -class CollectOutputSOPPath(pyblish.api.InstancePlugin): +class CollectOutputSOPPath(plugin.HoudiniInstancePlugin): """Collect the out node's SOP/COP Path value.""" order = pyblish.api.CollectorOrder @@ -19,7 +19,6 @@ class CollectOutputSOPPath(pyblish.api.InstancePlugin): "model" ] - hosts = ["houdini"] label = "Collect Output Node Path" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_redshift_rop.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_redshift_rop.py index ce90ae2413..96cb6ebeaf 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_redshift_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_redshift_rop.py @@ -4,16 +4,17 @@ import os import hou import pyblish.api -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from ayon_core.hosts.houdini.api import ( - colorspace +from ayon_houdini.api import ( + colorspace, + plugin ) -class CollectRedshiftROPRenderProducts(pyblish.api.InstancePlugin): +class CollectRedshiftROPRenderProducts(plugin.HoudiniInstancePlugin): """Collect USD Render Products Collects the instance.data["files"] for the render products. @@ -27,7 +28,6 @@ class CollectRedshiftROPRenderProducts(pyblish.api.InstancePlugin): # This specific order value is used so that # this plugin runs after CollectFrames order = pyblish.api.CollectorOrder + 0.11 - hosts = ["houdini"] families = ["redshift_rop"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_remote_publish.py similarity index 83% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_remote_publish.py index 5d459f525e..e695b57518 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_remote_publish.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_remote_publish.py @@ -1,16 +1,15 @@ +import hou import pyblish.api -import hou from ayon_core.pipeline.publish import RepairAction -from ayon_core.hosts.houdini.api import lib +from ayon_houdini.api import lib, plugin -class CollectRemotePublishSettings(pyblish.api.ContextPlugin): +class CollectRemotePublishSettings(plugin.HoudiniContextPlugin): """Collect custom settings of the Remote Publish node.""" order = pyblish.api.CollectorOrder families = ["*"] - hosts = ["houdini"] targets = ["deadline"] label = "Remote Publish Submission Settings" actions = [RepairAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_render_products.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_render_products.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_render_products.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_render_products.py index fcd80e0082..e84f6c6f84 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_render_products.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_render_products.py @@ -5,6 +5,7 @@ import hou import pxr.UsdRender import pyblish.api +from ayon_houdini.api import plugin def get_var_changed(variable=None): @@ -41,12 +42,11 @@ def get_var_changed(variable=None): return changed -class CollectRenderProducts(pyblish.api.InstancePlugin): +class CollectRenderProducts(plugin.HoudiniInstancePlugin): """Collect USD Render Products.""" label = "Collect Render Products" order = pyblish.api.CollectorOrder + 0.4 - hosts = ["houdini"] families = ["usdrender"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_review_data.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_review_data.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_review_data.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_review_data.py index ed2de785a2..cca55463e6 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_review_data.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_review_data.py @@ -1,8 +1,9 @@ import hou import pyblish.api +from ayon_houdini.api import plugin -class CollectHoudiniReviewData(pyblish.api.InstancePlugin): +class CollectHoudiniReviewData(plugin.HoudiniInstancePlugin): """Collect Review Data.""" label = "Collect Review Data" @@ -10,7 +11,6 @@ class CollectHoudiniReviewData(pyblish.api.InstancePlugin): # this plugin runs after CollectRopFrameRange # Also after CollectLocalRenderInstances order = pyblish.api.CollectorOrder + 0.13 - hosts = ["houdini"] families = ["review"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_reviewable_instances.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_reviewable_instances.py similarity index 84% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_reviewable_instances.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_reviewable_instances.py index 78dc5fe11a..84cd8377a8 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_reviewable_instances.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_reviewable_instances.py @@ -1,7 +1,8 @@ import pyblish.api +from ayon_houdini.api import plugin -class CollectReviewableInstances(pyblish.api.InstancePlugin): +class CollectReviewableInstances(plugin.HoudiniInstancePlugin): """Collect Reviewable Instances. Basically, all instances of the specified families diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_rop_frame_range.py similarity index 88% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_rop_frame_range.py index 44afaf2466..c0f8d7aef9 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_rop_frame_range.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_rop_frame_range.py @@ -2,13 +2,12 @@ """Collector plugin for frames data on ROP instances.""" import hou # noqa import pyblish.api -from ayon_core.hosts.houdini.api import lib +from ayon_houdini.api import lib, plugin -class CollectRopFrameRange(pyblish.api.InstancePlugin): +class CollectRopFrameRange(plugin.HoudiniInstancePlugin): """Collect all frames which would be saved from the ROP nodes""" - hosts = ["houdini"] order = pyblish.api.CollectorOrder label = "Collect RopNode Frame Range" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_staticmesh_type.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_staticmesh_type.py similarity index 84% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_staticmesh_type.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_staticmesh_type.py index db9efec7a1..1aab655532 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_staticmesh_type.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_staticmesh_type.py @@ -2,12 +2,12 @@ """Collector for staticMesh types. """ import pyblish.api +from ayon_houdini.api import plugin -class CollectStaticMeshType(pyblish.api.InstancePlugin): +class CollectStaticMeshType(plugin.HoudiniInstancePlugin): """Collect data type for fbx instance.""" - hosts = ["houdini"] families = ["staticMesh"] label = "Collect type of staticMesh" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_bootstrap.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_bootstrap.py index cd82f1679a..5067b9aab2 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_bootstrap.py @@ -1,10 +1,10 @@ import pyblish.api import ayon_api - from ayon_core.pipeline import usdlib, KnownPublishError +from ayon_houdini.api import plugin -class CollectUsdBootstrap(pyblish.api.InstancePlugin): +class CollectUsdBootstrap(plugin.HoudiniInstancePlugin): """Collect special Asset/Shot bootstrap instances if those are needed. Some specific products are intended to be part of the default structure @@ -21,7 +21,6 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.35 label = "Collect USD Bootstrap" - hosts = ["houdini"] families = ["usd", "usd.layered"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_layers.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_layers.py index 93add6806e..7ecf5fbb02 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_usd_layers.py @@ -1,17 +1,15 @@ import os - -import pyblish.api -import ayon_core.hosts.houdini.api.usd as usdlib - import hou +import pyblish.api +from ayon_houdini.api import plugin +import ayon_houdini.api.usd as usdlib -class CollectUsdLayers(pyblish.api.InstancePlugin): +class CollectUsdLayers(plugin.HoudiniInstancePlugin): """Collect the USD Layers that have configured save paths.""" order = pyblish.api.CollectorOrder + 0.35 label = "Collect USD Layers" - hosts = ["houdini"] families = ["usd"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_vray_rop.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_vray_rop.py index c39b1db103..2f9c2bb18e 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_vray_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_vray_rop.py @@ -4,16 +4,17 @@ import os import hou import pyblish.api -from ayon_core.hosts.houdini.api.lib import ( +from ayon_houdini.api.lib import ( evalParmNoFrame, get_color_management_preferences ) -from ayon_core.hosts.houdini.api import ( - colorspace +from ayon_houdini.api import ( + colorspace, + plugin ) -class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin): +class CollectVrayROPRenderProducts(plugin.HoudiniInstancePlugin): """Collect Vray Render Products Collects the instance.data["files"] for the render products. @@ -27,7 +28,6 @@ class CollectVrayROPRenderProducts(pyblish.api.InstancePlugin): # This specific order value is used so that # this plugin runs after CollectFrames order = pyblish.api.CollectorOrder + 0.11 - hosts = ["houdini"] families = ["vray_rop"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_workfile.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_workfile.py similarity index 91% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_workfile.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_workfile.py index aa533bcf1b..8d0939a803 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_workfile.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_workfile.py @@ -1,14 +1,13 @@ import os import pyblish.api +from ayon_houdini.api import plugin - -class CollectWorkfile(pyblish.api.InstancePlugin): +class CollectWorkfile(plugin.HoudiniInstancePlugin): """Inject workfile representation into instance""" order = pyblish.api.CollectorOrder - 0.01 label = "Houdini Workfile Data" - hosts = ["houdini"] families = ["workfile"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_workscene_fps.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_workscene_fps.py similarity index 75% rename from client/ayon_core/hosts/houdini/plugins/publish/collect_workscene_fps.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/collect_workscene_fps.py index 6f6cc978cd..0091eb0abb 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_workscene_fps.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/collect_workscene_fps.py @@ -1,13 +1,13 @@ -import pyblish.api import hou +import pyblish.api +from ayon_houdini.api import plugin -class CollectWorksceneFPS(pyblish.api.ContextPlugin): +class CollectWorksceneFPS(plugin.HoudiniContextPlugin): """Get the FPS of the work scene.""" label = "Workscene FPS" order = pyblish.api.CollectorOrder - hosts = ["houdini"] def process(self, context): fps = hou.fps() diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_active_view_thumbnail.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_active_view_thumbnail.py similarity index 88% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_active_view_thumbnail.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_active_view_thumbnail.py index aedcb1da02..c4d51c0808 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_active_view_thumbnail.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_active_view_thumbnail.py @@ -1,11 +1,10 @@ -import pyblish.api import tempfile -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api import lib -from ayon_core.hosts.houdini.api.pipeline import IS_HEADLESS +import pyblish.api +from ayon_houdini.api import lib, plugin +from ayon_houdini.api.pipeline import IS_HEADLESS -class ExtractActiveViewThumbnail(publish.Extractor): +class ExtractActiveViewThumbnail(plugin.HoudiniExtractorPlugin): """Set instance thumbnail to a screengrab of current active viewport. This makes it so that if an instance does not have a thumbnail set yet that @@ -16,7 +15,6 @@ class ExtractActiveViewThumbnail(publish.Extractor): order = pyblish.api.ExtractorOrder + 0.49 label = "Extract Active View Thumbnail" families = ["workfile"] - hosts = ["houdini"] def process(self, instance): if IS_HEADLESS: diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_alembic.py similarity index 89% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_alembic.py index 7ae476d2b4..e82f07284a 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_alembic.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_alembic.py @@ -1,18 +1,16 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractAlembic(publish.Extractor): +class ExtractAlembic(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract Alembic" - hosts = ["houdini"] families = ["abc", "camera"] targets = ["local", "remote"] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_ass.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_ass.py index 24b956ad81..a796bbf4b3 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_ass.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_ass.py @@ -1,19 +1,17 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractAss(publish.Extractor): +class ExtractAss(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder + 0.1 label = "Extract Ass" families = ["ass"] - hosts = ["houdini"] targets = ["local", "remote"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_bgeo.py similarity index 85% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_bgeo.py index 448cf97848..ab8837065d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_bgeo.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_bgeo.py @@ -1,19 +1,15 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop -from ayon_core.hosts.houdini.api import lib - -import hou +from ayon_houdini.api import lib, plugin -class ExtractBGEO(publish.Extractor): +class ExtractBGEO(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract BGEO" - hosts = ["houdini"] families = ["bgeo"] def process(self, instance): @@ -32,7 +28,7 @@ class ExtractBGEO(publish.Extractor): file_name, staging_dir)) # write files - render_rop(ropnode) + lib.render_rop(ropnode) output = instance.data["frames"] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_composite.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_composite.py index 0fab69ef4a..cab462aef6 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_composite.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_composite.py @@ -1,18 +1,17 @@ import os +import hou import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop, splitext - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop, splitext -class ExtractComposite(publish.Extractor, +class ExtractComposite(plugin.HoudiniExtractorPlugin, publish.ColormanagedPyblishPluginMixin): order = pyblish.api.ExtractorOrder label = "Extract Composite (Image Sequence)" - hosts = ["houdini"] families = ["imagesequence"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_fbx.py similarity index 90% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_fbx.py index 7ef004d7cb..49b3fa07ca 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_fbx.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_fbx.py @@ -2,18 +2,16 @@ """Fbx Extractor for houdini. """ import os -import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop - import hou +import pyblish.api +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractFBX(publish.Extractor): +class ExtractFBX(plugin.HoudiniExtractorPlugin): label = "Extract FBX" families = ["fbx"] - hosts = ["houdini"] order = pyblish.api.ExtractorOrder + 0.1 diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_hda.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_hda.py index 5fe83e0dcf..e4449d11f8 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_hda.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_hda.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- import os from pprint import pformat -import pyblish.api -from ayon_core.pipeline import publish import hou +import pyblish.api +from ayon_houdini.api import plugin -class ExtractHDA(publish.Extractor): +class ExtractHDA(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract HDA" - hosts = ["houdini"] families = ["hda"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_mantra_ifd.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_mantra_ifd.py index f0bcf4b371..b424f2e452 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_mantra_ifd.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_mantra_ifd.py @@ -1,17 +1,15 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish - -import hou +from ayon_houdini.api import plugin -class ExtractMantraIFD(publish.Extractor): +class ExtractMantraIFD(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract Mantra ifd" - hosts = ["houdini"] families = ["mantraifd"] targets = ["local", "remote"] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_opengl.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_opengl.py index 26a216e335..bee1bf871f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_opengl.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_opengl.py @@ -1,20 +1,19 @@ import os +import hou import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractOpenGL(publish.Extractor, +class ExtractOpenGL(plugin.HoudiniExtractorPlugin, publish.ColormanagedPyblishPluginMixin): order = pyblish.api.ExtractorOrder - 0.01 label = "Extract OpenGL" families = ["review"] - hosts = ["houdini"] def process(self, instance): ropnode = hou.node(instance.data.get("instance_node")) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_redshift_proxy.py similarity index 90% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_redshift_proxy.py index e08a73ae8e..3e8a79df00 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_redshift_proxy.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_redshift_proxy.py @@ -1,19 +1,17 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractRedshiftProxy(publish.Extractor): +class ExtractRedshiftProxy(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder + 0.1 label = "Extract Redshift Proxy" families = ["redshiftproxy"] - hosts = ["houdini"] targets = ["local", "remote"] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_render.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_render.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_render.py index 7b4762a25f..8ff8590650 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_render.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_render.py @@ -1,16 +1,16 @@ +import os +import hou + import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop -import hou -import os +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractRender(publish.Extractor): +class ExtractRender(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract Render" - hosts = ["houdini"] families = ["mantra_rop", "karma_rop", "redshift_rop", diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_usd.py similarity index 87% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_usd.py index 0aeed06643..40e6211e63 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_usd.py @@ -1,17 +1,16 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -import hou -class ExtractUSD(publish.Extractor): +class ExtractUSD(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract USD" - hosts = ["houdini"] families = ["usd", "usdModel", "usdSetDress"] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_usd_layered.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_usd_layered.py index 2e5c9a892c..6a377c57cf 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_usd_layered.py @@ -7,12 +7,10 @@ import hou import ayon_api import pyblish.api -from ayon_core.pipeline import ( - get_representation_path, - publish, -) -import ayon_core.hosts.houdini.api.usd as hou_usdlib -from ayon_core.hosts.houdini.api.lib import render_rop +from ayon_core.pipeline import get_representation_path +from ayon_houdini.api import plugin +import ayon_houdini.api.usd as hou_usdlib +from ayon_houdini.api.lib import render_rop class ExitStack(object): @@ -154,11 +152,10 @@ def parm_values(overrides): parm.set(value) -class ExtractUSDLayered(publish.Extractor): +class ExtractUSDLayered(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder label = "Extract Layered USD" - hosts = ["houdini"] families = ["usdLayered", "usdShade"] # Force Output Processors so it will always save any file @@ -312,3 +309,14 @@ class ExtractUSDLayered(publish.Extractor): return False return filecmp.cmp(old_file, new_file) + + def staging_dir(self, instance): + """Provide a temporary directory in which to store extracted files + + Upon calling this method the staging directory is stored inside + the instance.data['stagingDir'] + """ + + from ayon_core.pipeline.publish import get_instance_staging_dir + + return get_instance_staging_dir(instance) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_vdb_cache.py similarity index 89% rename from client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/extract_vdb_cache.py index 4544d33e57..a944d81e9b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/extract_vdb_cache.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/extract_vdb_cache.py @@ -1,19 +1,17 @@ import os +import hou import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.houdini.api.lib import render_rop - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import render_rop -class ExtractVDBCache(publish.Extractor): +class ExtractVDBCache(plugin.HoudiniExtractorPlugin): order = pyblish.api.ExtractorOrder + 0.1 label = "Extract VDB Cache" families = ["vdbcache"] - hosts = ["houdini"] def process(self, instance): if instance.data.get("farm"): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/help/validate_vdb_output_node.xml b/server_addon/houdini/client/ayon_houdini/plugins/publish/help/validate_vdb_output_node.xml similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/publish/help/validate_vdb_output_node.xml rename to server_addon/houdini/client/ayon_houdini/plugins/publish/help/validate_vdb_output_node.xml index eb83bfffe3..8aac9a6a07 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/help/validate_vdb_output_node.xml +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/help/validate_vdb_output_node.xml @@ -25,4 +25,4 @@ ROP node `{rop_path}` is set to export SOP path `{sop_path}`. - \ No newline at end of file + diff --git a/client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/increment_current_file.py similarity index 86% rename from client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/increment_current_file.py index 3e9291d5c2..878500f605 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/increment_current_file.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/increment_current_file.py @@ -2,11 +2,15 @@ import pyblish.api from ayon_core.lib import version_up from ayon_core.pipeline import registered_host -from ayon_core.pipeline.publish import get_errored_plugins_from_context -from ayon_core.pipeline.publish import KnownPublishError +from ayon_core.pipeline.publish import ( + get_errored_plugins_from_context, + KnownPublishError +) + +from ayon_houdini.api import plugin -class IncrementCurrentFile(pyblish.api.ContextPlugin): +class IncrementCurrentFile(plugin.HoudiniContextPlugin): """Increment the current file. Saves the current scene with an increased version number. @@ -15,7 +19,6 @@ class IncrementCurrentFile(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 - hosts = ["houdini"] families = ["workfile", "usdrender", "mantra_rop", diff --git a/client/ayon_core/hosts/houdini/plugins/publish/save_scene.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/save_scene.py similarity index 89% rename from client/ayon_core/hosts/houdini/plugins/publish/save_scene.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/save_scene.py index 7c453038ea..e0734da5d1 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/save_scene.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/save_scene.py @@ -2,13 +2,14 @@ import pyblish.api from ayon_core.pipeline import registered_host +from ayon_houdini.api import plugin -class SaveCurrentScene(pyblish.api.ContextPlugin): + +class SaveCurrentScene(plugin.HoudiniContextPlugin): """Save current scene""" label = "Save current file" order = pyblish.api.ExtractorOrder - 0.49 - hosts = ["houdini"] def process(self, context): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_abc_primitive_to_detail.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_abc_primitive_to_detail.py index 18a459bf7b..51885a963e 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_abc_primitive_to_detail.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_abc_primitive_to_detail.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- -import pyblish.api - from collections import defaultdict + +import pyblish.api from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateAbcPrimitiveToDetail(pyblish.api.InstancePlugin): + +class ValidateAbcPrimitiveToDetail(plugin.HoudiniInstancePlugin): """Validate Alembic ROP Primitive to Detail attribute is consistent. The Alembic ROP crashes Houdini whenever an attribute in the "Primitive to @@ -18,7 +20,6 @@ class ValidateAbcPrimitiveToDetail(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.1 families = ["abc"] - hosts = ["houdini"] label = "Validate Primitive to Detail (Abc)" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_face_sets.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_alembic_face_sets.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_face_sets.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_alembic_face_sets.py index 40114bc40e..00ce554ff1 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_face_sets.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_alembic_face_sets.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- -import pyblish.api import hou +import pyblish.api +from ayon_houdini.api import plugin -class ValidateAlembicROPFaceSets(pyblish.api.InstancePlugin): + +class ValidateAlembicROPFaceSets(plugin.HoudiniInstancePlugin): """Validate Face Sets are disabled for extraction to pointcache. When groups are saved as Face Sets with the Alembic these show up @@ -19,7 +21,6 @@ class ValidateAlembicROPFaceSets(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.1 families = ["abc"] - hosts = ["houdini"] label = "Validate Alembic ROP Face Sets" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_alembic_input_node.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_alembic_input_node.py index dbc38058e6..aab3068171 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_alembic_input_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_alembic_input_node.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- +import hou import pyblish.api from ayon_core.pipeline import PublishValidationError -import hou + +from ayon_houdini.api import plugin -class ValidateAlembicInputNode(pyblish.api.InstancePlugin): +class ValidateAlembicInputNode(plugin.HoudiniInstancePlugin): """Validate that the node connected to the output is correct. The connected node cannot be of the following types for Alembic: @@ -15,7 +17,6 @@ class ValidateAlembicInputNode(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.1 families = ["abc"] - hosts = ["houdini"] label = "Validate Input Node (Abc)" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_animation_settings.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_animation_settings.py index e28c38ece0..1cc9e24dc9 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_animation_settings.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_animation_settings.py @@ -1,11 +1,12 @@ -import pyblish.api - -from ayon_core.pipeline.publish import PublishValidationError -from ayon_core.hosts.houdini.api import lib import hou +import pyblish.api +from ayon_core.pipeline.publish import PublishValidationError -class ValidateAnimationSettings(pyblish.api.InstancePlugin): +from ayon_houdini.api import lib, plugin + + +class ValidateAnimationSettings(plugin.HoudiniInstancePlugin): """Validate if the unexpanded string contains the frame ('$F') token This validator will only check the output parameter of the node if diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_bypass.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_bypass.py index 8a83ff42fb..f3856b4147 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_bypass.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_bypass.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- +import hou + import pyblish.api from ayon_core.pipeline import PublishValidationError -import hou +from ayon_houdini.api import plugin -class ValidateBypassed(pyblish.api.InstancePlugin): + +class ValidateBypassed(plugin.HoudiniInstancePlugin): """Validate all primitives build hierarchy from attribute when enabled. The name of the attribute must exist on the prims and have the same name @@ -15,7 +18,6 @@ class ValidateBypassed(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder - 0.1 families = ["*"] - hosts = ["houdini"] label = "Validate ROP Bypass" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_camera_rop.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_camera_rop.py index ad4ace988a..f21addb11d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_camera_rop.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_camera_rop.py @@ -3,13 +3,14 @@ import pyblish.api from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateCameraROP(pyblish.api.InstancePlugin): + +class ValidateCameraROP(plugin.HoudiniInstancePlugin): """Validate Camera ROP settings.""" order = pyblish.api.ValidatorOrder families = ["camera"] - hosts = ["houdini"] label = "Camera ROP" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_cop_output_node.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_cop_output_node.py index 91bd36018a..1d63e15d90 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_cop_output_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_cop_output_node.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- import hou -import pyblish.api +import pyblish.api from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateCopOutputNode(pyblish.api.InstancePlugin): + +class ValidateCopOutputNode(plugin.HoudiniInstancePlugin): """Validate the instance COP Output Node. This will ensure: @@ -17,7 +19,6 @@ class ValidateCopOutputNode(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["imagesequence"] - hosts = ["houdini"] label = "Validate COP Output Node" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_export_is_a_single_frame.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_export_is_a_single_frame.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_export_is_a_single_frame.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_export_is_a_single_frame.py index b188055bc7..b26c60320b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_export_is_a_single_frame.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_export_is_a_single_frame.py @@ -6,7 +6,7 @@ from ayon_core.pipeline import ( OptionalPyblishPluginMixin ) from ayon_core.pipeline.publish import ValidateContentsOrder -from ayon_core.hosts.houdini.api.action import SelectInvalidAction +from ayon_houdini.api.action import SelectInvalidAction class ValidateSingleFrame(pyblish.api.InstancePlugin, @@ -18,7 +18,6 @@ class ValidateSingleFrame(pyblish.api.InstancePlugin, """ families = ["model"] - hosts = ["houdini"] label = "Validate Single Frame" order = ValidateContentsOrder + 0.1 actions = [SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_fbx_output_node.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_fbx_output_node.py index 08eaa182c0..1c236bb8f7 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_fbx_output_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_fbx_output_node.py @@ -1,15 +1,16 @@ # -*- coding: utf-8 -*- import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.houdini.api.action import ( +from ayon_houdini.api.action import ( SelectInvalidAction, SelectROPAction, ) -from ayon_core.hosts.houdini.api.lib import get_obj_node_output +from ayon_houdini.api import plugin +from ayon_houdini.api.lib import get_obj_node_output import hou -class ValidateFBXOutputNode(pyblish.api.InstancePlugin): +class ValidateFBXOutputNode(plugin.HoudiniInstancePlugin): """Validate the instance Output Node. This will ensure: @@ -22,7 +23,6 @@ class ValidateFBXOutputNode(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["fbx"] - hosts = ["houdini"] label = "Validate FBX Output Node" actions = [SelectROPAction, SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_file_extension.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_file_extension.py index e9a0397a58..1b3a58f4b3 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_file_extension.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- import os -import pyblish.api - -from ayon_core.hosts.houdini.api import lib -from ayon_core.pipeline import PublishValidationError - import hou +import pyblish.api +from ayon_core.pipeline import PublishValidationError -class ValidateFileExtension(pyblish.api.InstancePlugin): +from ayon_houdini.api import lib, plugin + + +class ValidateFileExtension(plugin.HoudiniInstancePlugin): """Validate the output file extension fits the output family. File extensions: @@ -20,7 +20,6 @@ class ValidateFileExtension(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["camera", "vdbcache"] - hosts = ["houdini"] label = "Output File Extension" family_extensions = { diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_frame_range.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_frame_range.py index 2a3418ee7e..9435fa033a 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_range.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_frame_range.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- +import hou + import pyblish.api from ayon_core.pipeline import PublishValidationError from ayon_core.pipeline.publish import RepairAction -from ayon_core.hosts.houdini.api.action import SelectInvalidAction -import hou +from ayon_houdini.api.action import SelectInvalidAction +from ayon_houdini.api import plugin + class DisableUseFolderHandlesAction(RepairAction): @@ -12,7 +15,7 @@ class DisableUseFolderHandlesAction(RepairAction): icon = "mdi.toggle-switch-off" -class ValidateFrameRange(pyblish.api.InstancePlugin): +class ValidateFrameRange(plugin.HoudiniInstancePlugin): """Validate Frame Range. Due to the usage of start and end handles, @@ -21,7 +24,6 @@ class ValidateFrameRange(pyblish.api.InstancePlugin): """ order = pyblish.api.ValidatorOrder - 0.1 - hosts = ["houdini"] label = "Validate Frame Range" actions = [DisableUseFolderHandlesAction, SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_frame_token.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_frame_token.py index 20fb859146..46c02ba6f2 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_frame_token.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_frame_token.py @@ -1,10 +1,11 @@ -import pyblish.api - -from ayon_core.hosts.houdini.api import lib import hou +import pyblish.api -class ValidateFrameToken(pyblish.api.InstancePlugin): +from ayon_houdini.api import lib, plugin + + +class ValidateFrameToken(plugin.HoudiniInstancePlugin): """Validate if the unexpanded string contains the frame ('$F') token. This validator will *only* check the output parameter of the node if diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_houdini_license_category.py similarity index 91% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_houdini_license_category.py index 9a68c34405..d76f8a0072 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_houdini_license_category.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- -import pyblish.api -from ayon_core.pipeline import PublishValidationError import hou +import pyblish.api +from ayon_core.pipeline import PublishValidationError -class ValidateHoudiniNotApprenticeLicense(pyblish.api.InstancePlugin): +from ayon_houdini.api import plugin + + +class ValidateHoudiniNotApprenticeLicense(plugin.HoudiniInstancePlugin): """Validate the Houdini instance runs a non Apprentice license. USD ROPs: @@ -21,7 +24,6 @@ class ValidateHoudiniNotApprenticeLicense(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["usd", "abc", "fbx", "camera"] - hosts = ["houdini"] label = "Houdini Apprentice License" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_instance_in_context.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_instance_in_context.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_instance_in_context.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_instance_in_context.py index 26708e306b..7566dff240 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_instance_in_context.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_instance_in_context.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- """Validate if instance asset is the same as context asset.""" - -import pyblish.api -from ayon_core.hosts.houdini.api.action import SelectROPAction from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, @@ -10,8 +7,11 @@ from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin ) +from ayon_houdini.api import plugin +from ayon_houdini.api.action import SelectROPAction -class ValidateInstanceInContextHoudini(pyblish.api.InstancePlugin, + +class ValidateInstanceInContextHoudini(plugin.HoudiniInstancePlugin, OptionalPyblishPluginMixin): """Validator to check if instance asset match context asset. @@ -24,7 +24,6 @@ class ValidateInstanceInContextHoudini(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Instance in same Context" optional = True - hosts = ["houdini"] actions = [SelectROPAction, RepairAction] def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_mesh_is_static.py similarity index 87% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_mesh_is_static.py index 9652367bfe..b6725bc36c 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_mesh_is_static.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_mesh_is_static.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- """Validator for correct naming of Static Meshes.""" -import pyblish.api from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) from ayon_core.pipeline.publish import ValidateContentsOrder -from ayon_core.hosts.houdini.api.action import SelectInvalidAction -from ayon_core.hosts.houdini.api.lib import get_output_children +from ayon_houdini.api import plugin +from ayon_houdini.api.action import SelectInvalidAction +from ayon_houdini.api.lib import get_output_children -class ValidateMeshIsStatic(pyblish.api.InstancePlugin, +class ValidateMeshIsStatic(plugin.HoudiniInstancePlugin, OptionalPyblishPluginMixin): """Validate mesh is static. @@ -23,7 +23,6 @@ class ValidateMeshIsStatic(pyblish.api.InstancePlugin, families = ["staticMesh", "model"] - hosts = ["houdini"] label = "Validate Mesh is Static" order = ValidateContentsOrder + 0.1 actions = [SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_mkpaths_toggled.py similarity index 89% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_mkpaths_toggled.py index 5e59eb505f..4573d4ba0b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_mkpaths_toggled.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_mkpaths_toggled.py @@ -1,14 +1,16 @@ # -*- coding: utf-8 -*- import pyblish.api + from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateIntermediateDirectoriesChecked(pyblish.api.InstancePlugin): + +class ValidateIntermediateDirectoriesChecked(plugin.HoudiniInstancePlugin): """Validate Create Intermediate Directories is enabled on ROP node.""" order = pyblish.api.ValidatorOrder families = ["pointcache", "camera", "vdbcache", "model"] - hosts = ["houdini"] label = "Create Intermediate Directories Checked" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_no_errors.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_no_errors.py index ae1e5cad27..ef66665d7b 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_no_errors.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_no_errors.py @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- -import pyblish.api import hou + +import pyblish.api from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin + def cook_in_range(node, start, end): current = hou.intFrame() @@ -26,11 +29,10 @@ def get_errors(node): return node.errors() -class ValidateNoErrors(pyblish.api.InstancePlugin): +class ValidateNoErrors(plugin.HoudiniInstancePlugin): """Validate the Instance has no current cooking errors.""" order = pyblish.api.ValidatorOrder - hosts = ["houdini"] label = "Validate no errors" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_primitive_hierarchy_paths.py similarity index 98% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_primitive_hierarchy_paths.py index f63cb23138..9daab2a1a3 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_primitive_hierarchy_paths.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_primitive_hierarchy_paths.py @@ -1,20 +1,20 @@ # -*- coding: utf-8 -*- -import pyblish.api +import hou + +from ayon_houdini.api import plugin from ayon_core.pipeline import PublishValidationError from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, ) -import hou - class AddDefaultPathAction(RepairAction): label = "Add a default path attribute" icon = "mdi.pencil-plus-outline" -class ValidatePrimitiveHierarchyPaths(pyblish.api.InstancePlugin): +class ValidatePrimitiveHierarchyPaths(plugin.HoudiniInstancePlugin): """Validate all primitives build hierarchy from attribute when enabled. The name of the attribute must exist on the prims and have the same name @@ -25,7 +25,6 @@ class ValidatePrimitiveHierarchyPaths(pyblish.api.InstancePlugin): order = ValidateContentsOrder + 0.1 families = ["abc"] - hosts = ["houdini"] label = "Validate Prims Hierarchy Path" actions = [AddDefaultPathAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_remote_publish.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_remote_publish.py index 133b45e8c3..08597c0a6f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_remote_publish.py @@ -1,19 +1,18 @@ # -*-coding: utf-8 -*- -import pyblish.api +import hou -from ayon_core.hosts.houdini.api import lib +import pyblish.api from ayon_core.pipeline.publish import RepairContextAction from ayon_core.pipeline import PublishValidationError -import hou +from ayon_houdini.api import lib, plugin -class ValidateRemotePublishOutNode(pyblish.api.ContextPlugin): +class ValidateRemotePublishOutNode(plugin.HoudiniContextPlugin): """Validate the remote publish out node exists for Deadline to trigger.""" order = pyblish.api.ValidatorOrder - 0.4 families = ["*"] - hosts = ["houdini"] targets = ["deadline"] label = "Remote Publish ROP node" actions = [RepairContextAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_remote_publish_enabled.py similarity index 91% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_remote_publish_enabled.py index d4c6e7a45e..dc5666609f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_remote_publish_enabled.py @@ -1,17 +1,18 @@ # -*- coding: utf-8 -*- -import pyblish.api - import hou + +import pyblish.api from ayon_core.pipeline.publish import RepairContextAction from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateRemotePublishEnabled(pyblish.api.ContextPlugin): + +class ValidateRemotePublishEnabled(plugin.HoudiniContextPlugin): """Validate the remote publish node is *not* bypassed.""" order = pyblish.api.ValidatorOrder - 0.39 families = ["*"] - hosts = ["houdini"] targets = ["deadline"] label = "Remote Publish ROP enabled" actions = [RepairContextAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_review_colorspace.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_review_colorspace.py index fa532c5437..e96b222446 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_review_colorspace.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_review_colorspace.py @@ -1,4 +1,7 @@ # -*- coding: utf-8 -*- +import os +import hou + import pyblish.api from ayon_core.pipeline import ( PublishValidationError, @@ -9,10 +12,9 @@ from ayon_core.pipeline.publish import ( get_plugin_settings, apply_plugin_settings_automatically ) -from ayon_core.hosts.houdini.api.action import SelectROPAction -import os -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.action import SelectROPAction class ResetViewSpaceAction(RepairAction): @@ -20,7 +22,7 @@ class ResetViewSpaceAction(RepairAction): icon = "mdi.monitor" -class ValidateReviewColorspace(pyblish.api.InstancePlugin, +class ValidateReviewColorspace(plugin.HoudiniInstancePlugin, OptionalPyblishPluginMixin): """Validate Review Colorspace parameters. @@ -29,7 +31,6 @@ class ValidateReviewColorspace(pyblish.api.InstancePlugin, order = pyblish.api.ValidatorOrder + 0.1 families = ["review"] - hosts = ["houdini"] label = "Validate Review Colorspace" actions = [ResetViewSpaceAction, SelectROPAction] @@ -123,14 +124,14 @@ class ValidateReviewColorspace(pyblish.api.InstancePlugin, As if OCIO is disabled the whole validation is skipped and this repair action won't show up. """ - from ayon_core.hosts.houdini.api.lib import set_review_color_space + from ayon_houdini.api.lib import set_review_color_space # Fall to the default value if cls.review_color_space is empty. if not cls.review_color_space: # cls.review_color_space is an empty string # when the imageio/workfile setting is disabled or # when the Review colorspace setting is empty. - from ayon_core.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa + from ayon_houdini.api.colorspace import get_default_display_view_colorspace # noqa cls.review_color_space = get_default_display_view_colorspace() rop_node = hou.node(instance.data["instance_node"]) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_scene_review.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_scene_review.py index 0b09306b0d..f45cd1c97d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_scene_review.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_scene_review.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- -import pyblish.api -from ayon_core.pipeline import PublishValidationError import hou +import pyblish.api +from ayon_core.pipeline import PublishValidationError -class ValidateSceneReview(pyblish.api.InstancePlugin): +from ayon_houdini.api import plugin + + +class ValidateSceneReview(plugin.HoudiniInstancePlugin): """Validator Some Scene Settings before publishing the review 1. Scene Path 2. Resolution @@ -12,7 +15,6 @@ class ValidateSceneReview(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["review"] - hosts = ["houdini"] label = "Scene Setting for review" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_sop_output_node.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_sop_output_node.py index d67192d28e..7d37927058 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_sop_output_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_sop_output_node.py @@ -1,15 +1,17 @@ # -*- coding: utf-8 -*- +import hou + import pyblish.api from ayon_core.pipeline import PublishValidationError -from ayon_core.hosts.houdini.api.action import ( + +from ayon_houdini.api import plugin +from ayon_houdini.api.action import ( SelectInvalidAction, SelectROPAction, ) -import hou - -class ValidateSopOutputNode(pyblish.api.InstancePlugin): +class ValidateSopOutputNode(plugin.HoudiniInstancePlugin): """Validate the instance SOP Output Node. This will ensure: @@ -23,7 +25,6 @@ class ValidateSopOutputNode(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["pointcache", "vdbcache", "model"] - hosts = ["houdini"] label = "Validate Output Node (SOP)" actions = [SelectROPAction, SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_subset_name.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_subset_name.py index 0481929824..dfd353bddf 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_subset_name.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- """Validator for correct naming of Static Meshes.""" -import pyblish.api +import hou + from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin @@ -9,24 +10,23 @@ from ayon_core.pipeline.publish import ( ValidateContentsOrder, RepairAction, ) -from ayon_core.hosts.houdini.api.action import SelectInvalidAction -from ayon_core.pipeline.create import get_product_name -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.action import SelectInvalidAction +from ayon_core.pipeline.create import get_product_name class FixProductNameAction(RepairAction): label = "Fix Product Name" -class ValidateSubsetName(pyblish.api.InstancePlugin, +class ValidateSubsetName(plugin.HoudiniInstancePlugin, OptionalPyblishPluginMixin): """Validate Product name. """ families = ["staticMesh"] - hosts = ["houdini"] label = "Validate Product Name" order = ValidateContentsOrder + 0.1 actions = [FixProductNameAction, SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_unreal_staticmesh_naming.py similarity index 91% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_unreal_staticmesh_naming.py index ae00bc9db4..a3d971695d 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_unreal_staticmesh_naming.py @@ -1,19 +1,19 @@ # -*- coding: utf-8 -*- """Validator for correct naming of Static Meshes.""" -import pyblish.api +import hou + from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) from ayon_core.pipeline.publish import ValidateContentsOrder -from ayon_core.hosts.houdini.api.action import SelectInvalidAction -from ayon_core.hosts.houdini.api.lib import get_output_children - -import hou +from ayon_houdini.api import plugin +from ayon_houdini.api.action import SelectInvalidAction +from ayon_houdini.api.lib import get_output_children -class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin, +class ValidateUnrealStaticMeshName(plugin.HoudiniInstancePlugin, OptionalPyblishPluginMixin): """Validate name of Unreal Static Mesh. @@ -29,7 +29,6 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin, """ families = ["staticMesh"] - hosts = ["houdini"] label = "Unreal Static Mesh Name (FBX)" order = ValidateContentsOrder + 0.1 actions = [SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_layer_path_backslashes.py similarity index 91% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_layer_path_backslashes.py index 2b727670ad..4da67ff199 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_layer_path_backslashes.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_layer_path_backslashes.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- -import pyblish.api - -import ayon_core.hosts.houdini.api.usd as hou_usdlib -from ayon_core.pipeline import PublishValidationError - import hou +import pyblish.api +from ayon_core.pipeline import PublishValidationError -class ValidateUSDLayerPathBackslashes(pyblish.api.InstancePlugin): +from ayon_houdini.api import plugin +import ayon_houdini.api.usd as hou_usdlib + + +class ValidateUSDLayerPathBackslashes(plugin.HoudiniInstancePlugin): """Validate USD loaded paths have no backslashes. This is a crucial validation for HUSK USD rendering as Houdini's @@ -22,7 +23,6 @@ class ValidateUSDLayerPathBackslashes(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["usdSetDress", "usdShade", "usd", "usdrender"] - hosts = ["houdini"] label = "USD Layer path backslashes" optional = True diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_model_and_shade.py similarity index 93% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_model_and_shade.py index dc1a19cae0..935bd39e23 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_model_and_shade.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_model_and_shade.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -import pyblish.api - -import ayon_core.hosts.houdini.api.usd as hou_usdlib -from ayon_core.pipeline import PublishValidationError - +import hou from pxr import UsdShade, UsdRender, UsdLux -import hou +import pyblish.api +from ayon_core.pipeline import PublishValidationError + +from ayon_houdini.api import plugin +import ayon_houdini.api.usd as hou_usdlib def fullname(o): @@ -17,7 +17,7 @@ def fullname(o): return module + "." + o.__name__ -class ValidateUsdModel(pyblish.api.InstancePlugin): +class ValidateUsdModel(plugin.HoudiniInstancePlugin): """Validate USD Model. Disallow Shaders, Render settings, products and vars and Lux lights. @@ -26,7 +26,6 @@ class ValidateUsdModel(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["usdModel"] - hosts = ["houdini"] label = "Validate USD Model" optional = True diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_output_node.py similarity index 94% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_output_node.py index 968d64e8fc..88d549d46c 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_output_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_output_node.py @@ -1,9 +1,12 @@ # -*- coding: utf-8 -*- import pyblish.api + from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateUSDOutputNode(pyblish.api.InstancePlugin): + +class ValidateUSDOutputNode(plugin.HoudiniInstancePlugin): """Validate the instance USD LOPs Output Node. This will ensure: @@ -15,7 +18,6 @@ class ValidateUSDOutputNode(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["usd"] - hosts = ["houdini"] label = "Validate Output Node (USD)" def process(self, instance): diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_product_names.py similarity index 89% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_product_names.py index 4825b7cc71..eb46b266e2 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_render_product_names.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_render_product_names.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- import os -import pyblish.api +import pyblish.api from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin -class ValidateUSDRenderProductNames(pyblish.api.InstancePlugin): + +class ValidateUSDRenderProductNames(plugin.HoudiniInstancePlugin): """Validate USD Render Product names are correctly set absolute paths.""" order = pyblish.api.ValidatorOrder families = ["usdrender"] - hosts = ["houdini"] label = "Validate USD Render Product Names" optional = True diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_setdress.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_setdress.py index 40b67e896a..3e91f0418f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_setdress.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_setdress.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import pyblish.api - -import ayon_core.hosts.houdini.api.usd as hou_usdlib from ayon_core.pipeline import PublishValidationError +from ayon_houdini.api import plugin +import ayon_houdini.api.usd as hou_usdlib -class ValidateUsdSetDress(pyblish.api.InstancePlugin): + +class ValidateUsdSetDress(plugin.HoudiniInstancePlugin): """Validate USD Set Dress. Must only have references or payloads. May not generate new mesh or @@ -15,14 +16,13 @@ class ValidateUsdSetDress(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder families = ["usdSetDress"] - hosts = ["houdini"] label = "Validate USD Set Dress" optional = True def process(self, instance): - from pxr import UsdGeom import hou + from pxr import UsdGeom rop = hou.node(instance.data.get("instance_node")) lop_path = hou_usdlib.get_usd_rop_loppath(rop) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_shade_model_exists.py similarity index 92% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_shade_model_exists.py index 048d675c00..8a93d3b4a1 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_shade_model_exists.py @@ -2,20 +2,19 @@ import re import ayon_api -import pyblish.api - from ayon_core.pipeline.publish import ( ValidateContentsOrder, KnownPublishError, PublishValidationError, ) +from ayon_houdini.api import plugin -class ValidateUSDShadeModelExists(pyblish.api.InstancePlugin): + +class ValidateUSDShadeModelExists(plugin.HoudiniInstancePlugin): """Validate the Instance has no current cooking errors.""" order = ValidateContentsOrder - hosts = ["houdini"] families = ["usdShade"] label = "USD Shade model exists" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_shade_workspace.py similarity index 95% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_shade_workspace.py index 2ea4b5d816..8972941253 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_workspace.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_usd_shade_workspace.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- +import hou + import pyblish.api from ayon_core.pipeline import PublishValidationError -import hou +from ayon_houdini.api import plugin -class ValidateUsdShadeWorkspace(pyblish.api.InstancePlugin): +class ValidateUsdShadeWorkspace(plugin.HoudiniInstancePlugin): """Validate USD Shading Workspace is correct version. There have been some issues with outdated/erroneous Shading Workspaces @@ -14,7 +16,6 @@ class ValidateUsdShadeWorkspace(pyblish.api.InstancePlugin): """ order = pyblish.api.ValidatorOrder - hosts = ["houdini"] families = ["usdShade"] label = "USD Shade Workspace" diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_vdb_output_node.py similarity index 97% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_vdb_output_node.py index 319a9a4b50..c4ed9d2fb8 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_vdb_output_node.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_vdb_output_node.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- import contextlib - -import pyblish.api import hou +import pyblish.api from ayon_core.pipeline import PublishXmlValidationError -from ayon_core.hosts.houdini.api.action import SelectInvalidAction + +from ayon_houdini.api import plugin +from ayon_houdini.api.action import SelectInvalidAction def group_consecutive_numbers(nums): @@ -60,7 +61,7 @@ def get_geometry_at_frame(sop_node, frame, force=True): return sop_node.geometryAtFrame(frame) -class ValidateVDBOutputNode(pyblish.api.InstancePlugin): +class ValidateVDBOutputNode(plugin.HoudiniInstancePlugin): """Validate that the node connected to the output node is of type VDB. All primitives of the output geometry must be VDBs, no other primitive @@ -81,7 +82,6 @@ class ValidateVDBOutputNode(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder + 0.1 families = ["vdbcache"] - hosts = ["houdini"] label = "Validate Output Node (VDB)" actions = [SelectInvalidAction] diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_workfile_paths.py similarity index 96% rename from client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py rename to server_addon/houdini/client/ayon_houdini/plugins/publish/validate_workfile_paths.py index 7984b7615c..e1cd0c6caa 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/validate_workfile_paths.py +++ b/server_addon/houdini/client/ayon_houdini/plugins/publish/validate_workfile_paths.py @@ -1,20 +1,22 @@ # -*- coding: utf-8 -*- -import pyblish.api import hou + +import pyblish.api from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) from ayon_core.pipeline.publish import RepairAction +from ayon_houdini.api import plugin + class ValidateWorkfilePaths( - pyblish.api.InstancePlugin, OptionalPyblishPluginMixin): + plugin.HoudiniInstancePlugin, OptionalPyblishPluginMixin): """Validate workfile paths so they are absolute.""" order = pyblish.api.ValidatorOrder families = ["workfile"] - hosts = ["houdini"] label = "Validate Workfile Paths" actions = [RepairAction] optional = True diff --git a/client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml b/server_addon/houdini/client/ayon_houdini/startup/MainMenuCommon.xml similarity index 94% rename from client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml rename to server_addon/houdini/client/ayon_houdini/startup/MainMenuCommon.xml index b6e78cbdc8..5b383f0085 100644 --- a/client/ayon_core/hosts/houdini/startup/MainMenuCommon.xml +++ b/server_addon/houdini/client/ayon_houdini/startup/MainMenuCommon.xml @@ -81,16 +81,16 @@ host_tools.show_workfiles(parent) diff --git a/client/ayon_core/hosts/houdini/startup/OPmenu.xml b/server_addon/houdini/client/ayon_houdini/startup/OPmenu.xml similarity index 91% rename from client/ayon_core/hosts/houdini/startup/OPmenu.xml rename to server_addon/houdini/client/ayon_houdini/startup/OPmenu.xml index 0a7b265fa1..5637d2cf6a 100644 --- a/client/ayon_core/hosts/houdini/startup/OPmenu.xml +++ b/server_addon/houdini/client/ayon_houdini/startup/OPmenu.xml @@ -15,7 +15,7 @@ 0.3.2", +} +ayon_compatible_addons = {} diff --git a/server_addon/houdini/server/settings/publish.py b/server_addon/houdini/server/settings/publish.py index 4a0c022f23..336de8e046 100644 --- a/server_addon/houdini/server/settings/publish.py +++ b/server_addon/houdini/server/settings/publish.py @@ -79,7 +79,8 @@ class PublishPluginsModel(BaseSettingsModel): ) ValidateInstanceInContextHoudini: BasicValidateModel = SettingsField( default_factory=BasicValidateModel, - title="Validate Instance is in same Context.") + title="Validate Instance is in same Context.", + section="Validators") ValidateMeshIsStatic: BasicValidateModel = SettingsField( default_factory=BasicValidateModel, title="Validate Mesh is Static.") diff --git a/client/ayon_core/hosts/max/__init__.py b/server_addon/max/client/ayon_max/__init__.py similarity index 100% rename from client/ayon_core/hosts/max/__init__.py rename to server_addon/max/client/ayon_max/__init__.py diff --git a/client/ayon_core/hosts/max/addon.py b/server_addon/max/client/ayon_max/addon.py similarity index 100% rename from client/ayon_core/hosts/max/addon.py rename to server_addon/max/client/ayon_max/addon.py diff --git a/client/ayon_core/hosts/max/api/__init__.py b/server_addon/max/client/ayon_max/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/max/api/__init__.py rename to server_addon/max/client/ayon_max/api/__init__.py diff --git a/client/ayon_core/hosts/max/api/action.py b/server_addon/max/client/ayon_max/api/action.py similarity index 100% rename from client/ayon_core/hosts/max/api/action.py rename to server_addon/max/client/ayon_max/api/action.py diff --git a/client/ayon_core/hosts/max/api/colorspace.py b/server_addon/max/client/ayon_max/api/colorspace.py similarity index 100% rename from client/ayon_core/hosts/max/api/colorspace.py rename to server_addon/max/client/ayon_max/api/colorspace.py diff --git a/client/ayon_core/hosts/max/api/lib.py b/server_addon/max/client/ayon_max/api/lib.py similarity index 99% rename from client/ayon_core/hosts/max/api/lib.py rename to server_addon/max/client/ayon_max/api/lib.py index f20f754248..eb22dbafd2 100644 --- a/client/ayon_core/hosts/max/api/lib.py +++ b/server_addon/max/client/ayon_max/api/lib.py @@ -20,7 +20,7 @@ from pymxs import runtime as rt JSON_PREFIX = "JSON::" -log = logging.getLogger("ayon_core.hosts.max") +log = logging.getLogger("ayon_max") def get_main_window(): diff --git a/client/ayon_core/hosts/max/api/lib_renderproducts.py b/server_addon/max/client/ayon_max/api/lib_renderproducts.py similarity index 99% rename from client/ayon_core/hosts/max/api/lib_renderproducts.py rename to server_addon/max/client/ayon_max/api/lib_renderproducts.py index 710ed0031a..82a6a0c20c 100644 --- a/client/ayon_core/hosts/max/api/lib_renderproducts.py +++ b/server_addon/max/client/ayon_max/api/lib_renderproducts.py @@ -6,7 +6,7 @@ import os from pymxs import runtime as rt -from ayon_core.hosts.max.api.lib import get_current_renderer +from ayon_max.api.lib import get_current_renderer from ayon_core.pipeline import get_current_project_name from ayon_core.settings import get_project_settings diff --git a/client/ayon_core/hosts/max/api/lib_rendersettings.py b/server_addon/max/client/ayon_max/api/lib_rendersettings.py similarity index 99% rename from client/ayon_core/hosts/max/api/lib_rendersettings.py rename to server_addon/max/client/ayon_max/api/lib_rendersettings.py index 35b6d064c1..4b65e1397e 100644 --- a/client/ayon_core/hosts/max/api/lib_rendersettings.py +++ b/server_addon/max/client/ayon_max/api/lib_rendersettings.py @@ -5,7 +5,7 @@ from ayon_core.settings import get_project_settings from ayon_core.pipeline import get_current_project_name from ayon_core.pipeline.context_tools import get_current_folder_entity -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api.lib import ( set_render_frame_range, get_current_renderer, get_default_render_folder diff --git a/client/ayon_core/hosts/max/api/menu.py b/server_addon/max/client/ayon_max/api/menu.py similarity index 99% rename from client/ayon_core/hosts/max/api/menu.py rename to server_addon/max/client/ayon_max/api/menu.py index c6ceeb3a43..25dd39fd84 100644 --- a/client/ayon_core/hosts/max/api/menu.py +++ b/server_addon/max/client/ayon_max/api/menu.py @@ -5,7 +5,7 @@ from qtpy import QtWidgets, QtCore from pymxs import runtime as rt from ayon_core.tools.utils import host_tools -from ayon_core.hosts.max.api import lib +from ayon_max.api import lib class AYONMenu(object): diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/server_addon/max/client/ayon_max/api/pipeline.py similarity index 97% rename from client/ayon_core/hosts/max/api/pipeline.py rename to server_addon/max/client/ayon_max/api/pipeline.py index d9cfc3407f..5f5e896e86 100644 --- a/client/ayon_core/hosts/max/api/pipeline.py +++ b/server_addon/max/client/ayon_max/api/pipeline.py @@ -14,14 +14,14 @@ from ayon_core.pipeline import ( AVALON_CONTAINER_ID, AYON_CONTAINER_ID, ) -from ayon_core.hosts.max.api.menu import AYONMenu -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.plugin import MS_CUSTOM_ATTRIB -from ayon_core.hosts.max import MAX_HOST_DIR +from ayon_max.api.menu import AYONMenu +from ayon_max.api import lib +from ayon_max.api.plugin import MS_CUSTOM_ATTRIB +from ayon_max import MAX_HOST_DIR from pymxs import runtime as rt # noqa -log = logging.getLogger("ayon_core.hosts.max") +log = logging.getLogger("ayon_max") PLUGINS_DIR = os.path.join(MAX_HOST_DIR, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") diff --git a/client/ayon_core/hosts/max/api/plugin.py b/server_addon/max/client/ayon_max/api/plugin.py similarity index 100% rename from client/ayon_core/hosts/max/api/plugin.py rename to server_addon/max/client/ayon_max/api/plugin.py diff --git a/client/ayon_core/hosts/max/api/preview_animation.py b/server_addon/max/client/ayon_max/api/preview_animation.py similarity index 99% rename from client/ayon_core/hosts/max/api/preview_animation.py rename to server_addon/max/client/ayon_max/api/preview_animation.py index 399d3b6222..acda5360a1 100644 --- a/client/ayon_core/hosts/max/api/preview_animation.py +++ b/server_addon/max/client/ayon_max/api/preview_animation.py @@ -3,7 +3,7 @@ import contextlib from pymxs import runtime as rt from .lib import get_max_version, render_resolution -log = logging.getLogger("ayon_core.hosts.max") +log = logging.getLogger("ayon_max") @contextlib.contextmanager diff --git a/client/ayon_core/hosts/max/hooks/force_startup_script.py b/server_addon/max/client/ayon_max/hooks/force_startup_script.py similarity index 94% rename from client/ayon_core/hosts/max/hooks/force_startup_script.py rename to server_addon/max/client/ayon_max/hooks/force_startup_script.py index 417f0049ab..1699ea300a 100644 --- a/client/ayon_core/hosts/max/hooks/force_startup_script.py +++ b/server_addon/max/client/ayon_max/hooks/force_startup_script.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Pre-launch to force 3ds max startup script.""" import os -from ayon_core.hosts.max import MAX_HOST_DIR +from ayon_max import MAX_HOST_DIR from ayon_applications import PreLaunchHook, LaunchTypes diff --git a/client/ayon_core/hosts/max/hooks/inject_python.py b/server_addon/max/client/ayon_max/hooks/inject_python.py similarity index 100% rename from client/ayon_core/hosts/max/hooks/inject_python.py rename to server_addon/max/client/ayon_max/hooks/inject_python.py diff --git a/client/ayon_core/hosts/max/hooks/set_paths.py b/server_addon/max/client/ayon_max/hooks/set_paths.py similarity index 100% rename from client/ayon_core/hosts/max/hooks/set_paths.py rename to server_addon/max/client/ayon_max/hooks/set_paths.py diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/util/__init__.py b/server_addon/max/client/ayon_max/plugins/__init__.py similarity index 100% rename from client/ayon_core/hosts/hiero/vendor/google/protobuf/util/__init__.py rename to server_addon/max/client/ayon_max/plugins/__init__.py diff --git a/client/ayon_core/hosts/max/plugins/create/create_camera.py b/server_addon/max/client/ayon_max/plugins/create/create_camera.py similarity index 80% rename from client/ayon_core/hosts/max/plugins/create/create_camera.py rename to server_addon/max/client/ayon_max/plugins/create/create_camera.py index 42f8cb716d..451e178afc 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_camera.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_camera.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating camera.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreateCamera(plugin.MaxCreator): @@ -9,3 +9,5 @@ class CreateCamera(plugin.MaxCreator): label = "Camera" product_type = "camera" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_maxScene.py b/server_addon/max/client/ayon_max/plugins/create/create_maxScene.py similarity index 81% rename from client/ayon_core/hosts/max/plugins/create/create_maxScene.py rename to server_addon/max/client/ayon_max/plugins/create/create_maxScene.py index 0e5768b267..ee58ef663d 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_maxScene.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_maxScene.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating raw max scene.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreateMaxScene(plugin.MaxCreator): @@ -9,3 +9,5 @@ class CreateMaxScene(plugin.MaxCreator): label = "Max Scene" product_type = "maxScene" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_model.py b/server_addon/max/client/ayon_max/plugins/create/create_model.py similarity index 79% rename from client/ayon_core/hosts/max/plugins/create/create_model.py rename to server_addon/max/client/ayon_max/plugins/create/create_model.py index 297c92067e..f48182ecd7 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_model.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_model.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for model.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreateModel(plugin.MaxCreator): @@ -9,3 +9,5 @@ class CreateModel(plugin.MaxCreator): label = "Model" product_type = "model" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_pointcache.py b/server_addon/max/client/ayon_max/plugins/create/create_pointcache.py similarity index 82% rename from client/ayon_core/hosts/max/plugins/create/create_pointcache.py rename to server_addon/max/client/ayon_max/plugins/create/create_pointcache.py index eb0686a0c0..6d7aabe12c 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_pointcache.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_pointcache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating pointcache alembics.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreatePointCache(plugin.MaxCreator): @@ -9,3 +9,5 @@ class CreatePointCache(plugin.MaxCreator): label = "Point Cache" product_type = "pointcache" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py b/server_addon/max/client/ayon_max/plugins/create/create_pointcloud.py similarity index 82% rename from client/ayon_core/hosts/max/plugins/create/create_pointcloud.py rename to server_addon/max/client/ayon_max/plugins/create/create_pointcloud.py index 9a58f4e624..52014d77b2 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_pointcloud.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating point cloud.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreatePointCloud(plugin.MaxCreator): @@ -9,3 +9,5 @@ class CreatePointCloud(plugin.MaxCreator): label = "Point Cloud" product_type = "pointcloud" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py b/server_addon/max/client/ayon_max/plugins/create/create_redshift_proxy.py similarity index 80% rename from client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py rename to server_addon/max/client/ayon_max/plugins/create/create_redshift_proxy.py index 17f5349dc1..bcc96c7efe 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_redshift_proxy.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating camera.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreateRedshiftProxy(plugin.MaxCreator): @@ -8,3 +8,5 @@ class CreateRedshiftProxy(plugin.MaxCreator): label = "Redshift Proxy" product_type = "redshiftproxy" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_render.py b/server_addon/max/client/ayon_max/plugins/create/create_render.py similarity index 93% rename from client/ayon_core/hosts/max/plugins/create/create_render.py rename to server_addon/max/client/ayon_max/plugins/create/create_render.py index 60fe628a5e..d1e236f3ef 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_render.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_render.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- """Creator plugin for creating camera.""" import os -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin from ayon_core.lib import BoolDef -from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_max.api.lib_rendersettings import RenderSettings class CreateRender(plugin.MaxCreator): @@ -13,6 +13,8 @@ class CreateRender(plugin.MaxCreator): product_type = "maxrender" icon = "gear" + settings_category = "max" + def create(self, product_name, instance_data, pre_create_data): from pymxs import runtime as rt file = rt.maxFileName diff --git a/client/ayon_core/hosts/max/plugins/create/create_review.py b/server_addon/max/client/ayon_max/plugins/create/create_review.py similarity index 98% rename from client/ayon_core/hosts/max/plugins/create/create_review.py rename to server_addon/max/client/ayon_max/plugins/create/create_review.py index 0a0ffd2e46..a49490519a 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_review.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_review.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating review in Max.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin from ayon_core.lib import BoolDef, EnumDef, NumberDef @@ -12,6 +12,8 @@ class CreateReview(plugin.MaxCreator): product_type = "review" icon = "video-camera" + settings_category = "max" + review_width = 1920 review_height = 1080 percentSize = 100 diff --git a/client/ayon_core/hosts/max/plugins/create/create_tycache.py b/server_addon/max/client/ayon_max/plugins/create/create_tycache.py similarity index 80% rename from client/ayon_core/hosts/max/plugins/create/create_tycache.py rename to server_addon/max/client/ayon_max/plugins/create/create_tycache.py index 2b3893bf13..cbdd94e272 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_tycache.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_tycache.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator plugin for creating TyCache.""" -from ayon_core.hosts.max.api import plugin +from ayon_max.api import plugin class CreateTyCache(plugin.MaxCreator): @@ -9,3 +9,5 @@ class CreateTyCache(plugin.MaxCreator): label = "TyCache" product_type = "tycache" icon = "gear" + + settings_category = "max" diff --git a/client/ayon_core/hosts/max/plugins/create/create_workfile.py b/server_addon/max/client/ayon_max/plugins/create/create_workfile.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/create/create_workfile.py rename to server_addon/max/client/ayon_max/plugins/create/create_workfile.py index 901da6254c..35c41f0fcc 100644 --- a/client/ayon_core/hosts/max/plugins/create/create_workfile.py +++ b/server_addon/max/client/ayon_max/plugins/create/create_workfile.py @@ -3,8 +3,8 @@ import ayon_api from ayon_core.pipeline import CreatedInstance, AutoCreator -from ayon_core.hosts.max.api import plugin -from ayon_core.hosts.max.api.lib import read, imprint +from ayon_max.api import plugin +from ayon_max.api.lib import read, imprint from pymxs import runtime as rt @@ -17,6 +17,8 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator): default_variant = "Main" + settings_category = "max" + def create(self): variant = self.default_variant current_instance = next( diff --git a/client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py b/server_addon/max/client/ayon_max/plugins/load/load_camera_fbx.py similarity index 96% rename from client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py rename to server_addon/max/client/ayon_max/plugins/load/load_camera_fbx.py index 6f1e9988c5..81ea15d52a 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_camera_fbx.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_camera_fbx.py @@ -1,12 +1,12 @@ import os -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( unique_namespace, get_namespace, object_transform_set ) -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, diff --git a/client/ayon_core/hosts/max/plugins/load/load_max_scene.py b/server_addon/max/client/ayon_max/plugins/load/load_max_scene.py similarity index 98% rename from client/ayon_core/hosts/max/plugins/load/load_max_scene.py rename to server_addon/max/client/ayon_max/plugins/load/load_max_scene.py index 97b8c6cd52..7fca69b193 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_max_scene.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_max_scene.py @@ -1,14 +1,14 @@ import os from qtpy import QtWidgets, QtCore from ayon_core.lib.attribute_definitions import EnumDef -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( unique_namespace, get_namespace, object_transform_set, is_headless ) -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, remove_container_data diff --git a/client/ayon_core/hosts/max/plugins/load/load_model.py b/server_addon/max/client/ayon_max/plugins/load/load_model.py similarity index 96% rename from client/ayon_core/hosts/max/plugins/load/load_model.py rename to server_addon/max/client/ayon_max/plugins/load/load_model.py index 1070fce2bd..2a6bc45c18 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_model.py @@ -1,12 +1,12 @@ import os from ayon_core.pipeline import load, get_representation_path -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, remove_container_data ) -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( maintained_selection, unique_namespace ) diff --git a/client/ayon_core/hosts/max/plugins/load/load_model_fbx.py b/server_addon/max/client/ayon_max/plugins/load/load_model_fbx.py similarity index 94% rename from client/ayon_core/hosts/max/plugins/load/load_model_fbx.py rename to server_addon/max/client/ayon_max/plugins/load/load_model_fbx.py index 6f5de20ae0..2775e1b453 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model_fbx.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_model_fbx.py @@ -1,17 +1,17 @@ import os from ayon_core.pipeline import load, get_representation_path -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, remove_container_data ) -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( unique_namespace, get_namespace, object_transform_set ) -from ayon_core.hosts.max.api.lib import maintained_selection +from ayon_max.api.lib import maintained_selection class FbxModelLoader(load.LoaderPlugin): diff --git a/client/ayon_core/hosts/max/plugins/load/load_model_obj.py b/server_addon/max/client/ayon_max/plugins/load/load_model_obj.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/load/load_model_obj.py rename to server_addon/max/client/ayon_max/plugins/load/load_model_obj.py index a9119259df..d38aadb5bc 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model_obj.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_model_obj.py @@ -1,13 +1,13 @@ import os -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( unique_namespace, get_namespace, maintained_selection, object_transform_set ) -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, diff --git a/client/ayon_core/hosts/max/plugins/load/load_model_usd.py b/server_addon/max/client/ayon_max/plugins/load/load_model_usd.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/load/load_model_usd.py rename to server_addon/max/client/ayon_max/plugins/load/load_model_usd.py index 2ed5d64a18..f4dd41d5db 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_model_usd.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_model_usd.py @@ -2,15 +2,15 @@ import os from pymxs import runtime as rt from ayon_core.pipeline.load import LoadError -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( unique_namespace, get_namespace, object_transform_set, get_plugins ) -from ayon_core.hosts.max.api.lib import maintained_selection -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.lib import maintained_selection +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, diff --git a/client/ayon_core/hosts/max/plugins/load/load_pointcache.py b/server_addon/max/client/ayon_max/plugins/load/load_pointcache.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/load/load_pointcache.py rename to server_addon/max/client/ayon_max/plugins/load/load_pointcache.py index 0743b3bb34..d7def3d0ba 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_pointcache.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_pointcache.py @@ -6,9 +6,9 @@ Because of limited api, alembics can be only loaded, but not easily updated. """ import os from ayon_core.pipeline import load, get_representation_path -from ayon_core.hosts.max.api import lib, maintained_selection -from ayon_core.hosts.max.api.lib import unique_namespace -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api import lib, maintained_selection +from ayon_max.api.lib import unique_namespace +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, remove_container_data diff --git a/client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py b/server_addon/max/client/ayon_max/plugins/load/load_pointcache_ornatrix.py similarity index 96% rename from client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py rename to server_addon/max/client/ayon_max/plugins/load/load_pointcache_ornatrix.py index 47690f84e9..bc997951c1 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_pointcache_ornatrix.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_pointcache_ornatrix.py @@ -1,20 +1,20 @@ import os from ayon_core.pipeline import load, get_representation_path from ayon_core.pipeline.load import LoadError -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, remove_container_data ) -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api.lib import ( unique_namespace, get_namespace, object_transform_set, get_plugins ) -from ayon_core.hosts.max.api import lib +from ayon_max.api import lib from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/load/load_pointcloud.py b/server_addon/max/client/ayon_max/plugins/load/load_pointcloud.py similarity index 92% rename from client/ayon_core/hosts/max/plugins/load/load_pointcloud.py rename to server_addon/max/client/ayon_max/plugins/load/load_pointcloud.py index 0e79882fc5..0fb506d5bd 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_pointcloud.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_pointcloud.py @@ -1,11 +1,11 @@ import os -from ayon_core.hosts.max.api import lib, maintained_selection -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib, maintained_selection +from ayon_max.api.lib import ( unique_namespace, ) -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, diff --git a/client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py b/server_addon/max/client/ayon_max/plugins/load/load_redshift_proxy.py similarity index 94% rename from client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py rename to server_addon/max/client/ayon_max/plugins/load/load_redshift_proxy.py index 22d42390d9..3fd84b7538 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_redshift_proxy.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_redshift_proxy.py @@ -6,14 +6,14 @@ from ayon_core.pipeline import ( get_representation_path ) from ayon_core.pipeline.load import LoadError -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, update_custom_attribute_data, get_previous_loaded_object, remove_container_data ) -from ayon_core.hosts.max.api import lib -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib +from ayon_max.api.lib import ( unique_namespace, get_plugins ) diff --git a/client/ayon_core/hosts/max/plugins/load/load_tycache.py b/server_addon/max/client/ayon_max/plugins/load/load_tycache.py similarity index 92% rename from client/ayon_core/hosts/max/plugins/load/load_tycache.py rename to server_addon/max/client/ayon_max/plugins/load/load_tycache.py index 7a5296d933..e087d5599a 100644 --- a/client/ayon_core/hosts/max/plugins/load/load_tycache.py +++ b/server_addon/max/client/ayon_max/plugins/load/load_tycache.py @@ -1,10 +1,10 @@ import os -from ayon_core.hosts.max.api import lib, maintained_selection -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api import lib, maintained_selection +from ayon_max.api.lib import ( unique_namespace, ) -from ayon_core.hosts.max.api.pipeline import ( +from ayon_max.api.pipeline import ( containerise, get_previous_loaded_object, update_custom_attribute_data, diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_current_file.py b/server_addon/max/client/ayon_max/plugins/publish/collect_current_file.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/collect_current_file.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_current_file.py diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_frame_range.py b/server_addon/max/client/ayon_max/plugins/publish/collect_frame_range.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/collect_frame_range.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_frame_range.py diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_members.py b/server_addon/max/client/ayon_max/plugins/publish/collect_members.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/collect_members.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_members.py diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_render.py b/server_addon/max/client/ayon_max/plugins/publish/collect_render.py similarity index 94% rename from client/ayon_core/hosts/max/plugins/publish/collect_render.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_render.py index 4ad9dfb3a3..a5e8d65df2 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_render.py +++ b/server_addon/max/client/ayon_max/plugins/publish/collect_render.py @@ -5,10 +5,10 @@ import pyblish.api from pymxs import runtime as rt from ayon_core.pipeline.publish import KnownPublishError -from ayon_core.hosts.max.api import colorspace -from ayon_core.hosts.max.api.lib import get_max_version, get_current_renderer -from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings -from ayon_core.hosts.max.api.lib_renderproducts import RenderProducts +from ayon_max.api import colorspace +from ayon_max.api.lib import get_max_version, get_current_renderer +from ayon_max.api.lib_rendersettings import RenderSettings +from ayon_max.api.lib_renderproducts import RenderProducts class CollectRender(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_review.py b/server_addon/max/client/ayon_max/plugins/publish/collect_review.py similarity index 99% rename from client/ayon_core/hosts/max/plugins/publish/collect_review.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_review.py index d746e2b2db..321aa7439c 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_review.py +++ b/server_addon/max/client/ayon_max/plugins/publish/collect_review.py @@ -4,7 +4,7 @@ import pyblish.api from pymxs import runtime as rt from ayon_core.lib import BoolDef -from ayon_core.hosts.max.api.lib import get_max_version +from ayon_max.api.lib import get_max_version from ayon_core.pipeline.publish import ( AYONPyblishPluginMixin, KnownPublishError diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py b/server_addon/max/client/ayon_max/plugins/publish/collect_tycache_attributes.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_tycache_attributes.py diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_workfile.py b/server_addon/max/client/ayon_max/plugins/publish/collect_workfile.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/collect_workfile.py rename to server_addon/max/client/ayon_max/plugins/publish/collect_workfile.py diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_alembic.py b/server_addon/max/client/ayon_max/plugins/publish/extract_alembic.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/extract_alembic.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_alembic.py index 67cec23ecc..b0999e5a78 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_alembic.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_alembic.py @@ -41,8 +41,8 @@ import os import pyblish.api from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection -from ayon_core.hosts.max.api.lib import suspended_refresh +from ayon_max.api import maintained_selection +from ayon_max.api.lib import suspended_refresh from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_fbx.py b/server_addon/max/client/ayon_max/plugins/publish/extract_fbx.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/publish/extract_fbx.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_fbx.py index 3d80588c47..bdfc1d0d78 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_fbx.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_fbx.py @@ -2,8 +2,8 @@ import os import pyblish.api from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection -from ayon_core.hosts.max.api.lib import convert_unit_scale +from ayon_max.api import maintained_selection +from ayon_max.api.lib import convert_unit_scale class ExtractModelFbx(publish.Extractor, OptionalPyblishPluginMixin): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py b/server_addon/max/client/ayon_max/plugins/publish/extract_max_scene_raw.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_max_scene_raw.py index f5c703564c..ecde6d2ce9 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_max_scene_raw.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_max_scene_raw.py @@ -15,6 +15,8 @@ class ExtractMaxSceneRaw(publish.Extractor, OptionalPyblishPluginMixin): families = ["camera", "maxScene", "model"] optional = True + settings_category = "max" + def process(self, instance): if not self.is_active(instance.data): return diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py b/server_addon/max/client/ayon_max/plugins/publish/extract_model_obj.py similarity index 93% rename from client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_model_obj.py index 03bdde7d5d..6556bd7809 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_model_obj.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_model_obj.py @@ -2,8 +2,8 @@ import os import pyblish.api from ayon_core.pipeline import publish, OptionalPyblishPluginMixin from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection -from ayon_core.hosts.max.api.lib import suspended_refresh +from ayon_max.api import maintained_selection +from ayon_max.api.lib import suspended_refresh from ayon_core.pipeline.publish import KnownPublishError @@ -18,6 +18,8 @@ class ExtractModelObj(publish.Extractor, OptionalPyblishPluginMixin): families = ["model"] optional = True + settings_category = "max" + def process(self, instance): if not self.is_active(instance.data): return diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py b/server_addon/max/client/ayon_max/plugins/publish/extract_model_usd.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_model_usd.py index 64791e4c7d..a48126c6e5 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_model_usd.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_model_usd.py @@ -3,7 +3,7 @@ import os import pyblish.api from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection +from ayon_max.api import maintained_selection from ayon_core.pipeline import OptionalPyblishPluginMixin, publish @@ -17,6 +17,8 @@ class ExtractModelUSD(publish.Extractor, families = ["model"] optional = True + settings_category = "max" + def process(self, instance): if not self.is_active(instance.data): return diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py b/server_addon/max/client/ayon_max/plugins/publish/extract_pointcloud.py similarity index 99% rename from client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_pointcloud.py index 67dde7f0a6..f763325eb9 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_pointcloud.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_pointcloud.py @@ -3,7 +3,7 @@ import os import pyblish.api from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection +from ayon_max.api import maintained_selection from ayon_core.pipeline import publish diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py b/server_addon/max/client/ayon_max/plugins/publish/extract_redshift_proxy.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_redshift_proxy.py index 6a647670bc..dfb3527be1 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_redshift_proxy.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_redshift_proxy.py @@ -2,7 +2,7 @@ import os import pyblish.api from ayon_core.pipeline import publish from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection +from ayon_max.api import maintained_selection class ExtractRedshiftProxy(publish.Extractor): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py b/server_addon/max/client/ayon_max/plugins/publish/extract_review_animation.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_review_animation.py index 12f1fbb63b..b6397d404e 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_review_animation.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_review_animation.py @@ -1,7 +1,7 @@ import os import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.max.api.preview_animation import ( +from ayon_max.api.preview_animation import ( render_preview_animation ) diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py b/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py index 5764ce98c4..183e381be2 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_thumbnail.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_thumbnail.py @@ -1,7 +1,7 @@ import os import pyblish.api from ayon_core.pipeline import publish -from ayon_core.hosts.max.api.preview_animation import render_preview_animation +from ayon_max.api.preview_animation import render_preview_animation class ExtractThumbnail(publish.Extractor): diff --git a/client/ayon_core/hosts/max/plugins/publish/extract_tycache.py b/server_addon/max/client/ayon_max/plugins/publish/extract_tycache.py similarity index 98% rename from client/ayon_core/hosts/max/plugins/publish/extract_tycache.py rename to server_addon/max/client/ayon_max/plugins/publish/extract_tycache.py index 50bb06a765..576abe32a2 100644 --- a/client/ayon_core/hosts/max/plugins/publish/extract_tycache.py +++ b/server_addon/max/client/ayon_max/plugins/publish/extract_tycache.py @@ -3,7 +3,7 @@ import os import pyblish.api from pymxs import runtime as rt -from ayon_core.hosts.max.api import maintained_selection +from ayon_max.api import maintained_selection from ayon_core.pipeline import publish diff --git a/client/ayon_core/hosts/max/plugins/publish/help/validate_model_name.xml b/server_addon/max/client/ayon_max/plugins/publish/help/validate_model_name.xml similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/help/validate_model_name.xml rename to server_addon/max/client/ayon_max/plugins/publish/help/validate_model_name.xml diff --git a/client/ayon_core/hosts/max/plugins/publish/increment_workfile_version.py b/server_addon/max/client/ayon_max/plugins/publish/increment_workfile_version.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/increment_workfile_version.py rename to server_addon/max/client/ayon_max/plugins/publish/increment_workfile_version.py diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scene.py b/server_addon/max/client/ayon_max/plugins/publish/save_scene.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/save_scene.py rename to server_addon/max/client/ayon_max/plugins/publish/save_scene.py diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py b/server_addon/max/client/ayon_max/plugins/publish/save_scenes_for_cameras.py similarity index 96% rename from client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py rename to server_addon/max/client/ayon_max/plugins/publish/save_scenes_for_cameras.py index 817db1b28f..a211210550 100644 --- a/client/ayon_core/hosts/max/plugins/publish/save_scenes_for_cameras.py +++ b/server_addon/max/client/ayon_max/plugins/publish/save_scenes_for_cameras.py @@ -5,8 +5,8 @@ import tempfile from pymxs import runtime as rt from ayon_core.lib import run_subprocess -from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings -from ayon_core.hosts.max.api.lib_renderproducts import RenderProducts +from ayon_max.api.lib_rendersettings import RenderSettings +from ayon_max.api.lib_renderproducts import RenderProducts class SaveScenesForCamera(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py b/server_addon/max/client/ayon_max/plugins/publish/validate_attributes.py similarity index 99% rename from client/ayon_core/hosts/max/plugins/publish/validate_attributes.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_attributes.py index 354539871f..a489533b2c 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_attributes.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_attributes.py @@ -61,6 +61,8 @@ class ValidateAttributes(OptionalPyblishPluginMixin, actions = [RepairContextAction] optional = True + settings_category = "max" + @classmethod def get_invalid(cls, context): attributes = json.loads( diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_camera_attributes.py b/server_addon/max/client/ayon_max/plugins/publish/validate_camera_attributes.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/validate_camera_attributes.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_camera_attributes.py index 9398cba2b7..63a2ef39a7 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_camera_attributes.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_camera_attributes.py @@ -6,7 +6,7 @@ from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError ) -from ayon_core.hosts.max.api.action import SelectInvalidAction +from ayon_max.api.action import SelectInvalidAction class ValidateCameraAttributes(OptionalPyblishPluginMixin, @@ -23,6 +23,8 @@ class ValidateCameraAttributes(OptionalPyblishPluginMixin, actions = [SelectInvalidAction, RepairAction] optional = True + settings_category = "max" + DEFAULTS = ["fov", "nearrange", "farrange", "nearclip", "farclip"] CAM_TYPE = ["Freecamera", "Targetcamera", diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_camera_contents.py b/server_addon/max/client/ayon_max/plugins/publish/validate_camera_contents.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_camera_contents.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_camera_contents.py diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_extended_viewport.py b/server_addon/max/client/ayon_max/plugins/publish/validate_extended_viewport.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_extended_viewport.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_extended_viewport.py diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py b/server_addon/max/client/ayon_max/plugins/publish/validate_frame_range.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_frame_range.py index 11b55232d5..9a9f22dd3e 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_frame_range.py @@ -10,7 +10,7 @@ from ayon_core.pipeline.publish import ( PublishValidationError, KnownPublishError ) -from ayon_core.hosts.max.api.lib import get_frame_range, set_timeline +from ayon_max.api.lib import get_frame_range, set_timeline class ValidateFrameRange(pyblish.api.InstancePlugin, @@ -36,6 +36,8 @@ class ValidateFrameRange(pyblish.api.InstancePlugin, optional = True actions = [RepairAction] + settings_category = "max" + def process(self, instance): if not self.is_active(instance.data): self.log.debug("Skipping Validate Frame Range...") diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_instance_has_members.py b/server_addon/max/client/ayon_max/plugins/publish/validate_instance_has_members.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_instance_has_members.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_instance_has_members.py diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_instance_in_context.py b/server_addon/max/client/ayon_max/plugins/publish/validate_instance_in_context.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/validate_instance_in_context.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_instance_in_context.py index 5107665235..d5bdfe4eb0 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_instance_in_context.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_instance_in_context.py @@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import ( PublishValidationError, OptionalPyblishPluginMixin ) -from ayon_core.hosts.max.api.action import SelectInvalidAction +from ayon_max.api.action import SelectInvalidAction from pymxs import runtime as rt @@ -27,6 +27,8 @@ class ValidateInstanceInContext(pyblish.api.InstancePlugin, hosts = ["max"] actions = [SelectInvalidAction, RepairAction] + settings_category = "max" + def process(self, instance): if not self.is_active(instance.data): return diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py b/server_addon/max/client/ayon_max/plugins/publish/validate_loaded_plugin.py similarity index 98% rename from client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_loaded_plugin.py index e278041b6b..1fddc7998d 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_loaded_plugin.py @@ -9,7 +9,7 @@ from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, PublishValidationError ) -from ayon_core.hosts.max.api.lib import get_plugins +from ayon_max.api.lib import get_plugins class ValidateLoadedPlugin(OptionalPyblishPluginMixin, @@ -25,6 +25,8 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin, optional = True actions = [RepairAction] + settings_category = "max" + family_plugins_mapping = [] @classmethod diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_mesh_has_uv.py b/server_addon/max/client/ayon_max/plugins/publish/validate_mesh_has_uv.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/publish/validate_mesh_has_uv.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_mesh_has_uv.py index ccd91da2be..31143a60c0 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_mesh_has_uv.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_mesh_has_uv.py @@ -1,6 +1,6 @@ import pyblish.api -from ayon_core.hosts.max.api.action import SelectInvalidAction +from ayon_max.api.action import SelectInvalidAction from ayon_core.pipeline.publish import ( ValidateMeshOrder, OptionalPyblishPluginMixin, @@ -30,6 +30,8 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin, actions = [SelectInvalidAction] optional = True + settings_category = "max" + @classmethod def get_invalid(cls, instance): meshes = [member for member in instance.data["members"] diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_model_contents.py b/server_addon/max/client/ayon_max/plugins/publish/validate_model_contents.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_model_contents.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_model_contents.py diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_model_name.py b/server_addon/max/client/ayon_max/plugins/publish/validate_model_name.py similarity index 97% rename from client/ayon_core/hosts/max/plugins/publish/validate_model_name.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_model_name.py index eb86e2e5bd..d691b739b7 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_model_name.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_model_name.py @@ -4,7 +4,7 @@ import re import pyblish.api -from ayon_core.hosts.max.api.action import SelectInvalidAction +from ayon_max.api.action import SelectInvalidAction from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, @@ -39,6 +39,9 @@ class ValidateModelName(pyblish.api.InstancePlugin, families = ["model"] label = "Validate Model Name" actions = [SelectInvalidAction] + + settings_category = "max" + # defined by settings regex = r"(.*)_(?P.*)_(GEO)" # cache diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_no_animation.py b/server_addon/max/client/ayon_max/plugins/publish/validate_no_animation.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/publish/validate_no_animation.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_no_animation.py index 4b2a18d606..26384954ca 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_no_animation.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_no_animation.py @@ -5,7 +5,7 @@ from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin ) -from ayon_core.hosts.max.api.action import SelectInvalidAction +from ayon_max.api.action import SelectInvalidAction def get_invalid_keys(obj): @@ -39,6 +39,8 @@ class ValidateNoAnimation(pyblish.api.InstancePlugin, label = "Validate No Animation" actions = [SelectInvalidAction] + settings_category = "max" + def process(self, instance): if not self.is_active(instance.data): return diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py b/server_addon/max/client/ayon_max/plugins/publish/validate_pointcloud.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_pointcloud.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_pointcloud.py diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py b/server_addon/max/client/ayon_max/plugins/publish/validate_renderable_camera.py similarity index 95% rename from client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_renderable_camera.py index ffd6b183fe..dc05771e1b 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_renderable_camera.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_renderable_camera.py @@ -4,7 +4,7 @@ from ayon_core.pipeline import ( PublishValidationError, OptionalPyblishPluginMixin) from ayon_core.pipeline.publish import RepairAction -from ayon_core.hosts.max.api.lib import get_current_renderer +from ayon_max.api.lib import get_current_renderer from pymxs import runtime as rt diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py b/server_addon/max/client/ayon_max/plugins/publish/validate_renderer_redshift_proxy.py similarity index 96% rename from client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_renderer_redshift_proxy.py index de3a806c85..66c69bc100 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_renderer_redshift_proxy.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_renderer_redshift_proxy.py @@ -3,7 +3,7 @@ import pyblish.api from ayon_core.pipeline import PublishValidationError from pymxs import runtime as rt from ayon_core.pipeline.publish import RepairAction -from ayon_core.hosts.max.api.lib import get_current_renderer +from ayon_max.api.lib import get_current_renderer class ValidateRendererRedshiftProxy(pyblish.api.InstancePlugin): diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_renderpasses.py b/server_addon/max/client/ayon_max/plugins/publish/validate_renderpasses.py similarity index 98% rename from client/ayon_core/hosts/max/plugins/publish/validate_renderpasses.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_renderpasses.py index 394d3119c4..d0d47c6340 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_renderpasses.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_renderpasses.py @@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import ( PublishValidationError, OptionalPyblishPluginMixin ) -from ayon_core.hosts.max.api.lib_rendersettings import RenderSettings +from ayon_max.api.lib_rendersettings import RenderSettings class ValidateRenderPasses(OptionalPyblishPluginMixin, @@ -21,6 +21,8 @@ class ValidateRenderPasses(OptionalPyblishPluginMixin, label = "Validate Render Passes" actions = [RepairAction] + settings_category = "max" + def process(self, instance): invalid = self.get_invalid(instance) if invalid: diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py b/server_addon/max/client/ayon_max/plugins/publish/validate_resolution_setting.py similarity index 98% rename from client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_resolution_setting.py index 5f6cd0a21d..9f7ec17dd9 100644 --- a/client/ayon_core/hosts/max/plugins/publish/validate_resolution_setting.py +++ b/server_addon/max/client/ayon_max/plugins/publish/validate_resolution_setting.py @@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import ( RepairAction, PublishValidationError ) -from ayon_core.hosts.max.api.lib import ( +from ayon_max.api.lib import ( reset_scene_resolution, imprint ) diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_scene_saved.py b/server_addon/max/client/ayon_max/plugins/publish/validate_scene_saved.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_scene_saved.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_scene_saved.py diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_tyflow_data.py b/server_addon/max/client/ayon_max/plugins/publish/validate_tyflow_data.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/publish/validate_tyflow_data.py rename to server_addon/max/client/ayon_max/plugins/publish/validate_tyflow_data.py diff --git a/client/ayon_core/hosts/max/startup/startup.ms b/server_addon/max/client/ayon_max/startup/startup.ms similarity index 100% rename from client/ayon_core/hosts/max/startup/startup.ms rename to server_addon/max/client/ayon_max/startup/startup.ms diff --git a/client/ayon_core/hosts/max/startup/startup.py b/server_addon/max/client/ayon_max/startup/startup.py similarity index 88% rename from client/ayon_core/hosts/max/startup/startup.py rename to server_addon/max/client/ayon_max/startup/startup.py index 49a861bad0..1462cc93b7 100644 --- a/client/ayon_core/hosts/max/startup/startup.py +++ b/server_addon/max/client/ayon_max/startup/startup.py @@ -1,15 +1,13 @@ # -*- coding: utf-8 -*- import os import sys - +from ayon_max.api import MaxHost +from ayon_core.pipeline import install_host # this might happen in some 3dsmax version where PYTHONPATH isn't added # to sys.path automatically for path in os.environ["PYTHONPATH"].split(os.pathsep): if path and path not in sys.path: sys.path.append(path) -from ayon_core.hosts.max.api import MaxHost -from ayon_core.pipeline import install_host - host = MaxHost() install_host(host) diff --git a/server_addon/max/package.py b/server_addon/max/package.py index fb1f1b3050..ddd4e3b33e 100644 --- a/server_addon/max/package.py +++ b/server_addon/max/package.py @@ -1,3 +1,9 @@ name = "max" title = "Max" -version = "0.1.7" +version = "0.2.0" +client_dir = "ayon_max" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/client/ayon_core/hosts/maya/__init__.py b/server_addon/maya/client/ayon_maya/__init__.py similarity index 100% rename from client/ayon_core/hosts/maya/__init__.py rename to server_addon/maya/client/ayon_maya/__init__.py diff --git a/client/ayon_core/hosts/maya/addon.py b/server_addon/maya/client/ayon_maya/addon.py similarity index 100% rename from client/ayon_core/hosts/maya/addon.py rename to server_addon/maya/client/ayon_maya/addon.py diff --git a/client/ayon_core/hosts/maya/api/__init__.py b/server_addon/maya/client/ayon_maya/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/maya/api/__init__.py rename to server_addon/maya/client/ayon_maya/api/__init__.py diff --git a/client/ayon_core/hosts/maya/api/action.py b/server_addon/maya/client/ayon_maya/api/action.py similarity index 100% rename from client/ayon_core/hosts/maya/api/action.py rename to server_addon/maya/client/ayon_maya/api/action.py diff --git a/client/ayon_core/hosts/maya/api/alembic.py b/server_addon/maya/client/ayon_maya/api/alembic.py similarity index 99% rename from client/ayon_core/hosts/maya/api/alembic.py rename to server_addon/maya/client/ayon_maya/api/alembic.py index 6bd00e1cb1..007e3ce4f3 100644 --- a/client/ayon_core/hosts/maya/api/alembic.py +++ b/server_addon/maya/client/ayon_maya/api/alembic.py @@ -4,7 +4,7 @@ import os from maya import cmds # noqa -from ayon_core.hosts.maya.api.lib import evaluation +from ayon_maya.api.lib import evaluation log = logging.getLogger(__name__) diff --git a/client/ayon_core/hosts/maya/api/commands.py b/server_addon/maya/client/ayon_maya/api/commands.py similarity index 100% rename from client/ayon_core/hosts/maya/api/commands.py rename to server_addon/maya/client/ayon_maya/api/commands.py diff --git a/client/ayon_core/hosts/maya/api/customize.py b/server_addon/maya/client/ayon_maya/api/customize.py similarity index 100% rename from client/ayon_core/hosts/maya/api/customize.py rename to server_addon/maya/client/ayon_maya/api/customize.py diff --git a/client/ayon_core/hosts/maya/api/exitstack.py b/server_addon/maya/client/ayon_maya/api/exitstack.py similarity index 98% rename from client/ayon_core/hosts/maya/api/exitstack.py rename to server_addon/maya/client/ayon_maya/api/exitstack.py index 5eb7e15784..c35724e889 100644 --- a/client/ayon_core/hosts/maya/api/exitstack.py +++ b/server_addon/maya/client/ayon_maya/api/exitstack.py @@ -6,7 +6,7 @@ compatible implementation to support bothPython 2 and Python 3. Instead of using ExitStack from contextlib, use it from this module: ->>> from ayon_core.hosts.maya.api.exitstack import ExitStack +>>> from ayon_maya.api.exitstack import ExitStack It will provide the appropriate ExitStack implementation for the current running Python version. diff --git a/client/ayon_core/hosts/maya/api/fbx.py b/server_addon/maya/client/ayon_maya/api/fbx.py similarity index 99% rename from client/ayon_core/hosts/maya/api/fbx.py rename to server_addon/maya/client/ayon_maya/api/fbx.py index fd1bf2c901..28a4058551 100644 --- a/client/ayon_core/hosts/maya/api/fbx.py +++ b/server_addon/maya/client/ayon_maya/api/fbx.py @@ -4,7 +4,7 @@ import logging from maya import cmds # noqa import maya.mel as mel # noqa -from ayon_core.hosts.maya.api.lib import maintained_selection +from ayon_maya.api.lib import maintained_selection class FBXExtractor: diff --git a/client/ayon_core/hosts/maya/api/gltf.py b/server_addon/maya/client/ayon_maya/api/gltf.py similarity index 97% rename from client/ayon_core/hosts/maya/api/gltf.py rename to server_addon/maya/client/ayon_maya/api/gltf.py index 2a983f1573..9aa4bf37ef 100644 --- a/client/ayon_core/hosts/maya/api/gltf.py +++ b/server_addon/maya/client/ayon_maya/api/gltf.py @@ -16,7 +16,7 @@ _gltf_options = { "hbu": bool, # hashBufferURI "ext": bool, # externalTextures "ivt": int, # initialValuesTime - "acn": str, # animationClipName + "acn": str, # animationClipName # codespell:ignore acn "ast": int, # animationClipStartTime "aet": int, # animationClipEndTime "afr": float, # animationClipFrameRate diff --git a/client/ayon_core/hosts/maya/api/lib.py b/server_addon/maya/client/ayon_maya/api/lib.py similarity index 100% rename from client/ayon_core/hosts/maya/api/lib.py rename to server_addon/maya/client/ayon_maya/api/lib.py diff --git a/client/ayon_core/hosts/maya/api/lib_renderproducts.py b/server_addon/maya/client/ayon_maya/api/lib_renderproducts.py similarity index 100% rename from client/ayon_core/hosts/maya/api/lib_renderproducts.py rename to server_addon/maya/client/ayon_maya/api/lib_renderproducts.py diff --git a/client/ayon_core/hosts/maya/api/lib_rendersettings.py b/server_addon/maya/client/ayon_maya/api/lib_rendersettings.py similarity index 99% rename from client/ayon_core/hosts/maya/api/lib_rendersettings.py rename to server_addon/maya/client/ayon_maya/api/lib_rendersettings.py index f9e243146a..f7f3f1d746 100644 --- a/client/ayon_core/hosts/maya/api/lib_rendersettings.py +++ b/server_addon/maya/client/ayon_maya/api/lib_rendersettings.py @@ -8,7 +8,7 @@ from ayon_core.settings import get_project_settings from ayon_core.pipeline import CreatorError, get_current_project_name from ayon_core.pipeline.context_tools import get_current_folder_entity -from ayon_core.hosts.maya.api.lib import reset_frame_range +from ayon_maya.api.lib import reset_frame_range class RenderSettings(object): diff --git a/client/ayon_core/hosts/maya/api/lib_rendersetup.py b/server_addon/maya/client/ayon_maya/api/lib_rendersetup.py similarity index 99% rename from client/ayon_core/hosts/maya/api/lib_rendersetup.py rename to server_addon/maya/client/ayon_maya/api/lib_rendersetup.py index 6dca8eb6dd..d93e6af0e2 100644 --- a/client/ayon_core/hosts/maya/api/lib_rendersetup.py +++ b/server_addon/maya/client/ayon_maya/api/lib_rendersetup.py @@ -19,7 +19,7 @@ from maya.app.renderSetup.model.override import ( UniqueOverride ) -from ayon_core.hosts.maya.api.lib import get_attribute +from ayon_maya.api.lib import get_attribute EXACT_MATCH = 0 PARENT_MATCH = 1 diff --git a/client/ayon_core/hosts/maya/api/menu.py b/server_addon/maya/client/ayon_maya/api/menu.py similarity index 99% rename from client/ayon_core/hosts/maya/api/menu.py rename to server_addon/maya/client/ayon_maya/api/menu.py index e3ef50cdc0..153aff07c3 100644 --- a/client/ayon_core/hosts/maya/api/menu.py +++ b/server_addon/maya/client/ayon_maya/api/menu.py @@ -15,7 +15,7 @@ from ayon_core.pipeline import ( ) from ayon_core.pipeline.workfile import BuildWorkfile from ayon_core.tools.utils import host_tools -from ayon_core.hosts.maya.api import lib, lib_rendersettings +from ayon_maya.api import lib, lib_rendersettings from .lib import get_main_window, IS_HEADLESS from ..tools import show_look_assigner diff --git a/client/ayon_core/hosts/maya/api/pipeline.py b/server_addon/maya/client/ayon_maya/api/pipeline.py similarity index 99% rename from client/ayon_core/hosts/maya/api/pipeline.py rename to server_addon/maya/client/ayon_maya/api/pipeline.py index 74d73e5f95..84268cc6f1 100644 --- a/client/ayon_core/hosts/maya/api/pipeline.py +++ b/server_addon/maya/client/ayon_maya/api/pipeline.py @@ -45,8 +45,8 @@ from ayon_core.pipeline.workfile.lock_workfile import ( is_workfile_locked, is_workfile_lock_enabled ) -from ayon_core.hosts.maya import MAYA_ROOT_DIR -from ayon_core.hosts.maya.lib import create_workspace_mel +from ayon_maya import MAYA_ROOT_DIR +from ayon_maya.lib import create_workspace_mel from . import menu, lib from .workio import ( @@ -58,7 +58,7 @@ from .workio import ( current_file ) -log = logging.getLogger("ayon_core.hosts.maya") +log = logging.getLogger("ayon_maya") PLUGINS_DIR = os.path.join(MAYA_ROOT_DIR, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/server_addon/maya/client/ayon_maya/api/plugin.py similarity index 97% rename from client/ayon_core/hosts/maya/api/plugin.py rename to server_addon/maya/client/ayon_maya/api/plugin.py index 6f8b74c906..b8d9748ef1 100644 --- a/client/ayon_core/hosts/maya/api/plugin.py +++ b/server_addon/maya/client/ayon_maya/api/plugin.py @@ -2,40 +2,41 @@ import json import os from abc import ABCMeta +import ayon_api import qargparse import six -import ayon_api -from maya import cmds -from maya.app.renderSetup.model import renderSetup from ayon_core.lib import BoolDef, Logger -from ayon_core.settings import get_project_settings from ayon_core.pipeline import ( - AYON_INSTANCE_ID, - AYON_CONTAINER_ID, - AVALON_INSTANCE_ID, AVALON_CONTAINER_ID, + AVALON_INSTANCE_ID, + AYON_CONTAINER_ID, + AYON_INSTANCE_ID, Anatomy, - + AutoCreator, CreatedInstance, Creator as NewCreator, - AutoCreator, - HiddenCreator, - CreatorError, + HiddenCreator, LegacyCreator, LoaderPlugin, - get_representation_path, get_current_project_name, + get_representation_path, + publish, ) -from ayon_core.pipeline.load import LoadError from ayon_core.pipeline.create import get_product_name +from ayon_core.pipeline.load import LoadError +from ayon_core.settings import get_project_settings +from maya import cmds +from maya.app.renderSetup.model import renderSetup +from pyblish.api import ContextPlugin, InstancePlugin from . import lib from .lib import imprint, read from .pipeline import containerise log = Logger.get_logger() +SETTINGS_CATEGORY = "maya" def _get_attr(node, attr, default=None): @@ -652,7 +653,7 @@ def get_load_color_for_product_type(product_type, settings=None): class Loader(LoaderPlugin): hosts = ["maya"] - + settings_category = SETTINGS_CATEGORY load_settings = {} # defined in settings @classmethod @@ -807,10 +808,9 @@ class ReferenceLoader(Loader): raise NotImplementedError("Must be implemented by subclass") def update(self, container, context): + from ayon_maya.api.lib import get_container_members from maya import cmds - from ayon_core.hosts.maya.api.lib import get_container_members - node = container["objectName"] project_name = context["project"]["name"] @@ -1025,3 +1025,30 @@ class ReferenceLoader(Loader): AYON_CONTAINER_ID, AVALON_CONTAINER_ID }: cmds.sets(node, forceElement=container) + + +class MayaLoader(LoaderPlugin): + """Base class for loader plugins.""" + + settings_category = SETTINGS_CATEGORY + + +class MayaInstancePlugin(InstancePlugin): + """Base class for instance publish plugins.""" + + settings_category = SETTINGS_CATEGORY + hosts = ["maya"] + + +class MayaContextPlugin(ContextPlugin): + """Base class for context publish plugins.""" + + settings_category = SETTINGS_CATEGORY + hosts = ["maya"] + + +class MayaExtractorPlugin(publish.Extractor): + """Base class for extract plugins.""" + + settings_category = SETTINGS_CATEGORY + hosts = ["maya"] diff --git a/client/ayon_core/hosts/maya/api/render_setup_tools.py b/server_addon/maya/client/ayon_maya/api/render_setup_tools.py similarity index 100% rename from client/ayon_core/hosts/maya/api/render_setup_tools.py rename to server_addon/maya/client/ayon_maya/api/render_setup_tools.py diff --git a/client/ayon_core/hosts/maya/api/setdress.py b/server_addon/maya/client/ayon_maya/api/setdress.py similarity index 99% rename from client/ayon_core/hosts/maya/api/setdress.py rename to server_addon/maya/client/ayon_maya/api/setdress.py index b1d5beb343..a130b93f4f 100644 --- a/client/ayon_core/hosts/maya/api/setdress.py +++ b/server_addon/maya/client/ayon_maya/api/setdress.py @@ -20,7 +20,7 @@ from ayon_core.pipeline import ( get_representation_path, get_current_project_name, ) -from ayon_core.hosts.maya.api.lib import ( +from ayon_maya.api.lib import ( matrix_equals, unique_namespace, get_container_transforms, diff --git a/client/ayon_core/hosts/maya/api/workfile_template_builder.py b/server_addon/maya/client/ayon_maya/api/workfile_template_builder.py similarity index 100% rename from client/ayon_core/hosts/maya/api/workfile_template_builder.py rename to server_addon/maya/client/ayon_maya/api/workfile_template_builder.py diff --git a/client/ayon_core/hosts/maya/api/workio.py b/server_addon/maya/client/ayon_maya/api/workio.py similarity index 100% rename from client/ayon_core/hosts/maya/api/workio.py rename to server_addon/maya/client/ayon_maya/api/workio.py diff --git a/client/ayon_core/hosts/maya/api/yeti.py b/server_addon/maya/client/ayon_maya/api/yeti.py similarity index 100% rename from client/ayon_core/hosts/maya/api/yeti.py rename to server_addon/maya/client/ayon_maya/api/yeti.py diff --git a/client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py b/server_addon/maya/client/ayon_maya/hooks/pre_auto_load_plugins.py similarity index 100% rename from client/ayon_core/hosts/maya/hooks/pre_auto_load_plugins.py rename to server_addon/maya/client/ayon_maya/hooks/pre_auto_load_plugins.py diff --git a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py b/server_addon/maya/client/ayon_maya/hooks/pre_copy_mel.py similarity index 92% rename from client/ayon_core/hosts/maya/hooks/pre_copy_mel.py rename to server_addon/maya/client/ayon_maya/hooks/pre_copy_mel.py index 683b4c59c7..c3268b09ee 100644 --- a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py +++ b/server_addon/maya/client/ayon_maya/hooks/pre_copy_mel.py @@ -1,5 +1,5 @@ from ayon_applications import PreLaunchHook, LaunchTypes -from ayon_core.hosts.maya.lib import create_workspace_mel +from ayon_maya.lib import create_workspace_mel class PreCopyMel(PreLaunchHook): diff --git a/client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py b/server_addon/maya/client/ayon_maya/hooks/pre_open_workfile_post_initialization.py similarity index 100% rename from client/ayon_core/hosts/maya/hooks/pre_open_workfile_post_initialization.py rename to server_addon/maya/client/ayon_maya/hooks/pre_open_workfile_post_initialization.py diff --git a/client/ayon_core/hosts/maya/lib.py b/server_addon/maya/client/ayon_maya/lib.py similarity index 100% rename from client/ayon_core/hosts/maya/lib.py rename to server_addon/maya/client/ayon_maya/lib.py diff --git a/client/ayon_core/hosts/max/plugins/__init__.py b/server_addon/maya/client/ayon_maya/plugins/__init__.py similarity index 100% rename from client/ayon_core/hosts/max/plugins/__init__.py rename to server_addon/maya/client/ayon_maya/plugins/__init__.py diff --git a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py b/server_addon/maya/client/ayon_maya/plugins/create/convert_legacy.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/create/convert_legacy.py rename to server_addon/maya/client/ayon_maya/plugins/create/convert_legacy.py index 81cf9613b4..8616413bdd 100644 --- a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/convert_legacy.py @@ -1,8 +1,8 @@ import ayon_api from ayon_core.pipeline.create.creator_plugins import ProductConvertorPlugin -from ayon_core.hosts.maya.api import plugin -from ayon_core.hosts.maya.api.lib import read +from ayon_maya.api import plugin +from ayon_maya.api.lib import read from maya import cmds from maya.app.renderSetup.model import renderSetup @@ -12,7 +12,7 @@ class MayaLegacyConvertor(ProductConvertorPlugin, plugin.MayaCreatorBase): """Find and convert any legacy products in the scene. - This Convertor will find all legacy products in the scene and will + This Converter will find all legacy products in the scene and will transform them to the current system. Since the old products doesn't retain any information about their original creators, the only mapping we can do is based on their families. diff --git a/client/ayon_core/hosts/maya/plugins/create/create_animation_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/create/create_animation_pointcache.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py index 069762e4ae..ea4cdb57fe 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_animation_pointcache.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_animation_pointcache.py @@ -1,6 +1,6 @@ from maya import cmds -from ayon_core.hosts.maya.api import lib, plugin +from ayon_maya.api import lib, plugin from ayon_core.lib import ( BoolDef, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/create/create_arnold_scene_source.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_arnold_scene_source.py index e321c13ca0..8ae2759628 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_arnold_scene_source.py @@ -1,6 +1,6 @@ from maya import cmds -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py b/server_addon/maya/client/ayon_maya/plugins/create/create_assembly.py similarity index 83% rename from client/ayon_core/hosts/maya/plugins/create/create_assembly.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_assembly.py index 92df125748..dff04f059e 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_assembly.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin class CreateAssembly(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_camera.py b/server_addon/maya/client/ayon_maya/plugins/create/create_camera.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/create/create_camera.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_camera.py index 4b1265bd3b..393176f5dd 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_camera.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_camera.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_layout.py b/server_addon/maya/client/ayon_maya/plugins/create/create_layout.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/create/create_layout.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_layout.py index 6cbc697502..1d9bc2c1c8 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_layout.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_layout.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_look.py b/server_addon/maya/client/ayon_maya/plugins/create/create_look.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/create/create_look.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_look.py index ac3625c38f..1f90d18607 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_look.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( plugin, lib ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py b/server_addon/maya/client/ayon_maya/plugins/create/create_matchmove.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/create/create_matchmove.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_matchmove.py index 44443a8b9f..9cb2a3dd47 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_matchmove.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/create/create_maya_usd.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_maya_usd.py index 3f34a541b4..19b55384f3 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_maya_usd.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from ayon_core.lib import ( BoolDef, EnumDef, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py b/server_addon/maya/client/ayon_maya/plugins/create/create_mayascene.py similarity index 84% rename from client/ayon_core/hosts/maya/plugins/create/create_mayascene.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_mayascene.py index cfe46336a2..9913efc016 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_mayascene.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin class CreateMayaScene(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_model.py b/server_addon/maya/client/ayon_maya/plugins/create/create_model.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/create/create_model.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_model.py index b47df421f3..87696c58d2 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_model.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_model.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from ayon_core.lib import ( BoolDef, TextDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multishot_layout.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_multishot_layout.py index 7216236719..5229823110 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multishot_layout.py @@ -8,7 +8,7 @@ from ayon_api import ( ) from maya import cmds # noqa: F401 -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from ayon_core.lib import BoolDef, EnumDef, TextDef from ayon_core.pipeline import ( Creator, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_look.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_look.py index de604a33b3..f2dcb77187 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_look.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from ayon_core.lib import ( BoolDef, EnumDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd.py index 668700995f..bdcea4cd2c 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from ayon_core.lib import ( BoolDef, NumberDef, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_comp.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_comp.py index 120e6ad920..2459704d14 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_comp.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from ayon_core.lib import ( BoolDef, NumberDef, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_over.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_over.py index 26208794e3..b070daf550 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_multiverse_usd_over.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from ayon_core.lib import ( BoolDef, NumberDef, diff --git a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py b/server_addon/maya/client/ayon_maya/plugins/create/create_proxy_abc.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_proxy_abc.py index ecc031436c..431f113941 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_proxy_abc.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/create/create_redshift_proxy.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_redshift_proxy.py index d99fe5a787..c4cc874a2a 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_redshift_proxy.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Creator of Redshift proxy product types.""" -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_render.py b/server_addon/maya/client/ayon_maya/plugins/create/create_render.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/create/create_render.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_render.py index e5a8d4dbd8..5defee7d07 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_render.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_render.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Create ``Render`` instance in Maya.""" -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib_rendersettings, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/create/create_rendersetup.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_rendersetup.py index 3d8d6a7309..415ab4ff8c 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_rendersetup.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from ayon_core.pipeline import CreatorError diff --git a/client/ayon_core/hosts/maya/plugins/create/create_review.py b/server_addon/maya/client/ayon_maya/plugins/create/create_review.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/create/create_review.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_review.py index 8a2f2df745..26fad91ed9 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_review.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_review.py @@ -3,7 +3,7 @@ import json from maya import cmds import ayon_api -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rig.py b/server_addon/maya/client/ayon_maya/plugins/create/create_rig.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/create/create_rig.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_rig.py index 54be50c169..135e51bcbf 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_rig.py @@ -1,6 +1,6 @@ from maya import cmds -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin class CreateRig(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py b/server_addon/maya/client/ayon_maya/plugins/create/create_setdress.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/create/create_setdress.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_setdress.py index 0f72d4d184..12532e0724 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_setdress.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from ayon_core.lib import BoolDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_skeletalmesh.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_unreal_skeletalmesh.py index a32e94971e..a182fe7a24 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_skeletalmesh.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator for Unreal Skeletal Meshes.""" -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from ayon_core.lib import ( BoolDef, TextDef diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_staticmesh.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_unreal_staticmesh.py index 76c33f00cc..e5436bca64 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_staticmesh.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- """Creator for Unreal Static Meshes.""" -from ayon_core.hosts.maya.api import plugin, lib +from ayon_maya.api import plugin, lib from maya import cmds # noqa diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_yeticache.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_unreal_yeticache.py index dea64b40fb..eea866d406 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_unreal_yeticache.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayproxy.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_vrayproxy.py index d565ec37e0..742e14ace0 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayproxy.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( plugin, lib ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayscene.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_vrayscene.py index cf5e7b5364..11c356fdef 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_vrayscene.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Create instance of vrayscene.""" -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib_rendersettings, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py b/server_addon/maya/client/ayon_maya/plugins/create/create_workfile.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/create/create_workfile.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_workfile.py index f636ed7b74..e0c94611b0 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_workfile.py @@ -3,7 +3,7 @@ import ayon_api from ayon_core.pipeline import CreatedInstance, AutoCreator -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin from maya import cmds diff --git a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py b/server_addon/maya/client/ayon_maya/plugins/create/create_xgen.py similarity index 79% rename from client/ayon_core/hosts/maya/plugins/create/create_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_xgen.py index fec2f07456..d13d032a13 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_xgen.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import plugin +from ayon_maya.api import plugin class CreateXgen(plugin.MayaCreator): diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_cache.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_yeti_cache.py index bf20acaca8..8a834f18c0 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_cache.py @@ -1,4 +1,4 @@ -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_rig.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py rename to server_addon/maya/client/ayon_maya/plugins/create/create_yeti_rig.py index dfe224ceb1..c5378dc1b8 100644 --- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/create/create_yeti_rig.py @@ -1,6 +1,6 @@ from maya import cmds -from ayon_core.hosts.maya.api import ( +from ayon_maya.api import ( lib, plugin ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_geometry.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/connect_geometry.py index 5410546a2e..ccb88313e9 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py +++ b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_geometry.py @@ -1,7 +1,7 @@ from maya import cmds from ayon_core.pipeline import InventoryAction, get_repres_contexts -from ayon_core.hosts.maya.api.lib import get_id +from ayon_maya.api.lib import get_id class ConnectGeometry(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_xgen.py similarity index 100% rename from client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/connect_xgen.py diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_yeti_rig.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/connect_yeti_rig.py index 8f13cc6ae5..2385444403 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/inventory/connect_yeti_rig.py @@ -9,7 +9,7 @@ from ayon_core.pipeline import ( get_repres_contexts, get_representation_path, ) -from ayon_core.hosts.maya.api.lib import get_container_members, get_id +from ayon_maya.api.lib import get_container_members, get_id class ConnectYetiRig(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py b/server_addon/maya/client/ayon_maya/plugins/inventory/import_modelrender.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/import_modelrender.py index 4655017ae5..5e36ec6bc1 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/import_modelrender.py +++ b/server_addon/maya/client/ayon_maya/plugins/inventory/import_modelrender.py @@ -8,7 +8,7 @@ from ayon_core.pipeline import ( InventoryAction, get_current_project_name, ) -from ayon_core.hosts.maya.api.lib import ( +from ayon_maya.api.lib import ( maintained_selection, apply_shaders ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py b/server_addon/maya/client/ayon_maya/plugins/inventory/import_reference.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/inventory/import_reference.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/import_reference.py index 771cb96a57..5e42facad4 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/import_reference.py +++ b/server_addon/maya/client/ayon_maya/plugins/inventory/import_reference.py @@ -1,7 +1,7 @@ from maya import cmds from ayon_core.pipeline import InventoryAction -from ayon_core.hosts.maya.api.lib import get_reference_node +from ayon_maya.api.lib import get_reference_node class ImportReference(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py b/server_addon/maya/client/ayon_maya/plugins/inventory/rig_recreate_animation_instance.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/rig_recreate_animation_instance.py index cbff293cd7..796a651f8a 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/rig_recreate_animation_instance.py +++ b/server_addon/maya/client/ayon_maya/plugins/inventory/rig_recreate_animation_instance.py @@ -3,7 +3,7 @@ from ayon_core.pipeline import ( get_current_project_name, ) from ayon_core.pipeline.load import get_representation_contexts_by_ids -from ayon_core.hosts.maya.api.lib import ( +from ayon_maya.api.lib import ( create_rig_animation_instance, get_container_members, ) diff --git a/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py b/server_addon/maya/client/ayon_maya/plugins/inventory/select_containers.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/inventory/select_containers.py rename to server_addon/maya/client/ayon_maya/plugins/inventory/select_containers.py index f0bb2fc376..e45c8a5706 100644 --- a/client/ayon_core/hosts/maya/plugins/inventory/select_containers.py +++ b/server_addon/maya/client/ayon_maya/plugins/inventory/select_containers.py @@ -1,7 +1,7 @@ from maya import cmds from ayon_core.pipeline import InventoryAction, registered_host -from ayon_core.hosts.maya.api.lib import get_container_members +from ayon_maya.api.lib import get_container_members class SelectInScene(InventoryAction): diff --git a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py b/server_addon/maya/client/ayon_maya/plugins/load/_load_animation.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/load/_load_animation.py rename to server_addon/maya/client/ayon_maya/plugins/load/_load_animation.py index 393f6b0115..6d4ebe250c 100644 --- a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/_load_animation.py @@ -1,4 +1,4 @@ -import ayon_core.hosts.maya.api.plugin +import ayon_maya.api.plugin import maya.cmds as cmds @@ -14,7 +14,7 @@ def _process_reference(file_url, name, namespace, options): Returns: list: list of object nodes """ - from ayon_core.hosts.maya.api.lib import unique_namespace + from ayon_maya.api.lib import unique_namespace # Get name from asset being loaded # Assuming name is product name from the animation, we split the number # suffix from the name to ensure the namespace is unique @@ -43,7 +43,7 @@ def _process_reference(file_url, name, namespace, options): return nodes -class AbcLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader): +class AbcLoader(ayon_maya.api.plugin.ReferenceLoader): """Loader to reference an Alembic file""" product_types = { @@ -74,7 +74,7 @@ class AbcLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader): return nodes -class FbxLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader): +class FbxLoader(ayon_maya.api.plugin.ReferenceLoader): """Loader to reference an Fbx files""" product_types = { diff --git a/client/ayon_core/hosts/maya/plugins/load/actions.py b/server_addon/maya/client/ayon_maya/plugins/load/actions.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/load/actions.py rename to server_addon/maya/client/ayon_maya/plugins/load/actions.py index 8bef219812..d28645ea43 100644 --- a/client/ayon_core/hosts/maya/plugins/load/actions.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/actions.py @@ -3,11 +3,11 @@ """ import qargparse from ayon_core.pipeline import load -from ayon_core.hosts.maya.api.lib import ( +from ayon_maya.api.lib import ( maintained_selection, get_custom_namespace ) -import ayon_core.hosts.maya.api.plugin +import ayon_maya.api.plugin class SetFrameRangeLoader(load.LoaderPlugin): @@ -85,7 +85,7 @@ class SetFrameRangeWithHandlesLoader(load.LoaderPlugin): animationEndTime=end) -class ImportMayaLoader(ayon_core.hosts.maya.api.plugin.Loader): +class ImportMayaLoader(ayon_maya.api.plugin.Loader): """Import action for Maya (unmanaged) Warning: diff --git a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py b/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py index ae3b68965a..d01cea3ad4 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py @@ -1,21 +1,18 @@ import os + import clique - import maya.cmds as cmds - +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.lib import ( - unique_namespace, +from ayon_maya.api.lib import ( get_attribute_input, + get_fps_for_current_context, maintained_selection, - get_fps_for_current_context + unique_namespace, ) -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api.pipeline import containerise +from ayon_maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api import plugin def is_sequence(files): @@ -26,7 +23,7 @@ def is_sequence(files): return sequence -class ArnoldStandinLoader(load.LoaderPlugin): +class ArnoldStandinLoader(plugin.Loader): """Load as Arnold standin""" product_types = { diff --git a/client/ayon_core/hosts/maya/plugins/load/load_as_template.py b/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py similarity index 79% rename from client/ayon_core/hosts/maya/plugins/load/load_as_template.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py index f696d369e3..b6bd3c3ab6 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_as_template.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py @@ -1,16 +1,10 @@ -from ayon_core.lib import ( - BoolDef -) -from ayon_core.pipeline import ( - load, - registered_host -) -from ayon_core.hosts.maya.api.workfile_template_builder import ( - MayaTemplateBuilder -) +from ayon_core.lib import BoolDef +from ayon_core.pipeline import registered_host +from ayon_maya.api import plugin +from ayon_maya.api.workfile_template_builder import MayaTemplateBuilder -class LoadAsTemplate(load.LoaderPlugin): +class LoadAsTemplate(plugin.Loader): """Load workfile as a template """ product_types = {"workfile", "mayaScene"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_assembly.py b/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/load/load_assembly.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py index 0fcbc6bd07..490631aa67 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_assembly.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py @@ -1,16 +1,12 @@ import maya.cmds as cmds - -from ayon_core.pipeline import ( - load, - remove_container -) - -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.lib import unique_namespace -from ayon_core.hosts.maya.api import setdress +from ayon_core.pipeline import remove_container +from ayon_maya.api import setdress +from ayon_maya.api.lib import unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin -class AssemblyLoader(load.LoaderPlugin): +class AssemblyLoader(plugin.Loader): product_types = {"assembly"} representations = {"json"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_audio.py b/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/load/load_audio.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_audio.py index 228189f1a1..d9f67fdd90 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_audio.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py @@ -1,14 +1,11 @@ +from ayon_core.pipeline import get_representation_path +from ayon_maya.api.lib import get_container_members, unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin from maya import cmds, mel -from ayon_core.pipeline import ( - load, - get_representation_path, -) -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.lib import unique_namespace, get_container_members - -class AudioLoader(load.LoaderPlugin): +class AudioLoader(plugin.Loader): """Specific loader of audio.""" product_types = {"audio"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py b/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/load/load_gpucache.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py index 9832d2d657..795d01fd5a 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py @@ -1,16 +1,13 @@ import maya.cmds as cmds - -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.lib import unique_namespace -from ayon_core.pipeline import ( - load, - get_representation_path -) +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api.lib import unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type -class GpuCacheLoader(load.LoaderPlugin): +class GpuCacheLoader(plugin.Loader): """Load Alembic as gpuCache""" product_types = {"model", "animation", "proxyAbc", "pointcache"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image.py b/server_addon/maya/client/ayon_maya/plugins/load/load_image.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/load/load_image.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_image.py index 171920f747..453e24a2d5 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_image.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_image.py @@ -1,24 +1,17 @@ import copy from ayon_core.lib import EnumDef -from ayon_core.pipeline import ( - load, - get_current_host_name, +from ayon_core.pipeline import get_current_host_name +from ayon_core.pipeline.colorspace import ( + get_current_context_imageio_config_preset, + get_imageio_file_rules, + get_imageio_file_rules_colorspace_from_filepath, ) from ayon_core.pipeline.load.utils import get_representation_path_from_context -from ayon_core.pipeline.colorspace import ( - get_imageio_file_rules_colorspace_from_filepath, - get_current_context_imageio_config_preset, - get_imageio_file_rules -) from ayon_core.settings import get_project_settings - -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.lib import ( - unique_namespace, - namespaced -) - +from ayon_maya.api.lib import namespaced, unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin from maya import cmds @@ -88,7 +81,7 @@ def create_stencil(): return file, place, stencil, place_stencil -class FileNodeLoader(load.LoaderPlugin): +class FileNodeLoader(plugin.Loader): """File node loader.""" product_types = {"image", "plate", "render"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py b/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/load/load_image_plane.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py index 15c7654c52..3da67221e2 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py @@ -1,18 +1,14 @@ -from qtpy import QtWidgets, QtCore - -from ayon_core.pipeline import ( - load, - get_representation_path, -) -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.lib import ( - unique_namespace, +from ayon_core.pipeline import get_representation_path +from ayon_maya.api.lib import ( + get_container_members, namespaced, pairwise, - get_container_members + unique_namespace, ) - +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin from maya import cmds +from qtpy import QtCore, QtWidgets def disconnect_inputs(plug): @@ -84,7 +80,7 @@ class CameraWindow(QtWidgets.QDialog): self.close() -class ImagePlaneLoader(load.LoaderPlugin): +class ImagePlaneLoader(plugin.Loader): """Specific loader of plate for image planes on selected camera.""" product_types = {"image", "plate", "render"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_look.py b/server_addon/maya/client/ayon_maya/plugins/load/load_look.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/load/load_look.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_look.py index af0e000dd2..da7b3691fd 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_look.py @@ -3,18 +3,16 @@ import json from collections import defaultdict -from qtpy import QtWidgets +import ayon_maya.api.plugin from ayon_api import get_representation_by_name - from ayon_core.pipeline import get_representation_path -import ayon_core.hosts.maya.api.plugin -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.lib import get_reference_node - from ayon_core.tools.utils import ScrollMessageBox +from ayon_maya.api import lib +from ayon_maya.api.lib import get_reference_node +from qtpy import QtWidgets -class LookLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader): +class LookLoader(ayon_maya.api.plugin.ReferenceLoader): """Specific loader for lookdev""" product_types = {"look"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py b/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/load/load_matchmove.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py index b19b14b1aa..7689a3ca5e 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_matchmove.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py @@ -1,7 +1,8 @@ +from ayon_maya.api import plugin from maya import mel -from ayon_core.pipeline import load -class MatchmoveLoader(load.LoaderPlugin): + +class MatchmoveLoader(plugin.Loader): """ This will run matchmove script to create track in scene. diff --git a/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py index 628a25e574..79fc1fc94f 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_maya_usd.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py @@ -1,19 +1,13 @@ # -*- coding: utf-8 -*- import maya.cmds as cmds - -from ayon_core.pipeline import ( - load, - get_representation_path, -) +from ayon_core.pipeline import get_representation_path from ayon_core.pipeline.load import get_representation_path_from_context -from ayon_core.hosts.maya.api.lib import ( - namespaced, - unique_namespace -) -from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_maya.api.lib import namespaced, unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin -class MayaUsdLoader(load.LoaderPlugin): +class MayaUsdLoader(plugin.Loader): """Read USD data in a Maya USD Proxy""" product_types = {"model", "usd", "pointcache", "animation"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py index f32c76481d..026740a957 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py @@ -1,23 +1,16 @@ # -*- coding: utf-8 -*- -import maya.cmds as cmds -from maya import mel import os +import maya.cmds as cmds from ayon_api import get_representation_by_id - -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, - namespaced, - unique_namespace -) -from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.pipeline import get_representation_path +from ayon_maya.api import plugin +from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace +from ayon_maya.api.pipeline import containerise +from maya import mel -class MultiverseUsdLoader(load.LoaderPlugin): +class MultiverseUsdLoader(plugin.Loader): """Read USD data in a Multiverse Compound""" product_types = { diff --git a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py index b23fa48f07..a8fff12577 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_multiverse_usd_over.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py @@ -1,22 +1,17 @@ # -*- coding: utf-8 -*- -import maya.cmds as cmds -from maya import mel import os +import maya.cmds as cmds import qargparse from ayon_api import get_representation_by_id - -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.lib import ( - maintained_selection -) -from ayon_core.hosts.maya.api.pipeline import containerise +from ayon_core.pipeline import get_representation_path +from ayon_maya.api import plugin +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api.pipeline import containerise +from maya import mel -class MultiverseUsdOverLoader(load.LoaderPlugin): +class MultiverseUsdOverLoader(plugin.Loader): """Reference file""" product_types = {"mvUsdOverride"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py index 7760d4081c..92bf6dfe26 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py @@ -1,25 +1,18 @@ # -*- coding: utf-8 -*- """Loader for Redshift proxy.""" import os + import clique - import maya.cmds as cmds - +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.lib import ( - namespaced, - maintained_selection, - unique_namespace -) -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api import plugin +from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api.plugin import get_load_color_for_product_type -class RedshiftProxyLoader(load.LoaderPlugin): +class RedshiftProxyLoader(plugin.Loader): """Load Redshift proxy""" product_types = {"redshiftproxy"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_reference.py b/server_addon/maya/client/ayon_maya/plugins/load/load_reference.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/load/load_reference.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_reference.py index 847591bd11..92cee414fd 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_reference.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_reference.py @@ -1,17 +1,36 @@ -import difflib import contextlib +import difflib -from maya import cmds import qargparse - from ayon_core.settings import get_project_settings -from ayon_core.hosts.maya.api import plugin -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, +from ayon_maya.api import plugin +from ayon_maya.api.lib import ( + create_rig_animation_instance, get_container_members, + maintained_selection, parent_nodes, - create_rig_animation_instance ) +from maya import cmds + + +@contextlib.contextmanager +def preserve_time_units(): + """Preserve current frame, frame range and fps""" + frame = cmds.currentTime(query=True) + fps = cmds.currentUnit(query=True, time=True) + start = cmds.playbackOptions(query=True, minTime=True) + end = cmds.playbackOptions(query=True, maxTime=True) + anim_start = cmds.playbackOptions(query=True, animationStartTime=True) + anim_end = cmds.playbackOptions(query=True, animationEndTime=True) + try: + yield + finally: + cmds.currentUnit(time=fps, updateAnimation=False) + cmds.currentTime(frame) + cmds.playbackOptions(minTime=start, + maxTime=end, + animationStartTime=anim_start, + animationEndTime=anim_end) @contextlib.contextmanager @@ -349,6 +368,15 @@ class MayaUSDReferenceLoader(ReferenceLoader): ]) options["file_type"] = self.file_type - return super(MayaUSDReferenceLoader, self).process_reference( - context, name, namespace, options - ) + # Maya USD import reference has the tendency to change the time slider + # range and current frame, so we force revert it after + with preserve_time_units(): + return super(MayaUSDReferenceLoader, self).process_reference( + context, name, namespace, options + ) + + def update(self, container, context): + # Maya USD import reference has the tendency to change the time slider + # range and current frame, so we force revert it after + with preserve_time_units(): + super(MayaUSDReferenceLoader, self).update(container, context) diff --git a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py index d5685b2c4c..3b323698c4 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_rendersetup.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py @@ -6,21 +6,18 @@ When this json is loaded, it will overwrite all settings on RenderSetup instance. """ +import contextlib import json import sys -import six -import contextlib -from ayon_core.lib import BoolDef, EnumDef -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.pipeline import containerise - -from maya import cmds import maya.app.renderSetup.model.renderSetup as renderSetup +import six +from ayon_core.lib import BoolDef, EnumDef +from ayon_core.pipeline import get_representation_path +from ayon_maya.api import lib +from ayon_maya.api import plugin +from ayon_maya.api.pipeline import containerise +from maya import cmds @contextlib.contextmanager @@ -48,7 +45,7 @@ def mark_all_imported(enabled): cmds.deleteAttr(plug) -class RenderSetupLoader(load.LoaderPlugin): +class RenderSetupLoader(plugin.Loader): """Load json preset for RenderSetup overwriting current one.""" product_types = {"rendersetup"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py index 5b0c78fd6f..4515ec499d 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py @@ -1,15 +1,18 @@ +"""Load OpenVDB for Arnold in aiVolume. + +TODO: + `aiVolume` doesn't automatically set velocity fps correctly, set manual? + +""" import os +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type -# TODO aiVolume doesn't automatically set velocity fps correctly, set manual? +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type -class LoadVDBtoArnold(load.LoaderPlugin): +class LoadVDBtoArnold(plugin.Loader): """Load OpenVDB for Arnold in aiVolume""" product_types = {"vdbcache"} @@ -21,9 +24,9 @@ class LoadVDBtoArnold(load.LoaderPlugin): def load(self, context, name, namespace, data): + from ayon_maya.api.lib import unique_namespace + from ayon_maya.api.pipeline import containerise from maya import cmds - from ayon_core.hosts.maya.api.pipeline import containerise - from ayon_core.hosts.maya.api.lib import unique_namespace product_type = context["product"]["productType"] diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py index e345a7bf6f..c08004421b 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py @@ -1,14 +1,12 @@ import os +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type -class LoadVDBtoRedShift(load.LoaderPlugin): +class LoadVDBtoRedShift(plugin.Loader): """Load OpenVDB in a Redshift Volume Shape Note that the RedshiftVolumeShape is created without a RedshiftVolume @@ -27,9 +25,9 @@ class LoadVDBtoRedShift(load.LoaderPlugin): def load(self, context, name=None, namespace=None, data=None): + from ayon_maya.api.lib import unique_namespace + from ayon_maya.api.pipeline import containerise from maya import cmds - from ayon_core.hosts.maya.api.pipeline import containerise - from ayon_core.hosts.maya.api.lib import unique_namespace product_type = context["product"]["productType"] diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py index d6d1c948b0..f022f8be5e 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py @@ -1,12 +1,9 @@ import os +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type - +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type from maya import cmds # List of 3rd Party Channels Mapping names for VRayVolumeGrid @@ -74,7 +71,7 @@ def _fix_duplicate_vvg_callbacks(): matched.add(callback) -class LoadVDBtoVRay(load.LoaderPlugin): +class LoadVDBtoVRay(plugin.Loader): """Load OpenVDB in a V-Ray Volume Grid""" product_types = {"vdbcache"} @@ -86,8 +83,8 @@ class LoadVDBtoVRay(load.LoaderPlugin): def load(self, context, name, namespace, data): - from ayon_core.hosts.maya.api.lib import unique_namespace - from ayon_core.hosts.maya.api.pipeline import containerise + from ayon_maya.api.lib import unique_namespace + from ayon_maya.api.pipeline import containerise path = self.filepath_from_context(context) assert os.path.exists(path), ( @@ -159,7 +156,7 @@ class LoadVDBtoVRay(load.LoaderPlugin): def _set_path(self, grid_node, path, show_preset_popup=True): - from ayon_core.hosts.maya.api.lib import attribute_values + from ayon_maya.api.lib import attribute_values from maya import cmds def _get_filename_from_folder(path): @@ -175,6 +172,7 @@ class LoadVDBtoVRay(load.LoaderPlugin): else: # Sequence import clique + # todo: check support for negative frames as input collections, remainder = clique.assemble(files) assert len(collections) == 1, ( diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py index 14d645021c..c71a48247c 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py @@ -7,24 +7,17 @@ loader will use them instead of native vray vrmesh format. """ import os -import maya.cmds as cmds - import ayon_api +import maya.cmds as cmds +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path, -) -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, - namespaced, - unique_namespace -) -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type -class VRayProxyLoader(load.LoaderPlugin): +class VRayProxyLoader(plugin.Loader): """Load VRay Proxy with Alembic or VrayMesh.""" product_types = {"vrayproxy", "model", "pointcache", "animation"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py index ea3215da97..255ca844ba 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py @@ -1,20 +1,14 @@ # -*- coding: utf-8 -*- import maya.cmds as cmds # noqa +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, - namespaced, - unique_namespace -) -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type -class VRaySceneLoader(load.LoaderPlugin): +class VRaySceneLoader(plugin.Loader): """Load Vray scene""" product_types = {"vrayscene_layer"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_xgen.py b/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/load/load_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py index e2664439b0..88d9d550da 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_xgen.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py @@ -1,23 +1,21 @@ import os import shutil +from ayon_maya.api import plugin import maya.cmds as cmds import xgenm - +from ayon_core.pipeline import get_representation_path +from ayon_maya.api import current_file +from ayon_maya.api.lib import ( + attribute_values, + get_container_members, + maintained_selection, + write_xgen_file, +) from qtpy import QtWidgets -import ayon_core.hosts.maya.api.plugin -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, - get_container_members, - attribute_values, - write_xgen_file -) -from ayon_core.hosts.maya.api import current_file -from ayon_core.pipeline import get_representation_path - -class XgenLoader(ayon_core.hosts.maya.api.plugin.ReferenceLoader): +class XgenLoader(plugin.ReferenceLoader): """Load Xgen as reference""" product_types = {"xgen"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py index 4ca9ae9d03..6000de2507 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py @@ -1,21 +1,17 @@ -import os import json +import os import re from collections import defaultdict import clique -from maya import cmds - +from ayon_core.pipeline import get_representation_path from ayon_core.settings import get_project_settings -from ayon_core.pipeline import ( - load, - get_representation_path -) -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.yeti import create_yeti_variable -from ayon_core.hosts.maya.api.pipeline import containerise -from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type - +from ayon_maya.api import lib +from ayon_maya.api.pipeline import containerise +from ayon_maya.api import plugin +from ayon_maya.api.plugin import get_load_color_for_product_type +from ayon_maya.api.yeti import create_yeti_variable +from maya import cmds # Do not reset these values on update but only apply on first load # to preserve any potential local overrides @@ -45,7 +41,7 @@ def set_attribute(node, attr, value): lib.set_attribute(node, attr, value) -class YetiCacheLoader(load.LoaderPlugin): +class YetiCacheLoader(plugin.Loader): """Load Yeti Cache with one or more Yeti nodes""" product_types = {"yeticache", "yetiRig"} diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_rig.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py rename to server_addon/maya/client/ayon_maya/plugins/load/load_yeti_rig.py index 7444566ee1..a45e5c63ef 100644 --- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_rig.py @@ -1,12 +1,9 @@ from typing import List import maya.cmds as cmds - -from ayon_core.hosts.maya.api import plugin -from ayon_core.hosts.maya.api import lib - from ayon_core.pipeline import registered_host from ayon_core.pipeline.create import CreateContext +from ayon_maya.api import lib, plugin class YetiRigLoader(plugin.ReferenceLoader): diff --git a/client/ayon_core/hosts/maya/plugins/__init__.py b/server_addon/maya/client/ayon_maya/plugins/publish/__init__.py similarity index 100% rename from client/ayon_core/hosts/maya/plugins/__init__.py rename to server_addon/maya/client/ayon_maya/plugins/publish/__init__.py diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/collect_animation.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py index 391c80c84e..528d981c4b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py @@ -1,9 +1,9 @@ -import pyblish.api - import maya.cmds as cmds +import pyblish.api +from ayon_maya.api import plugin -class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin): +class CollectAnimationOutputGeometry(plugin.MayaInstancePlugin): """Collect out hierarchy data for instance. Collect all hierarchy nodes which reside in the out_SET of the animation @@ -18,7 +18,6 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.4 families = ["animation"] label = "Collect Animation Output Geometry" - hosts = ["maya"] ignore_type = ["constraints"] diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py index fb71e128eb..c9dd0b8063 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_arnold_scene_source.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py @@ -1,10 +1,10 @@ +import pyblish.api +from ayon_maya.api.lib import get_all_children +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.hosts.maya.api.lib import get_all_children - -class CollectArnoldSceneSource(pyblish.api.InstancePlugin): +class CollectArnoldSceneSource(plugin.MayaInstancePlugin): """Collect Arnold Scene Source data.""" # Offset to be after renderable camera collection. diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py index eebbbd4447..e57d70662c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_assembly.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py @@ -1,14 +1,20 @@ +"""Collect all relevant assembly items. + +Todo: + Publish of assembly need unique namespace for all assets, we should + create validator for this. + +""" from collections import defaultdict import pyblish.api from maya import cmds, mel -from ayon_core.hosts.maya import api -from ayon_core.hosts.maya.api import lib - -# TODO : Publish of assembly: -unique namespace for all assets, VALIDATOR! +from ayon_maya import api +from ayon_maya.api import lib +from ayon_maya.api import plugin -class CollectAssembly(pyblish.api.InstancePlugin): +class CollectAssembly(plugin.MayaInstancePlugin): """Collect all relevant assembly items Collected data: diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_current_file.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py similarity index 78% rename from client/ayon_core/hosts/maya/plugins/publish/collect_current_file.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py index c7105a7f3c..8bd1908c73 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_current_file.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py @@ -1,15 +1,13 @@ - import pyblish.api - +from ayon_maya.api import plugin from maya import cmds -class CollectCurrentFile(pyblish.api.ContextPlugin): +class CollectCurrentFile(plugin.MayaContextPlugin): """Inject the current working file.""" order = pyblish.api.CollectorOrder - 0.4 label = "Maya Current File" - hosts = ['maya'] def process(self, context): """Inject the current working file""" diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py index d8fd7a16e8..83f42667a5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_animation.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py @@ -1,16 +1,16 @@ # -*- coding: utf-8 -*- -from maya import cmds # noqa import pyblish.api from ayon_core.pipeline import OptionalPyblishPluginMixin +from ayon_maya.api import plugin +from maya import cmds # noqa -class CollectFbxAnimation(pyblish.api.InstancePlugin, +class CollectFbxAnimation(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Collect Animated Rig Data for FBX Extractor.""" order = pyblish.api.CollectorOrder + 0.2 label = "Collect Fbx Animation" - hosts = ["maya"] families = ["animation"] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py similarity index 85% rename from client/ayon_core/hosts/maya/plugins/publish/collect_fbx_camera.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py index bfa5bccbb9..f6791b6e72 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_fbx_camera.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -from maya import cmds # noqa import pyblish.api +from ayon_maya.api import plugin +from maya import cmds # noqa -class CollectFbxCamera(pyblish.api.InstancePlugin): +class CollectFbxCamera(plugin.MayaInstancePlugin): """Collect Camera for FBX export.""" order = pyblish.api.CollectorOrder + 0.2 diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_file_dependencies.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/collect_file_dependencies.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py index 60853bd1ee..74b8054c33 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_file_dependencies.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py @@ -1,14 +1,13 @@ from maya import cmds - +from ayon_maya.api import plugin import pyblish.api -class CollectFileDependencies(pyblish.api.ContextPlugin): +class CollectFileDependencies(plugin.MayaContextPlugin): """Gather all files referenced in this scene.""" label = "Collect File Dependencies" order = pyblish.api.CollectorOrder - 0.49 - hosts = ["maya"] families = ["renderlayer"] @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_gltf.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py similarity index 85% rename from client/ayon_core/hosts/maya/plugins/publish/collect_gltf.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py index bb37fe3a7e..7ee23d289c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_gltf.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- import pyblish.api +from ayon_maya.api import plugin -class CollectGLTF(pyblish.api.InstancePlugin): +class CollectGLTF(plugin.MayaInstancePlugin): """Collect Assets for GLTF/GLB export.""" order = pyblish.api.CollectorOrder + 0.2 diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_history.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/collect_history.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py index 2da74991c0..9041d4d1d5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_history.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py @@ -1,9 +1,9 @@ +import pyblish.api +from ayon_maya.api import plugin from maya import cmds -import pyblish.api - -class CollectMayaHistory(pyblish.api.InstancePlugin): +class CollectMayaHistory(plugin.MayaInstancePlugin): """Collect history for instances from the Maya scene Note: diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py index fa5a694a76..67d4a3f378 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_inputs.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py @@ -5,8 +5,9 @@ import maya.api.OpenMaya as om import pyblish.api from ayon_core.pipeline import registered_host -from ayon_core.hosts.maya.api.lib import get_container_members -from ayon_core.hosts.maya.api.lib_rendersetup import get_shader_in_layer +from ayon_maya.api.lib import get_container_members +from ayon_maya.api.lib_rendersetup import get_shader_in_layer +from ayon_maya.api import plugin def iter_history(nodes, @@ -93,7 +94,7 @@ def collect_input_containers(containers, nodes): if any(node in container["_members"] for node in nodes)] -class CollectUpstreamInputs(pyblish.api.InstancePlugin): +class CollectUpstreamInputs(plugin.MayaInstancePlugin): """Collect input source inputs for this publish. This will include `inputs` data of which loaded publishes were used in the @@ -104,7 +105,6 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin): label = "Collect Inputs" order = pyblish.api.CollectorOrder + 0.34 - hosts = ["maya"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/collect_instances.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py index 774c217cfd..0ca43d4be9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py @@ -1,10 +1,11 @@ from maya import cmds import pyblish.api -from ayon_core.hosts.maya.api.lib import get_all_children +from ayon_maya.api.lib import get_all_children +from ayon_maya.api import plugin -class CollectNewInstances(pyblish.api.InstancePlugin): +class CollectNewInstances(plugin.MayaInstancePlugin): """Gather members for instances and pre-defined attribute This collector takes into account assets that are associated with @@ -105,8 +106,10 @@ class CollectNewInstances(pyblish.api.InstancePlugin): parents = set() for node in nodes: - splitted = node.split("|") - items = ["|".join(splitted[0:i]) for i in range(2, len(splitted))] + split_parts = node.split("|") + items = [ + "|".join(split_parts[:i]) for i in range(2, len(split_parts)) + ] parents.update(items) return parents diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/publish/collect_look.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py index a3a32bc0cb..691933babd 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- """Maya look collector.""" -import re -import os import glob +import os +import re -from maya import cmds # noqa import pyblish.api -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds # noqa SHAPE_ATTRS = {"castsShadows", "receiveShadows", @@ -265,7 +266,7 @@ def get_file_node_files(node): return result -class CollectLook(pyblish.api.InstancePlugin): +class CollectLook(plugin.MayaInstancePlugin): """Collect look data for instance. For the shapes/transforms of the referenced object to collect look for @@ -286,7 +287,6 @@ class CollectLook(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.2 families = ["look"] label = "Collect Look" - hosts = ["maya"] def process(self, instance): """Collect the Look in the instance with the correct layer settings""" @@ -644,7 +644,6 @@ class CollectModelRenderSets(CollectLook): order = pyblish.api.CollectorOrder + 0.21 families = ["model"] label = "Collect Model Render Sets" - hosts = ["maya"] def collect_sets(self, instance): """Collect all related objectSets except shadingEngines diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_scene_time.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/collect_maya_scene_time.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py index 6a20cb151f..c10d0fffbe 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_scene_time.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py @@ -1,9 +1,9 @@ +import pyblish.api +from ayon_maya.api import plugin from maya import cmds -import pyblish.api - -class CollectMayaSceneTime(pyblish.api.InstancePlugin): +class CollectMayaSceneTime(plugin.MayaInstancePlugin): """Collect Maya Scene playback range This allows to reproduce the playback range for the content to be loaded. diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_units.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/collect_maya_units.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py index 2421641d26..47888506ff 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_units.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py @@ -1,15 +1,16 @@ import maya.cmds as cmds import maya.mel as mel +from ayon_maya.api import plugin + import pyblish.api -class CollectMayaUnits(pyblish.api.ContextPlugin): +class CollectMayaUnits(plugin.MayaContextPlugin): """Collect Maya's scene units.""" label = "Maya Units" order = pyblish.api.CollectorOrder - hosts = ["maya"] def process(self, context): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_workspace.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/collect_maya_workspace.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py index 122fabe8a1..a7b51e1fb3 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_maya_workspace.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py @@ -1,17 +1,16 @@ import os import pyblish.api - +from ayon_maya.api import plugin from maya import cmds -class CollectMayaWorkspace(pyblish.api.ContextPlugin): +class CollectMayaWorkspace(plugin.MayaContextPlugin): """Inject the current workspace into context""" order = pyblish.api.CollectorOrder - 0.5 label = "Maya Workspace" - hosts = ['maya'] def process(self, context): workspace = cmds.workspace(rootDirectory=True, query=True) diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_model.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/collect_model.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py index 9d45ed63bc..13e5a609e7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_model.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py @@ -1,9 +1,9 @@ +import pyblish.api +from ayon_maya.api import plugin from maya import cmds -import pyblish.api - -class CollectModelData(pyblish.api.InstancePlugin): +class CollectModelData(plugin.MayaInstancePlugin): """Collect model data Ensures always only a single frame is extracted (current frame). diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py index 83e743c92e..ddf36b7eda 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_multiverse_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py @@ -2,9 +2,10 @@ import glob import os import re -from maya import cmds import pyblish.api -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds SHAPE_ATTRS = ["castsShadows", "receiveShadows", @@ -251,7 +252,7 @@ def is_mipmap(fname): return False -class CollectMultiverseLookData(pyblish.api.InstancePlugin): +class CollectMultiverseLookData(plugin.MayaInstancePlugin): """Collect Multiverse Look Searches through the overrides finding all material overrides. From there diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/collect_pointcache.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py index 5578a57f31..8d0b45137f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_pointcache.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py @@ -1,15 +1,14 @@ +import pyblish.api +from ayon_maya.api import plugin from maya import cmds -import pyblish.api - -class CollectPointcache(pyblish.api.InstancePlugin): +class CollectPointcache(plugin.MayaInstancePlugin): """Collect pointcache data for instance.""" order = pyblish.api.CollectorOrder + 0.4 families = ["pointcache"] label = "Collect Pointcache" - hosts = ["maya"] def process(self, instance): if instance.data.get("farm"): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_remove_marked.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py similarity index 86% rename from client/ayon_core/hosts/maya/plugins/publish/collect_remove_marked.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py index 69e69f6630..14d914cac5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_remove_marked.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py @@ -1,7 +1,8 @@ import pyblish.api +from ayon_maya.api import plugin -class CollectRemoveMarked(pyblish.api.ContextPlugin): +class CollectRemoveMarked(plugin.MayaContextPlugin): """Remove marked data Remove instances that have 'remove' in their instance.data diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/collect_render.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py index 21095935a2..160a019540 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py @@ -32,24 +32,23 @@ Provides: instance -> pixelAspect """ +import json import os import platform -import json - -from maya import cmds import pyblish.api - -from ayon_core.pipeline import KnownPublishError from ayon_core.lib import get_formatted_current_time -from ayon_core.hosts.maya.api.lib_renderproducts import ( +from ayon_core.pipeline import KnownPublishError +from ayon_maya.api import lib +from ayon_maya.api.lib_renderproducts import ( + UnsupportedRendererException, get as get_layer_render_products, - UnsupportedRendererException ) -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import plugin +from maya import cmds -class CollectMayaRender(pyblish.api.InstancePlugin): +class CollectMayaRender(plugin.MayaInstancePlugin): """Gather all publishable render layers from renderSetup.""" order = pyblish.api.CollectorOrder + 0.01 diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py index 1c83918155..dd4a8fefe5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py @@ -1,11 +1,10 @@ +import pyblish.api +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.hosts.maya.api import lib - - -class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): +class CollectRenderLayerAOVS(plugin.MayaInstancePlugin): """Collect all render layer's AOVs / Render Elements that will render. This collector is important to be able to Extend Frames. @@ -26,7 +25,6 @@ class CollectRenderLayerAOVS(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.02 label = "Render Elements / AOVs" - hosts = ["maya"] families = ["renderlayer"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py similarity index 85% rename from client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py index 97d857079b..fbd181de3e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_renderable_camera.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py @@ -1,11 +1,10 @@ import pyblish.api - +from ayon_maya.api.lib_rendersetup import get_attr_in_layer +from ayon_maya.api import plugin from maya import cmds -from ayon_core.hosts.maya.api.lib_rendersetup import get_attr_in_layer - -class CollectRenderableCamera(pyblish.api.InstancePlugin): +class CollectRenderableCamera(plugin.MayaInstancePlugin): """Collect the renderable camera(s) for the render layer""" # Offset to be after renderlayer collection. diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/collect_review.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py index 4e35b3bcc2..8a50c2f0a9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py @@ -1,13 +1,12 @@ -from maya import cmds, mel - import ayon_api import pyblish.api - from ayon_core.pipeline import KnownPublishError -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds, mel -class CollectReview(pyblish.api.InstancePlugin): +class CollectReview(plugin.MayaInstancePlugin): """Collect Review data """ diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_rig_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/collect_rig_sets.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py index 34ff26a8b8..98f4d38ab2 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_rig_sets.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py @@ -1,8 +1,9 @@ import pyblish.api +from ayon_maya.api import plugin from maya import cmds -class CollectRigSets(pyblish.api.InstancePlugin): +class CollectRigSets(plugin.MayaInstancePlugin): """Ensure rig contains pipeline-critical content Every rig must contain at least two object sets: @@ -13,7 +14,6 @@ class CollectRigSets(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.05 label = "Collect Rig Sets" - hosts = ["maya"] families = ["rig"] accepted_output = ["mesh", "transform"] diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_skeleton_mesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/collect_skeleton_mesh.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py index 31f0eca88c..aaec4cb6d9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_skeleton_mesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- -from maya import cmds # noqa import pyblish.api +from ayon_maya.api import plugin +from maya import cmds # noqa -class CollectSkeletonMesh(pyblish.api.InstancePlugin): +class CollectSkeletonMesh(plugin.MayaInstancePlugin): """Collect Static Rig Data for FBX Extractor.""" order = pyblish.api.CollectorOrder + 0.2 label = "Collect Skeleton Mesh" - hosts = ["maya"] families = ["rig"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_unreal_skeletalmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/collect_unreal_skeletalmesh.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py index 79693bb35e..32515a5957 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_unreal_skeletalmesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- from maya import cmds # noqa import pyblish.api +from ayon_maya.api import plugin -class CollectUnrealSkeletalMesh(pyblish.api.InstancePlugin): +class CollectUnrealSkeletalMesh(plugin.MayaInstancePlugin): """Collect Unreal Skeletal Mesh.""" order = pyblish.api.CollectorOrder + 0.2 diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/collect_unreal_staticmesh.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py index 03b6c4a188..35295d6e3b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_unreal_staticmesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- from maya import cmds # noqa import pyblish.api +from ayon_maya.api import plugin from pprint import pformat -class CollectUnrealStaticMesh(pyblish.api.InstancePlugin): +class CollectUnrealStaticMesh(plugin.MayaInstancePlugin): """Collect Unreal Static Mesh.""" order = pyblish.api.CollectorOrder + 0.2 diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_user_defined_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/collect_user_defined_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py index 3d586d48fb..e468636def 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_user_defined_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py @@ -1,15 +1,14 @@ from maya import cmds - +from ayon_maya.api import plugin import pyblish.api -class CollectUserDefinedAttributes(pyblish.api.InstancePlugin): +class CollectUserDefinedAttributes(plugin.MayaInstancePlugin): """Collect user defined attributes for nodes in instance.""" order = pyblish.api.CollectorOrder + 0.45 families = ["pointcache", "animation", "usd"] label = "Collect User Defined Attributes" - hosts = ["maya"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py index 8630f56e58..a5491e5f9b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- """Collect Vray Proxy.""" import pyblish.api +from ayon_maya.api import plugin -class CollectVrayProxy(pyblish.api.InstancePlugin): +class CollectVrayProxy(plugin.MayaInstancePlugin): """Collect Vray Proxy instance. Add `pointcache` family for it. diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py index 9548cd9387..f14735574e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- """Collect Vray Scene and prepare it for extraction and publishing.""" - import pyblish.api from ayon_core.lib import get_formatted_current_time -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin -class CollectVrayScene(pyblish.api.InstancePlugin): +class CollectVrayScene(plugin.MayaInstancePlugin): """Collect Vray Scene. If export on farm is checked, job is created to export it. diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_workfile.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/collect_workfile.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py index e2b64f1ebd..fa0689849a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_workfile.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py @@ -1,13 +1,13 @@ import os import pyblish.api +from ayon_maya.api import plugin -class CollectWorkfileData(pyblish.api.InstancePlugin): +class CollectWorkfileData(plugin.MayaInstancePlugin): """Inject data into Workfile instance""" order = pyblish.api.CollectorOrder - 0.01 label = "Maya Workfile" - hosts = ['maya'] families = ["workfile"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_workscene_fps.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py similarity index 78% rename from client/ayon_core/hosts/maya/plugins/publish/collect_workscene_fps.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py index 41d6ffea33..a87483e67f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_workscene_fps.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py @@ -1,13 +1,13 @@ import pyblish.api +from ayon_maya.api import plugin from maya import mel -class CollectWorksceneFPS(pyblish.api.ContextPlugin): +class CollectWorksceneFPS(plugin.MayaContextPlugin): """Get the FPS of the work scene""" label = "Workscene FPS" order = pyblish.api.CollectorOrder - hosts = ["maya"] def process(self, context): fps = mel.eval('currentTimeUnitToFPS()') diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py index f8f506376d..9ef17f3399 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_xgen.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py @@ -1,12 +1,12 @@ import os +import pyblish.api +from ayon_maya.api.lib import get_attribute_input +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.hosts.maya.api.lib import get_attribute_input - -class CollectXgen(pyblish.api.InstancePlugin): +class CollectXgen(plugin.MayaInstancePlugin): """Collect Xgen""" order = pyblish.api.CollectorOrder + 0.499999 diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py index e1755e4212..44de461126 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_cache.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py @@ -1,10 +1,8 @@ -from maya import cmds - import pyblish.api - -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.yeti import get_yeti_user_variables - +from ayon_maya.api import lib +from ayon_maya.api import plugin +from ayon_maya.api.yeti import get_yeti_user_variables +from maya import cmds SETTINGS = { # Preview @@ -24,7 +22,7 @@ SETTINGS = { } -class CollectYetiCache(pyblish.api.InstancePlugin): +class CollectYetiCache(plugin.MayaInstancePlugin): """Collect all information of the Yeti caches The information contains the following attributes per Yeti node @@ -41,7 +39,6 @@ class CollectYetiCache(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder + 0.45 label = "Collect Yeti Cache" families = ["yetiRig", "yeticache", "yeticacheUE"] - hosts = ["maya"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py rename to server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py index 8964e17f14..dbdc10789f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/collect_yeti_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py @@ -1,13 +1,11 @@ import os import re -from maya import cmds - import pyblish.api - -from ayon_core.hosts.maya.api import lib from ayon_core.pipeline.publish import KnownPublishError - +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds SETTINGS = {"renderDensity", "renderWidth", @@ -17,13 +15,12 @@ SETTINGS = {"renderDensity", "cbId"} -class CollectYetiRig(pyblish.api.InstancePlugin): +class CollectYetiRig(plugin.MayaInstancePlugin): """Collect all information of the Yeti Rig""" order = pyblish.api.CollectorOrder + 0.4 label = "Collect Yeti Rig" families = ["yetiRig"] - hosts = ["maya"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py b/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py rename to server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py index 5b597f2707..0c05b499c0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py @@ -1,13 +1,13 @@ import pyblish.api +from ayon_maya.api import plugin -class DetermineFutureVersion(pyblish.api.InstancePlugin): +class DetermineFutureVersion(plugin.MayaInstancePlugin): """ This will determine version of product if we want render to be attached to. """ label = "Determine Product Version" order = pyblish.api.IntegratorOrder - hosts = ["maya"] families = ["renderlayer"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py index b5054b4846..290f7e24eb 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_active_view_thumbnail.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py @@ -1,13 +1,13 @@ -import maya.api.OpenMaya as om -import maya.api.OpenMayaUI as omui - -import pyblish.api import tempfile -from ayon_core.hosts.maya.api.lib import IS_HEADLESS +import maya.api.OpenMaya as om +import maya.api.OpenMayaUI as omui +import pyblish.api +from ayon_maya.api.lib import IS_HEADLESS +from ayon_maya.api import plugin -class ExtractActiveViewThumbnail(pyblish.api.InstancePlugin): +class ExtractActiveViewThumbnail(plugin.MayaInstancePlugin): """Set instance thumbnail to a screengrab of current active viewport. This makes it so that if an instance does not have a thumbnail set yet that @@ -18,7 +18,6 @@ class ExtractActiveViewThumbnail(pyblish.api.InstancePlugin): order = pyblish.api.ExtractorOrder + 0.49 label = "Active View Thumbnail" families = ["workfile"] - hosts = ["maya"] def process(self, instance): if IS_HEADLESS: diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py index fb4c41f1de..b39c875400 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_arnold_scene_source.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py @@ -1,19 +1,16 @@ +import json import os from collections import defaultdict -import json -from maya import cmds import arnold - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib, plugin +from maya import cmds -class ExtractArnoldSceneSource(publish.Extractor): +class ExtractArnoldSceneSource(plugin.MayaExtractorPlugin): """Extract the content of the instance to an Arnold Scene Source file.""" label = "Extract Arnold Scene Source" - hosts = ["maya"] families = ["ass"] asciiAss = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py index 5f51dc38cb..8460fb716f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_assembly.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py @@ -1,13 +1,12 @@ -import os import json +import os -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.alembic import extract_alembic - +from ayon_maya.api.alembic import extract_alembic +from ayon_maya.api import plugin from maya import cmds -class ExtractAssembly(publish.Extractor): +class ExtractAssembly(plugin.MayaExtractorPlugin): """Produce an alembic of just point positions and normals. Positions and normals are preserved, but nothing more, @@ -16,7 +15,6 @@ class ExtractAssembly(publish.Extractor): """ label = "Extract Assembly" - hosts = ["maya"] families = ["assembly"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py index 74abc8de75..b5ce6a6a44 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py @@ -2,12 +2,12 @@ import os import json from maya import cmds - +from ayon_maya.api import plugin from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib -class ExtractCameraAlembic(publish.Extractor, +class ExtractCameraAlembic(plugin.MayaExtractorPlugin, publish.OptionalPyblishPluginMixin): """Extract a Camera as Alembic. diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py index cb3951ec0c..c5aa331cb2 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py @@ -1,16 +1,14 @@ # -*- coding: utf-8 -*- """Extract camera as Maya Scene.""" -import os -import itertools import contextlib +import itertools +import os -from maya import cmds - +from ayon_core.lib import BoolDef from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib -from ayon_core.lib import ( - BoolDef -) +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds def massage_ma_file(path): @@ -82,7 +80,7 @@ def unlock(plug): cmds.disconnectAttr(source, destination) -class ExtractCameraMayaScene(publish.Extractor, +class ExtractCameraMayaScene(plugin.MayaExtractorPlugin, publish.OptionalPyblishPluginMixin): """Extract a Camera as Maya Scene. diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py index bb2a6dad07..d9b0a789c5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- import os -from maya import cmds # noqa import maya.mel as mel # noqa import pyblish.api - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection -from ayon_core.hosts.maya.api import fbx +from ayon_maya.api import fbx +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin +from maya import cmds # noqa -class ExtractFBX(publish.Extractor): +class ExtractFBX(plugin.MayaExtractorPlugin): """Extract FBX from Maya. This extracts reproducible FBX exports ignoring any of the diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py index 77b5b79b5f..c22241d2ca 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_fbx_animation.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py @@ -1,17 +1,14 @@ # -*- coding: utf-8 -*- import os -from maya import cmds # noqa import pyblish.api - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import fbx -from ayon_core.hosts.maya.api.lib import ( - namespaced, get_namespace, strip_namespace -) +from ayon_maya.api import fbx +from ayon_maya.api.lib import get_namespace, namespaced, strip_namespace +from ayon_maya.api import plugin +from maya import cmds # noqa -class ExtractFBXAnimation(publish.Extractor): +class ExtractFBXAnimation(plugin.MayaExtractorPlugin): """Extract Rig in FBX format from Maya. This extracts the rig in fbx with the constraints @@ -22,7 +19,6 @@ class ExtractFBXAnimation(publish.Extractor): """ order = pyblish.api.ExtractorOrder label = "Extract Animation (FBX)" - hosts = ["maya"] families = ["animation.fbx"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py index ff11bf0c1f..46da8f9463 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_gltf.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py @@ -1,17 +1,15 @@ import os -from maya import cmds, mel import pyblish.api - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.gltf import extract_gltf +from ayon_maya.api import lib +from ayon_maya.api.gltf import extract_gltf +from ayon_maya.api import plugin +from maya import cmds, mel -class ExtractGLB(publish.Extractor): +class ExtractGLB(plugin.MayaExtractorPlugin): order = pyblish.api.ExtractorOrder - hosts = ["maya"] label = "Extract GLB" families = ["gltf"] @@ -39,7 +37,7 @@ class ExtractGLB(publish.Extractor): "aet": end_frame, "afr": fps, "dsa": 1, - "acn": instance.name, + "acn": instance.name, # codespell:ignore acn "glb": True, "vno": True # visibleNodeOnly } diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py index 4b293b5785..53944571a8 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_gpu_cache.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py @@ -1,16 +1,15 @@ import json +from ayon_core.pipeline import publish +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish - -class ExtractGPUCache(publish.Extractor, +class ExtractGPUCache(plugin.MayaExtractorPlugin, publish.OptionalPyblishPluginMixin): """Extract the content of the instance to a GPU cache file.""" label = "GPU Cache" - hosts = ["maya"] families = ["model", "animation", "pointcache"] step = 1.0 stepSave = 1 diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py index 3fb84c8d83..b5964e426b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_import_reference.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py @@ -1,18 +1,16 @@ import os import sys - -from maya import cmds - -import pyblish.api import tempfile +import pyblish.api from ayon_core.lib import run_subprocess -from ayon_core.pipeline import publish from ayon_core.pipeline.publish import OptionalPyblishPluginMixin -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds -class ExtractImportReference(publish.Extractor, +class ExtractImportReference(plugin.MayaExtractorPlugin, OptionalPyblishPluginMixin): """ @@ -24,7 +22,6 @@ class ExtractImportReference(publish.Extractor, label = "Extract Import Reference" order = pyblish.api.ExtractorOrder - 0.48 - hosts = ["maya"] families = ["renderlayer", "workfile"] optional = True tmp_format = "_tmp" diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_layout.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py index b025a1605a..ca53f563d4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py @@ -1,19 +1,17 @@ +import json import math import os -import json +from ayon_api import get_representation_by_id +from ayon_maya.api import plugin from maya import cmds from maya.api import OpenMaya as om -from ayon_api import get_representation_by_id - -from ayon_core.pipeline import publish -class ExtractLayout(publish.Extractor): +class ExtractLayout(plugin.MayaExtractorPlugin): """Extract a layout.""" label = "Extract Layout" - hosts = ["maya"] families = ["layout"] project_container = "AVALON_CONTAINERS" optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/publish/extract_look.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py index 2a86b20131..8e57b22d64 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py @@ -1,31 +1,29 @@ # -*- coding: utf-8 -*- """Maya look extractor.""" -import os -import sys import contextlib import json import logging -import tempfile +import os import platform +import sys +import tempfile from abc import ABCMeta, abstractmethod from collections import OrderedDict -import six import attr import pyblish.api - -from maya import cmds # noqa - +import six from ayon_core.lib import ( - find_executable, - source_hash, - run_subprocess, - get_oiio_tool_args, ToolNotFoundError, + find_executable, + get_oiio_tool_args, + run_subprocess, + source_hash, ) - -from ayon_core.pipeline import publish, KnownPublishError -from ayon_core.hosts.maya.api import lib +from ayon_core.pipeline import KnownPublishError +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds # noqa # Modes for transfer COPY = 1 @@ -407,7 +405,7 @@ class MakeTX(TextureProcessor): return False -class ExtractLook(publish.Extractor): +class ExtractLook(plugin.MayaExtractorPlugin): """Extract Look (Maya Scene + JSON) Only extracts the sets (shadingEngines and alike) alongside a .json file diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py index 2fd4f44449..6e66353c7a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py @@ -2,26 +2,21 @@ """Extract data as Maya scene (raw).""" import os +from ayon_core.lib import BoolDef +from ayon_core.pipeline import AVALON_CONTAINER_ID, AYON_CONTAINER_ID +from ayon_core.pipeline.publish import AYONPyblishPluginMixin +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin from maya import cmds -from ayon_core.hosts.maya.api.lib import maintained_selection -from ayon_core.pipeline import ( - AYON_CONTAINER_ID, - AVALON_CONTAINER_ID, - publish, -) -from ayon_core.pipeline.publish import AYONPyblishPluginMixin -from ayon_core.lib import BoolDef - -class ExtractMayaSceneRaw(publish.Extractor, AYONPyblishPluginMixin): +class ExtractMayaSceneRaw(plugin.MayaExtractorPlugin, AYONPyblishPluginMixin): """Extract as Maya Scene (raw). This will preserve all references, construction history, etc. """ label = "Maya Scene (Raw)" - hosts = ["maya"] families = ["mayaAscii", "mayaScene", "setdress", diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py index cfaea8e479..d2bf98afbc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_usd.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py @@ -1,13 +1,12 @@ -import os -import six -import json import contextlib - -from maya import cmds +import json +import os import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection +import six +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin +from maya import cmds @contextlib.contextmanager @@ -112,14 +111,13 @@ def usd_export_attributes(nodes, attrs=None, attr_prefixes=None, mapping=None): dg_mod.undoIt() -class ExtractMayaUsd(publish.Extractor): +class ExtractMayaUsd(plugin.MayaExtractorPlugin): """Extractor for Maya USD Asset data. Upon publish a .usd (or .usdz) asset file will typically be written. """ label = "Extract Maya USD Asset" - hosts = ["maya"] families = ["mayaUsd"] @property diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/extract_model.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py index 543af59e8f..7f257a2013 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_model.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py @@ -2,13 +2,13 @@ """Extract model as Maya Scene.""" import os +from ayon_core.pipeline import publish +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib - -class ExtractModel(publish.Extractor, +class ExtractModel(plugin.MayaExtractorPlugin, publish.OptionalPyblishPluginMixin): """Extract as Model (Maya Scene). @@ -25,7 +25,6 @@ class ExtractModel(publish.Extractor, """ label = "Model (Maya Scene)" - hosts = ["maya"] families = ["model"] scene_type = "ma" optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py index 2dd8821b3a..b6f8043a93 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_look.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py @@ -2,11 +2,11 @@ import os from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin -class ExtractMultiverseLook(publish.Extractor): +class ExtractMultiverseLook(plugin.MayaExtractorPlugin): """Extractor for Multiverse USD look data. This will extract: @@ -34,7 +34,6 @@ class ExtractMultiverseLook(publish.Extractor): """ label = "Extract Multiverse USD Look" - hosts = ["maya"] families = ["mvLook"] scene_type = "usda" file_formats = ["usda", "usd"] diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py index 8c195c25fd..477af9dc26 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py @@ -1,15 +1,13 @@ import os -import six - -from maya import cmds -from maya import mel import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection +import six +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin +from maya import cmds, mel -class ExtractMultiverseUsd(publish.Extractor): +class ExtractMultiverseUsd(plugin.MayaExtractorPlugin): """Extractor for Multiverse USD Asset data. This will extract settings for a Multiverse Write Asset operation: @@ -27,7 +25,6 @@ class ExtractMultiverseUsd(publish.Extractor): """ label = "Extract Multiverse USD Asset" - hosts = ["maya"] families = ["mvUsd"] scene_type = "usd" file_formats = ["usd", "usda", "usdz"] diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py index d31660d1b4..3d18bb80e1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_comp.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py @@ -1,12 +1,11 @@ import os +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection - -class ExtractMultiverseUsdComposition(publish.Extractor): +class ExtractMultiverseUsdComposition(plugin.MayaExtractorPlugin): """Extractor of Multiverse USD Composition data. This will extract settings for a Multiverse Write Composition operation: @@ -24,7 +23,6 @@ class ExtractMultiverseUsdComposition(publish.Extractor): """ label = "Extract Multiverse USD Composition" - hosts = ["maya"] families = ["mvUsdComposition"] scene_type = "usd" # Order of `fileFormat` must match create_multiverse_usd_comp.py diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py index 00303e604c..a67f5c0a99 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_multiverse_usd_over.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py @@ -1,12 +1,11 @@ import os -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection - +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin from maya import cmds -class ExtractMultiverseUsdOverride(publish.Extractor): +class ExtractMultiverseUsdOverride(plugin.MayaExtractorPlugin): """Extractor for Multiverse USD Override data. This will extract settings for a Multiverse Write Override operation: @@ -22,7 +21,6 @@ class ExtractMultiverseUsdOverride(publish.Extractor): """ label = "Extract Multiverse USD Override" - hosts = ["maya"] families = ["mvUsdOverride"] scene_type = "usd" # Order of `fileFormat` must match create_multiverse_usd_over.py diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/extract_obj.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py index 6ce40a8728..baf86b581e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_obj.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- import os -from maya import cmds import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds -class ExtractObj(publish.Extractor): +class ExtractObj(plugin.MayaExtractorPlugin): """Extract OBJ from Maya. This extracts reproducible OBJ exports ignoring any of the settings @@ -15,7 +15,6 @@ class ExtractObj(publish.Extractor): """ order = pyblish.api.ExtractorOrder - hosts = ["maya"] label = "Extract OBJ" families = ["model"] diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py index a394d880ff..539246eef0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py @@ -1,14 +1,12 @@ import os import clique - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib - +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -class ExtractPlayblast(publish.Extractor): +class ExtractPlayblast(plugin.MayaExtractorPlugin): """Extract viewport playblast. Takes review camera and creates review Quicktime video based on viewport @@ -17,7 +15,6 @@ class ExtractPlayblast(publish.Extractor): """ label = "Extract Playblast" - hosts = ["maya"] families = ["review"] optional = True capture_preset = {} diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py index cc930e49cc..d3e9d89aaf 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py @@ -1,29 +1,28 @@ import os from collections import OrderedDict -from maya import cmds - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.alembic import extract_alembic -from ayon_core.hosts.maya.api.lib import ( - get_all_children, - suspended_refresh, - maintained_selection, - iter_visible_nodes_in_range -) from ayon_core.lib import ( BoolDef, - TextDef, - NumberDef, EnumDef, - UISeparatorDef, + NumberDef, + TextDef, UILabelDef, + UISeparatorDef, ) -from ayon_core.pipeline.publish import AYONPyblishPluginMixin from ayon_core.pipeline import KnownPublishError +from ayon_core.pipeline.publish import AYONPyblishPluginMixin +from ayon_maya.api.alembic import extract_alembic +from ayon_maya.api.lib import ( + get_all_children, + iter_visible_nodes_in_range, + maintained_selection, + suspended_refresh, +) +from ayon_maya.api import plugin +from maya import cmds -class ExtractAlembic(publish.Extractor, AYONPyblishPluginMixin): +class ExtractAlembic(plugin.MayaExtractorPlugin, AYONPyblishPluginMixin): """Produce an alembic of just point positions and normals. Positions and normals, uvs, creases are preserved, but nothing more, diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py index 5aefdfc33a..fc1c7981ed 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_proxy_abc.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py @@ -1,22 +1,20 @@ import os +from ayon_maya.api.alembic import extract_alembic +from ayon_maya.api.lib import ( + iter_visible_nodes_in_range, + maintained_selection, + suspended_refresh, +) +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.alembic import extract_alembic -from ayon_core.hosts.maya.api.lib import ( - suspended_refresh, - maintained_selection, - iter_visible_nodes_in_range -) - -class ExtractProxyAlembic(publish.Extractor): +class ExtractProxyAlembic(plugin.MayaExtractorPlugin): """Produce an alembic for bounding box geometry """ label = "Extract Proxy (Alembic)" - hosts = ["maya"] families = ["proxyAbc"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py index 66dd805437..909d3dd172 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py @@ -2,23 +2,18 @@ """Redshift Proxy extractor.""" import os +from ayon_maya.api.lib import maintained_selection, renderlayer +from ayon_maya.api import plugin +from ayon_maya.api.render_setup_tools import ( + allow_export_from_render_setup_layer, +) from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, - renderlayer -) -from ayon_core.hosts.maya.api.render_setup_tools import ( - allow_export_from_render_setup_layer -) - -class ExtractRedshiftProxy(publish.Extractor): +class ExtractRedshiftProxy(plugin.MayaExtractorPlugin): """Extract the content of the instance to a redshift proxy file.""" label = "Redshift Proxy (.rs)" - hosts = ["maya"] families = ["redshiftproxy"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py index 4815033777..8dcdd603b7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_rendersetup.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py @@ -1,11 +1,11 @@ -import os import json +import os import maya.app.renderSetup.model.renderSetup as renderSetup -from ayon_core.pipeline import publish +from ayon_maya.api import plugin -class ExtractRenderSetup(publish.Extractor): +class ExtractRenderSetup(plugin.MayaExtractorPlugin): """ Produce renderSetup template file @@ -13,7 +13,6 @@ class ExtractRenderSetup(publish.Extractor): """ label = "Extract RenderSetup" - hosts = ["maya"] families = ["rendersetup"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/extract_rig.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py index 305f4698c6..3f96d7123d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py @@ -2,17 +2,15 @@ """Extract rig as Maya Scene.""" import os +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection - -class ExtractRig(publish.Extractor): +class ExtractRig(plugin.MayaExtractorPlugin): """Extract rig as Maya Scene.""" label = "Extract Rig (Maya Scene)" - hosts = ["maya"] families = ["rig"] scene_type = "ma" diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py index a6811d6a6f..e496d53d42 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_skeleton_mesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py @@ -4,12 +4,12 @@ import os from maya import cmds # noqa import pyblish.api -from ayon_core.pipeline import publish from ayon_core.pipeline.publish import OptionalPyblishPluginMixin -from ayon_core.hosts.maya.api import fbx +from ayon_maya.api import fbx +from ayon_maya.api import plugin -class ExtractSkeletonMesh(publish.Extractor, +class ExtractSkeletonMesh(plugin.MayaExtractorPlugin, OptionalPyblishPluginMixin): """Extract Rig in FBX format from Maya. @@ -21,7 +21,6 @@ class ExtractSkeletonMesh(publish.Extractor, """ order = pyblish.api.ExtractorOrder label = "Extract Skeleton Mesh" - hosts = ["maya"] families = ["rig.fbx"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py index d3140487a6..c2ffedd67c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py @@ -1,12 +1,12 @@ -import os import glob +import os import tempfile -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib +from ayon_maya.api import plugin -class ExtractThumbnail(publish.Extractor): +class ExtractThumbnail(plugin.MayaExtractorPlugin): """Extract viewport thumbnail. Takes review camera and creates a thumbnail based on viewport @@ -15,7 +15,6 @@ class ExtractThumbnail(publish.Extractor): """ label = "Thumbnail" - hosts = ["maya"] families = ["review"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py index b5cc7745a1..a5d9303052 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_abc.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py @@ -2,21 +2,16 @@ """Create Unreal Skeletal Mesh data to be extracted as FBX.""" import os +from ayon_maya.api.alembic import extract_alembic +from ayon_maya.api.lib import maintained_selection, suspended_refresh +from ayon_maya.api import plugin from maya import cmds # noqa -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.alembic import extract_alembic -from ayon_core.hosts.maya.api.lib import ( - suspended_refresh, - maintained_selection -) - -class ExtractUnrealSkeletalMeshAbc(publish.Extractor): +class ExtractUnrealSkeletalMeshAbc(plugin.MayaExtractorPlugin): """Extract Unreal Skeletal Mesh as FBX from Maya. """ label = "Extract Unreal Skeletal Mesh - Alembic" - hosts = ["maya"] families = ["skeletalMesh"] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py index 6292afcf41..36324d3511 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py @@ -3,12 +3,10 @@ import os from contextlib import contextmanager -from maya import cmds # noqa - import pyblish.api - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import fbx +from ayon_maya.api import fbx +from ayon_maya.api import plugin +from maya import cmds # noqa @contextmanager @@ -21,7 +19,7 @@ def renamed(original_name, renamed_name): cmds.rename(renamed_name, original_name) -class ExtractUnrealSkeletalMeshFbx(publish.Extractor): +class ExtractUnrealSkeletalMeshFbx(plugin.MayaExtractorPlugin): """Extract Unreal Skeletal Mesh as FBX from Maya. """ order = pyblish.api.ExtractorOrder - 0.1 diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py index 9cf8a543f4..215f82b338 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_staticmesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py @@ -2,19 +2,14 @@ """Create Unreal Static Mesh data to be extracted as FBX.""" import os +import pyblish.api +from ayon_maya.api import fbx +from ayon_maya.api.lib import maintained_selection, parent_nodes +from ayon_maya.api import plugin from maya import cmds # noqa -import pyblish.api -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import ( - parent_nodes, - maintained_selection -) -from ayon_core.hosts.maya.api import fbx - - -class ExtractUnrealStaticMesh(publish.Extractor): +class ExtractUnrealStaticMesh(plugin.MayaExtractorPlugin): """Extract Unreal Static Mesh as FBX from Maya. """ order = pyblish.api.ExtractorOrder - 0.1 diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py index 9a6b4ebaed..79f47fbe9b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_yeticache.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py @@ -1,18 +1,16 @@ import os +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish - -class ExtractUnrealYetiCache(publish.Extractor): +class ExtractUnrealYetiCache(plugin.MayaExtractorPlugin): """Producing Yeti cache files using scene time range. This will extract Yeti cache file sequence and fur settings. """ label = "Extract Yeti Cache (Unreal)" - hosts = ["maya"] families = ["yeticacheUE"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py index d16f9e8701..d6f1fd6698 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py @@ -1,12 +1,11 @@ import os +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import maintained_selection - -class ExtractVRayProxy(publish.Extractor): +class ExtractVRayProxy(plugin.MayaExtractorPlugin): """Extract the content of the instance to a vrmesh file Things to pay attention to: @@ -15,7 +14,6 @@ class ExtractVRayProxy(publish.Extractor): """ label = "VRay Proxy (.vrmesh)" - hosts = ["maya"] families = ["vrayproxy.vrmesh"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py index 023a15e67a..785cb4c37c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayscene.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py @@ -3,18 +3,16 @@ import os import re -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.render_setup_tools import export_in_rs_layer -from ayon_core.hosts.maya.api.lib import maintained_selection - +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin +from ayon_maya.api.render_setup_tools import export_in_rs_layer from maya import cmds -class ExtractVrayscene(publish.Extractor): +class ExtractVrayscene(plugin.MayaExtractorPlugin): """Extractor for vrscene.""" label = "VRay Scene (.vrscene)" - hosts = ["maya"] families = ["vrayscene_layer"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py index 54d295b479..e6df19c7f1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py @@ -1,15 +1,14 @@ +import copy import os import shutil -import copy - -from maya import cmds import pyblish.api -from ayon_core.hosts.maya.api.alembic import extract_alembic -from ayon_core.pipeline import publish +from ayon_maya.api.alembic import extract_alembic +from ayon_maya.api import plugin +from maya import cmds -class ExtractWorkfileXgen(publish.Extractor): +class ExtractWorkfileXgen(plugin.MayaExtractorPlugin): """Extract Workfile Xgen. When submitting a render, we need to prep Xgen side car files. @@ -19,7 +18,6 @@ class ExtractWorkfileXgen(publish.Extractor): order = pyblish.api.ExtractorOrder - 0.499 label = "Extract Workfile Xgen" families = ["workfile"] - hosts = ["maya"] def get_render_max_frame_range(self, context): """Return start to end frame range including all renderlayers in diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py index b672089a63..bb700bbdec 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_xgen.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py @@ -1,17 +1,19 @@ -import os import copy +import os import tempfile -from maya import cmds import xgenm - -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, attribute_values, write_xgen_file, delete_after +from ayon_maya.api.lib import ( + attribute_values, + delete_after, + maintained_selection, + write_xgen_file, ) +from ayon_maya.api import plugin +from maya import cmds -class ExtractXgen(publish.Extractor): +class ExtractXgen(plugin.MayaExtractorPlugin): """Extract Xgen Workflow: @@ -23,7 +25,6 @@ class ExtractXgen(publish.Extractor): """ label = "Extract Xgen" - hosts = ["maya"] families = ["xgen"] scene_type = "ma" diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py index b9cd7a1be5..b84867316c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_cache.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py @@ -1,19 +1,17 @@ -import os import json +import os +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish - -class ExtractYetiCache(publish.Extractor): +class ExtractYetiCache(plugin.MayaExtractorPlugin): """Producing Yeti cache files using scene time range. This will extract Yeti cache file sequence and fur settings. """ label = "Extract Yeti Cache" - hosts = ["maya"] families = ["yetiRig", "yeticache"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py rename to server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py index 0b67117ebc..640b37b667 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_yeti_rig.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py @@ -1,15 +1,14 @@ # -*- coding: utf-8 -*- """Extract Yeti rig.""" -import os -import json import contextlib +import json +import os +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline import publish -from ayon_core.hosts.maya.api import lib - @contextlib.contextmanager def disconnect_plugs(settings, members): @@ -90,11 +89,10 @@ def yetigraph_attribute_values(assumed_destination, resources): pass -class ExtractYetiRig(publish.Extractor): +class ExtractYetiRig(plugin.MayaExtractorPlugin): """Extract the Yeti rig to a Maya Scene and write the Yeti rig data.""" label = "Extract Yeti Rig" - hosts = ["maya"] families = ["yetiRig"] scene_type = "ma" diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml index e92320ccdc..fa908fe425 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml +++ b/server_addon/maya/client/ayon_maya/plugins/publish/help/submit_maya_remote_publish_deadline.xml @@ -13,4 +13,4 @@ Check all failing plugins (should be highlighted in red) and fix issues if possi - \ No newline at end of file + diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml index a855dd90a5..cdaf97b8f4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml +++ b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_animation_out_set_related_node_ids.xml @@ -6,13 +6,13 @@ Meshes are detected where the (deformed) mesh has a different `cbId` than the same mesh in its deformation history. -Theses should normally be the same. +These should normally be the same. ### How to repair? By using the repair action the IDs from the shape in history will be copied to the deformed shape. For **animation** instances using the -repair action usually is usually the correct fix. +repair action is usually the correct fix. diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_maya_units.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_maya_units.xml similarity index 100% rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_maya_units.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_maya_units.xml diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_mesh_non_manifold.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_mesh_non_manifold.xml similarity index 100% rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_mesh_non_manifold.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_mesh_non_manifold.xml diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_node_ids.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_node_ids.xml similarity index 100% rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_node_ids.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_node_ids.xml diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_rig_out_set_node_ids.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_rig_out_set_node_ids.xml similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_rig_out_set_node_ids.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_rig_out_set_node_ids.xml index 374b8e59ae..956a7adb3b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/help/validate_rig_out_set_node_ids.xml +++ b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_rig_out_set_node_ids.xml @@ -6,7 +6,7 @@ Meshes are detected in the **rig** where the (deformed) mesh has a different `cbId` than the same mesh in its deformation history. -Theses should normally be the same. +These should normally be the same. ### How to repair? diff --git a/client/ayon_core/hosts/maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml b/server_addon/maya/client/ayon_maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml similarity index 100% rename from client/ayon_core/hosts/maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml rename to server_addon/maya/client/ayon_maya/plugins/publish/help/validate_skeletalmesh_hierarchy.xml diff --git a/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py b/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py rename to server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py index a9378df8e1..66019c4837 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/increment_current_file_deadline.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py @@ -1,7 +1,8 @@ import pyblish.api +from ayon_maya.api import plugin -class IncrementCurrentFileDeadline(pyblish.api.ContextPlugin): +class IncrementCurrentFileDeadline(plugin.MayaContextPlugin): """Increment the current file. Saves the current maya scene with an increased version number. @@ -10,15 +11,14 @@ class IncrementCurrentFileDeadline(pyblish.api.ContextPlugin): label = "Increment current file" order = pyblish.api.IntegratorOrder + 9.0 - hosts = ["maya"] families = ["workfile"] optional = True def process(self, context): - from maya import cmds from ayon_core.lib import version_up from ayon_core.pipeline.publish import get_errored_plugins_from_context + from maya import cmds errored_plugins = get_errored_plugins_from_context(context) if any(plugin.__name__ == "MayaSubmitDeadline" diff --git a/client/ayon_core/hosts/maya/plugins/publish/reset_xgen_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/reset_xgen_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py index 759aa23258..ac9e1beeec 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/reset_xgen_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py @@ -1,9 +1,9 @@ +import pyblish.api +from ayon_maya.api import plugin from maya import cmds -import pyblish.api - -class ResetXgenAttributes(pyblish.api.InstancePlugin): +class ResetXgenAttributes(plugin.MayaInstancePlugin): """Reset Xgen attributes. When the incremental save of the workfile triggers, the Xgen attributes diff --git a/client/ayon_core/hosts/maya/plugins/publish/save_scene.py b/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/save_scene.py rename to server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py index eb7c06a113..9c23fcff85 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/save_scene.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py @@ -1,18 +1,16 @@ import pyblish.api from ayon_core.pipeline.workfile.lock_workfile import ( is_workfile_lock_enabled, - remove_workfile_lock + remove_workfile_lock, ) +from ayon_maya.api import plugin -class SaveCurrentScene(pyblish.api.ContextPlugin): - """Save current scene - - """ +class SaveCurrentScene(plugin.MayaContextPlugin): + """Save current scene.""" label = "Save current file" order = pyblish.api.ExtractorOrder - 0.49 - hosts = ["maya"] families = ["renderlayer", "workfile"] def process(self, context): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_alembic_options_defaults.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_alembic_options_defaults.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py index 11f4c313fa..fd4e2254a7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_alembic_options_defaults.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py @@ -1,12 +1,13 @@ import inspect -import pyblish.api +import pyblish.api from ayon_core.pipeline import OptionalPyblishPluginMixin -from ayon_core.pipeline.publish import RepairAction, PublishValidationError +from ayon_core.pipeline.publish import PublishValidationError, RepairAction +from ayon_maya.api import plugin class ValidateAlembicDefaultsPointcache( - pyblish.api.InstancePlugin, OptionalPyblishPluginMixin + plugin.MayaInstancePlugin, OptionalPyblishPluginMixin ): """Validate the attributes on the instance are defaults. @@ -15,7 +16,6 @@ class ValidateAlembicDefaultsPointcache( order = pyblish.api.ValidatorOrder families = ["pointcache"] - hosts = ["maya"] label = "Validate Alembic Options Defaults" actions = [RepairAction] optional = True @@ -54,8 +54,8 @@ class ValidateAlembicDefaultsPointcache( default_value = settings[key] - # Lists are best to compared sorted since we cant rely on the order - # of the items. + # Lists are best to compared sorted since we can't rely on + # the order of the items. if isinstance(value, list): value = sorted(value) default_value = sorted(default_value) @@ -79,15 +79,15 @@ class ValidateAlembicDefaultsPointcache( def get_description(): return inspect.cleandoc( """### Alembic Extract settings differ from defaults - - The alembic export options differ from the project default values. - - If this is intentional you can disable this validation by + + The alembic export options differ from the project default values. + + If this is intentional you can disable this validation by disabling **Validate Alembic Options Default**. - + If not you may use the "Repair" action to revert all the options to their default values. - + """ ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py index ea989bbcf3..b10a1a2bb7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py @@ -1,13 +1,13 @@ -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateAnimationContent(pyblish.api.InstancePlugin, +class ValidateAnimationContent(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Adheres to the content of 'animation' product type @@ -17,10 +17,9 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["animation"] label = "Animation Content" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py index 7ecd602662..40f03b2690 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py @@ -1,19 +1,18 @@ +import ayon_maya.api.action import maya.cmds as cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishXmlValidationError, RepairAction, ValidateContentsOrder, - PublishXmlValidationError, - OptionalPyblishPluginMixin, + apply_plugin_settings_automatically, get_plugin_settings, - apply_plugin_settings_automatically ) +from ayon_maya.api import lib +from ayon_maya.api import plugin -class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin, +class ValidateOutRelatedNodeIds(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate if deformed shapes have related IDs to the original shapes @@ -29,7 +28,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin, hosts = ['maya'] label = 'Animation Out Set Related Node Ids' actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, + ayon_maya.api.action.SelectInvalidAction, RepairAction ] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py index 8574b3ecc8..edc4161dff 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py @@ -1,21 +1,20 @@ +import pyblish.api +from ayon_core.pipeline.publish import ( + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api.lib import is_visible +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, PublishValidationError -) -from ayon_core.hosts.maya.api.lib import is_visible - - -class ValidateArnoldSceneSource(pyblish.api.InstancePlugin): +class ValidateArnoldSceneSource(plugin.MayaInstancePlugin): """Validate Arnold Scene Source. Ensure no nodes are hidden. """ order = ValidateContentsOrder - hosts = ["maya"] families = ["ass", "assProxy"] label = "Validate Arnold Scene Source" diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py index e5dbe178fc..8da8813b0d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_arnold_scene_source_cbid.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py @@ -1,14 +1,14 @@ -import pyblish.api -from ayon_core.hosts.maya.api import lib from ayon_core.pipeline.publish import ( - ValidateContentsOrder, + OptionalPyblishPluginMixin, PublishValidationError, RepairAction, - OptionalPyblishPluginMixin + ValidateContentsOrder, ) +from ayon_maya.api import lib +from ayon_maya.api import plugin -class ValidateArnoldSceneSourceCbid(pyblish.api.InstancePlugin, +class ValidateArnoldSceneSourceCbid(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate Arnold Scene Source Cbid. @@ -16,7 +16,6 @@ class ValidateArnoldSceneSourceCbid(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["assProxy"] label = "Validate Arnold Scene Source CBID" actions = [RepairAction] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py index 6e65eee592..36c220f862 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_ass_relative_paths.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py @@ -4,21 +4,20 @@ import types import maya.cmds as cmds from mtoa.core import createOptions -import pyblish.api from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateAssRelativePaths(pyblish.api.InstancePlugin, +class ValidateAssRelativePaths(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure exporting ass file has set relative texture paths""" order = ValidateContentsOrder - hosts = ['maya'] families = ['ass'] label = "ASS has relative texture paths" actions = [RepairAction] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py index c829f4bf74..4dfe7214bf 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_name.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py @@ -1,13 +1,14 @@ -import pyblish.api +import ayon_maya.api.action import maya.cmds as cmds -import ayon_core.hosts.maya.api.action +import pyblish.api from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateAssemblyName(pyblish.api.InstancePlugin, +class ValidateAssemblyName(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """ Ensure Assembly name ends with `GRP` @@ -17,7 +18,7 @@ class ValidateAssemblyName(pyblish.api.InstancePlugin, label = "Validate Assembly Name" order = pyblish.api.ValidatorOrder families = ["assembly"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] active = False optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py similarity index 81% rename from client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py index 814a8295c4..324b12a207 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_namespaces.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py @@ -1,13 +1,15 @@ +import ayon_maya.api.action import pyblish.api -import ayon_core.hosts.maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin, + +class ValidateAssemblyNamespaces(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): - """Ensure namespaces are not nested + """Ensure namespaces are not nested. In the outliner an item in a normal namespace looks as following: props_desk_01_:modelDefault @@ -21,7 +23,7 @@ class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin, label = "Validate Assembly Namespaces" order = pyblish.api.ValidatorOrder families = ["assembly"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py index 3bcae5de49..7fc14560f7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_assembly_transforms.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py @@ -1,15 +1,15 @@ +import ayon_maya.api.action import pyblish.api -from maya import cmds - -import ayon_core.hosts.maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, RepairAction, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin, +class ValidateAssemblyModelTransforms(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Verify only root nodes of the loaded asset have transformations. @@ -32,7 +32,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin, order = pyblish.api.ValidatorOrder + 0.49 label = "Assembly Model Transforms" families = ["assembly"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] prompt_message = ("You are about to reset the matrix to the default values." @@ -53,7 +53,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin, @classmethod def get_invalid(cls, instance): - from ayon_core.hosts.maya.api import lib + from ayon_maya.api import lib # Get all transforms in the loaded containers container_roots = cmds.listRelatives(instance.data["nodesHierarchy"], @@ -98,10 +98,9 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin, """ + from ayon_maya.api import lib from qtpy import QtWidgets - from ayon_core.hosts.maya.api import lib - # Store namespace in variable, cosmetics thingy choice = QtWidgets.QMessageBox.warning( None, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py index 1514972159..8d4d8323ce 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py @@ -1,16 +1,18 @@ import json from collections import defaultdict -import pyblish.api +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + RepairAction, + ValidateContentsOrder, +) +from ayon_maya.api.lib import set_attribute +from ayon_maya.api import plugin from maya import cmds -from ayon_core.hosts.maya.api.lib import set_attribute -from ayon_core.pipeline.publish import ( - OptionalPyblishPluginMixin, PublishValidationError, RepairAction, - ValidateContentsOrder) - -class ValidateAttributes(pyblish.api.InstancePlugin, +class ValidateAttributes(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure attributes are consistent. @@ -25,7 +27,6 @@ class ValidateAttributes(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Validate Attributes" - hosts = ["maya"] actions = [RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py index 5fd8772a96..8c3f3800cc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py @@ -1,15 +1,14 @@ -import pyblish.api -from maya import cmds - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateCameraAttributes(pyblish.api.InstancePlugin, +class ValidateCameraAttributes(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates Camera has no invalid attribute keys or values. @@ -23,7 +22,7 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin, families = ['camera'] hosts = ['maya'] label = 'Camera Attributes' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True DEFAULTS = [ diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py index 0f14a057f9..42a5ef1769 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_camera_contents.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py @@ -1,14 +1,14 @@ -import pyblish.api from maya import cmds -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( PublishValidationError, ValidateContentsOrder, OptionalPyblishPluginMixin) +from ayon_maya.api import plugin -class ValidateCameraContents(pyblish.api.InstancePlugin, +class ValidateCameraContents(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates Camera instance contents. @@ -21,9 +21,8 @@ class ValidateCameraContents(pyblish.api.InstancePlugin, order = ValidateContentsOrder families = ['camera'] - hosts = ['maya'] label = 'Camera Contents' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] validate_shapes = True optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py index f70b46f89e..f95e27def1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_color_sets.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py @@ -1,16 +1,15 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateMeshOrder, OptionalPyblishPluginMixin, PublishValidationError, - RepairAction + RepairAction, + ValidateMeshOrder, ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateColorSets(pyblish.api.InstancePlugin, +class ValidateColorSets(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate all meshes in the instance have unlocked normals @@ -20,11 +19,10 @@ class ValidateColorSets(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh ColorSets' actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction + ayon_maya.api.action.SelectInvalidAction, RepairAction ] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py index 045e22545c..6c599d398d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_current_renderlayer_renderable.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py @@ -1,16 +1,16 @@ import inspect import pyblish.api - -from maya import cmds from ayon_core.pipeline.publish import ( - context_plugin_should_run, + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin + context_plugin_should_run, ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateCurrentRenderLayerIsRenderable(pyblish.api.ContextPlugin, +class ValidateCurrentRenderLayerIsRenderable(plugin.MayaContextPlugin, OptionalPyblishPluginMixin): """Validate if current render layer has a renderable camera. @@ -25,7 +25,6 @@ class ValidateCurrentRenderLayerIsRenderable(pyblish.api.ContextPlugin, label = "Current Render Layer Has Renderable Camera" order = pyblish.api.ValidatorOrder - hosts = ["maya"] families = ["renderlayer"] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py similarity index 74% rename from client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py index f969ff533b..0b870993e9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_cycle_error.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py @@ -1,13 +1,15 @@ -import pyblish.api +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api.lib import maintained_selection +from ayon_maya.api import plugin from maya import cmds -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api.lib import maintained_selection -from ayon_core.pipeline.publish import ( - OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) - -class ValidateCycleError(pyblish.api.InstancePlugin, +class ValidateCycleError(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate nodes produce no cycle errors.""" @@ -15,7 +17,7 @@ class ValidateCycleError(pyblish.api.InstancePlugin, label = "Cycle Errors" hosts = ["maya"] families = ["rig"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py index 5736e726e9..90bdef4107 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py @@ -1,20 +1,16 @@ -import pyblish.api - -from maya import cmds from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) -from ayon_core.hosts.maya.api.lib_rendersetup import ( - get_attr_overrides, - get_attr_in_layer, ) +from ayon_maya.api.lib_rendersetup import get_attr_in_layer, get_attr_overrides +from ayon_maya.api import plugin +from maya import cmds from maya.app.renderSetup.model.override import AbsOverride -class ValidateFrameRange(pyblish.api.InstancePlugin, +class ValidateFrameRange(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates the frame ranges. diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py index 3735dbb74c..e94cb3e663 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_material.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py @@ -1,15 +1,15 @@ import os + +from ayon_core.pipeline import ( + OptionalPyblishPluginMixin, + PublishValidationError, +) +from ayon_core.pipeline.publish import RepairAction, ValidateContentsOrder +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.pipeline.publish import ( - RepairAction, - ValidateContentsOrder -) -from ayon_core.pipeline import PublishValidationError, OptionalPyblishPluginMixin - -class ValidateGLSLMaterial(pyblish.api.InstancePlugin, +class ValidateGLSLMaterial(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """ Validate if the asset uses GLSL Shader @@ -17,7 +17,6 @@ class ValidateGLSLMaterial(pyblish.api.InstancePlugin, order = ValidateContentsOrder + 0.1 families = ['gltf'] - hosts = ['maya'] label = 'GLSL Shader for GLTF' actions = [RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py index d783da8b5c..aaea616631 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_glsl_plugin.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py @@ -1,16 +1,15 @@ - from maya import cmds -import pyblish.api from ayon_core.pipeline.publish import ( RepairAction, ValidateContentsOrder, PublishValidationError, OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateGLSLPlugin(pyblish.api.InstancePlugin, +class ValidateGLSLPlugin(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """ Validate if the asset uses GLSL Shader @@ -18,7 +17,6 @@ class ValidateGLSLPlugin(pyblish.api.InstancePlugin, order = ValidateContentsOrder + 0.15 families = ['gltf'] - hosts = ['maya'] label = 'maya2glTF plugin' actions = [RepairAction] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py similarity index 81% rename from client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py index 16e04af446..baca2a9008 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py @@ -1,18 +1,17 @@ -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + PublishValidationError, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api import plugin -class ValidateInstanceHasMembers(pyblish.api.InstancePlugin): +class ValidateInstanceHasMembers(plugin.MayaInstancePlugin): """Validates instance objectSet has *any* members.""" order = ValidateContentsOrder - hosts = ["maya"] label = 'Instance has members' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] @classmethod def get_invalid(cls, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py index e6f4b908bb..5168c8496c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py @@ -2,17 +2,17 @@ """Validate if instance asset is the same as context asset.""" from __future__ import absolute_import -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateInstanceInContext(pyblish.api.InstancePlugin, +class ValidateInstanceInContext(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validator to check if instance asset match context asset. @@ -26,9 +26,8 @@ class ValidateInstanceInContext(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Instance in same Context" optional = True - hosts = ["maya"] actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction + ayon_maya.api.action.SelectInvalidAction, RepairAction ] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py index df9ca0bf13..4c876079ff 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py @@ -1,11 +1,11 @@ -import pyblish.api import string import six from ayon_core.pipeline.publish import ( + PublishValidationError, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api import plugin # Allow only characters, numbers and underscore allowed = set(string.ascii_lowercase + @@ -18,7 +18,7 @@ def validate_name(product_name): return all(x in allowed for x in product_name) -class ValidateSubsetName(pyblish.api.InstancePlugin): +class ValidateSubsetName(plugin.MayaInstancePlugin): """Validates product name has only valid characters""" order = ValidateContentsOrder diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py similarity index 67% rename from client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py index a05920a21e..60af00186e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_loaded_plugin.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py @@ -7,15 +7,15 @@ from ayon_core.pipeline.publish import ( PublishValidationError, OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateLoadedPlugin(pyblish.api.ContextPlugin, +class ValidateLoadedPlugin(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure there are no unauthorized loaded plugins""" label = "Loaded Plugin" order = pyblish.api.ValidatorOrder - host = ["maya"] actions = [RepairContextAction] optional = True @@ -23,17 +23,17 @@ class ValidateLoadedPlugin(pyblish.api.ContextPlugin, def get_invalid(cls, context): invalid = [] - loaded_plugin = cmds.pluginInfo(query=True, listPlugins=True) + loaded_plugins = cmds.pluginInfo(query=True, listPlugins=True) # get variable from AYON settings whitelist_native_plugins = cls.whitelist_native_plugins authorized_plugins = cls.authorized_plugins or [] - for plugin in loaded_plugin: + for maya_plugin in loaded_plugins: if not whitelist_native_plugins and os.getenv('MAYA_LOCATION') \ - in cmds.pluginInfo(plugin, query=True, path=True): + in cmds.pluginInfo(maya_plugin, query=True, path=True): continue - if plugin not in authorized_plugins: - invalid.append(plugin) + if maya_plugin not in authorized_plugins: + invalid.append(maya_plugin) return invalid @@ -50,6 +50,6 @@ class ValidateLoadedPlugin(pyblish.api.ContextPlugin, def repair(cls, context): """Unload forbidden plugins""" - for plugin in cls.get_invalid(context): - cmds.pluginInfo(plugin, edit=True, autoload=False) - cmds.unloadPlugin(plugin, force=True) + for maya_plugin in cls.get_invalid(context): + cmds.pluginInfo(maya_plugin, edit=True, autoload=False) + cmds.unloadPlugin(maya_plugin, force=True) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py index a8d8ec373a..722f92b1b5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_contents.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py @@ -1,15 +1,13 @@ -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( PublishValidationError, - ValidateContentsOrder + ValidateContentsOrder, ) - - +from ayon_maya.api import plugin from maya import cmds # noqa -class ValidateLookContents(pyblish.api.InstancePlugin): +class ValidateLookContents(plugin.MayaInstancePlugin): """Validate look instance contents Rules: @@ -25,9 +23,8 @@ class ValidateLookContents(pyblish.api.InstancePlugin): order = ValidateContentsOrder families = ['look'] - hosts = ['maya'] label = 'Look Data Contents' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py index cfd4156124..ac936b36c7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_default_shaders_connections.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py @@ -1,13 +1,13 @@ -from maya import cmds - import pyblish.api from ayon_core.pipeline.publish import ( + PublishValidationError, RepairContextAction, - PublishValidationError ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateLookDefaultShadersConnections(pyblish.api.ContextPlugin): +class ValidateLookDefaultShadersConnections(plugin.MayaContextPlugin): """Validate default shaders in the scene have their default connections. For example the standardSurface1 or lambert1 (maya 2023 and before) could @@ -22,7 +22,6 @@ class ValidateLookDefaultShadersConnections(pyblish.api.ContextPlugin): order = pyblish.api.ValidatorOrder - 0.4999 families = ['look'] - hosts = ['maya'] label = 'Look Default Shader Connections' actions = [RepairContextAction] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py index 7ae3b4b9b5..4763128f3f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_id_reference_edits.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py @@ -1,16 +1,16 @@ from collections import defaultdict -from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin): +class ValidateLookIdReferenceEdits(plugin.MayaInstancePlugin): """Validate nodes in look have no reference edits to cbId. Note: @@ -22,9 +22,8 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin): order = ValidateContentsOrder families = ['look'] - hosts = ['maya'] label = 'Look Id Reference Edits' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py index 3a67bbd72b..e4662dd498 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_no_default_shaders.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py @@ -1,14 +1,13 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError -) - -class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin): +class ValidateLookNoDefaultShaders(plugin.MayaInstancePlugin): """Validate if any node has a connection to a default shader. This checks whether the look has any members of: @@ -28,9 +27,8 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin): order = ValidateContentsOrder + 0.01 families = ['look'] - hosts = ['maya'] label = 'Look No Default Shaders' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] DEFAULT_SHADERS = {"lambert1", "initialShadingGroup", "initialParticleSE", "particleCloud1"} diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py index dd7515c1fb..eae1664114 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_sets.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py @@ -1,13 +1,13 @@ -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib +import ayon_maya.api.action +from ayon_maya.api import lib from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) +from ayon_maya.api import plugin -class ValidateLookSets(pyblish.api.InstancePlugin): +class ValidateLookSets(plugin.MayaInstancePlugin): """Validate if any sets relationships are not being collected. A shader can be assigned to a node that is missing a Colorbleed ID. @@ -42,9 +42,8 @@ class ValidateLookSets(pyblish.api.InstancePlugin): order = ValidateContentsOrder families = ['look'] - hosts = ['maya'] label = 'Look Sets' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] def process(self, instance): """Process all the nodes in the instance""" diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py index 070974aef5..2aecf64e01 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_shading_group.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py @@ -1,16 +1,15 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateShadingEngine(pyblish.api.InstancePlugin, +class ValidateShadingEngine(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate all shading engines are named after the surface material. @@ -19,10 +18,9 @@ class ValidateShadingEngine(pyblish.api.InstancePlugin, order = ValidateContentsOrder families = ["look"] - hosts = ["maya"] label = "Look Shading Engine Naming" actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction + ayon_maya.api.action.SelectInvalidAction, RepairAction ] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py index c0ffaaf9c0..d48c050d97 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_look_single_shader.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py @@ -1,12 +1,13 @@ -import pyblish.api +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - PublishValidationError, ValidateContentsOrder) - -class ValidateSingleShader(pyblish.api.InstancePlugin): +class ValidateSingleShader(plugin.MayaInstancePlugin): """Validate all nurbsSurfaces and meshes have exactly one shader assigned. This will error if a shape has no shaders or more than one shader. @@ -15,9 +16,8 @@ class ValidateSingleShader(pyblish.api.InstancePlugin): order = ValidateContentsOrder families = ['look'] - hosts = ['maya'] label = 'Look Single Shader Per Shape' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] # The default connections to check def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py index 47314b64ac..cb4df4b5d5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_maya_units.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py @@ -1,23 +1,20 @@ +import ayon_maya.api.lib as mayalib import maya.cmds as cmds - -import pyblish.api - -import ayon_core.hosts.maya.api.lib as mayalib from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishXmlValidationError, RepairContextAction, ValidateSceneOrder, - PublishXmlValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateMayaUnits(pyblish.api.ContextPlugin, +class ValidateMayaUnits(plugin.MayaContextPlugin, OptionalPyblishPluginMixin): """Check if the Maya units are set correct""" order = ValidateSceneOrder label = "Maya Units" - hosts = ['maya'] actions = [RepairContextAction] validate_linear_units = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py index e9d9a17ff4..9729c8863d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py @@ -1,23 +1,22 @@ -from maya import cmds -import pyblish.api - -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api.lib import ( - maintained_selection, - delete_after, - undo_chunk, - get_attribute, - set_attribute -) +import ayon_maya.api.action from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateMeshOrder, - PublishValidationError ) +from ayon_maya.api.lib import ( + delete_after, + get_attribute, + maintained_selection, + set_attribute, + undo_chunk, +) +from ayon_maya.api import plugin +from maya import cmds -class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin, +class ValidateMeshArnoldAttributes(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate the mesh has default Arnold attributes. @@ -30,7 +29,7 @@ class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin, families = ["model"] label = "Mesh Arnold Attributes" actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, + ayon_maya.api.action.SelectInvalidAction, RepairAction ] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py similarity index 83% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py index c95e1ec816..12b2252eb8 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_empty.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py @@ -1,15 +1,14 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + PublishValidationError, RepairAction, ValidateMeshOrder, - PublishValidationError ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateMeshEmpty(pyblish.api.InstancePlugin): +class ValidateMeshEmpty(plugin.MayaInstancePlugin): """Validate meshes have some vertices. Its possible to have meshes without any vertices. To replicate @@ -17,11 +16,10 @@ class ValidateMeshEmpty(pyblish.api.InstancePlugin): """ order = ValidateMeshOrder - hosts = ["maya"] families = ["model"] label = "Mesh Empty" actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, RepairAction + ayon_maya.api.action.SelectInvalidAction, RepairAction ] @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py index 633fc29732..c7576d2a78 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_has_uv.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py @@ -1,16 +1,15 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateMeshOrder, +) +from ayon_maya.api.lib import len_flattened +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateMeshOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) -from ayon_core.hosts.maya.api.lib import len_flattened - -class ValidateMeshHasUVs(pyblish.api.InstancePlugin, +class ValidateMeshHasUVs(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate the current mesh has UVs. @@ -21,10 +20,9 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh Has UVs' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py similarity index 86% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py index bfb4257f23..50e3b5b53a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py @@ -1,15 +1,14 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateMeshOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateMeshOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - -class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin, +class ValidateMeshLaminaFaces(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate meshes don't have lamina faces. @@ -18,10 +17,9 @@ class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh Lamina Faces' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True description = ( diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py index 58d015e962..c73c8d27e8 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_ngons.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py @@ -1,16 +1,15 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - -class ValidateMeshNgons(pyblish.api.InstancePlugin, +class ValidateMeshNgons(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure that meshes don't have ngons @@ -22,10 +21,9 @@ class ValidateMeshNgons(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["model"] label = "Mesh ngons" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True description = ( diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py index bf1489f92e..7a77a2a4f6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py @@ -1,12 +1,11 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateMeshOrder, + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin + ValidateMeshOrder, ) +from ayon_maya.api import plugin +from maya import cmds def _as_report_list(values, prefix="- ", suffix="\n"): @@ -16,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateMeshNoNegativeScale(pyblish.api.InstancePlugin, +class ValidateMeshNoNegativeScale(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure that meshes don't have a negative scale. @@ -30,10 +29,9 @@ class ValidateMeshNoNegativeScale(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh No Negative Scale' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py index 958707e4f4..8288e8a3b3 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_manifold.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py @@ -1,13 +1,12 @@ -from maya import cmds, mel - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateMeshOrder, + OptionalPyblishPluginMixin, PublishXmlValidationError, RepairAction, - OptionalPyblishPluginMixin + ValidateMeshOrder, ) +from ayon_maya.api import plugin +from maya import cmds, mel def poly_cleanup(version=4, @@ -101,7 +100,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateMeshNonManifold(pyblish.api.InstancePlugin, +class ValidateMeshNonManifold(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure that meshes don't have non-manifold edges or vertices @@ -111,10 +110,9 @@ class ValidateMeshNonManifold(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh Non-Manifold Edges/Vertices' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, CleanupMatchingPolygons] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py index 0a8d6cf159..bd11ca6488 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py @@ -1,16 +1,15 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateMeshOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib -from ayon_core.pipeline.publish import ( - ValidateMeshOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - -class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin, +class ValidateMeshNonZeroEdgeLength(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate meshes don't have edges with a zero length. @@ -23,9 +22,8 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin, order = ValidateMeshOrder families = ['model'] - hosts = ['maya'] label = 'Mesh Edge Length Non Zero' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True __tolerance = 1e-5 diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py index 76b716d01f..dd8c523082 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py @@ -1,14 +1,13 @@ -from maya import cmds +import ayon_maya.api.action import maya.api.OpenMaya as om2 - -import pyblish.api -import ayon_core.hosts.maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateMeshOrder, - OptionalPyblishPluginMixin, - PublishValidationError ) +from ayon_maya.api import plugin +from maya import cmds def _as_report_list(values, prefix="- ", suffix="\n"): @@ -18,7 +17,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateMeshNormalsUnlocked(pyblish.api.InstancePlugin, +class ValidateMeshNormalsUnlocked(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate all meshes in the instance have unlocked normals @@ -28,10 +27,9 @@ class ValidateMeshNormalsUnlocked(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh Normals Unlocked' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py index a13d16e849..0ef6c2732e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py @@ -1,16 +1,15 @@ import math -from six.moves import xrange -from maya import cmds +import ayon_maya.api.action import maya.api.OpenMaya as om -import pyblish.api - -import ayon_core.hosts.maya.api.action from ayon_core.pipeline.publish import ( - ValidateMeshOrder, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + ValidateMeshOrder, ) +from ayon_maya.api import plugin +from maya import cmds +from six.moves import xrange def _as_report_list(values, prefix="- ", suffix="\n"): @@ -236,7 +235,7 @@ class GetOverlappingUVs(object): return faces -class ValidateMeshHasOverlappingUVs(pyblish.api.InstancePlugin, +class ValidateMeshHasOverlappingUVs(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """ Validate the current mesh overlapping UVs. @@ -245,10 +244,9 @@ class ValidateMeshHasOverlappingUVs(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh Has Overlapping UVs' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py index 70ede83f2d..e3fff157ac 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_shader_connections.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py @@ -1,13 +1,12 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateMeshOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds def pairs(iterable): @@ -80,7 +79,7 @@ def disconnect(node_a, node_b): cmds.disconnectAttr(source, input) -class ValidateMeshShaderConnections(pyblish.api.InstancePlugin, +class ValidateMeshShaderConnections(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure mesh shading engine connections are valid. @@ -93,10 +92,9 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = "Mesh Shader Connections" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py index 21697cd903..a254cbf8a6 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py @@ -1,17 +1,16 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateMeshOrder, - OptionalPyblishPluginMixin, - PublishValidationError ) +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds -class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin, +class ValidateMeshSingleUVSet(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Warn on multiple UV sets existing for each polygon mesh. @@ -22,11 +21,10 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model', 'pointcache'] optional = True label = "Mesh Single UV Set" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py index 305a58d78e..a749edb35a 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py @@ -1,18 +1,17 @@ import inspect -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateMeshOrder, - OptionalPyblishPluginMixin, - PublishValidationError ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin, +class ValidateMeshUVSetMap1(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate model's default set exists and is named 'map1'. @@ -24,11 +23,10 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] optional = True label = "Mesh has map1 UV Set" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] @classmethod @@ -120,10 +118,10 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin, @staticmethod def get_description(): return inspect.cleandoc("""### Mesh found without map1 uv set - + A mesh must have a default UV set named `map1` to adhere to the default mesh behavior of Maya meshes. - + There may be meshes that: - Have no UV set - Have no `map1` uv set but are using a different name @@ -131,7 +129,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin, #### Repair - + Using repair will try to make the first UV set the `map1` uv set. If it does not exist yet it will be created or renames the current first UV set to `map1`. diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py index f0962148dc..a10a275c44 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py @@ -1,17 +1,16 @@ -import pyblish.api -from maya import cmds - -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api.lib import len_flattened +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, RepairAction, ValidateMeshOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api.lib import len_flattened +from ayon_maya.api import plugin +from maya import cmds -class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin, +class ValidateMeshVerticesHaveEdges(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate meshes have only vertices that are connected to edges. @@ -32,10 +31,9 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin, """ order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Mesh Vertices Have Edges' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py index bbc644c3db..5e100dca1c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py @@ -1,18 +1,17 @@ import inspect +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) - -class ValidateModelContent(pyblish.api.InstancePlugin, +class ValidateModelContent(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Adheres to the content of 'model' product type @@ -21,10 +20,9 @@ class ValidateModelContent(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["model"] label = "Model Content" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] validate_top_group = True optional = False @@ -120,18 +118,18 @@ class ValidateModelContent(pyblish.api.InstancePlugin, message="Model content is invalid. See log for more details.", description=self.get_description() ) - + @classmethod def get_description(cls): return inspect.cleandoc(f""" ### Model content is invalid - - Your model instance does not adhere to the rules of a + + Your model instance does not adhere to the rules of a model product type: - + - Must have at least one visible shape in it, like a mesh. - - Must have one root node. When exporting multiple meshes they + - Must have one root node. When exporting multiple meshes they must be inside a group. - - May only contain the following node types: + - May only contain the following node types: {", ".join(cls.allowed)} """) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py index 8c2bbf2a36..b26a3f4cb7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_mvlook_contents.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py @@ -1,24 +1,24 @@ import os -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin COLOUR_SPACES = ['sRGB', 'linear', 'auto'] MIPMAP_EXTENSIONS = ['tdl'] -class ValidateMvLookContents(pyblish.api.InstancePlugin, +class ValidateMvLookContents(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): order = ValidateContentsOrder families = ['mvLook'] hosts = ['maya'] label = 'Validate mvLook Data' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] # Allow this validation step to be skipped when you just need to # get things pushed through. diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py index bf45c0e974..146dfda2ca 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_animation.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py @@ -1,12 +1,11 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + ValidateContentsOrder, ) +from ayon_maya.api import plugin +from maya import cmds def _as_report_list(values, prefix="- ", suffix="\n"): @@ -16,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateNoAnimation(pyblish.api.InstancePlugin, +class ValidateNoAnimation(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure no keyframes on nodes in the Instance. @@ -31,7 +30,7 @@ class ValidateNoAnimation(pyblish.api.InstancePlugin, hosts = ["maya"] families = ["model"] optional = True - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] def process(self, instance): if not self.is_active(instance.data): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py similarity index 85% rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py index 3e21ec6e50..a57c02a842 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_default_camera.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py @@ -1,12 +1,11 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin + ValidateContentsOrder, ) +from ayon_maya.api import plugin +from maya import cmds def _as_report_list(values, prefix="- ", suffix="\n"): @@ -16,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateNoDefaultCameras(pyblish.api.InstancePlugin, +class ValidateNoDefaultCameras(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure no default (startup) cameras are in the instance. @@ -26,10 +25,9 @@ class ValidateNoDefaultCameras(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ['maya'] families = ['camera'] label = "No Default Cameras" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py index f546caff2c..9bd2d98e54 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_namespace.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py @@ -1,14 +1,12 @@ +import ayon_maya.api.action import maya.cmds as cmds - -import pyblish.api from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) - -import ayon_core.hosts.maya.api.action +from ayon_maya.api import plugin def _as_report_list(values, prefix="- ", suffix="\n"): @@ -25,15 +23,14 @@ def get_namespace(node_name): return node_name.rpartition(":")[0] -class ValidateNoNamespace(pyblish.api.InstancePlugin, +class ValidateNoNamespace(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure the nodes don't have a namespace""" order = ValidateContentsOrder - hosts = ['maya'] families = ['model'] label = 'No Namespaces' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py index 38955fd777..5c1baeb0e3 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_null_transforms.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py @@ -1,13 +1,12 @@ +import ayon_maya.api.action import maya.cmds as cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin def _as_report_list(values, prefix="- ", suffix="\n"): @@ -33,7 +32,7 @@ def has_shape_children(node): return True -class ValidateNoNullTransforms(pyblish.api.InstancePlugin, +class ValidateNoNullTransforms(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure no null transforms are in the scene. @@ -46,11 +45,10 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ['maya'] families = ['model'] label = 'No Empty/Null Transforms' actions = [RepairAction, - ayon_core.hosts.maya.api.action.SelectInvalidAction] + ayon_maya.api.action.SelectInvalidAction] optional = False @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py similarity index 86% rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py index 5cc3e95593..3662c94ba3 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_unknown_nodes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py @@ -1,12 +1,11 @@ -from maya import cmds - -import pyblish.api -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + ValidateContentsOrder, ) +from ayon_maya.api import plugin +from maya import cmds def _as_report_list(values, prefix="- ", suffix="\n"): @@ -16,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateNoUnknownNodes(pyblish.api.InstancePlugin, +class ValidateNoUnknownNodes(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Checks to see if there are any unknown nodes in the instance. @@ -33,7 +32,7 @@ class ValidateNoUnknownNodes(pyblish.api.InstancePlugin, families = ['model', 'rig'] optional = True label = "Unknown Nodes" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] @staticmethod def get_invalid(instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py index 2d59608e11..d14c335021 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_no_vraymesh.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py @@ -1,9 +1,11 @@ import pyblish.api -from maya import cmds from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds + def _as_report_list(values, prefix="- ", suffix="\n"): """Return list as bullet point list for a report""" @@ -12,7 +14,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"): return prefix + (suffix + prefix).join(values) -class ValidateNoVRayMesh(pyblish.api.InstancePlugin, +class ValidateNoVRayMesh(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate there are no VRayMesh objects in the instance""" diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py similarity index 85% rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py index 2d6f231cb5..f9dafa024f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py @@ -1,14 +1,13 @@ -import pyblish.api - from ayon_core.pipeline.publish import ( ValidatePipelineOrder, PublishXmlValidationError ) -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib +import ayon_maya.api.action +from ayon_maya.api import lib +from ayon_maya.api import plugin -class ValidateNodeIDs(pyblish.api.InstancePlugin): +class ValidateNodeIDs(plugin.MayaInstancePlugin): """Validate nodes have a Colorbleed Id. When IDs are missing from nodes *save your scene* and they should be @@ -19,7 +18,6 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin): order = ValidatePipelineOrder label = 'Instance Nodes Have ID' - hosts = ['maya'] families = ["model", "look", "rig", @@ -28,8 +26,8 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin): "yetiRig", "assembly"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, - ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction, + ayon_maya.api.action.GenerateUUIDsOnInvalidAction] @classmethod def apply_settings(cls, project_settings): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py index 545ab8e28c..8e3c4e5bff 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py @@ -1,13 +1,15 @@ -import pyblish.api +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + PublishValidationError, + RepairAction, + ValidateContentsOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib -from ayon_core.pipeline.publish import ( - PublishValidationError, RepairAction, ValidateContentsOrder) - -class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin): +class ValidateNodeIdsDeformedShape(plugin.MayaInstancePlugin): """Validate if deformed shapes have related IDs to the original shapes. When a deformer is applied in the scene on a referenced mesh that already @@ -19,10 +21,9 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin): order = ValidateContentsOrder families = ['look'] - hosts = ['maya'] label = 'Deformed shape ids' actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, + ayon_maya.api.action.SelectInvalidAction, RepairAction ] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py index d679c510af..95e488d8e7 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_in_database.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py @@ -1,13 +1,14 @@ -import pyblish.api import ayon_api - -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - PublishValidationError, ValidatePipelineOrder) + PublishValidationError, + ValidatePipelineOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin -class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin): +class ValidateNodeIdsInDatabase(plugin.MayaInstancePlugin): """Validate if the CB Id is related to an folder in the database All nodes with the `cbId` attribute will be validated to ensure that @@ -20,11 +21,10 @@ class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin): order = ValidatePipelineOrder label = 'Node Ids in Database' - hosts = ['maya'] families = ["*"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, - ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction, + ayon_maya.api.action.GenerateUUIDsOnInvalidAction] @classmethod def apply_settings(cls, project_settings): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py index 17eb58f421..7382653d35 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_related.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py @@ -1,13 +1,16 @@ import inspect import uuid from collections import defaultdict -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib -from ayon_core.pipeline.publish import ( - OptionalPyblishPluginMixin, PublishValidationError, ValidatePipelineOrder) +import ayon_maya.api.action from ayon_api import get_folders +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidatePipelineOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin def is_valid_uuid(value) -> bool: @@ -19,20 +22,19 @@ def is_valid_uuid(value) -> bool: return True -class ValidateNodeIDsRelated(pyblish.api.InstancePlugin, +class ValidateNodeIDsRelated(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate nodes have a related `cbId` to the instance.data[folderPath]""" order = ValidatePipelineOrder label = 'Node Ids Related (ID)' - hosts = ['maya'] families = ["model", "look", "rig"] optional = True - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, - ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction, + ayon_maya.api.action.GenerateUUIDsOnInvalidAction] @classmethod def apply_settings(cls, project_settings): @@ -109,14 +111,14 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin, @staticmethod def get_description(): return inspect.cleandoc("""### Node IDs must match folder id - + The node ids must match the folder entity id you are publishing to. - - Usually these mismatch occurs if you are re-using nodes from another - folder or project. - + + Usually these mismatch occurs if you are re-using nodes from another + folder or project. + #### How to repair? - - The repair action will regenerate new ids for + + The repair action will regenerate new ids for the invalid nodes to match the instance's folder. """) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py similarity index 86% rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py index 6b44a307d2..27606baa55 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_ids_unique.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py @@ -1,17 +1,16 @@ from collections import defaultdict -import pyblish.api +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + PublishValidationError, ValidatePipelineOrder, - PublishValidationError ) -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib - +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): +class ValidateNodeIdsUnique(plugin.MayaInstancePlugin): """Validate the nodes in the instance have a unique Colorbleed Id Here we ensure that what has been added to the instance is unique @@ -19,14 +18,13 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin): order = ValidatePipelineOrder label = 'Non Duplicate Instance Members (ID)' - hosts = ['maya'] families = ["model", "look", "rig", "yetiRig"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, - ayon_core.hosts.maya.api.action.GenerateUUIDsOnInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction, + ayon_maya.api.action.GenerateUUIDsOnInvalidAction] @classmethod def apply_settings(cls, project_settings): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py index 10cbbc9a88..184e4eaf15 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_node_no_ghosting.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py @@ -1,16 +1,14 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - - -class ValidateNodeNoGhosting(pyblish.api.InstancePlugin, +class ValidateNodeNoGhosting(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure nodes do not have ghosting enabled. @@ -24,10 +22,9 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ['maya'] families = ['model', 'rig'] label = "No Ghosting" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False _attributes = {'ghosting': 0} diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py index f961ec6e4a..506759516e 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_plugin_path_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py @@ -1,26 +1,23 @@ import os +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api.action import SelectInvalidAction +from ayon_maya.api.lib import pairwise +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.hosts.maya.api.lib import pairwise -from ayon_core.hosts.maya.api.action import SelectInvalidAction -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) - - -class ValidatePluginPathAttributes(pyblish.api.InstancePlugin, +class ValidatePluginPathAttributes(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """ Validate plug-in path attributes point to existing file paths. """ order = ValidateContentsOrder - hosts = ['maya'] families = ["workfile"] label = "Plug-in Path Attributes" actions = [SelectInvalidAction] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py index 117f7df822..fd1a9ad9e4 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_image_rule.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py @@ -1,18 +1,16 @@ import os -import pyblish.api - -from maya import cmds - from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, RepairAction, ValidateContentsOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateRenderImageRule(pyblish.api.InstancePlugin, +class ValidateRenderImageRule(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates Maya Workpace "images" file rule matches project settings. @@ -24,7 +22,6 @@ class ValidateRenderImageRule(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Images File Rule (Workspace)" - hosts = ["maya"] families = ["renderlayer"] actions = [RepairAction] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py similarity index 82% rename from client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py index 41c0fa4807..083b21b819 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_no_default_cameras.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py @@ -1,24 +1,21 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) - - -class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin, +class ValidateRenderNoDefaultCameras(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure no default (startup) cameras are to be rendered.""" order = ValidateContentsOrder - hosts = ['maya'] families = ['renderlayer'] label = "No Default Cameras Renderable" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py similarity index 87% rename from client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py index e186d74b89..6856b9a0f1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_render_single_camera.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py @@ -1,19 +1,18 @@ -import re import inspect +import re -import pyblish.api +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api.lib_rendersettings import RenderSettings +from ayon_maya.api import plugin from maya import cmds -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) - -class ValidateRenderSingleCamera(pyblish.api.InstancePlugin, +class ValidateRenderSingleCamera(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate renderable camera count for layer and token. @@ -23,10 +22,9 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Render Single Camera" - hosts = ['maya'] families = ["renderlayer", "vrayscene"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False R_CAMERA_TOKEN = re.compile(r'%c|', re.IGNORECASE) @@ -77,8 +75,8 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin, Your render cameras are misconfigured. You may have no render camera set or have multiple cameras with a render filename prefix that does not include the `` token. - + See the logs for more details about the cameras. - + """ ) diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py index 910e336fc1..16350cfa08 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py @@ -1,13 +1,14 @@ import ayon_api +import ayon_maya.api.action import pyblish.api - -import ayon_core.hosts.maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin, + +class ValidateRenderLayerAOVs(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate created AOVs / RenderElement is registered in the database @@ -26,9 +27,8 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin, order = pyblish.api.ValidatorOrder + 0.1 label = "Render Passes / AOVs Are Registered" - hosts = ["maya"] families = ["renderlayer"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py similarity index 98% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py index 7badfdc027..7b21bf6a14 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rendersettings.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py @@ -3,17 +3,16 @@ import re from collections import OrderedDict -from maya import cmds, mel - -import pyblish.api from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.lib_rendersettings import RenderSettings +from ayon_maya.api import lib +from ayon_maya.api.lib_rendersettings import RenderSettings +from ayon_maya.api import plugin +from maya import cmds, mel def convert_to_int_or_float(string_value): @@ -38,7 +37,7 @@ def get_redshift_image_format_labels(): return mel.eval("{0}={0}".format(var)) -class ValidateRenderSettings(pyblish.api.InstancePlugin, +class ValidateRenderSettings(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates the global render settings diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py index d822dca288..58d2ad3030 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_resolution.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py @@ -1,21 +1,21 @@ import pyblish.api from ayon_core.pipeline import ( + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin ) -from maya import cmds from ayon_core.pipeline.publish import RepairAction -from ayon_core.hosts.maya.api import lib -from ayon_core.hosts.maya.api.lib import reset_scene_resolution +from ayon_maya.api import lib +from ayon_maya.api.lib import reset_scene_resolution +from ayon_maya.api import plugin +from maya import cmds -class ValidateResolution(pyblish.api.InstancePlugin, +class ValidateResolution(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate the render resolution setting aligned with DB""" order = pyblish.api.ValidatorOrder families = ["renderlayer"] - hosts = ["maya"] label = "Validate Resolution" actions = [RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_resources.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py index 725e86450d..0ec51d909c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_resources.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py @@ -1,14 +1,14 @@ import os from collections import defaultdict -import pyblish.api from ayon_core.pipeline.publish import ( + PublishValidationError, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api import plugin -class ValidateResources(pyblish.api.InstancePlugin): +class ValidateResources(plugin.MayaInstancePlugin): """Validates mapped resources. These are external files to the current application, for example diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_review.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py similarity index 91% rename from client/ayon_core/hosts/maya/plugins/publish/validate_review.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py index fcfd851368..76f61dc3e5 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_review.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py @@ -1,11 +1,10 @@ -import pyblish.api - from ayon_core.pipeline.publish import ( ValidateContentsOrder, PublishValidationError ) +from ayon_maya.api import plugin -class ValidateReview(pyblish.api.InstancePlugin): +class ValidateReview(plugin.MayaInstancePlugin): """Validate review.""" order = ValidateContentsOrder diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py index f05e2b7311..ada2ce045b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_contents.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py @@ -1,14 +1,14 @@ -import pyblish.api -from maya import cmds -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateRigContents(pyblish.api.InstancePlugin, +class ValidateRigContents(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure rig contains pipeline-critical content @@ -20,9 +20,8 @@ class ValidateRigContents(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Rig Contents" - hosts = ["maya"] families = ["rig"] - action = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + action = [ayon_maya.api.action.SelectInvalidAction] optional = True accepted_output = ["mesh", "transform"] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py index 814ff50177..fed78df2da 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py @@ -1,18 +1,16 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + RepairAction, + ValidateContentsOrder, +) +from ayon_maya.api.lib import undo_chunk +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - RepairAction, - PublishValidationError, - OptionalPyblishPluginMixin -) -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api.lib import undo_chunk - - -class ValidateRigControllers(pyblish.api.InstancePlugin, +class ValidateRigControllers(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate rig controllers. @@ -33,11 +31,10 @@ class ValidateRigControllers(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder + 0.05 label = "Rig Controllers" - hosts = ["maya"] families = ["rig"] optional = True actions = [RepairAction, - ayon_core.hosts.maya.api.action.SelectInvalidAction] + ayon_maya.api.action.SelectInvalidAction] # Default controller values CONTROLLER_DEFAULTS = { diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py index ea2de81036..06691f4bd3 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py @@ -1,19 +1,16 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + RepairAction, + ValidateContentsOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - RepairAction, - PublishValidationError, - OptionalPyblishPluginMixin -) - -from ayon_core.hosts.maya.api import lib -import ayon_core.hosts.maya.api.action - - -class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin, +class ValidateRigControllersArnoldAttributes(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate rig control curves have no keyable arnold attributes. @@ -35,11 +32,10 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder + 0.05 label = "Rig Controllers (Arnold Attributes)" - hosts = ["maya"] families = ["rig"] optional = False actions = [RepairAction, - ayon_core.hosts.maya.api.action.SelectInvalidAction] + ayon_maya.api.action.SelectInvalidAction] attributes = [ "rcurve", diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py similarity index 81% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py index 78cc3f5938..f0593ed7bc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_joints_hidden.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py @@ -1,18 +1,16 @@ -from maya import cmds - -import pyblish.api - -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds -class ValidateRigJointsHidden(pyblish.api.InstancePlugin, +class ValidateRigJointsHidden(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate all joints are hidden visually. @@ -25,10 +23,9 @@ class ValidateRigJointsHidden(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ['maya'] families = ['rig'] label = "Joints Hidden" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py index d94ddc5f2a..e5f7a5b204 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py @@ -1,20 +1,18 @@ +import ayon_maya.api.action import maya.cmds as cmds - -import pyblish.api - -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishXmlValidationError, RepairAction, ValidateContentsOrder, - PublishXmlValidationError, - OptionalPyblishPluginMixin, + apply_plugin_settings_automatically, get_plugin_settings, - apply_plugin_settings_automatically ) +from ayon_maya.api import lib +from ayon_maya.api import plugin -class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin, +class ValidateRigOutSetNodeIds(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate if deformed shapes have related IDs to the original shapes. @@ -27,10 +25,9 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin, order = ValidateContentsOrder families = ["rig"] - hosts = ['maya'] label = 'Rig Out Set Node Ids' actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, + ayon_maya.api.action.SelectInvalidAction, RepairAction ] allow_history_only = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py index d04006f013..064c83c0b9 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_rig_output_ids.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py @@ -1,16 +1,14 @@ from collections import defaultdict -from maya import cmds - -import pyblish.api - -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api.lib import get_id, set_id +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api.lib import get_id, set_id +from ayon_maya.api import plugin +from maya import cmds def get_basename(node): @@ -18,7 +16,7 @@ def get_basename(node): return node.rsplit("|", 1)[-1].rsplit(":", 1)[-1] -class ValidateRigOutputIds(pyblish.api.InstancePlugin): +class ValidateRigOutputIds(plugin.MayaInstancePlugin): """Validate rig output ids. Ids must share the same id as similarly named nodes in the scene. This is @@ -27,10 +25,9 @@ class ValidateRigOutputIds(pyblish.api.InstancePlugin): """ order = ValidateContentsOrder + 0.05 label = "Rig Output Ids" - hosts = ["maya"] families = ["rig"] actions = [RepairAction, - ayon_core.hosts.maya.api.action.SelectInvalidAction] + ayon_maya.api.action.SelectInvalidAction] @classmethod def apply_settings(cls, project_settings): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py index c7d5de2050..cd36f98dfb 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_scene_set_workspace.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py @@ -1,10 +1,11 @@ import os import maya.cmds as cmds -import pyblish.api - from ayon_core.pipeline.publish import ( - PublishValidationError, ValidatePipelineOrder) + PublishValidationError, + ValidatePipelineOrder, +) +from ayon_maya.api import plugin def is_subdir(path, root_dir): @@ -26,11 +27,10 @@ def is_subdir(path, root_dir): return True -class ValidateSceneSetWorkspace(pyblish.api.ContextPlugin): +class ValidateSceneSetWorkspace(plugin.MayaContextPlugin): """Validate the scene is inside the currently set Maya workspace""" order = ValidatePipelineOrder - hosts = ['maya'] label = 'Maya Workspace Set' def process(self, context): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py similarity index 83% rename from client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py index f88e33fdfb..26245435eb 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_setdress_root.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py @@ -1,16 +1,15 @@ -import pyblish.api from ayon_core.pipeline.publish import ( + PublishValidationError, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api import plugin -class ValidateSetdressRoot(pyblish.api.InstancePlugin): +class ValidateSetdressRoot(plugin.MayaInstancePlugin): """Validate if set dress top root node is published.""" order = ValidateContentsOrder label = "SetDress Root" - hosts = ["maya"] families = ["setdress"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py index 09c17202c5..45d7ee1c8b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py @@ -1,14 +1,16 @@ import re -import pyblish.api +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder) - -class ValidateShaderName(pyblish.api.InstancePlugin, +class ValidateShaderName(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate shader name assigned. @@ -18,9 +20,8 @@ class ValidateShaderName(pyblish.api.InstancePlugin, optional = True order = ValidateContentsOrder families = ["look"] - hosts = ['maya'] label = 'Validate Shaders Name' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] regex = r'(?P.*)_(.*)_SHD' # The default connections to check diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py index c4c4c909d3..4e4f98d755 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_default_names.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py @@ -1,23 +1,21 @@ import re -from maya import cmds - -import pyblish.api - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - RepairAction, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + RepairAction, + ValidateContentsOrder, ) +from ayon_maya.api import plugin +from maya import cmds def short_name(node): return node.rsplit("|", 1)[-1].rsplit(":", 1)[-1] -class ValidateShapeDefaultNames(pyblish.api.InstancePlugin, +class ValidateShapeDefaultNames(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates that Shape names are using Maya's default format. @@ -43,7 +41,7 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin, families = ['model'] optional = True label = "Shape Default Naming" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py index 52ce3c5436..a9c3e861f0 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_render_stats.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py @@ -1,25 +1,22 @@ -import pyblish.api - -from maya import cmds - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, RepairAction, ValidateMeshOrder, - PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateShapeRenderStats(pyblish.api.InstancePlugin, +class ValidateShapeRenderStats(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Ensure all render stats are set to the default values.""" order = ValidateMeshOrder - hosts = ['maya'] families = ['model'] label = 'Shape Default Render Stats' - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction, + actions = [ayon_maya.api.action.SelectInvalidAction, RepairAction] defaults = {'castsShadows': 1, diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py index 6c89258085..8c11009374 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_shape_zero.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py @@ -1,18 +1,16 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + RepairAction, + ValidateContentsOrder, +) +from ayon_maya.api import lib +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.hosts.maya.api import lib -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - RepairAction, - PublishValidationError, - OptionalPyblishPluginMixin -) - - -class ValidateShapeZero(pyblish.api.InstancePlugin, +class ValidateShapeZero(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Shape components may not have any "tweak" values @@ -21,11 +19,10 @@ class ValidateShapeZero(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["model"] label = "Shape Zero (Freeze)" actions = [ - ayon_core.hosts.maya.api.action.SelectInvalidAction, + ayon_maya.api.action.SelectInvalidAction, RepairAction ] optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py index f5d73553d3..0a760e2acc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_single_assembly.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py @@ -1,11 +1,11 @@ -import pyblish.api from ayon_core.pipeline.publish import ( + PublishValidationError, ValidateContentsOrder, - PublishValidationError ) +from ayon_maya.api import plugin -class ValidateSingleAssembly(pyblish.api.InstancePlugin): +class ValidateSingleAssembly(plugin.MayaInstancePlugin): """Ensure the content of the instance is grouped in a single hierarchy The instance must have a single root node containing all the content. @@ -21,7 +21,6 @@ class ValidateSingleAssembly(pyblish.api.InstancePlugin): """ order = ValidateContentsOrder - hosts = ['maya'] families = ['rig'] label = 'Single Assembly' diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py index 172453f1ef..9904fdce22 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_hierarchy.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py @@ -1,21 +1,19 @@ # -*- coding: utf-8 -*- -import pyblish.api from ayon_core.pipeline.publish import ( - ValidateContentsOrder, + OptionalPyblishPluginMixin, PublishXmlValidationError, - OptionalPyblishPluginMixin + ValidateContentsOrder, ) - +from ayon_maya.api import plugin from maya import cmds -class ValidateSkeletalMeshHierarchy(pyblish.api.InstancePlugin, +class ValidateSkeletalMeshHierarchy(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates that nodes has common root.""" order = ValidateContentsOrder - hosts = ["maya"] families = ["skeletalMesh"] label = "Skeletal Mesh Top Node" optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py similarity index 88% rename from client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py index cc25e769e6..7b2b005e9c 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeletalmesh_triangulated.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py @@ -1,24 +1,19 @@ # -*- coding: utf-8 -*- -import pyblish.api -from ayon_core.hosts.maya.api.action import ( - SelectInvalidAction, -) from ayon_core.pipeline.publish import ( + PublishValidationError, RepairAction, ValidateContentsOrder, - PublishValidationError ) - - +from ayon_maya.api.action import SelectInvalidAction +from ayon_maya.api import plugin from maya import cmds -class ValidateSkeletalMeshTriangulated(pyblish.api.InstancePlugin): +class ValidateSkeletalMeshTriangulated(plugin.MayaInstancePlugin): """Validates that the geometry has been triangulated.""" order = ValidateContentsOrder - hosts = ["maya"] families = ["skeletalMesh"] label = "Skeletal Mesh Triangulated" optional = True diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py similarity index 90% rename from client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py index 9fbe0f440b..4e0dc38a36 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skeleton_top_group_hierarchy.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py @@ -1,17 +1,15 @@ # -*- coding: utf-8 -*- """Plugin for validating naming conventions.""" +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - - -class ValidateSkeletonTopGroupHierarchy(pyblish.api.InstancePlugin, +class ValidateSkeletonTopGroupHierarchy(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates top group hierarchy in the SETs Make sure the object inside the SETs are always top diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py similarity index 92% rename from client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py index a548e12f33..32015a57bc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py @@ -1,16 +1,15 @@ from maya import cmds -import pyblish.api - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( ValidateContentsOrder, OptionalPyblishPluginMixin, PublishValidationError ) +from ayon_maya.api import plugin -class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin, +class ValidateSkinclusterDeformerSet(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate skinClusters on meshes have valid member relationships. @@ -21,10 +20,9 @@ class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ['maya'] families = ['fbx'] label = "Skincluster Deformer Relationships" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py similarity index 86% rename from client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py index a276a5b644..303885d907 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_step_size.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py @@ -1,14 +1,13 @@ -import pyblish.api - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateStepSize(pyblish.api.InstancePlugin, +class ValidateStepSize(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates the step size for the instance is in a valid range. @@ -21,7 +20,7 @@ class ValidateStepSize(pyblish.api.InstancePlugin, families = ['camera', 'pointcache', 'animation'] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False MIN = 0.01 MAX = 1.0 diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py similarity index 94% rename from client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py index e565866778..3a60bc7aef 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_naming_suffix.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py @@ -1,19 +1,18 @@ # -*- coding: utf-8 -*- """Plugin for validating naming conventions.""" import json + +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - - -class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin, +class ValidateTransformNamingSuffix(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates transform suffix based on the type of its children shapes. @@ -36,11 +35,10 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["model"] optional = True label = "Suffix Naming Conventions" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] SUFFIX_NAMING_TABLE = json.dumps({ "mesh": ["_GEO", "_GES", "_GEP", "_OSD"], "nurbsCurve": ["_CRV"], diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py index cd96ebb10d..e251572c0d 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_transform_zero.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py @@ -1,17 +1,16 @@ import inspect -from maya import cmds -import pyblish.api - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin + ValidateContentsOrder, ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateTransformZero(pyblish.api.InstancePlugin, +class ValidateTransformZero(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Transforms can't have any values @@ -22,10 +21,9 @@ class ValidateTransformZero(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["model"] label = "Transform Zero (Freeze)" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] _identity = [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, @@ -86,7 +84,7 @@ class ValidateTransformZero(pyblish.api.InstancePlugin, def get_description(): return inspect.cleandoc("""### Transform can't have any values - The model publish allows no transformations. + The model publish allows no transformations. You must **freeze transformations** to continue. diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py similarity index 81% rename from client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py index 0066d70531..cbe5d2f647 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unique_names.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py @@ -1,15 +1,14 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - OptionalPyblishPluginMixin, - PublishValidationError -) - -class ValidateUniqueNames(pyblish.api.InstancePlugin, +class ValidateUniqueNames(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """transform names should be unique @@ -18,10 +17,9 @@ class ValidateUniqueNames(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder - hosts = ["maya"] families = ["model"] label = "Unique transform name" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = True @staticmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py similarity index 80% rename from client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py index 6440c00eae..f283150892 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py @@ -1,25 +1,22 @@ # -*- coding: utf-8 -*- - -from maya import cmds -import pyblish.api - +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateMeshOrder, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + ValidateMeshOrder, ) -import ayon_core.hosts.maya.api.action +from ayon_maya.api import plugin +from maya import cmds -class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin, +class ValidateUnrealMeshTriangulated(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate if mesh is made of triangles for Unreal Engine""" order = ValidateMeshOrder - hosts = ["maya"] families = ["staticMesh"] label = "Mesh is Triangulated" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] active = False @classmethod diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py similarity index 95% rename from client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py index 88b0ff0e71..dee6563989 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py @@ -2,17 +2,16 @@ """Validator for correct naming of Static Meshes.""" import re -import pyblish.api - -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + ValidateContentsOrder, ) +from ayon_maya.api import plugin -class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin, +class ValidateUnrealStaticMeshName(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate name of Unreal Static Mesh @@ -55,10 +54,9 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin, """ optional = True order = ValidateContentsOrder - hosts = ["maya"] families = ["staticMesh"] label = "Unreal Static Mesh Name" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] regex_mesh = r"(?P.*))" regex_collision = r"(?P.*)" diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py similarity index 86% rename from client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py index f7acd41cea..d970eb8020 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_up_axis.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py @@ -1,24 +1,21 @@ # -*- coding: utf-8 -*- - -from maya import cmds -import pyblish.api - from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - RepairAction, OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, + RepairAction, + ValidateContentsOrder, ) +from ayon_maya.api import plugin +from maya import cmds -class ValidateUnrealUpAxis(pyblish.api.ContextPlugin, +class ValidateUnrealUpAxis(plugin.MayaContextPlugin, OptionalPyblishPluginMixin): """Validate if Z is set as up axis in Maya""" optional = True active = False order = ValidateContentsOrder - hosts = ["maya"] families = ["staticMesh"] label = "Unreal Up-Axis check" actions = [RepairAction] diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py similarity index 84% rename from client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py index 1fdb476dba..b694b890fc 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py @@ -1,15 +1,14 @@ -import pyblish.api - -from ayon_core.hosts.maya.api.lib import iter_visible_nodes_in_range -import ayon_core.hosts.maya.api.action +import ayon_maya.api.action from ayon_core.pipeline.publish import ( - ValidateContentsOrder, + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin + ValidateContentsOrder, ) +from ayon_maya.api.lib import iter_visible_nodes_in_range +from ayon_maya.api import plugin -class ValidateAlembicVisibleOnly(pyblish.api.InstancePlugin, +class ValidateAlembicVisibleOnly(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validates at least a single node is visible in frame range. @@ -19,9 +18,8 @@ class ValidateAlembicVisibleOnly(pyblish.api.InstancePlugin, """ order = ValidateContentsOrder + 0.05 label = "Alembic Visible Only" - hosts = ["maya"] families = ["pointcache", "animation"] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py similarity index 84% rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py index db78212658..7cf064f993 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py @@ -1,15 +1,14 @@ -from maya import cmds - import pyblish.api from ayon_core.pipeline.publish import PublishValidationError +from ayon_maya.api import plugin +from maya import cmds -class ValidateVray(pyblish.api.InstancePlugin): +class ValidateVray(plugin.MayaInstancePlugin): """Validate general Vray setup.""" order = pyblish.api.ValidatorOrder label = 'VRay' - hosts = ["maya"] families = ["vrayproxy"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py index b3978b8483..0338798e3f 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py @@ -1,17 +1,16 @@ -import pyblish.api -from maya import cmds - -from ayon_core.hosts.maya.api import lib from ayon_core.pipeline.publish import ( KnownPublishError, + OptionalPyblishPluginMixin, PublishValidationError, RepairAction, ValidateContentsOrder, - OptionalPyblishPluginMixin ) +from ayon_maya.api import lib +from ayon_maya.api import plugin +from maya import cmds -class ValidateVRayDistributedRendering(pyblish.api.InstancePlugin, +class ValidateVRayDistributedRendering(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate V-Ray Distributed Rendering is ignored in batch mode. diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py index 9df5fb8488..a330866e9b 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py @@ -1,17 +1,18 @@ # -*- coding: utf-8 -*- """Validate if there are AOVs pulled from references.""" -import pyblish.api import types + +import pyblish.api +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + RepairContextAction, +) +from ayon_maya.api import plugin from maya import cmds -from ayon_core.pipeline.publish import ( - RepairContextAction, - OptionalPyblishPluginMixin, - PublishValidationError -) - -class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin, +class ValidateVrayReferencedAOVs(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate whether the V-Ray Render Elements (AOVs) include references. @@ -23,7 +24,6 @@ class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin, order = pyblish.api.ValidatorOrder label = 'VRay Referenced AOVs' - hosts = ['maya'] families = ['renderlayer'] actions = [RepairContextAction] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py index a3d93dd9c0..a4b34db2a1 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vray_translator_settings.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py @@ -1,18 +1,17 @@ # -*- coding: utf-8 -*- """Validate VRay Translator settings.""" -import pyblish.api from ayon_core.pipeline.publish import ( - context_plugin_should_run, + OptionalPyblishPluginMixin, + PublishValidationError, RepairContextAction, ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin + context_plugin_should_run, ) - +from ayon_maya.api import plugin from maya import cmds -class ValidateVRayTranslatorEnabled(pyblish.api.ContextPlugin, +class ValidateVRayTranslatorEnabled(plugin.MayaContextPlugin, OptionalPyblishPluginMixin): """Validate VRay Translator settings for extracting vrscenes.""" diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py index 0288d4b865..67d656b183 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py @@ -1,17 +1,16 @@ import pyblish.api - from ayon_core.pipeline.publish import ( OptionalPyblishPluginMixin, - PublishValidationError + PublishValidationError, ) +from ayon_maya.api import plugin -class ValidateVrayProxy(pyblish.api.InstancePlugin, +class ValidateVrayProxy(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): order = pyblish.api.ValidatorOrder label = "VRay Proxy Settings" - hosts = ["maya"] families = ["vrayproxy"] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py similarity index 82% rename from client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py index 6732d09202..cfb17cda55 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_vrayproxy_members.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py @@ -1,24 +1,21 @@ +import ayon_maya.api.action import pyblish.api - +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, +) +from ayon_maya.api import plugin from maya import cmds -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - PublishValidationError, - OptionalPyblishPluginMixin -) - - -class ValidateVrayProxyMembers(pyblish.api.InstancePlugin, +class ValidateVrayProxyMembers(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate whether the V-Ray Proxy instance has shape members""" order = pyblish.api.ValidatorOrder label = 'VRay Proxy Members' - hosts = ['maya'] families = ['vrayproxy'] - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py index 7e0f01c482..050165db01 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_xgen.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py @@ -1,18 +1,17 @@ import json import maya.cmds as cmds -import xgenm - import pyblish.api +import xgenm from ayon_core.pipeline.publish import PublishValidationError +from ayon_maya.api import plugin -class ValidateXgen(pyblish.api.InstancePlugin): +class ValidateXgen(plugin.MayaInstancePlugin): """Validate Xgen data.""" label = "Validate Xgen" order = pyblish.api.ValidatorOrder - host = ["maya"] families = ["xgen"] def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py similarity index 96% rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py index 086cb7b1f5..ce6410deaa 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_renderscript_callbacks.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py @@ -1,14 +1,13 @@ +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) - -class ValidateYetiRenderScriptCallbacks(pyblish.api.InstancePlugin, +class ValidateYetiRenderScriptCallbacks(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Check if the render script callbacks will be used during the rendering @@ -27,7 +26,6 @@ class ValidateYetiRenderScriptCallbacks(pyblish.api.InstancePlugin, order = ValidateContentsOrder label = "Yeti Render Script Callbacks" - hosts = ["maya"] families = ["renderlayer"] optional = False diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py similarity index 89% rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py index 84614fc0be..a7f272c1ec 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py @@ -1,16 +1,17 @@ import inspect -import pyblish.api +import ayon_maya.api.action import maya.cmds as cmds -import ayon_core.hosts.maya.api.action +import pyblish.api from ayon_core.pipeline.publish import ( - RepairAction, + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin + RepairAction, ) +from ayon_maya.api import plugin -class ValidateYetiRigCacheState(pyblish.api.InstancePlugin, +class ValidateYetiRigCacheState(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate the I/O attributes of the node @@ -22,10 +23,9 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin, order = pyblish.api.ValidatorOrder label = "Yeti Rig Cache State" - hosts = ["maya"] families = ["yetiRig"] actions = [RepairAction, - ayon_core.hosts.maya.api.action.SelectInvalidAction] + ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py similarity index 85% rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py index 77e189e37b..8c258b4455 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py @@ -1,24 +1,21 @@ +import ayon_maya.api.action +from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, + PublishValidationError, + ValidateContentsOrder, +) +from ayon_maya.api import plugin from maya import cmds -import pyblish.api -import ayon_core.hosts.maya.api.action -from ayon_core.pipeline.publish import ( - ValidateContentsOrder, - PublishValidationError, - OptionalPyblishPluginMixin -) - - -class ValidateYetiRigInputShapesInInstance(pyblish.api.InstancePlugin, +class ValidateYetiRigInputShapesInInstance(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate if all input nodes are part of the instance's hierarchy""" order = ValidateContentsOrder - hosts = ["maya"] families = ["yetiRig"] label = "Yeti Rig Input Shapes In Instance" - actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction] + actions = [ayon_maya.api.action.SelectInvalidAction] optional = False def process(self, instance): diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py similarity index 93% rename from client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py rename to server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py index 6bd2ebb753..fa0836e0ef 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/validate_yeti_rig_settings.py +++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py @@ -1,12 +1,12 @@ import pyblish.api - from ayon_core.pipeline.publish import ( + OptionalPyblishPluginMixin, PublishValidationError, - OptionalPyblishPluginMixin ) +from ayon_maya.api import plugin -class ValidateYetiRigSettings(pyblish.api.InstancePlugin, +class ValidateYetiRigSettings(plugin.MayaInstancePlugin, OptionalPyblishPluginMixin): """Validate Yeti Rig Settings have collected input connections. diff --git a/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py b/server_addon/maya/client/ayon_maya/plugins/workfile_build/load_placeholder.py similarity index 97% rename from client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py rename to server_addon/maya/client/ayon_maya/plugins/workfile_build/load_placeholder.py index b07c7e9a70..6cf38e591a 100644 --- a/client/ayon_core/hosts/maya/plugins/workfile_build/load_placeholder.py +++ b/server_addon/maya/client/ayon_maya/plugins/workfile_build/load_placeholder.py @@ -4,12 +4,12 @@ from ayon_core.pipeline.workfile.workfile_template_builder import ( PlaceholderLoadMixin, LoadPlaceholderItem ) -from ayon_core.hosts.maya.api.lib import ( +from ayon_maya.api.lib import ( get_container_transforms, get_node_parent, get_node_index_under_parent ) -from ayon_core.hosts.maya.api.workfile_template_builder import ( +from ayon_maya.api.workfile_template_builder import ( MayaPlaceholderPlugin, ) diff --git a/client/ayon_core/hosts/maya/plugins/workfile_build/script_placeholder.py b/server_addon/maya/client/ayon_maya/plugins/workfile_build/script_placeholder.py similarity index 99% rename from client/ayon_core/hosts/maya/plugins/workfile_build/script_placeholder.py rename to server_addon/maya/client/ayon_maya/plugins/workfile_build/script_placeholder.py index 62e10ba023..ff54306220 100644 --- a/client/ayon_core/hosts/maya/plugins/workfile_build/script_placeholder.py +++ b/server_addon/maya/client/ayon_maya/plugins/workfile_build/script_placeholder.py @@ -1,6 +1,6 @@ from maya import cmds -from ayon_core.hosts.maya.api.workfile_template_builder import ( +from ayon_maya.api.workfile_template_builder import ( MayaPlaceholderPlugin ) from ayon_core.lib import NumberDef, TextDef, EnumDef diff --git a/client/ayon_core/hosts/maya/startup/userSetup.py b/server_addon/maya/client/ayon_maya/startup/userSetup.py similarity index 96% rename from client/ayon_core/hosts/maya/startup/userSetup.py rename to server_addon/maya/client/ayon_maya/startup/userSetup.py index 3112e2bf12..600864fd2b 100644 --- a/client/ayon_core/hosts/maya/startup/userSetup.py +++ b/server_addon/maya/client/ayon_maya/startup/userSetup.py @@ -2,7 +2,7 @@ import os from ayon_core.settings import get_project_settings from ayon_core.pipeline import install_host, get_current_project_name -from ayon_core.hosts.maya.api import MayaHost +from ayon_maya.api import MayaHost from maya import cmds diff --git a/client/ayon_core/hosts/maya/tools/__init__.py b/server_addon/maya/client/ayon_maya/tools/__init__.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/__init__.py rename to server_addon/maya/client/ayon_maya/tools/__init__.py diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/LICENSE b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/LICENSE similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/LICENSE rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/LICENSE diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/__init__.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/__init__.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/__init__.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/__init__.py diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/alembic.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/alembic.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/alembic.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/alembic.py diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/app.py similarity index 99% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/app.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/app.py index 44d8dfda21..2937b72934 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py +++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/app.py @@ -8,7 +8,7 @@ from qtpy import QtWidgets, QtCore from ayon_core import style from ayon_core.pipeline import get_current_project_name from ayon_core.tools.utils.lib import qt_app_context -from ayon_core.hosts.maya.api.lib import ( +from ayon_maya.api.lib import ( assign_look_by_version, get_main_window ) diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/arnold_standin.py similarity index 99% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/arnold_standin.py index a20880dffc..c285b857c7 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py +++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/arnold_standin.py @@ -7,7 +7,7 @@ from maya import cmds import ayon_api from ayon_core.pipeline import get_current_project_name -from ayon_core.hosts.maya import api +from ayon_maya import api from . import lib from .alembic import get_alembic_ids_cache diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/commands.py similarity index 99% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/commands.py index ad43a24385..54b1cff740 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py +++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/commands.py @@ -10,7 +10,7 @@ from ayon_core.pipeline import ( registered_host, get_current_project_name, ) -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib from .vray_proxies import get_alembic_ids_cache from . import arnold_standin diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/lib.py similarity index 98% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/lib.py index 78fded12a9..5417db26bc 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/lib.py +++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/lib.py @@ -11,7 +11,7 @@ from ayon_core.pipeline import ( loaders_from_representation, load_container ) -from ayon_core.hosts.maya.api import lib +from ayon_maya.api import lib log = logging.getLogger(__name__) diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/models.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/models.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/models.py diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/usd.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/usd.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/usd.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/usd.py diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/views.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/views.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/views.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/views.py diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/vray_proxies.py similarity index 98% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/vray_proxies.py index c1d9f019e4..6b451abb9a 100644 --- a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py +++ b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/vray_proxies.py @@ -7,7 +7,7 @@ from maya import cmds import ayon_api from ayon_core.pipeline import get_current_project_name -import ayon_core.hosts.maya.api.lib as maya_lib +import ayon_maya.api.lib as maya_lib from . import lib from .alembic import get_alembic_ids_cache diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py b/server_addon/maya/client/ayon_maya/tools/mayalookassigner/widgets.py similarity index 100% rename from client/ayon_core/hosts/maya/tools/mayalookassigner/widgets.py rename to server_addon/maya/client/ayon_maya/tools/mayalookassigner/widgets.py diff --git a/client/ayon_core/hosts/maya/vendor/python/capture.py b/server_addon/maya/client/ayon_maya/vendor/python/capture.py similarity index 100% rename from client/ayon_core/hosts/maya/vendor/python/capture.py rename to server_addon/maya/client/ayon_maya/vendor/python/capture.py diff --git a/server_addon/maya/package.py b/server_addon/maya/package.py index 4537c23eaa..0331fb2fb6 100644 --- a/server_addon/maya/package.py +++ b/server_addon/maya/package.py @@ -1,3 +1,7 @@ name = "maya" title = "Maya" -version = "0.1.20" +version = "0.2.1" + +ayon_required_addons = { + "core": ">0.3.2", +} diff --git a/client/ayon_core/hosts/photoshop/__init__.py b/server_addon/photoshop/client/ayon_photoshop/__init__.py similarity index 78% rename from client/ayon_core/hosts/photoshop/__init__.py rename to server_addon/photoshop/client/ayon_photoshop/__init__.py index cf21b7df75..e72c79c812 100644 --- a/client/ayon_core/hosts/photoshop/__init__.py +++ b/server_addon/photoshop/client/ayon_photoshop/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( PHOTOSHOP_ADDON_ROOT, PhotoshopAddon, @@ -6,6 +7,8 @@ from .addon import ( __all__ = ( + "__version__", + "PHOTOSHOP_ADDON_ROOT", "PhotoshopAddon", "get_launch_script_path", diff --git a/client/ayon_core/hosts/photoshop/addon.py b/server_addon/photoshop/client/ayon_photoshop/addon.py similarity index 94% rename from client/ayon_core/hosts/photoshop/addon.py rename to server_addon/photoshop/client/ayon_photoshop/addon.py index 65fe6a7cd1..d0fe638f15 100644 --- a/client/ayon_core/hosts/photoshop/addon.py +++ b/server_addon/photoshop/client/ayon_photoshop/addon.py @@ -1,11 +1,14 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + PHOTOSHOP_ADDON_ROOT = os.path.dirname(os.path.abspath(__file__)) class PhotoshopAddon(AYONAddon, IHostAddon): name = "photoshop" + version = __version__ host_name = "photoshop" def add_implementation_envs(self, env, _app): @@ -33,4 +36,3 @@ def get_launch_script_path(): return os.path.join( PHOTOSHOP_ADDON_ROOT, "api", "launch_script.py" ) - diff --git a/client/ayon_core/hosts/photoshop/api/README.md b/server_addon/photoshop/client/ayon_photoshop/api/README.md similarity index 97% rename from client/ayon_core/hosts/photoshop/api/README.md rename to server_addon/photoshop/client/ayon_photoshop/api/README.md index b391131a42..ef458dea16 100644 --- a/client/ayon_core/hosts/photoshop/api/README.md +++ b/server_addon/photoshop/client/ayon_photoshop/api/README.md @@ -17,7 +17,7 @@ ExManCmd /install {path to addon}/api/extension.zxp The easiest way to get the server and Photoshop launch is with: ``` -python -c ^"import ayon_core.hosts.photoshop;ayon_core.hosts.photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^" +python -c ^"import ayon_photoshop;ayon_photoshop.launch(""C:\Program Files\Adobe\Adobe Photoshop 2020\Photoshop.exe"")^" ``` `avalon.photoshop.launch` launches the application and server, and also closes the server when Photoshop exists. @@ -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/client/ayon_core/hosts/photoshop/api/__init__.py b/server_addon/photoshop/client/ayon_photoshop/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/photoshop/api/__init__.py rename to server_addon/photoshop/client/ayon_photoshop/api/__init__.py diff --git a/client/ayon_core/hosts/photoshop/api/extension.zxp b/server_addon/photoshop/client/ayon_photoshop/api/extension.zxp similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension.zxp rename to server_addon/photoshop/client/ayon_photoshop/api/extension.zxp diff --git a/client/ayon_core/hosts/photoshop/api/extension/.debug b/server_addon/photoshop/client/ayon_photoshop/api/extension/.debug similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/.debug rename to server_addon/photoshop/client/ayon_photoshop/api/extension/.debug diff --git a/client/ayon_core/hosts/photoshop/api/extension/CSXS/manifest.xml b/server_addon/photoshop/client/ayon_photoshop/api/extension/CSXS/manifest.xml similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/CSXS/manifest.xml rename to server_addon/photoshop/client/ayon_photoshop/api/extension/CSXS/manifest.xml diff --git a/client/ayon_core/hosts/photoshop/api/extension/client/CSInterface.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/client/CSInterface.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/client/CSInterface.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/client/CSInterface.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/client/client.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/client/client.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/client/client.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/client/client.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/client/loglevel.min.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/client/loglevel.min.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/client/loglevel.min.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/client/loglevel.min.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/client/wsrpc.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/client/wsrpc.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/client/wsrpc.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/client/wsrpc.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/client/wsrpc.min.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/client/wsrpc.min.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/client/wsrpc.min.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/client/wsrpc.min.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/host/JSX.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/host/JSX.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/host/JSX.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/host/JSX.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/host/index.jsx b/server_addon/photoshop/client/ayon_photoshop/api/extension/host/index.jsx similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/host/index.jsx rename to server_addon/photoshop/client/ayon_photoshop/api/extension/host/index.jsx diff --git a/client/ayon_core/hosts/photoshop/api/extension/host/json.js b/server_addon/photoshop/client/ayon_photoshop/api/extension/host/json.js similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/host/json.js rename to server_addon/photoshop/client/ayon_photoshop/api/extension/host/json.js diff --git a/client/ayon_core/hosts/photoshop/api/extension/icons/ayon_logo.png b/server_addon/photoshop/client/ayon_photoshop/api/extension/icons/ayon_logo.png similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/icons/ayon_logo.png rename to server_addon/photoshop/client/ayon_photoshop/api/extension/icons/ayon_logo.png diff --git a/client/ayon_core/hosts/photoshop/api/extension/index.html b/server_addon/photoshop/client/ayon_photoshop/api/extension/index.html similarity index 100% rename from client/ayon_core/hosts/photoshop/api/extension/index.html rename to server_addon/photoshop/client/ayon_photoshop/api/extension/index.html diff --git a/client/ayon_core/hosts/photoshop/api/launch_logic.py b/server_addon/photoshop/client/ayon_photoshop/api/launch_logic.py similarity index 99% rename from client/ayon_core/hosts/photoshop/api/launch_logic.py rename to server_addon/photoshop/client/ayon_photoshop/api/launch_logic.py index c388f93044..04401a0972 100644 --- a/client/ayon_core/hosts/photoshop/api/launch_logic.py +++ b/server_addon/photoshop/client/ayon_photoshop/api/launch_logic.py @@ -22,9 +22,9 @@ from ayon_core.pipeline.workfile import ( ) from ayon_core.pipeline.template_data import get_template_data_with_names from ayon_core.tools.utils import host_tools -from ayon_core.tools.adobe_webserver.app import WebServerTool from ayon_core.pipeline.context_tools import change_current_context +from .webserver import WebServerTool from .ws_stub import PhotoshopServerStub log = Logger.get_logger(__name__) diff --git a/client/ayon_core/hosts/photoshop/api/launch_script.py b/server_addon/photoshop/client/ayon_photoshop/api/launch_script.py similarity index 97% rename from client/ayon_core/hosts/photoshop/api/launch_script.py rename to server_addon/photoshop/client/ayon_photoshop/api/launch_script.py index bb4de80086..de7fc8ba48 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/api/lib.py b/server_addon/photoshop/client/ayon_photoshop/api/lib.py similarity index 97% rename from client/ayon_core/hosts/photoshop/api/lib.py rename to server_addon/photoshop/client/ayon_photoshop/api/lib.py index af14e6d02f..fd003919ce 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/api/panel.png b/server_addon/photoshop/client/ayon_photoshop/api/panel.png similarity index 100% rename from client/ayon_core/hosts/photoshop/api/panel.png rename to server_addon/photoshop/client/ayon_photoshop/api/panel.png diff --git a/client/ayon_core/hosts/photoshop/api/panel_failure.png b/server_addon/photoshop/client/ayon_photoshop/api/panel_failure.png similarity index 100% rename from client/ayon_core/hosts/photoshop/api/panel_failure.png rename to server_addon/photoshop/client/ayon_photoshop/api/panel_failure.png diff --git a/client/ayon_core/hosts/photoshop/api/pipeline.py b/server_addon/photoshop/client/ayon_photoshop/api/pipeline.py similarity index 99% rename from client/ayon_core/hosts/photoshop/api/pipeline.py rename to server_addon/photoshop/client/ayon_photoshop/api/pipeline.py index 27cfa5a7b5..d399bb25e2 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/api/plugin.py b/server_addon/photoshop/client/ayon_photoshop/api/plugin.py similarity index 100% rename from client/ayon_core/hosts/photoshop/api/plugin.py rename to server_addon/photoshop/client/ayon_photoshop/api/plugin.py diff --git a/server_addon/photoshop/client/ayon_photoshop/api/webserver.py b/server_addon/photoshop/client/ayon_photoshop/api/webserver.py new file mode 100644 index 0000000000..cd229c65ad --- /dev/null +++ b/server_addon/photoshop/client/ayon_photoshop/api/webserver.py @@ -0,0 +1,241 @@ +"""Webserver for communication with photoshop. + +Aiohttp (Asyncio) based websocket server used for communication with host +application. + +This webserver is started in spawned Python process that opens DCC during +its launch, waits for connection from DCC and handles communication going +forward. Server is closed before Python process is killed. +""" +import os +import logging +import urllib +import threading +import asyncio +import socket + +from aiohttp import web + +from wsrpc_aiohttp import WSRPCClient + +from ayon_core.pipeline import get_global_context + +log = logging.getLogger(__name__) + + +class WebServerTool: + """ + Basic POC implementation of asychronic websocket RPC server. + Uses class in external_app_1.py to mimic implementation for single + external application. + 'test_client' folder contains two test implementations of client + """ + _instance = None + + def __init__(self): + WebServerTool._instance = self + + self.client = None + self.handlers = {} + self.on_stop_callbacks = [] + + port = None + host_name = "localhost" + websocket_url = os.getenv("WEBSOCKET_URL") + if websocket_url: + parsed = urllib.parse.urlparse(websocket_url) + port = parsed.port + host_name = parsed.netloc.split(":")[0] + if not port: + port = 8098 # fallback + + self.port = port + self.host_name = host_name + + self.app = web.Application() + + # add route with multiple methods for single "external app" + self.webserver_thread = WebServerThread(self, self.port) + + def add_route(self, *args, **kwargs): + self.app.router.add_route(*args, **kwargs) + + def add_static(self, *args, **kwargs): + self.app.router.add_static(*args, **kwargs) + + def start_server(self): + if self.webserver_thread and not self.webserver_thread.is_alive(): + self.webserver_thread.start() + + def stop_server(self): + self.stop() + + async def send_context_change(self, host): + """ + Calls running webserver to inform about context change + + Used when new PS/AE should be triggered, + but one already running, without + this publish would point to old context. + """ + client = WSRPCClient(os.getenv("WEBSOCKET_URL"), + loop=asyncio.get_event_loop()) + await client.connect() + + context = get_global_context() + project_name = context["project_name"] + folder_path = context["folder_path"] + task_name = context["task_name"] + log.info("Sending context change to {}{}/{}".format( + project_name, folder_path, task_name + )) + + await client.call( + '{}.set_context'.format(host), + project=project_name, + folder=folder_path, + task=task_name + ) + await client.close() + + def port_occupied(self, host_name, port): + """ + Check if 'url' is already occupied. + + This could mean, that app is already running and we are trying open it + again. In that case, use existing running webserver. + Check here is easier than capturing exception from thread. + """ + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as con: + result = con.connect_ex((host_name, port)) == 0 + + if result: + print(f"Port {port} is already in use") + return result + + def call(self, func): + log.debug("websocket.call {}".format(func)) + future = asyncio.run_coroutine_threadsafe( + func, + self.webserver_thread.loop + ) + result = future.result() + return result + + @staticmethod + def get_instance(): + if WebServerTool._instance is None: + WebServerTool() + return WebServerTool._instance + + @property + def is_running(self): + if not self.webserver_thread: + return False + return self.webserver_thread.is_running + + def stop(self): + if not self.is_running: + return + try: + log.debug("Stopping websocket server") + self.webserver_thread.is_running = False + self.webserver_thread.stop() + except Exception: + log.warning( + "Error has happened during Killing websocket server", + exc_info=True + ) + + def thread_stopped(self): + for callback in self.on_stop_callbacks: + callback() + + +class WebServerThread(threading.Thread): + """ Listener for websocket rpc requests. + + It would be probably better to "attach" this to main thread (as for + example Harmony needs to run something on main thread), but currently + it creates separate thread and separate asyncio event loop + """ + def __init__(self, module, port): + super(WebServerThread, self).__init__() + + self.is_running = False + self.port = port + self.module = module + self.loop = None + self.runner = None + self.site = None + self.tasks = [] + + def run(self): + self.is_running = True + + try: + log.info("Starting web server") + self.loop = asyncio.new_event_loop() # create new loop for thread + asyncio.set_event_loop(self.loop) + + self.loop.run_until_complete(self.start_server()) + + websocket_url = "ws://localhost:{}/ws".format(self.port) + + log.debug( + "Running Websocket server on URL: \"{}\"".format(websocket_url) + ) + + asyncio.ensure_future(self.check_shutdown(), loop=self.loop) + self.loop.run_forever() + except Exception: + self.is_running = False + log.warning( + "Websocket Server service has failed", exc_info=True + ) + raise + finally: + self.loop.close() # optional + + self.is_running = False + self.module.thread_stopped() + log.info("Websocket server stopped") + + async def start_server(self): + """ Starts runner and TCPsite """ + self.runner = web.AppRunner(self.module.app) + await self.runner.setup() + self.site = web.TCPSite(self.runner, 'localhost', self.port) + await self.site.start() + + def stop(self): + """Sets is_running flag to false, 'check_shutdown' shuts server down""" + self.is_running = False + + async def check_shutdown(self): + """ Future that is running and checks if server should be running + periodically. + """ + while self.is_running: + while self.tasks: + task = self.tasks.pop(0) + log.debug("waiting for task {}".format(task)) + await task + log.debug("returned value {}".format(task.result)) + + await asyncio.sleep(0.5) + + log.debug("Starting shutdown") + await self.site.stop() + log.debug("Site stopped") + await self.runner.cleanup() + log.debug("Runner stopped") + tasks = [task for task in asyncio.all_tasks() if + task is not asyncio.current_task()] + list(map(lambda task: task.cancel(), tasks)) # cancel all the tasks + results = await asyncio.gather(*tasks, return_exceptions=True) + log.debug(f'Finished awaiting cancelled tasks, results: {results}...') + await self.loop.shutdown_asyncgens() + # to really make sure everything else has time to stop + await asyncio.sleep(0.07) + self.loop.stop() diff --git a/client/ayon_core/hosts/photoshop/api/ws_stub.py b/server_addon/photoshop/client/ayon_photoshop/api/ws_stub.py similarity index 99% rename from client/ayon_core/hosts/photoshop/api/ws_stub.py rename to server_addon/photoshop/client/ayon_photoshop/api/ws_stub.py index 36fe0af2f8..3619fa4b7a 100644 --- a/client/ayon_core/hosts/photoshop/api/ws_stub.py +++ b/server_addon/photoshop/client/ayon_photoshop/api/ws_stub.py @@ -6,7 +6,7 @@ import json import attr from wsrpc_aiohttp import WebSocketAsync -from ayon_core.tools.adobe_webserver.app import WebServerTool +from .webserver import WebServerTool @attr.s diff --git a/client/ayon_core/hosts/photoshop/hooks/pre_launch_args.py b/server_addon/photoshop/client/ayon_photoshop/hooks/pre_launch_args.py similarity index 97% rename from client/ayon_core/hosts/photoshop/hooks/pre_launch_args.py rename to server_addon/photoshop/client/ayon_photoshop/hooks/pre_launch_args.py index 70f8fc730f..ff60c2f40d 100644 --- a/client/ayon_core/hosts/photoshop/hooks/pre_launch_args.py +++ b/server_addon/photoshop/client/ayon_photoshop/hooks/pre_launch_args.py @@ -7,7 +7,7 @@ from ayon_core.lib import ( is_using_ayon_console, ) from ayon_applications import PreLaunchHook, LaunchTypes -from ayon_core.hosts.photoshop import get_launch_script_path +from ayon_photoshop import get_launch_script_path def get_launch_kwargs(kwargs): diff --git a/client/ayon_core/hosts/photoshop/lib.py b/server_addon/photoshop/client/ayon_photoshop/lib.py similarity index 97% rename from client/ayon_core/hosts/photoshop/lib.py rename to server_addon/photoshop/client/ayon_photoshop/lib.py index dd227c5d81..9dc90953c5 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_flatten_image.py similarity index 97% rename from client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/create/create_flatten_image.py index a3bc77c640..a467a5ecaa 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/create/create_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_image.py similarity index 98% rename from client/ayon_core/hosts/photoshop/plugins/create/create_image.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/create/create_image.py index a44c3490c6..0170306301 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/create/create_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_review.py similarity index 94% rename from client/ayon_core/hosts/photoshop/plugins/create/create_review.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/create/create_review.py index 229b736801..60c64b3831 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/create/create_workfile.py similarity index 94% rename from client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/create/create_workfile.py index da0c9d1d12..ce44a1ad2d 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/load/load_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image.py similarity index 95% rename from client/ayon_core/hosts/photoshop/plugins/load/load_image.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image.py index d71067615e..e3d80f6957 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/load/load_image_from_sequence.py b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image_from_sequence.py similarity index 95% rename from client/ayon_core/hosts/photoshop/plugins/load/load_image_from_sequence.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/load/load_image_from_sequence.py index dd14543f3e..f69dce26f6 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/load/load_reference.py b/server_addon/photoshop/client/ayon_photoshop/plugins/load/load_reference.py similarity index 95% rename from client/ayon_core/hosts/photoshop/plugins/load/load_reference.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/load/load_reference.py index b563faff82..21076f6a4f 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/closePS.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/closePS.py similarity index 91% rename from client/ayon_core/hosts/photoshop/plugins/publish/closePS.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/closePS.py index 68c3b5b249..2cdc9fa1e8 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image.py similarity index 98% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image.py index adbe02eb74..23a71bdf46 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image_refresh.py similarity index 94% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image_refresh.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_image_refresh.py index 7a5f297c89..108b65232a 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_review.py similarity index 98% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_review.py index d7267d253a..8b84e69309 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_workfile.py similarity index 98% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_auto_workfile.py index af74c76a15..1bf7c1a600 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_batch_data.py similarity index 100% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_batch_data.py diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py similarity index 99% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_color_coded_instances.py index e8f7c7e3df..072eb82179 100644 --- a/client/ayon_core/hosts/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): @@ -33,6 +33,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder hosts = ["photoshop"] targets = ["automated"] + settings_category = "photoshop" # configurable by Settings color_code_mapping = [] diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_current_file.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_current_file.py similarity index 88% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_current_file.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_current_file.py index 74353d452f..02f2217f75 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_extension_version.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_extension_version.py similarity index 97% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_extension_version.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_extension_version.py index 2d24a8de15..90415e9245 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_image.py similarity index 91% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_image.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_image.py index bfd73bfc5f..ed6af6f7d3 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_published_version.py similarity index 100% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_published_version.py diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_review.py similarity index 94% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_review.py index 1ffbadf022..d9a29f9b74 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_review.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_review.py @@ -16,6 +16,7 @@ class CollectReview(pyblish.api.ContextPlugin): label = "Collect Review" hosts = ["photoshop"] order = pyblish.api.CollectorOrder + 0.1 + settings_category = "photoshop" def process(self, context): for instance in context: diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_version.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_version.py similarity index 96% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_version.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_version.py index cda71d8643..bc9f05ab50 100644 --- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_version.py +++ b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_version.py @@ -22,6 +22,7 @@ class CollectVersion(pyblish.api.InstancePlugin): hosts = ["photoshop"] families = ["image", "review", "workfile"] + settings_category = "photoshop" def process(self, instance): workfile_version = instance.context.data["version"] diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_workfile.py similarity index 100% rename from client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/collect_workfile.py diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py similarity index 97% rename from client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_image.py index 7290a1437e..33599d37bb 100644 --- a/client/ayon_core/hosts/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): @@ -22,6 +22,7 @@ class ExtractImage(pyblish.api.ContextPlugin): families = ["image", "background"] formats = ["png", "jpg"] + settings_category = "photoshop" def process(self, context): stub = photoshop.stub() diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py similarity index 99% rename from client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_review.py index 3497e7ad75..0f36d31648 100644 --- a/client/ayon_core/hosts/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): @@ -29,6 +29,7 @@ class ExtractReview(publish.Extractor): label = "Extract Review" hosts = ["photoshop"] families = ["review"] + settings_category = "photoshop" # Extract Options jpg_options = None diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_save_scene.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_save_scene.py similarity index 85% rename from client/ayon_core/hosts/photoshop/plugins/publish/extract_save_scene.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/extract_save_scene.py index 962c0722db..22ebbb739d 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/help/validate_instance_asset.xml b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/help/validate_instance_asset.xml similarity index 100% rename from client/ayon_core/hosts/photoshop/plugins/publish/help/validate_instance_asset.xml rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/help/validate_instance_asset.xml diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/help/validate_naming.xml b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/help/validate_naming.xml similarity index 100% rename from client/ayon_core/hosts/photoshop/plugins/publish/help/validate_naming.xml rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/help/validate_naming.xml diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/increment_workfile.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/increment_workfile.py similarity index 94% rename from client/ayon_core/hosts/photoshop/plugins/publish/increment_workfile.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/increment_workfile.py index 9b25a35ef5..b10645813a 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_instance_asset.py similarity index 97% rename from client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_instance_asset.py index c3a6822f32..36ba621dc2 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py b/server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py similarity index 97% rename from client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py rename to server_addon/photoshop/client/ayon_photoshop/plugins/publish/validate_naming.py index 13c6a54fd2..e5f826b07e 100644 --- a/client/ayon_core/hosts/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, @@ -16,6 +16,7 @@ class ValidateNamingRepair(pyblish.api.Action): label = "Repair" icon = "wrench" on = "failed" + settings_category = "photoshop" def process(self, context, plugin): diff --git a/client/ayon_core/hosts/photoshop/resources/template.psd b/server_addon/photoshop/client/ayon_photoshop/resources/template.psd similarity index 100% rename from client/ayon_core/hosts/photoshop/resources/template.psd rename to server_addon/photoshop/client/ayon_photoshop/resources/template.psd diff --git a/server_addon/photoshop/client/ayon_photoshop/version.py b/server_addon/photoshop/client/ayon_photoshop/version.py new file mode 100644 index 0000000000..31a969addf --- /dev/null +++ b/server_addon/photoshop/client/ayon_photoshop/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'photoshop' version.""" +__version__ = "0.2.1" diff --git a/server_addon/photoshop/client/pyproject.toml b/server_addon/photoshop/client/pyproject.toml new file mode 100644 index 0000000000..3beb76ba74 --- /dev/null +++ b/server_addon/photoshop/client/pyproject.toml @@ -0,0 +1,6 @@ +[project] +name="photoshop" +description="AYON Phostoshop addon." + +[ayon.runtimeDependencies] +wsrpc_aiohttp = "^3.1.1" # websocket server diff --git a/server_addon/photoshop/package.py b/server_addon/photoshop/package.py index 22043f951c..d04973ebc3 100644 --- a/server_addon/photoshop/package.py +++ b/server_addon/photoshop/package.py @@ -1,3 +1,10 @@ name = "photoshop" title = "Photoshop" -version = "0.1.3" +version = "0.2.1" + +client_dir = "ayon_photoshop" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/client/ayon_core/hosts/resolve/README.markdown b/server_addon/resolve/client/ayon_resolve/README.markdown similarity index 100% rename from client/ayon_core/hosts/resolve/README.markdown rename to server_addon/resolve/client/ayon_resolve/README.markdown diff --git a/client/ayon_core/hosts/resolve/RESOLVE_API_v18.5.1-build6.txt b/server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt similarity index 86% rename from client/ayon_core/hosts/resolve/RESOLVE_API_v18.5.1-build6.txt rename to server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt index 7d1d6edf61..a2f3fa6f73 100644 --- a/client/ayon_core/hosts/resolve/RESOLVE_API_v18.5.1-build6.txt +++ b/server_addon/resolve/client/ayon_resolve/RESOLVE_API_v19.0B-build20.txt @@ -1,26 +1,23 @@ -Updated as of 26 May 2023 +Last Updated: 1 April 2024 ---------------------------- In this package, you will find a brief introduction to the Scripting API for DaVinci Resolve Studio. Apart from this README.txt file, this package contains folders containing the basic import modules for scripting access (DaVinciResolve.py) and some representative examples. From v16.2.0 onwards, the nodeIndex parameters accepted by SetLUT() and SetCDL() are 1-based instead of 0-based, i.e. 1 <= nodeIndex <= total number of nodes. - Overview -------- -As with Blackmagic Design Fusion scripts, user scripts written in Lua and Python programming languages are supported. By default, scripts can be invoked from the Console window in the Fusion page, +As with Blackmagic Fusion scripts, user scripts written in Lua and Python programming languages are supported. By default, scripts can be invoked from the Console window in the Fusion page, or via command line. This permission can be changed in Resolve Preferences, to be only from Console, or to be invoked from the local network. Please be aware of the security implications when allowing scripting access from outside of the Resolve application. - Prerequisites ------------- DaVinci Resolve scripting requires one of the following to be installed (for all users): Lua 5.1 - Python 2.7 64-bit Python >= 3.6 64-bit - + Python 2.7 64-bit Using a script -------------- @@ -64,6 +61,7 @@ The interactive Console window allows for an easy way to execute simple scriptin and Lua and evaluates and executes them immediately. For more information on how to use the Console, please refer to the DaVinci Resolve User Manual. This example Python script creates a simple project: + #!/usr/bin/env python import DaVinciResolveScript as dvr_script resolve = dvr_script.scriptapp("Resolve") @@ -80,9 +78,8 @@ Running DaVinci Resolve in headless mode DaVinci Resolve can be launched in a headless mode without the user interface using the -nogui command line option. When DaVinci Resolve is launched using this option, the user interface is disabled. However, the various scripting APIs will continue to work as expected. - -Basic Resolve API ------------------ +DaVinci Resolve API +------------------- Some commonly used API functions are described below (*). As with the resolve object, each object is inspectable for properties and functions. Resolve @@ -101,6 +98,12 @@ Resolve SaveLayoutPreset(presetName) --> Bool # Saves current UI layout as a preset named 'presetName'. ImportLayoutPreset(presetFilePath, presetName) --> Bool # Imports preset from path 'presetFilePath'. The optional argument 'presetName' specifies how the preset shall be named. If not specified, the preset is named based on the filename. Quit() --> None # Quits the Resolve App. + ImportRenderPreset(presetPath) --> Bool # Import a preset from presetPath (string) and set it as current preset for rendering. + ExportRenderPreset(presetName, exportPath) --> Bool # Export a preset to a given path (string) if presetName(string) exists. + ImportBurnInPreset(presetPath) --> Bool # Import a data burn in preset from a given presetPath (string) + ExportBurnInPreset(presetName, exportPath) --> Bool # Export a data burn in preset to a given path (string) if presetName (string) exists. + GetKeyframeMode() --> keyframeMode # Returns the currently set keyframe mode (int). Refer to section 'Keyframe Mode information' below for details. + SetKeyframeMode(keyframeMode) --> Bool # Returns True when 'keyframeMode'(enum) is successfully set. Refer to section 'Keyframe Mode information' below for details. ProjectManager ArchiveProject(projectName, @@ -131,6 +134,14 @@ ProjectManager # 'DbType': 'Disk' or 'PostgreSQL' (string) # 'DbName': database name (string) # 'IpAddress': IP address of the PostgreSQL server (string, optional key - defaults to '127.0.0.1') + CreateCloudProject({cloudSettings}) --> Project # Creates and returns a cloud project. + # '{cloudSettings}': Check 'Cloud Projects Settings' subsection below for more information. + ImportCloudProject(filePath, {cloudSettings}) --> Bool # Returns True if import cloud project is successful; False otherwise + # 'filePath': String; filePath of file to import + # '{cloudSettings}': Check 'Cloud Projects Settings' subsection below for more information. + RestoreCloudProject(folderPath, {cloudSettings}) --> Bool # Returns True if restore cloud project is successful; False otherwise + # 'folderPath': String; path of folder to restore + # '{cloudSettings}': Check 'Cloud Projects Settings' subsection below for more information. Project GetMediaPool() --> MediaPool # Returns the Media Pool object. @@ -175,6 +186,9 @@ Project startOffsetInSamples, durationInSamples) LoadBurnInPreset(presetName) --> Bool # Loads user defined data burn in preset for project when supplied presetName (string). Returns true if successful. ExportCurrentFrameAsStill(filePath) --> Bool # Exports current frame as still to supplied filePath. filePath must end in valid export file format. Returns True if succssful, False otherwise. + GetColorGroupsList() --> [ColorGroups...] # Returns a list of all group objects in the timeline. + AddColorGroup(groupName) --> ColorGroup # Creates a new ColorGroup. groupName must be a unique string. + DeleteColorGroup(colorGroup) --> Bool # Deletes the given color group and sets clips to ungrouped. MediaStorage GetMountedVolumeList() --> [paths...] # Returns list of folder paths corresponding to mounted volumes displayed in Resolve’s Media Storage. @@ -198,7 +212,7 @@ MediaPool CreateTimelineFromClips(name, clip1, clip2,...) --> Timeline # Creates new timeline with specified name, and appends the specified MediaPoolItem objects. CreateTimelineFromClips(name, [clips]) --> Timeline # Creates new timeline with specified name, and appends the specified MediaPoolItem objects. CreateTimelineFromClips(name, [{clipInfo}]) --> Timeline # Creates new timeline with specified name, appending the list of clipInfos specified as a dict of "mediaPoolItem", "startFrame" (int), "endFrame" (int), "recordFrame" (int). - ImportTimelineFromFile(filePath, {importOptions}) --> Timeline # Creates timeline based on parameters within given file (AAF/EDL/XML/FCPXML/DRT/ADL) and optional importOptions dict, with support for the keys: + ImportTimelineFromFile(filePath, {importOptions}) --> Timeline # Creates timeline based on parameters within given file (AAF/EDL/XML/FCPXML/DRT/ADL/OTIO) and optional importOptions dict, with support for the keys: # "timelineName": string, specifies the name of the timeline to be created. Not valid for DRT import # "importSourceClips": Bool, specifies whether source clips should be imported, True by default. Not valid for DRT import # "sourceClipsPath": string, specifies a filesystem path to search for source clips if the media is inaccessible in their original path and if "importSourceClips" is True @@ -225,6 +239,8 @@ MediaPool ExportMetadata(fileName, [clips]) --> Bool # Exports metadata of specified clips to 'fileName' in CSV format. # If no clips are specified, all clips from media pool will be used. GetUniqueId() --> string # Returns a unique ID for the media pool + CreateStereoClip(LeftMediaPoolItem, + RightMediaPoolItem) --> MediaPoolItem # Takes in two existing media pool items and creates a new 3D stereoscopic media pool entry replacing the input media in the media pool. Folder GetClipList() --> [clips...] # Returns a list of clips (items) within the folder. @@ -233,6 +249,8 @@ Folder GetIsFolderStale() --> bool # Returns true if folder is stale in collaboration mode, false otherwise GetUniqueId() --> string # Returns a unique ID for the media pool folder Export(filePath) --> bool # Returns true if export of DRB folder to filePath is successful, false otherwise + TranscribeAudio() --> Bool # Transcribes audio of the MediaPoolItems within the folder and nested folders. Returns True if successful; False otherwise + ClearTranscription() --> Bool # Clears audio transcription of the MediaPoolItems within the folder and nested folders. Returns True if successful; False otherwise. MediaPoolItem GetName() --> string # Returns the clip name. @@ -340,8 +358,12 @@ Timeline GrabStill() --> galleryStill # Grabs still from the current video clip. Returns a GalleryStill object. GrabAllStills(stillFrameSource) --> [galleryStill] # Grabs stills from all the clips of the timeline at 'stillFrameSource' (1 - First frame, 2 - Middle frame). Returns the list of GalleryStill objects. GetUniqueId() --> string # Returns a unique ID for the timeline - CreateSubtitlesFromAudio() --> Bool # Creates subtitles from audio for the timeline. Returns True on success, False otherwise. + CreateSubtitlesFromAudio({autoCaptionSettings}) --> Bool # Creates subtitles from audio for the timeline. + # Takes in optional dictionary {autoCaptionSettings}. Check 'Auto Caption Settings' subsection below for more information. + # Returns True on success, False otherwise. DetectSceneCuts() --> Bool # Detects and makes scene cuts along the timeline. Returns True if successful, False otherwise. + ConvertTimelineToStereo() --> Bool # Converts timeline to stereo. Returns True if successful; False otherwise. + GetNodeGraph() --> Graph # Returns the timeline's node graph object. TimelineItem GetName() --> string # Returns the item name. @@ -390,12 +412,7 @@ TimelineItem GetStereoConvergenceValues() --> {keyframes...} # Returns a dict (offset -> value) of keyframe offsets and respective convergence values. GetStereoLeftFloatingWindowParams() --> {keyframes...} # For the LEFT eye -> returns a dict (offset -> dict) of keyframe offsets and respective floating window params. Value at particular offset includes the left, right, top and bottom floating window values. GetStereoRightFloatingWindowParams() --> {keyframes...} # For the RIGHT eye -> returns a dict (offset -> dict) of keyframe offsets and respective floating window params. Value at particular offset includes the left, right, top and bottom floating window values. - GetNumNodes() --> int # Returns the number of nodes in the current graph for the timeline item ApplyArriCdlLut() --> Bool # Applies ARRI CDL and LUT. Returns True if successful, False otherwise. - SetLUT(nodeIndex, lutPath) --> Bool # Sets LUT on the node mapping the node index provided, 1 <= nodeIndex <= total number of nodes. - # The lutPath can be an absolute path, or a relative path (based off custom LUT paths or the master LUT path). - # The operation is successful for valid lut paths that Resolve has already discovered (see Project.RefreshLUTList). - GetLUT(nodeIndex) --> String # Gets relative LUT path based on the node index provided, 1 <= nodeIndex <= total number of nodes. SetCDL([CDL map]) --> Bool # Keys of map are: "NodeIndex", "Slope", "Offset", "Power", "Saturation", where 1 <= NodeIndex <= total number of nodes. # Example python code - SetCDL({"NodeIndex" : "1", "Slope" : "0.5 0.4 0.2", "Offset" : "0.4 0.3 0.2", "Power" : "0.6 0.7 0.8", "Saturation" : "0.65"}) AddTake(mediaPoolItem, startFrame, endFrame) --> Bool # Adds mediaPoolItem as a new take. Initializes a take selector for the timeline item if needed. By default, the full clip extents is added. startFrame (int) and endFrame (int) are optional arguments used to specify the extents. @@ -411,11 +428,17 @@ TimelineItem UpdateSidecar() --> Bool # Updates sidecar file for BRAW clips or RMD file for R3D clips. GetUniqueId() --> string # Returns a unique ID for the timeline item LoadBurnInPreset(presetName) --> Bool # Loads user defined data burn in preset for clip when supplied presetName (string). Returns true if successful. - GetNodeLabel(nodeIndex) --> string # Returns the label of the node at nodeIndex. CreateMagicMask(mode) --> Bool # Returns True if magic mask was created successfully, False otherwise. mode can "F" (forward), "B" (backward), or "BI" (bidirection) RegenerateMagicMask() --> Bool # Returns True if magic mask was regenerated successfully, False otherwise. Stabilize() --> Bool # Returns True if stabilization was successful, False otherwise SmartReframe() --> Bool # Performs Smart Reframe. Returns True if successful, False otherwise. + GetNodeGraph() --> Graph # Returns the clip's node graph object. + GetColorGroup() --> ColorGroup # Returns the clip's color group if one exists. + AssignToColorGroup(ColorGroup) --> Bool # Returns True if TiItem to successfully assigned to given ColorGroup. ColorGroup must be an existing group in the current project. + RemoveFromColorGroup() --> Bool # Returns True if the TiItem is successfully removed from the ColorGroup it is in. + ExportLUT(exportType, path) --> Bool # Exports LUTs from tiItem referring to value passed in 'exportType' (enum) for LUT size. Refer to. 'ExportLUT notes' section for possible values. + # Saves generated LUT in the provided 'path' (string). 'path' should include the intended file name. + # If an empty or incorrect extension is provided, the appropriate extension (.cube/.vlt) will be appended at the end of the path. Gallery GetAlbumName(galleryStillAlbum) --> string # Returns the name of the GalleryStillAlbum object 'galleryStillAlbum'. @@ -428,17 +451,63 @@ GalleryStillAlbum GetStills() --> [galleryStill] # Returns the list of GalleryStill objects in the album. GetLabel(galleryStill) --> string # Returns the label of the galleryStill. SetLabel(galleryStill, label) --> Bool # Sets the new 'label' to GalleryStill object 'galleryStill'. - ExportStills([galleryStill], folderPath, filePrefix, format) --> Bool # Exports list of GalleryStill objects '[galleryStill]' to directory 'folderPath', with filename prefix 'filePrefix', using file format 'format' (supported formats: dpx, cin, tif, jpg, png, ppm, bmp, xpm). + ImportStills([filePaths]) --> Bool # Imports GalleryStill from each filePath in [filePaths] list. True if at least one still is imported successfully. False otherwise. + ExportStills([galleryStill], folderPath, filePrefix, format) --> Bool # Exports list of GalleryStill objects '[galleryStill]' to directory 'folderPath', with filename prefix 'filePrefix', using file format 'format' (supported formats: dpx, cin, tif, jpg, png, ppm, bmp, xpm, drx). DeleteStills([galleryStill]) --> Bool # Deletes specified list of GalleryStill objects '[galleryStill]'. GalleryStill # This class does not provide any API functions but the object type is used by functions in other classes. +Graph + GetNumNodes() --> int # Returns the number of nodes in the graph + SetLUT(nodeIndex, lutPath) --> Bool # Sets LUT on the node mapping the node index provided, 1 <= nodeIndex <= self.GetNumNodes(). + # The lutPath can be an absolute path, or a relative path (based off custom LUT paths or the master LUT path). + # The operation is successful for valid lut paths that Resolve has already discovered (see Project.RefreshLUTList). + GetLUT(nodeIndex) --> String # Gets relative LUT path based on the node index provided, 1 <= nodeIndex <= total number of nodes. + GetNodeLabel(nodeIndex) --> string # Returns the label of the node at nodeIndex. + GetToolsInNode(nodeIndex) --> [toolsList] # Returns toolsList (list of strings) of the tools used in the node indicated by given nodeIndex (int). + +ColorGroup + GetName() --> String # Returns the name (string) of the ColorGroup. + SetName(groupName) --> Bool # Renames ColorGroup to groupName (string). + GetClipsInTimeline(Timeline=CurrTimeline) --> [TimelineItem] # Returns a list of TimelineItem that are in colorGroup in the given Timeline. Timeline is Current Timeline by default. + GetPreClipNodeGraph() --> Graph # Returns the ColorGroup Pre-clip graph. + GetPostClipNodeGraph() --> Graph # Returns the ColorGroup Post-clip graph. + List and Dict Data Structures ----------------------------- Beside primitive data types, Resolve's Python API mainly uses list and dict data structures. Lists are denoted by [ ... ] and dicts are denoted by { ... } above. As Lua does not support list and dict data structures, the Lua API implements "list" as a table with indices, e.g. { [1] = listValue1, [2] = listValue2, ... }. Similarly the Lua API implements "dict" as a table with the dictionary key as first element, e.g. { [dictKey1] = dictValue1, [dictKey2] = dictValue2, ... }. +Keyframe Mode information +------------------------- +This section covers additional notes for the functions Resolve.GetKeyframeMode() and Resolve.SetKeyframeMode(keyframeMode). + +'keyframeMode' can be one of the following enums: + - resolve.KEYFRAME_MODE_ALL == 0 + - resolve.KEYFRAME_MODE_COLOR == 1 + - resolve.KEYFRAME_MODE_SIZING == 2 + +Integer values returned by Resolve.GetKeyframeMode() will correspond to the enums above. + +Cloud Projects Settings +-------------------------------------- +This section covers additional notes for the functions "ProjectManager:CreateCloudProject," "ProjectManager:ImportCloudProject," and "ProjectManager:RestoreCloudProject" + +All three functions take in a {cloudSettings} dict, that have the following keys: +* resolve.CLOUD_SETTING_PROJECT_NAME: String, ["" by default] +* resolve.CLOUD_SETTING_PROJECT_MEDIA_PATH: String, ["" by default] +* resolve.CLOUD_SETTING_IS_COLLAB: Bool, [False by default] +* resolve.CLOUD_SETTING_SYNC_MODE: syncMode (see below), [resolve.CLOUD_SYNC_PROXY_ONLY by default] +* resolve.CLOUD_SETTING_IS_CAMERA_ACCESS: Bool [False by default] + +Where syncMode is one of the following values: +* resolve.CLOUD_SYNC_NONE, +* resolve.CLOUD_SYNC_PROXY_ONLY, +* resolve.CLOUD_SYNC_PROXY_AND_ORIG + +All three "ProjectManager:CreateCloudProject," "ProjectManager:ImportCloudProject," and "ProjectManager:RestoreCloudProject" require resolve.PROJECT_MEDIA_PATH to be defined. "ProjectManager:CreateCloudProject" also requires resolve.PROJECT_NAME to be defined. + Looking up Project and Clip properties -------------------------------------- This section covers additional notes for the functions "Project:GetSetting", "Project:SetSetting", "Timeline:GetSetting", "Timeline:SetSetting", "MediaPoolItem:GetClipProperty" and @@ -478,6 +547,49 @@ Affects: • x = MediaPoolItem:GetClipProperty('Super Scale') and MediaPoolItem:SetClipProperty('Super Scale', x) • for '2x Enhanced' --> MediaPoolItem:SetClipProperty('Super Scale', 2, sharpnessValue, noiseReductionValue), where sharpnessValue is a float in the range [0.0, 1.0] and noiseReductionValue is a float in the range [0.0, 1.0] +Auto Caption Settings +---------------------- +This section covers the supported settings for the method Timeline.CreateSubtitlesFromAudio({autoCaptionSettings}) + +The parameter setting is a dictionary containing the following keys: +* resolve.SUBTITLE_LANGUAGE: languageID (see below), [resolve.AUTO_CAPTION_AUTO by default] +* resolve.SUBTITLE_CAPTION_PRESET: presetType (see below), [resolve.AUTO_CAPTION_SUBTITLE_DEFAULT by default] +* resolve.SUBTITLE_CHARS_PER_LINE: Number between 1 and 60 inclusive [42 by default] +* resolve.SUBTITLE_LINE_BREAK: lineBreakType (see below), [resolve.AUTO_CAPTION_LINE_SINGLE by default] +* resolve.SUBTITLE_GAP: Number between 0 and 10 inclusive [0 by default] + +Note that the default values for some keys may change based on values defined for other keys, as per the UI. +For example, if the following dictionary is supplied, + CreateSubtitlesFromAudio( { resolve.SUBTITLE_LANGUAGE = resolve.AUTO_CAPTION_KOREAN, + resolve.SUBTITLE_CAPTION_PRESET = resolve.AUTO_CAPTION_NETFLIX } ) +the default value for resolve.SUBTITLE_CHARS_PER_LINE will be 16 instead of 42 + +languageIDs: +* resolve.AUTO_CAPTION_AUTO +* resolve.AUTO_CAPTION_DANISH +* resolve.AUTO_CAPTION_DUTCH +* resolve.AUTO_CAPTION_ENGLISH +* resolve.AUTO_CAPTION_FRENCH +* resolve.AUTO_CAPTION_GERMAN +* resolve.AUTO_CAPTION_ITALIAN +* resolve.AUTO_CAPTION_JAPANESE +* resolve.AUTO_CAPTION_KOREAN +* resolve.AUTO_CAPTION_MANDARIN_SIMPLIFIED +* resolve.AUTO_CAPTION_MANDARIN_TRADITIONAL +* resolve.AUTO_CAPTION_NORWEGIAN +* resolve.AUTO_CAPTION_PORTUGUESE +* resolve.AUTO_CAPTION_RUSSIAN +* resolve.AUTO_CAPTION_SPANISH +* resolve.AUTO_CAPTION_SWEDISH + +presetTypes: +* resolve.AUTO_CAPTION_SUBTITLE_DEFAULT +* resolve.AUTO_CAPTION_TELETEXT +* resolve.AUTO_CAPTION_NETFLIX + +lineBreakTypes: +* resolve.AUTO_CAPTION_LINE_SINGLE +* resolve.AUTO_CAPTION_LINE_DOUBLE Looking up Render Settings -------------------------- @@ -531,6 +643,8 @@ exportType can be one of the following constants: - resolve.EXPORT_DOLBY_VISION_VER_4_0 - resolve.EXPORT_DOLBY_VISION_VER_5_1 - resolve.EXPORT_OTIO + - resolve.EXPORT_ALE + - resolve.EXPORT_ALE_CDL exportSubtype can be one of the following enums: - resolve.EXPORT_NONE - resolve.EXPORT_AAF_NEW @@ -627,7 +741,8 @@ The supported keys with their accepted values are: - MOTION_EST_STANDARD_BETTER - MOTION_EST_ENHANCED_FASTER - MOTION_EST_ENHANCED_BETTER - - MOTION_EST_SPEED_WRAP + - MOTION_EST_SPEED_WARP_BETTER + - MOTION_EST_SPEED_WARP_FASTER "Scaling" : A value from the following constants - SCALE_USE_PROJECT = 0 - SCALE_CROP @@ -659,6 +774,16 @@ as a single argument. Getting the values for the keys that uses constants will return the number which is in the constant +ExportLUT notes +--------------- +The following section covers additional notes for TimelineItem.ExportLUT(exportType, path). + +Supported values for 'exportType' (enum) are: + - resolve.EXPORT_LUT_17PTCUBE + - resolve.EXPORT_LUT_33PTCUBE + - resolve.EXPORT_LUT_65PTCUBE + - resolve.EXPORT_LUT_PANASONICVLUT + Deprecated Resolve API Functions -------------------------------- The following API functions are deprecated. @@ -693,7 +818,12 @@ TimelineItem GetFusionCompNames() --> {names...} # Returns a dict of Fusion composition names associated with the timeline item. GetFlags() --> {colors...} # Returns a dict of flag colors assigned to the item. GetVersionNames(versionType) --> {names...} # Returns a dict of version names by provided versionType: 0 - local, 1 - remote. - + GetNumNodes() --> int # Returns the number of nodes in the current graph for the timeline item + SetLUT(nodeIndex, lutPath) --> Bool # Sets LUT on the node mapping the node index provided, 1 <= nodeIndex <= total number of nodes. + # The lutPath can be an absolute path, or a relative path (based off custom LUT paths or the master LUT path). + # The operation is successful for valid lut paths that Resolve has already discovered (see Project.RefreshLUTList). + GetLUT(nodeIndex) --> String # Gets relative LUT path based on the node index provided, 1 <= nodeIndex <= total number of nodes. + GetNodeLabel(nodeIndex) --> string # Returns the label of the node at nodeIndex. Unsupported Resolve API Functions --------------------------------- diff --git a/server_addon/resolve/client/ayon_resolve/__init__.py b/server_addon/resolve/client/ayon_resolve/__init__.py new file mode 100644 index 0000000000..ba9afb67d5 --- /dev/null +++ b/server_addon/resolve/client/ayon_resolve/__init__.py @@ -0,0 +1,13 @@ +from .version import __version__ +from .addon import ( + RESOLVE_ADDON_ROOT, + ResolveAddon, +) + + +__all__ = ( + "__version__", + + "RESOLVE_ADDON_ROOT", + "ResolveAddon", +) diff --git a/client/ayon_core/hosts/resolve/addon.py b/server_addon/resolve/client/ayon_resolve/addon.py similarity index 70% rename from client/ayon_core/hosts/resolve/addon.py rename to server_addon/resolve/client/ayon_resolve/addon.py index 1354caabb2..706d2802b0 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/api/__init__.py b/server_addon/resolve/client/ayon_resolve/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/__init__.py rename to server_addon/resolve/client/ayon_resolve/api/__init__.py diff --git a/client/ayon_core/hosts/resolve/api/action.py b/server_addon/resolve/client/ayon_resolve/api/action.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/action.py rename to server_addon/resolve/client/ayon_resolve/api/action.py diff --git a/client/ayon_core/hosts/resolve/api/lib.py b/server_addon/resolve/client/ayon_resolve/api/lib.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/lib.py rename to server_addon/resolve/client/ayon_resolve/api/lib.py diff --git a/client/ayon_core/hosts/resolve/api/menu.py b/server_addon/resolve/client/ayon_resolve/api/menu.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/menu.py rename to server_addon/resolve/client/ayon_resolve/api/menu.py diff --git a/client/ayon_core/hosts/resolve/api/menu_style.qss b/server_addon/resolve/client/ayon_resolve/api/menu_style.qss similarity index 100% rename from client/ayon_core/hosts/resolve/api/menu_style.qss rename to server_addon/resolve/client/ayon_resolve/api/menu_style.qss diff --git a/client/ayon_core/hosts/resolve/api/pipeline.py b/server_addon/resolve/client/ayon_resolve/api/pipeline.py similarity index 98% rename from client/ayon_core/hosts/resolve/api/pipeline.py rename to server_addon/resolve/client/ayon_resolve/api/pipeline.py index 15e4f1203d..d6d6dc799e 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/api/plugin.py b/server_addon/resolve/client/ayon_resolve/api/plugin.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/plugin.py rename to server_addon/resolve/client/ayon_resolve/api/plugin.py diff --git a/client/ayon_core/hosts/resolve/api/testing_utils.py b/server_addon/resolve/client/ayon_resolve/api/testing_utils.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/testing_utils.py rename to server_addon/resolve/client/ayon_resolve/api/testing_utils.py diff --git a/client/ayon_core/hosts/resolve/api/todo-rendering.py b/server_addon/resolve/client/ayon_resolve/api/todo-rendering.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/todo-rendering.py rename to server_addon/resolve/client/ayon_resolve/api/todo-rendering.py diff --git a/client/ayon_core/hosts/resolve/api/utils.py b/server_addon/resolve/client/ayon_resolve/api/utils.py similarity index 91% rename from client/ayon_core/hosts/resolve/api/utils.py rename to server_addon/resolve/client/ayon_resolve/api/utils.py index 030534370b..d63ade9d51 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/api/workio.py b/server_addon/resolve/client/ayon_resolve/api/workio.py similarity index 100% rename from client/ayon_core/hosts/resolve/api/workio.py rename to server_addon/resolve/client/ayon_resolve/api/workio.py diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_last_workfile.py similarity index 100% rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_last_workfile.py rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_last_workfile.py diff --git a/client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py similarity index 99% rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_setup.py rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_setup.py index f45e28d5ab..ffd34d7b8d 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py b/server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py similarity index 77% rename from client/ayon_core/hosts/resolve/hooks/pre_resolve_startup.py rename to server_addon/resolve/client/ayon_resolve/hooks/pre_resolve_startup.py index 300564f7cc..b357b10056 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/maya/plugins/publish/__init__.py b/server_addon/resolve/client/ayon_resolve/otio/__init__.py similarity index 100% rename from client/ayon_core/hosts/maya/plugins/publish/__init__.py rename to server_addon/resolve/client/ayon_resolve/otio/__init__.py diff --git a/client/ayon_core/hosts/resolve/otio/davinci_export.py b/server_addon/resolve/client/ayon_resolve/otio/davinci_export.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/davinci_export.py rename to server_addon/resolve/client/ayon_resolve/otio/davinci_export.py diff --git a/client/ayon_core/hosts/resolve/otio/davinci_import.py b/server_addon/resolve/client/ayon_resolve/otio/davinci_import.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/davinci_import.py rename to server_addon/resolve/client/ayon_resolve/otio/davinci_import.py diff --git a/client/ayon_core/hosts/resolve/otio/utils.py b/server_addon/resolve/client/ayon_resolve/otio/utils.py similarity index 100% rename from client/ayon_core/hosts/resolve/otio/utils.py rename to server_addon/resolve/client/ayon_resolve/otio/utils.py diff --git a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py similarity index 99% rename from client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py rename to server_addon/resolve/client/ayon_resolve/plugins/create/create_shot_clip.py index cbc03da3b6..da98c8de7d 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/plugins/load/load_clip.py b/server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py similarity index 98% rename from client/ayon_core/hosts/resolve/plugins/load/load_clip.py rename to server_addon/resolve/client/ayon_resolve/plugins/load/load_clip.py index 2ce1c43957..7e3a5a254e 100644 --- a/client/ayon_core/hosts/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 new file mode 100644 index 0000000000..234e7b7f71 --- /dev/null +++ b/server_addon/resolve/client/ayon_resolve/plugins/load/load_editorial_package.py @@ -0,0 +1,52 @@ +from pathlib import Path + +from ayon_core.pipeline import ( + load, + get_representation_path, +) + +from ayon_resolve.api import lib + + +class LoadEditorialPackage(load.LoaderPlugin): + """Load editorial package to timeline. + + Loading timeline from OTIO file included media sources + and timeline structure. + """ + + product_types = {"editorial_pkg"} + + representations = {"*"} + extensions = {"otio"} + + label = "Load as Timeline" + order = -10 + icon = "ei.align-left" + color = "orange" + + def load(self, context, name, namespace, data): + files = get_representation_path(context["representation"]) + + search_folder_path = Path(files).parent / "resources" + + project = lib.get_current_project() + media_pool = project.GetMediaPool() + + # create versioned bin for editorial package + version_name = context["version"]["name"] + bin_name = f"{name}_{version_name}" + lib.create_bin(bin_name) + + import_options = { + "timelineName": "Editorial Package Timeline", + "importSourceClips": True, + "sourceClipsPath": search_folder_path.as_posix(), + } + + timeline = media_pool.ImportTimelineFromFile(files, import_options) + print("Timeline imported: ", timeline) + + def update(self, container, context): + # TODO: implement update method in future + pass diff --git a/client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py similarity index 95% rename from client/ayon_core/hosts/resolve/plugins/publish/extract_workfile.py rename to server_addon/resolve/client/ayon_resolve/plugins/publish/extract_workfile.py index 48ebdee7e3..77d14ccdc5 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py similarity index 99% rename from client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py rename to server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_instances.py index caa79c85c0..10e1eba3e3 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py b/server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py similarity index 94% rename from client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py rename to server_addon/resolve/client/ayon_resolve/plugins/publish/precollect_workfile.py index 6158cf1d61..a388d4bc59 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/startup.py b/server_addon/resolve/client/ayon_resolve/startup.py similarity index 93% rename from client/ayon_core/hosts/resolve/startup.py rename to server_addon/resolve/client/ayon_resolve/startup.py index 3ad0a6bf7b..7f0bd59055 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py similarity index 82% rename from client/ayon_core/hosts/resolve/utility_scripts/AYON__Menu.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/AYON__Menu.py index b10b477beb..670544d605 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/utility_scripts/ayon_startup.scriptlib b/server_addon/resolve/client/ayon_resolve/utility_scripts/ayon_startup.scriptlib similarity index 100% rename from client/ayon_core/hosts/resolve/utility_scripts/ayon_startup.scriptlib rename to server_addon/resolve/client/ayon_resolve/utility_scripts/ayon_startup.scriptlib diff --git a/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py similarity index 96% rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_export.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_export.py index c1c83eb060..4572d1354d 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py similarity index 96% rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OTIO_import.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OTIO_import.py index 5bbdd73402..17de1b6fc3 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py b/server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py similarity index 73% rename from client/ayon_core/hosts/resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py rename to server_addon/resolve/client/ayon_resolve/utility_scripts/develop/OpenPype_sync_util_scripts.py index c394238860..5a069aff9e 100644 --- a/client/ayon_core/hosts/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/client/ayon_core/hosts/resolve/utils.py b/server_addon/resolve/client/ayon_resolve/utils.py similarity index 96% rename from client/ayon_core/hosts/resolve/utils.py rename to server_addon/resolve/client/ayon_resolve/utils.py index 4ef6ea4f40..d256fda18d 100644 --- a/client/ayon_core/hosts/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" diff --git a/server_addon/resolve/package.py b/server_addon/resolve/package.py index cf92413bce..993f700e40 100644 --- a/server_addon/resolve/package.py +++ b/server_addon/resolve/package.py @@ -1,3 +1,10 @@ name = "resolve" title = "DaVinci Resolve" -version = "0.1.0" +version = "0.2.0" + +client_dir = "ayon_resolve" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/client/ayon_core/hosts/substancepainter/__init__.py b/server_addon/substancepainter/client/ayon_substancepainter/__init__.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/__init__.py rename to server_addon/substancepainter/client/ayon_substancepainter/__init__.py diff --git a/client/ayon_core/hosts/substancepainter/addon.py b/server_addon/substancepainter/client/ayon_substancepainter/addon.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/addon.py rename to server_addon/substancepainter/client/ayon_substancepainter/addon.py diff --git a/client/ayon_core/hosts/substancepainter/api/__init__.py b/server_addon/substancepainter/client/ayon_substancepainter/api/__init__.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/api/__init__.py rename to server_addon/substancepainter/client/ayon_substancepainter/api/__init__.py diff --git a/client/ayon_core/hosts/substancepainter/api/colorspace.py b/server_addon/substancepainter/client/ayon_substancepainter/api/colorspace.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/api/colorspace.py rename to server_addon/substancepainter/client/ayon_substancepainter/api/colorspace.py diff --git a/client/ayon_core/hosts/substancepainter/api/lib.py b/server_addon/substancepainter/client/ayon_substancepainter/api/lib.py similarity index 90% rename from client/ayon_core/hosts/substancepainter/api/lib.py rename to server_addon/substancepainter/client/ayon_substancepainter/api/lib.py index 64c39943ce..0ae3932f58 100644 --- a/client/ayon_core/hosts/substancepainter/api/lib.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/api/lib.py @@ -3,6 +3,8 @@ import re import json from collections import defaultdict +import contextlib +import substance_painter import substance_painter.project import substance_painter.resource import substance_painter.js @@ -640,3 +642,88 @@ def prompt_new_file_with_mesh(mesh_filepath): return return project_mesh + + +def get_filtered_export_preset(export_preset_name, channel_type_names): + """Return export presets included with specific channels + requested by users. + + Args: + export_preset_name (str): Name of export preset + channel_type_list (list): A list of channel type requested by users + + Returns: + dict: export preset data + """ + + target_maps = [] + + export_presets = get_export_presets() + export_preset_nice_name = export_presets[export_preset_name] + resource_presets = substance_painter.export.list_resource_export_presets() + preset = next( + ( + preset for preset in resource_presets + if preset.resource_id.name == export_preset_nice_name + ), None + ) + if preset is None: + return {} + + maps = preset.list_output_maps() + for channel_map in maps: + for channel_name in channel_type_names: + if not channel_map.get("fileName"): + continue + + if channel_name in channel_map["fileName"]: + target_maps.append(channel_map) + # Create a new preset + return { + "exportPresets": [ + { + "name": export_preset_name, + "maps": target_maps + } + ], + } + + +@contextlib.contextmanager +def set_layer_stack_opacity(node_ids, channel_types): + """Function to set the opacity of the layer stack during + context + Args: + node_ids (list[int]): Substance painter root layer node ids + channel_types (list[str]): Channel type names as defined as + attributes in `substance_painter.textureset.ChannelType` + """ + # Do nothing + if not node_ids or not channel_types: + yield + return + + stack = substance_painter.textureset.get_active_stack() + stack_root_layers = ( + substance_painter.layerstack.get_root_layer_nodes(stack) + ) + node_ids = set(node_ids) # lookup + excluded_nodes = [ + node for node in stack_root_layers + if node.uid() not in node_ids + ] + + original_opacity_values = [] + for node in excluded_nodes: + for channel in channel_types: + chan = getattr(substance_painter.textureset.ChannelType, channel) + original_opacity_values.append((chan, node.get_opacity(chan))) + try: + for node in excluded_nodes: + for channel, _ in original_opacity_values: + node.set_opacity(0.0, channel) + yield + finally: + for node in excluded_nodes: + for channel, opacity in original_opacity_values: + node.set_opacity(opacity, channel) diff --git a/client/ayon_core/hosts/substancepainter/api/pipeline.py b/server_addon/substancepainter/client/ayon_substancepainter/api/pipeline.py similarity index 99% rename from client/ayon_core/hosts/substancepainter/api/pipeline.py rename to server_addon/substancepainter/client/ayon_substancepainter/api/pipeline.py index 23d629533c..47090c4b0a 100644 --- a/client/ayon_core/hosts/substancepainter/api/pipeline.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/api/pipeline.py @@ -27,11 +27,11 @@ from ayon_core.lib import ( emit_event, ) from ayon_core.pipeline.load import any_outdated_containers -from ayon_core.hosts.substancepainter import SUBSTANCE_HOST_DIR +from ayon_substancepainter import SUBSTANCE_HOST_DIR from . import lib -log = logging.getLogger("ayon_core.hosts.substance") +log = logging.getLogger("ayon_substancepainter") PLUGINS_DIR = os.path.join(SUBSTANCE_HOST_DIR, "plugins") PUBLISH_PATH = os.path.join(PLUGINS_DIR, "publish") diff --git a/client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py b/server_addon/substancepainter/client/ayon_substancepainter/deploy/plugins/ayon_plugin.py similarity index 67% rename from client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py rename to server_addon/substancepainter/client/ayon_substancepainter/deploy/plugins/ayon_plugin.py index 8ced463367..85bb56d73c 100644 --- a/client/ayon_core/hosts/substancepainter/deploy/plugins/openpype_plugin.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/deploy/plugins/ayon_plugin.py @@ -1,6 +1,6 @@ -def cleanup_openpype_qt_widgets(): +def cleanup_ayon_qt_widgets(): """ Workaround for Substance failing to shut down correctly when a Qt window was still open at the time of shutting down. @@ -8,27 +8,27 @@ def cleanup_openpype_qt_widgets(): This seems to work sometimes, but not all the time. """ - # TODO: Create a more reliable method to close down all OpenPype Qt widgets + # TODO: Create a more reliable method to close down all AYON Qt widgets from PySide2 import QtWidgets import substance_painter.ui - # Kill OpenPype Qt widgets - print("Killing OpenPype Qt widgets..") + # Kill AYON Qt widgets + print("Killing AYON Qt widgets..") for widget in QtWidgets.QApplication.topLevelWidgets(): - if widget.__module__.startswith("openpype."): + if widget.__module__.startswith("ayon_"): print(f"Deleting widget: {widget.__class__.__name__}") substance_painter.ui.delete_ui_element(widget) def start_plugin(): from ayon_core.pipeline import install_host - from ayon_core.hosts.substancepainter.api import SubstanceHost + from ayon_substancepainter.api import SubstanceHost install_host(SubstanceHost()) def close_plugin(): from ayon_core.pipeline import uninstall_host - cleanup_openpype_qt_widgets() + cleanup_ayon_qt_widgets() uninstall_host() diff --git a/client/ayon_core/hosts/substancepainter/deploy/startup/openpype_load_on_first_run.py b/server_addon/substancepainter/client/ayon_substancepainter/deploy/startup/ayon_load_on_first_run.py similarity index 78% rename from client/ayon_core/hosts/substancepainter/deploy/startup/openpype_load_on_first_run.py rename to server_addon/substancepainter/client/ayon_substancepainter/deploy/startup/ayon_load_on_first_run.py index 04b610b4df..9ef119e357 100644 --- a/client/ayon_core/hosts/substancepainter/deploy/startup/openpype_load_on_first_run.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/deploy/startup/ayon_load_on_first_run.py @@ -1,6 +1,6 @@ -"""Ease the OpenPype on-boarding process by loading the plug-in on first run""" +"""Ease the AYON on-boarding process by loading the plug-in on first run""" -OPENPYPE_PLUGIN_NAME = "openpype_plugin" +AYON_PLUGIN_NAME = "ayon_plugin" def start_plugin(): @@ -19,9 +19,9 @@ def start_plugin(): # later than this startup script, we check whether its menu initialized is_before_plugins_menu = PLUGINS_MENU is None - settings = get_settings(OPENPYPE_PLUGIN_NAME) + settings = get_settings(AYON_PLUGIN_NAME) if settings.value(LAUNCH_AT_START_KEY, None) is None: - print("Initializing OpenPype plug-in on first run...") + print("Initializing AYON plug-in on first run...") if is_before_plugins_menu: print("- running before 'painter_plugins_ui'") # Delay the launch to the painter_plugins_ui initialization @@ -29,11 +29,11 @@ def start_plugin(): else: # Launch now print("- running after 'painter_plugins_ui'") - plugin_manager(OPENPYPE_PLUGIN_NAME)(True) + plugin_manager(AYON_PLUGIN_NAME)(True) # Set the checked state in the menu to avoid confusion action = next(action for action in PLUGINS_MENU._menu.actions() - if action.text() == OPENPYPE_PLUGIN_NAME) + if action.text() == AYON_PLUGIN_NAME) if action is not None: action.blockSignals(True) action.setChecked(True) diff --git a/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_textures.py similarity index 67% rename from client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_textures.py index f46afadb5a..8869cb5eb0 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_textures.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- """Creator plugin for creating textures.""" - from ayon_core.pipeline import CreatedInstance, Creator, CreatorError from ayon_core.lib import ( EnumDef, @@ -9,14 +8,15 @@ from ayon_core.lib import ( BoolDef ) -from ayon_core.hosts.substancepainter.api.pipeline import ( +from ayon_substancepainter.api.pipeline import ( get_instances, set_instance, set_instances, remove_instance ) -from ayon_core.hosts.substancepainter.api.lib import get_export_presets +from ayon_substancepainter.api.lib import get_export_presets +import substance_painter import substance_painter.project @@ -28,9 +28,17 @@ class CreateTextures(Creator): icon = "picture-o" default_variant = "Main" + settings_category = "substancepainter" + channel_mapping = [] + + def apply_settings(self, project_settings): + settings = project_settings["substancepainter"].get("create", []) # noqa + if settings: + self.channel_mapping = settings["CreateTextures"].get( + "channel_mapping", []) + def create(self, product_name, instance_data, pre_create_data): - if not substance_painter.project.is_open(): raise CreatorError("Can't create a Texture Set instance without " "an open project.") @@ -42,11 +50,20 @@ class CreateTextures(Creator): "exportFileFormat", "exportSize", "exportPadding", - "exportDilationDistance" + "exportDilationDistance", + "useCustomExportPreset", + "exportChannel" ]: if key in pre_create_data: creator_attributes[key] = pre_create_data[key] + if pre_create_data.get("use_selection"): + stack = substance_painter.textureset.get_active_stack() + + instance_data["selected_node_id"] = [ + node_number.uid() for node_number in + substance_painter.layerstack.get_selected_nodes(stack)] + instance = self.create_instance_in_context(product_name, instance_data) set_instance( @@ -88,8 +105,53 @@ class CreateTextures(Creator): return instance def get_instance_attr_defs(self): + if self.channel_mapping: + export_channel_enum = { + item["value"]: item["name"] + for item in self.channel_mapping + } + else: + export_channel_enum = { + "BaseColor": "Base Color", + "Metallic": "Metallic", + "Roughness": "Roughness", + "SpecularEdgeColor": "Specular Edge Color", + "Emissive": "Emissive", + "Opacity": "Opacity", + "Displacement": "Displacement", + "Glossiness": "Glossiness", + "Anisotropylevel": "Anisotropy Level", + "AO": "Ambient Occulsion", + "Anisotropyangle": "Anisotropy Angle", + "Transmissive": "Transmissive", + "Reflection": "Reflection", + "Diffuse": "Diffuse", + "Ior": "Index of Refraction", + "Specularlevel": "Specular Level", + "BlendingMask": "Blending Mask", + "Translucency": "Translucency", + "Scattering": "Scattering", + "ScatterColor": "Scatter Color", + "SheenOpacity": "Sheen Opacity", + "SheenRoughness": "Sheen Roughness", + "SheenColor": "Sheen Color", + "CoatOpacity": "Coat Opacity", + "CoatColor": "Coat Color", + "CoatRoughness": "Coat Roughness", + "CoatSpecularLevel": "Coat Specular Level", + "CoatNormal": "Coat Normal", + } return [ + EnumDef("exportChannel", + items=export_channel_enum, + multiselection=True, + default=None, + label="Export Channel(s)", + tooltip="Choose the channel which you " + "want to solely export. The value " + "is 'None' by default which exports " + "all channels"), EnumDef("exportPresetUrl", items=get_export_presets(), label="Output Template"), @@ -149,7 +211,6 @@ class CreateTextures(Creator): }, default=None, label="Size"), - EnumDef("exportPadding", items={ "passthrough": "No padding (passthrough)", @@ -172,4 +233,10 @@ class CreateTextures(Creator): def get_pre_create_attr_defs(self): # Use same attributes as for instance attributes - return self.get_instance_attr_defs() + attr_defs = [] + if substance_painter.application.version_info()[0] >= 10: + attr_defs.append( + BoolDef("use_selection", label="Use selection", + tooltip="Select Layer Stack(s) for exporting") + ) + return attr_defs + self.get_instance_attr_defs() diff --git a/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_workfile.py similarity index 97% rename from client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_workfile.py index 63b1c6c7da..b100e4189d 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/plugins/create/create_workfile.py @@ -5,7 +5,7 @@ import ayon_api from ayon_core.pipeline import CreatedInstance, AutoCreator -from ayon_core.hosts.substancepainter.api.pipeline import ( +from ayon_substancepainter.api.pipeline import ( set_instances, set_instance, get_instances @@ -22,6 +22,7 @@ class CreateWorkfile(AutoCreator): icon = "document" default_variant = "Main" + settings_category = "substancepainter" def create(self): diff --git a/client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/load/load_mesh.py similarity index 99% rename from client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/load/load_mesh.py index d5aac1191c..e2a48dd5a4 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/load/load_mesh.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/plugins/load/load_mesh.py @@ -5,7 +5,7 @@ from ayon_core.pipeline import ( get_representation_path, ) from ayon_core.pipeline.load import LoadError -from ayon_core.hosts.substancepainter.api.pipeline import ( +from ayon_substancepainter.api.pipeline import ( imprint_container, set_container_metadata, remove_container_metadata diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_current_file.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_current_file.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/plugins/publish/collect_current_file.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_current_file.py diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_textureset_images.py similarity index 96% rename from client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_textureset_images.py index 20aaa56993..6d2336cbc0 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_textureset_images.py @@ -6,8 +6,9 @@ import ayon_api import substance_painter.textureset from ayon_core.pipeline import publish -from ayon_core.hosts.substancepainter.api.lib import ( +from ayon_substancepainter.api.lib import ( get_parsed_export_maps, + get_filtered_export_preset, strip_template ) from ayon_core.pipeline.create import get_product_name @@ -207,5 +208,8 @@ class CollectTextureSet(pyblish.api.InstancePlugin): for key, value in dict(parameters).items(): if value is None: parameters.pop(key) - + channel_layer = creator_attrs.get("exportChannel", []) + if channel_layer: + maps = get_filtered_export_preset(preset_url, channel_layer) + config.update(maps) return config diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_workfile_representation.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_workfile_representation.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/plugins/publish/collect_workfile_representation.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/collect_workfile_representation.py diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/extract_textures.py similarity index 66% rename from client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/extract_textures.py index 0fa7b52f45..52212922ae 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/extract_textures.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/extract_textures.py @@ -1,6 +1,6 @@ import substance_painter.export - from ayon_core.pipeline import KnownPublishError, publish +from ayon_substancepainter.api.lib import set_layer_stack_opacity class ExtractTextures(publish.Extractor, @@ -25,19 +25,24 @@ class ExtractTextures(publish.Extractor, def process(self, instance): config = instance.data["exportConfig"] - result = substance_painter.export.export_project_textures(config) + creator_attrs = instance.data["creator_attributes"] + export_channel = creator_attrs.get("exportChannel", []) + node_ids = instance.data.get("selected_node_id", []) - if result.status != substance_painter.export.ExportStatus.Success: - raise KnownPublishError( - "Failed to export texture set: {}".format(result.message) - ) + with set_layer_stack_opacity(node_ids, export_channel): + result = substance_painter.export.export_project_textures(config) - # Log what files we generated - for (texture_set_name, stack_name), maps in result.textures.items(): - # Log our texture outputs - self.log.info(f"Exported stack: {texture_set_name} {stack_name}") - for texture_map in maps: - self.log.info(f"Exported texture: {texture_map}") + if result.status != substance_painter.export.ExportStatus.Success: + raise KnownPublishError( + "Failed to export texture set: {}".format(result.message) + ) + + # Log what files we generated + for (texture_set_name, stack_name), maps in result.textures.items(): + # Log our texture outputs + self.log.info(f"Exported stack: {texture_set_name} {stack_name}") + for texture_map in maps: + self.log.info(f"Exported texture: {texture_map}") # We'll insert the color space data for each image instance that we # added into this texture set. The collector couldn't do so because diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/increment_workfile.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/increment_workfile.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/plugins/publish/increment_workfile.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/increment_workfile.py diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/save_workfile.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/save_workfile.py similarity index 100% rename from client/ayon_core/hosts/substancepainter/plugins/publish/save_workfile.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/save_workfile.py diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/validate_ouput_maps.py similarity index 71% rename from client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py rename to server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/validate_ouput_maps.py index 720771994c..3293e7f204 100644 --- a/client/ayon_core/hosts/substancepainter/plugins/publish/validate_ouput_maps.py +++ b/server_addon/substancepainter/client/ayon_substancepainter/plugins/publish/validate_ouput_maps.py @@ -30,11 +30,16 @@ class ValidateOutputMaps(pyblish.api.InstancePlugin): # it will generate without actually exporting the files. So we try to # generate the smallest size / fastest export as possible config = copy.deepcopy(config) + invalid_channels = self.get_invalid_channels(instance, config) + if invalid_channels: + raise PublishValidationError( + "Invalid Channel(s): {} found in texture set {}".format( + invalid_channels, instance.name + )) parameters = config["exportParameters"][0]["parameters"] parameters["sizeLog2"] = [1, 1] # output 2x2 images (smallest) parameters["paddingAlgorithm"] = "passthrough" # no dilation (faster) parameters["dithering"] = False # no dithering (faster) - result = substance_painter.export.export_project_textures(config) if result.status != substance_painter.export.ExportStatus.Success: raise PublishValidationError( @@ -108,3 +113,41 @@ class ValidateOutputMaps(pyblish.api.InstancePlugin): message=message, title="Missing output maps" ) + + def get_invalid_channels(self, instance, config): + """Function to get invalid channel(s) from export channel + filtering + + Args: + instance (pyblish.api.Instance): Instance + config (dict): export config + + Raises: + PublishValidationError: raise Publish Validation + Error if any invalid channel(s) found + + Returns: + list: invalid channel(s) + """ + creator_attrs = instance.data["creator_attributes"] + export_channel = creator_attrs.get("exportChannel", []) + tmp_export_channel = copy.deepcopy(export_channel) + invalid_channel = [] + if export_channel: + for export_preset in config.get("exportPresets", {}): + if not export_preset.get("maps", {}): + raise PublishValidationError( + "No Texture Map Exported with texture set: {}.".format( + instance.name) + ) + map_names = [channel_map["fileName"] for channel_map + in export_preset["maps"]] + for channel in tmp_export_channel: + # Check if channel is found in at least one map + for map_name in map_names: + if channel in map_name: + break + else: + invalid_channel.append(channel) + + return invalid_channel diff --git a/server_addon/substancepainter/package.py b/server_addon/substancepainter/package.py index d445b0059f..4db5ef634f 100644 --- a/server_addon/substancepainter/package.py +++ b/server_addon/substancepainter/package.py @@ -1,3 +1,10 @@ name = "substancepainter" title = "Substance Painter" -version = "0.1.1" +version = "0.2.0" + +client_dir = "ayon_substancepainter" + +ayon_required_addons = { + "core": ">0.3.2", +} +ayon_compatible_addons = {} diff --git a/server_addon/substancepainter/server/settings/creator_plugins.py b/server_addon/substancepainter/server/settings/creator_plugins.py new file mode 100644 index 0000000000..9ba7684d30 --- /dev/null +++ b/server_addon/substancepainter/server/settings/creator_plugins.py @@ -0,0 +1,59 @@ +from ayon_server.settings import BaseSettingsModel, SettingsField + + +class ChannelMappingItemModel(BaseSettingsModel): + _layout = "compact" + name: str = SettingsField(title="Channel Type") + value: str = SettingsField(title="Channel Map") + + +class CreateTextureModel(BaseSettingsModel): + channel_mapping: list[ChannelMappingItemModel] = SettingsField( + default_factory=list, title="Channel Mapping") + + +class CreatorsModel(BaseSettingsModel): + CreateTextures: CreateTextureModel = SettingsField( + default_factory=CreateTextureModel, + title="Create Textures" + ) + + +DEFAULT_CREATOR_SETTINGS = { + "CreateTextures": { + "channel_mapping": [ + {"name": "Base Color", "value": "BaseColor"}, + {"name": "Metallic", "value": "Metallic"}, + {"name": "Roughness", "value": "Roughness"}, + {"name": "Normal", "value": "Normal"}, + {"name": "Height", "value": "Height"}, + {"name": "Specular Edge Color", + "value": "SpecularEdgeColor"}, + {"name": "Opacity", "value": "Opacity"}, + {"name": "Displacement", "value": "Displacement"}, + {"name": "Glossiness", "value": "Glossiness"}, + {"name": "Anisotropy Level", + "value": "Anisotropylevel"}, + {"name": "Ambient Occulsion", "value": "AO"}, + {"name": "Anisotropy Angle", + "value": "Anisotropyangle"}, + {"name": "Transmissive", "value": "Transmissive"}, + {"name": "Reflection", "value": "Reflection"}, + {"name": "Diffuse", "value": "Diffuse"}, + {"name": "Index of Refraction", "value": "Ior"}, + {"name": "Specular Level", "value": "Specularlevel"}, + {"name": "Blending Mask", "value": "BlendingMask"}, + {"name": "Translucency", "value": "Translucency"}, + {"name": "Scattering", "value": "Scattering"}, + {"name": "Scatter Color", "value": "ScatterColor"}, + {"name": "Sheen Opacity", "value": "SheenOpacity"}, + {"name": "Sheen Color", "value": "SheenColor"}, + {"name": "Coat Opacity", "value": "CoatOpacity"}, + {"name": "Coat Color", "value": "CoatColor"}, + {"name": "Coat Roughness", "value": "CoatRoughness"}, + {"name": "CoatSpecularLevel", + "value": "Coat Specular Level"}, + {"name": "CoatNormal", "value": "Coat Normal"} + ], + } +} \ No newline at end of file diff --git a/server_addon/substancepainter/server/settings/main.py b/server_addon/substancepainter/server/settings/main.py index 93523fd650..9a13d2c32f 100644 --- a/server_addon/substancepainter/server/settings/main.py +++ b/server_addon/substancepainter/server/settings/main.py @@ -1,5 +1,6 @@ from ayon_server.settings import BaseSettingsModel, SettingsField from .imageio import ImageIOSettings, DEFAULT_IMAGEIO_SETTINGS +from .creator_plugins import CreatorsModel, DEFAULT_CREATOR_SETTINGS from .load_plugins import LoadersModel, DEFAULT_LOADER_SETTINGS @@ -18,6 +19,8 @@ class SubstancePainterSettings(BaseSettingsModel): default_factory=list, title="Shelves" ) + create: CreatorsModel = SettingsField( + default_factory=DEFAULT_CREATOR_SETTINGS, title="Creators") load: LoadersModel = SettingsField( default_factory=DEFAULT_LOADER_SETTINGS, title="Loaders") @@ -25,5 +28,7 @@ class SubstancePainterSettings(BaseSettingsModel): DEFAULT_SPAINTER_SETTINGS = { "imageio": DEFAULT_IMAGEIO_SETTINGS, "shelves": [], + "create": DEFAULT_CREATOR_SETTINGS, "load": DEFAULT_LOADER_SETTINGS, + } diff --git a/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py index 5f0a84be4a..bc003c0601 100644 --- a/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py +++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/create/create_editorial_package.py @@ -16,13 +16,13 @@ class EditorialPackageCreator(TrayPublishCreator): """Creates instance for OTIO file from published folder. Folder contains OTIO file and exported .mov files. Process should publish - whole folder as single `editorial_pckg` product type and (possibly) convert + whole folder as single `editorial_pkg` product type and (possibly) convert .mov files into different format and copy them into `publish` `resources` subfolder. """ - identifier = "editorial_pckg" + identifier = "editorial_pkg" label = "Editorial package" - product_type = "editorial_pckg" + product_type = "editorial_pkg" description = "Publish folder with OTIO file and resources" # Position batch creator after simple creators @@ -89,8 +89,8 @@ class EditorialPackageCreator(TrayPublishCreator): def get_detail_description(self): return """# Publish folder with OTIO file and video clips - Folder contains OTIO file and exported .mov files. Process should - publish whole folder as single `editorial_pckg` product type and - (possibly) convert .mov files into different format and copy them into + Folder contains OTIO file and exported .mov files. Process should + publish whole folder as single `editorial_pkg` product type and + (possibly) convert .mov files into different format and copy them into `publish` `resources` subfolder. """ diff --git a/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py index cb1277546c..fb7d5cd5a1 100644 --- a/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py +++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/collect_editorial_package.py @@ -1,10 +1,10 @@ -"""Produces instance.data["editorial_pckg"] data used during integration. +"""Produces instance.data["editorial_pkg"] data used during integration. Requires: instance.data["creator_attributes"]["path"] - from creator Provides: - instance -> editorial_pckg (dict): + instance -> editorial_pkg (dict): folder_path (str) otio_path (str) - from dragged folder resource_paths (list) @@ -24,7 +24,7 @@ class CollectEditorialPackage(pyblish.api.InstancePlugin): order = pyblish.api.CollectorOrder - 0.1 hosts = ["traypublisher"] - families = ["editorial_pckg"] + families = ["editorial_pkg"] def process(self, instance): folder_path = instance.data["creator_attributes"]["folder_path"] @@ -34,14 +34,14 @@ class CollectEditorialPackage(pyblish.api.InstancePlugin): )) return - instance.data["editorial_pckg"] = {} - instance.data["editorial_pckg"]["folder_path"] = folder_path + instance.data["editorial_pkg"] = {} + instance.data["editorial_pkg"]["folder_path"] = folder_path otio_path, resource_paths = ( self._get_otio_and_resource_paths(folder_path)) - instance.data["editorial_pckg"]["otio_path"] = otio_path - instance.data["editorial_pckg"]["resource_paths"] = resource_paths + instance.data["editorial_pkg"]["otio_path"] = otio_path + instance.data["editorial_pkg"]["resource_paths"] = resource_paths def _get_otio_and_resource_paths(self, folder_path): otio_path = None diff --git a/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py index 6dd4e84704..3e391b5f6e 100644 --- a/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py +++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/extract_editorial_pckg.py @@ -20,27 +20,27 @@ class ExtractEditorialPckgConversion(publish.Extractor): label = "Extract Editorial Package" order = pyblish.api.ExtractorOrder - 0.45 hosts = ["traypublisher"] - families = ["editorial_pckg"] + families = ["editorial_pkg"] def process(self, instance): - editorial_pckg_data = instance.data.get("editorial_pckg") + editorial_pkg_data = instance.data.get("editorial_pkg") - otio_path = editorial_pckg_data["otio_path"] + otio_path = editorial_pkg_data["otio_path"] otio_basename = os.path.basename(otio_path) staging_dir = self.staging_dir(instance) - editorial_pckg_repre = { - 'name': "editorial_pckg", + editorial_pkg_repre = { + 'name': "editorial_pkg", 'ext': "otio", 'files': otio_basename, "stagingDir": staging_dir, } otio_staging_path = os.path.join(staging_dir, otio_basename) - instance.data["representations"].append(editorial_pckg_repre) + instance.data["representations"].append(editorial_pkg_repre) publish_resource_folder = self._get_publish_resource_folder(instance) - resource_paths = editorial_pckg_data["resource_paths"] + resource_paths = editorial_pkg_data["resource_paths"] transfers = self._get_transfers(resource_paths, publish_resource_folder) @@ -61,13 +61,13 @@ class ExtractEditorialPckgConversion(publish.Extractor): source_to_rootless = self._get_resource_path_mapping(instance, transfers) - otio_data = editorial_pckg_data["otio_data"] + otio_data = editorial_pkg_data["otio_data"] otio_data = self._replace_target_urls(otio_data, source_to_rootless) opentimelineio.adapters.write_to_file(otio_data, otio_staging_path) self.log.info("Added Editorial Package representation: {}".format( - editorial_pckg_repre)) + editorial_pkg_repre)) def _get_publish_resource_folder(self, instance): """Calculates publish folder and create it.""" diff --git a/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py index c63c4a6a73..02793516e2 100644 --- a/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py +++ b/server_addon/traypublisher/client/ayon_traypublisher/plugins/publish/validate_editorial_package.py @@ -1,5 +1,7 @@ import os import opentimelineio +from opentimelineio.exceptions import UnsupportedSchemaError + import pyblish.api from ayon_core.pipeline import PublishValidationError @@ -17,26 +19,35 @@ class ValidateEditorialPackage(pyblish.api.InstancePlugin): order = pyblish.api.ValidatorOrder - 0.49 hosts = ["traypublisher"] - families = ["editorial_pckg"] + families = ["editorial_pkg"] def process(self, instance): - editorial_pckg_data = instance.data.get("editorial_pckg") - if not editorial_pckg_data: + editorial_pkg_data = instance.data.get("editorial_pkg") + if not editorial_pkg_data: raise PublishValidationError("Editorial package not collected") - folder_path = editorial_pckg_data["folder_path"] + folder_path = editorial_pkg_data["folder_path"] - otio_path = editorial_pckg_data["otio_path"] + otio_path = editorial_pkg_data["otio_path"] if not otio_path: raise PublishValidationError( f"Folder {folder_path} missing otio file") - resource_paths = editorial_pckg_data["resource_paths"] + resource_paths = editorial_pkg_data["resource_paths"] resource_file_names = {os.path.basename(path) for path in resource_paths} - otio_data = opentimelineio.adapters.read_from_file(otio_path) + try: + otio_data = opentimelineio.adapters.read_from_file(otio_path) + except UnsupportedSchemaError as e: + raise PublishValidationError( + f"Unsupported schema in otio file '{otio_path}'." + "Version of your OpenTimelineIO library is too old." + "Please update it to the latest version." + f"Current version is '{opentimelineio.__version__}', " + "but required is at least 0.16.0." + ) from e target_urls = self._get_all_target_urls(otio_data) missing_files = set() @@ -50,7 +61,7 @@ class ValidateEditorialPackage(pyblish.api.InstancePlugin): f"Otio file contains missing files `{missing_files}`.\n\n" f"Please add them to `{folder_path}` and republish.") - instance.data["editorial_pckg"]["otio_data"] = otio_data + instance.data["editorial_pkg"]["otio_data"] = otio_data def _get_all_target_urls(self, otio_data): target_urls = [] diff --git a/server_addon/traypublisher/package.py b/server_addon/traypublisher/package.py index ea04835b45..c9b94c2b72 100644 --- a/server_addon/traypublisher/package.py +++ b/server_addon/traypublisher/package.py @@ -1,6 +1,6 @@ name = "traypublisher" title = "TrayPublisher" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_traypublisher" diff --git a/server_addon/tvpaint/client/ayon_tvpaint/__init__.py b/server_addon/tvpaint/client/ayon_tvpaint/__init__.py index b98680f204..2c4a052234 100644 --- a/server_addon/tvpaint/client/ayon_tvpaint/__init__.py +++ b/server_addon/tvpaint/client/ayon_tvpaint/__init__.py @@ -1,3 +1,4 @@ +from .version import __version__ from .addon import ( get_launch_script_path, TVPaintAddon, @@ -6,6 +7,8 @@ from .addon import ( __all__ = ( + "__version__", + "get_launch_script_path", "TVPaintAddon", "TVPAINT_ROOT_DIR", diff --git a/server_addon/tvpaint/client/ayon_tvpaint/addon.py b/server_addon/tvpaint/client/ayon_tvpaint/addon.py index 6756b274f9..c98c929a96 100644 --- a/server_addon/tvpaint/client/ayon_tvpaint/addon.py +++ b/server_addon/tvpaint/client/ayon_tvpaint/addon.py @@ -1,6 +1,8 @@ import os from ayon_core.addon import AYONAddon, IHostAddon +from .version import __version__ + TVPAINT_ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -14,6 +16,7 @@ def get_launch_script_path(): class TVPaintAddon(AYONAddon, IHostAddon): name = "tvpaint" + version = __version__ host_name = "tvpaint" def add_implementation_envs(self, env, _app): diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py index de61992d3f..18b06c9632 100644 --- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py +++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_image.py @@ -8,6 +8,7 @@ class ImportImage(plugin.Loader): product_types = {"render", "image", "background", "plate", "review"} representations = {"*"} + settings_category = "tvpaint" label = "Import Image" order = 1 diff --git a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py index ce08aa9cd9..88bf738999 100644 --- a/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py +++ b/server_addon/tvpaint/client/ayon_tvpaint/plugins/load/load_reference_image.py @@ -19,6 +19,7 @@ class LoadImage(plugin.Loader): product_types = {"render", "image", "background", "plate", "review"} representations = {"*"} + settings_category = "tvpaint" label = "Load Image" order = 1 diff --git a/server_addon/tvpaint/client/ayon_tvpaint/version.py b/server_addon/tvpaint/client/ayon_tvpaint/version.py new file mode 100644 index 0000000000..03419cd02e --- /dev/null +++ b/server_addon/tvpaint/client/ayon_tvpaint/version.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +"""Package declaring AYON addon 'tvpaint' version.""" +__version__ = "0.2.1" diff --git a/server_addon/tvpaint/package.py b/server_addon/tvpaint/package.py index 3ab35f727e..eddb112b16 100644 --- a/server_addon/tvpaint/package.py +++ b/server_addon/tvpaint/package.py @@ -1,6 +1,6 @@ name = "tvpaint" title = "TVPaint" -version = "0.2.0" +version = "0.2.1" client_dir = "ayon_tvpaint" ayon_required_addons = { diff --git a/server_addon/tvpaint/pyproject.toml b/server_addon/tvpaint/pyproject.toml new file mode 100644 index 0000000000..46d0611d74 --- /dev/null +++ b/server_addon/tvpaint/pyproject.toml @@ -0,0 +1,6 @@ +[project] +name="tvpaint" +description="AYON TVPaint addon." + +[ayon.runtimeDependencies] +aiohttp_json_rpc = "*"