ohmyapi 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

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/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/cli.py

@@ -1,4 +1,5 @@
 import asyncio
+import atexit
 import importlib
 import sys
 import typer
@@ -45,6 +46,28 @@ def shell(root: str = "."):
     project_path = Path(root).resolve()
     project = runtime.Project(project_path)
 
+    # Ensure the ORM is shutdown
+    async def close_project():
+        try:
+            await project.close_orm()
+            print("Tortoise ORM closed successfully.")
+        except Exception as e:
+            print(f"Error closing ORM: {e}")
+
+    def cleanup():
+        loop = None
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            pass
+        if loop and loop.is_running():
+            asyncio.create_task(close_project())
+        else:
+            asyncio.run(close_project())
+
+    # Ensure the ORM is initialized
+    asyncio.run(project.init_orm())
+
     try:
         from IPython import start_ipython
         shell_vars = {
@@ -56,11 +79,13 @@ def shell(root: str = "."):
         c.TerminalInteractiveShell.banner2 = banner.format(**{
             "project_name": f"{f'{project.settings.PROJECT_NAME} ' if getattr(project.settings, 'PROJECT_NAME', '') else ''}[{Path(project_path).resolve()}]",
         })
+        atexit.register(cleanup)
         start_ipython(argv=[], user_ns=shell_vars, config=c)
     except ImportError:
         typer.echo("IPython is not installed. Falling back to built-in Python shell.")
         import code
-        code.interact(local={"settings": project.settings})
+        atexit.register(cleanup)
+        code.interact(local={"p": project})
 
 
 @app.command()

ohmyapi/db/__init__.py

@@ -1,3 +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.12.dist-info → ohmyapi-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.12
+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")
 
@@ -353,12 +353,17 @@ Out[2]:
  Routes:
   - APIRoute(path='/auth/login', name='login', methods=['POST'])
   - APIRoute(path='/auth/refresh', name='refresh_token', methods=['POST'])
-  - APIRoute(path='/auth/me', name='me', methods=['GET'])
-  - APIRoute(path='/auth/introspect', name='introspect', methods=['GET'])}
+  - APIRoute(path='/auth/introspect', name='introspect', methods=['GET'])
+  - APIRoute(path='/auth/me', name='me', methods=['GET']),
+ 'tournament': App: tournament
+ Models:
+  - Tournament
+  - Event
+  - Team
+ Routes:
+  - APIRoute(path='/tournament/', name='list', methods=['GET'])}
 
 In [3]: from tournament.models import Tournament
-Out[3]:
-
 ```
 
 

{ohmyapi-0.1.12.dist-info → ohmyapi-0.1.14.dist-info}/RECORD

@@ -1,10 +1,10 @@
 ohmyapi/__init__.py,sha256=UmLNQImTbKvHEgwQB2Wsyl6fq88X92imL9QZYJpQX4I,18
 ohmyapi/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 ohmyapi/builtin/auth/__init__.py,sha256=TY1RKgwWmJ6FKz_v4J3m0Ang69qSmtVDLe4rqjLk4-E,69
-ohmyapi/builtin/auth/models.py,sha256=Xsxn9m5RTgY2a0PPfW3wTj77ocuuISytdl4ec_TR_kw,1524
+ohmyapi/builtin/auth/models.py,sha256=ubdDwVKgU8q8K58a_lR93xCveQGcdM8hTyusgVx8rK0,1687
 ohmyapi/builtin/auth/permissions.py,sha256=jf-I2b9rIOw2EF4Kga-_Bz1ZPPHU0vHNaXGrDQSwhSI,145
-ohmyapi/builtin/auth/routes.py,sha256=iMxmgP6TSpMrtSKf-g7mc60NcOiw8FRkngUroalGCyk,5519
-ohmyapi/cli.py,sha256=qCGi9GtgybCh_jb_NVwu9dlG9XTbilg6qnXop2IIgC8,3768
+ohmyapi/builtin/auth/routes.py,sha256=re3w7fZ9q9tUXDsQtkFcKizuEmtjxnebVA2lIO7afkM,5545
+ohmyapi/cli.py,sha256=Mip1eBKYyu1hmUHbNW-1kSMc05EJOTVXqdI0c0r_B4g,4440
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ohmyapi/core/runtime.py,sha256=l5zffc4VTwQOo7G9mfiYHsPGapMONRX_jtO_z9QaKHU,8577
 ohmyapi/core/scaffolding.py,sha256=iMymscokJ-YqzB0ZTC-gcc2T71o73577j9tnb2x8lH8,2572
@@ -14,12 +14,12 @@ ohmyapi/core/templates/app/routes.py.j2,sha256=o3XEBZDfHRhodx-6rX1ebnKpqqd-QApfw
 ohmyapi/core/templates/project/README.md.j2,sha256=SjR4JIrg-8XRE-UntUDwiw8jDpYitD_UjwoKkYJ7GLw,22
 ohmyapi/core/templates/project/pyproject.toml.j2,sha256=X0VS6YT9aL3vpHFKPTfLFsdpD8423nY57ySQpSTMxmQ,895
 ohmyapi/core/templates/project/settings.py.j2,sha256=RBKGB8MZWPM3Bp0a57Y1YrSvSXxh502TUnJqbbu48Ig,138
-ohmyapi/db/__init__.py,sha256=PaDrioQ1lkFAo7Al82MoV6duQeJF0dTQ7EG0TzKOOIM,70
+ohmyapi/db/__init__.py,sha256=T7AUWlEXD--WOn01mKPIpkxPVwmgYHZQ4vQo3ejOkgE,204
 ohmyapi/db/exceptions.py,sha256=I7AubrdqQF_UvAvzKqz2ve08-BkXHzEWXnwG300StHE,35
 ohmyapi/db/model/__init__.py,sha256=k3StTNuKatpwZo_Z5JBFa-927eJrzibFE8U4SA82asc,32
 ohmyapi/db/model/model.py,sha256=BajFtLlQ1s0mZ2hj-_JNQhLQmxuVe-Lw2LuW5t2C7Rw,1579
 ohmyapi/router.py,sha256=hutccsrP9RT8W5O6uBDhOJehwqrkRoPzaUI5zoHPh9A,55
-ohmyapi-0.1.12.dist-info/METADATA,sha256=i8wVhc1RwYUKSXXQmffQCMcuawbKmD07yu48rxK3zOY,8673
-ohmyapi-0.1.12.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
-ohmyapi-0.1.12.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
-ohmyapi-0.1.12.dist-info/RECORD,,
+ohmyapi-0.1.14.dist-info/METADATA,sha256=phAamjzQNPXdbFSrrGk_qH4CxECl5UmwTp0KiTpatWE,8766
+ohmyapi-0.1.14.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+ohmyapi-0.1.14.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
+ohmyapi-0.1.14.dist-info/RECORD,,