CheeseAPI 1.6.24__tar.gz → 1.7.0__tar.gz

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/app.py

@@ -1,6 +1,8 @@
 import multiprocessing, os, setproctitle, sys, multiprocessing.managers
 from typing import Dict, Any, List
 
+from dill import settings
+
 from CheeseAPI.text import Text
 from CheeseAPI.server import Server
 from CheeseAPI.workspace import Workspace
@@ -10,6 +12,9 @@ from CheeseAPI.route import Route, RouteBus
 from CheeseAPI.cors import Cors
 from CheeseAPI.schedule import Scheduler
 
+multiprocessing.set_start_method('fork', True)
+settings['protocol'] = 5
+
 class App:
     def __init__(self):
         self.manager: multiprocessing.managers.SyncManager = multiprocessing.Manager()
@@ -59,8 +64,6 @@ class App:
             self.localModules.append(foldername)
 
     def run(self):
-        multiprocessing.set_start_method('fork', True)
-
         self._handle.server_start()
 
     @property

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/file.py

@@ -48,5 +48,5 @@ class File:
 
         from CheeseAPI.app import app
 
-        with open(filePath if filePath[0] == '/' else os.path.join(app.workspace.base, filePath), 'w' if isinstance(self.data, str) else 'wb') as f:
+        with open(filePath if filePath[0] == '/' else join(app.workspace.base, filePath), 'w' if isinstance(self.data, str) else 'wb') as f:
             f.write(self.data)

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/handle.py

@@ -40,7 +40,7 @@ HTTP_STATUS_NOT_FOUND = HTTPStatus.NOT_FOUND
 HTTP_STATUS_METHOD_NOT_ALLOWED = HTTPStatus.METHOD_NOT_ALLOWED
 HTTP_STATUS_INTERNAL_SERVER_ERROR = HTTPStatus.INTERNAL_SERVER_ERROR
 HTTP_STATUS_BAD_REQUEST = HTTPStatus.BAD_REQUEST
-STATIC_INDEX_FILE_NAMES = ('', '.html', 'index.html', '/index.html')
+STATIC_INDEX_FILE_NAMES = frozenset(('', '.html', 'index.html', '/index.html'))
 STATIC_EXCEPTIONS = (FileNotFoundError, NotADirectoryError, IsADirectoryError)
 logger_danger = logger.danger
 WEBSOCKET_EXCEPTIONS = (ConnectionClosed, TimeoutError)

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/request.py

@@ -1,11 +1,11 @@
 import http
 from typing import Literal, Dict, List
 from urllib.parse import unquote
-from json import loads
 from re import findall
 
 from CheeseAPI.file import File
 from xmltodict import parse
+from orjson import loads
 
 class Request:
     def __init__(self, method: http.HTTPMethod | None, url: str):

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/response.py

@@ -1,10 +1,11 @@
-from json import dumps
 from typing import Callable, Dict, AsyncIterator, Tuple, overload, Literal
 from email.utils import formatdate
 from http import HTTPStatus
 from time import time
 from datetime import datetime, timedelta
 
+from orjson import dumps
+
 from CheeseAPI.file import File
 
 HTTPStatus_OK = HTTPStatus.OK
@@ -465,7 +466,7 @@ class JsonResponse(BaseResponse):
     '''
 
     def __init__(self, body: dict | list = {}, status: HTTPStatus | int = HTTPStatus_OK, headers: Dict[str, str] = {}):
-        super().__init__(dumps(body), status, {
+        super().__init__(dumps(body).encode(), status, {
             'Content-Type': 'application/json',
             **headers
         })

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/schedule.py

@@ -5,6 +5,7 @@ from asyncio import sleep as asyncio_sleep
 from uuid import uuid4
 from traceback import format_exc
 
+from snappy import compress, uncompress
 from CheeseLog import logger
 from dill import loads, dumps
 
@@ -14,6 +15,7 @@ if TYPE_CHECKING:
 logger_danger = logger.danger
 logger_encode = logger.encode
 datetime_now = datetime.now
+DATA_LENGTH = 1024
 
 class ScheduleTask:
     def __init__(self, app: 'App', key: str):
@@ -55,13 +57,15 @@ class ScheduleTask:
 
     @property
     def fn(self) -> Callable:
-        return loads(self._app._managers_['schedules'][self.key]['fn'])
+        fn = self._app._managers_['schedules'][self.key]['fn']
+        return loads(uncompress(memoryview(fn).toreadonly() if len(fn) >= DATA_LENGTH else fn))
 
     @fn.setter
     def fn(self, value: Callable):
+        value = dumps(value, recurse = True)
         self._app._managers_['schedules'][self.key] = {
             **self._app._managers_['schedules'][self.key],
-            'fn': dumps(value, recurse = True),
+            'fn': compress(memoryview(value).toreadonly() if len(value) >= DATA_LENGTH else value),
             'needUpdate': True
         }
 
@@ -209,7 +213,8 @@ class ScheduleTask:
         【只读】 上一次的返回值
         '''
 
