OP-3103 - use variant from context for PS

openpype/hosts/photoshop/plugins/publish/collect_color_coded_instances.py

@@ -4,7 +4,6 @@ import re
 import pyblish.api
 
 from openpype.lib import prepare_template_data
-from openpype.lib.plugin_tools import parse_json, get_batch_asset_task_info
 from openpype.hosts.photoshop import api as photoshop
 
 
@@ -46,7 +45,10 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
 
         existing_subset_names = self._get_existing_subset_names(context)
 
-        asset_name, task_name, variant = self._parse_batch(batch_dir)
+        # from CollectBatchData
+        asset_name = context.data["asset"]
+        task_name = context.data["task"]
+        variant = context.data["variant"]
 
         stub = photoshop.stub()
         layers = stub.get_layers()
@@ -130,25 +132,6 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
 
         return existing_subset_names
 
-    def _parse_batch(self, batch_dir):
-        """Parses asset_name, task_name, variant from batch manifest."""
-        task_data = None
-        if batch_dir and os.path.exists(batch_dir):
-            task_data = parse_json(os.path.join(batch_dir,
-                                                "manifest.json"))
-        if not task_data:
-            raise ValueError(
-                "Cannot parse batch meta in {} folder".format(batch_dir))
-        variant = task_data["variant"]
-
-        asset, task_name, task_type = get_batch_asset_task_info(
-            task_data["context"])
-
-        if not task_name:
-            task_name = task_type
-
-        return asset, task_name, variant
-
     def _create_instance(self, context, layer, family,
                          asset, subset, task_name):
         instance = context.create_instance(layer.name)

openpype/hosts/photoshop/plugins/publish/collect_instances.py

@@ -82,8 +82,9 @@ class CollectInstances(pyblish.api.ContextPlugin):
             task_name = api.Session["AVALON_TASK"]
             asset_name = context.data["assetEntity"]["name"]
 
+            variant = context.data.get("variant") or variants[0]
             fill_pairs = {
-                "variant": variants[0],
+                "variant": variant,
                 "family": family,
                 "task": task_name
             }

openpype/hosts/photoshop/plugins/publish/collect_review.py

@@ -16,7 +16,7 @@ class CollectReview(pyblish.api.ContextPlugin):
         family = "review"
         subset = get_subset_name_with_asset_doc(
             family,
-            "",
+            context.data.get("variant", ''),
             context.data["anatomyData"]["task"]["name"],
             context.data["assetEntity"],
             context.data["anatomyData"]["project"]["name"],