Various bugfix in LodelContext integration

- Replaced some "hidden" import with LodelContext.expose_modules calls
 - in some functions of Setting, Plugin, validator
 - in loader.py (temporary version)

In this state the tests runs (151 success), I'm able to run an instance (from debian package using slim) in MONOSITE mode and in MULTISITE mode by creating and loading a context in the loader.

lodel/auth/client.py

@@ -6,7 +6,6 @@ import warnings
 import inspect
 
 from lodel.context import LodelContext
-
 LodelContext.expose_modules(globals(), {
     'lodel.settings': 'Settings',
     'lodel.logger': 'logger',

lodel/plugin/__init__.py

@@ -93,9 +93,11 @@
 # - @ref lodel.plugin.sessionhandler.SessionHandlerPlugin "SessionHandlerPlugin"
 #
 
-from .hooks import LodelHook
-from .plugins import Plugin, CustomMethod
-from .datasource_plugin import DatasourcePlugin
-from .sessionhandler import SessionHandlerPlugin
-from .interface import InterfacePlugin
-from .extensions import Extension
+from lodel.context import LodelContext
+LodelContext.expose_modules(globals(), {
+    'lodel.plugin.hooks': ['LodelHook'],
+    'lodel.plugin.plugins': ['Plugin', 'CustomMethod'],
+    'lodel.plugin.datasource_plugin': ['DatasourcePlugin'],
+    'lodel.plugin.sessionhandler': ['SessionHandlerPlugin'],
+    'lodel.plugin.interface': ['InterfacePlugin'],
+    'lodel.plugin.extensions': ['Extension']})

lodel/plugin/plugins.py

@@ -11,6 +11,7 @@ from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {
     'lodel.logger': 'logger',
     'lodel.settings.utils': ['SettingsError'],
+    'lodel.plugin.hooks': ['LodelHook'],
     'lodel.plugin.exceptions': ['PluginError', 'PluginTypeError',
         'LodelScriptError', 'DatasourcePluginError'],
     'lodel.exceptions': ['LodelException', 'LodelExceptions',
@@ -430,7 +431,6 @@ name differ from the one found in plugin's init file"
     #
     # @note Maybe we have to exit everything if a plugin cannot be loaded...
     def activable(self):
-        from lodel import logger
         try:
             test_fun = getattr(self.module, ACTIVATE_METHOD_NAME)
         except AttributeError:
@@ -452,7 +452,6 @@ name differ from the one found in plugin's init file"
     def _load(self):
         if self.loaded:
             return
-        from lodel import logger
         #Test that plugin "wants" to be activated
         activable = self.activable()
         if not(activable is True):
@@ -524,7 +523,6 @@ name differ from the one found in plugin's init file"
                 msg += "\n\t%20s : %s" % (name,e)
             msg += "\n"
             raise PluginError(msg)
-        from lodel.plugin.hooks import LodelHook
         LodelHook.call_hook(
             "lodel2_plugins_loaded", cls, cls._plugin_instances)
    
@@ -552,7 +550,8 @@ name differ from the one found in plugin's init file"
     # etc...
     @classmethod
     def plugin_list_confspec(cls):
-        from lodel.settings.validator import confspec_append
+        LodelContext.expose_modules(globals(), {
+            'lodel.settings.validator': ['confspec_append']})
         res = dict()
         for pcls in cls.plugin_types():
             plcs = pcls.plist_confspec()

lodel/settings/__init__.py

@@ -33,5 +33,7 @@
 #   print("DEBUG MODE !")
 # </pre>
 #
-from lodel.settings.settings import SettingsRO as Settings
+from lodel.context import LodelContext
+LodelContext.expose_modules(globals(), {
+    'lodel.settings.settings': [('SettingsRO', 'Settings')]})
 

lodel/settings/settings.py

@@ -134,7 +134,8 @@ class Settings(object, metaclass=MetaSettings):
 
     ##@brief This method handles Settings instance bootstraping
     def __bootstrap(self):
-        from lodel.plugin.plugins import Plugin, PluginError
+        LodelContext.expose_modules(globals(), {
+            'lodel.plugin.plugins': ['Plugin', 'PluginError']})
         logger.debug("Settings bootstraping")
         lodel2_specs = LODEL2_CONF_SPECS
         loader = SettingsLoader(self.__conf_dir) 

lodel/settings/validator.py

@@ -241,8 +241,10 @@ def host_val(value):
 ##@brief Validator for Editorial model component
 #
 # Designed to validate a conf that indicate a class.field in an EM
+#@todo modified the hardcoded dyncode import (it's a warning)
 def emfield_val(value):
-    from lodel.plugin.hooks import LodelHook
+    LodelContext.expose_modules(globals(), {
+        'lodel.plugin.hooks': ['LodelHook']})
     spl = value.split('.')
     if len(spl) != 2:
         msg = "Expected a value in the form CLASSNAME.FIELDNAME but got : %s"
@@ -251,7 +253,7 @@ def emfield_val(value):
     #Late validation hook
     @LodelHook('lodel2_dyncode_bootstraped')
     def emfield_conf_check(hookname, caller, payload):
-        from lodel import dyncode
+        import eapi_dyncode as dyncode # <-- dirty & quick
         classnames = { cls.__name__.lower():cls for cls in dyncode.dynclasses}
         if value[0].lower() not in classnames:
             msg = "Following dynamic class do not exists in current EM : %s"
@@ -266,12 +268,14 @@ def emfield_val(value):
 #
 #Able to check that the value is a plugin and if it is of a specific type
 def plugin_validator(value, ptype = None):
-    from lodel.plugin.hooks import LodelHook
+    LodelContext.expose_modules(globals(), {
+        'lodel.plugin.hooks': ['LodelHook']})
     value = copy.copy(value)
     @LodelHook('lodel2_dyncode_bootstraped')
     def plugin_type_checker(hookname, caller, payload):
-        from lodel.plugin.plugins import Plugin
-        from lodel.plugin.exceptions import PluginError
+        LodelContext.expose_modules(globals(), {
+            'lodel.plugin.plugins': ['Plugin'],
+            'lodel.plugin.exceptions': ['PluginError']})
         if value is None:
             return
         try:

plugins/webui/interface/controllers/admin.py

@@ -5,7 +5,7 @@ from .base import get_response
 from lodel.context import LodelContext
 LodelContext.expose_modules(globals(), {
     'lodel.leapi.exceptions': [],
-    'lodel.logger': 'logger':
+    'lodel.logger': 'logger',
     'lodel.leapi.datahandlers.base_classes': ['MultipleRef']})
 
 from ...client import WebUiClient

progs/slim/install_model/loader.py

@@ -32,20 +32,24 @@ if 'LODEL2_NO_SETTINGS_LOAD' not in os.environ:
     #
     # Loading settings
     #
-    from lodel.settings.settings import Settings as settings
+    LodelContext.expose_modules(globals(), {
+        'lodel.settings.settings': [('Settings', 'settings')]})
     if not settings.started():
         settings('conf.d')
-    from lodel.settings import Settings
+    LodelContext.expose_modules(globals(), {
+        'lodel.settings': ['Settings']})
     
     #Starts hooks
-    from lodel.plugin import LodelHook
-    from lodel.plugin import core_hooks
-    from lodel.plugin import core_scripts
+    LodelContext.expose_modules(globals(), {
+        'lodel.plugin': ['LodelHook'],
+	'lodel.plugin.core_hooks': 'core_hooks',
+	'lodel.plugin.core_scripts': 'core_scripts'})
 
 def start():
     #Load plugins
-    from lodel import logger
-    from lodel.plugin import Plugin
+    LodelContext.expose_modules(globals(), {
+        'lodel.logger': 'logger',
+        'lodel.plugin': ['Plugin']})
     logger.debug("Loader.start() called")
     Plugin.load_all()
     LodelHook.call_hook('lodel2_bootstraped', '__main__', None)
@@ -66,7 +70,7 @@ if __name__ == '__main__':
         runner.run(suite)
         exit()
 
-    import lodel
+    lodel = LodelContext.get()
     import leapi_dyncode as dyncode
     lodel.dyncode = dyncode
     LodelHook.call_hook('lodel2_dyncode_bootstraped', '__main__', None)