Merge branch 'develop' into feature/AY-5235_Delivery-Farm-Publishing

client/ayon_core/plugins/publish/collect_farm_env_variables.py

@@ -24,6 +24,7 @@ class CollectCoreJobEnvVars(pyblish.api.ContextPlugin):
             # NOTE we should use 'context.data["user"]' but that has higher
             #   order.
             ("AYON_USERNAME", get_ayon_username()),
+            ("AYON_HOST_NAME", context.data["hostName"]),
         ):
             if value:
                 self.log.debug(f"Setting job env: {key}: {value}")

client/ayon_core/plugins/publish/collect_otio_subset_resources.py

@@ -178,7 +178,10 @@ class CollectOtioSubsetResources(
             repre = self._create_representation(
                 frame_start, frame_end, collection=collection)
 
-            if "review" in instance.data["families"]:
+            if (
+                not instance.data.get("otioReviewClips")
+                and "review" in instance.data["families"]
+            ):
                 review_repre = self._create_representation(
                 frame_start, frame_end, collection=collection,
                 delete=True, review=True)
@@ -197,7 +200,10 @@ class CollectOtioSubsetResources(
             repre = self._create_representation(
                 frame_start, frame_end, file=filename, trim=_trim)
 
-            if "review" in instance.data["families"]:
+            if (
+                not instance.data.get("otioReviewClips")
+                and "review" in instance.data["families"]
+            ):
                 review_repre = self._create_representation(
                     frame_start, frame_end,
                     file=filename, delete=True, review=True)

client/ayon_core/plugins/publish/collect_rendered_files.py

@@ -93,8 +93,7 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
 
         # now we can just add instances from json file and we are done
         any_staging_dir_persistent = False
-        for instance_data in data.get("instances"):
-
+        for instance_data in data["instances"]:
             self.log.debug("  - processing instance for {}".format(
                 instance_data.get("productName")))
             instance = self._context.create_instance(
@@ -105,7 +104,11 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
             instance.data.update(instance_data)
 
             # stash render job id for later validation
-            instance.data["render_job_id"] = data.get("job").get("_id")
+            instance.data["publishJobMetadata"] = data
+            # TODO remove 'render_job_id' here and rather use
+            #   'publishJobMetadata' where is needed.
+            #   - this is deadline specific
+            instance.data["render_job_id"] = data.get("job", {}).get("_id")
             staging_dir_persistent = instance.data.get(
                 "stagingDir_persistent", False
             )

client/ayon_core/plugins/publish/collect_resources_path.py

@@ -66,7 +66,8 @@ class CollectResourcesPath(pyblish.api.InstancePlugin):
                 "yeticacheUE",
                 "tycache",
                 "usd",
-                "oxrig"
+                "oxrig",
+                "sbsar",
                 ]
 
     def process(self, instance):

client/ayon_core/plugins/publish/extract_otio_review.py

@@ -209,13 +209,9 @@ class ExtractOTIOReview(
                 # File sequence way
                 if is_sequence:
                     # Remap processing range to input file sequence.
-                    processing_range_as_frames = (
-                        processing_range.start_time.to_frames(),
-                        processing_range.end_time_inclusive().to_frames()
-                    )
                     first, last = remap_range_on_file_sequence(
                         r_otio_cl,
-                        processing_range_as_frames,
+                        processing_range,
                     )
                     input_fps = processing_range.start_time.rate
 

client/ayon_core/plugins/publish/validate_file_saved.py

@@ -37,7 +37,7 @@ class ValidateCurrentSaveFile(pyblish.api.ContextPlugin):
     label = "Validate File Saved"
     order = pyblish.api.ValidatorOrder - 0.1
     hosts = ["fusion", "houdini", "max", "maya", "nuke", "substancepainter",
-             "cinema4d"]
+             "cinema4d", "silhouette"]
     actions = [SaveByVersionUpAction, ShowWorkfilesAction]
 
     def process(self, context):