Merge pull request #2641 from pypeclub/OP-2505_Web-publisher-instance-duplicates

WebPublisher: fix instance duplicates

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

@@ -9,7 +9,7 @@ from openpype.hosts.photoshop import api as photoshop
 
 
 class CollectRemoteInstances(pyblish.api.ContextPlugin):
-    """Gather instances configured color code of a layer.
+    """Creates instances for configured color code of a layer.
 
     Used in remote publishing when artists marks publishable layers by color-
     coding.
@@ -46,6 +46,11 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin):
         stub = photoshop.stub()
         layers = stub.get_layers()
 
+        existing_subset_names = []
+        for instance in context:
+            if instance.data.get('publish'):
+                existing_subset_names.append(instance.data.get('subset'))
+
         asset, task_name, task_type = get_batch_asset_task_info(
             task_data["context"])
 
@@ -55,6 +60,10 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin):
         instance_names = []
         for layer in layers:
             self.log.debug("Layer:: {}".format(layer))
+            if layer.parents:
+                self.log.debug("!!! Not a top layer, skip")
+                continue
+
             resolved_family, resolved_subset_template = self._resolve_mapping(
                 layer
             )
@@ -66,8 +75,19 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin):
                 self.log.debug("!!! Not found family or template, skip")
                 continue
 
-            if layer.parents:
-                self.log.debug("!!! Not a top layer, skip")
+            fill_pairs = {
+                "variant": variant,
+                "family": resolved_family,
+                "task": task_name,
+                "layer": layer.name
+            }
+
+            subset = resolved_subset_template.format(
+                **prepare_template_data(fill_pairs))
+
+            if subset in existing_subset_names:
+                self.log.info(
+                    "Subset {} already created, skipping.".format(subset))
                 continue
 
             instance = context.create_instance(layer.name)
@@ -76,15 +96,6 @@ class CollectRemoteInstances(pyblish.api.ContextPlugin):
             instance.data["publish"] = layer.visible
             instance.data["asset"] = asset
             instance.data["task"] = task_name
-
-            fill_pairs = {
-                "variant": variant,
-                "family": instance.data["family"],
-                "task": instance.data["task"],
-                "layer": layer.name
-            }
-            subset = resolved_subset_template.format(
-                **prepare_template_data(fill_pairs))
             instance.data["subset"] = subset
 
             instance_names.append(layer.name)

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

@@ -1,3 +1,4 @@
+import collections
 import pyblish.api
 import openpype.api
 
@@ -16,11 +17,14 @@ class ValidateSubsetUniqueness(pyblish.api.ContextPlugin):
         subset_names = []
 
         for instance in context:
+            self.log.info("instance:: {}".format(instance.data))
             if instance.data.get('publish'):
                 subset_names.append(instance.data.get('subset'))
 
-        msg = (
-            "Instance subset names are not unique. " +
-            "Remove duplicates via SubsetManager."
-        )
-        assert len(subset_names) == len(set(subset_names)), msg
+        non_unique = \
+            [item
+             for item, count in collections.Counter(subset_names).items()
+             if count > 1]
+        msg = ("Instance subset names {} are not unique. ".format(non_unique) +
+               "Remove duplicates via SubsetManager.")
+        assert not non_unique, msg

openpype/lib/remote_publish.py

@@ -88,7 +88,6 @@ def publish(log, close_plugin_name=None):
             if close_plugin:  # close host app explicitly after error
                 context = pyblish.api.Context()
                 close_plugin().process(context)
-            sys.exit(1)
 
 
 def publish_and_log(dbcon, _id, log, close_plugin_name=None, batch_id=None):
@@ -137,7 +136,7 @@ def publish_and_log(dbcon, _id, log, close_plugin_name=None, batch_id=None):
             if close_plugin:  # close host app explicitly after error
                 context = pyblish.api.Context()
                 close_plugin().process(context)
-            sys.exit(1)
+            return
         elif processed % log_every == 0:
             # pyblish returns progress in 0.0 - 2.0
             progress = min(round(result["progress"] / 2 * 100), 99)

openpype/pype_commands.py

@@ -251,7 +251,10 @@ class PypeCommands:
 
         data = {
             "last_workfile_path": workfile_path,
-            "start_last_workfile": True
+            "start_last_workfile": True,
+            "project_name": project,
+            "asset_name": asset,
+            "task_name": task_name
         }
 
         launched_app = application_manager.launch(app_name, **data)