CheeseAPI 2.0.7b3__tar.gz → 2.0.7b4__tar.gz

{cheeseapi-2.0.7b3 → cheeseapi-2.0.7b4}/CheeseAPI/app.py

@@ -334,7 +334,8 @@ class AppProxy:
     async def get_response(self, request: Request) -> Response:
         if inspect.isfunction(request.fn):
             try:
-                if 'request' in inspect.signature(request.fn).parameters:
+                signature = inspect.signature(request.fn)
+                if 'request' in signature.parameters or any(p.kind == inspect.Parameter.VAR_KEYWORD for p in signature.parameters.values()):
                     return await request.fn(request = request)
                 else:
                     return await request.fn()

{cheeseapi-2.0.7b3 → cheeseapi-2.0.7b4}/CheeseAPI/scheduler.py

@@ -372,7 +372,9 @@ class SchedulerProxy:
                 now = time.time()
 
                 try:
-                    if 'app' in inspect.signature(fn).parameters:
+                    signature = inspect.signature(fn)
+                    has_kwargs = any(p.kind == inspect.Parameter.VAR_KEYWORD for p in signature.parameters.values())
+                    if 'app' in signature.parameters or has_kwargs:
                         fn(*args, app = self.app, **kwargs)
                     else:
                         fn(*args, **kwargs)
@@ -386,6 +388,8 @@ class SchedulerProxy:
                     task._last_run_time = time.time() - now
                     task._last_run_timer = datetime.datetime.fromtimestamp(now)
                     task._run_num += 1
+                    if first_run:
+                        task._queue.get()
 
                     if static.scheduler_sync_servers:
                         sync_server = redis.Redis(connection_pool = static.scheduler_sync_servers[0])
@@ -423,7 +427,9 @@ class SchedulerProxy:
             now = time.time()
 
             try:
-                if 'app' in inspect.signature(fn).parameters:
+                signature = inspect.signature(fn)
+                has_kwargs = any(p.kind == inspect.Parameter.VAR_KEYWORD for p in signature.parameters.values())
+                if 'app' in signature.parameters or has_kwargs:
                     await fn(*args, app = self.app, **kwargs)
                 else:
                     await fn(*args, **kwargs)
@@ -437,6 +443,8 @@ class SchedulerProxy:
                 task._last_run_time = time.time() - now
                 task._last_run_timer = datetime.datetime.fromtimestamp(now)
                 task._run_num += 1
+                if first_run:
+                    task._queue.get()
 
                 if static.scheduler_sync_servers:
                     sync_server = redis.asyncio.Redis(connection_pool = static.scheduler_sync_servers[1])
@@ -526,6 +534,7 @@ class SchedulerProxy:
             if static.scheduler_sync_servers:
                 redis.Redis(connection_pool = static.scheduler_sync_servers[0]).publish('CheeseAPI_scheduler', json.dumps(['remove', key]))
         else:
+            _task._queue.put(None)
             self._tasks.pop(key, None)
         if static.scheduler_sync_servers:
             redis.Redis(connection_pool = static.scheduler_sync_servers[0]).hdel('CheeseAPI_scheduler_tasks', key)
@@ -556,6 +565,7 @@ class SchedulerProxy:
             if static.scheduler_sync_servers:
                 await redis.asyncio.Redis(connection_pool = static.scheduler_sync_servers[1]).publish('CheeseAPI_scheduler', json.dumps(['remove', key]))
         else:
+            _task._queue.put(None)
             self._tasks.pop(key, None)
         if static.scheduler_sync_servers:
             await redis.asyncio.Redis(connection_pool = static.scheduler_sync_servers[1]).hdel('CheeseAPI_scheduler_tasks', key)

{cheeseapi-2.0.7b3 → cheeseapi-2.0.7b4}/CheeseAPI/validator.py

@@ -1,4 +1,4 @@
-import json
+import json, inspect
 from typing import Callable, TYPE_CHECKING
 from functools import wraps
 
@@ -20,10 +20,8 @@ def validator(*, json_model: pydantic.BaseModel | None = None, form_model: pydan
 
     def wrapper(fn: Callable) -> Callable:
         @wraps(fn)
-        async def decorator(*args, **kwargs):
+        async def decorator(*args, request: 'Request', **kwargs):
             try:
-                request: 'Request' = kwargs.get('request', None)
-
                 json_data = None
                 if json_model is not None:
                     json_data = json_model.model_validate(request.json or {}, by_alias = True)
@@ -59,6 +57,10 @@ def validator(*, json_model: pydantic.BaseModel | None = None, form_model: pydan
                 else:
                     return Response(json.loads(e.json()), 400)
 
-            return await fn(*args, **kwargs)
+            signature = inspect.signature(fn)
+            if 'request' in signature.parameters or any(p.kind == inspect.Parameter.VAR_KEYWORD for p in signature.parameters.values()):
+                return await fn(*args, request = request, **kwargs)
+            else:
+                return await fn(*args, **kwargs)
         return decorator
     return wrapper

{cheeseapi-2.0.7b3 → cheeseapi-2.0.7b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CheeseAPI
-Version: 2.0.7b3
+Version: 2.0.7b4
 Summary: 一款web协程框架
 Project-URL: Source, https://github.com/CheeseUnknown/CheeseAPI
 Author-email: Cheese Unknown <cheese@cheese.ren>

{cheeseapi-2.0.7b3 → cheeseapi-2.0.7b4}/pyproject.toml

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