From 5abda854566bb38d8a5fefb535cb198be2bc1c48 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 27 Mar 2024 18:33:48 +0100
Subject: [PATCH] modified addons discovery to be able to detect addons in
 addons dir

---
 client/ayon_core/addon/base.py | 42 +++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index 6bac25b8ac..da02691275 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -16,6 +16,7 @@ import six
 import appdirs
 import ayon_api
 
+from ayon_core import AYON_CORE_ROOT
 from ayon_core.lib import Logger, is_dev_mode_enabled
 from ayon_core.settings import get_studio_settings
 
@@ -335,14 +336,49 @@ def _load_ayon_addons(openpype_modules, modules_key, log):
     return addons_to_skip_in_core
 
 
+def _load_ayon_addons_dir(openpype_modules, modules_key, log):
+    addons_dir = os.path.join(AYON_CORE_ROOT, "addons")
+    if not os.path.exists(addons_dir):
+        return
+
+    while addons_dir in sys.path:
+        sys.path.remove(addons_dir)
+    sys.path.insert(0, addons_dir)
+
+    imported_modules = []
+    for name in os.listdir(addons_dir):
+        fullpath = os.path.join(addons_dir, name)
+        basename = os.path.splitext(name)[0]
+        try:
+            module = __import__(basename, fromlist=("",))
+            for attr_name in dir(module):
+                attr = getattr(module, attr_name)
+                if (
+                    inspect.isclass(attr)
+                    and issubclass(attr, AYONAddon)
+                ):
+                    new_import_str = "{}.{}".format(modules_key, basename)
+                    sys.modules[new_import_str] = module
+                    setattr(openpype_modules, basename, module)
+                    imported_modules.append(module)
+                    break
+
+        except Exception:
+            log.error(
+                "Failed to import addon '{}'.".format(fullpath),
+                exc_info=True
+            )
+    return imported_modules
+
+
 def _load_addons_in_core(
     ignore_addon_names, openpype_modules, modules_key, log
 ):
+    _load_ayon_addons_dir(openpype_modules, modules_key, log)
     # Add current directory at first place
     #   - has small differences in import logic
-    current_dir = os.path.abspath(os.path.dirname(__file__))
-    hosts_dir = os.path.join(os.path.dirname(current_dir), "hosts")
-    modules_dir = os.path.join(os.path.dirname(current_dir), "modules")
+    hosts_dir = os.path.join(AYON_CORE_ROOT, "hosts")
+    modules_dir = os.path.join(AYON_CORE_ROOT, "modules")
 
     ignored_host_names = set(IGNORED_HOSTS_IN_AYON)
     ignored_module_dir_filenames = (