reyserver 1.1.59__py3-none-any.whl → 1.1.60__py3-none-any.whl

reyserver/radmin.py

@@ -12,7 +12,9 @@
 from typing import Any, Type
 from collections.abc import Sequence
 from sqlalchemy.ext.asyncio import async_sessionmaker
+from fastapi import Request
 from sqladmin import Admin, ModelView
+from sqladmin.authentication import AuthenticationBackend
 from reydb import DatabaseEngineAsync, rorm
 from reykit.rbase import Singleton
 
@@ -23,11 +25,12 @@ from . import rserver
 __all__ = (
     'ServerAdminModel',
     'ServerAdminModelView',
-    'ServerAdminModelViewStats'
+    'ServerAdminModelViewStats',
+    'ServerAdmin'
 )
 
 
-class ServerAdminModel(ModelView):
+class ServerAdminModel(ServerBase, ModelView):
     """
     Server admin model type.
     """
@@ -50,6 +53,40 @@ class ServerAdminModelViewStats(ServerAdminModelView):
     column_list = ['item', 'value', 'comment']
 
 
+# class ServerAdminAuthentication(ServerAdmin, AuthenticationBackend):
+#     """
+#     Server admin authentication type.
+#     """
+
+
+#     async def authenticate(self, request: Request) -> bool:
+#         """
+#         Authenticate request.
+
+#         Parameters
+#         ----------
+#         request : Request.
+#         """
+
+#         # 
+#         ...
+#         request.session['token']
+#         ...
+
+
+#     async def login(self, request: Request) -> bool:
+#         form = await request.form()
+#         form['username']
+#         form['password']
+#         ...
+#         request.session['token'] = ...
+#         ...
+
+
+#     async def logout(self, request: Request) -> None:
+#         request.session.clear()
+
+
 class ServerAdmin(ServerBase, Singleton):
     """
     Server admin type, singleton mode.
@@ -73,7 +110,13 @@ class ServerAdmin(ServerBase, Singleton):
         'Admin API model bind database engine dictionary.'
         Session = async_sessionmaker()
         Session.configure(binds=self.api_admin_binds)
-        self.admin = Admin(self.server.app, session_maker=Session)
+        auth = self.__create_auth()
+        self.admin = Admin(
+            self.server.app,
+            session_maker=Session,
+            authentication_backend=auth
+        )
+
 
 
     def add_model(

reyserver/rauth.py

@@ -415,6 +415,7 @@ async def depend_auth(
     """
 
     # Check.
