ohmyapi 0.1.22__py3-none-any.whl → 0.1.23__py3-none-any.whl

ohmyapi/builtin/auth/routes.py

@@ -26,9 +26,64 @@ REFRESH_TOKEN_EXPIRE_SECONDS = getattr(
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
 
 
-def create_token(data: dict, expires_in: int) -> str:
-    to_encode = data.copy()
-    to_encode.update({"exp": int(time.time()) + expires_in})
+class ClaimsUser(BaseModel):
+    username: str
+    email: str
+    is_admin: bool
+    is_staff: bool
+
+
+class Claims(BaseModel):
+    type: str
+    sub: str
+    user: ClaimsUser
+    roles: List[str]
+    exp: str
+
+
+class AccessToken(BaseModel):
+    token_type: str
+    access_token: str
+
+
+class RefreshToken(AccessToken):
+    refresh_token: str
+
+
+class LoginRequest(BaseModel):
+    username: str
+    password: str
+
+
+class TokenType(str, Enum):
+    """
+    Helper for indicating the token type when generating claims.
+    """
+
+    access = "access"
+    refresh = "refresh"
+
+
+def claims(
+    token_type: TokenType, user: User, groups: List[Group] = []
+) -> Claims:
+    return Claims(
+        type=token_type,
+        sub=str(user.id),
+        user=ClaimsUser(
+            username=user.username,
+            email=user.email,
+            is_admin=user.is_admin,
+            is_staff=user.is_staff,
+        ),
+        roles=[g.name for g in groups],
+        exp="",
+    )
+
+
+def create_token(claims: Claims, expires_in: int) -> str:
+    to_encode = claims.model_dump()
+    to_encode['exp'] = int(time.time()) + expires_in
     token = jwt.encode(to_encode, JWT_SECRET, algorithm=JWT_ALGORITHM)
     if isinstance(token, bytes):
         token = token.decode("utf-8")
@@ -48,29 +103,6 @@ def decode_token(token: str) -> Dict:
         )
 
 
-class TokenType(str, Enum):
-    """
-    Helper for indicating the token type when generating claims.
-    """
-
-    access = "access"
-    refresh = "refresh"
-
-
-def claims(
-    token_type: TokenType, user: User, groups: List[Group] = []
-) -> Dict[str, Any]:
-    return {
-        "type": token_type,
-        "sub": str(user.id),
-        "user": {
-            "username": user.username,
-            "email": user.email,
-        },
-        "roles": [g.name for g in groups],
-    }
-
-
 async def get_token(token: str = Depends(oauth2_scheme)) -> Dict:
     """Dependency: token introspection"""
     payload = decode_token(token)
@@ -127,12 +159,7 @@ async def require_group(
     return current_user
 
 
-class LoginRequest(BaseModel):
-    username: str
-    password: str
-
-
-@router.post("/login")
+@router.post("/login", response_model=RefreshToken)
 async def login(form_data: LoginRequest = Body(...)):
     """Login with username & password, returns access and refresh tokens."""
     user = await User.authenticate(form_data.username, form_data.password)
@@ -148,14 +175,14 @@ async def login(form_data: LoginRequest = Body(...)):
         claims(TokenType.refresh, user), REFRESH_TOKEN_EXPIRE_SECONDS
     )
 
-    return {
-        "access_token": access_token,
-        "refresh_token": refresh_token,
-        "token_type": "bearer",
-    }
+    return RefreshToken(
+        token_type="bearer",
+        access_token=access_token,
+        refresh_token=refresh_token,
+    )
 
 
-@router.post("/refresh")
+@router.post("/refresh", response_model=AccessToken)
 async def refresh_token(refresh_token: str):
     """Exchange refresh token for new access token."""
     payload = decode_token(refresh_token)
@@ -174,15 +201,15 @@ async def refresh_token(refresh_token: str):
     new_access = create_token(
         claims(TokenType.access, user), ACCESS_TOKEN_EXPIRE_SECONDS
     )
-    return {"access_token": new_access, "token_type": "bearer"}
+    return AccessToken(token_type="bearer", access_token=access_token)
 
 
-@router.get("/introspect")
+@router.get("/introspect", response_model=Dict[str, Any])
 async def introspect(token: Dict = Depends(get_token)):
     return token
 
 
-@router.get("/me")
+@router.get("/me", response_model=User.Schema.model)
 async def me(user: User = Depends(get_current_user)):
     """Return the currently authenticated user."""
-    return User.Schema.one.from_orm(user)
+    return await User.Schema.model.from_tortoise_orm(user)

ohmyapi/builtin/demo/__init__.py

@@ -0,0 +1,2 @@
+from . import models
+from . import routes

ohmyapi/builtin/demo/models.py

@@ -0,0 +1,50 @@
+from ohmyapi.db import Model, field
+from ohmyapi_auth.models import User
+
+from datetime import datetime
+from decimal import Decimal
+from uuid import UUID
+
+
+class Team(Model):
+    id: UUID = field.data.UUIDField(primary_key=True)
+    name: str = field.TextField()
+    members: field.ManyToManyRelation[User] = field.ManyToManyField(
+        'ohmyapi_auth.User',
+        related_name="tournament_teams",
+        through='user_tournament_teams',
+    )
+
+    def __str__(self):
+        return self.name
+
+
+class Tournament(Model):
+    id: UUID = field.data.UUIDField(primary_key=True)
+    name: str = field.TextField()
+    created: datetime = field.DatetimeField(auto_now_add=True)
+
+    def __str__(self):
+        return self.name
+
+
+class Event(Model):
+    id: UUID = field.data.UUIDField(primary_key=True)
+    name: str = field.TextField()
+    tournament: field.ForeignKeyRelation[Tournament] = field.ForeignKeyField(
+        'ohmyapi_demo.Tournament',
+        related_name='events',
+    )
+    participants: field.ManyToManyRelation[Team] = field.ManyToManyField(
+        'ohmyapi_demo.Team',
+        related_name='events',
+        through='event_team',
+    )
+    modified: datetime = field.DatetimeField(auto_now=True)
+    prize: Decimal = field.DecimalField(max_digits=10, decimal_places=2, null=True)
+
+    class Schema:
+        exclude = ['tournament_id']
+
+    def __str__(self):
+        return self.name

