CheeseAPI 1.3.2__tar.gz → 1.4.0__tar.gz

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/CheeseAPI/handle.py

@@ -1,4 +1,4 @@
-import time, os, inspect, socket, multiprocessing, signal, http, ipaddress, datetime, traceback
+import time, os, inspect, socket, multiprocessing, signal, http, ipaddress, datetime, traceback, threading
 from typing import TYPE_CHECKING, Dict, Tuple, List
 
 import asyncio, uvloop, setproctitle, websockets
@@ -10,6 +10,7 @@ from CheeseAPI.exception import Route_404_Exception, Route_405_Exception
 if TYPE_CHECKING:
     from CheeseAPI.app import App
     from CheeseAPI.protocol import HttpProtocol, WebsocketProtocol
+    from CheeseAPI.schedule import ScheduleTask
 
 class Handle:
     def __init__(self, app: 'App'):
@@ -149,7 +150,6 @@ class Handle:
             logger.error(f'''
 {logger.encode(traceback.format_exc()[:-1])}''')
         finally:
-            logger.destroy()
             os.killpg(os.getpid(), signal.SIGKILL)
 
     def worker_beforeStarting(self):
@@ -243,18 +243,38 @@ class Handle:
             return
 
         timer = datetime.datetime.now()
+        tasks: List[ScheduleTask] = []
 
         for task in self._app.scheduler.tasks.values():
-            triggeredTimer = task.startTimer + task.timer * task.total_repetition_num
-
-            if (self._timer < triggeredTimer < timer or self._timer > triggeredTimer + task.timer) and task.active and task.is_unexpired:
-                self._app._managers_['schedules'][task.key] = {
-                    **self._app._managers_['schedules'][task.key],
-                    'total_repetition_num': task.total_repetition_num + 1
-                }
-                await task.fn()
-                if task.is_expired and task.auto_remove:
-                    self._app.scheduler.remove(task.key)
+            if task.inactive or task.expired:
+                continue
+
+            if task.mode == 'multiprocessing':
+                if task.key not in self._app.scheduler._taskHandlers:
+                    self._app.scheduler._taskHandlers[task.key] = multiprocessing.Process(target = self._app.scheduler._processHandle, args = (task.key, ), name = f'{setproctitle.getproctitle()}:SchedulerTask:{task.key}', daemon = True)
+                    self._app.scheduler._taskHandlers[task.key].start()
+            elif task.mode == 'threading':
+                if task.key not in self._app.scheduler._taskHandlers:
+                    self._app.scheduler._taskHandlers[task.key] = threading.Thread(target = self._app.scheduler._processHandle, args = (task.key, ), name = f'{setproctitle.getproctitle()}:SchedulerTask:{task.key}', daemon = True)
+                    self._app.scheduler._taskHandlers[task.key].start()
+            elif task.mode == 'asyncio':
+                triggeredTimer = task.startTimer + task.timer * task.total_repetition_num
+
+                if (self._timer < triggeredTimer < timer or self._timer > triggeredTimer + task.timer):
+                    tasks.append(task)
+
+        for task in tasks:
+            self._app._managers_['schedules'][task.key] = {
+                **self._app._managers_['schedules'][task.key],
+                'total_repetition_num': task.total_repetition_num + 1,
+                'lastTimer': timer
+            }
+
+        await asyncio.gather(*[ task.fn() for task in tasks ])
+
+        for task in self._app.scheduler.tasks.values():
+            if task.expired and task.auto_remove:
+                self._app.scheduler.remove(task.key)
 
         self._timer = timer
 

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/CheeseAPI/request.py

@@ -37,7 +37,7 @@ class Request:
         self._method = 'WEBSOCKET'
 
     def _parseBody(self):
-        if 'Content-Type' not in self.headers:
+        if 'Content-Type' not in self.headers or self.body is None:
             return
 
         if 'application/json' in self.headers['Content-Type']:

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/CheeseAPI/response.py

@@ -360,6 +360,7 @@ class BaseResponse:
             'Transfer-Encoding': 'chunked',
             **headers
         }
+        self.headers['Content-Type'] += '; charset=utf-8'
         self.body: str | bytes | Callable | AsyncIterator = self.status.description if body is None else body
         self._transfering: bool = False
 
@@ -464,7 +465,7 @@ class JsonResponse(BaseResponse):
 
     def __init__(self, body: dict | list = {}, status: http.HTTPStatus | int = http.HTTPStatus.OK, headers: Dict[str, str] = {}):
         super().__init__(json.dumps(body), status, {
-            'Content-Type': 'application/json; charset=utf-8',
+            'Content-Type': 'application/json',
             **headers
         })
 

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/CheeseAPI/schedule.py

@@ -1,7 +1,7 @@
-import uuid, datetime
-from typing import TYPE_CHECKING, Callable, Dict, overload
+import uuid, datetime, multiprocessing, threading, time
+from typing import TYPE_CHECKING, Callable, Dict, overload, Literal
 
-import dill
+import dill, setproctitle
 
 if TYPE_CHECKING:
     from CheeseAPI.app import App
