ohmyapi 0.1.24__tar.gz → 0.1.25__tar.gz

{ohmyapi-0.1.24 → ohmyapi-0.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.24
+Version: 0.1.25
 Summary: A Django-like but async web-framework based on FastAPI and TortoiseORM.
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,async,web-framework
@@ -62,7 +62,7 @@ It is ***blazingly fast***, extremely ***fun to use*** and comes with ***batteri
 **Creating a Project**
 
 ```
-pip install ohmyapi
+pipx install ohmyapi
 ohmyapi startproject myproject
 cd myproject
 ```
@@ -159,24 +159,29 @@ from ohmyapi.db.exceptions import DoesNotExist
 
 from .models import Tournament
 
-# Expose your app's routes via `router = fastapi.APIRouter`.
-# Use prefixes wisely to avoid cross-app namespace-collisions.
+# OhMyAPI will automatically pick up all instances of `fastapi.APIRouter` and
+# add their routes to the main project router.
+#
+# Note:
+# Use prefixes wisely to avoid cross-app namespace-collisions!
 # Tags improve the UX of the OpenAPI docs at /docs.
-router = APIRouter(prefix="/tournament", tags=['Tournament'])
+#
+tournament_router = APIRouter(prefix="/tournament", tags=['Tournament'])
 
-@router.get("/")
+
+@tournament_router.get("/")
 async def list():
     queryset = Tournament.all()
     return await Tournament.Schema.model.from_queryset(queryset)
 
 
-@router.post("/", status_code=HTTPStatus.CREATED)
+@tournament_router.post("/", status_code=HTTPStatus.CREATED)
 async def post(tournament: Tournament.Schema.readonly):
     queryset = Tournament.create(**payload.model_dump())
     return await Tournament.Schema.model.from_queryset(queryset)
 
 
-@router.get("/:id")
+@tournament_router.get("/:id")
 async def get(id: str):
     try:
         queryset = Tournament.get(id=id)
@@ -184,6 +189,16 @@ async def get(id: str):
     except DoesNotExist:
         raise HTTPException(status_code=404, detail="not found")
 
+
+@tournament_router.delete("/:id")
+async def delete(id: str):
+    try:
+        tournament = await Tournament.get(id=id)
+        return await Tournament.Schema.model.from_queryset(tournament.delete())
+    except DoesNotExist:
+        raise HTTPException(status_code=404, detail="not found")
+
+
 ...
 ```
 

{ohmyapi-0.1.24 → ohmyapi-0.1.25}/README.md

@@ -30,7 +30,7 @@ It is ***blazingly fast***, extremely ***fun to use*** and comes with ***batteri
 **Creating a Project**
 
 ```
-pip install ohmyapi
+pipx install ohmyapi
 ohmyapi startproject myproject
 cd myproject
 ```
@@ -127,24 +127,29 @@ from ohmyapi.db.exceptions import DoesNotExist
 
 from .models import Tournament
 
-# Expose your app's routes via `router = fastapi.APIRouter`.
-# Use prefixes wisely to avoid cross-app namespace-collisions.
+# OhMyAPI will automatically pick up all instances of `fastapi.APIRouter` and
+# add their routes to the main project router.
+#
+# Note:
+# Use prefixes wisely to avoid cross-app namespace-collisions!
 # Tags improve the UX of the OpenAPI docs at /docs.
-router = APIRouter(prefix="/tournament", tags=['Tournament'])
+#
+tournament_router = APIRouter(prefix="/tournament", tags=['Tournament'])
 
-@router.get("/")
+
+@tournament_router.get("/")
 async def list():
     queryset = Tournament.all()
     return await Tournament.Schema.model.from_queryset(queryset)
 
 
-@router.post("/", status_code=HTTPStatus.CREATED)
+@tournament_router.post("/", status_code=HTTPStatus.CREATED)
 async def post(tournament: Tournament.Schema.readonly):
     queryset = Tournament.create(**payload.model_dump())
     return await Tournament.Schema.model.from_queryset(queryset)
 
 
-@router.get("/:id")
+@tournament_router.get("/:id")
 async def get(id: str):
     try:
         queryset = Tournament.get(id=id)
@@ -152,6 +157,16 @@ async def get(id: str):
     except DoesNotExist:
         raise HTTPException(status_code=404, detail="not found")
 
+
+@tournament_router.delete("/:id")
+async def delete(id: str):
+    try:
+        tournament = await Tournament.get(id=id)
+        return await Tournament.Schema.model.from_queryset(tournament.delete())
+    except DoesNotExist:
+        raise HTTPException(status_code=404, detail="not found")
+
+
 ...
 ```
 

{ohmyapi-0.1.24 → ohmyapi-0.1.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.1.24"
+version = "0.1.25"
 description = "A Django-like but async web-framework based on FastAPI and TortoiseORM."
 license = "MIT"
 keywords = ["fastapi", "tortoise", "orm", "async", "web-framework"]

{ohmyapi-0.1.24 → ohmyapi-0.1.25}/src/ohmyapi/core/runtime.py

@@ -211,7 +211,7 @@ class App:
         self.model_modules: List[str] = []
 
         # The APIRouter
-        self.router: Optional[APIRouter] = None
+        self.router: APIRouter = APIRouter()
 
         # Import the app, so its __init__.py runs.
         importlib.import_module(self.name)
@@ -226,9 +226,12 @@ class App:
         # Locate the APIRouter
         try:
             routes_mod = importlib.import_module(f"{self.name}.routes")
-            router = getattr(routes_mod, "router", None)
-            if isinstance(router, APIRouter):
-                self.router = router
+            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
 

{ohmyapi-0.1.24 → ohmyapi-0.1.25}/src/ohmyapi/core/templates/app/routes.py.j2

@@ -4,13 +4,16 @@ 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.
+# OhMyAPI will automatically pick up all instances of `fastapi.APIRouter` and
+# add their routes to the main project router.
+#
+# Note:
+# Use prefixes wisely to avoid cross-app namespace-collisions!
 # Tags improve the UX of the OpenAPI docs at /docs.
+#
 router = APIRouter(prefix="/{{ app_name }}", tags=['{{ app_name }}'])
 
 
-
 @router.get("/")
 async def list():
     """List all ..."""

{ohmyapi-0.1.24 → ohmyapi-0.1.25}/src/ohmyapi/core/templates/project/settings.py.j2

@@ -2,6 +2,6 @@
 PROJECT_NAME = "MyProject"
 DATABASE_URL = "sqlite://db.sqlite3"
 INSTALLED_APPS = [
-  #'ohmyapi_auth',
+    #"ohmyapi_auth",
 ]