Merge pull request #5568 from BigRoy/enhancement/houdini_raise_publishvalidationerror

openpype/hosts/houdini/plugins/publish/collect_output_node.py

@@ -1,5 +1,7 @@
 import pyblish.api
 
+from openpype.pipeline.publish import KnownPublishError
+
 
 class CollectOutputSOPPath(pyblish.api.InstancePlugin):
     """Collect the out node's SOP/COP Path value."""
@@ -58,8 +60,8 @@ class CollectOutputSOPPath(pyblish.api.InstancePlugin):
         elif node_type == "Redshift_Proxy_Output":
             out_node = node.parm("RS_archive_sopPath").evalAsNode()
         else:
-            raise ValueError(
-                "ROP node type '%s' is" " not supported." % node_type
+            raise KnownPublishError(
+                "ROP node type '{}' is not supported.".format(node_type)
             )
 
         if not out_node:

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

@@ -2,7 +2,7 @@ import pyblish.api
 
 from openpype.lib import version_up
 from openpype.pipeline import registered_host
-from openpype.action import get_errored_plugins_from_data
+from openpype.pipeline.publish import get_errored_plugins_from_context
 from openpype.hosts.houdini.api import HoudiniHost
 from openpype.pipeline.publish import KnownPublishError
 
@@ -27,7 +27,7 @@ class IncrementCurrentFile(pyblish.api.ContextPlugin):
 
     def process(self, context):
 
-        errored_plugins = get_errored_plugins_from_data(context)
+        errored_plugins = get_errored_plugins_from_context(context)
         if any(
             plugin.__name__ == "HoudiniSubmitPublishDeadline"
             for plugin in errored_plugins
@@ -40,9 +40,10 @@ class IncrementCurrentFile(pyblish.api.ContextPlugin):
         # Filename must not have changed since collecting
         host = registered_host()  # type: HoudiniHost
         current_file = host.current_file()
-        assert (
-            context.data["currentFile"] == current_file
-        ), "Collected filename mismatches from current scene name."
+        if context.data["currentFile"] != current_file:
+            raise KnownPublishError(
+                "Collected filename mismatches from current scene name."
+            )
 
         new_filepath = version_up(current_file)
         host.save_workfile(new_filepath)

openpype/hosts/houdini/plugins/publish/validate_animation_settings.py

@@ -1,5 +1,6 @@
 import pyblish.api
 
+from openpype.pipeline.publish import PublishValidationError
 from openpype.hosts.houdini.api import lib
 import hou
 
@@ -30,7 +31,7 @@ class ValidateAnimationSettings(pyblish.api.InstancePlugin):
 
         invalid = self.get_invalid(instance)
         if invalid:
-            raise RuntimeError(
+            raise PublishValidationError(
                 "Output settings do no match for '%s'" % instance
             )
 

openpype/hosts/houdini/plugins/publish/validate_remote_publish.py

@@ -36,11 +36,11 @@ class ValidateRemotePublishOutNode(pyblish.api.ContextPlugin):
         if node.parm("shellexec").eval():
             self.raise_error("Must not execute in shell")
         if node.parm("prerender").eval() != cmd:
-            self.raise_error(("REMOTE_PUBLISH node does not have "
-                              "correct prerender script."))
+            self.raise_error("REMOTE_PUBLISH node does not have "
+                             "correct prerender script.")
         if node.parm("lprerender").eval() != "python":
-            self.raise_error(("REMOTE_PUBLISH node prerender script "
-                              "type not set to 'python'"))
+            self.raise_error("REMOTE_PUBLISH node prerender script "
+                             "type not set to 'python'")
 
     @classmethod
     def repair(cls, context):
@@ -48,5 +48,4 @@ class ValidateRemotePublishOutNode(pyblish.api.ContextPlugin):
         lib.create_remote_publish_node(force=True)
 
     def raise_error(self, message):
-        self.log.error(message)
-        raise PublishValidationError(message, title=self.label)
+        raise PublishValidationError(message)

openpype/hosts/houdini/plugins/publish/validate_usd_render_product_names.py

@@ -24,7 +24,7 @@ class ValidateUSDRenderProductNames(pyblish.api.InstancePlugin):
 
             if not os.path.isabs(filepath):
                 invalid.append(
-                    "Output file path is not " "absolute path: %s" % filepath
+                    "Output file path is not absolute path: %s" % filepath
                 )
 
         if invalid: