Merge pull request #4912 from EmberLightVFX/bugfix/fusion-optional-validation

openpype/hosts/fusion/plugins/publish/increment_current_file.py

@@ -1,29 +1,39 @@
 import pyblish.api
 
+from openpype.pipeline import OptionalPyblishPluginMixin
+from openpype.pipeline import KnownPublishError
 
-class FusionIncrementCurrentFile(pyblish.api.ContextPlugin):
+
+class FusionIncrementCurrentFile(
+    pyblish.api.ContextPlugin, OptionalPyblishPluginMixin
+):
     """Increment the current file.
 
     Saves the current file with an increased version number.
 
     """
 
-    label = "Increment current file"
+    label = "Increment workfile version"
     order = pyblish.api.IntegratorOrder + 9.0
     hosts = ["fusion"]
-    families = ["workfile"]
     optional = True
 
     def process(self, context):
+        if not self.is_active(context.data):
+            return
 
         from openpype.lib import version_up
         from openpype.pipeline.publish import get_errored_plugins_from_context
 
         errored_plugins = get_errored_plugins_from_context(context)
-        if any(plugin.__name__ == "FusionSubmitDeadline"
-                for plugin in errored_plugins):
-            raise RuntimeError("Skipping incrementing current file because "
-                               "submission to render farm failed.")
+        if any(
+            plugin.__name__ == "FusionSubmitDeadline"
+            for plugin in errored_plugins
+        ):
+            raise KnownPublishError(
+                "Skipping incrementing current file because "
+                "submission to render farm failed."
+            )
 
         comp = context.data.get("currentComp")
         assert comp, "Must have comp"

openpype/hosts/fusion/plugins/publish/validate_background_depth.py

@@ -1,12 +1,17 @@
 import pyblish.api
 
-from openpype.pipeline.publish import RepairAction
-from openpype.pipeline import PublishValidationError
+from openpype.pipeline import (
+    publish,
+    OptionalPyblishPluginMixin,
+    PublishValidationError,
+)
 
 from openpype.hosts.fusion.api.action import SelectInvalidAction
 
 
-class ValidateBackgroundDepth(pyblish.api.InstancePlugin):
+class ValidateBackgroundDepth(
+    pyblish.api.InstancePlugin, OptionalPyblishPluginMixin
+):
     """Validate if all Background tool are set to float32 bit"""
 
     order = pyblish.api.ValidatorOrder
@@ -15,11 +20,10 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin):
     families = ["render"]
     optional = True
 
-    actions = [SelectInvalidAction, RepairAction]
+    actions = [SelectInvalidAction, publish.RepairAction]
 
     @classmethod
     def get_invalid(cls, instance):
-
         context = instance.context
         comp = context.data.get("currentComp")
         assert comp, "Must have Comp object"
@@ -31,12 +35,16 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin):
         return [i for i in backgrounds if i.GetInput("Depth") != 4.0]
 
     def process(self, instance):
+        if not self.is_active(instance.data):
+            return
+
         invalid = self.get_invalid(instance)
         if invalid:
             raise PublishValidationError(
                 "Found {} Backgrounds tools which"
                 " are not set to float32".format(len(invalid)),
-                title=self.label)
+                title=self.label,
+            )
 
     @classmethod
     def repair(cls, instance):