From 2e412b55c1d526373e8b2eb35250c2409a60a1ba Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 26 Aug 2022 12:25:02 +0200
Subject: [PATCH] use new import sources for 'RepairContextAction' and
 'RepairAction'

---
 .../fusion/plugins/publish/validate_background_depth.py  | 4 ++--
 .../plugins/publish/validate_create_folder_checked.py    | 4 ++--
 .../houdini/plugins/publish/validate_remote_publish.py   | 4 ++--
 .../plugins/publish/validate_remote_publish_enabled.py   | 4 ++--
 .../validate_animation_out_set_related_node_ids.py       | 3 ++-
 .../maya/plugins/publish/validate_ass_relative_paths.py  | 3 ++-
 .../maya/plugins/publish/validate_assembly_transforms.py | 3 ++-
 .../hosts/maya/plugins/publish/validate_attributes.py    | 3 ++-
 .../hosts/maya/plugins/publish/validate_color_sets.py    | 3 ++-
 .../hosts/maya/plugins/publish/validate_frame_range.py   | 3 ++-
 .../hosts/maya/plugins/publish/validate_loaded_plugin.py | 7 ++++---
 .../plugins/publish/validate_look_id_reference_edits.py  | 3 ++-
 .../maya/plugins/publish/validate_look_shading_group.py  | 3 ++-
 .../hosts/maya/plugins/publish/validate_maya_units.py    | 3 ++-
 .../plugins/publish/validate_mesh_arnold_attributes.py   | 3 ++-
 .../plugins/publish/validate_mesh_normals_unlocked.py    | 3 ++-
 .../plugins/publish/validate_mesh_shader_connections.py  | 3 ++-
 .../maya/plugins/publish/validate_mesh_single_uv_set.py  | 3 ++-
 .../maya/plugins/publish/validate_mesh_uv_set_map1.py    | 3 ++-
 .../plugins/publish/validate_mesh_vertices_have_edges.py | 3 ++-
 .../maya/plugins/publish/validate_muster_connection.py   | 8 +++++---
 .../hosts/maya/plugins/publish/validate_no_namespace.py  | 3 ++-
 .../maya/plugins/publish/validate_no_null_transforms.py  | 3 ++-
 .../plugins/publish/validate_node_ids_deformed_shapes.py | 3 ++-
 .../maya/plugins/publish/validate_render_image_rule.py   | 3 ++-
 .../maya/plugins/publish/validate_rendersettings.py      | 3 ++-
 .../maya/plugins/publish/validate_rig_controllers.py     | 4 ++--
 .../validate_rig_controllers_arnold_attributes.py        | 3 ++-
 .../maya/plugins/publish/validate_rig_joints_hidden.py   | 3 ++-
 .../plugins/publish/validate_rig_out_set_node_ids.py     | 3 ++-
 .../maya/plugins/publish/validate_rig_output_ids.py      | 3 ++-
 .../maya/plugins/publish/validate_shape_default_names.py | 3 ++-
 .../maya/plugins/publish/validate_shape_render_stats.py  | 3 ++-
 .../hosts/maya/plugins/publish/validate_shape_zero.py    | 3 ++-
 .../maya/plugins/publish/validate_unreal_up_axis.py      | 3 ++-
 .../publish/validate_vray_distributed_rendering.py       | 3 ++-
 .../plugins/publish/validate_vray_referenced_aovs.py     | 4 ++--
 .../plugins/publish/validate_vray_translator_settings.py | 7 +++++--
 .../plugins/publish/validate_yeti_rig_cache_state.py     | 4 ++--
 openpype/hosts/nuke/plugins/publish/validate_knobs.py    | 9 ++++++---
 .../nuke/plugins/publish/validate_output_resolution.py   | 6 +++---
 .../nuke/plugins/publish/validate_script_attributes.py   | 4 ++--
 .../hosts/nuke/plugins/publish/validate_write_legacy.py  | 5 +++--
 43 files changed, 100 insertions(+), 61 deletions(-)

diff --git a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py
index a0734d8278..4268fab528 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_background_depth.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_background_depth.py
@@ -1,6 +1,6 @@
 import pyblish.api
 
