ohmyapi 0.1.27__tar.gz → 0.2.1__tar.gz

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.27
+Version: 0.2.1
 Summary: Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,pydantic,async,web-framework

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.1.27"
+version = "0.2.1"
 description = "Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations"
 license = "MIT"
 keywords = ["fastapi", "tortoise", "orm", "pydantic", "async", "web-framework"]

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/builtin/auth/models.py

@@ -24,7 +24,7 @@ class User(Model):
     is_admin: bool = field.BooleanField(default=False)
     is_staff: bool = field.BooleanField(default=False)
     groups: field.ManyToManyRelation[Group] = field.ManyToManyField(
-        "ohmyapi_auth.Group", related_name="users", through="user_groups"
+        "ohmyapi_auth.Group", related_name="users", through="usergroups"
     )
 
     class Schema:

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/builtin/auth/routes.py

@@ -11,7 +11,7 @@ from pydantic import BaseModel
 from ohmyapi.builtin.auth.models import Group, User
 
 # Router
-router = APIRouter(prefix="/auth", tags=["auth"])
+router = APIRouter(prefix="/auth", tags=["Auth"])
 
 # Secrets & config (should come from settings/env in real projects)
 JWT_SECRET = getattr(settings, "JWT_SECRET", "changeme")

ohmyapi-0.2.1/src/ohmyapi/builtin/demo/__init__.py

@@ -0,0 +1 @@
+from . import models, routes

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/builtin/demo/models.py

@@ -1,10 +1,11 @@
-from ohmyapi.db import Model, field
-from ohmyapi_auth.models import User
-
 from datetime import datetime
 from decimal import Decimal
 from uuid import UUID
 
+from ohmyapi_auth.models import User
+
+from ohmyapi.db import Model, field
+
 
 class Team(Model):
     id: UUID = field.data.UUIDField(primary_key=True)

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/builtin/demo/routes.py

@@ -1,19 +1,17 @@
-from ohmyapi.router import APIRouter, HTTPException, HTTPStatus
+from typing import List
+
 from ohmyapi.db.exceptions import DoesNotExist
+from ohmyapi.router import APIRouter, HTTPException, HTTPStatus
 
 from . import models
 
-from typing import List
-
 # Expose your app's routes via `router = fastapi.APIRouter`.
 # Use prefixes wisely to avoid cross-app namespace-collisions.
 # Tags improve the UX of the OpenAPI docs at /docs.
 router = APIRouter(prefix="/tournament")
 
 
-@router.get(
-    "/", tags=["tournament"], response_model=List[models.Tournament.Schema()]
-)
+@router.get("/", tags=["tournament"], response_model=List[models.Tournament.Schema()])
 async def list():
     """List all tournaments."""
     return await models.Tournament.Schema().from_queryset(models.Tournament.all())
@@ -30,9 +28,7 @@ async def post(tournament: models.Tournament.Schema(readonly=True)):
 @router.get("/{id}", tags=["tournament"], response_model=models.Tournament.Schema())
 async def get(id: str):
     """Get tournament by id."""
-    return await models.Tournament.Schema().from_queryset(
-        models.Tournament.get(id=id)
-    )
+    return await models.Tournament.Schema().from_queryset(models.Tournament.get(id=id))
 
 
 @router.put(

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/core/runtime.py

@@ -1,12 +1,13 @@
 # ohmyapi/core/runtime.py
-import copy
 import importlib
 import importlib.util
 import json
 import pkgutil
 import sys
+from http import HTTPStatus
 from pathlib import Path
-from typing import Any, Dict, Generator, List, Optional
+from types import ModuleType
+from typing import Any, Dict, Generator, List, Optional, Type
 
 import click
 from aerich import Command as AerichCommand
@@ -21,8 +22,9 @@ class Project:
     """
     Project runtime loader + Tortoise/Aerich integration.
 
-    - injects builtin apps as ohmyapi_<name>
-    - builds unified tortoise config for runtime
+    - aliases builtin apps as ohmyapi_<name>
+    - loads all INSTALLED_APPS into scope
+    - builds unified tortoise config for ORM runtime
     - provides makemigrations/migrate methods using Aerich Command API
     """
 
@@ -34,8 +36,8 @@ class Project:
         if str(self.project_path) not in sys.path:
             sys.path.insert(0, str(self.project_path))
 
-        # Pre-register builtin apps as ohmyapi_<name>.
-        # This makes all builtin apps easily loadable via f"ohmyapi_{app_name}".
+        # Alias builtin apps as ohmyapi_<name>.
+        # We need this, because Tortoise app-names may not include dots `.`.
         spec = importlib.util.find_spec("ohmyapi.builtin")
         if spec and spec.submodule_search_locations:
             for _, modname, _ in pkgutil.iter_modules(spec.submodule_search_locations):
@@ -107,7 +109,7 @@ class Project:
         }
 
         for app_name, app in self._apps.items():
