CheeseAPI 1.1.4__tar.gz → 1.2.0__tar.gz

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/CheeseAPI/__init__.py

@@ -1,3 +1,4 @@
+from CheeseAPI import exception
 from CheeseAPI.app import app
 from CheeseAPI.file import File
 from CheeseAPI.request import Request

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/CheeseAPI/handle.py

@@ -87,7 +87,7 @@ class Handle:
 
     def loadLocalModules(self):
         foldernames = self._app.localModules.copy()
-        for foldername in self._app.preferred_localModules:
+        for foldername in reversed(self._app.preferred_localModules):
             if foldername in foldernames:
                 foldernames.remove(foldername)
                 foldernames.insert(0, foldername)

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/CheeseAPI/protocol.py

@@ -62,7 +62,8 @@ class HttpProtocol(asyncio.Protocol):
             self.request._body = b''
         self.request._body += body
 
-        if len(self.request.body) == int(self.request.headers.get('Content-Length', 0)):
+    def on_message_complete(self):
+        if not self.parser.should_upgrade():
             self.request._parseBody()
             asyncio.get_event_loop().create_task(app._handle.http(self))
 

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/CheeseAPI/schedule.py

@@ -233,7 +233,7 @@ class Scheduler:
         if fn:
             self._app._managers_['schedules'][key] = {
                 'timer': timer,
-                'fn': dill.dumps(fn),
+                'fn': dill.dumps(fn, recurse = True),
                 'startTimer': startTimer,
                 'expected_repetition_num': expected_repetition_num,
                 'total_repetition_num': 0,
@@ -242,10 +242,10 @@ class Scheduler:
             }
             return
 
-        def decorator(fn):
+        def wrapper(fn):
             self._app._managers_['schedules'][key] = {
                 'timer': timer,
-                'fn': dill.dumps(fn),
+                'fn': dill.dumps(fn, recurse = True),
                 'startTimer': startTimer,
                 'expected_repetition_num': expected_repetition_num,
                 'total_repetition_num': 0,
@@ -253,7 +253,7 @@ class Scheduler:
                 'active': True
             }
             return fn
-        return decorator
+        return wrapper
 
     @overload
     def remove(self, fn: Callable):

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/CheeseAPI/text.py

@@ -153,8 +153,8 @@ Static: <cyan>{self._app.server.static}</cyan>''' if self._app.workspace.static
     def validator_requiredMessage(self, scope: str, key: str) -> str:
         return f'The {scope}.{key} is required'
 
-    def validator_typeMessage(self, scope: str, key: str, expected_type: object) -> str:
-        return f'The {scope}.{key} cannot be converted to {expected_type.__name__}'
+    def validator_typeMessage(self, scope: str, key: str, expected_type: str) -> str:
+        return f'The {scope}.{key} cannot be converted to {expected_type}'
 
     def validator_patternMessage(self, scope: str, key: str) -> str:
         return f'The {scope}.{key} regular check error'

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/CheeseAPI/validator.py

@@ -9,12 +9,12 @@ if TYPE_CHECKING:
     from CheeseAPI.app import App
 
 class ValidateError(Exception):
-    def __init__(self, response: BaseResponse = Response('校验错误', 400)):
+    def __init__(self, response: BaseResponse | None = None):
         '''
         在自定义校验函数中抛出此错误，可结束校验并直接返回响应体。
         '''
 
-        self.response = response
+        self.response: BaseResponse | None = response
 
 class Bool:
     '''
@@ -40,8 +40,8 @@ class Validator:
         *,
         required: bool = False,
         default: Any = None,
-        type: List[object | Callable] | object | Callable | None = None,
-        expected_type: object | None = None,
+        type: List[object | Callable] | object | Callable = str,
+        expected_type: str | None = None,
         pattern: str | None = None,
         min: object | None = None,
         max: object | None = None,
@@ -57,7 +57,7 @@ class Validator:
 
         from CheeseAPI import Validator
 
-        Validator('form', 'date', type = [ float, datetime.datetime.fromtimestamp ], expected_type = datetime.datetime)
+        Validator('form', 'date', type = [ float, datetime.datetime.fromtimestamp ], expected_type = 'timestamp')
 
         Validator('form', 'gender', enum = [ 'man', 'woman', None ])
 
@@ -70,7 +70,7 @@ class Validator:
 
             - type: 遵循`self.type(value) -> object`的类或函数；支持list按顺序转换类型。
 
-            - expected_type: 期望的数据类型，对type转换后的结果进行二次校验。
+            - expected_type: 期望的数据类型，不参与校验，仅供提示。
 
             - default: 默认值；该值仍会执行校验流程，而不是直接应用。
 
@@ -101,7 +101,7 @@ class Validator:
         self._scope: Literal['form', 'headers', 'args', 'path', 'cookie'] = scope
         self.key: str = key
         self._type: List[object | Callable] | object | Callable = type
