diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py index f4425d9216..6b62ea09d4 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_asset_handles.py @@ -3,11 +3,11 @@ import hou # noqa import pyblish.api from ayon_core.lib import BoolDef -from ayon_core.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import AYONPyblishPluginMixin class CollectAssetHandles(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Apply asset handles. If instance does not have: diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py index 5a6b0b156c..3e2561dd6f 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_chunk_size.py @@ -1,10 +1,10 @@ import pyblish.api from ayon_core.lib import NumberDef -from ayon_core.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import AYONPyblishPluginMixin class CollectChunkSize(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Collect chunk size for cache submission to Deadline.""" order = pyblish.api.CollectorOrder + 0.05 diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_review.py b/client/ayon_core/hosts/max/plugins/publish/collect_review.py index 98899de4da..d746e2b2db 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_review.py +++ b/client/ayon_core/hosts/max/plugins/publish/collect_review.py @@ -6,13 +6,13 @@ 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_core.pipeline.publish import ( - OpenPypePyblishPluginMixin, + AYONPyblishPluginMixin, KnownPublishError ) class CollectReview(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Collect Review Data for Preview Animation""" order = pyblish.api.CollectorOrder + 0.02 diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py b/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py index 248a719218..4855e952d8 100644 --- a/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py +++ b/client/ayon_core/hosts/max/plugins/publish/collect_tycache_attributes.py @@ -1,11 +1,11 @@ import pyblish.api from ayon_core.lib import EnumDef, TextDef -from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import AYONPyblishPluginMixin class CollectTyCacheData(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Collect Channel Attributes for TyCache Export""" order = pyblish.api.CollectorOrder + 0.02 diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py index 7d2e484c94..5045a8d252 100644 --- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py +++ b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py @@ -6,11 +6,11 @@ from maya import cmds from ayon_core.hosts.maya.api.lib import maintained_selection from ayon_core.pipeline import AVALON_CONTAINER_ID, publish -from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import AYONPyblishPluginMixin from ayon_core.lib import BoolDef -class ExtractMayaSceneRaw(publish.Extractor, OpenPypePyblishPluginMixin): +class ExtractMayaSceneRaw(publish.Extractor, AYONPyblishPluginMixin): """Extract as Maya Scene (raw). This will preserve all references, construction history, etc. diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py index 96b215829f..b194e9bf00 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_colorspace_look.py @@ -6,7 +6,7 @@ from ayon_core.pipeline import colorspace class CollectColorspaceLook(pyblish.api.InstancePlugin, - publish.OpenPypePyblishPluginMixin): + publish.AYONPyblishPluginMixin): """Collect OCIO colorspace look from LUT file """ diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py index 346131ac44..8e29a0048d 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py @@ -9,7 +9,7 @@ from ayon_core.pipeline.publish import KnownPublishError class CollectColorspace(pyblish.api.InstancePlugin, - publish.OpenPypePyblishPluginMixin, + publish.AYONPyblishPluginMixin, publish.ColormanagedPyblishPluginMixin): """Collect explicit user defined representation colorspaces""" diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py index da33b9bfbd..c4f2915ef8 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_movie_batch.py @@ -1,11 +1,11 @@ import os import pyblish.api -from ayon_core.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import AYONPyblishPluginMixin class CollectMovieBatch( - pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin + pyblish.api.InstancePlugin, AYONPyblishPluginMixin ): """Collect file url for batch movies and create representation. diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py index 4d1bdbdbfc..f7be322e74 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/extract_colorspace_look.py @@ -5,7 +5,7 @@ from ayon_core.pipeline import publish class ExtractColorspaceLook(publish.Extractor, - publish.OpenPypePyblishPluginMixin): + publish.AYONPyblishPluginMixin): """Extract OCIO colorspace look from LUT file """ diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py index 3a63db4af1..9f629f78dd 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace.py @@ -11,7 +11,7 @@ from ayon_core.pipeline.colorspace import ( class ValidateColorspace(pyblish.api.InstancePlugin, - publish.OpenPypePyblishPluginMixin, + publish.AYONPyblishPluginMixin, publish.ColormanagedPyblishPluginMixin): """Validate representation colorspaces""" diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py index 3f30e03388..91c7632376 100644 --- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py +++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_colorspace_look.py @@ -7,7 +7,7 @@ from ayon_core.pipeline import ( class ValidateColorspaceLook(pyblish.api.InstancePlugin, - publish.OpenPypePyblishPluginMixin): + publish.AYONPyblishPluginMixin): """Validate colorspace look attributes""" label = "Validate colorspace look attributes" diff --git a/client/ayon_core/modules/deadline/abstract_submit_deadline.py b/client/ayon_core/modules/deadline/abstract_submit_deadline.py index 2a33075ef2..b2da4d1398 100644 --- a/client/ayon_core/modules/deadline/abstract_submit_deadline.py +++ b/client/ayon_core/modules/deadline/abstract_submit_deadline.py @@ -20,7 +20,7 @@ import pyblish.api from ayon_core.pipeline.publish import ( AbstractMetaInstancePlugin, KnownPublishError, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ) from ayon_core.pipeline.publish.lib import ( replace_with_published_scene_path @@ -406,7 +406,7 @@ class DeadlineJobInfo(object): @six.add_metaclass(AbstractMetaInstancePlugin) class AbstractSubmitDeadline(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Class abstracting access to Deadline.""" label = "Submit to Deadline" diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py index bd48695422..6c35012173 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py +++ b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- import pyblish.api from ayon_core.lib import TextDef -from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import AYONPyblishPluginMixin class CollectDeadlinePools(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Collect pools from instance or Publisher attributes, from Setting otherwise. diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py index 1dc19b0d11..776d7ecdaa 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py @@ -13,7 +13,7 @@ from ayon_core.lib import ( TextDef, ) from ayon_core.pipeline import legacy_io -from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import AYONPyblishPluginMixin from ayon_core.pipeline.farm.tools import iter_expected_files from ayon_core.tests.lib import is_in_tests @@ -29,7 +29,7 @@ class BlenderPluginInfo(): class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): label = "Submit Render to Deadline" hosts = ["blender"] families = ["render"] 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 7327eb0be5..8355e857e9 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 @@ -8,7 +8,7 @@ import pyblish.api from ayon_core.pipeline import legacy_io from ayon_core.pipeline.publish import ( - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ) from ayon_core.lib import ( BoolDef, @@ -19,7 +19,7 @@ from ayon_core.lib import ( class FusionSubmitDeadline( pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ): """Submit current Comp to Deadline diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py index d548a59c4e..96558a3af9 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py @@ -10,7 +10,7 @@ from ayon_core.lib import ( ) from ayon_core.pipeline import ( legacy_io, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ) from ayon_core.tests.lib import is_in_tests from ayon_core.lib import is_running_from_build @@ -32,7 +32,7 @@ class HoudiniPluginInfo(object): class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, # noqa - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Submit Houdini scene to perform a local publish in Deadline. Publishing in Deadline can be helpful for scenes that publish very slow. diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py index e1b92a2769..56a1c27288 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py @@ -5,7 +5,7 @@ from datetime import datetime import pyblish.api -from ayon_core.pipeline import legacy_io, OpenPypePyblishPluginMixin +from ayon_core.pipeline import legacy_io, AYONPyblishPluginMixin from ayon_core.tests.lib import is_in_tests from openpype_modules.deadline import abstract_submit_deadline from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo @@ -50,7 +50,7 @@ class RedshiftRenderPluginInfo(): class HoudiniSubmitDeadline( abstract_submit_deadline.AbstractSubmitDeadline, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ): """Submit Render ROPs to Deadline. 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 99f9454ca6..6781a6a8ee 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 @@ -10,7 +10,7 @@ from ayon_core.lib import ( ) from ayon_core.pipeline import ( legacy_io, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ) from ayon_core.pipeline.publish.lib import ( replace_with_published_scene_path @@ -35,7 +35,7 @@ class MaxPluginInfo(object): class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): label = "Submit Render to Deadline" hosts = ["max"] 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 23d0c6370a..76a7e5e182 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 @@ -30,7 +30,7 @@ import attr from ayon_core.pipeline import ( legacy_io, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ) from ayon_core.lib import ( BoolDef, @@ -100,7 +100,7 @@ class ArnoldPluginInfo(object): class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): label = "Submit Render to Deadline" hosts = ["maya"] diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py index 9a37c667c7..4ea3ae2eaf 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py @@ -9,7 +9,7 @@ import pyblish.api from ayon_core.pipeline import legacy_io from ayon_core.pipeline.publish import ( - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ) from ayon_core.tests.lib import is_in_tests from ayon_core.lib import ( @@ -20,7 +20,7 @@ from ayon_core.lib import ( class NukeSubmitDeadline(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Submit write to Deadline Renders are submitted to a Deadline Web Service as diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py index 498f579d69..c72479b869 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py @@ -26,7 +26,7 @@ from ayon_core.pipeline.farm.pyblish_functions import ( class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, - publish.OpenPypePyblishPluginMixin, + publish.AYONPyblishPluginMixin, publish.ColormanagedPyblishPluginMixin): """Process Cache Job submitted on farm This is replicated version of submit publish job diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py index 7931721780..a218560adc 100644 --- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py +++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py @@ -54,7 +54,7 @@ def get_resource_files(resources, frame_range=None): class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, - publish.OpenPypePyblishPluginMixin, + publish.AYONPyblishPluginMixin, publish.ColormanagedPyblishPluginMixin): """Process Job submitted on farm. diff --git a/client/ayon_core/modules/royalrender/lib.py b/client/ayon_core/modules/royalrender/lib.py index df29fa9d46..d985a39d24 100644 --- a/client/ayon_core/modules/royalrender/lib.py +++ b/client/ayon_core/modules/royalrender/lib.py @@ -19,14 +19,14 @@ from ayon_core.modules.royalrender.rr_job import ( RREnvList, get_rr_platform, ) -from ayon_core.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import AYONPyblishPluginMixin from ayon_core.pipeline.publish import KnownPublishError from ayon_core.pipeline.publish.lib import get_published_workfile_instance from ayon_core.tests.lib import is_in_tests class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin): + AYONPyblishPluginMixin): """Creates separate rendering job for Royal Render""" label = "Create Nuke Render job in RR" order = pyblish.api.IntegratorOrder + 0.1 diff --git a/client/ayon_core/pipeline/create/README.md b/client/ayon_core/pipeline/create/README.md index 02b64e52ea..012572a776 100644 --- a/client/ayon_core/pipeline/create/README.md +++ b/client/ayon_core/pipeline/create/README.md @@ -6,7 +6,7 @@ Entry point of creation. All data and metadata are handled through create contex Discovers Creator plugins to be able create new instances and convert existing instances. Creators may have defined attributes that are specific for their instances. Attributes definition can enhance behavior of instance during publishing. -Publish plugins are loaded because they can also define attributes definitions. These are less family specific To be able define attributes Publish plugin must inherit from `OpenPypePyblishPluginMixin` and must override `get_attribute_defs` class method which must return list of attribute definitions. Values of publish plugin definitions are stored per plugin name under `publish_attributes`. Also can override `convert_attribute_values` class method which gives ability to modify values on instance before are used in CreatedInstance. Method `convert_attribute_values` can be also used without `get_attribute_defs` to modify values when changing compatibility (remove metadata from instance because are irrelevant). +Publish plugins are loaded because they can also define attributes definitions. These are less family specific To be able define attributes Publish plugin must inherit from `AYONPyblishPluginMixin` and must override `get_attribute_defs` class method which must return list of attribute definitions. Values of publish plugin definitions are stored per plugin name under `publish_attributes`. Also can override `convert_attribute_values` class method which gives ability to modify values on instance before are used in CreatedInstance. Method `convert_attribute_values` can be also used without `get_attribute_defs` to modify values when changing compatibility (remove metadata from instance because are irrelevant). Possible attribute definitions can be found in `openpype/pipeline/lib/attribute_definitions.py`. diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py index 6b94da0e5b..8990d50324 100644 --- a/client/ayon_core/pipeline/create/context.py +++ b/client/ayon_core/pipeline/create/context.py @@ -1200,7 +1200,7 @@ class CreatedInstance: Args: attr_plugins (List[pyblish.api.Plugin]): Pyblish plugins which - inherit from 'OpenPypePyblishPluginMixin' and may contain + inherit from 'AYONPyblishPluginMixin' and may contain attribute definitions. """ @@ -1735,7 +1735,7 @@ class CreateContext: self._reset_convertor_plugins() def _reset_publish_plugins(self, discover_publish_plugins): - from ayon_core.pipeline import OpenPypePyblishPluginMixin + from ayon_core.pipeline import AYONPyblishPluginMixin from ayon_core.pipeline.publish import ( publish_plugins_discover ) @@ -1759,7 +1759,7 @@ class CreateContext: # Collect plugins that can have attribute definitions for plugin in publish_plugins: - if OpenPypePyblishPluginMixin in inspect.getmro(plugin): + if AYONPyblishPluginMixin in inspect.getmro(plugin): plugins_with_defs.append(plugin) plugins_mismatch_targets = [ diff --git a/client/ayon_core/pipeline/publish/README.md b/client/ayon_core/pipeline/publish/README.md index b367a35281..2a0f45d093 100644 --- a/client/ayon_core/pipeline/publish/README.md +++ b/client/ayon_core/pipeline/publish/README.md @@ -17,16 +17,16 @@ Exception `PublishValidationError` 3 arguments: When there is a known error that can't be fixed by user (e.g. can't connect to deadline service, etc.) `KnownPublishError` should be raise. The only difference is that it's message is shown in UI to artist otherwise a neutral message without context is shown. ## Plugin extension -Publish plugins can be extended by additional logic when inherits from `OpenPypePyblishPluginMixin` which can be used as mixin (additional inheritance of class). +Publish plugins can be extended by additional logic when inherits from `AYONPyblishPluginMixin` which can be used as mixin (additional inheritance of class). ```python import pyblish.api -from ayon_core.pipeline import OpenPypePyblishPluginMixin +from ayon_core.pipeline import AYONPyblishPluginMixin # Example context plugin class MyExtendedPlugin( - pyblish.api.ContextPlugin, OpenPypePyblishPluginMixin + pyblish.api.ContextPlugin, AYONPyblishPluginMixin ): pass diff --git a/client/ayon_core/pipeline/publish/__init__.py b/client/ayon_core/pipeline/publish/__init__.py index 3a82d6f565..d507972664 100644 --- a/client/ayon_core/pipeline/publish/__init__.py +++ b/client/ayon_core/pipeline/publish/__init__.py @@ -12,6 +12,7 @@ from .publish_plugins import ( PublishValidationError, PublishXmlValidationError, KnownPublishError, + AYONPyblishPluginMixin, OpenPypePyblishPluginMixin, OptionalPyblishPluginMixin, @@ -62,6 +63,7 @@ __all__ = ( "PublishValidationError", "PublishXmlValidationError", "KnownPublishError", + "AYONPyblishPluginMixin", "OpenPypePyblishPluginMixin", "OptionalPyblishPluginMixin", diff --git a/client/ayon_core/pipeline/publish/publish_plugins.py b/client/ayon_core/pipeline/publish/publish_plugins.py index 98ab38589c..2386558091 100644 --- a/client/ayon_core/pipeline/publish/publish_plugins.py +++ b/client/ayon_core/pipeline/publish/publish_plugins.py @@ -78,7 +78,7 @@ class KnownPublishError(Exception): pass -class OpenPypePyblishPluginMixin: +class AYONPyblishPluginMixin: # TODO # executable_in_thread = False # @@ -166,7 +166,10 @@ class OpenPypePyblishPluginMixin: return self.get_attr_values_from_data_for_plugin(self.__class__, data) -class OptionalPyblishPluginMixin(OpenPypePyblishPluginMixin): +OpenPypePyblishPluginMixin = AYONPyblishPluginMixin + + +class OptionalPyblishPluginMixin(AYONPyblishPluginMixin): """Prepare mixin for optional plugins. Defined active attribute definition prepared for published and diff --git a/client/ayon_core/plugins/publish/collect_comment.py b/client/ayon_core/plugins/publish/collect_comment.py index 4db4827905..dadb7b9e8d 100644 --- a/client/ayon_core/plugins/publish/collect_comment.py +++ b/client/ayon_core/plugins/publish/collect_comment.py @@ -25,12 +25,12 @@ Todos: import pyblish.api from ayon_core.lib.attribute_definitions import TextDef -from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import AYONPyblishPluginMixin class CollectInstanceCommentDef( pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ): label = "Comment per instance" targets = ["local"] @@ -64,7 +64,7 @@ class CollectInstanceCommentDef( class CollectComment( pyblish.api.ContextPlugin, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ): """Collect comment per each instance. diff --git a/client/ayon_core/plugins/publish/collect_frames_fix.py b/client/ayon_core/plugins/publish/collect_frames_fix.py index 5ea2d52b00..4903991d40 100644 --- a/client/ayon_core/plugins/publish/collect_frames_fix.py +++ b/client/ayon_core/plugins/publish/collect_frames_fix.py @@ -4,7 +4,7 @@ from ayon_core.lib.attribute_definitions import ( BoolDef ) -from ayon_core.pipeline.publish import OpenPypePyblishPluginMixin +from ayon_core.pipeline.publish import AYONPyblishPluginMixin from ayon_core.client.entities import ( get_last_version_by_subset_name, get_representations @@ -13,7 +13,7 @@ from ayon_core.client.entities import ( class CollectFramesFixDef( pyblish.api.InstancePlugin, - OpenPypePyblishPluginMixin + AYONPyblishPluginMixin ): """Provides text field to insert frame(s) to be rerendered. diff --git a/client/ayon_core/tools/publisher/widgets/widgets.py b/client/ayon_core/tools/publisher/widgets/widgets.py index 95268a7a4b..fabb50232a 100644 --- a/client/ayon_core/tools/publisher/widgets/widgets.py +++ b/client/ayon_core/tools/publisher/widgets/widgets.py @@ -1465,7 +1465,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget): """Widget showing publsish plugin attributes for selected instances. Attributes are defined on publish plugins. Publihs plugin may define - attribute definitions but must inherit `OpenPypePyblishPluginMixin` + attribute definitions but must inherit `AYONPyblishPluginMixin` (~/openpype/pipeline/publish). At the moment requires to implement `get_attribute_defs` and `convert_attribute_values` class methods.