ohmyapi 0.2.4__py3-none-any.whl → 0.2.7__py3-none-any.whl

ohmyapi/__init__.py

@@ -1 +1 @@
-from . import db
+__VERSION__ = "0.2.7"

ohmyapi/cli.py

@@ -35,6 +35,7 @@ def serve(root: str = ".", host="127.0.0.1", port=8000):
     project_path = Path(root)
     project = runtime.Project(project_path)
     app_instance = project.app()
+    app_instance = project.configure_app(app_instance)
     uvicorn.run(app_instance, host=host, port=int(port), reload=False)
 
 

ohmyapi/core/runtime.py

@@ -72,23 +72,35 @@ class Project:
     def is_app_installed(self, name: str) -> bool:
         return name in getattr(self.settings, "INSTALLED_APPS", [])
 
-    def app(self, generate_schemas: bool = False) -> FastAPI:
+    def app(self,
+            docs_url: str = "/docs",
+    ) -> FastAPI:
         """
-        Create a FastAPI app, attach all APIRouters from registered apps,
-        and register ORM lifecycle event handlers.
+        Create and return a FastAPI app.
         """
-        app = FastAPI(title=getattr(self.settings, "PROJECT_NAME", "OhMyAPI Project"))
+        import ohmyapi
+        return FastAPI(
+            title=getattr(self.settings, "PROJECT_NAME", "OhMyAPI Project"),
+            description=getattr(self.settings, "PROJECT_DESCRIPTION", ""),
+            docs_url=getattr(self.settings, "DOCS_URL", "/docs"),
+            version=ohmyapi.__VERSION__,
+        )
 
-        # Attach routers from apps
+    def configure_app(self, app: FastAPI) -> FastAPI:
+        """
+        Attach project routes and event handlers to given FastAPI instance.
+        """
+        # Attach project routes.
         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
+        # Initialize ORM on startup
         @app.on_event("startup")
         async def _startup():
-            await self.init_orm(generate_schemas=generate_schemas)
+            await self.init_orm(generate_schemas=False)
 
+        # Close ORM on shutdown
         @app.on_event("shutdown")
         async def _shutdown():
             await self.close_orm()
@@ -333,16 +345,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.4.dist-info → ohmyapi-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.2.4
+Version: 0.2.7
 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.4.dist-info → ohmyapi-0.2.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ohmyapi/__init__.py,sha256=3y8knoHhOjkUMMi7ADheYxBJywXPvpn5JldxMUeWejw,17
+ohmyapi/__init__.py,sha256=8wo4flTaSvqGlIOWARbqD5xEq_In5CHTiPa4m8_Oujo,22
 ohmyapi/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 ohmyapi/builtin/auth/__init__.py,sha256=vOVCSJX8BALzs8h5ZW9507bjoscP37bncMjdMmBXcMM,42
 ohmyapi/builtin/auth/models.py,sha256=8az4TKdC6PUha3_HyslKinDT2-yAN-aBoYUQcjxm7Js,1728
@@ -7,9 +7,9 @@ ohmyapi/builtin/auth/routes.py,sha256=r887BWea20vinX88QBuxGzQc9BrIi-LqyStM0V1cl1
 ohmyapi/builtin/demo/__init__.py,sha256=44Yo3mYmlKSKEwVp6O9urr-C_3qDQzCYLMn6B9i6wew,29
 ohmyapi/builtin/demo/models.py,sha256=r06rfuhPJaI2fYsQ24L1JCOd67f2GQNfGnkgKAptOX8,1404
 ohmyapi/builtin/demo/routes.py,sha256=1VTlEttrez6Qnhrz_9sTA-emtfXem0s0BkPVcLvg3k0,1801
-ohmyapi/cli.py,sha256=dJVNgpW5S4rCc619AEEKBKuEIAmQs153Ls0ZVaea48w,4173
+ohmyapi/cli.py,sha256=3qOXEns3FNCfD67dy_70PMfdU7kOLIagV8taNSeLL24,4228
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ohmyapi/core/runtime.py,sha256=90nZQwMxrOn0n7b2XI393ERX3Jem2bd4EJrUdUZLh8U,11849
+ohmyapi/core/runtime.py,sha256=pNfFRk7sFX8FePX6cnb4H7kLh5CauNnA_gmc0rsWIh8,12287
 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.4.dist-info/METADATA,sha256=Qzo5YjAgaujzOPj-K_ZAgntfq3OLpfxTp9z19zmfdWU,2575
-ohmyapi-0.2.4.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-ohmyapi-0.2.4.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
-ohmyapi-0.2.4.dist-info/RECORD,,
+ohmyapi-0.2.7.dist-info/METADATA,sha256=intrTUslU5Kr_osXBIzNLLaY23s-JAS7nYzO07KuMcI,2575
+ohmyapi-0.2.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ohmyapi-0.2.7.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
+ohmyapi-0.2.7.dist-info/RECORD,,

{ohmyapi-0.2.4.dist-info → ohmyapi-0.2.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.0
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any