CheeseAPI 2.0.2b1__tar.gz → 2.0.4__tar.gz

{cheeseapi-2.0.2b1 → cheeseapi-2.0.4}/CheeseAPI/app.py

@@ -98,7 +98,7 @@ class AppProxy:
                 'modules': module
             })
 
-            for path in pathlib.Path(module).glob('*.py'):
+            for path in pathlib.Path(module.replace('.', '/')).glob('*.py'):
                 __import__(f'{module}.{path.stem}')
 
             self.after_load_module(i, module)
@@ -463,7 +463,7 @@ class CheeseAPI:
             - compress: 支持的压缩算法，按照顺序尝试压缩
             - compress_min_length: 启用压缩的最小响应体长度
             - compress_level: 压缩等级，每个算法的压缩级别可能不同，详见各算法文档
-            - manual_modules: 手动加载的模块列表
+            - manual_modules: 手动加载的模块列表；若想要加载多层级模块，请使用点号分隔，如 `Xxx.module`，与导入模块的方式一致
             - exclude_modules: 排除加载的模块列表
             - priority_modules: 优先加载的模块列表
             - sync_server_data_encode: 同步服务器数据编码处理函数

{cheeseapi-2.0.2b1 → cheeseapi-2.0.4}/CheeseAPI/printer.py

@@ -45,32 +45,32 @@ class Printer:
 
     def fn_error(self, e: Exception, request: 'Request'):
         error = traceback.format_exc()[:-1].replace("\n", "\n    ")
-        self.app.logger.danger(f'An error occurred causing the {request.ip} visited {request.method} {request.path}:\n    {error}', f'An error occurred causing the <cyan>{request.ip}</cyan> visited <cyan>{request.method} {request.path}</cyan>:\n    {self.app.logger.encode(error)}')
+        self.app.logger.danger(f'An error occurred causing the {request.ip} visited {request.method} {request.full_path}:\n    {error}', f'An error occurred causing the <cyan>{request.ip}</cyan> visited <cyan>{request.method} {self.app.logger.encode(request.full_path)}</cyan>:\n    {self.app.logger.encode(error)}')
 
     def websocket_error(self, e: Exception, websocket: 'Websocket'):
         error = traceback.format_exc()[:-1].replace("\n", "\n    ")
-        self.app.logger.danger(f'An error occurred causing the {websocket.request.ip} disconnected :\n    {error}', f'An error occurred causing the <cyan>{websocket.request.ip}</cyan> disconnected <cyan>{websocket.request.method} {websocket.request.path}</cyan>:\n    {self.app.logger.encode(error)}')
+        self.app.logger.danger(f'An error occurred causing the {websocket.request.ip} disconnected  {websocket.request.method} {websocket.request.full_path}:\n    {error}', f'An error occurred causing the <cyan>{websocket.request.ip}</cyan> disconnected <cyan>{websocket.request.method} {self.app.logger.encode(websocket.request.full_path)}</cyan>:\n    {self.app.logger.encode(error)}')
 
     def response(self, request: 'Request', response: 'Response'):
         status_color = HTTP_STATUS_COLOR[int(response.status / 100) - 1]
         if request.path is not None:
-            self.app.logger.print('HTTP', f'The {request.ip} visited {request.method} {request.path} and returned {response.status}', f'The <cyan>{request.ip}</cyan> visited <cyan>{request.method} {request.path}</cyan> returned <{status_color}>{response.status}</{status_color}>')
+            self.app.logger.print('HTTP', f'The {request.ip} visited {request.method} {request.full_path} and returned {response.status}', f'The <cyan>{request.ip}</cyan> visited <cyan>{request.method} {self.app.logger.encode(request.full_path)}</cyan> returned <{status_color}>{response.status}</{status_color}>')
         else:
             self.app.logger.print('HTTP', f'The request from {request.ip} failed to parse and returned {response.status}', f'The request from <cyan>{request.ip}</cyan> failed to parse and returned <{status_color}>{response.status}</{status_color}>')
 
     def websocket_connect(self, websocket: 'Websocket'):
-        self.app.logger.print('WEBSOCKET', f'The {websocket.request.ip} connected {websocket.request.method} {websocket.request.path}', f'The <cyan>{websocket.request.ip}</cyan> connected <cyan>{websocket.request.method} {websocket.request.path}</cyan>')
+        self.app.logger.print('WEBSOCKET', f'The {websocket.request.ip} connected {websocket.request.method} {websocket.request.full_path}', f'The <cyan>{websocket.request.ip}</cyan> connected <cyan>{websocket.request.method} {self.app.logger.encode(websocket.request.full_path)}</cyan>')
 
     def websocket_disconnect(self, websocket: 'Websocket'):
