From 8ecb1fa3a542b49308bbfa3c35e11de4ebed5379 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 5 Mar 2024 16:17:08 +0100
Subject: [PATCH] Refactor representation data handling for thumbnails and
 media types.

- Refactored how thumbnail and media representation data is processed.
- Added logic to handle different types of representations based on colorspaces.
---
 .../plugins/create/create_csv_ingest.py       | 40 ++++++++++++++-----
 .../collect_csv_ingest_instance_data.py       | 21 ++++++++--
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
index 00ff7e00ed..720ef5ddb3 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_csv_ingest.py
@@ -246,15 +246,27 @@ configuration in project settings.
                             "stagingDir": thumb_dir,
                             "outputName": explicit_output_name,
                         })
-                        new_instance["prepared_data_for_repres"].append(
-                            ("_thumbnail_", thumbnail_repr_data)
-                        )
+                        new_instance["prepared_data_for_repres"].append({
+                            "type": "thumbnail",
+                            "colorspace": None,
+                            "representation": thumbnail_repr_data,
+                        })
+                        # also add thumbnailPath for ayon to integrate
+                        if not new_instance.get("thumbnailPath"):
+                            new_instance["thumbnailPath"] = (
+                                os.path.join(thumb_dir, thumb_file)
+                            )
                     elif (
                         thumbnails
                         and not multiple_thumbnails
                         and not thumbnails_processed
                         or not reviewable
                     ):
+                        """
+                        For case where we have only one thumbnail
+                        and not reviewable medias. This needs to be processed
+                        only once per instance.
+                        """
                         if not thumbnails:
                             continue
                         # here we will use only one thumbnail for
@@ -273,9 +285,17 @@ configuration in project settings.
                             "files": thumb_file,
                             "stagingDir": thumb_dir
                         })
-                        new_instance["prepared_data_for_repres"].append(
-                            ("_thumbnail_", thumbnail_repr_data)
-                        )
+                        new_instance["prepared_data_for_repres"].append({
+                            "type": "thumbnail",
+                            "colorspace": None,
+                            "representation": thumbnail_repr_data,
+                        })
+                        # also add thumbnailPath for ayon to integrate
+                        if not new_instance.get("thumbnailPath"):
+                            new_instance["thumbnailPath"] = (
+                                os.path.join(thumb_dir, thumb_file)
+                            )
+
                         thumbnails_processed = True
 
                     # get representation data
@@ -284,9 +304,11 @@ configuration in project settings.
                         explicit_output_name
                     )
 
-                    new_instance["prepared_data_for_repres"].append(
-                        (repre_data["colorspace"], representation_data)
-                    )
+                    new_instance["prepared_data_for_repres"].append({
+                        "type": "media",
+                        "colorspace": repre_data["colorspace"],
+                        "representation": representation_data,
+                    })
 
     def _get_refactor_thumbnail_path(
             self, staging_dir, relative_thumbnail_path):
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
index f76ef93c95..33536d0854 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_csv_ingest_instance_data.py
@@ -22,13 +22,26 @@ class CollectCSVIngestInstancesData(
         prepared_repres_data_items = instance.data[
             "prepared_data_for_repres"]
 
-        for colorspace, repre_data in prepared_repres_data_items:
-            # only apply colorspace to those which are not marked as thumbnail
-            if colorspace != "_thumbnail_":
+        for prep_repre_data in prepared_repres_data_items:
+            type = prep_repre_data["type"]
+            colorspace = prep_repre_data["colorspace"]
+            repre_data = prep_repre_data["representation"]
+
+            # thumbnails should be skipped
+            if type == "media":
                 # colorspace name is passed from CSV column
                 self.set_representation_colorspace(
                     repre_data, instance.context, colorspace
                 )
+            elif type == "media" and colorspace is None:
+                # TODO: implement colorspace file rules file parsing
+                self.log.warning(
+                    "Colorspace is not defined in csv for following"
+                    f" representation: {pformat(repre_data)}"
+                )
+                pass
+            elif type == "thumbnail":
+                # thumbnails should be skipped
+                pass
 
             instance.data["representations"].append(repre_data)
-