@@ -9,7 +9,7 @@ if TYPE_CHECKING:
 class ScheduleTask:
     def __init__(self, app: 'App', key: str):
         self._app: 'App' = app
-        self.key = key
+        self._key: str = key
 
     def reset(self):
         '''
@@ -21,6 +21,14 @@ class ScheduleTask:
             'total_repetition_num': 0
         }
 
+    @property
+    def key(self) -> str:
+        '''
+        【只读】
+        '''
+
+        return self._key
+
     @property
     def timer(self) -> datetime.timedelta:
         '''
@@ -52,7 +60,7 @@ class ScheduleTask:
         '''
         自定义的开始时间。若未设置，则为当前时间。
 
-        若设置后`self.is_expired and self.auto_remove`，则该任务会被立刻删除。
+        若设置后`self.expired and self.auto_remove`，则该任务会被立刻删除。
         '''
 
         return self._app._managers_['schedules'][self.key]['startTimer']
@@ -64,7 +72,7 @@ class ScheduleTask:
             'startTimer': value
         }
 
-        if self.auto_remove and self.is_expired:
+        if self.auto_remove and self.expired:
             del self._app._managers_['schedules'][self.key]
 
     @property
@@ -72,7 +80,7 @@ class ScheduleTask:
         '''
         任务过期后是否自动删除。
 
-        若设置后`self.is_expired and self.auto_remove`，则该任务会被立刻删除。
+        若设置后`self.expired and self.auto_remove`，则该任务会被立刻删除。
         '''
 
         return self._app._managers_['schedules'][self.key]['auto_remove']
@@ -84,7 +92,7 @@ class ScheduleTask:
             'auto_remove': value
         }
 
-        if self.auto_remove and self.is_expired:
+        if self.auto_remove and self.expired:
             del self._app._managers_['schedules'][self.key]
 
     @property
@@ -102,15 +110,20 @@ class ScheduleTask:
             'active': value
         }
 
-        if self.auto_remove and self.is_expired:
-            del self._app._managers_['schedules'][self.key]
+    @property
+    def inactive(self) -> bool:
+        '''
+        【只读】 是否未激活。
+        '''
+
+        return not self._app._managers_['schedules'][self.key]['active']
 
     @property
     def expected_repetition_num(self) -> int:
         '''
         期望的重复次数；0代表无限次数。
 
-        若设置后`self.is_expired and self.auto_remove`，则该任务会被立刻删除。
+        若设置后`self.expired and self.auto_remove`，则该任务会被立刻删除。
         '''
 
         return self._app._managers_['schedules'][self.key]['expected_repetition_num']
@@ -122,8 +135,13 @@ class ScheduleTask:
             'expected_repetition_num': value
         }
 
-        if self.auto_remove and self.is_expired:
-            del self._app._managers_['schedules'][self.key]
+    @property
+    def mode(self) -> Literal['multiprocessing', 'threading', 'asyncio']:
+        '''
+        【只读】 运行的模式是进程、线程还是协程。
+        '''
+
+        return self._app._managers_['schedules'][self.key]['mode']
 
     @property
     def total_repetition_num(self) -> int:
@@ -144,7 +162,7 @@ class ScheduleTask:
         return self.expected_repetition_num - self.total_repetition_num
 
     @property
-    def is_unexpired(self) -> bool:
+    def unexpired(self) -> bool:
         '''
         【只读】 任务是否未过期。
         '''
@@ -155,19 +173,56 @@ class ScheduleTask:
         return self.startTimer + self.timer * (self.expected_repetition_num + 1) >= datetime.datetime.now()
 
     @property
-    def is_expired(self) -> bool:
+    def expired(self) -> bool:
         '''
         【只读】 任务是否过期。
         '''
 
-        return not self.is_unexpired
+        return not self.unexpired
+
+    @property
+    def lastTimer(self) -> datetime.datetime | None:
+        '''
+        【只读】 任务上一次的触发时间；`None`代表从未触发过。
+        '''
+
+        return self._app._managers_['schedules'][self.key]['lastTimer']
 
 class Scheduler:
     def __init__(self, app: 'App'):
         self._app: 'App' = app
+        self._taskHandlers: Dict[str, multiprocessing.Process | threading.Thread] = {}
+
+    def _processHandle(self, key: str):
+        task: ScheduleTask = self._app.scheduler.tasks[key]
+        if task.mode == 'multiprocessing':
+            setproctitle.setproctitle(f'{setproctitle.getproctitle()}:SchedulerTask:{task.key}')
+        lastTimer = datetime.datetime.now()
+
+        while True:
+            task: ScheduleTask = self._app.scheduler.tasks.get(key)
+            if not task or task.expired or task.inactive:
+                break
+
+            _timer = datetime.datetime.now()
+
+            triggeredTimer = task.startTimer + task.timer * task.total_repetition_num
+            if (lastTimer < triggeredTimer <= _timer or lastTimer > triggeredTimer + task.timer) and task.active:
+                task.fn()
+
+                self._app._managers_['schedules'][task.key] = {
+                    **self._app._managers_['schedules'][task.key],
+                    'total_repetition_num': task.total_repetition_num + 1,
+                    'lastTimer': _timer
+                }
+
+            lastTimer = _timer
+            time.sleep(self._app.server.intervalTime)
+
+        del self._taskHandlers[key]
 
     @overload
