Merge branch 'develop' into enhancement/AY-2612-resolve-adaptation-colorbleed-plugins

client/ayon_core/hosts/maya/plugins/publish/extract_pointcache.py

@@ -26,6 +26,10 @@ class ExtractAlembic(publish.Extractor):
     families = ["pointcache", "model", "vrayproxy.alembic"]
     targets = ["local", "remote"]
 
+    # From settings
+    bake_attributes = []
+    bake_attribute_prefixes = []
+
     def process(self, instance):
         if instance.data.get("farm"):
             self.log.debug("Should be processed on farm, skipping.")
@@ -40,10 +44,12 @@ class ExtractAlembic(publish.Extractor):
         attrs = instance.data.get("attr", "").split(";")
         attrs = [value for value in attrs if value.strip()]
         attrs += instance.data.get("userDefinedAttributes", [])
+        attrs += self.bake_attributes
         attrs += ["cbId"]
 
         attr_prefixes = instance.data.get("attrPrefix", "").split(";")
         attr_prefixes = [value for value in attr_prefixes if value.strip()]
+        attr_prefixes += self.bake_attribute_prefixes
 
         self.log.debug("Extracting pointcache..")
         dirname = self.staging_dir(instance)

client/ayon_core/hosts/nuke/api/lib.py

@@ -389,7 +389,13 @@ def imprint(node, data, tab=None):
 
     """
     for knob in create_knobs(data, tab):
-        node.addKnob(knob)
+        # If knob name exists we set the value. Technically there could be
+        # multiple knobs with the same name, but the intent is not to have
+        # duplicated knobs so we do not account for that.
+        if knob.name() in node.knobs().keys():
+            node[knob.name()].setValue(knob.value())
+        else:
+            node.addKnob(knob)
 
 
 @deprecated

server/settings/publish_plugins.py

@@ -9,7 +9,7 @@ from ayon_server.settings import (
     task_types_enum,
 )
 
-from ayon_server.types import ColorRGB_uint8, ColorRGBA_uint8
+from ayon_server.types import ColorRGBA_uint8
 
 
 class ValidateBaseModel(BaseSettingsModel):
@@ -221,7 +221,12 @@ class OIIOToolArgumentsModel(BaseSettingsModel):
 
 class ExtractOIIOTranscodeOutputModel(BaseSettingsModel):
     _layout = "expanded"
-    name: str = SettingsField("", title="Name")
+    name: str = SettingsField(
+        "",
+        title="Name",
+        description="Output name (no space)",
+        regex=r"[a-zA-Z0-9_]([a-zA-Z0-9_\.\-]*[a-zA-Z0-9_])?$",
+    )
     extension: str = SettingsField("", title="Extension")
     transcoding_type: str = SettingsField(
         "colorspace",

server_addon/maya/server/settings/publishers.py

@@ -299,6 +299,16 @@ class ExtractAlembicModel(BaseSettingsModel):
     families: list[str] = SettingsField(
         default_factory=list,
         title="Families")
+    bake_attributes: list[str] = SettingsField(
+        default_factory=list, title="Bake Attributes",
+        description="List of attributes that will be included in the alembic "
+                    "export.",
+    )
+    bake_attribute_prefixes: list[str] = SettingsField(
+        default_factory=list, title="Bake Attribute Prefixes",
+        description="List of attribute prefixes for attributes that will be "
+                    "included in the alembic export.",
+    )
 
 
 class ExtractObjModel(BaseSettingsModel):
@@ -1184,7 +1194,9 @@ DEFAULT_PUBLISH_SETTINGS = {
             "pointcache",
             "model",
             "vrayproxy.alembic"
-        ]
+        ],
+        "bake_attributes": [],
+        "bake_attribute_prefixes": []
     },
     "ExtractObj": {
         "enabled": False,

server_addon/maya/server/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.11"
+__version__ = "0.1.12"