ohmyapi/builtin/demo/routes.py

@@ -0,0 +1,54 @@
+from ohmyapi.router import APIRouter, HTTPException, HTTPStatus
+from ohmyapi.db.exceptions import DoesNotExist
+
+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.
+# Tags improve the UX of the OpenAPI docs at /docs.
+router = APIRouter(prefix="/tournemant")
+
+
+@router.get("/",
+            tags=["tournament"],
+            response_model=List[models.Tournament.Schema.model])
+async def list():
+    """List all tournaments."""
+    return await models.Tournament.Schema.model.from_queryset(Tournament.all())
+
+
+@router.post("/",
+             tags=["tournament"],
+             status_code=HTTPStatus.CREATED)
+async def post(tournament: models.Tournament.Schema.readonly):
+    """Create tournament."""
+    return await models.Tournament.Schema.model.from_queryset(models.Tournament.create(**tournament.model_dump()))
+
+
+@router.get("/{id}",
+            tags=["tournament"],
+            response_model=models.Tournament.Schema.model)
+async def get(id: str):
+    """Get tournament by id."""
+    return await models.Tournament.Schema.model.from_queryset(models.Tournament.get(id=id))
+
+
+@router.put("/{id}",
+            tags=["tournament"],
+            response_model=models.Tournament.Schema.model,
+            status_code=HTTPStatus.ACCEPTED)
+async def put(tournament: models.Tournament.Schema.model):
+    """Update tournament."""
+    return await models.Tournament.Schema.model.from_queryset(models.Tournament.update(**tournament.model_dump()))
+
+
+@router.delete("/{id}", tags=["tournament"])
+async def delete(id: str):
+    try:
+        tournament = await models.Tournament.get(id=id)
+        return await tournament.delete()
+    except DoesNotExist:
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="not found")
+

ohmyapi/router.py

@@ -1,3 +1,2 @@
 from fastapi import APIRouter, Depends, HTTPException
 from http import HTTPStatus
-

{ohmyapi-0.1.22.dist-info → ohmyapi-0.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.22
+Version: 0.1.23
 Summary: A Django-like but async web-framework based on FastAPI and TortoiseORM.
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,async,web-framework

{ohmyapi-0.1.22.dist-info → ohmyapi-0.1.23.dist-info}/RECORD

@@ -3,7 +3,10 @@ ohmyapi/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 ohmyapi/builtin/auth/__init__.py,sha256=vOVCSJX8BALzs8h5ZW9507bjoscP37bncMjdMmBXcMM,42
 ohmyapi/builtin/auth/models.py,sha256=Fggg3GDVydKoZQOlXXNDsWKxehvsp8BXC1xedv0Qr34,1729
 ohmyapi/builtin/auth/permissions.py,sha256=mxsnhF_UGesTFle7v1JHORkNODtQ0qanAL3FtOcMCEY,145
-ohmyapi/builtin/auth/routes.py,sha256=faVs9FuldubEcA3N335OvNGwiMUBjGxHf4IzIUQhV8o,5744
+ohmyapi/builtin/auth/routes.py,sha256=e6i9AanJqj1RK8VQVXwNV-Pv8R3X8I70SgaDtbCYUIE,6318
+ohmyapi/builtin/demo/__init__.py,sha256=k1rGtOmMPVZJ1fMPELY0v3k70WyzSp18pstJTkCdFr0,42
+ohmyapi/builtin/demo/models.py,sha256=8Id0dHPuow_Dtt_337UV3VTxvtVAllaVeImvstqiqdE,1403
+ohmyapi/builtin/demo/routes.py,sha256=MQaPCz43v4kTv9_oz44up1j77Ra1SqSN9i3vN26xllU,1843
 ohmyapi/cli.py,sha256=dJVNgpW5S4rCc619AEEKBKuEIAmQs153Ls0ZVaea48w,4173
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ohmyapi/core/runtime.py,sha256=i4dI7mC59rw0blMOeVGawUm8v5id3ZllLlP8RLo1GT0,9419
@@ -18,8 +21,8 @@ ohmyapi/db/__init__.py,sha256=5QKUycxnN83DOUD_Etoee9tEOYjnZ74deqrSOOx_MiQ,204
 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=WTf41ByCtfk9c_O6QCsO9KA0avHL3zGMZ6SEdw5GOuc,2420
-ohmyapi/router.py,sha256=LDxOyiqSb5zVU9zCxi014Ad4DKPZn6V8o9u0WfpmgdE,83
-ohmyapi-0.1.22.dist-info/METADATA,sha256=NrxMn9DH5ydLr6Aui5yN4svdRP9UiuKT5GqzJ8XMuaU,9727
-ohmyapi-0.1.22.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-ohmyapi-0.1.22.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
-ohmyapi-0.1.22.dist-info/RECORD,,
+ohmyapi/router.py,sha256=6Exv6sVPVyiIYxxAQbxQhFRX74MKTUPWXIBwC7UZ-ww,82
+ohmyapi-0.1.23.dist-info/METADATA,sha256=HPmvXFChCOfKmKOn6u6JlcItr_2_UrXk9MoA7aCBl2Y,9727
+ohmyapi-0.1.23.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+ohmyapi-0.1.23.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
+ohmyapi-0.1.23.dist-info/RECORD,,