Merge pull request #405 from BigRoy/chore/cleanup_abstract_collect_render

Abstract Render Collector: Preserve instance id when replacing with new instance

client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py

@@ -41,7 +41,6 @@ class CollectAERender(publish.AbstractCollectRender):
 
     def get_instances(self, context):
         instances = []
-        instances_to_remove = []
 
         app_version = CollectAERender.get_stub().get_app_version()
         app_version = app_version[0:4]
@@ -117,7 +116,10 @@ class CollectAERender(publish.AbstractCollectRender):
                 fps=fps,
                 app_version=app_version,
                 publish_attributes=inst.data.get("publish_attributes", {}),
-                file_names=[item.file_name for item in render_q]
+                file_names=[item.file_name for item in render_q],
+
+                # The source instance this render instance replaces
+                source_instance=inst
             )
 
             comp = compositions_by_id.get(comp_id)
@@ -145,10 +147,7 @@ class CollectAERender(publish.AbstractCollectRender):
                     instance.families.remove("review")
 
             instances.append(instance)
-            instances_to_remove.append(inst)
 
-        for instance in instances_to_remove:
-            context.remove(instance)
         return instances
 
     def get_expected_files(self, render_instance):

client/ayon_core/hosts/fusion/plugins/publish/collect_render.py

@@ -37,14 +37,13 @@ class CollectFusionRender(
         aspect_x = comp_frame_format_prefs["AspectX"]
         aspect_y = comp_frame_format_prefs["AspectY"]
 
-        instances = []
-        instances_to_remove = []
 
         current_file = context.data["currentFile"]
         version = context.data["version"]
 
         project_entity = context.data["projectEntity"]
 
+        instances = []
         for inst in context:
             if not inst.data.get("active", True):
                 continue
@@ -91,7 +90,10 @@ class CollectFusionRender(
                 frameStep=1,
                 fps=comp_frame_format_prefs.get("Rate"),
                 app_version=comp.GetApp().Version,
-                publish_attributes=inst.data.get("publish_attributes", {})
+                publish_attributes=inst.data.get("publish_attributes", {}),
+
+                # The source instance this render instance replaces
+                source_instance=inst
             )
 
             render_target = inst.data["creator_attributes"]["render_target"]
@@ -114,13 +116,7 @@ class CollectFusionRender(
                     # to skip ExtractReview locally
                     instance.families.remove("review")
 
-            # add new instance to the list and remove the original
-            # instance since it is not needed anymore
             instances.append(instance)
-            instances_to_remove.append(inst)
-
-        for instance in instances_to_remove:
-            context.remove(instance)
 
         return instances
 

client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py

@@ -103,17 +103,17 @@ class FusionSubmitDeadline(
 
         # Collect all saver instances in context that are to be rendered
         saver_instances = []
-        for instance in context:
-            if instance.data["productType"] != "render":
+        for inst in context:
+            if inst.data["productType"] != "render":
                 # Allow only saver family instances
                 continue
 
-            if not instance.data.get("publish", True):
+            if not inst.data.get("publish", True):
                 # Skip inactive instances
                 continue
 
-            self.log.debug(instance.data["name"])
-            saver_instances.append(instance)
+            self.log.debug(inst.data["name"])
+            saver_instances.append(inst)
 
         if not saver_instances:
             raise RuntimeError("No instances found for Deadline submission")

client/ayon_core/pipeline/publish/abstract_collect_render.py

@@ -81,6 +81,9 @@ class RenderInstance(object):
     outputDir = attr.ib(default=None)
     context = attr.ib(default=None)
 
+    # The source instance the data of this render instance should merge into
+    source_instance = attr.ib(default=None, type=pyblish.api.Instance)
+
     @frameStart.validator
     def check_frame_start(self, _, value):
         """Validate if frame start is not larger then end."""
@@ -214,8 +217,11 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
             data = self.add_additional_data(data)
             render_instance_dict = attr.asdict(render_instance)
 
-            instance = context.create_instance(render_instance.name)
-            instance.data["label"] = render_instance.label
+            # Merge into source instance if provided, otherwise create instance
+            instance = render_instance_dict.pop("source_instance", None)
+            if instance is None:
+                instance = context.create_instance(render_instance.name)
+
             instance.data.update(render_instance_dict)
             instance.data.update(data)