ohmyapi 0.1.13__tar.gz → 0.1.14__tar.gz

{ohmyapi-0.1.13 → ohmyapi-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.13
+Version: 0.1.14
 Summary: A Django-like but async web-framework based on FastAPI and TortoiseORM.
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,async,web-framework
@@ -52,11 +52,11 @@ It is ***blazingly fast***, ***fun to use*** and comes with ***batteries include
 - Highly configurable and customizable
 - 100% async
 
-OhMyAPI aims to:
+**Goals**
 
 - combine FastAPI, TortoiseORM and Aerich migrations into a high-productivity web-application framework
-- tying everything neatly together into a project structure consisting of apps with models and a router
-- while ***AVOIDING*** to introduce any additional abstractions ontop of Tortoise's model-system or FastAPI's routing
+- tie everything neatly together into a concise API
+- while ***AVOIDING*** any additional abstractions ontop of Tortoise's model-system or FastAPI's routing system
 
 ---
 
@@ -173,8 +173,8 @@ async def list():
 @router.get("/:id")
 async def get(id: str):
     try:
-        queryset = Tournament.get(pk=id)
-        return await Tournament.Schema.one(queryset)
+        tournament = await Tournament.get(pk=id)
+        return await Tournament.Schema.one.form_orm(tournament)
     except DoesNotExist:
         raise HTTPException(status_code=404, detail="item not found")
 

{ohmyapi-0.1.13 → ohmyapi-0.1.14}/README.md

@@ -20,11 +20,11 @@ It is ***blazingly fast***, ***fun to use*** and comes with ***batteries include
 - Highly configurable and customizable
 - 100% async
 
-OhMyAPI aims to:
+**Goals**
 
 - combine FastAPI, TortoiseORM and Aerich migrations into a high-productivity web-application framework
-- tying everything neatly together into a project structure consisting of apps with models and a router
-- while ***AVOIDING*** to introduce any additional abstractions ontop of Tortoise's model-system or FastAPI's routing
+- tie everything neatly together into a concise API
+- while ***AVOIDING*** any additional abstractions ontop of Tortoise's model-system or FastAPI's routing system
 
 ---
 
@@ -141,8 +141,8 @@ async def list():
 @router.get("/:id")
 async def get(id: str):
     try:
-        queryset = Tournament.get(pk=id)
-        return await Tournament.Schema.one(queryset)
+        tournament = await Tournament.get(pk=id)
+        return await Tournament.Schema.one.form_orm(tournament)
     except DoesNotExist:
         raise HTTPException(status_code=404, detail="item not found")
 

{ohmyapi-0.1.13 → ohmyapi-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.1.13"
+version = "0.1.14"
 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.13 → ohmyapi-0.1.14}/src/ohmyapi/builtin/auth/models.py

@@ -1,5 +1,7 @@
+from functools import wraps
 from typing import Optional, List
-from ohmyapi.db import Model, field
+from ohmyapi.router import HTTPException
+from ohmyapi.db import Model, field, pre_save, pre_delete
 from passlib.context import CryptContext
 from tortoise.contrib.pydantic import pydantic_queryset_creator
 
@@ -7,24 +9,22 @@ pwd_context = CryptContext(schemes=["argon2"], deprecated="auto")
 
 
 class Group(Model):
-    id = field.data.UUIDField(pk=True)
-    name = field.CharField(max_length=42, index=True)
+    id: str = field.data.UUIDField(pk=True)
+    name: str = field.CharField(max_length=42, index=True)
 
 
 class User(Model):
-    id = field.data.UUIDField(pk=True)
-    email = field.CharField(max_length=255, unique=True, index=True)
-    username = field.CharField(max_length=150, unique=True)
-    password_hash = field.CharField(max_length=128)
-    is_admin = field.BooleanField(default=False)
-    is_staff = field.BooleanField(default=False)
-    groups: Optional[List[Group]] = field.ManyToManyField("ohmyapi_auth.Group", related_name="users")
-
+    id: str = field.data.UUIDField(pk=True)
+    email: str = field.CharField(max_length=255, unique=True, index=True)
+    username: str = field.CharField(max_length=150, unique=True)
+    password_hash: str = field.CharField(max_length=128)
+    is_admin: bool = field.BooleanField(default=False)
+    is_staff: bool = field.BooleanField(default=False)
+    groups: field.ManyToManyRelation[Group] = field.ManyToManyField("ohmyapi_auth.Group", related_name="users", through='user_groups')
 
     class Schema:
         exclude = 'password_hash',
 
-
     def set_password(self, raw_password: str) -> None:
         """Hash and store the password."""
         self.password_hash = pwd_context.hash(raw_password)
@@ -40,4 +40,3 @@ class User(Model):
         if user and user.verify_password(password):
             return user
         return None
-

{ohmyapi-0.1.13 → ohmyapi-0.1.14}/src/ohmyapi/builtin/auth/routes.py

@@ -160,5 +160,5 @@ async def introspect(token: Dict = Depends(get_token)):
 @router.get("/me")
 async def me(user: User = Depends(get_current_user)):
     """Return the currently authenticated user."""
-    return user
+    return User.Schema.one.from_orm(user)
 

ohmyapi-0.1.14/src/ohmyapi/db/__init__.py

@@ -0,0 +1,10 @@
+from .model import Model, field
+from tortoise.manager import Manager
+from tortoise.queryset import QuerySet
+from tortoise.signals import (
+    pre_delete,
+    post_delete,
+    pre_save,
+    post_save,
+)
+

ohmyapi-0.1.13/src/ohmyapi/db/__init__.py

@@ -1,3 +0,0 @@
-from .model import Model, field
-from tortoise.manager import Manager
-