ohmyapi 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

ohmyapi/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.4.3"
+__VERSION__ = "0.4.5"

ohmyapi/builtin/auth/routes.py

@@ -1,6 +1,6 @@
 import time
 from enum import Enum
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 import jwt
 import settings
@@ -124,6 +124,12 @@ async def get_current_user(token: str = Depends(oauth2_scheme)) -> User:
     return user
 
 
+async def optionally_authenticated(token: Optional[str] = Depends(oauth2_scheme)) -> Optional[User]:
+    if token is None:
+        return None
+    return await get_current_user(token)
+
+
 async def require_authenticated(current_user: User = Depends(get_current_user)) -> User:
     """Ensure the current user is an admin."""
     if not current_user:

ohmyapi/core/runtime.py

@@ -154,7 +154,10 @@ class Project:
         tortoise_cfg = self.build_tortoise_config(db_url=db_url)
 
         # Prevent leaking other app's models to Aerich.
-        tortoise_cfg["apps"] = {app_label: tortoise_cfg["apps"][app_label]}
+        if app_label in tortoise_cfg["apps"].keys():
+            tortoise_cfg["apps"] = {app_label: tortoise_cfg["apps"][app_label]}
+        else:
+            tortoise_cfg["apps"] = {app_label: {"default_connection": "default", "models": []}}
 
         # Append aerich.models to the models list of the target app only
         tortoise_cfg["apps"][app_label]["models"].append("aerich.models")
@@ -403,7 +406,7 @@ class App:
         """
         return {
             "models": [
-                f"{self.name}.{m.__name__}" for m in self.models[f"{self.name}.models"]
+                f"{self.name}.{m.__name__}" for m in self._models[f"{self.name}.models"]
             ],
             "middlewares": self.__serialize_middleware(),
             "routes": self.__serialize_router(),

ohmyapi/db/__init__.py

@@ -1,5 +1,6 @@
 from tortoise.expressions import Q
 from tortoise.manager import Manager
+from tortoise.query_utils import Prefetch
 from tortoise.queryset import QuerySet
 from tortoise.signals import (
     post_delete,

{ohmyapi-0.4.3.dist-info → ohmyapi-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.4.3
+Version: 0.4.5
 Summary: Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,pydantic,async,web-framework

{ohmyapi-0.4.3.dist-info → ohmyapi-0.4.5.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ohmyapi/__init__.py,sha256=USRLBMh7ZFbVjoeXs5WO1vDhQDzxaV5cZDqmfP3x1E4,22
+ohmyapi/__init__.py,sha256=HnnSH0gG1g7ATAegc_GYeIjnfe5EsX83POJ_loJ2i_s,22
 ohmyapi/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 ohmyapi/builtin/auth/__init__.py,sha256=vOVCSJX8BALzs8h5ZW9507bjoscP37bncMjdMmBXcMM,42
 ohmyapi/builtin/auth/models.py,sha256=FJ-F7wY5tXBSZl5YZth6UzhBSFISVCZNc2gp2uKvmR0,2602
 ohmyapi/builtin/auth/permissions.py,sha256=mxsnhF_UGesTFle7v1JHORkNODtQ0qanAL3FtOcMCEY,145
-ohmyapi/builtin/auth/routes.py,sha256=r887BWea20vinX88QBuxGzQc9BrIi-LqyStM0V1cl1o,6304
+ohmyapi/builtin/auth/routes.py,sha256=I1WK3iyWcOAYrUIXUk8GAmbxq9sNkZyw4YBw5MCgym0,6500
 ohmyapi/builtin/demo/__init__.py,sha256=44Yo3mYmlKSKEwVp6O9urr-C_3qDQzCYLMn6B9i6wew,29
 ohmyapi/builtin/demo/models.py,sha256=r06rfuhPJaI2fYsQ24L1JCOd67f2GQNfGnkgKAptOX8,1404
 ohmyapi/builtin/demo/routes.py,sha256=1VTlEttrez6Qnhrz_9sTA-emtfXem0s0BkPVcLvg3k0,1801
 ohmyapi/cli.py,sha256=iWP0vPkodC_Y3MenNs9AH8FR_d-XpoXliGtz4inWkR4,5114
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ohmyapi/core/logging.py,sha256=YHN-I2--WP1uXy4W3Q1aD1XLiG9-CrVWvyCYe8HsD9E,1094
-ohmyapi/core/runtime.py,sha256=wQJEVoetXqrpIy2lqtF6QBL4aMQpEbZzIRYLnh6smu8,13654
+ohmyapi/core/runtime.py,sha256=sXIlbRAzTvDzfJNB1COk0CHaUUfc-Vflmx6cVVoLRRg,13822
 ohmyapi/core/scaffolding.py,sha256=EehJesfDBB8vcMvc_T351QYdyJuyMGBA__BpLT33oVA,3122
 ohmyapi/core/templates/app/__init__.py.j2,sha256=QwVIQVUGZVhdH1d4NrvL7NTsK4-T4cihzYs8UVX2dt4,43
 ohmyapi/core/templates/app/models.py.j2,sha256=_3w-vFJ5fgsmncsCv34k_wyCMF78jufbSSglns4gbb0,119
@@ -20,13 +20,13 @@ ohmyapi/core/templates/docker/docker-compose.yml,sha256=GnFZN8hrxrIdpqQ2COMmBoFc
 ohmyapi/core/templates/project/README.md.j2,sha256=SjR4JIrg-8XRE-UntUDwiw8jDpYitD_UjwoKkYJ7GLw,22
 ohmyapi/core/templates/project/pyproject.toml.j2,sha256=xXMlZOZ4ewyE7Xlvk8kwyF1781-AZfG_CuNtXQGfxqk,522
 ohmyapi/core/templates/project/settings.py.j2,sha256=So6w1OiL_jU-FyeT8IHueDjGNuEoSkYhabhHpne2fUU,140
-ohmyapi/db/__init__.py,sha256=qoZZvji8wLwU38DSw9IcQOZm0C2sMF-fGn-b1J1fzws,239
+ohmyapi/db/__init__.py,sha256=wMxq4C2tLh779IL5dl2HW4YBYomrLz12LGNk43VQQW8,281
 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=ui4g78c5xoS06Dj8Cdk7QgTjRnE68zKeL-AdmeYYPuQ,2776
 ohmyapi/middleware/cors.py,sha256=p8HlKsZLM6jKLEa2-q22cIEZUKawirMQB9ajfxaM4xw,818
 ohmyapi/router.py,sha256=5g0U59glu4hxxnIoTSFzb2S2offkOT3eE39aprzVxwo,83
-ohmyapi-0.4.3.dist-info/METADATA,sha256=_HRuCmjc_duv5Cejzf9ucWLnekja4ZZJpxCM7Difayw,2657
-ohmyapi-0.4.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-ohmyapi-0.4.3.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
-ohmyapi-0.4.3.dist-info/RECORD,,
+ohmyapi-0.4.5.dist-info/METADATA,sha256=Y2MKvxvMoNFdDoUioJY-UHtmJDys9k9VjB4dFgDECBI,2657
+ohmyapi-0.4.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ohmyapi-0.4.5.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
+ohmyapi-0.4.5.dist-info/RECORD,,