ohmyapi 0.1.17__tar.gz → 0.1.18__tar.gz

{ohmyapi-0.1.17 → ohmyapi-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.17
+Version: 0.1.18
 Summary: A Django-like but async web-framework based on FastAPI and TortoiseORM.
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,async,web-framework
@@ -167,14 +167,14 @@ router = APIRouter(prefix="/tournament", tags=['Tournament'])
 @router.get("/")
 async def list():
     queryset = Tournament.all()
-    return await Tournament.Schema.many.from_queryset(queryset)
+    return await Tournament.Schema.model.from_queryset(queryset)
 
 
 @router.get("/:id")
 async def get(id: str):
     try:
         tournament = await Tournament.get(pk=id)
-        return await Tournament.Schema.one.form_orm(tournament)
+        return await Tournament.Schema.model.from_queryset_single(tournament)
     except DoesNotExist:
         raise HTTPException(status_code=404, detail="item not found")
 
@@ -280,7 +280,7 @@ router = APIRouter(prefix="/tournament", tags=["Tournament"])
 @router.get("/")
 async def list(user: auth.User = Depends(permissions.require_authenticated)):
     queryset = Tournament.all()
-    return await Tournament.Schema.many.from_queryset(queryset)
+    return await Tournament.Schema.model.from_queryset(queryset)
 
 
 ...
@@ -322,7 +322,7 @@ router = APIRouter(prefix="/tournament", tags=["Tournament"])
 @router.get("/teams")
 async def teams(user: auth.User = Depends(permissions.require_authenticated)):
     queryset = Team.for_user(user)
-    return await Tournament.Schema.many.from_queryset(queryset)
+    return await Tournament.Schema.model.from_queryset(queryset)
 ```
 
 ## Shell

{ohmyapi-0.1.17 → ohmyapi-0.1.18}/README.md

@@ -135,14 +135,14 @@ router = APIRouter(prefix="/tournament", tags=['Tournament'])
 @router.get("/")
 async def list():
     queryset = Tournament.all()
-    return await Tournament.Schema.many.from_queryset(queryset)
+    return await Tournament.Schema.model.from_queryset(queryset)
 
 
 @router.get("/:id")
 async def get(id: str):
     try:
         tournament = await Tournament.get(pk=id)
-        return await Tournament.Schema.one.form_orm(tournament)
+        return await Tournament.Schema.model.from_queryset_single(tournament)
     except DoesNotExist:
         raise HTTPException(status_code=404, detail="item not found")
 
@@ -248,7 +248,7 @@ router = APIRouter(prefix="/tournament", tags=["Tournament"])
 @router.get("/")
 async def list(user: auth.User = Depends(permissions.require_authenticated)):
     queryset = Tournament.all()
-    return await Tournament.Schema.many.from_queryset(queryset)
+    return await Tournament.Schema.model.from_queryset(queryset)
 
 
 ...
@@ -290,7 +290,7 @@ router = APIRouter(prefix="/tournament", tags=["Tournament"])
 @router.get("/teams")
 async def teams(user: auth.User = Depends(permissions.require_authenticated)):
     queryset = Team.for_user(user)
-    return await Tournament.Schema.many.from_queryset(queryset)
+    return await Tournament.Schema.model.from_queryset(queryset)
 ```
 
 ## Shell

{ohmyapi-0.1.17 → ohmyapi-0.1.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.1.17"
+version = "0.1.18"
 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.17 → ohmyapi-0.1.18}/src/ohmyapi/db/model/model.py

@@ -11,30 +11,18 @@ class ModelMeta(type(TortoiseModel)):
 
         class BoundSchema:
             @property
-            def one(self):
+            def model(self):
                 """Return a Pydantic model class for 'one' results."""
                 include = getattr(schema_opts, "include", None)
                 exclude = getattr(schema_opts, "exclude", None)
                 return pydantic_model_creator(
                     new_cls,
-                    name=f"{new_cls.__name__}SchemaOne",
+                    name=f"{new_cls.__name__}Schema",
                     include=include,
                     exclude=exclude,
                     exclude_readonly=True,
                 )
 
-            @property
-            def many(self):
-                """Return a Pydantic queryset class for 'many' results."""
-                include = getattr(schema_opts, "include", None)
-                exclude = getattr(schema_opts, "exclude", None)
-                return pydantic_queryset_creator(
-                    new_cls,
-                    name=f"{new_cls.__name__}SchemaMany",
-                    include=include,
-                    exclude=exclude,
-                )
-
         new_cls.Schema = BoundSchema()
         return new_cls