CheeseAPI 0.3.8__tar.gz → 0.3.10__tar.gz

{cheeseapi-0.3.8 → cheeseapi-0.3.10}/CheeseAPI/app.py

@@ -39,43 +39,34 @@ class App:
             'startedWorkerNum': multiprocessing.Value('i', 0)
         }
 
-    def init(self):
+    def run(self, *, managers: Dict[str, Any] = {}):
         try:
-            self._handle._initHandle(self)
+            self.managers.update(managers)
+            manager = multiprocessing.Manager()
+            self._managers['workspace.logger'] = manager.Value(str, self.workspace.logger)
+
+            self._handle._server_beforeStartingHandle(self)
+            if signal.receiver('server_beforeStartingHandle'):
+                signal.send('server_beforeStartingHandle')
+
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.bind((self.server.host, self.server.port))
+            sock.listen(self.server.backlog)
+            sock.set_inheritable(True)
+
+            multiprocessing.allow_connection_pickling()
+            for i in range(0, self.server.workers - 1):
+                process = multiprocessing.Process(target = run, args = (self, sock), name = f'CheeseAPI_subprocess')
+                process.start()
+
+            run(self, sock, True)
+
+            while self._managers['startedWorkerNum'].value != 0:
+                time.sleep(0.01)
         except Exception as e:
             sys.excepthook(Exception, e, sys.exc_info()[2])
 
-    def run(self, *, managers: Dict[str, Any] = {}):
-        if 'startTimer' not in app.g:
-            logger.error('The app has not yet been initiated')
-        else:
-            try:
-                self.managers.update(managers)
-                manager = multiprocessing.Manager()
-                self._managers['workspace.logger'] = manager.Value(str, self.workspace.logger)
-
-                self._handle._server_beforeStartingHandle(self)
-                if signal.receiver('server_beforeStartingHandle'):
-                    signal.send('server_beforeStartingHandle')
-
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-                sock.bind((self.server.host, self.server.port))
-                sock.listen(self.server.backlog)
-                sock.set_inheritable(True)
-
-                multiprocessing.allow_connection_pickling()
-                for i in range(0, self.server.workers - 1):
-                    process = multiprocessing.Process(target = run, args = (self, sock), name = f'CheeseAPI_subprocess')
-                    process.start()
-
-                run(self, sock, True)
-
-                while self._managers['startedWorkerNum'].value != 0:
-                    time.sleep(0.01)
-            except Exception as e:
-                sys.excepthook(Exception, e, sys.exc_info()[2])
-
         if signal.receiver('server_beforeStoppingHandle'):
             signal.send('server_beforeStoppingHandle')
         self._handle._server_beforeStoppingHandle(self)

{cheeseapi-0.3.8 → cheeseapi-0.3.10}/CheeseAPI/handle.py

@@ -2,7 +2,7 @@ import os, time, http, traceback, asyncio
 from typing import TYPE_CHECKING, Callable, Tuple, Dict, Any
 
 import websockets
-from CheeseLog import logger
+from CheeseLog import logger, ProgressBar
 from websockets.legacy.server import HTTPResponse
 
 from CheeseAPI.response import FileResponse, BaseResponse, Response
@@ -53,38 +53,9 @@ class Handle:
     def _exitSignalHandle(self, server):
         server.close()
 
-    def _initHandle(self, app: 'App'):
+    def _server_beforeStartingHandle(self, app: 'App'):
         app.g['startTimer'] = time.time()
 
-        moduleNum = len(app.modules)
-        if moduleNum:
-            for i in range(moduleNum):
-                Module(app.modules[i])
-
-        if app.localModules is True:
-            localModule = []
-            for foldername in os.listdir(app.workspace.base):
-                if foldername[0] == '.' or foldername == '__pycache__':
-                    continue
-                folderPath = os.path.join(app.workspace.base, foldername)
-                if os.path.isdir(folderPath):
-                    if (not app.workspace.static or not os.path.exists(os.path.join(app.workspace.base, app.workspace.static)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.static))) and (not app.workspace.log or not os.path.exists(os.path.join(app.workspace.base, app.workspace.log)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.log))) and foldername not in app.exclude_localModules:
-                        localModule.append(foldername)
-            app.localModules = localModule
-        else:
-            app.preferred_localModules = []
-        localModuleNum = len(app.localModules)
-        if localModuleNum:
-            for module in app.preferred_localModules:
-                LocalModule(app.workspace.base, module)
-            for module in app.localModules:
-                if module not in app.preferred_localModules:
-                    LocalModule(app.workspace.base, module)
-
-        if signal.receiver('afterInitHandle'):
-            signal.send('afterInitHandle')
-
-    def _server_beforeStartingHandle(self, app: 'App'):
         logger.starting(f'The master process {os.getpid()} started', f'The master process <blue>{os.getpid()}</blue> started')
 
         logger.starting(f'''Workspace information:
@@ -109,13 +80,51 @@ Port: <blue>{app.server.port}</blue>
 Workers: <blue>{app.server.workers}</blue>''' + (f'''
 Static: <cyan>{app.server.static}</cyan>''' if app.server.static else ''))
 
