ohmyapi 0.2.4__tar.gz → 0.2.7__tar.gz

{ohmyapi-0.2.4 → ohmyapi-0.2.7}/PKG-INFO

@@ -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 → ohmyapi-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.2.4"
+version = "0.2.7"
 description = "Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations"
 license = "MIT"
 keywords = ["fastapi", "tortoise", "orm", "pydantic", "async", "web-framework"]
@@ -43,6 +43,19 @@ ohmyapi = "ohmyapi.cli:app"
 [project.urls]
 repository = "https://code.c-base.org/baccenfutter/ohmyapi"
 
+[build-system]
+requires = [
+    "poetry-core>=1.8.0",
+    "poetry-dynamic-versioning>=1.8.0"
+]
+build-backend = "poetry_dynamic_versioning.backend"
+
+[tool.poetry-dynamic-versioning]
+enable = true
+source = "file"
+path = "src/ohmyapi/__init__.py"
+pattern = "__VERSION__\\s*=\\s*['\"](?P<version>[^'\"]+)['\"]"
+
 [tool.black]
 line-length = 88
 target-version = ['py39', 'py310', 'py311', 'py312', 'py313']

ohmyapi-0.2.7/src/ohmyapi/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "0.2.7"

{ohmyapi-0.2.4 → ohmyapi-0.2.7}/src/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-0.2.4 → ohmyapi-0.2.7}/src/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/src/ohmyapi/__init__.py

@@ -1 +0,0 @@
-from . import db