reyserver 1.1.51__py3-none-any.whl → 1.1.53__py3-none-any.whl

reyserver/rauth.py

@@ -9,11 +9,12 @@
 """
 
 
-from typing import Literal
+from typing import Any, Literal
+from datetime import datetime as Datetime
 from fastapi import APIRouter
 from reydb import rorm, DatabaseEngine, DatabaseEngineAsync
-# from reykit.rdata import encode_jwt, is_hash_bcrypt
-# from reykit.rtime import now
+from reykit.rdata import encode_jwt, is_hash_bcrypt
+from reykit.rtime import now, time_to
 
 from .rbase import ServerConfig, Bind, exit_api
 
@@ -263,41 +264,39 @@ async def create_sessions(
         "    SELECT `perm_id`, `name`, CONCAT(`method`, ':', `path`) as `api`\n"
         '    FROM `test`.`perm`\n'
         ') AS `perm`\n'
-        'ON `role_perm`.`perm_id` = `perm`.`perm_id`'
+        'ON `role_perm`.`perm_id` = `perm`.`perm_id`\n'
+        'GROUP BY `user_id`'
     )
-    print(1111111111111)
     result = await conn.execute(
         sql,
         account=account
     )
-    print(result.fetchall())
-    return {'message': 'ok'}
-
-    # # Check.
-    # table = result.to_table()
-    # print(table)
-    # if table == []:
-    #     exit_api(401)
-    # json = table[0]
-    # if not is_hash_bcrypt(password, json['password']):
-    #     exit_api(401)
-
-    # # JWT.
-    # now_timestamp_s = now('timestamp_s')
-    # json['sub'] = json.pop('user_id')
-    # json['iat'] = now_timestamp_s
-    # json['nbf'] = now_timestamp_s
-    # json['exp'] = now_timestamp_s + sess_seconds
-    # json['role_names'] = json['role_names'].split(';')
-    # json['perm_names'] = json['perm_names'].split(';')
-    # perm_apis: list[str] = json['perm_apis'].split(';')
-    # perm_api_dict = {}
-    # for perm_api in perm_apis:
-    #     for method, path in perm_api.split(':', 1):
-    #         paths: list = perm_api_dict.setdefault(method, [])
-    #         paths.append(path)
-    # json['perm_apis'] = perm_api_dict
-    # token = encode_jwt(json, key)
-    # data = {'token': token}
-    # print(111111, data)
-    # return data
+
+    # Check.
+    if result.empty:
+        exit_api(401)
+    json: dict[str, Datetime | Any] = result.to_row()
+    if not is_hash_bcrypt(password, json['password']):
+        exit_api(401)
+
+    # JWT.
+    now_timestamp_s = now('timestamp_s')
+    json['sub'] = json.pop('user_id')
+    json['iat'] = now_timestamp_s
+    json['nbf'] = now_timestamp_s
+    json['exp'] = now_timestamp_s + sess_seconds
+    json['role_names'] = json['role_names'].split(';')
+    json['perm_names'] = json['perm_names'].split(';')
+    perm_apis: list[str] = json['perm_apis'].split(';')
+    perm_api_dict = {}
+    for perm_api in perm_apis:
+        method, path = perm_api.split(':', 1)
+        paths: list = perm_api_dict.setdefault(method, [])
+        paths.append(path)
+    json['perm_apis'] = perm_api_dict
+    json['create_time'] = json['create_time'].timestamp()
+    json['update_time'] = json['update_time'].timestamp()
+    token = encode_jwt(json, key)
+    data = {'token': token}
+
+    return data

reyserver/rbase.py

@@ -9,11 +9,9 @@
 """
 
 
-from typing import Sequence, Literal, NoReturn
-from inspect import iscoroutinefunction
-from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
+from typing import Literal, NoReturn
 from http import HTTPStatus
-from fastapi import FastAPI, HTTPException, UploadFile as File
+from fastapi import HTTPException, UploadFile as File
 from fastapi.params import (
     Depends,
     Path,
@@ -26,7 +24,7 @@ from fastapi.params import (
 )
 from reydb.rconn import DatabaseConnectionAsync
 from reydb.rorm import DatabaseORMModel, DatabaseORMSessionAsync
-from reykit.rbase import CoroutineFunctionSimple, Base, Exit, StaticMeta, ConfigMeta, Singleton, throw
+from reykit.rbase import Base, Exit, StaticMeta, ConfigMeta, Singleton, throw
 
 from . import rserver
 
@@ -259,57 +257,6 @@ class ServerBind(ServerBase, metaclass=StaticMeta):
     """
 
 
-    def create_lifespan(
-        before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
-        after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
-    ) -> _AsyncGeneratorContextManager[None, None]:
-        """
-        Create asynchronous function of lifespan manager.
-
-        Parameters
-        ----------
-        before : Execute before server start.
-        after : Execute after server end.
-
-        Returns
-        -------
-        Asynchronous function.
-        """
-
-        # Parameter.
-        if before is None:
-            before = ()
-        elif iscoroutinefunction(before):
-            before = (before,)
-        if after is None:
-            after = ()
-        elif iscoroutinefunction(after):
-            after = (after,)
-
-
-        @asynccontextmanager
-        async def lifespan(app: FastAPI):
-            """
-            Server lifespan manager.
-
-            Parameters
-            ----------
-            app : Server APP.
-            """
-
-            # Before.
-            for task in before:
-                await task()
-            yield
-
-            # After.
-            for task in after:
-                await after()
-
-
-        return lifespan
-
-
     def create_depend_db(database: str, mode: Literal['sess', 'conn']) -> Depends:
         """
         Create dependencie type of asynchronous database.

reyserver/rserver.py

@@ -12,6 +12,7 @@
 from typing import Literal
 from collections.abc import Sequence, Callable, Coroutine
 from inspect import iscoroutinefunction
+from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
 from uvicorn import run as uvicorn_run
 from starlette.middleware.base import _StreamingResponse
 from fastapi import FastAPI, Request
@@ -67,7 +68,6 @@ class Server(ServerBase, Singleton):
         # Parameter.
         if type(ssl_cert) != type(ssl_key):
             throw(AssertionError, ssl_cert, ssl_key)
-        lifespan = Bind.create_lifespan(before, after)
         if depend is None:
             depend = ()
         elif iscoroutinefunction(depend):
@@ -76,6 +76,7 @@ class Server(ServerBase, Singleton):
             Bind.Depend(task)
             for task in depend
         ]