-        return loads(self._app._managers_['schedules'][self.key]['lastReturn'])
+        lastReturn = self._app._managers_['schedules'][self.key]['lastReturn']
+        return loads(uncompress(memoryview(lastReturn).toreadonly() if len(lastReturn) >= DATA_LENGTH else lastReturn))
 
     @property
     def endTimer(self) -> datetime | None:
@@ -317,11 +322,12 @@ class Scheduler:
 {logger_encode(format_exc()[:-1])}''')
                     result = None
 
+                result = dumps(result, recurse = True)
                 self._app._managers_['schedules'][task.key] = {
                     **self._app._managers_['schedules'][task.key],
                     'total_repetition_num': task.total_repetition_num + 1,
                     'lastTimer': datetime_fromtimestamp(runTime),
-                    'lastReturn': dumps(result, recurse = True)
+                    'lastReturn': compress(memoryview(result).toreadonly() if len(result) >= DATA_LENGTH else result)
                 }
                 queues[0].put(True)
 
@@ -415,9 +421,10 @@ class Scheduler:
             startTimer = datetime_now()
 
         if fn:
+            fn = dumps(fn, recurse = True)
             self._app._managers_['schedules'][key] = {
                 'timer': timer,
-                'fn': dumps(fn, recurse = True),
+                'fn': compress(memoryview(fn).toreadonly() if len(fn) > DATA_LENGTH else fn),
                 'startTimer': startTimer,
                 'expected_repetition_num': expected_repetition_num,
                 'total_repetition_num': 0,
@@ -432,9 +439,10 @@ class Scheduler:
             return
 
         def wrapper(fn):
+            fn = dumps(fn, recurse = True)
             self._app._managers_['schedules'][key] = {
                 'timer': timer,
-                'fn': dumps(fn, recurse = True),
+                'fn': compress(memoryview(fn).toreadonly() if len(fn) >= DATA_LENGTH else fn),
                 'startTimer': startTimer,
                 'expected_repetition_num': expected_repetition_num,
                 'total_repetition_num': 0,

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/text.py

@@ -49,8 +49,8 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
     def loadedModules(self) -> List[Tuple[str, str]]:
         return [
             (f'''Modules:
-''' + ' | '.join(self._app.modules), f'''Modules:
-''' + ' | '.join(self._app.modules))
+{' | '.join(self._app.modules)}''', f'''Modules:
+{' | '.join(self._app.modules)}''')
         ]
 
     def loadingLocalModule(self, precent: float, module: str) -> Tuple[str, str]:
