From b3e34fce324603cf955f3fcf8dca795995796d98 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 15 Feb 2023 10:46:17 +0100
Subject: [PATCH] fix few validators

---
 .../publish/validate_render_pass_group.py       |  1 -
 .../publish/validate_workfile_metadata.py       | 17 +++++++++++++----
 .../publish/validate_workfile_project_name.py   |  7 +++----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py b/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py
index 0fbfca6c56..2a3173c698 100644
--- a/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py
+++ b/openpype/hosts/tvpaint/plugins/publish/validate_render_pass_group.py
@@ -85,6 +85,5 @@ class ValidateLayersGroup(pyblish.api.InstancePlugin):
                 ),
                 "expected_group": correct_group["name"],
                 "layer_names": ", ".join(invalid_layer_names)
-
             }
         )
diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py
index d66ae50c60..b38231e208 100644
--- a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py
+++ b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_metadata.py
@@ -1,5 +1,9 @@
 import pyblish.api
-from openpype.pipeline import PublishXmlValidationError, registered_host
+from openpype.pipeline import (
+    PublishXmlValidationError,
+    PublishValidationError,
+    registered_host,
+)
 
 
 class ValidateWorkfileMetadataRepair(pyblish.api.Action):
@@ -27,13 +31,18 @@ class ValidateWorkfileMetadata(pyblish.api.ContextPlugin):
 
     actions = [ValidateWorkfileMetadataRepair]
 
-    required_keys = {"project", "asset", "task"}
+    required_keys = {"project_name", "asset_name", "task_name"}
 
     def process(self, context):
         workfile_context = context.data["workfile_context"]
         if not workfile_context:
-            raise AssertionError(
-                "Current workfile is missing whole metadata about context."
+            raise PublishValidationError(
+                "Current workfile is missing whole metadata about context.",
+                "Missing context",
+                (
+                    "Current workfile is missing metadata about task."
+                    " To fix this issue save the file using Workfiles tool."
+                )
             )
 
         missing_keys = []
diff --git a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
index 0f25f2f7be..2ed5afa11c 100644
--- a/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
+++ b/openpype/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
@@ -1,4 +1,3 @@
-import os
 import pyblish.api
 from openpype.pipeline import PublishXmlValidationError
 
@@ -16,15 +15,15 @@ class ValidateWorkfileProjectName(pyblish.api.ContextPlugin):
     def process(self, context):
         workfile_context = context.data.get("workfile_context")
         # If workfile context is missing than project is matching to
-        #   `AVALON_PROJECT` value for 100%
+        #   global project
         if not workfile_context:
             self.log.info(
                 "Workfile context (\"workfile_context\") is not filled."
             )
             return
 
-        workfile_project_name = workfile_context["project"]
-        env_project_name = os.environ["AVALON_PROJECT"]
+        workfile_project_name = workfile_context["project_name"]
+        env_project_name = context.data["projectName"]
         if workfile_project_name == env_project_name:
             self.log.info((
                 "Both workfile project and environment project are same. {}"