+    print(11111111111111111)
     api_path = f'{request.method} {request.url.path}'
     if (
         not server.is_started_auth
@@ -429,14 +430,14 @@ async def depend_auth(
     token = auth.credentials
 
     # Decode.
-    token = decode_jwt(token, key)
-    if token is None:
+    json = decode_jwt(token, key)
+    if json is None:
         exit_api(401)
-    token: Token
-    request.state.token = token
+    json: Token
+    request.state.user = json['user']
 
     # Check.
-    perm_apis = token['user']['perm_apis']
+    perm_apis = json['user']['perm_apis']
     perm_apis = [
         f'^{pattern}$'
         for pattern in perm_apis

reyserver/rclient.py

@@ -9,8 +9,10 @@
 """
 
 
-from typing import TypedDict, Literal
+from typing import TypedDict
 from datetime import datetime as Datetime
+from requests import Response
+from reykit.rbase import copy_type_hints
 from reykit.ros import File, Folder, overload
 from reykit.rnet import join_url, request, get_response_file_name
 
@@ -31,31 +33,40 @@ class ServerClient(ServerBase):
     """
 
 
-    def __init__(self, url: str) -> None:
+    def __init__(
+        self,
+        username: str,
+        password: str,
+        url: str = 'http://127.0.0.1:8000',
+    ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
+        username: User name.
+        password: User password.
         url : Server url.
         """
 
         # Build.
+        self.username = username
+        self.password = password
         self.url = url
+        self.token = self.create_session(username, password)
 
 
     def create_session(
         self,
-        account: str,
-        password: str,
-        account_type: Literal['name', 'email', 'phone'] = 'name'
+        username: str,
+        password: str
     ) -> str:
         """
         Create session.
 
         Parameters
         ----------
-        account : User account, name or email or phone.
+        account : User name.
         password : User password.
         account_type : User account type.
 
@@ -67,9 +78,8 @@ class ServerClient(ServerBase):
         # Parameter.
         url = join_url(self.url, 'sessions')
         json = {
-            'account': account,
-            'password': password,
-            'account_type': account_type
+            'account': username,
+            'password': password
         }
 
         # Request.
@@ -80,6 +90,45 @@ class ServerClient(ServerBase):
         return token
 
 
+    def _request(self, *args, **kwargs) -> Response:
+        """
+        Send request.
+
+        Parameters
+        ----------
+        args : Position arguments.
+        kwargs : Keyword arguments.
+
+        Returns
+        -------
+        Response.
+        """
+
+        # Parameter.
+        headers = kwargs.setdefault('headers', {})
+        headers['Authorization'] = f'Bearer {self.token}'
+        kwargs['check'] = list(range(200, 400))
+        kwargs['check'].append(401)
+
+        # Request.
+        response = request(*args, **kwargs)
+
+        # Check.
+        if response.status_code != 401:
+            return response
+
+        # Try request.
+        self.token = self.create_session(self.username, self.password)
+        headers['Authorization'] = f'Bearer {self.token}'
+        kwargs['check'] = True
+        response = request(*args, **kwargs)
+
+        return response
+
+
+    request = copy_type_hints(_request, request)
+
+
     def upload_file(
         self,
         source: str | bytes,
@@ -128,7 +177,7 @@ class ServerClient(ServerBase):
         # Request.
         data = {'name': file_name, 'note': note}
         files = {'file': file_bytes}
-        response = request(url, data=data, files=files, check=True)
+        response = self.request(url, data=data, files=files, check=True)
 
         ## Extract.
         response_json = response.json()
@@ -177,7 +226,7 @@ class ServerClient(ServerBase):
         url = join_url(self.url, 'files', file_id, 'download')
 
         # Request.
-        response = request(url, check=True)
+        response = self.request(url, check=True)
         file_bytes = response.content
 
         # Not save.
@@ -215,7 +264,7 @@ class ServerClient(ServerBase):
         url = join_url(self.url, 'files', file_id)
 
         # Request.
-        response = request(url, check=True)
+        response = self.request(url, check=True)
         response_dict = response.json()
 
         return response_dict

{reyserver-1.1.59.dist-info → reyserver-1.1.60.dist-info}/METADATA

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

reyserver-1.1.60.dist-info/RECORD

@@ -0,0 +1,12 @@
+reyserver/__init__.py,sha256=Oq-lOcQInzhgKt1_4OB2jNx0OO2d9qZg9iZqUx6YRr8,398
+reyserver/radmin.py,sha256=0nOEBd1vFDn0annjiGXi3TN9C6Vofpb8W_UfXj5TuhM,4257
+reyserver/rall.py,sha256=MI1NnqUpq22CK9w3XPPBS0K8lNuf0BnbI0pn4MGMx38,293
+reyserver/rauth.py,sha256=KgHWuRmqmxMoeNFCvCpdxb0S5uv7VH75M0vuMrZTOt8,15111
+reyserver/rbase.py,sha256=kzSbo6yoPlWquR6XiseTKi5hEbllaG3qVmmwnnKKac0,6898
+reyserver/rclient.py,sha256=VDUqQMVUTGzmZ8kjiMet2_zEt0_Siw0gyQkqHRIZ594,6281
+reyserver/rfile.py,sha256=0wS-ohsAOGcSCg07U66wpqJlxnCLWN6gkEQJK4qavWQ,8877
+reyserver/rserver.py,sha256=mjc-SeE2RZZwB5Z1nUSMo_VMign3VcftIK1Kv7XIne8,11484
+reyserver-1.1.60.dist-info/METADATA,sha256=JuZnt-TPamZk_dtV07w4aEm6cT5fZa3Js146QUa6wNI,1666
+reyserver-1.1.60.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.60.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.60.dist-info/RECORD,,

reyserver-1.1.59.dist-info/RECORD

@@ -1,12 +0,0 @@
-reyserver/__init__.py,sha256=Oq-lOcQInzhgKt1_4OB2jNx0OO2d9qZg9iZqUx6YRr8,398
-reyserver/radmin.py,sha256=Hwy8QsiQOyK2YP7abcS22IbRKB7sgcDGPHQ2-mHtf-8,3269
-reyserver/rall.py,sha256=MI1NnqUpq22CK9w3XPPBS0K8lNuf0BnbI0pn4MGMx38,293
-reyserver/rauth.py,sha256=irnwf1_OSOjB9fB7VBWY5RvpetPX2ydivMt_teXmDVs,15079
-reyserver/rbase.py,sha256=kzSbo6yoPlWquR6XiseTKi5hEbllaG3qVmmwnnKKac0,6898
-reyserver/rclient.py,sha256=Ffm66YuWupzEtQ6RqEm2KCc6jSF8JeMB7Xq6pzRFZ6M,5073
-reyserver/rfile.py,sha256=0wS-ohsAOGcSCg07U66wpqJlxnCLWN6gkEQJK4qavWQ,8877
-reyserver/rserver.py,sha256=mjc-SeE2RZZwB5Z1nUSMo_VMign3VcftIK1Kv7XIne8,11484
-reyserver-1.1.59.dist-info/METADATA,sha256=oJNACNqqErBtx9jcDkkGRQoTyDaFT-T5tnfbEkVm-6E,1666
-reyserver-1.1.59.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.59.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.59.dist-info/RECORD,,