From 71cd7a3fb0aad57e191fb0c520b09921d668d542 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 25 Mar 2022 11:53:32 +0100
Subject: [PATCH] OP-2765 - added support for optional validations

Asset and Task should be ALWAYS on instance, not on context. (Publishable instance might allow different context than "real context".)
---
 .../plugins/publish/collect_render.py          | 18 +++++++++++-------
 openpype/lib/abstract_collect_render.py        |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index aa5bc58ac2..24d08b343e 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -22,6 +22,7 @@ class AERenderInstance(RenderInstance):
     projectEntity = attr.ib(default=None)
     stagingDir = attr.ib(default=None)
     app_version = attr.ib(default=None)
+    publish_attributes = attr.ib(default=None)
 
 
 class CollectAERender(abstract_collect_render.AbstractCollectRender):
@@ -50,16 +51,21 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
 
         current_file = context.data["currentFile"]
         version = context.data["version"]
-        asset_entity = context.data["assetEntity"]
+
         project_entity = context.data["projectEntity"]
 
         compositions = CollectAERender.get_stub().get_items(True)
         compositions_by_id = {item.id: item for item in compositions}
         for inst in context:
+            if not inst.data["active"]:
+                continue
+
             family = inst.data["family"]
             if family not in ["render", "renderLocal"]:  # legacy
                 continue
 
+            asset_entity = inst.data["assetEntity"]
+
             item_id = inst.data["members"][0]
 
             work_area_info = CollectAERender.get_stub().get_work_area(
@@ -78,9 +84,6 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
             fps = work_area_info.frameRate
             # TODO add resolution when supported by extension
 
-            if not inst.data["active"]:
-                continue
-
             subset_name = inst.data["subset"]
             instance = AERenderInstance(
                 family=family,
@@ -90,7 +93,8 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
                 source=current_file,
                 label="{} - {}".format(subset_name, family),
                 subset=subset_name,
-                asset=context.data["assetEntity"]["name"],
+                asset=inst.data["asset"],
+                task=inst.data["task"],
                 attachTo=False,
                 setMembers='',
                 publish=True,
@@ -112,8 +116,8 @@ class CollectAERender(abstract_collect_render.AbstractCollectRender):
                 toBeRenderedOn='deadline',
                 fps=fps,
                 app_version=app_version,
-                anatomyData=deepcopy(context.data["anatomyData"]),
-                context=context
+                anatomyData=deepcopy(inst.data["anatomyData"]),
+                publish_attributes=inst.data.get("publish_attributes")
             )
 
             comp = compositions_by_id.get(int(item_id))
diff --git a/openpype/lib/abstract_collect_render.py b/openpype/lib/abstract_collect_render.py
index 029bd3ec39..cce161b51c 100644
--- a/openpype/lib/abstract_collect_render.py
+++ b/openpype/lib/abstract_collect_render.py
@@ -30,6 +30,7 @@ class RenderInstance(object):
     source = attr.ib()  # path to source scene file
     label = attr.ib()  # label to show in GUI
     subset = attr.ib()  # subset name
+    task = attr.ib()  # task name
     asset = attr.ib()  # asset name (AVALON_ASSET)
     attachTo = attr.ib()  # subset name to attach render to
     setMembers = attr.ib()  # list of nodes/members producing render output