pull

client/ayon_core/pipeline/structures.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from typing import Literal
+
+ListType = Literal["generic", "review-session"]
+
+
+@dataclass
+class ListConfigFolder:
+    label: str
+    # Empty list means the folder is visible for all list types
+    scope: list[ListType] = field(default_factory=list)
+    color: str | None = None
+    icon: str | None = None
+
+
+@dataclass
+class ListConfig:
+    """Define a list."""
+    label: str
+    list_type: ListType = "generic"
+    list_folders: list[ListConfigFolder] = field(default_factory=list)

client/ayon_core/pipeline/workfile/workfile_template_builder.py

@@ -1678,12 +1678,17 @@ def _get_representations(self, placeholder):
         if not folder_ids:
             return []
 
-        # TODO this should filter by product_base_types
-        # - that can change only when AYON server 1.14.0 is required
+        filter_key = "product_base_types"
+        if ayon_api.get_server_version_tuple() < (1, 14, 0):
+            filter_key = "product_types"
+        filter_kwargs = {
+            filter_key: {product_base_type},
+        }
+
         products = list(get_products(
             project_name,
             folder_ids=folder_ids,
-            product_types={product_base_type},
+            **filter_kwargs,
             fields={"id", "name"}
         ))
         filtered_product_ids = set()

client/ayon_core/plugins/publish/collect_version_to_list.py

@@ -0,0 +1,90 @@
+from __future__ import annotations
+
+import pyblish.api
+from ayon_core.lib import filter_profiles
+from ayon_core.pipeline.structures import ListConfig, ListConfigFolder
+
+
+class CollectVersionToList(pyblish.api.InstancePlugin):
+    """Collect Version to List."""
+
+    order = pyblish.api.CollectorOrder + 0.499
+    label = "Collect Version to List"
+    settings_category = "core"
+
+    profiles = []
+
+    def process(self, instance):
+        if "versionLists" in instance.data:
+            version_lists = instance.data["versionLists"]
+            self.log.debug(f"Version lists already collected: {version_lists}")
+            return
+
+        version_lists: list[ListConfig] = []
+        instance.data["versionLists"] = version_lists
+
+        profile = self._get_profile_for_instance(instance)
+        if not profile:
+            self.log.debug(f"No profile found for instance {instance}")
+            return
+
+        list_folders = []
+        for item in profile["list_folders"]:
+            scope = []
+            if item["scope_def"] == "list_type":
+                scope.append(profile["list_type"])
+
+            list_folders.append(
+                ListConfigFolder(
+                    label=item["label"],
+                    scope=scope,
+                )
+            )
+
+        version_lists.append(
+            ListConfig(
+                label=profile["list_name"],
+                list_type=profile["list_type"],
+                list_folders=list_folders,
+            )
+        )
+        self.log.debug(f"Collected version lists: {version_lists}")
+
+    def _get_profile_for_instance(
+        self,
+        instance: pyblish.api.Instance
+    ) -> dict | None:
+        """Returns profile for the given instance."""
+        host_name = instance.context.data["hostName"]
+        product_base_type = instance.data.get("productBaseType")
+        if not product_base_type:
+            product_base_type = instance.data["productType"]
+        product_name = instance.data["productName"]
+        task_data = instance.data["anatomyData"].get("task", {})
+        task_name = task_data.get("name")
+        task_type = task_data.get("type")
+        filtering_criteria = {
+            "host_names": host_name,
+            "product_base_types": product_base_type,
+            "product_names": product_name,
+            "task_names": task_name,
+            "task_types": task_type,
+        }
+        profile = filter_profiles(
+            self.profiles,
+            filtering_criteria,
+            logger=self.log
+        )
+
+        if not profile:
+            self.log.debug(
+                "Skipped instance. None of profiles in presets are for"
+                f' Host name: "{host_name}"'
+                f' | Product base type: "{product_base_type}"'
+                f' | Product name: "{product_name}"'
+                f' | Task name "{task_name}"'
+                f' | Task type "{task_type}"'
+            )
+            return None
+
+        return profile

client/ayon_core/plugins/publish/extract_thumbnail.py

@@ -110,6 +110,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         "unreal",
         "houdini",
         "batchdelivery",
+        "workflow",
     ]
     settings_category = "core"
     enabled = False

client/ayon_core/plugins/publish/integrate_review.py

@@ -77,6 +77,7 @@ def _upload_reviewable(self, project_name, version_id, instance):
                     # Pass headers to fix bug in ayon-api (fixed in 1.2.15)
                     headers={},
                 )
+                instance.data["hasWebreview"] = True
             except Exception as exc:
                 self.log.warning(
                     f"Review upload failed after {time.time() - start}s.",