mdb-engine 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

mdb_engine/__init__.py

@@ -82,8 +82,8 @@ from .repositories import Entity, MongoRepository, Repository, UnitOfWork
 from .utils import clean_mongo_doc, clean_mongo_docs
 
 __version__ = (
-    "0.4.2"  # Security release: Fixed auto-role assignment, token blacklist
-    # fail-closed, race conditions, session binding, and path traversal
+    "0.4.3"  # Feature: Automatic route import for multi-app deployments
+    # Routes from web.py/routes.py are now automatically imported when using create_multi_app()
 )
 
 __all__ = [

mdb_engine/core/engine.py

@@ -1729,6 +1729,199 @@ class MongoDBEngine:
 
         return validation_errors
 
+    def _import_app_routes(self, child_app: "FastAPI", manifest_path: Path, slug: str) -> None:
+        """
+        Automatically discover and import route modules for a child app.
+
+        This method looks for route modules (web.py, routes.py) in the same directory
+        as the manifest and imports them so that route decorators are executed and
+        routes are registered on the child app.
+
+        Args:
+            child_app: The FastAPI child app to register routes on
+            manifest_path: Path to the manifest.json file
+            slug: App slug for logging
+
+        The method tries multiple strategies:
+        1. Look for 'web.py' in the manifest directory
+        2. Look for 'routes.py' in the manifest directory
+        3. Check manifest for explicit 'routes_module' field (future support)
+
+        When importing, the method ensures that route decorators in the imported module
+        reference the child_app by temporarily injecting it into the module namespace.
+        """
+        import importlib.util
+        import sys
+
+        manifest_dir = manifest_path.parent
+
+        # Try to find route modules in order of preference
+        route_module_paths = [
+            manifest_dir / "web.py",
+            manifest_dir / "routes.py",
+        ]
+
+        # Also check for routes_module in manifest (future support)
+        try:
+            import json
+
+            with open(manifest_path) as f:
+                manifest_data = json.load(f)
+            routes_module = manifest_data.get("routes_module")
+            if routes_module:
+                # Support both relative (to manifest dir) and absolute paths
+                if routes_module.startswith("/"):
+                    route_module_paths.insert(0, Path(routes_module))
+                else:
+                    route_module_paths.insert(0, manifest_dir / routes_module)
+        except (FileNotFoundError, json.JSONDecodeError, KeyError):
+            pass
+
+        imported = False
+        module_name = None
+        route_module = None
+        manifest_dir_str = None
+        path_inserted = False
+
+        for route_module_path in route_module_paths:
+            if not route_module_path.exists():
+                continue
+
+            # Create a unique module name to avoid conflicts
+            module_name = f"mdb_engine_imported_routes_{slug}_{id(child_app)}"
+
+            try:
+                # Validate file is actually a Python file
+                if not route_module_path.suffix == ".py":
+                    logger.debug(f"Skipping non-Python file '{route_module_path}' for app '{slug}'")
+                    continue
+
+                # Load the module spec
+                spec = importlib.util.spec_from_file_location(module_name, route_module_path)
+                if spec is None or spec.loader is None:
+                    logger.warning(
+                        f"Could not create spec for route module '{route_module_path}' "
+                        f"for app '{slug}'"
+                    )
+                    continue
+
+                route_module = importlib.util.module_from_spec(spec)
+
+                # CRITICAL: Inject child_app into module namespace BEFORE loading
+                # This ensures that @app.get(), @app.post(), etc. decorators in the
+                # imported module will reference our child_app instead of creating a new one
+                route_module.app = child_app
+                route_module.engine = self  # Also provide engine reference for dependencies
+
+                # Add to sys.modules temporarily to handle relative imports
+                # Use a try-finally to ensure cleanup even on exceptions
+                sys.modules[module_name] = route_module
+
+                # Store route count before import
+                routes_before = len(child_app.routes)
+
+                # Add manifest directory to Python path temporarily for relative imports
+                # This allows route modules to import sibling modules
+                manifest_dir_str = str(manifest_dir.resolve())
+                path_inserted = manifest_dir_str not in sys.path
+                if path_inserted:
+                    sys.path.insert(0, manifest_dir_str)
+
+                try:
+                    # Execute the module (runs route decorators with injected app)
+                    spec.loader.exec_module(route_module)
+                except SyntaxError as e:
+                    logger.warning(
+                        f"Syntax error in route module '{route_module_path}' "
+                        f"for app '{slug}': {e}. Skipping this module."
+                    )
+                    continue
+                except ImportError as e:
+                    # ImportError might be due to missing dependencies - log but don't fail
+                    logger.debug(
+                        f"Import error in route module '{route_module_path}' "
+                        f"for app '{slug}': {e}. "
+                        "This may be OK if dependencies are optional."
+                    )
+                    # Check if it's a critical import (like FastAPI) vs optional dependency
+                    error_str = str(e).lower()
+                    if "fastapi" in error_str or "starlette" in error_str:
+                        logger.warning(
+                            f"Route module '{route_module_path}' for app '{slug}' "
+                            "requires FastAPI/Starlette but they're not available. "
+                            "Routes will not be registered."
+                        )
+                    continue
+                finally:
+                    # Remove from path only if we added it
+                    if path_inserted and manifest_dir_str and manifest_dir_str in sys.path:
+                        try:
+                            sys.path.remove(manifest_dir_str)
+                        except ValueError:
+                            # Path might have been removed already - ignore
+                            pass
+
+                # Check if module overwrote app (shouldn't happen in well-structured modules)
+                module_app = getattr(route_module, "app", None)
+                if module_app is not None and module_app is not child_app:
+                    import warnings
+
+                    warning_msg = (
+                        f"Route module '{route_module_path.name}' for app '{slug}' "
+                        "created its own app instance. Routes defined before app creation "
+                        "are registered, but routes defined after may not be. "
+                        "Consider restructuring the module to use the injected 'app' variable."
+                    )
+                    logger.warning(warning_msg)
+                    warnings.warn(warning_msg, UserWarning, stacklevel=2)
+
+                routes_after = len(child_app.routes)
+                routes_added = routes_after - routes_before
+
+                if routes_added > 0:
+                    logger.info(
+                        f"✅ Auto-imported routes from '{route_module_path.name}' "
+                        f"for app '{slug}'. Added {routes_added} route(s) "
+                        f"(total: {routes_after})"
+                    )
+                else:
+                    logger.debug(
+                        f"Route module '{route_module_path.name}' for app '{slug}' "
+                        "was imported but no new routes were registered. "
+                        "This may be expected if routes are registered conditionally."
+                    )
+
+                imported = True
+                break
+
+            except (ValueError, TypeError, AttributeError, RuntimeError, OSError) as e:
+                logger.warning(
+                    f"Unexpected error importing route module '{route_module_path}' "
+                    f"for app '{slug}': {e}",
+                    exc_info=True,
+                )
+                continue
+            finally:
+                # Clean up temporary module from sys.modules
+                if module_name and module_name in sys.modules:
+                    try:
+                        del sys.modules[module_name]
+                    except KeyError:
+                        # Already removed - ignore
+                        pass
+                # Ensure path is cleaned up even if exception occurred
+                if path_inserted and manifest_dir_str and manifest_dir_str in sys.path:
+                    try:
+                        sys.path.remove(manifest_dir_str)
+                    except ValueError:
+                        pass
+
+        if not imported:
+            logger.debug(
+                f"No route modules found for app '{slug}' in {manifest_dir}. "
+                "Routes may be defined elsewhere or app may not have HTTP routes."
+            )
+
     def create_multi_app(  # noqa: C901
         self,
         apps: list[dict[str, Any]] | None = None,
@@ -2059,6 +2252,26 @@ class MongoDBEngine:
                         on_shutdown=on_shutdown,
                     )
 
+                    # Automatically import routes from app module
+                    # This discovers and imports route modules (web.py, routes.py, etc.)
+                    # so that route decorators are executed and routes are registered
+                    try:
+                        self._import_app_routes(child_app, manifest_path, slug)
+                    except (
+                        ValueError,
+                        TypeError,
+                        AttributeError,
+                        RuntimeError,
+                        ImportError,
+                        SyntaxError,
+                        OSError,
+                    ) as e:
+                        logger.warning(
+                            f"Failed to auto-import routes for app '{slug}': {e}. "
+                            "Routes may need to be imported manually.",
+                            exc_info=True,
+                        )
+
                     # Share user_pool with child app if shared auth is enabled
                     if shared_user_pool_initialized and hasattr(app.state, "user_pool"):
                         child_app.state.user_pool = app.state.user_pool
@@ -2081,6 +2294,8 @@ class MongoDBEngine:
                     # Store parent app reference and current app info for middleware
                     child_app.state.parent_app = app
                     child_app.state.app_slug = slug
+                    # Required for get_scoped_db and other dependencies
+                    child_app.state.engine = engine
                     child_app.state.app_base_path = path_prefix
                     child_app.state.app_auth_hub_url = auth_hub_url
                     child_app.state.app_manifest = app_manifest_data

{mdb_engine-0.4.2.dist-info → mdb_engine-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdb-engine
-Version: 0.4.2
+Version: 0.4.4
 Summary: MongoDB Engine
 Home-page: https://github.com/ranfysvalle02/mdb-engine
 Author: Fabian Valle

{mdb_engine-0.4.2.dist-info → mdb_engine-0.4.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdb_engine/README.md,sha256=T3EFGcPopY9LslYW3lxgG3hohWkAOmBNbYG0FDMUJiY,3502
-mdb_engine/__init__.py,sha256=6Uve36cIfvCcTfYTZEHKkZoD9sz4zw3Wfz76y0FEvUo,3242
+mdb_engine/__init__.py,sha256=Hm7dL74-37z0tXYLcgCV5f6CZ_ZDOaTACYw4N863OCA,3262
 mdb_engine/config.py,sha256=DTAyxfKB8ogyI0v5QR9Y-SJOgXQr_eDBCKxNBSqEyLc,7269
 mdb_engine/constants.py,sha256=eaotvW57TVOg7rRbLziGrVNoP7adgw_G9iVByHezc_A,7837
 mdb_engine/dependencies.py,sha256=MJuYQhZ9ZGzXlip1ha5zba9Rvn04HDPWahJFJH81Q2s,14107
@@ -46,7 +46,7 @@ mdb_engine/core/app_registration.py,sha256=7szt2a7aBkpSppjmhdkkPPYMKGKo0MkLKZeEe
 mdb_engine/core/app_secrets.py,sha256=bo-syg9UUATibNyXEZs-0TTYWG-JaY-2S0yNSGA12n0,10524
 mdb_engine/core/connection.py,sha256=XnwuPG34pJ7kJGJ84T0mhj1UZ6_CLz_9qZf6NRYGIS8,8346
 mdb_engine/core/encryption.py,sha256=RZ5LPF5g28E3ZBn6v1IMw_oas7u9YGFtBcEj8lTi9LM,7515
-mdb_engine/core/engine.py,sha256=ManZZUCGsI0mNlBKL7CxofX1L1tkJDNI4-8YHBKGYYk,123708
+mdb_engine/core/engine.py,sha256=CAhewr0DWaakRKf8-NSSni_pWU3AFdIVLNBTgzGR4IQ,133549
 mdb_engine/core/index_management.py,sha256=9-r7MIy3JnjQ35sGqsbj8K_I07vAUWtAVgSWC99lJcE,5555
 mdb_engine/core/manifest.py,sha256=jguhjVPAHMZGxOJcdSGouv9_XiKmxUjDmyjn2yXHCj4,139205
 mdb_engine/core/ray_integration.py,sha256=vexYOzztscvRYje1xTNmXJbi99oJxCaVJAwKfTNTF_E,13610
@@ -89,9 +89,9 @@ mdb_engine/routing/__init__.py,sha256=reupjHi_RTc2ZBA4AH5XzobAmqy4EQIsfSUcTkFknU
 mdb_engine/routing/websockets.py,sha256=3X4OjQv_Nln4UmeifJky0gFhMG8A6alR77I8g1iIOLY,29311
 mdb_engine/utils/__init__.py,sha256=lDxQSGqkV4fVw5TWIk6FA6_eey_ZnEtMY0fir3cpAe8,236
 mdb_engine/utils/mongo.py,sha256=Oqtv4tQdpiiZzrilGLEYQPo8Vmh8WsTQypxQs8Of53s,3369
-mdb_engine-0.4.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-mdb_engine-0.4.2.dist-info/METADATA,sha256=1wI8au6nvUczKwC6e-MoS7fvqHv-TozwjswYSg5TT6w,15810
-mdb_engine-0.4.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-mdb_engine-0.4.2.dist-info/entry_points.txt,sha256=INCbYdFbBzJalwPwxliEzLmPfR57IvQ7RAXG_pn8cL8,48
-mdb_engine-0.4.2.dist-info/top_level.txt,sha256=PH0UEBwTtgkm2vWvC9He_EOMn7hVn_Wg_Jyc0SmeO8k,11
-mdb_engine-0.4.2.dist-info/RECORD,,
+mdb_engine-0.4.4.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+mdb_engine-0.4.4.dist-info/METADATA,sha256=-VlUy-pbstZzXVVyb3oaKJAecjYQ_rMMN_iH_Npji7s,15810
+mdb_engine-0.4.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mdb_engine-0.4.4.dist-info/entry_points.txt,sha256=INCbYdFbBzJalwPwxliEzLmPfR57IvQ7RAXG_pn8cL8,48
+mdb_engine-0.4.4.dist-info/top_level.txt,sha256=PH0UEBwTtgkm2vWvC9He_EOMn7hVn_Wg_Jyc0SmeO8k,11
+mdb_engine-0.4.4.dist-info/RECORD,,