reyserver 1.1.64__py3-none-any.whl → 1.1.66__py3-none-any.whl

reyserver/rauth.py

@@ -407,7 +407,7 @@ async def get_user_data(
 
 
 @router_auth.post('/token')
-async def create_sessions(
+async def create_token(
     username: str = Bind.i.form,
     password: str = Bind.i.form,
     conn: Bind.Conn = Bind.conn.auth,

reyserver/rserver.py

@@ -13,6 +13,7 @@ from typing import Literal
 from collections.abc import Sequence, Callable, Coroutine
 from inspect import iscoroutinefunction
 from contextlib import asynccontextmanager, _AsyncGeneratorContextManager
+from logging import getLogger, Filter
 from uvicorn import run as uvicorn_run
 from starlette.middleware.base import _StreamingResponse
 from fastapi import FastAPI, Request
@@ -114,6 +115,9 @@ class Server(ServerBase, Singleton):
         self.api_file_dir: str
         'File API store directory path.'
 
+        # Filter warning.
+        self.__filter_warning()
+
 
     def __create_lifespan(
         self,
@@ -216,12 +220,27 @@ class Server(ServerBase, Singleton):
             return response
 
 
+    def __filter_warning(self) -> None:
+        """
+        Filter server default logger warning record.
+        """
+
+        # Filter.
+        log_filter = Filter()
+        log_filter.filter = lambda record: (
+            False
+            if record.msg == 'ASGI app factory detected. Using it, but please consider setting the --factory flag explicitly.'
+            else True
+        )
+        log = getLogger('uvicorn.error')
+        log.addFilter(log_filter)
+
+
     def run(
         self,
         host: str = '127.0.0.1',
-        port: int = 1024,
+        port: int = 8000,
         app: str | None = None,
-        factory: bool = False,
         workers: int = 1
     ) -> None:
         """
@@ -231,27 +250,29 @@ class Server(ServerBase, Singleton):
         ----------
         host : Server host.
         port: Server port.
-        app : Application path, format is `Module[.Sub....]:Variable[.Attributre....]` (e.g. `module.sub:server.app`).
+        app : Application or function path.
             - `None`: Cannot use parameter `workers`.
-        factory : Whether parameter `app` is factory function.
+            - `Application`: format is `module[.sub....]:var[.attr....]` (e.g. `module.sub:server.app`).
+            - `Function`: format is `module[.sub....]:func` (e.g. `module.sub:main`).
         workers: Number of server work processes.
 
         Examples
         --------
-        >>> server = Server(db)
-
         Single work process.
+        >>> server = Server(db)
         >>> server.run()
 
         Multiple work processes.
         >>> server = Server(db)
         >>> if __name__ == '__main__':
-        >>>     server('module.sub:server.app')
+        >>>     server('module.sub:server.app', workers=2)
         """
 
         # Parameter.
         if app is None:
             app = self.app
+        if workers == 1:
+            workers = None
 
         # Run.
         uvicorn_run(
@@ -260,8 +281,7 @@ class Server(ServerBase, Singleton):
             port=port,
             workers=workers,
             ssl_certfile=self.ssl_cert,
-            ssl_keyfile=self.ssl_key,
-            factory=factory
+            ssl_keyfile=self.ssl_key
         )
 
 

{reyserver-1.1.64.dist-info → reyserver-1.1.66.dist-info}/METADATA

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

{reyserver-1.1.64.dist-info → reyserver-1.1.66.dist-info}/RECORD

@@ -1,11 +1,11 @@
 reyserver/__init__.py,sha256=7GX64p7uI2eetJH9NJ-DTg-8iyQwOsGcviADFJCPxVA,373
 reyserver/rall.py,sha256=riyDRTUsigco_Bee1H4aZFb8IgvjnxdX9qcnVb9i9mE,270
-reyserver/rauth.py,sha256=JGo5lLTRGoP1SFPyQA-Q5EE-O3OU_86Mb3pvwhvFu-w,15125
+reyserver/rauth.py,sha256=mqyo5FsN4vdW5GRgvZssWcpfku1Dfo_Md8vvoo8JzhU,15122
 reyserver/rbase.py,sha256=0ECJ1zuUpJhwaNc0u5GvR5VyGxIAnKQep-EdotwnLoE,7752
 reyserver/rclient.py,sha256=og5YuWm-PODkFn9njBwYQpGlk0j1BfqFuEarlCFSQYI,6229
 reyserver/rfile.py,sha256=6H5_7B9aiA3F56VToQDI9Trarkrl9gcIuFqYyCVCiCU,8877
-reyserver/rserver.py,sha256=fCuf8pDBM2ZdAOlXPzlFcNf63zUGjoTY3VKLoXjNqpo,10562
-reyserver-1.1.64.dist-info/METADATA,sha256=WhmSK0M15RiZXyO2e8fxsvScBmkfcZXOKBi24u-Hodo,1666
-reyserver-1.1.64.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reyserver-1.1.64.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reyserver-1.1.64.dist-info/RECORD,,
+reyserver/rserver.py,sha256=3l6NoAfogeYli5lgHRfLpC9q5k7pwRCiacjN8Yt4fso,11199
+reyserver-1.1.66.dist-info/METADATA,sha256=njJDT00gu53ZHN4sFnbN29vl8qPli9hSvAyfP8bgJo4,1666
+reyserver-1.1.66.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reyserver-1.1.66.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reyserver-1.1.66.dist-info/RECORD,,