From 8eef66c3df8583a8503caefd69e6bd7255fd1498 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 16 Feb 2023 12:29:43 +0100
Subject: [PATCH] Fix creation of DiscoverResult for pyblish plugins

---
 openpype/pipeline/create/context.py | 7 ++++---
 openpype/pipeline/publish/lib.py    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 5f1371befa..7672c49eb3 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -8,6 +8,9 @@ import inspect
 from uuid import uuid4
 from contextlib import contextmanager
 
+import pyblish.logic
+import pyblish.api
+
 from openpype.client import get_assets, get_asset_by_name
 from openpype.settings import (
     get_system_settings,
@@ -1619,8 +1622,6 @@ class CreateContext:
         self._reset_convertor_plugins()
 
     def _reset_publish_plugins(self, discover_publish_plugins):
-        import pyblish.logic
-
         from openpype.pipeline import OpenPypePyblishPluginMixin
         from openpype.pipeline.publish import (
             publish_plugins_discover
@@ -1629,7 +1630,7 @@ class CreateContext:
         # Reset publish plugins
         self._attr_plugins_by_family = {}
 
-        discover_result = DiscoverResult()
+        discover_result = DiscoverResult(pyblish.api.Plugin)
         plugins_with_defs = []
         plugins_by_targets = []
         plugins_mismatch_targets = []
diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py
index 50623e5110..5f95c6695e 100644
--- a/openpype/pipeline/publish/lib.py
+++ b/openpype/pipeline/publish/lib.py
@@ -270,7 +270,7 @@ def publish_plugins_discover(paths=None):
     """
 
     # The only difference with `pyblish.api.discover`
-    result = DiscoverResult()
+    result = DiscoverResult(pyblish.api.Plugin)
 
     plugins = dict()
     plugin_names = []