-        self.app.logger.print('WEBSOCKET', f'The {websocket.request.ip} disconnected {websocket.request.method} {websocket.request.path}', f'The <cyan>{websocket.request.ip}</cyan> disconnected <cyan>{websocket.request.method} {websocket.request.path}</cyan>')
+        self.app.logger.print('WEBSOCKET', f'The {websocket.request.ip} disconnected {websocket.request.method} {websocket.request.full_path}', f'The <cyan>{websocket.request.ip}</cyan> disconnected <cyan>{websocket.request.method} {self.app.logger.encode(websocket.request.full_path)}</cyan>')
 
     def websocket_message_error(self, e: Exception, websocket: 'Websocket'):
         error = traceback.format_exc()[:-1].replace("\n", "\n    ")
-        self.app.logger.danger(f'An error occurred causing the {websocket.request.ip} received a message to {websocket.request.method} {websocket.request.path}:\n    {error}', f'An error occurred causing the <cyan>{websocket.request.ip}</cyan> receive a message to <cyan>{websocket.request.method} {websocket.request.path}</cyan>:\n    {self.app.logger.encode(error)}')
+        self.app.logger.danger(f'An error occurred causing the {websocket.request.ip} received a message to {websocket.request.method} {websocket.request.full_path}:\n    {error}', f'An error occurred causing the <cyan>{websocket.request.ip}</cyan> receive a message to <cyan>{websocket.request.method} {self.app.logger.encode(websocket.request.full_path)}</cyan>:\n    {self.app.logger.encode(error)}')
 
     def scheduler_error(self, e: Exception, task: 'Task'):
         error = traceback.format_exc()[:-1].replace("\n", "\n    ")
-        self.app.logger.danger(f'An error occurred in the scheduled task {task.key} running:\n    {error}', f'An error occurred in the scheduled task running <green>{task.key}</green>:\n    {self.app.logger.encode(error)}')
+        self.app.logger.danger(f'An error occurred in the scheduled task {task.key} running:\n    {error}', f'An error occurred in the scheduled task running <green>{self.app.logger.encode(task.key)}</green>:\n    {self.app.logger.encode(error)}')
 
     @property
     def app(self) -> 'CheeseAPI':

{cheeseapi-2.0.2b1 → cheeseapi-2.0.4}/CheeseAPI/route.py

@@ -1,6 +1,8 @@
 import re, uuid
 from typing import Literal, TypedDict, Callable, TYPE_CHECKING, AsyncIterable, Union
 
+from urllib.parse import unquote
+
 from CheeseAPI.cors import CORS
 
 if TYPE_CHECKING:
@@ -252,7 +254,7 @@ class RouteProxy:
                     i = 1
                     for key, type in self.app.route._proxy.dynamic_routes[_path][method]['params'].items():
                         value = match.group(i)
-                        _params[key] = type(value)
+                        _params[key] = type(unquote(value))
                         i += 1
                     return self.app.route._proxy.dynamic_routes[_path][method], _params
                 else:

{cheeseapi-2.0.2b1 → cheeseapi-2.0.4}/CheeseAPI/scheduler.py

@@ -158,6 +158,14 @@ class SchedulerProxy:
 
         self._tasks: dict[str, Task] = {}
 
+    def __getstate__(self):
+        return {
+            'app': self.app
+        }
+
+    def __setstate__(self, state):
+        self.app = state['app']
+
     def add(self, fn: Callable | None = None, *, interval_time: float | None = None, first_run_timer: datetime.datetime | None = None, expected_run_num: int | None = None, key: str | None = None, run_type: Literal['THREAD', 'PROCESS'] = 'THREAD', args: tuple = (), kwargs: dict = {}, auto_remove: bool = False):
         if fn is not None:
             task = Task(fn, interval_time = interval_time, first_run_timer = first_run_timer, expected_run_num = expected_run_num, key = key, run_type = run_type, args = args, kwargs = kwargs, auto_remove = auto_remove)

{cheeseapi-2.0.2b1 → cheeseapi-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CheeseAPI
-Version: 2.0.2b1
+Version: 2.0.4
 Summary: 一款web协程框架
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>

{cheeseapi-2.0.2b1 → cheeseapi-2.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "2.0.2-beta.1"
+version = "2.0.4"
 description = "一款web协程框架"
 readme = "README.md"
 license-files = { paths = [ "LICENSE" ] }