-    def add(self, timer: datetime.timedelta, fn: Callable, *, key: str | None = None, startTimer: datetime.datetime | None = None, expected_repetition_num: int = 0, auto_remove: bool = False):
+    def add(self, timer: datetime.timedelta, fn: Callable, *, key: str | None = None, startTimer: datetime.datetime | None = None, expected_repetition_num: int = 0, auto_remove: bool = False, mode: Literal['multiprocessing', 'threading', 'asyncio'] = 'multiprocessing'):
         '''
         通过函数添加一个任务。
 
@@ -193,10 +248,12 @@ class Scheduler:
             - expected_repetition_num: 期望的重复次数，0代表无限重复。
 
             - auto_remove: 若`expected_repetition_num > 0`且当前计划过期，是否自动删除该计划。
+
+            - mode: 运行的模式是进程、线程还是协程。
         '''
 
     @overload
-    def add(self, timer: datetime.timedelta, *, key: str | None = None, startTimer: datetime.datetime | None = None, expected_repetition_num: int = 0, auto_remove: bool = False):
+    def add(self, timer: datetime.timedelta, *, key: str | None = None, startTimer: datetime.datetime | None = None, expected_repetition_num: int = 0, auto_remove: bool = False, mode: Literal['multiprocessing', 'threading', 'asyncio'] = 'multiprocessing'):
         '''
         通过装饰器添加一个任务。
 
@@ -221,13 +278,15 @@ class Scheduler:
             - expected_repetition_num: 期望的重复次数，0代表无限重复。
 
             - auto_remove: 若`expected_repetition_num > 0`且当前计划过期，是否自动删除该计划。
+
+            - mode: 运行的模式是进程、线程还是协程。
         '''
 
-    def add(self, timer: datetime.timedelta, fn: Callable | None = None, *, key: str | None = None, startTimer: datetime.datetime | None = None, expected_repetition_num: int = 0, auto_remove: bool = False):
-        if not key:
+    def add(self, timer: datetime.timedelta, fn: Callable | None = None, *, key: str | None = None, startTimer: datetime.datetime | None = None, expected_repetition_num: int = 0, auto_remove: bool = False, mode: Literal['multiprocessing', 'threading', 'asyncio'] = 'multiprocessing'):
+        if key is None:
             key = str(uuid.uuid4())
 
-        if not startTimer:
+        if startTimer is None:
             startTimer = datetime.datetime.now()
 
         if fn:
@@ -238,7 +297,9 @@ class Scheduler:
                 'expected_repetition_num': expected_repetition_num,
                 'total_repetition_num': 0,
                 'auto_remove': auto_remove,
-                'active': True
+                'active': True,
+                'mode': mode,
+                'lastTimer': None
             }
             return
 
@@ -250,7 +311,9 @@ class Scheduler:
                 'expected_repetition_num': expected_repetition_num,
                 'total_repetition_num': 0,
                 'auto_remove': auto_remove,
-                'active': True
+                'active': True,
+                'mode': mode,
+                'lastTimer': None
             }
             return fn
         return wrapper

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/CheeseAPI/server.py

@@ -33,3 +33,7 @@ class Server:
         '''
 
         return self._intervalTime
+
+    @intervalTime.setter
+    def intervalTime(self, value: float):
+        self._intervalTime = value

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/PKG-INFO

@@ -1,17 +1,18 @@
 Metadata-Version: 2.3
 Name: CheeseAPI
-Version: 1.3.2
+Version: 1.4.0
 Summary: 一款web协程框架。
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>
 License-File: LICENSE
 Keywords: API,BackEnd
-Requires-Dist: cheeselog==1.0.*
+Requires-Dist: cheeselog==1.1.*
 Requires-Dist: cheesesignal==1.1.*
 Requires-Dist: dill
 Requires-Dist: email-validator
 Requires-Dist: httptools
 Requires-Dist: pydantic
+Requires-Dist: setproctitle
 Requires-Dist: uvloop
 Requires-Dist: websockets
 Requires-Dist: xmltodict

{cheeseapi-1.3.2 → cheeseapi-1.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CheeseAPI"
-version = "1.3.2"
+version = "1.4.0"
 description = "一款web协程框架。"
 readme = "README.md"
 license-files = { paths = [ "LICENSE" ] }
@@ -14,7 +14,7 @@ authors = [
 keywords = [ 'API', 'BackEnd' ]
 
 dependencies = [
-    "CheeseLog==1.0.*",
+    "CheeseLog==1.1.*",
     "xmltodict",
     "websockets",
     "uvloop",
@@ -22,7 +22,8 @@ dependencies = [
     "CheeseSignal==1.1.*",
     "dill",
     "pydantic",
-    "email-validator"
+    "email-validator",
+    "setproctitle"
 ]
 
 [project.urls]