Merge pull request #127 from ZeroIntensity/fix-sync-routes

Fix Synchronous Routes

Author: ZeroIntensity

.github/workflows/tests.yml

@@ -39,7 +39,7 @@ jobs:
               run: pip install --upgrade --pre ward
 
             - name: Install project
-              run: pip install .[templates]
+              run: pip install .[full]
 
             - name: Run tests
               run: ward

CHANGELOG.md

@@ -11,7 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added environment prefixes for database configuration
 - Added `templates` and `TemplatesConfig` to config
 - Added the `templates` function
-- Added support for `attrs` in type validation.
+- Added support for `attrs` in type validation
+- Removed `psutil` and `plotext` as a global dependency
+- Added `fancy` optional dependencies
+- Fixed route inputs with synchronous routes
+- **Breaking Change:** Route inputs are now applied in the order of the decorator call as it appears in code
 
 ## [1.0.0-alpha7] - 2023-12-7
 

pyproject.toml

@@ -26,11 +26,8 @@ dependencies = [
     "typing_extensions",
     "ujson",
     "configzen",
-    "psutil",
-    "plotext",
     "uvicorn",
     "aiofiles",
-    "aiohttp",
 ]
 dynamic = ["version", "license"]
 
@@ -46,6 +43,21 @@ databases = [
     "aiosqlite"
 ]
 templates = ["beautifulsoup4", "jinja2", "mako", "django", "chameleon"]
+fancy = ["psutil", "plotext"]
+full = [
+    "psutil",
+    "plotext",
+    "beautifulsoup4",
+    "jinja2",
+    "mako",
+    "django",
+    "chameleon",
+    "attrs",
+    "psycopg2-binary",
+    "mysql-connector-python",
+    "pymongo",
+    "aiosqlite"
+]
 
 [project.urls]
 Documentation = "https://view.zintensity.dev"

src/_view/app.c

@@ -1899,6 +1899,7 @@ static int handle_route_impl(
     ViewApp* self;
     Py_ssize_t* size;
     PyObject** path_params;
+
     if (PyAwaitable_UnpackValues(
         awaitable,
         &self,
@@ -1933,14 +1934,14 @@ static int handle_route_impl(
             NULL
         );
     }
+
     PyObject** params = json_parser(
         &self->parsers,
         body,
         query_obj,
         r->inputs,
         r->inputs_size
     );
-
     Py_DECREF(query_obj);
 
     if (!params) {
@@ -1977,7 +1978,6 @@ static int handle_route_impl(
             NULL
         );
 
-
         for (int i = 0; i < r->inputs_size + *size; i++)
             Py_DECREF(merged[i]);
 
@@ -1992,22 +1992,33 @@ static int handle_route_impl(
             NULL
         );
 
-        for (int i = 0; i < r->inputs_size; i++) {
+        for (int i = 0; i < r->inputs_size; i++)
             Py_DECREF(params[i]);
-        }
     }
 
-    if (!coro) {
+    if (!coro)
         return -1;
-    }
 
-    if (PyAwaitable_AddAwait(
-        awaitable,
-        coro,
-        handle_route_callback,
-        route_error
-        ) < 0) {
-        return -1;
+    if (!Py_IS_TYPE(coro, &PyCoro_Type)) {
+        if (handle_route_callback(awaitable, coro) < 0) {
+            if (fire_error(
+                self,
+                awaitable,
+                500,
+                r,
+                NULL
+                ) < 0)
+                return -1;
+        }
+    } else {
+        if (PyAwaitable_AddAwait(
+            awaitable,
+            coro,
+            handle_route_callback,
+            route_error
+            ) < 0) {
+            return -1;
+        }
     }
 
     return 0;
@@ -2045,7 +2056,6 @@ static int body_inc_buf(PyObject* awaitable, PyObject* result) {
         return -1;
     }
 
-
     char* buf;
     Py_ssize_t* size;
     char* query;
@@ -2226,9 +2236,8 @@ static int handle_route_query(PyObject* awaitable, char* query) {
             );
             if (!parsed_item) {
                 PyErr_Clear();
-                for (int i = 0; i < r->inputs_size; i++) {
+                for (int i = 0; i < r->inputs_size; i++)
                     Py_XDECREF(params[i]);
-                }
 
                 free(params);
                 Py_DECREF(query_obj);
@@ -2274,18 +2283,30 @@ static int handle_route_query(PyObject* awaitable, char* query) {
     free(params);
     Py_DECREF(query_obj);
 
-
     if (!coro)
         return -1;
 
-    if (PyAwaitable_AddAwait(
-        awaitable,
-        coro,
-        handle_route_callback,
-        route_error
-        ) < 0) {
-        Py_DECREF(coro);
-        return -1;
+    if (!Py_IS_TYPE(coro, &PyCoro_Type)) {
+        if (handle_route_callback(awaitable, coro) < 0) {
+            if (fire_error(
+                self,
+                awaitable,
+                500,
+                r,
+                NULL
+                ) < 0)
+                return -1;
+        }
+    } else {
+        if (PyAwaitable_AddAwait(
+            awaitable,
+            coro,
+            handle_route_callback,
+            route_error
+            ) < 0) {
+            Py_DECREF(coro);
+            return -1;
+        }
     }
 
     Py_DECREF(coro);
@@ -2880,6 +2901,7 @@ static PyObject* app(
         } else {
             res_coro = PyObject_CallNoArgs(r->callable);
         }
+
         if (!res_coro) {
             Py_DECREF(awaitable);
             free(path);
@@ -2898,9 +2920,9 @@ static PyObject* app(
             return awaitable;
         }
 
-        if (!PyObject_IsInstance(
+        if (!Py_IS_TYPE(
             res_coro,
-            (PyObject*) &PyCoro_Type
+            &PyCoro_Type
             )) {
             if (handle_route_callback(
                 awaitable,

src/view/_loader.py

@@ -141,7 +141,7 @@ def _format_body(
             default=default,
         )
         vbody_defaults[k] = default
-
+    
     return [
         (TYPECODE_CLASSTYPES, k, v, vbody_defaults[k])
         for k, v in vbody_final.items()
@@ -421,6 +421,7 @@ def finalize(routes: list[Route], app: ViewApp):
             virtual_routes[route.path or ""] = [route]
 
         sig = inspect.signature(route.func)
+        route.inputs = [i for i in reversed(route.inputs)]
         if len(sig.parameters) != len(route.inputs):
             names = [i.name for i in route.inputs]
             for k, v in sig.parameters.items():