From a3a839181b0fa94d5696a53c8a4d52cc8aed4119 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 27 Jul 2022 11:21:20 +0200
Subject: [PATCH] global, flame, hiero, resolve, sp: implementing
 `newAssetPublishing`

---
 .../plugins/publish/collect_timeline_instances.py     |  3 ++-
 .../hiero/plugins/publish/precollect_instances.py     |  3 ++-
 .../resolve/plugins/publish/precollect_instances.py   |  3 ++-
 .../plugins/publish/collect_editorial_instances.py    |  3 ++-
 openpype/plugins/publish/integrate.py                 | 11 ++++++++++-
 openpype/plugins/publish/validate_asset_docs.py       |  4 ++++
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/flame/plugins/publish/collect_timeline_instances.py b/openpype/hosts/flame/plugins/publish/collect_timeline_instances.py
index 5db89a0ab9..992db62c75 100644
--- a/openpype/hosts/flame/plugins/publish/collect_timeline_instances.py
+++ b/openpype/hosts/flame/plugins/publish/collect_timeline_instances.py
@@ -136,7 +136,8 @@ class CollectTimelineInstances(pyblish.api.ContextPlugin):
                 "tasks": {
                     task["name"]: {"type": task["type"]}
                     for task in self.add_tasks},
-                "representations": []
+                "representations": [],
+                "newAssetPublishing": True
             })
             self.log.debug("__ inst_data: {}".format(pformat(inst_data)))
 
diff --git a/openpype/hosts/hiero/plugins/publish/precollect_instances.py b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
index 2d0ec6fc99..0c7dbc1f22 100644
--- a/openpype/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
@@ -109,7 +109,8 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
                 "clipAnnotations": annotations,
 
                 # add all additional tags
-                "tags": phiero.get_track_item_tags(track_item)
+                "tags": phiero.get_track_item_tags(track_item),
+                "newAssetPublishing": True
             })
 
             # otio clip data
diff --git a/openpype/hosts/resolve/plugins/publish/precollect_instances.py b/openpype/hosts/resolve/plugins/publish/precollect_instances.py
index 8f1a13a4e5..ee51998c0d 100644
--- a/openpype/hosts/resolve/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/resolve/plugins/publish/precollect_instances.py
@@ -70,7 +70,8 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
                 "publish": resolve.get_publish_attribute(timeline_item),
                 "fps": context.data["fps"],
                 "handleStart": handle_start,
-                "handleEnd": handle_end
+                "handleEnd": handle_end,
+                "newAssetPublishing": True
             })
 
             # otio clip data
diff --git a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
index 3237fbbe12..75c260bad7 100644
--- a/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
+++ b/openpype/hosts/standalonepublisher/plugins/publish/collect_editorial_instances.py
@@ -170,7 +170,8 @@ class CollectInstances(pyblish.api.InstancePlugin):
                     "frameStart": frame_start,
                     "frameEnd": frame_end,
                     "frameStartH": frame_start - handle_start,
-                    "frameEndH": frame_end + handle_end
+                    "frameEndH": frame_end + handle_end,
+                    "newAssetPublishing": True
                 }
 
                 for data_key in instance_data_filter:
diff --git a/openpype/plugins/publish/integrate.py b/openpype/plugins/publish/integrate.py
index 8ab508adc9..a4378bf58d 100644
--- a/openpype/plugins/publish/integrate.py
+++ b/openpype/plugins/publish/integrate.py
@@ -12,6 +12,7 @@ import pyblish.api
 import openpype.api
 from openpype.client import (
     get_representations,
+    get_asset_by_name,
     get_subset_by_name,
     get_version_by_name,
 )
@@ -273,6 +274,14 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
     def register(self, instance, file_transactions, filtered_repres):
         project_name = legacy_io.active_project()
 
+        # making sure editorial instances have its `assetEntity`
+        if instance.data.get("newAssetPublishing"):
+            asset_doc = get_asset_by_name(
+                project_name,
+                instance.data["asset"]
+            )
+            instance.data["assetEntity"] = asset_doc
+
         instance_stagingdir = instance.data.get("stagingDir")
         if not instance_stagingdir:
             self.log.info((
@@ -426,7 +435,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
                       "".format(len(prepared_representations)))
 
     def prepare_subset(self, instance, project_name):
-        asset_doc = instance.data.get("assetEntity")
+        asset_doc = instance.data["assetEntity"]
         subset_name = instance.data["subset"]
         self.log.debug("Subset: {}".format(subset_name))
 
diff --git a/openpype/plugins/publish/validate_asset_docs.py b/openpype/plugins/publish/validate_asset_docs.py
index bc1f9b9e6c..9a1ca5b8de 100644
--- a/openpype/plugins/publish/validate_asset_docs.py
+++ b/openpype/plugins/publish/validate_asset_docs.py
@@ -24,6 +24,10 @@ class ValidateAssetDocs(pyblish.api.InstancePlugin):
         if instance.data.get("assetEntity"):
             self.log.info("Instance has set asset document in its data.")
 
+        elif instance.data.get("newAssetPublishing"):
+            # skip if it is editorial
+            self.log.info("Editorial instance is no need to check...")
+
         else:
             raise PublishValidationError((
                 "Instance \"{}\" doesn't have asset document "