-            modules = list(dict.fromkeys(app.model_modules))
+            modules = list(app.models.keys())
             if modules:
                 config["apps"][app_name] = {
                     "models": modules,
@@ -119,11 +121,20 @@ class Project:
     def build_aerich_command(
         self, app_label: str, db_url: Optional[str] = None
     ) -> AerichCommand:
+        """
+        Build Aerich command for app with given app_label.
+
+        Aerich needs to see only the app of interest, but with the extra model
+        "aerich.models".
+        """
         if app_label not in self._apps:
             raise RuntimeError(f"App '{app_label}' is not registered")
 
         # Get a fresh copy of the config (without aerich.models anywhere)
-        tortoise_cfg = copy.deepcopy(self.build_tortoise_config(db_url=db_url))
+        tortoise_cfg = self.build_tortoise_config(db_url=db_url)
+
+        # Prevent leaking other app's models to Aerich.
+        tortoise_cfg["apps"] = {app_label: tortoise_cfg["apps"][app_label]}
 
         # Append aerich.models to the models list of the target app only
         tortoise_cfg["apps"][app_label]["models"].append("aerich.models")
@@ -199,33 +210,18 @@ class App:
         self.project = project
         self.name = name
 
-        # The list of module paths (e.g. "ohmyapi_auth.models") for Tortoise and Aerich
-        self.model_modules: List[str] = []
+        # Reference to this app's models modules. Tortoise needs to know the
+        # modules where to lookup models for this app.
+        self._models: Dict[str, ModuleType] = {}
 
-        # The APIRouter
-        self.router: APIRouter = APIRouter()
+        # Reference to this app's routes modules.
+        self._routers: Dict[str, ModuleType] = {}
 
         # Import the app, so its __init__.py runs.
-        importlib.import_module(self.name)
-
-        # Load the models
-        try:
-            models_mod = importlib.import_module(f"{self.name}.models")
-            self.model_modules.append(f"{self.name}.models")
-        except ModuleNotFoundError:
-            pass
+        mod: ModuleType = importlib.import_module(name)
 
-        # Locate the APIRouter
-        try:
-            routes_mod = importlib.import_module(f"{self.name}.routes")
-            for attr_name in dir(routes_mod):
-                if attr_name.startswith("__"):
-                    continue
-                attr = getattr(routes_mod, attr_name)
-                if isinstance(attr, APIRouter):
-                    self.router.include_router(attr)
-        except ModuleNotFoundError:
-            pass
+        self.__load_models(f"{self.name}.models")
+        self.__load_routes(f"{self.name}.routes")
 
     def __repr__(self):
         return json.dumps(self.dict(), indent=2)
@@ -233,42 +229,127 @@ class App:
     def __str__(self):
         return self.__repr__()
 
-    def _serialize_route(self, route):
-        """Convert APIRoute to JSON-serializable dict."""
+    def __load_models(self, mod_name: str):
+        """
+        Recursively scan through a module and collect all models.
+        If the module is a package, iterate through its submodules.
+        """
+
+        # An app may come without any models.
+        try:
+            importlib.import_module(mod_name)
+        except ModuleNotFoundError:
+            print(f"no models detected: {mod_name}")
+            return
+
+        # Acoid duplicates.
+        visited: set[str] = set()
+
+        def walk(mod_name: str):
+            mod = importlib.import_module(mod_name)
+            if mod_name in visited:
+                return
+            visited.add(mod_name)
+
+            for name, value in vars(mod).copy().items():
+                if (
+                    isinstance(value, type)
+                    and issubclass(value, Model)
+                    and not name == Model.__name__
+                ):
+                    self._models[mod_name] = self._models.get(mod_name, []) + [value]
+
+            # if it's a package, recurse into submodules
+            if hasattr(mod, "__path__"):
+                for _, subname, _ in pkgutil.iter_modules(
+                    mod.__path__, mod.__name__ + "."
+                ):
+                    walk(subname)
+
+        # Walk the walk.
+        walk(mod_name)
+
+    def __load_routes(self, mod_name: str):
+        """
+        Recursively scan through a module and collect all APIRouters.
+        If the module is a package, iterate through all its submodules.
+        """
+
+        # An app may come without any routes.
+        try:
+            importlib.import_module(mod_name)
+        except ModuleNotFound:
+            print(f"no routes detected: {mod_name}")
+            return
+
+        # Avoid duplicates.
+        visited: set[str] = set()
+
+        def walk(mod_name: str):
+            mod = importlib.import_module(mod_name)
+            if mod.__name__ in visited:
+                return
+            visited.add(mod.__name__)
+
+            for name, value in vars(mod).copy().items():
+                if isinstance(value, APIRouter) and not name == APIRouter.__name__:
+                    self._routers[mod_name] = self._routers.get(mod_name, []) + [value]
+
+            # if it's a package, recurse into submodules
+            if hasattr(mod, "__path__"):
+                for _, subname, _ in pkgutil.iter_modules(
+                    mod.__path__, mod.__name__ + "."
+                ):
+                    submod = importlib.import_module(subname)
+                    walk(submod)
+
+        # Walk the walk.
+        walk(mod_name)
+
+    def __serialize_route(self, route):
+        """
+        Convert APIRoute to JSON-serializable dict.
+        """
         return {
             "path": route.path,
-            "name": route.name,
-            "methods": list(route.methods),
-            "endpoint": route.endpoint.__name__,  # just the function name
-            "response_model": (
-                getattr(route, "response_model", None).__name__
-                if getattr(route, "response_model", None)
-                else None
-            ),
-            "tags": getattr(route, "tags", None),
+            "method": list(route.methods)[0],
+            "endpoint": f"{route.endpoint.__module__}.{route.endpoint.__name__}",
         }
 
-    def _serialize_router(self):
-        return [self._serialize_route(route) for route in self.routes]
+    def __serialize_router(self):
+        return [self.__serialize_route(route) for route in self.routes]
 
-    def dict(self) -> Dict[str, Any]:
+    @property
+    def models(self) -> List[ModuleType]:
+        """
+        Return a list of all loaded models.
+        """
+        out = []
+        for module in self._models:
+            for model in self._models[module]:
+                out.append(model)
         return {
-            "models": [m.__name__ for m in self.models],
-            "routes": self._serialize_router(),
+            module: out,
         }
 
-    @property
-    def models(self) -> Generator[Model, None, None]:
-        for mod in self.model_modules:
-            models_mod = importlib.import_module(mod)
-            for obj in models_mod.__dict__.values():
-                if (
-                    isinstance(obj, type)
-                    and getattr(obj, "_meta", None) is not None
-                    and obj.__name__ != "Model"
-                ):
-                    yield obj
-
     @property
     def routes(self):
-        return self.router.routes
+        """
+        Return an APIRouter with all loaded routes.
+        """
+        router = APIRouter()
+        for routes_mod in self._routers:
+            for r in self._routers[routes_mod]:
+                router.include_router(r)
+        return router.routes
+
+    def dict(self) -> Dict[str, Any]:
+        """
+        Convenience method for serializing the runtime data.
+        """
+        return {
+            "models": [
+                f"{self.name}.{m.__name__}" for m in self.models[f"{self.name}.models"]
+            ],
+            "routes": self.__serialize_router(),
+        }

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/db/model/model.py

@@ -30,10 +30,12 @@ UUID.__get_pydantic_core_schema__ = classmethod(__uuid_schema_monkey_patch)
 
 
 class ModelMeta(type(TortoiseModel)):
-    def __new__(cls, name, bases, attrs):
-        new_cls = super().__new__(cls, name, bases, attrs)
+    def __new__(mcls, name, bases, attrs):
+        # Grab the Schema class for further processing.
+        schema_opts = attrs.get("Schema", None)
 
-        schema_opts = getattr(new_cls, "Schema", None)
+        # Let Tortoise's Metaclass do it's thing.
+        new_cls = super().__new__(mcls, name, bases, attrs)
 
         class BoundSchema:
             def __call__(self, readonly: bool = False):

{ohmyapi-0.1.27 → ohmyapi-0.2.1}/src/ohmyapi/router.py

@@ -1,2 +1,3 @@
-from fastapi import APIRouter, Depends, HTTPException
 from http import HTTPStatus
+
+from fastapi import APIRouter, Depends, HTTPException

ohmyapi-0.1.27/src/ohmyapi/builtin/demo/__init__.py

@@ -1,2 +0,0 @@
-from . import models
-from . import routes