Screenshot

app/app.py

@@ -12,7 +12,7 @@
 import alembic.migration as alembic_migration
 import redis
 from calypsso import get_calypsso_app
-from fastapi import FastAPI, HTTPException, Request, Response, status
+from fastapi import APIRouter, FastAPI, HTTPException, Request, Response, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
@@ -24,7 +24,6 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import Session
 
-from app import api
 from app.core.core_endpoints import coredata_core, models_core
 from app.core.google_api.google_api import GoogleAPI
 from app.core.groups import models_groups
@@ -41,7 +40,7 @@
     get_redis_client,
     init_state,
 )
-from app.module import all_modules, module_list
+from app.module import get_all_modules, get_module_list, init_module_list
 from app.types.exceptions import (
     ContentHTTPException,
     GoogleAPIInvalidCredentialsError,
@@ -51,6 +50,7 @@
 from app.utils import initialization
 from app.utils.communication.notifications import NotificationManager
 from app.utils.redis import limiter
+from app.utils.screenshots.factory_screenshots import create_data
 from app.utils.state import LifespanState
 
 if TYPE_CHECKING:
@@ -234,13 +234,15 @@ async def run_factories(
     hyperion_error_logger: logging.Logger,
 ) -> None:
     """Run the factories to create default data in the database"""
+    await create_data(db=db)
+
     if not settings.USE_FACTORIES:
         return
 
     hyperion_error_logger.info("Startup: Factories enabled")
     # Importing the core_factory at the beginning of the factories.
     factories_list: list[Factory] = []
-    for module in all_modules:
+    for module in get_all_modules():
         if module.factory:
             factories_list.append(module.factory)
             hyperion_error_logger.info(
@@ -299,10 +301,11 @@ def initialize_module_visibility(
             coredata_core.ModuleVisibilityAwareness,
             db,
         )
+        known_roots = module_awareness.roots
 
         new_modules = [
             module
-            for module in module_list
+            for module in get_module_list()
             if module.root not in module_awareness.roots
         ]
         # Is run to create default module visibilities or when the table is empty
@@ -311,6 +314,7 @@ def initialize_module_visibility(
                 f"Startup: Some modules visibility settings are empty, initializing them ({[module.root for module in new_modules]})",
             )
             for module in new_modules:
+                known_roots.append(module.root)
                 if module.default_allowed_groups_ids is not None:
                     for group_id in module.default_allowed_groups_ids:
                         module_group_visibility = models_core.ModuleGroupVisibility(
@@ -344,9 +348,7 @@ def initialize_module_visibility(
                                 f"Startup: Could not add module visibility {module.root} in the database: {error}",
                             )
             initialization.set_core_data_sync(
-                coredata_core.ModuleVisibilityAwareness(
-                    roots=[module.root for module in module_list],
-                ),
+                coredata_core.ModuleVisibilityAwareness(roots=known_roots),
                 db,
             )
             hyperion_error_logger.info(
@@ -365,7 +367,7 @@ async def initialize_notification_topics(
 ) -> None:
     existing_topics = await get_notification_topic(db=db)
     existing_topics_id = [topic.id for topic in existing_topics]
-    for module in all_modules:
+    for module in get_all_modules():
         if module.registred_topics:
             for registred_topic in module.registred_topics:
                 if registred_topic.id not in existing_topics_id:
@@ -609,7 +611,7 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[LifespanState, None]:
             app=app,
             settings=settings,
             hyperion_error_logger=hyperion_error_logger,
-            drop_db=drop_db,
+            drop_db=True,
         )
 
         yield state
@@ -622,13 +624,18 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[LifespanState, None]:
             hyperion_error_logger=hyperion_error_logger,
         )
 
+    init_module_list(settings=settings)
+
     # Initialize app
     app = FastAPI(
         title="Hyperion",
         version=settings.HYPERION_VERSION,
         lifespan=lifespan,
     )
-    app.include_router(api.api_router)
+    api_router = APIRouter()
+    for module in get_all_modules():
+        api_router.include_router(module.router)
+    app.include_router(api_router)
     use_route_path_as_operation_ids(app)
 
     app.add_middleware(

app/core/checkout/endpoints_checkout.py

@@ -14,7 +14,7 @@
     NotificationResultContent,
 )
 from app.dependencies import get_db
-from app.module import all_modules
+from app.module import get_all_modules
 from app.types.module import CoreModule
 
 router = APIRouter(tags=["Checkout"])
@@ -133,7 +133,7 @@ async def webhook(
 
         # If a callback is defined for the module, we want to call it
         try:
-            for module in all_modules:
+            for module in get_all_modules():
                 if module.root == checkout.module:
                     if module.payment_callback is not None:
                         hyperion_error_logger.info(

app/core/core_endpoints/endpoints_core.py

@@ -14,7 +14,7 @@
     is_user,
     is_user_super_admin,
 )
-from app.module import module_list
+from app.module import get_module_list
 from app.types.module import CoreModule
 from app.utils.tools import is_group_id_valid, patch_identity_in_text
 
@@ -209,7 +209,7 @@ async def get_module_visibility(
     """
 
     return_module_visibilities = []
-    for module in module_list:
+    for module in get_module_list():
         allowed_group_ids = await cruds_core.get_allowed_groups_by_root(
             root=module.root,
             db=db,
@@ -237,14 +237,19 @@ async def get_module_visibility(
 async def get_user_modules_visibility(
     db: AsyncSession = Depends(get_db),
     user: models_users.CoreUser = Depends(is_user()),
+    settings: Settings = Depends(get_settings),
 ):
     """
     Get group user accessible root
 
     **This endpoint is only usable by everyone**
     """
 
-    return await cruds_core.get_modules_by_user(user=user, db=db)
+    modules = await cruds_core.get_modules_by_user(user=user, db=db)
+    if settings.RESTRICT_TO_MODULES:
+        return [module for module in modules if module in settings.RESTRICT_TO_MODULES]
+
+    return modules
 
 
 @router.post(

app/core/utils/config.py

@@ -213,6 +213,10 @@ def settings_customise_sources(
     # If self registration is disabled, users will need to be invited by an administrator to be able to register
     ALLOW_SELF_REGISTRATION: bool = True
 
+    # Restrict to a list of module roots
+    # CoreModules can not be disabled
+    RESTRICT_TO_MODULES: list[str] | None = None
+
     ############################
     # PostgreSQL configuration #
     ############################

app/module.py

@@ -2,37 +2,66 @@
 import logging
 from pathlib import Path
 
+from app.core.utils.config import Settings
+from app.types.exceptions import InvalidModuleRootInDotenvError
 from app.types.module import CoreModule, Module
 
 hyperion_error_logger = logging.getLogger("hyperion.error")
 
-module_list: list[Module] = []
-core_module_list: list[CoreModule] = []
-all_modules: list[CoreModule] = []
-
-for endpoints_file in Path().glob("app/modules/*/endpoints_*.py"):
-    endpoint_module = importlib.import_module(
-        ".".join(endpoints_file.with_suffix("").parts),
-    )
-    if hasattr(endpoint_module, "module"):
-        module: Module = endpoint_module.module
-        module_list.append(module)
-    else:
-        hyperion_error_logger.error(
-            f"Module {endpoints_file} does not declare a module. It won't be enabled.",
+_module_list: list[Module] = []
+_core_module_list: list[CoreModule] = []
+
+
+def init_module_list(settings: Settings):
+    _module_list.clear()
+    _core_module_list.clear()
+
+    module_list = []
+    for endpoints_file in Path().glob("app/modules/*/endpoints_*.py"):
+        endpoint_module = importlib.import_module(
+            ".".join(endpoints_file.with_suffix("").parts),
         )
+        if hasattr(endpoint_module, "module"):
+            module: Module = endpoint_module.module
+            module_list.append(module)
+        else:
+            hyperion_error_logger.error(
+                f"Module {endpoints_file} does not declare a module. It won't be enabled.",
+            )
 
+    if settings.RESTRICT_TO_MODULES:
+        existing_module_roots = [module.root for module in module_list]
+        for root in settings.RESTRICT_TO_MODULES:
+            if root not in existing_module_roots:
+                raise InvalidModuleRootInDotenvError(root)
+    for module in module_list:
+        if (
+            settings.RESTRICT_TO_MODULES
+            and module.root not in settings.RESTRICT_TO_MODULES
+        ):
+            continue
+        _module_list.append(module)
 
-for endpoints_file in Path().glob("app/core/*/endpoints_*.py"):
-    endpoint_module = importlib.import_module(
-        ".".join(endpoints_file.with_suffix("").parts),
-    )
-    if hasattr(endpoint_module, "core_module"):
-        core_module: CoreModule = endpoint_module.core_module
-        core_module_list.append(core_module)
-    else:
-        hyperion_error_logger.error(
-            f"Core module {endpoints_file} does not declare a core module. It won't be enabled.",
+    for endpoints_file in Path().glob("app/core/*/endpoints_*.py"):
+        endpoint_module = importlib.import_module(
+            ".".join(endpoints_file.with_suffix("").parts),
         )
+        if hasattr(endpoint_module, "core_module"):
+            core_module: CoreModule = endpoint_module.core_module
+            _core_module_list.append(core_module)
+        else:
+            hyperion_error_logger.error(
+                f"Core module {endpoints_file} does not declare a core module. It won't be enabled.",
+            )
+
+
+def get_module_list() -> list[Module]:
+    return _module_list
+
+
+def get_core_module_list() -> list[CoreModule]:
+    return _core_module_list
+
 
-all_modules = module_list + core_module_list
+def get_all_modules() -> list[Module | CoreModule]:
+    return get_module_list() + get_core_module_list()

app/types/exceptions.py

@@ -32,6 +32,11 @@ def __init__(self):
         super().__init__("Google API is not configured in dotenv")
 
 
+class InvalidModuleRootInDotenvError(Exception):
+    def __init__(self, root: str):
+        super().__init__(f"Module root {root} does not exist")
+
+
 class ContentHTTPException(HTTPException):
     """
     A custom HTTPException allowing to return custom content.