Merge branch 'main' into prs/adding-pickle-output-to-cli

Author: NotTheEvilOne

Dockerfile

@@ -27,6 +27,7 @@ LABEL org.opencontainers.image.source="https://github.com/SovereignCloudStack/ro
 
 ARG ROOKIFY_VERSION=0.0.0.dev1
 ENV ROOKIFY_VERSION=$ROOKIFY_VERSION
+ENV PYTHONPATH="${PYTHONPATH}:/app/rookify/src"
 
 WORKDIR /app/rookify
 

requirements.txt

@@ -1,17 +1,17 @@
 bcrypt==4.1.2
 cachetools==5.3.2
-certifi==2024.2.2
+certifi==2024.7.4
 cffi==1.16.0
 charset-normalizer==3.3.2
-cryptography==42.0.4
+cryptography==43.0.1
 dill==0.3.8
 decorator==5.1.1
 Deprecated==1.2.14
 fabric==3.2.2
 google-auth==2.28.1
-idna==3.6
+idna==3.7
 invoke==2.2.0
-Jinja2==3.1.3
+Jinja2==3.1.4
 kubernetes==29.0.0
 MarkupSafe==2.1.5
 oauthlib==3.2.2
@@ -22,13 +22,13 @@ pycparser==2.21
 PyNaCl==1.5.0
 python-dateutil==2.8.2
 PyYAML==6.0.1
-requests==2.31.0
+requests==2.32.2
 requests-oauthlib==1.3.1
 rsa==4.9
 six==1.16.0
 structlog==24.1.0
 transitions==0.9.0
-urllib3==2.2.1
+urllib3==2.2.2
 yamale==5.1.0
 websocket-client==1.7.0
 wrapt==1.16.0

src/rookify/modules/__init__.py

@@ -44,7 +44,16 @@ def _load_module(
 
     global _modules_loaded
 
-    module = importlib.import_module("rookify.modules.{0}".format(module_name))
+    if "." in module_name:
+        absolute_module_name = module_name
+    else:
+        absolute_module_name = "rookify.modules.{0}".format(module_name)
+
+    try:
+        module = importlib.import_module(absolute_module_name)
+    except ModuleNotFoundError as e:
+        raise ModuleLoadException(module_name, str(e))
+
     additional_module_names = []
 
     if not hasattr(module, "ModuleHandler") or not callable(
@@ -61,6 +70,7 @@ def _load_module(
 
     if module not in _modules_loaded:
         _modules_loaded.append(module)
+
     module.ModuleHandler.register_states(machine, config)
 
 
@@ -79,6 +89,11 @@ def load_modules(machine: Machine, config: Dict[str, Any]) -> None:
             migration_modules.remove(entry.name)
             _load_module(machine, config, entry.name)
 
+    for migration_module in migration_modules.copy():
+        if "." in migration_module:
+            migration_modules.remove(migration_module)
+            _load_module(machine, config, migration_module)
+
     if len(migration_modules) > 0 or len(config["migration_modules"]) < 1:
         logger = get_logger()