Merge branch 'develop' into bugfix/inplace-integration

client/ayon_core/plugins/publish/extract_thumbnail.py

@@ -450,7 +450,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         # output arguments from presets
         jpeg_items.extend(ffmpeg_args.get("output") or [])
         # we just want one frame from movie files
-        jpeg_items.extend(["-vframes", "1"])
+        jpeg_items.extend(["-frames:v", "1"])
 
         if resolution_arg:
             jpeg_items.extend(resolution_arg)
@@ -498,7 +498,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             "-i", video_file_path,
             "-analyzeduration", max_int,
             "-probesize", max_int,
-            "-vframes", "1"
+            "-frames:v", "1"
         ]
 
         # add output file path

client/ayon_core/plugins/publish/extract_thumbnail_from_source.py

@@ -170,7 +170,7 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
             "-analyzeduration", max_int,
             "-probesize", max_int,
             "-i", src_path,
-            "-vframes", "1",
+            "-frames:v", "1",
             dst_path
         )
 

client/ayon_core/plugins/publish/integrate_thumbnail.py

@@ -27,8 +27,10 @@ import collections
 
 import pyblish.api
 import ayon_api
+from ayon_api import RequestTypes
 from ayon_api.operations import OperationsSession
 
+
 InstanceFilterResult = collections.namedtuple(
     "InstanceFilterResult",
     ["instance", "thumbnail_path", "version_id"]
@@ -161,6 +163,30 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
             return None
         return os.path.normpath(filled_path)
 
+    def _create_thumbnail(self, project_name: str, src_filepath: str) -> str:
+        """Upload thumbnail to AYON and return its id.
+
+        This is temporary fix of 'create_thumbnail' function in ayon_api to
+            fix jpeg mime type.
+
+        """
+        mime_type = None
+        with open(src_filepath, "rb") as stream:
+            if b"\xff\xd8\xff" == stream.read(3):
+                mime_type = "image/jpeg"
+
+        if mime_type is None:
+            return ayon_api.create_thumbnail(project_name, src_filepath)
+
+        response = ayon_api.upload_file(
+            f"projects/{project_name}/thumbnails",
+            src_filepath,
+            request_type=RequestTypes.post,
+            headers={"Content-Type": mime_type},
+        )
+        response.raise_for_status()
+        return response.json()["id"]
+
     def _integrate_thumbnails(
         self,
         filtered_instance_items,
@@ -179,7 +205,7 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
                 ).format(instance_label))
                 continue
 
-            thumbnail_id = ayon_api.create_thumbnail(
+            thumbnail_id = self._create_thumbnail(
                 project_name, thumbnail_path
             )
 

client/ayon_core/tools/common_models/thumbnails.py

@@ -27,9 +27,12 @@ class ThumbnailsModel:
         entity_type,
         entity_ids,
     ):
-        thumbnail_paths = set()
+        output = {
+            entity_id: None
+            for entity_id in entity_ids
+        }
         if not project_name or not entity_type or not entity_ids:
-            return thumbnail_paths
+            return output
 
         thumbnail_id_by_entity_id = {}
         if entity_type == "folder":
@@ -43,7 +46,7 @@ class ThumbnailsModel:
             )
 
         if not thumbnail_id_by_entity_id:
-            return thumbnail_paths
+            return output
 
         entity_ids_by_thumbnail_id = collections.defaultdict(set)
         for entity_id, thumbnail_id in thumbnail_id_by_entity_id.items():
@@ -51,10 +54,6 @@ class ThumbnailsModel:
                 continue
             entity_ids_by_thumbnail_id[thumbnail_id].add(entity_id)
 
-        output = {
-            entity_id: None
-            for entity_id in entity_ids
-        }
         for thumbnail_id, entity_ids in entity_ids_by_thumbnail_id.items():
             thumbnail_path = self._get_thumbnail_path(
                 project_name, entity_type, next(iter(entity_ids)), thumbnail_id