ohmyapi 0.2.3__tar.gz → 0.2.5__tar.gz

{ohmyapi-0.2.3 → ohmyapi-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.2.3
+Version: 0.2.5
 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.2.3 → ohmyapi-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.2.3"
+version = "0.2.5"
 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.2.3 → ohmyapi-0.2.5}/src/ohmyapi/core/runtime.py

@@ -81,8 +81,8 @@ class Project:
 
         # Attach routers from apps
         for app_name, app_def in self._apps.items():
-            if app_def.router:
-                app.include_router(app_def.router)
+            for router in app_def.routers:
+                app.include_router(router)
 
         # Startup / shutdown events
         @app.on_event("startup")
@@ -257,7 +257,9 @@ class App:
                     and issubclass(value, Model)
                     and not name == Model.__name__
                 ):
-                    self._models[mod_name] = self._models.get(mod_name, []) + [value]
+                    value.__module__ = value.__module__.replace("ohmyapi.builtin.", "ohmyapi_")
+                    if value.__module__.startswith(mod_name):
+                        self._models[mod_name] = self._models.get(mod_name, []) + [value]
 
             # if it's a package, recurse into submodules
             if hasattr(mod, "__path__"):
@@ -300,8 +302,7 @@ class App:
                 for _, subname, _ in pkgutil.iter_modules(
                     mod.__path__, mod.__name__ + "."
                 ):
-                    submod = importlib.import_module(subname)
-                    walk(submod)
+                    walk(subname)
 
         # Walk the walk.
         walk(mod_name)
@@ -332,16 +333,23 @@ class App:
             module: out,
         }
 
+    @property
+    def routers(self):
+        out = []
+        for routes_mod in self._routers:
+            for r in self._routers[routes_mod]:
+                out.append(r)
+        return out
+
     @property
     def routes(self):
         """
         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
+        out = []
+        for r in self.routers:
+            out.extend(r.routes)
+        return out
 
     def dict(self) -> Dict[str, Any]:
         """