-        if app.modules:
+        moduleNum = len(app.modules)
+        if moduleNum:
+            progressBar = ProgressBar()
+            message, styledMessage = progressBar(0)
+            logger.loading(message, styledMessage, refreshed = False)
+            for i in range(moduleNum):
+                Module(app.modules[i])
+                message, styledMessage = progressBar((i + 1) / moduleNum)
+                logger.loading('Modules: ' + message + ' ' + app.modules[i], 'Modules: ' + styledMessage + ' ' + app.modules[i])
+
             logger.loaded(f'''Modules:
-''' + ' | '.join(app.modules))
+''' + ' | '.join(app.modules), refreshed = True)
+
+        if app.localModules is True:
+            localModule = []
+            for foldername in os.listdir(app.workspace.base):
+                if foldername[0] == '.' or foldername == '__pycache__':
+                    continue
+                folderPath = os.path.join(app.workspace.base, foldername)
+                if os.path.isdir(folderPath):
+                    if (not app.workspace.static or not os.path.exists(os.path.join(app.workspace.base, app.workspace.static)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.static))) and (not app.workspace.log or not os.path.exists(os.path.join(app.workspace.base, app.workspace.log)) or not os.path.samefile(folderPath, os.path.join(app.workspace.base, app.workspace.log))) and foldername not in app.exclude_localModules:
+                        localModule.append(foldername)
+            app.localModules = localModule
+        else:
+            app.preferred_localModules = []
+        localModuleNum = len(app.localModules)
+        if localModuleNum:
+            progressBar = ProgressBar()
+            i = 0
+            message, styledMessage = progressBar(i / localModuleNum)
+            logger.loading(message, styledMessage, refreshed = False)
+            for module in app.preferred_localModules:
+                LocalModule(app.workspace.base, module)
+                i += 1
+                message, styledMessage = progressBar(i / localModuleNum)
+                logger.loading('Local Modules: ' + message + ' ' + module, 'Local Modules: ' + styledMessage + ' ' + module)
+            for module in app.localModules:
+                if module not in app.preferred_localModules:
+                    LocalModule(app.workspace.base, module)
+                    i += 1
+                    message, styledMessage = progressBar(i / localModuleNum)
+                    logger.loading('Local Modules: ' + message + ' ' + module, 'Local Modules: ' + styledMessage + ' ' + module)
 
-        if app.localModules:
             logger.loaded(f'''Local Modules:
-''' + ' | '.join(app.localModules))
+''' + ' | '.join(app.localModules), refreshed = True)
 
     def _worker_beforeStartingHandle(self):
         logger.debug(f'The subprocess {os.getpid()} started', f'The subprocess <blue>{os.getpid()}</blue> started')

{cheeseapi-0.3.8 → cheeseapi-0.3.10}/CheeseAPI/signal.py

@@ -37,7 +37,6 @@ blinker.Signal.set_class = OrderedSet
 
 signal = Signal()
 
-signal.register('afterInitHandle')
 signal.register('server_beforeStartingHandle')
 signal.register('worker_beforeStartingHandle')
 signal.register('worker_afterStartingHandle')

{cheeseapi-0.3.8 → cheeseapi-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CheeseAPI
-Version: 0.3.8
+Version: 0.3.10
 Summary: 一款web协程框架。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>
@@ -56,10 +56,7 @@ from CheeseAPI import app, Response
 async def test(**kwargs):
     return Response('您好，这里是CheeseAPI！')
 
-app.init() # 初始化app
-
-if __name__ == '__main__':
-    app.run() # 默认的启动地址：'0.0.0.0'，默认的启动端口：5214
+app.run() # 默认的启动地址：0.0.0.0，默认的启动端口：5214
 ```
 
 运行`app.py`，可以看到打印了一些基础信息，当当前代码的最后一行启动时，代表系统已经可以访问：
@@ -80,8 +77,6 @@ $ python app.py
 (STARTING) 2023-08-24 12:20:56.939158 > The server started on http://0.0.0.0:5214
 ```
 
-请不要在尚未完全启动时关闭服务器，这可能导致部分进程无法被销毁。
-
 使用`ctrl + c`或`kill <pid>`杀死进程，会打印完剩下的内容：
 
 ```bash
@@ -115,6 +110,7 @@ CheeseAPI采用类Django的结构：
 | model.py | 模型类 |
 | api.py | api接口 |
 | service.py | 业务逻辑实现 |
+| model.py | ORM |
 | handle.py | 初始化逻辑 |
 
 ## **更多...**

{cheeseapi-0.3.8 → cheeseapi-0.3.10}/README.md

@@ -39,10 +39,7 @@ from CheeseAPI import app, Response
 async def test(**kwargs):
     return Response('您好，这里是CheeseAPI！')
 
-app.init() # 初始化app
-
-if __name__ == '__main__':
-    app.run() # 默认的启动地址：'0.0.0.0'，默认的启动端口：5214
+app.run() # 默认的启动地址：0.0.0.0，默认的启动端口：5214
 ```
 
 运行`app.py`，可以看到打印了一些基础信息，当当前代码的最后一行启动时，代表系统已经可以访问：
@@ -63,8 +60,6 @@ $ python app.py
 (STARTING) 2023-08-24 12:20:56.939158 > The server started on http://0.0.0.0:5214
 ```
 
-请不要在尚未完全启动时关闭服务器，这可能导致部分进程无法被销毁。
-
 使用`ctrl + c`或`kill <pid>`杀死进程，会打印完剩下的内容：
 
 ```bash
@@ -98,6 +93,7 @@ CheeseAPI采用类Django的结构：
 | model.py | 模型类 |
 | api.py | api接口 |
 | service.py | 业务逻辑实现 |
+| model.py | ORM |
 | handle.py | 初始化逻辑 |
 
 ## **更多...**

{cheeseapi-0.3.8 → cheeseapi-0.3.10}/pyproject.toml

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