ohmyapi 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

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]:
         """

{ohmyapi-0.2.3.dist-info → ohmyapi-0.2.5.dist-info}/METADATA

@@ -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.dist-info → ohmyapi-0.2.5.dist-info}/RECORD

@@ -9,7 +9,7 @@ ohmyapi/builtin/demo/models.py,sha256=r06rfuhPJaI2fYsQ24L1JCOd67f2GQNfGnkgKAptOX
 ohmyapi/builtin/demo/routes.py,sha256=1VTlEttrez6Qnhrz_9sTA-emtfXem0s0BkPVcLvg3k0,1801
 ohmyapi/cli.py,sha256=dJVNgpW5S4rCc619AEEKBKuEIAmQs153Ls0ZVaea48w,4173
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ohmyapi/core/runtime.py,sha256=6MejxdFxY9zfmAEcFMIly-R5JEhIlzf3hlx9dZWBZrY,11748
+ohmyapi/core/runtime.py,sha256=Zs2080IXOamzs1TIRVCX-oWh93uJHumtYUwMZKtRwFY,11958
 ohmyapi/core/scaffolding.py,sha256=SA0SYFd7VcqkOn9xuXgj-yOoVqCZMJo68GGFbm34GE4,2663
 ohmyapi/core/templates/app/__init__.py.j2,sha256=QwVIQVUGZVhdH1d4NrvL7NTsK4-T4cihzYs8UVX2dt4,43
 ohmyapi/core/templates/app/models.py.j2,sha256=_3w-vFJ5fgsmncsCv34k_wyCMF78jufbSSglns4gbb0,119
@@ -22,7 +22,7 @@ ohmyapi/db/exceptions.py,sha256=vb4IIUoeYAY6sK42zRtjMy-39IFVi_Qb6mWySTY0jYw,34
 ohmyapi/db/model/__init__.py,sha256=k3StTNuKatpwZo_Z5JBFa-927eJrzibFE8U4SA82asc,32
 ohmyapi/db/model/model.py,sha256=ui4g78c5xoS06Dj8Cdk7QgTjRnE68zKeL-AdmeYYPuQ,2776
 ohmyapi/router.py,sha256=5g0U59glu4hxxnIoTSFzb2S2offkOT3eE39aprzVxwo,83
-ohmyapi-0.2.3.dist-info/METADATA,sha256=RwdNl_tbHfK7TWcb5tqp2Yb9RSbtHiQDb2gD1scd_ng,2575
-ohmyapi-0.2.3.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-ohmyapi-0.2.3.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
-ohmyapi-0.2.3.dist-info/RECORD,,
+ohmyapi-0.2.5.dist-info/METADATA,sha256=lZw4-WY9rahDJboBp1q0RNAxrzErYkA7p3lnz4RyVYo,2575
+ohmyapi-0.2.5.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+ohmyapi-0.2.5.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
+ohmyapi-0.2.5.dist-info/RECORD,,