@@ -69,8 +69,8 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
 
         return [
             (f'''Local Modules:
-''' + ' | '.join(foldernames), f'''Local Modules:
-''' + ' | '.join(foldernames))
+{' | '.join(foldernames)}''', f'''Local Modules:
+{' | '.join(foldernames)}''')
         ]
 
     def worker_starting(self) -> List[Tuple[str, str]]:
@@ -85,7 +85,7 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
 
     def http(self, protocol: 'HttpProtocol') -> List[Tuple[str, str]]:
         return [
-            (f'The {protocol.request.client} accessed {protocol.request.method} {protocol.request.fullPath} and returned {protocol.response.status}', f'The <cyan>{protocol.request.client}</cyan> accessed <cyan>{protocol.request.method} ' + logger.encode(protocol.request.fullPath) + f'</cyan> and returned <blue>{protocol.response.status}</blue>')
+            (f'The {protocol.request.client} accessed {protocol.request.method} {protocol.request.fullPath} and returned {protocol.response.status}', f'The <cyan>{protocol.request.client}</cyan> accessed <cyan>{protocol.request.method} {logger.encode(protocol.request.fullPath)}</cyan> and returned <blue>{protocol.response.status}</blue>')
         ]
 
     def http_500(self, protocol: 'HttpProtocol', e: BaseException) -> List[Tuple[str, str]]:
@@ -98,7 +98,7 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
 
     def websocket_response(self, protocol: 'WebsocketProtocol') -> List[Tuple[str, str]]:
         return [
-            (f'The {protocol.request.client} accessed {protocol.request.method} {protocol.request.fullPath} and returned {protocol.response.status}', f'The <cyan>{protocol.request.client}</cyan> accessed <cyan>{protocol.request.method} ' + logger.encode(protocol.request.fullPath) + f'</cyan> and returned <blue>{protocol.response.status}</blue>')
+            (f'The {protocol.request.client} accessed {protocol.request.method} {protocol.request.fullPath} and returned {protocol.response.status}', f'The <cyan>{protocol.request.client}</cyan> accessed <cyan>{protocol.request.method} {logger.encode(protocol.request.fullPath)}</cyan> and returned <blue>{protocol.response.status}</blue>')
         ]
 
     def websocket_500(self, protocol: 'WebsocketProtocol', e: BaseException) -> List[Tuple[str, str]]:
@@ -111,12 +111,12 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
 
     def websocket_connection(self, protocol: 'WebsocketProtocol') -> List[Tuple[str, str]]:
         return [
-            (f'The {protocol.request.client} connected {protocol.request.method} {protocol.request.fullPath}', f'The <cyan>{protocol.request.client}</cyan> connected <cyan>{protocol.request.method} ' + logger.encode(protocol.request.fullPath) + f'</cyan>')
+            (f'The {protocol.request.client} connected {protocol.request.method} {protocol.request.fullPath}', f'The <cyan>{protocol.request.client}</cyan> connected <cyan>{protocol.request.method} {logger.encode(protocol.request.fullPath)}</cyan>')
         ]
 
     def websocket_disconnection(self, protocol: 'WebsocketProtocol') -> List[Tuple[str, str]]:
         return [
-            (f'The {protocol.request.client} disconnected {protocol.request.method} {protocol.request.fullPath}', f'The <cyan>{protocol.request.client}</cyan> disconnected <cyan>{protocol.request.method} ' + logger.encode(protocol.request.fullPath) + f'</cyan>')
+            (f'The {protocol.request.client} disconnected {protocol.request.method} {protocol.request.fullPath}', f'The <cyan>{protocol.request.client}</cyan> disconnected <cyan>{protocol.request.method} {logger.encode(protocol.request.fullPath)}</cyan>')
         ]
 
     def worker_stopping(self) -> List[Tuple[str, str]]:

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/CheeseAPI/validator.py

@@ -1,18 +1,18 @@
-from json import loads
 from typing import TYPE_CHECKING
 from functools import wraps
 
 from pydantic import BaseModel, ValidationError
+from orjson import loads
 
 from CheeseAPI.response import JsonResponse, Response
 
 if TYPE_CHECKING:
     from CheeseAPI.response import BaseResponse
 
-SCOPES = ('path', 'args', 'form', 'cookie', 'headers')
-SCOPES_JSON = ('form', 'args')
-JSON_PREFIX = ('{', '[')
-JSON_SUFFIX = ('}', ']')
+SCOPES = frozenset(('path', 'args', 'form', 'cookie', 'headers'))
+SCOPES_JSON = frozenset(('form', 'args'))
+JSON_PREFIX = frozenset(('{', '['))
+JSON_SUFFIX = frozenset(('}', ']'))
 
 class ValidateError(Exception):
     def __init__(self, response: 'BaseResponse' = Response(status = 400)):
@@ -56,6 +56,8 @@ def validator(validator: BaseModel):
     def wrapper(fn):
         @wraps(fn)
         async def decorator(*args, **kwargs):
+            request = kwargs['request']
+
             _kwargs = {}
             for key in validator.model_fields.keys():
                 for scope in SCOPES:
@@ -64,11 +66,11 @@ def validator(validator: BaseModel):
                             _kwargs[key] = kwargs[key]
                     elif scope == 'headers':
                         _key = key.replace('_', '-')
-                        if _key in kwargs['request'].headers:
-                            _kwargs[key] = getattr(kwargs['request'], scope)[_key]
+                        if _key in request.headers:
+                            _kwargs[key] = getattr(request, scope)[_key]
                     else:
-                        if getattr(kwargs['request'], scope) and key in getattr(kwargs['request'], scope):
-                            _kwargs[key] = getattr(kwargs['request'], scope)[key]
+                        if getattr(request, scope) and key in getattr(request, scope):
+                            _kwargs[key] = getattr(request, scope)[key]
 
                             if scope in SCOPES_JSON and _kwargs[key][0] in JSON_PREFIX and _kwargs[key][-1] in JSON_SUFFIX:
                                 try:

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CheeseAPI
-Version: 1.6.24
+Version: 1.7.0
 Summary: 一款web协程框架
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>
@@ -11,7 +11,9 @@ Requires-Dist: cheesesignal==1.2.*
 Requires-Dist: dill
 Requires-Dist: email-validator
 Requires-Dist: httptools
+Requires-Dist: orjson
 Requires-Dist: pydantic
+Requires-Dist: python-snappy
 Requires-Dist: setproctitle
 Requires-Dist: uvloop
 Requires-Dist: websockets

{cheeseapi-1.6.24 → cheeseapi-1.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "1.6.24"
+version = "1.7.0"
 description = "一款web协程框架"
 readme = "README.md"
 license-files = { paths = [ "LICENSE" ] }
@@ -23,7 +23,9 @@ dependencies = [
     "dill",
     "pydantic",
     "email-validator",
-    "setproctitle"
+    "setproctitle",
+    "orjson",
+    "python-snappy"
 ]
 
 [project.urls]