-        self._expected_type: object = type if expected_type is None else expected_type
+        self._expected_type: str = type.__name__ if expected_type is None else expected_type
         self.required: bool = required
         self._default: Any = default
         self._pattern: str | None = pattern
@@ -132,8 +132,6 @@ class Validator:
                             validatedForm[f'{self.scope}.{self.key}'] = type(validatedForm[f'{self.scope}.{self.key}'])
                     else:
                         validatedForm[f'{self.scope}.{self.key}'] = self.type(validatedForm[f'{self.scope}.{self.key}'])
-                    if not isinstance(validatedForm[f'{self.scope}.{self.key}'], self.expected_type):
-                        raise Exception()
                 except:
                     raise ValidateError(self.response or Response(app._text.validator_typeMessage(self.scope, self.key, self.expected_type), 400))
 
@@ -150,13 +148,16 @@ class Validator:
                 raise ValidateError(self.response or Response(app._text.validator_enumMessage(self.scope, self.key, self.enum), 400))
 
             if self.fn:
-                _value = await self.fn(*args, **{
-                    'request': request,
-                    'validatedForm': validatedForm,
-                    **kwargs
-                })
-                if _value is not None:
-                    validatedForm[f'{self.scope}.{self.key}'] = _value
+                try:
+                    _value = await self.fn(*args, **{
+                        'request': request,
+                        'validatedForm': validatedForm,
+                        **kwargs
+                    })
+                    if _value is not None:
+                        validatedForm[f'{self.scope}.{self.key}'] = _value
+                except ValidateError as e:
+                    raise ValidateError(e.response or self.response or Response(status = 500))
 
     @property
     def scope(self) -> Literal['form', 'headers', 'args', 'path', 'cookie']:
@@ -193,16 +194,16 @@ class Validator:
         self._type = value
 
     @property
-    def expected_type(self) -> object:
+    def expected_type(self) -> str:
         '''
-        期望的数据类型，对type转换后的结果进行二次校验。
+        期望的数据类型，不参与校验，仅供提示。
         '''
 
         return self._expected_type
 
     @expected_type.setter
-    def expected_type(self, value: object | None):
-        self._expected_type = self.type if value is None else value
+    def expected_type(self, value: str | None):
+        self._expected_type = self.type.__name__ if value is None else value
 
     @property
     def default(self) -> Any:
@@ -303,7 +304,7 @@ def validator(validators: List[Validator]):
     @app.route.get('/')
     @validator([
         Validator('form', 'name', required = True),
-        Validator('form', 'birthDate', type = [ float, datetime.datetime.fromtimestamp ], expected_type = datetime.datetime, fn = birthDateValidator),
+        Validator('form', 'birthDate', type = [ float, datetime.datetime.fromtimestamp ], expected_type = 'timestamp', fn = birthDateValidator),
         Validator('form', 'gender', enum = [ 'man', 'woman', None ]),
         Validator('form', 'idCard', pattern = r'^[1-9]\\d{5}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\\d|3[0-1])\\d{3}[\\dXx]$', response = Response('身份证格式错误', 400))
     ])
@@ -327,7 +328,7 @@ def validator(validators: List[Validator]):
     @app.route.get('/')
     @validator([
         Validator('form', 'name', required = True),
-        Validator('form', 'birthDate', type = [ float, datetime.datetime.fromtimestamp ], expected_type = datetime.datetime),
+        Validator('form', 'birthDate', type = [ float, datetime.datetime.fromtimestamp ], expected_type = 'timestamp'),
         Validator('form', 'gender', enum = [ 'man', 'woman', None ]),
         Validator('form', 'idCard', pattern = r'^[1-9]\\d{5}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\\d|3[0-1])\\d{3}[\\dXx]$', response = Response('身份证格式错误', 400)),
         Validator('form', 'birthDate', fn = birthDateValidator)

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: CheeseAPI
-Version: 1.1.4
+Version: 1.2.0
 Summary: 一款web协程框架。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>
@@ -96,7 +96,8 @@ from CheeseAPI import app, Response
 async def index(**kwargs):
     return Response('这里是CheeseAPI！')
 
-app.run()
+if __name__ == '__main__':
+    app.run()
 ```
 
 运行`app.py`，可以看到打印了一些服务器的基本信息：

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/README.md

@@ -79,7 +79,8 @@ from CheeseAPI import app, Response
 async def index(**kwargs):
     return Response('这里是CheeseAPI！')
 
-app.run()
+if __name__ == '__main__':
+    app.run()
 ```
 
 运行`app.py`，可以看到打印了一些服务器的基本信息：

{cheeseapi-1.1.4 → cheeseapi-1.2.0}/pyproject.toml

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