Merge pull request #939 from TheDeanLab/2024-07-13

Refactor plugins_model

Author: annie-xd-wang

src/navigate/config/config.py

@@ -1,6 +1,5 @@
 # Copyright (c) 2021-2024  The University of Texas Southwestern Medical Center.
 # All rights reserved.
-
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted for academic and research use only
 # (subject to the limitations in the disclaimer below)
@@ -39,12 +38,14 @@
 from pathlib import Path
 from os.path import isfile
 from multiprocessing.managers import ListProxy, DictProxy
+import inspect
 
 # Third Party Imports
 import yaml
 
 # Local Imports
-from navigate.tools.common_functions import build_ref_name
+from navigate.tools.common_functions import build_ref_name, load_module_from_file
+from navigate.model.features import feature_related_functions
 
 
 def get_navigate_path():
@@ -1097,3 +1098,23 @@ def verify_configuration(manager, configuration):
         "gui",
         {"channels": {"count": channel_count}},
     )
+
+
+def set_feature_attributes(plugin_path):
+    """Load feature module and set function attributes.
+
+    Parameters
+    ----------
+    plugin_path : str
+        The path to the plugins folder.
+    """
+    features_dir = os.path.join(plugin_path, "model", "features")
+    if os.path.exists(features_dir):
+        features = os.listdir(features_dir)
+        for feature in features:
+            feature_file = os.path.join(features_dir, feature)
+            if os.path.isfile(feature_file):
+                temp = load_module_from_file(feature, feature_file)
+                for c in dir(temp):
+                    if inspect.isclass(getattr(temp, c)):
+                        setattr(feature_related_functions, c, getattr(temp, c))

src/navigate/controller/sub_controllers/plugins.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2022  The University of Texas Southwestern Medical Center.
+# Copyright (c) 2021-2024  The University of Texas Southwestern Medical Center.
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,6 @@
 # Standard library imports
 from pathlib import Path
 import os
-import inspect
 import tkinter as tk
 from tkinter import messagebox
 
@@ -48,6 +47,7 @@
 from navigate.model.features import feature_related_functions
 from navigate.controller.sub_controllers.gui import GUIController
 from navigate.view.popups.plugins_popup import PluginsPopup
+from navigate.config import set_feature_attributes
 
 
 class PluginsController:
@@ -174,18 +174,7 @@ def load_plugins(self):
                             plugin_name, plugin_frame, plugin_controller
                         )
             # feature
-            features_dir = os.path.join(plugin_path, "model", "features")
-            if os.path.exists(features_dir):
-                features = os.listdir(features_dir)
-                for feature in features:
-                    feature_file = os.path.join(features_dir, feature)
-                    if os.path.isfile(feature_file):
-                        module = load_module_from_file(feature, feature_file)
-                        for c in dir(module):
-                            if inspect.isclass(getattr(module, c)):
-                                setattr(
-                                    feature_related_functions, c, getattr(module, c)
-                                )
+            set_feature_attributes(plugin_path)
 
             # acquisition mode
             acquisition_modes = plugin_config.get("acquisition_modes", [])