publish: 5.5a4

pyproject.toml

@@ -5,7 +5,7 @@
 
 [tool.poetry]
     name = "royalnet"
-    version = "5.5a3"
+    version = "5.5a4"
     description = "A multipurpose bot and web framework"
     authors = ["Stefano Pigozzi <ste.pigozzi@gmail.com>"]
     license = "AGPL-3.0+"

royalnet/backpack/stars/api_login_royalnet.py

@@ -9,7 +9,9 @@ from ..tables.tokens import Token
 class ApiLoginRoyalnetStar(ApiStar):
     path = "/api/login/royalnet/v1"
 
-    async def api(self, data: ApiData) -> dict:
+    methods = ["POST"]
+
+    async def api(self, data: ApiData) -> ru.JSON:
         TokenT = self.alchemy.get(Token)
         UserT = self.alchemy.get(User)
         AliasT = self.alchemy.get(Alias)

royalnet/backpack/stars/api_royalnet_version.py

@@ -1,11 +1,12 @@
 import royalnet.version as rv
 from royalnet.constellation.api import *
+import royalnet.utils as ru
 
 
 class ApiRoyalnetVersionStar(ApiStar):
     path = "/api/royalnet/version/v1"
 
-    async def api(self, data: ApiData) -> dict:
+    async def api(self, data: ApiData) -> ru.JSON:
         return {
             "semantic": rv.semantic
         }

royalnet/backpack/stars/api_token_create.py

@@ -3,13 +3,14 @@ import datetime
 import royalnet.utils as ru
 from royalnet.constellation.api import *
 from ..tables.tokens import Token
-from sqlalchemy import and_
 
 
 class ApiTokenCreateStar(ApiStar):
     path = "/api/token/create/v1"
 
-    async def api(self, data: ApiData) -> dict:
+    methods = ["POST"]
+
+    async def api(self, data: ApiData) -> ru.JSON:
         user = await data.user()
         try:
             duration = int(data["duration"])

royalnet/backpack/stars/api_token_info.py

@@ -1,13 +1,10 @@
-import datetime
 import royalnet.utils as ru
 from royalnet.constellation.api import *
-from ..tables.users import User
-from ..tables.aliases import Alias
 
 
 class ApiTokenInfoStar(ApiStar):
     path = "/api/token/info/v1"
 
-    async def api(self, data: ApiData) -> dict:
+    async def api(self, data: ApiData) -> ru.JSON:
         token = await data.token()
         return token.json()

royalnet/backpack/stars/api_token_passwd.py

@@ -9,7 +9,9 @@ from ..tables.tokens import Token
 class ApiTokenPasswdStar(ApiStar):
     path = "/api/token/passwd/v1"
 
-    async def api(self, data: ApiData) -> dict:
+    methods = ["POST"]
+
+    async def api(self, data: ApiData) -> ru.JSON:
         TokenT = self.alchemy.get(Token)
         token = await data.token()
         user = token.user

royalnet/constellation/api/apistar.py

@@ -7,7 +7,7 @@ from ..pagestar import PageStar
 from .jsonapi import api_error, api_success
 from .apidata import ApiData
 from .apierrors import *
-from royalnet.utils import sentry_exc
+import royalnet.utils as ru
 
 
 class ApiStar(PageStar, ABC):
@@ -31,12 +31,12 @@ class ApiStar(PageStar, ABC):
         except BadRequestError as e:
             return api_error(e, code=400)
         except Exception as e:
-            sentry_exc(e)
+            ru.sentry_exc(e)
             return api_error(e, code=500)
         else:
             return api_success(response)
         finally:
             await apidata.session_close()
 
-    async def api(self, data: dict) -> dict:
+    async def api(self, data: ApiData) -> ru.JSON:
         raise NotImplementedError()

royalnet/utils/__init__.py

@@ -5,6 +5,7 @@ from .urluuid import to_urluuid, from_urluuid
 from .multilock import MultiLock
 from .sentry import init_sentry, sentry_exc
 from .log import init_logging
+from .royaltyping import JSON
 
 __all__ = [
     "asyncify",
@@ -20,4 +21,5 @@ __all__ = [
     "init_sentry",
     "sentry_exc",
     "init_logging",
+    "JSON",
 ]

royalnet/utils/royaltyping.py

@@ -0,0 +1,3 @@
+from typing import *
+
+JSON = Union[None, int, str, List["JSON"], Dict[str, "JSON"]]

royalnet/version.py

@@ -1 +1 @@
-semantic = "5.5a3"
+semantic = "5.5a4"