From 68ab2fc934e6a11995884ad1472cb04567f7c271 Mon Sep 17 00:00:00 2001
From: Roy Nieterau <roy_nieterau@hotmail.com>
Date: Tue, 5 Sep 2023 09:06:07 +0200
Subject: [PATCH] Raise PublishValidationError

---
 .../plugins/publish/validate_filesequences.py   |  5 ++++-
 openpype/plugins/publish/validate_intent.py     | 10 ++++------
 .../plugins/publish/validate_publish_dir.py     | 17 +++++++++--------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/openpype/plugins/publish/validate_filesequences.py b/openpype/plugins/publish/validate_filesequences.py
index 8a877d79bb..0ac281022d 100644
--- a/openpype/plugins/publish/validate_filesequences.py
+++ b/openpype/plugins/publish/validate_filesequences.py
@@ -1,5 +1,7 @@
 import pyblish.api
 
+from openpype.pipeline.publish import PublishValidationError
+
 
 class ValidateFileSequences(pyblish.api.ContextPlugin):
     """Validates whether any file sequences were collected."""
@@ -10,4 +12,5 @@ class ValidateFileSequences(pyblish.api.ContextPlugin):
     label = "Validate File Sequences"
 
     def process(self, context):
-        assert context, "Nothing collected."
+        if not context:
+            raise PublishValidationError("Nothing collected.")
diff --git a/openpype/plugins/publish/validate_intent.py b/openpype/plugins/publish/validate_intent.py
index 23d57bb2b7..832c7cc0a1 100644
--- a/openpype/plugins/publish/validate_intent.py
+++ b/openpype/plugins/publish/validate_intent.py
@@ -1,7 +1,7 @@
-import os
 import pyblish.api
 
 from openpype.lib import filter_profiles
+from openpype.pipeline.publish import PublishValidationError
 
 
 class ValidateIntent(pyblish.api.ContextPlugin):
@@ -51,12 +51,10 @@ class ValidateIntent(pyblish.api.ContextPlugin):
             ))
             return
 
-        msg = (
-            "Please make sure that you select the intent of this publish."
-        )
-
         intent = context.data.get("intent") or {}
         self.log.debug(str(intent))
         intent_value = intent.get("value")
         if not intent_value:
-            raise AssertionError(msg)
+            raise PublishValidationError(
+                "Please make sure that you select the intent of this publish."
+            )
diff --git a/openpype/plugins/publish/validate_publish_dir.py b/openpype/plugins/publish/validate_publish_dir.py
index ad5fd34434..0eb93da583 100644
--- a/openpype/plugins/publish/validate_publish_dir.py
+++ b/openpype/plugins/publish/validate_publish_dir.py
@@ -47,15 +47,16 @@ class ValidatePublishDir(pyblish.api.InstancePlugin):
         # original_dirname must be convertable to rootless path
         # in other case it is path inside of root folder for the project
         success, _ = anatomy.find_root_template_from_path(original_dirname)
-
-        formatting_data = {
-            "original_dirname": original_dirname,
-        }
-        msg = "Path '{}' not in project folder.".format(original_dirname) + \
-              " Please publish from inside of project folder."
         if not success:
-            raise PublishXmlValidationError(self, msg, key="not_in_dir",
-                                            formatting_data=formatting_data)
+            raise PublishXmlValidationError(
+                plugin=self,
+                message=(
+                    "Path '{}' not in project folder. Please publish from "
+                    "inside of project folder.".format(original_dirname)
+                ),
+                key="not_in_dir",
+                formatting_data={"original_dirname": original_dirname}
+            )
 
     def _get_template_name_from_instance(self, instance):
         """Find template which will be used during integration."""