+        lifespan = self.__create_lifespan(before, after)
 
         # Build.
         ServerConfig.server = self
@@ -111,6 +112,61 @@ class Server(ServerBase, Singleton):
         'File API store directory path.'
 
 
+    def __create_lifespan(
+        self,
+        before: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
+        after: CoroutineFunctionSimple | Sequence[CoroutineFunctionSimple] | None = None,
+    ) -> _AsyncGeneratorContextManager[None, None]:
+        """
+        Create asynchronous function of lifespan manager.
+
+        Parameters
+        ----------
+        before : Execute before server start.
+        after : Execute after server end.
+
+        Returns
+        -------
+        Asynchronous function.
+        """
+
+        # Parameter.
+        if before is None:
+            before = ()
+        elif iscoroutinefunction(before):
+            before = (before,)
+        if after is None:
+            after = ()
+        elif iscoroutinefunction(after):
+            after = (after,)
+
+
+        @asynccontextmanager
+        async def lifespan(app: FastAPI):
+            """
+            Server lifespan manager.
+
+            Parameters
+            ----------
+            app : Server APP.
+            """
+
+            # Before.
+            for task in before:
+                await task()
+            yield
+
+            # After.
+            for task in after:
+                await after()
+
+            # Database.
+            await self.db.dispose_all()
+
+
+        return lifespan
+
+
     def __add_default_middleware(self) -> None:
         """
         Add default handle middleware.
@@ -138,7 +194,10 @@ class Server(ServerBase, Singleton):
             response = await call_next(request)
 
             # After.
-            if request.method == 'POST':
+            if (
+                response.status_code == 200
+                and request.method == 'POST'
+            ):
                 response.status_code = 201
 
             return response

{reyserver-1.1.51.dist-info → reyserver-1.1.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reyserver
-Version: 1.1.51
+Version: 1.1.53
 Summary: Backend server method set.
 Project-URL: homepage, https://github.com/reyxbo/reyserver/
 Author-email: Rey <reyxbo@163.com>

reyserver-1.1.53.dist-info/RECORD

@@ -0,0 +1,11 @@
+reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
+reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
+reyserver/rauth.py,sha256=oa6Iwuutcj9eO6RH7DaT-rPn_YqYwKuyHYaBd3lZoZE,11728
+reyserver/rbase.py,sha256=jgjAkT1kxzVKB60xfWxZbnQJsehhcTBr24AclTYjc4g,5603
+reyserver/rclient.py,sha256=IWZ3smyIP0_YJrfSrM8JFCr0FCtN02AyT3hp8YuSsDQ,5103
+reyserver/rfile.py,sha256=bvuXOYO3UDM1jMiyNzQDz56_0ekZUEIRcfNFAhGgdUY,9010
+reyserver/rserver.py,sha256=wQMAtCb3iu3XfYSiGS7TbqHslxdcMFLAmCaYdNToDbY,8241
+reyserver-1.1.53.dist-info/METADATA,sha256=9DvHdPLFWZ6BASCz_WFMmGLB5ZmTstbC0_99kaQjhw4,1689
+reyserver-1.1.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.53.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.53.dist-info/RECORD,,

reyserver-1.1.51.dist-info/RECORD

@@ -1,11 +0,0 @@
-reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
-reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
-reyserver/rauth.py,sha256=T2oafUAmXr4WfVYmEHO5v0j9K703KUYLGNVEom0J76Q,11716
-reyserver/rbase.py,sha256=xgdLP_O77e-pSrRWm9GVSziPSqEOh2w20cWkF4HBeWo,7042
-reyserver/rclient.py,sha256=IWZ3smyIP0_YJrfSrM8JFCr0FCtN02AyT3hp8YuSsDQ,5103
-reyserver/rfile.py,sha256=bvuXOYO3UDM1jMiyNzQDz56_0ekZUEIRcfNFAhGgdUY,9010
-reyserver/rserver.py,sha256=gOvLfaLqiDgHcZbzd3h2iIaDtraCuBcmsy1d61TaJ2c,6717
-reyserver-1.1.51.dist-info/METADATA,sha256=F4eENaUB_2lE1aEeV4ZZ_W7AHW7iB6NfPuTsR1fy-8U,1689
-reyserver-1.1.51.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.51.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.51.dist-info/RECORD,,