-from openpype import action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateBackgroundDepth(pyblish.api.InstancePlugin):
@@ -8,7 +8,7 @@ class ValidateBackgroundDepth(pyblish.api.InstancePlugin):
 
     order = pyblish.api.ValidatorOrder
     label = "Validate Background Depth 32 bit"
-    actions = [action.RepairAction]
+    actions = [RepairAction]
     hosts = ["fusion"]
     families = ["render"]
     optional = True
diff --git a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py
index 45ed53f65c..f6beefefc1 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py
@@ -1,6 +1,6 @@
 import pyblish.api
 
-from openpype import action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateCreateFolderChecked(pyblish.api.InstancePlugin):
@@ -11,7 +11,7 @@ class ValidateCreateFolderChecked(pyblish.api.InstancePlugin):
     """
 
     order = pyblish.api.ValidatorOrder
-    actions = [action.RepairAction]
+    actions = [RepairAction]
     label = "Validate Create Folder Checked"
     families = ["render"]
     hosts = ["fusion"]
diff --git a/openpype/hosts/houdini/plugins/publish/validate_remote_publish.py b/openpype/hosts/houdini/plugins/publish/validate_remote_publish.py
index 95c66edff0..0ab182c584 100644
--- a/openpype/hosts/houdini/plugins/publish/validate_remote_publish.py
+++ b/openpype/hosts/houdini/plugins/publish/validate_remote_publish.py
@@ -1,7 +1,7 @@
 import pyblish.api
-import openpype.api
 
 from openpype.hosts.houdini.api import lib
+from openpype.pipeline.publish import RepairContextAction
 
 import hou
 
@@ -14,7 +14,7 @@ class ValidateRemotePublishOutNode(pyblish.api.ContextPlugin):
     hosts = ["houdini"]
     targets = ["deadline"]
     label = "Remote Publish ROP node"
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
 
     def process(self, context):
 
diff --git a/openpype/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py b/openpype/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py
index b681fd0ee1..afc8df7528 100644
--- a/openpype/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py
+++ b/openpype/hosts/houdini/plugins/publish/validate_remote_publish_enabled.py
@@ -1,7 +1,7 @@
 import pyblish.api
-import openpype.api
 
 import hou
+from openpype.pipeline.publish import RepairContextAction
 
 
 class ValidateRemotePublishEnabled(pyblish.api.ContextPlugin):
@@ -12,7 +12,7 @@ class ValidateRemotePublishEnabled(pyblish.api.ContextPlugin):
     hosts = ["houdini"]
     targets = ["deadline"]
     label = "Remote Publish ROP enabled"
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
 
     def process(self, context):
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py b/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
index 05d63f1d56..5f4d92bed9 100644
--- a/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin):
@@ -22,7 +23,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin):
     label = 'Animation Out Set Related Node Ids'
     actions = [
         openpype.hosts.maya.api.action.SelectInvalidAction,
-        openpype.api.RepairAction
+        RepairAction
     ]
 
     def process(self, instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_ass_relative_paths.py b/openpype/hosts/maya/plugins/publish/validate_ass_relative_paths.py
index 5fb9bd98b1..3de8e55a41 100644
--- a/openpype/hosts/maya/plugins/publish/validate_ass_relative_paths.py
+++ b/openpype/hosts/maya/plugins/publish/validate_ass_relative_paths.py
@@ -6,6 +6,7 @@ import maya.cmds as cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateAssRelativePaths(pyblish.api.InstancePlugin):
@@ -15,7 +16,7 @@ class ValidateAssRelativePaths(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ['ass']
     label = "ASS has relative texture paths"
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     def process(self, instance):
         # we cannot ask this until user open render settings as
diff --git a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
index dca59b147b..f793846555 100644
--- a/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
+++ b/openpype/hosts/maya/plugins/publish/validate_assembly_transforms.py
@@ -4,6 +4,7 @@ import openpype.api
 from maya import cmds
 
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
@@ -29,7 +30,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
     label = "Assembly Model Transforms"
     families = ["assembly"]
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     prompt_message = ("You are about to reset the matrix to the default values."
                       " This can alter the look of your scene. "
diff --git a/openpype/hosts/maya/plugins/publish/validate_attributes.py b/openpype/hosts/maya/plugins/publish/validate_attributes.py
index e2a22f80b6..e5b72ac3a3 100644
--- a/openpype/hosts/maya/plugins/publish/validate_attributes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_attributes.py
@@ -2,6 +2,7 @@ import pymel.core as pm
 
 import pyblish.api
 import openpype.api
+from openpype.pipeline.publish import RepairContextAction
 
 
 class ValidateAttributes(pyblish.api.ContextPlugin):
@@ -19,7 +20,7 @@ class ValidateAttributes(pyblish.api.ContextPlugin):
     order = openpype.api.ValidateContentsOrder
     label = "Attributes"
     hosts = ["maya"]
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
     optional = True
 
     attributes = None
diff --git a/openpype/hosts/maya/plugins/publish/validate_color_sets.py b/openpype/hosts/maya/plugins/publish/validate_color_sets.py
index 45224b0672..ecc5c78e43 100644
--- a/openpype/hosts/maya/plugins/publish/validate_color_sets.py
+++ b/openpype/hosts/maya/plugins/publish/validate_color_sets.py
@@ -3,6 +3,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateColorSets(pyblish.api.Validator):
@@ -19,7 +20,7 @@ class ValidateColorSets(pyblish.api.Validator):
     category = 'geometry'
     label = 'Mesh ColorSets'
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
     optional = True
 
     @staticmethod
diff --git a/openpype/hosts/maya/plugins/publish/validate_frame_range.py b/openpype/hosts/maya/plugins/publish/validate_frame_range.py
index c51766379e..9094176abb 100644
--- a/openpype/hosts/maya/plugins/publish/validate_frame_range.py
+++ b/openpype/hosts/maya/plugins/publish/validate_frame_range.py
@@ -2,6 +2,7 @@ import pyblish.api
 import openpype.api
 
 from maya import cmds
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateFrameRange(pyblish.api.InstancePlugin):
@@ -26,7 +27,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin):
                 "review",
                 "yeticache"]
     optional = True
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
     exclude_families = []
 
     def process(self, instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_loaded_plugin.py b/openpype/hosts/maya/plugins/publish/validate_loaded_plugin.py
index 9306d8ce15..624074aaf9 100644
--- a/openpype/hosts/maya/plugins/publish/validate_loaded_plugin.py
+++ b/openpype/hosts/maya/plugins/publish/validate_loaded_plugin.py
@@ -1,7 +1,8 @@
+import os
 import pyblish.api
 import maya.cmds as cmds
-import openpype.api
-import os
+
+from openpype.pipeline.publish import RepairContextAction
 
 
 class ValidateLoadedPlugin(pyblish.api.ContextPlugin):
@@ -10,7 +11,7 @@ class ValidateLoadedPlugin(pyblish.api.ContextPlugin):
     label = "Loaded Plugin"
     order = pyblish.api.ValidatorOrder
     host = ["maya"]
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
 
     @classmethod
     def get_invalid(cls, context):
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py b/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
index 9d074f927b..dc751b6b04 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
@@ -4,6 +4,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin):
@@ -21,7 +22,7 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin):
     hosts = ['maya']
     label = 'Look Id Reference Edits'
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     def process(self, instance):
         invalid = self.get_invalid(instance)
diff --git a/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py b/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py
index e8affac036..5e504cde9b 100644
--- a/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py
+++ b/openpype/hosts/maya/plugins/publish/validate_look_shading_group.py
@@ -3,6 +3,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateShadingEngine(pyblish.api.InstancePlugin):
@@ -16,7 +17,7 @@ class ValidateShadingEngine(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     label = "Look Shading Engine Naming"
     actions = [
-        openpype.hosts.maya.api.action.SelectInvalidAction, openpype.api.RepairAction
+        openpype.hosts.maya.api.action.SelectInvalidAction, RepairAction
     ]
 
     # The default connections to check
diff --git a/openpype/hosts/maya/plugins/publish/validate_maya_units.py b/openpype/hosts/maya/plugins/publish/validate_maya_units.py
index 5f67adec76..791030e932 100644
--- a/openpype/hosts/maya/plugins/publish/validate_maya_units.py
+++ b/openpype/hosts/maya/plugins/publish/validate_maya_units.py
@@ -5,6 +5,7 @@ import openpype.api
 import openpype.hosts.maya.api.lib as mayalib
 from openpype.pipeline.context_tools import get_current_project_asset
 from math import ceil
+from openpype.pipeline.publish import RepairContextAction
 
 
 def float_round(num, places=0, direction=ceil):
@@ -17,7 +18,7 @@ class ValidateMayaUnits(pyblish.api.ContextPlugin):
     order = openpype.api.ValidateSceneOrder
     label = "Maya Units"
     hosts = ['maya']
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
 
     validate_linear_units = True
     linear_units = "cm"
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
index 90eb01aa12..0924a40632 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api.lib import maintained_selection
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin):
@@ -20,7 +21,7 @@ class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin):
     label = "Mesh Arnold Attributes"
     actions = [
         openpype.hosts.maya.api.action.SelectInvalidAction,
-        openpype.api.RepairAction
+        RepairAction
     ]
     optional = True
     if cmds.getAttr(
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py b/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
index 750932df54..b11d4a3b63 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
@@ -4,6 +4,7 @@ import maya.api.OpenMaya as om2
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateMeshNormalsUnlocked(pyblish.api.Validator):
@@ -21,7 +22,7 @@ class ValidateMeshNormalsUnlocked(pyblish.api.Validator):
     version = (0, 1, 0)
     label = 'Mesh Normals Unlocked'
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
     optional = True
 
     @staticmethod
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py b/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
index e0835000f0..90873369c9 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
@@ -3,6 +3,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 def pairs(iterable):
@@ -91,7 +92,7 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin):
     families = ['model']
     label = "Mesh Shader Connections"
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     def process(self, instance):
         """Process all the nodes in the instance 'objectSet'"""
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py b/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
index 9d2aeb7d99..70007ccd7b 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin):
@@ -23,7 +24,7 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin):
     version = (0, 1, 0)
     label = "Mesh Single UV Set"
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py b/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
index 52c45d3b0c..cb9180fd09 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
@@ -3,6 +3,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin):
@@ -21,7 +22,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin):
     optional = True
     label = "Mesh has map1 UV Set"
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
index 463c3c4c50..0c9cc81de7 100644
--- a/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
+++ b/openpype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
@@ -5,6 +5,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 def len_flattened(components):
@@ -63,7 +64,7 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin):
     category = 'geometry'
     label = 'Mesh Vertices Have Edges'
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     @classmethod
     def repair(cls, instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_muster_connection.py b/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
index 856f1d933d..c31ccf405c 100644
--- a/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
+++ b/openpype/hosts/maya/plugins/publish/validate_muster_connection.py
@@ -5,8 +5,10 @@ import appdirs
 
 import pyblish.api
 from openpype.lib import requests_get
-from openpype.pipeline.publish import context_plugin_should_run
-import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import (
+    context_plugin_should_run,
+    RepairAction,
+)
 
 
 class ValidateMusterConnection(pyblish.api.ContextPlugin):
@@ -21,7 +23,7 @@ class ValidateMusterConnection(pyblish.api.ContextPlugin):
     token = None
     if not os.environ.get("MUSTER_REST_URL"):
         active = False
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     def process(self, context):
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_namespace.py b/openpype/hosts/maya/plugins/publish/validate_no_namespace.py
index 5b3d6bc9c4..6b721135b8 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_namespace.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_namespace.py
@@ -3,6 +3,7 @@ import maya.cmds as cmds
 
 import pyblish.api
 import openpype.api
+from openpype.pipeline.publish import RepairAction
 import openpype.hosts.maya.api.action
 
 
@@ -23,7 +24,7 @@ class ValidateNoNamespace(pyblish.api.InstancePlugin):
     version = (0, 1, 0)
     label = 'No Namespaces'
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py b/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py
index 36d61b03e8..fea91b666d 100644
--- a/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py
+++ b/openpype/hosts/maya/plugins/publish/validate_no_null_transforms.py
@@ -3,6 +3,7 @@ import maya.cmds as cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 def has_shape_children(node):
@@ -43,7 +44,7 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin):
     category = 'cleanup'
     version = (0, 1, 0)
     label = 'No Empty/Null Transforms'
-    actions = [openpype.api.RepairAction,
+    actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
diff --git a/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py b/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
index 0324be9fc9..363d8882c0 100644
--- a/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
@@ -22,7 +23,7 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
     label = 'Deformed shape ids'
     actions = [
         openpype.hosts.maya.api.action.SelectInvalidAction,
-        openpype.api.RepairAction
+        RepairAction
     ]
 
     def process(self, instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_render_image_rule.py b/openpype/hosts/maya/plugins/publish/validate_render_image_rule.py
index 4d3796e429..965211e046 100644
--- a/openpype/hosts/maya/plugins/publish/validate_render_image_rule.py
+++ b/openpype/hosts/maya/plugins/publish/validate_render_image_rule.py
@@ -2,6 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import openpype.api
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateRenderImageRule(pyblish.api.InstancePlugin):
@@ -17,7 +18,7 @@ class ValidateRenderImageRule(pyblish.api.InstancePlugin):
     label = "Images File Rule (Workspace)"
     hosts = ["maya"]
     families = ["renderlayer"]
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     def process(self, instance):
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_rendersettings.py b/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
index f19c0bff36..41cfbc19b5 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -7,6 +7,7 @@ from maya import cmds, mel
 
 import pyblish.api
 import openpype.api
+from openpype.pipeline.publish import RepairAction
 from openpype.hosts.maya.api import lib
 
 
@@ -43,7 +44,7 @@ class ValidateRenderSettings(pyblish.api.InstancePlugin):
     label = "Render Settings"
     hosts = ["maya"]
     families = ["renderlayer"]
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     ImagePrefixes = {
         'mentalray': 'defaultRenderGlobals.imageFilePrefix',
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_controllers.py b/openpype/hosts/maya/plugins/publish/validate_rig_controllers.py
index d5a1fd3529..fc6cda7f23 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_controllers.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_controllers.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-import openpype.api
+from openpype.pipeline.publish import RepairAction
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api.lib import undo_chunk
 
@@ -29,7 +29,7 @@ class ValidateRigControllers(pyblish.api.InstancePlugin):
     label = "Rig Controllers"
     hosts = ["maya"]
     families = ["rig"]
-    actions = [openpype.api.RepairAction,
+    actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
     # Default controller values
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
index 1f1db9156b..23237d7ef6 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
@@ -3,6 +3,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 
+from openpype.pipeline.publish import RepairAction
 from openpype.hosts.maya.api import lib
 import openpype.hosts.maya.api.action
 
@@ -30,7 +31,7 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin):
     label = "Rig Controllers (Arnold Attributes)"
     hosts = ["maya"]
     families = ["rig"]
-    actions = [openpype.api.RepairAction,
+    actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
     attributes = [
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py b/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
index 5df754fff4..bad9c8b0d4 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_joints_hidden.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateRigJointsHidden(pyblish.api.InstancePlugin):
@@ -23,7 +24,7 @@ class ValidateRigJointsHidden(pyblish.api.InstancePlugin):
     version = (0, 1, 0)
     label = "Joints Hidden"
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py b/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
index cc3723a6e1..f170bc72b1 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin):
@@ -22,7 +23,7 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin):
     label = 'Rig Out Set Node Ids'
     actions = [
         openpype.hosts.maya.api.action.SelectInvalidAction,
-        openpype.api.RepairAction
+        RepairAction
     ]
     allow_history_only = False
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py b/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py
index 7c5c540c60..d0ef8d9c04 100644
--- a/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py
+++ b/openpype/hosts/maya/plugins/publish/validate_rig_output_ids.py
@@ -4,6 +4,7 @@ import pyblish.api
 
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateRigOutputIds(pyblish.api.InstancePlugin):
@@ -17,7 +18,7 @@ class ValidateRigOutputIds(pyblish.api.InstancePlugin):
     label = "Rig Output Ids"
     hosts = ["maya"]
     families = ["rig"]
-    actions = [openpype.api.RepairAction,
+    actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
diff --git a/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py b/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py
index e08e06b50e..d6e7ed82c4 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shape_default_names.py
@@ -5,6 +5,7 @@ from maya import cmds
 import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 def short_name(node):
@@ -39,7 +40,7 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin):
     version = (0, 1, 0)
     label = "Shape Default Naming"
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     @staticmethod
     def _define_default_name(shape):
diff --git a/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py b/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py
index 714451bb98..c332e07505 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py
@@ -4,6 +4,7 @@ import openpype.api
 from maya import cmds
 
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateShapeRenderStats(pyblish.api.Validator):
@@ -14,7 +15,7 @@ class ValidateShapeRenderStats(pyblish.api.Validator):
     families = ['model']
     label = 'Shape Default Render Stats'
     actions = [openpype.hosts.maya.api.action.SelectInvalidAction,
-               openpype.api.RepairAction]
+               RepairAction]
 
     defaults = {'castsShadows': 1,
                 'receiveShadows': 1,
diff --git a/openpype/hosts/maya/plugins/publish/validate_shape_zero.py b/openpype/hosts/maya/plugins/publish/validate_shape_zero.py
index 343eaccb7d..515a8056f7 100644
--- a/openpype/hosts/maya/plugins/publish/validate_shape_zero.py
+++ b/openpype/hosts/maya/plugins/publish/validate_shape_zero.py
@@ -4,6 +4,7 @@ import pyblish.api
 import openpype.api
 import openpype.hosts.maya.api.action
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateShapeZero(pyblish.api.Validator):
@@ -19,7 +20,7 @@ class ValidateShapeZero(pyblish.api.Validator):
     label = "Shape Zero (Freeze)"
     actions = [
         openpype.hosts.maya.api.action.SelectInvalidAction,
-        openpype.api.RepairAction
+        RepairAction
     ]
 
     @staticmethod
diff --git a/openpype/hosts/maya/plugins/publish/validate_unreal_up_axis.py b/openpype/hosts/maya/plugins/publish/validate_unreal_up_axis.py
index 5e1b04889f..3ed22c7cef 100644
--- a/openpype/hosts/maya/plugins/publish/validate_unreal_up_axis.py
+++ b/openpype/hosts/maya/plugins/publish/validate_unreal_up_axis.py
@@ -3,6 +3,7 @@
 from maya import cmds
 import pyblish.api
 import openpype.api
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateUnrealUpAxis(pyblish.api.ContextPlugin):
@@ -14,7 +15,7 @@ class ValidateUnrealUpAxis(pyblish.api.ContextPlugin):
     hosts = ["maya"]
     families = ["staticMesh"]
     label = "Unreal Up-Axis check"
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     def process(self, context):
         assert cmds.upAxis(q=True, axis=True) == "z", (
diff --git a/openpype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py b/openpype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
index 5e35565383..376d49d583 100644
--- a/openpype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
+++ b/openpype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
@@ -1,6 +1,7 @@
 import pyblish.api
 import openpype.api
 from openpype.hosts.maya.api import lib
+from openpype.pipeline.publish import RepairAction
 
 from maya import cmds
 
@@ -18,7 +19,7 @@ class ValidateVRayDistributedRendering(pyblish.api.InstancePlugin):
     order = openpype.api.ValidateContentsOrder
     label = "VRay Distributed Rendering"
     families = ["renderlayer"]
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     # V-Ray attribute names
     enabled_attr = "vraySettings.sys_distributed_rendering_on"
diff --git a/openpype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py b/openpype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
index 7a48c29b7d..39c721e717 100644
--- a/openpype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
+++ b/openpype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
@@ -4,7 +4,7 @@ import pyblish.api
 import types
 from maya import cmds
 
-import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairContextAction
 
 
 class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin):
@@ -20,7 +20,7 @@ class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin):
     label = 'VRay Referenced AOVs'
     hosts = ['maya']
     families = ['renderlayer']
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
 
     def process(self, instance):
         """Plugin main entry point."""
diff --git a/openpype/hosts/maya/plugins/publish/validate_vray_translator_settings.py b/openpype/hosts/maya/plugins/publish/validate_vray_translator_settings.py
index d611777f43..9b78699e14 100644
--- a/openpype/hosts/maya/plugins/publish/validate_vray_translator_settings.py
+++ b/openpype/hosts/maya/plugins/publish/validate_vray_translator_settings.py
@@ -2,7 +2,10 @@
 """Validate VRay Translator settings."""
 import pyblish.api
 import openpype.api
-from openpype.pipeline.publish import context_plugin_should_run
+from openpype.pipeline.publish import (
+    context_plugin_should_run,
+    RepairContextAction,
+)
 
 from maya import cmds
 
@@ -13,7 +16,7 @@ class ValidateVRayTranslatorEnabled(pyblish.api.ContextPlugin):
     order = openpype.api.ValidateContentsOrder
     label = "VRay Translator Settings"
     families = ["vrayscene_layer"]
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
 
     def process(self, context):
         """Plugin entry point."""
diff --git a/openpype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py b/openpype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
index 5610733577..4842134b12 100644
--- a/openpype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
+++ b/openpype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
@@ -1,7 +1,7 @@
 import pyblish.api
-import openpype.action
 import maya.cmds as cmds
 import openpype.hosts.maya.api.action
+from openpype.pipeline.publish import RepairAction
 
 
 class ValidateYetiRigCacheState(pyblish.api.InstancePlugin):
@@ -17,7 +17,7 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin):
     label = "Yeti Rig Cache State"
     hosts = ["maya"]
     families = ["yetiRig"]
-    actions = [openpype.action.RepairAction,
+    actions = [RepairAction,
                openpype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
diff --git a/openpype/hosts/nuke/plugins/publish/validate_knobs.py b/openpype/hosts/nuke/plugins/publish/validate_knobs.py
index e2b11892e5..d44f27791a 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_knobs.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_knobs.py
@@ -1,8 +1,11 @@
 import nuke
 import six
 import pyblish.api
-import openpype.api
-from openpype.pipeline import PublishXmlValidationError
+
+from openpype.pipeline.publish import (
+    RepairContextAction,
+    PublishXmlValidationError,
+)
 
 
 class ValidateKnobs(pyblish.api.ContextPlugin):
@@ -24,7 +27,7 @@ class ValidateKnobs(pyblish.api.ContextPlugin):
     order = pyblish.api.ValidatorOrder
     label = "Validate Knobs"
     hosts = ["nuke"]
-    actions = [openpype.api.RepairContextAction]
+    actions = [RepairContextAction]
     optional = True
 
     def process(self, context):
diff --git a/openpype/hosts/nuke/plugins/publish/validate_output_resolution.py b/openpype/hosts/nuke/plugins/publish/validate_output_resolution.py
index fc07e9b83b..1e59880f90 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_output_resolution.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_output_resolution.py
@@ -1,8 +1,8 @@
-
 import pyblish.api
-import openpype.api
+
 from openpype.hosts.nuke.api import maintained_selection
 from openpype.pipeline import PublishXmlValidationError
+from openpype.pipeline.publish import RepairAction
 import nuke
 
 
@@ -18,7 +18,7 @@ class ValidateOutputResolution(pyblish.api.InstancePlugin):
     families = ["render", "render.local", "render.farm"]
     label = "Write Resolution"
     hosts = ["nuke"]
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     missing_msg = "Missing Reformat node in render group node"
     resolution_msg = "Reformat is set to wrong format"
diff --git a/openpype/hosts/nuke/plugins/publish/validate_script_attributes.py b/openpype/hosts/nuke/plugins/publish/validate_script_attributes.py
index 106d7a2524..f0632f8080 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_script_attributes.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_script_attributes.py
@@ -1,8 +1,8 @@
 from pprint import pformat
 import pyblish.api
 
-import openpype.api
 from openpype.pipeline import PublishXmlValidationError
+from openpype.pipeline.publish import RepairAction
 from openpype.hosts.nuke.api.lib import (
     get_avalon_knob_data,
     WorkfileSettings
@@ -19,7 +19,7 @@ class ValidateScriptAttributes(pyblish.api.InstancePlugin):
     label = "Validatte script attributes"
     hosts = ["nuke"]
     optional = True
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     def process(self, instance):
         root = nuke.root()
diff --git a/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py b/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py
index 9fb57c1698..699526ef57 100644
--- a/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py
+++ b/openpype/hosts/nuke/plugins/publish/validate_write_legacy.py
@@ -3,8 +3,9 @@ import toml
 import nuke
 
 import pyblish.api
-import openpype.api
+
 from openpype.pipeline import discover_creator_plugins
+from openpype.pipeline.publish import RepairAction
 from openpype.hosts.nuke.api.lib import get_avalon_knob_data
 
 
@@ -16,7 +17,7 @@ class ValidateWriteLegacy(pyblish.api.InstancePlugin):
     families = ["write"]
     label = "Validate Write Legacy"
     hosts = ["nuke"]
-    actions = [openpype.api.RepairAction]
+    actions = [RepairAction]
 
     def process(self, instance):
         node = instance[0]