[Automated] Merged develop into main

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,6 +35,7 @@ body:
       label: Version
       description: What version are you running? Look to OpenPype Tray
       options:
+        - 3.18.2-nightly.1
         - 3.18.1
         - 3.18.1-nightly.1
         - 3.18.0
@@ -134,7 +135,6 @@ body:
         - 3.15.4-nightly.3
         - 3.15.4-nightly.2
         - 3.15.4-nightly.1
-        - 3.15.3
     validations:
       required: true
   - type: dropdown

openpype/hosts/fusion/plugins/create/create_saver.py

@@ -120,8 +120,15 @@ class CreateSaver(NewCreator):
             return
 
         original_subset = tool.GetData("openpype.subset")
+        original_format = tool.GetData(
+            "openpype.creator_attributes.image_format"
+        )
+
         subset = data["subset"]
-        if original_subset != subset:
+        if (
+            original_subset != subset
+            or original_format != data["creator_attributes"]["image_format"]
+        ):
             self._configure_saver_tool(data, tool, subset)
 
     def _configure_saver_tool(self, data, tool, subset):

openpype/hosts/fusion/plugins/publish/extract_render_local.py

@@ -146,11 +146,15 @@ class FusionRenderLocal(
 
         staging_dir = os.path.dirname(path)
 
+        files = [os.path.basename(f) for f in expected_files]
+        if len(expected_files) == 1:
+            files = files[0]
+
         repre = {
             "name": ext[1:],
             "ext": ext[1:],
             "frameStart": f"%0{padding}d" % start,
-            "files": [os.path.basename(f) for f in expected_files],
+            "files": files,
             "stagingDir": staging_dir,
         }
 

openpype/hosts/nuke/api/pipeline.py

@@ -260,7 +260,7 @@ def _install_menu():
             "Create...",
             lambda: host_tools.show_publisher(
                 parent=(
-                    main_window if nuke.NUKE_VERSION_RELEASE >= 14 else None
+                    main_window if nuke.NUKE_VERSION_MAJOR >= 14 else None
                 ),
                 tab="create"
             )
@@ -271,7 +271,7 @@ def _install_menu():
             "Publish...",
             lambda: host_tools.show_publisher(
                 parent=(
-                    main_window if nuke.NUKE_VERSION_RELEASE >= 14 else None
+                    main_window if nuke.NUKE_VERSION_MAJOR >= 14 else None
                 ),
                 tab="publish"
             )

openpype/hosts/photoshop/plugins/publish/extract_review.py

@@ -170,8 +170,7 @@ class ExtractReview(publish.Extractor):
         # Generate mov.
         mov_path = os.path.join(staging_dir, "review.mov")
         self.log.info(f"Generate mov review: {mov_path}")
-        args = [
-            ffmpeg_path,
+        args = ffmpeg_path + [
             "-y",
             "-i", source_files_pattern,
             "-vf", "pad=ceil(iw/2)*2:ceil(ih/2)*2",
@@ -224,6 +223,7 @@ class ExtractReview(publish.Extractor):
             "stagingDir": staging_dir,
             "tags": ["thumbnail", "delete"]
         })
+        instance.data["thumbnailPath"] = thumbnail_path
 
     def _check_and_resize(self, processed_img_names, source_files_pattern,
                           staging_dir):

openpype/hosts/traypublisher/plugins/publish/collect_explicit_colorspace.py

@@ -5,6 +5,7 @@ from openpype.pipeline import (
 )
 from openpype.lib import EnumDef
 from openpype.pipeline import colorspace
+from openpype.pipeline.publish import KnownPublishError
 
 
 class CollectColorspace(pyblish.api.InstancePlugin,
@@ -26,18 +27,44 @@ class CollectColorspace(pyblish.api.InstancePlugin,
 
     def process(self, instance):
         values = self.get_attr_values_from_data(instance.data)
-        colorspace = values.get("colorspace", None)
-        if colorspace is None:
+        colorspace_value = values.get("colorspace", None)
+        if colorspace_value is None:
             return
 
-        self.log.debug("Explicit colorspace set to: {}".format(colorspace))
+        color_data = colorspace.convert_colorspace_enumerator_item(
+            colorspace_value, self.config_items)
+
+        colorspace_name = self._colorspace_name_by_type(color_data)
+        self.log.debug("Explicit colorspace name: {}".format(colorspace_name))
 
         context = instance.context
         for repre in instance.data.get("representations", {}):
             self.set_representation_colorspace(
                 representation=repre,
                 context=context,
-                colorspace=colorspace
+                colorspace=colorspace_name
+            )
+
+    def _colorspace_name_by_type(self, colorspace_data):
+        """
+        Returns colorspace name by type
+
+        Arguments:
+            colorspace_data (dict): colorspace data
+
+        Returns:
+            str: colorspace name
+        """
+        if colorspace_data["type"] == "colorspaces":
+            return colorspace_data["name"]
+        elif colorspace_data["type"] == "roles":
+            return colorspace_data["colorspace"]
+        else:
+            raise KnownPublishError(
+                (
+                    "Collecting of colorspace failed. used config is missing "
+                    "colorspace type: '{}' . Please contact your pipeline TD."
+                ).format(colorspace_data['type'])
             )
 
     @classmethod

openpype/hosts/traypublisher/plugins/publish/validate_colorspace.py

@@ -33,7 +33,19 @@ class ValidateColorspace(pyblish.api.InstancePlugin,
             config_path = colorspace_data["config"]["path"]
             if config_path not in config_colorspaces:
                 colorspaces = get_ocio_config_colorspaces(config_path)
-                config_colorspaces[config_path] = set(colorspaces)
+                if not colorspaces.get("colorspaces"):
+                    message = (
+                        f"OCIO config '{config_path}' does not contain any "
+                        "colorspaces. This is an error in the OCIO config. "
+                        "Contact your pipeline TD.",
+                    )
+                    raise PublishValidationError(
+                        title="Colorspace validation",
+                        message=message,
+                        description=message
+                    )
+                config_colorspaces[config_path] = set(
+                    colorspaces["colorspaces"])
 
             colorspace = colorspace_data["colorspace"]
             self.log.debug(

openpype/modules/ftrack/lib/custom_attributes.py

@@ -66,7 +66,7 @@ def get_openpype_attr(session, split_hierarchical=True, query_keys=None):
         "select {}"
         " from CustomAttributeConfiguration"
         # Kept `pype` for Backwards Compatibility
-        " where group.name in (\"pype\", \"{}\")"
+        " where group.name in (\"pype\", \"ayon\", \"{}\")"
     ).format(", ".join(query_keys), CUST_ATTR_GROUP)
     all_avalon_attr = session.query(cust_attrs_query).all()
     for cust_attr in all_avalon_attr:

openpype/modules/ftrack/plugins/publish/integrate_hierarchy_ftrack.py

@@ -21,7 +21,7 @@ def get_pype_attr(session, split_hierarchical=True):
         "select id, entity_type, object_type_id, is_hierarchical, default"
         " from CustomAttributeConfiguration"
         # Kept `pype` for Backwards Compatibility
-        " where group.name in (\"pype\", \"{}\")"
+        " where group.name in (\"pype\", \"ayon\", \"{}\")"
     ).format(CUST_ATTR_GROUP)
     all_avalon_attr = session.query(cust_attrs_query).all()
     for cust_attr in all_avalon_attr:

openpype/plugins/publish/integrate_thumbnail_ayon.py

@@ -5,7 +5,21 @@
     pull into a scene.
 
     This one is used only as image describing content of published item and
-    shows up only in Loader in right column section.
+        shows up only in Loader or WebUI.
+
+    Instance must have 'published_representations' to
+        be able to integrate thumbnail.
+    Possible sources of thumbnail paths:
+    - instance.data["thumbnailPath"]
+    - representation with 'thumbnail' name in 'published_representations'
+    - context.data["thumbnailPath"]
+
+    Notes:
+        Issue with 'thumbnail' representation is that we most likely don't
+            want to integrate it as representation. Integrated representation
+            is polluting Loader and database without real usage. That's why
+            they usually have 'delete' tag to skip the integration.
+
 """
 
 import os
@@ -92,11 +106,8 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
                 continue
 
             # Find thumbnail path on instance
-            thumbnail_source = instance.data.get("thumbnailSource")
-            thumbnail_path = instance.data.get("thumbnailPath")
             thumbnail_path = (
-                thumbnail_source
-                or thumbnail_path
+                instance.data.get("thumbnailPath")
                 or self._get_instance_thumbnail_path(published_repres)
             )
             if thumbnail_path:

openpype/settings/defaults/project_settings/maya.json

@@ -436,7 +436,7 @@
             "viewTransform": "sRGB gamma"
         }
     },
-    "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders/maya\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\n",
+    "mel_workspace": "workspace -fr \"shaders\" \"renderData/shaders\";\nworkspace -fr \"images\" \"renders/maya\";\nworkspace -fr \"particles\" \"particles\";\nworkspace -fr \"mayaAscii\" \"\";\nworkspace -fr \"mayaBinary\" \"\";\nworkspace -fr \"scene\" \"\";\nworkspace -fr \"alembicCache\" \"cache/alembic\";\nworkspace -fr \"renderData\" \"renderData\";\nworkspace -fr \"sourceImages\" \"sourceimages\";\nworkspace -fr \"fileCache\" \"cache/nCache\";\nworkspace -fr \"autoSave\" \"autosave\";",
     "ext_mapping": {
         "model": "ma",
         "mayaAscii": "ma",

server_addon/maya/server/settings/main.py

@@ -97,7 +97,7 @@ DEFAULT_MEL_WORKSPACE_SETTINGS = "\n".join((
     'workspace -fr "renderData" "renderData";',
     'workspace -fr "sourceImages" "sourceimages";',
     'workspace -fr "fileCache" "cache/nCache";',
-    'workspace -fr "autoSave" "autosave"',
+    'workspace -fr "autoSave" "autosave";',
     '',
 ))
 

server_addon/photoshop/server/settings/publish_plugins.py

@@ -29,7 +29,7 @@ class ColorCodeMappings(BaseSettingsModel):
     )
 
     layer_name_regex: list[str] = Field(
-        "",
+        default_factory=list,
         title="Layer name regex"
     )
 

server_addon/photoshop/server/version.py

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