CheeseAPI 0.0.4__tar.gz → 0.0.6__tar.gz

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/CheeseAPI/__init__.py

@@ -1,4 +1,4 @@
-from .app import app
+from .app import app, doFunc
 from .route import Route
 from .response import Response, JsonResponse, RedirectResponse, FileResponse
 from .request import Request

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/CheeseAPI/app.py

@@ -14,6 +14,17 @@ from .websocket import websocket
 from .module import LocalModule, Module
 from .cSignal import signal
 
+async def doFunc(func: Callable, kwargs: Dict[str, Any] = {}):
+    _kwargs = {}
+    sig = inspect.signature(func)
+    for key, value in kwargs.items():
+        if key in sig.parameters or 'kwargs' in sig.parameters:
+            _kwargs[key] = value
+    if inspect.iscoroutinefunction(func):
+        return await func(**_kwargs)
+    else:
+        return func(**_kwargs)
+
 class App:
     def __init__(self):
         self.startTimer: float = time.time()
@@ -128,7 +139,7 @@ class App:
                         if signal.receiver('http_response404Handle'):
                             await signal.send_async('http_response404Handle', kwargs)
                         for http_response404Handle in self.http_response404Handles:
-                            _response = await self.doFunc(http_response404Handle, kwargs)
+                            _response = await doFunc(http_response404Handle, kwargs)
                             if isinstance(_response, BaseResponse):
                                 response = _response
                         if not isinstance(response, BaseResponse):
@@ -139,7 +150,7 @@ class App:
                         if signal.receiver('http_response405Handle'):
                             await signal.send_async('http_response405Handle', kwargs)
                         for http_response405Handle in self.http_response405Handles:
-                            _response = await self.doFunc(http_response405Handle, kwargs)
+                            _response = await doFunc(http_response405Handle, kwargs)
                             if isinstance(_response, BaseResponse):
                                 response = _response
                         if not isinstance(response, BaseResponse):
@@ -150,20 +161,20 @@ class App:
                         if signal.receiver('http_beforeRequestHandle'):
                             await signal.send_async('http_beforeRequestHandle', kwargs)
                         for http_beforeRequestHandle in self.http_beforeRequestHandles:
-                            _response = await self.doFunc(http_beforeRequestHandle, kwargs)
+                            _response = await doFunc(http_beforeRequestHandle, kwargs)
                             if isinstance(_response, BaseResponse):
                                 response = _response
 
                         if not isinstance(response, BaseResponse):
                             requestFunc = requestFunc[request.method]
-                            response = await self.doFunc(requestFunc, kwargs)
+                            response = await doFunc(requestFunc, kwargs)
 
                         if isinstance(response, BaseResponse):
                             if signal.receiver('http_afterResponseHandle'):
                                 await signal.send_async('http_afterResponseHandle', kwargs)
                             for http_afterResponseHandle in self.http_afterResponseHandles:
                                 kwargs['response'] = response
-                                _response = await self.doFunc(http_afterResponseHandle, kwargs)
+                                _response = await doFunc(http_afterResponseHandle, kwargs)
                                 if isinstance(_response, BaseResponse):
                                     response = _response
                         else:
@@ -175,7 +186,7 @@ class App:
                     await signal.send_async('http_response500Handle', kwargs)
                 for http_response500Handle in self.http_response500Handles:
                     kwargs['exception'] = e
-                    _response = await self.doFunc(http_response500Handle, kwargs)
+                    _response = await doFunc(http_response500Handle, kwargs)
                     if isinstance(_response, BaseResponse):
                         response = _response
                 if not isinstance(response, BaseResponse):
@@ -236,14 +247,14 @@ class App:
                 kwargs['request'] = request
                 if requestFunc is None or 'WEBSOCKET' not in requestFunc:
                     for websocket_notFoundHandle in self.websocket_notFoundHandles:
-                        await self.doFunc(websocket_notFoundHandle, kwargs)
+                        await doFunc(websocket_notFoundHandle, kwargs)
                     return
                 requestFunc = requestFunc['WEBSOCKET']
 
                 if signal.receiver('websocket_beforeConnectionHandle'):
                     await signal.send_async('websocket_beforeConnectionHandle', kwargs)
                 for websocket_beforeConnectionHandle in self.websocket_beforeConnectionHandles:
