From bf3812b820d44d0ae8fdcb573d4663e81fb7a6dd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 6 Feb 2024 12:12:00 +0100
Subject: [PATCH] minor fixes in the code

---
 client/ayon_core/addon/base.py       | 23 +++++++++++++++++++++++
 client/ayon_core/addon/interfaces.py |  2 +-
 client/ayon_core/client/__init__.py  |  2 +-
 client/ayon_core/modules/base.py     | 23 ++++-------------------
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index fd096dea56..374ace0783 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -592,6 +592,26 @@ class AYONAddon(object):
         pass
 
 
+class OpenPypeModule(AYONAddon):
+    """Base class of OpenPype module.
+
+    Deprecated:
+        Use `AYONAddon` instead.
+
+    Args:
+        manager (AddonsManager): Manager object who discovered addon.
+        settings (dict[str, Any]): Module settings (OpenPype settings).
+    """
+
+    # Disable by default
+    enabled = False
+
+
+class OpenPypeAddOn(OpenPypeModule):
+    # Enable Addon by default
+    enabled = True
+
+
 class AddonsManager:
     """Manager of addons that helps to load and prepare them to work.
 
@@ -638,12 +658,15 @@ class AddonsManager:
 
         return self._addons_by_name.get(addon_name, default)
 
+    @property
     def addons(self):
         return list(self._addons)
 
+    @property
     def addons_by_id(self):
         return dict(self._addons_by_id)
 
+    @property
     def addons_by_name(self):
         return dict(self._addons_by_name)
 
diff --git a/client/ayon_core/addon/interfaces.py b/client/ayon_core/addon/interfaces.py
index b68189ddcc..86e0c6e060 100644
--- a/client/ayon_core/addon/interfaces.py
+++ b/client/ayon_core/addon/interfaces.py
@@ -2,7 +2,7 @@ from abc import ABCMeta, abstractmethod
 
 import six
 
-from openpype import resources
+from ayon_core import resources
 
 
 class _AYONInterfaceMeta(ABCMeta):
diff --git a/client/ayon_core/client/__init__.py b/client/ayon_core/client/__init__.py
index dfea70bc05..00f4d9863f 100644
--- a/client/ayon_core/client/__init__.py
+++ b/client/ayon_core/client/__init__.py
@@ -1,4 +1,4 @@
-from .server.utils import get_ayon_server_api_connection
+from .utils import get_ayon_server_api_connection
 
 from .entities import (
     get_projects,
diff --git a/client/ayon_core/modules/base.py b/client/ayon_core/modules/base.py
index 060098fac6..8a78edf961 100644
--- a/client/ayon_core/modules/base.py
+++ b/client/ayon_core/modules/base.py
@@ -4,26 +4,11 @@ from ayon_core.addon import (
     TrayAddonsManager,
     load_addons,
 )
+from ayon_core.addon.base import (
+    OpenPypeModule,
+    OpenPypeAddOn,
+)
 
 ModulesManager = AddonsManager
 TrayModulesManager = TrayAddonsManager
 load_modules = load_addons
-
-
-class OpenPypeModule(AYONAddon):
-    """Base class of OpenPype module.
-
-    Instead of 'AYONAddon' are passed in module settings.
-
-    Args:
-        manager (AddonsManager): Manager object who discovered addon.
-        settings (dict[str, Any]): Settings.
-    """
-
-    # Disable by default
-    enabled = False
-
-
-class OpenPypeAddOn(OpenPypeModule):
-    # Enable Addon by default
-    enabled = True