-                    await self.doFunc(websocket_beforeConnectionHandle, kwargs)
+                    await doFunc(websocket_beforeConnectionHandle, kwargs)
 
                 await send({
                     'type': 'websocket.accept'
@@ -268,7 +279,7 @@ class App:
                                 kwargs['value'] = message['text']
                             elif 'bytes' in message:
                                 kwargs['value'] = message['bytes']
-                            await self.doFunc(requestFunc, kwargs)
+                            await doFunc(requestFunc, kwargs)
                         elif message['type'] == 'websocket.disconnect':
                             del websocket._CLIENTS[request.sid]
                             task.cancel()
@@ -279,23 +290,12 @@ class App:
                 if signal.receiver('websocket_afterDisconnectHandle'):
                     await signal.send_async('websocket_afterDisconnectHandle', kwargs)
                 for websocket_afterDisconnectHandle in self.websocket_afterDisconnectHandles:
-                    await self.doFunc(websocket_afterDisconnectHandle, kwargs)
+                    await doFunc(websocket_afterDisconnectHandle, kwargs)
             except Exception as e:
                 CheeseLog.danger(f'The error occured while accessing the WEBSOCKET {request.fullPath}\n{traceback.format_exc()}'[:-1], f'The error occured while accessing the \033[36mWEBSOCKET {request.fullPath}\033[0m\n{traceback.format_exc()}'[:-1])
                 for websocket_errorHandle in self.websocket_errorHandles:
                     kwargs['exception'] = e
-                    await self.doFunc(websocket_errorHandle, kwargs)
-
-    async def doFunc(self, func: Callable, kwargs: Dict[str, Any] = {}):
-        _kwargs = {}
-        sig = inspect.signature(func)
-        for key, value in kwargs.items():
-            if key in sig.parameters or 'kwargs' in sig.parameters:
-                _kwargs[key] = value
-        if inspect.iscoroutinefunction(func):
-            return await func(**_kwargs)
-        else:
-            return func(**_kwargs)
+                    await doFunc(websocket_errorHandle, kwargs)
 
     def server_startingHandle(self, func: Callable):
         self.server_startingHandles.append(func)

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/CheeseAPI/command.py

@@ -1,7 +1,9 @@
-import argparse, time, os, traceback, json, shutil
+import argparse, time, os, traceback, json, shutil, importlib, importlib.util
 
 import CheeseLog, uvicorn, CheeseType, CheeseType.network, uvicorn.importer
 
+from .module import Module, LocalModule
+
 def command():
     from .app import app
     from .cSignal import signal
@@ -9,9 +11,9 @@ def command():
     parser = argparse.ArgumentParser()
     parser.add_argument('--app', nargs = '?', default = 'app:app', help = '服务器本服务【默认值：app:app】')
     parser.add_argument('--host', nargs = '?', default = '127.0.0.1', help = '服务器地址【默认值：127.0.0.1】')
-    parser.add_argument('--port', nargs = '?', default = 5214, help = '端口号【默认值：5214】')
-    parser.add_argument('--reload', nargs = '?', default = False, help = '热更新。与workers冲突【默认值：False】')
-    parser.add_argument('--workers', nargs = '?', default = 1, help = 'workers为0时会自动设置为cpu核数*2。与reload冲突【默认值：1】')
+    parser.add_argument('--port', type = int, nargs = '?', default = 5214, help = '端口号【默认值：5214】')
+    parser.add_argument('--reload', action='store_true', help = '热更新。与workers冲突【默认值：False】')
+    parser.add_argument('--workers', type = int, nargs = '?', default = 1, help = 'workers为0时会自动设置为cpu核数*2。与reload冲突【默认值：1】')
     parser.add_argument('--log_path', nargs = '?', default = '/logs/', help = '日志文件夹的相对路径【默认值：/logs/】')
     parser.add_argument('--log_filename', nargs = '?', default = False, help = '日志文件名。当值为True时，自动设置为%%Y_%%m_%%d-%%H_%%M_%%S.log；当值为False，关闭日志文件记录；自定义文件名也是允许的【默认值：True】')
     args = parser.parse_args()
@@ -29,6 +31,9 @@ def command():
     except:
         ...
 
+    if reload:
+        workers = 1
+
     app.workspace.LOG_PATH = log_path
     app.server.LOG_FILENAME = log_filename
     app.server.HOST = host
@@ -101,6 +106,34 @@ current log file path: \033[4;36m.{app.logger.filePath[len(app.workspace.BASE_PA
 
     CheeseLog.starting(f'The server running on http://{app.server.HOST}:{app.server.PORT}', f'The server running on \033[4;36mhttp://{app.server.HOST}:{app.server.PORT}\033[0m')
 
+    import sys
+    sys.path.append(os.getcwd())
+    app = eval(f'__import__(\'{_app.split(":")[0]}\').{_app.split(":")[1]}')
+
+    _modules = set()
+    if len(app.modules):
+        CheeseLog.starting(f'Modules:\n{" | ".join(app.modules)}')
+    for module in app.modules:
+        _modules.add(Module(_modules, module))
+    app.modules = _modules
+
+    if app.localModules is True:
+        app.localModules = set()
+        for folderName in os.listdir(app.workspace.BASE_PATH):
+            if folderName[0] == '.':
+                continue
+            if folderName in app.exclude_localModules:
+                continue
+            folderPath = os.path.join(app.workspace.BASE_PATH, folderName)
+            if os.path.isdir(folderPath) and folderPath not in [ app.workspace.BASE_PATH + app.workspace.STATIC_PATH[:-1], app.workspace.BASE_PATH + app.workspace.MEDIA_PATH[:-1], app.workspace.BASE_PATH + app.workspace.LOG_PATH[:-1], app.workspace.BASE_PATH + '/__pycache__' ]:
+                app.localModules.add(folderName)
+    if len(app.localModules):
+        CheeseLog.starting(f'Local modules:\n{" | ".join(app.localModules)}')
+    _localModules = set()
+    for module in app.localModules:
+        _localModules.add(LocalModule(app.workspace.BASE_PATH, module))
+    app.localModules = _localModules
+
     if signal.receiver('server_startingHandle'):
         signal.send('server_startingHandle')
     for server_startingHandle in app.server_startingHandles:

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/CheeseAPI/request.py

@@ -16,46 +16,6 @@ class BaseItem:
             return default
         return self._values[key]
 
-class Args(BaseItem):
-    def __init__(self, query: str):
-        super().__init__()
-
-        for q in query.split('&'):
-            q = q.split('=')
-            self._values[q[0]] = q[1] if len(q) > 1 else None
-
-class Form(BaseItem):
-    @overload
-    def __init__(self):
-        ...
-
-    @overload
-    def __init__(self, body: str):
-        ...
-
-    @overload
-    def __init__(self, body: bytes, spliter: bytes):
-        ...
-
-    def __init__(self, body: str | bytes | None = None, spliter: bytes | None = None):
-        super().__init__()
-
-        if body and not spliter:
-            for s in body.split('&'):
-                s = s.split('=')
-                self._values[s[0]] = s[1]
-
-        elif body and spliter:
-            body = body[2:-4].split(spliter)[1:-1]
-            for s in body:
-                key = re.findall(rb'\bname="(.*?)"', s)[0].decode()
-                value = s.split(b'\r\n\r\n')[1][:-4]
-                filename = re.findall(rb'\bfilename="(.*?)"', s)
-                if len(filename):
-                    self._values[key] = File(filename[0].decode(), value)
-                else:
-                    self._values[key] = value.decode()
-
 class Request:
     def __init__(self, scope, body: bytes | None = None):
         query_string = scope['query_string'].decode()
@@ -69,9 +29,12 @@ class Request:
 
         if scope['type'] in [ 'http', 'https' ]:
             self.method: str = scope['method']
-            self.args = Args(query_string)
+            self.args: Dict[str, str] = {}
+            for q in query_string.split('&'):
+                q = q.split('=')
+                self.args[q[0]] = q[1] if len(q) > 1 else None
             self.body = None
-            self.form: Form = Form()
+            self.form: Dict[str, str] = {}
             for header in scope['headers']:
                 key = header[0].decode()
                 value = header[1].decode()
@@ -85,9 +48,20 @@ class Request:
                         elif value in [ 'text/plain', 'text/html' ]:
                             self.body = body.decode()
                         elif value.startswith('multipart/form-data;'):
-                            self.form = Form(body, header[1].split(b'boundary=')[1].split(b';')[0])
+                            spliter = header[1].split(b'boundary=')[1].split(b';')[0]
+                            body = body[2:-4].split(spliter)[1:-1]
+                            for s in body:
+                                key = re.findall(rb'\bname="(.*?)"', s)[0].decode()
+                                value = s.split(b'\r\n\r\n')[1][:-4]
+                                filename = re.findall(rb'\bfilename="(.*?)"', s)
+                                if len(filename):
+                                    self.form[key] = File(filename[0].decode(), value)
+                                else:
+                                    self.form[key] = value.decode()
                         elif value == 'application/x-www-form-urlencoded':
-                            self.form = Form(body.decode())
+                            for s in body.decode().split('&'):
+                                s = s.split('=')
+                                self.form[s[0]] = s[1]
                     except:
                         CheeseLog.danger(f'{self.method} {self.fullPath} cannot parse request.body correctly:\n{traceback.format_exc()}'[:-1], f'\033[36m{self.method} {self.fullPath}\033[0m cannot parse request.body correctly:\n{traceback.format_exc()}'[:-1])
         else:

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/CheeseAPI/server.py

@@ -41,7 +41,8 @@ class Server:
             if not self._IS_DEBUG:
                 self._app.logger.filter.add('DEBUG')
             elif self._IS_DEBUG:
-                self._app.logger.filter.remove('DEBUG')
+                if 'DEBUG' in self._app.logger.filter:
+                    self._app.logger.filter.remove('DEBUG')
 
     @property
     def IS_REQUEST_LOGGED(self) -> bool:
@@ -55,8 +56,10 @@ class Server:
                 self._app.logger.filter.add('HTTP')
                 self._app.logger.filter.add('WEBSOCKET')
             elif self._IS_REQUEST_LOGGED:
-                self._app.logger.filter.remove('HTTP')
-                self._app.logger.filter.add('WEBSOCKET')
+                if 'HTTP' in self._app.logger.filter:
+                    self._app.logger.filter.remove('HTTP')
+                if 'WEBSOCKET' in self._app.logger.filter:
+                    self._app.logger.filter.remove('WEBSOCKET')
 
     @property
     def LOG_FILENAME(self) -> str | bool:

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/CheeseAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheeseAPI
-Version: 0.0.4
+Version: 0.0.6
 Summary: 一款基于uvicorn的web协程框架
 Home-page: https://github.com/CheeseUnknown/CheeseAPI
 Author: Cheese Unknown
@@ -15,7 +15,9 @@ License-File: LICENSE
 
 # **CheeseAPI**
 
-请注意，该文档是最新的beta版，如果你想要查看最新的发布版内容，请查看最新的tag。
+目前项目仍处于开发阶段，无法保证稳定性。
+
+该文档是最新的beta版，如果你想要查看最新的发布版内容，请查看最新的tag。
 
 ## **介绍**
 
@@ -217,7 +219,7 @@ route = Route('/User', app.route)
 def register(request: Request):
     nickname = request.form.get('nickname')
     password = request.form.get('password')
-    gender = Gender(request.form.get('gender', 2))
+    gender = Gender(int(request.form.get('gender', 2)))
     service.register(nickname, password, gender)
     return Response('注册成功！')
 

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheeseAPI
-Version: 0.0.4
+Version: 0.0.6
 Summary: 一款基于uvicorn的web协程框架
 Home-page: https://github.com/CheeseUnknown/CheeseAPI
 Author: Cheese Unknown
@@ -15,7 +15,9 @@ License-File: LICENSE
 
 # **CheeseAPI**
 
-请注意，该文档是最新的beta版，如果你想要查看最新的发布版内容，请查看最新的tag。
+目前项目仍处于开发阶段，无法保证稳定性。
+
+该文档是最新的beta版，如果你想要查看最新的发布版内容，请查看最新的tag。
 
 ## **介绍**
 
@@ -217,7 +219,7 @@ route = Route('/User', app.route)
 def register(request: Request):
     nickname = request.form.get('nickname')
     password = request.form.get('password')
-    gender = Gender(request.form.get('gender', 2))
+    gender = Gender(int(request.form.get('gender', 2)))
     service.register(nickname, password, gender)
     return Response('注册成功！')
 

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/README.md

@@ -1,6 +1,8 @@
 # **CheeseAPI**
 
-请注意，该文档是最新的beta版，如果你想要查看最新的发布版内容，请查看最新的tag。
+目前项目仍处于开发阶段，无法保证稳定性。
+
+该文档是最新的beta版，如果你想要查看最新的发布版内容，请查看最新的tag。
 
 ## **介绍**
 
@@ -202,7 +204,7 @@ route = Route('/User', app.route)
 def register(request: Request):
     nickname = request.form.get('nickname')
     password = request.form.get('password')
-    gender = Gender(request.form.get('gender', 2))
+    gender = Gender(int(request.form.get('gender', 2)))
     service.register(nickname, password, gender)
     return Response('注册成功！')
 

{CheeseAPI-0.0.4 → CheeseAPI-0.0.6}/setup.py

@@ -5,7 +5,7 @@ with open('./README.md', 'r', encoding = 'utf-8') as f:
 
 setuptools.setup(
     name = 'CheeseAPI',
-    version = '0.0.4',
+    version = '0.0.6',
     author = 'Cheese Unknown',
     author_email = 'cheese@cheese.ren',
     description = '一款基于uvicorn的web协程框架',