fusion-framework 1.2.0__tar.gz → 1.2.2__tar.gz

{fusion_framework-1.2.0 → fusion_framework-1.2.2}/Cargo.lock

@@ -124,7 +124,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fusion-core"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "bytes",
  "console",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "fusion-ffi"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "bytes",
  "fusion-core",
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "fusion-node"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "fusion-core",
  "napi",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "fusion-py"
-version = "1.2.0"
+version = "1.2.2"
 dependencies = [
  "bytes",
  "fusion-core",

{fusion_framework-1.2.0 → fusion_framework-1.2.2}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = ["crates/fusion-core", "crates/fusion-py"]
 
 [workspace.package]
-version = "1.2.0"
+version = "1.2.2"
 edition = "2024"
 
 [workspace.dependencies]

{fusion_framework-1.2.0 → fusion_framework-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fusion-framework
-Version: 1.2.0
+Version: 1.2.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: 3

{fusion_framework-1.2.0 → fusion_framework-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "fusion-framework"
-version = "1.2.0"
+version = "1.2.2"
 description = "Class-based HTTP framework for Python, powered by a shared Rust core"
 readme = "README.md"
 requires-python = ">=3.9"

{fusion_framework-1.2.0 → fusion_framework-1.2.2}/python/fusion_framework/middleware.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import base64
 import inspect
 import json
@@ -35,7 +34,7 @@ def clear_active_global() -> None:
 
 
 async def _maybe_await(value: MaybeAwaitable) -> Any:
-    if asyncio.iscoroutine(value) or asyncio.isfuture(value):
+    if inspect.isawaitable(value):
         return await value
     return value
 
@@ -78,8 +77,11 @@ def _run_chain_sync(
             return dispatch(index + 1, next_req)
 
         result = middleware(req, call_next)
+        # Sync middleware may return a coroutine when the route handler is
+        # ``async def`` (HandlerInvoker is sync but yields an awaitable).
+        # Propagate to Rust so ``async_runtime.submit`` can await it.
         if inspect.isawaitable(result):
-            raise RuntimeError("async middleware requires an async app runtime")
+            return result
         if _is_response(result):
             return result
         return result
@@ -203,6 +205,22 @@ def _merge_response_headers(result: Any, extra: dict[str, str]) -> Any:
     return out
 
 
+def _call_next_merge_headers(
+    call_next: Callable[[RequestDict], Any],
+    request: RequestDict,
+    extra: dict[str, str],
+) -> Any:
+    """Merge headers after ``call_next``, awaiting async handler results."""
+    result = call_next(request)
+    if inspect.isawaitable(result):
+
+        async def _await_merge() -> Any:
+            return _merge_response_headers(await result, extra)
+
+        return _await_merge()
+    return _merge_response_headers(result, extra)
+
+
 def framework_headers() -> Middleware:
     """Default identity middleware: advertise Fusion on every response.
 
@@ -215,18 +233,25 @@ def framework_headers() -> Middleware:
 
         extra = dict(_fp())
     except Exception:
-        from fusion_framework import header as hdr
-
-        extra = {
-            getattr(hdr, "X_POWERED_BY", "X-Powered-By"): getattr(
-                hdr, "FRAMEWORK_POWERED_BY", "Fusion Framework"
-            ),
-            getattr(hdr, "X_FRAMEWORK", "X-Framework"): getattr(hdr, "FRAMEWORK_ID", "Fusion"),
-            getattr(hdr, "X_FUSION_VERSION", "X-Fusion-Version"): "1.2.0",
-        }
+        try:
+            from fusion_framework import header as hdr
+
+            extra = {
+                getattr(hdr, "X_POWERED_BY", "X-Powered-By"): getattr(
+                    hdr, "FRAMEWORK_POWERED_BY", "Fusion Framework"
+                ),
+                getattr(hdr, "X_FRAMEWORK", "X-Framework"): getattr(hdr, "FRAMEWORK_ID", "Fusion"),
+                getattr(hdr, "X_FUSION_VERSION", "X-Fusion-Version"): "1.2.2",
+            }
+        except Exception:
+            extra = {
+                "X-Powered-By": "Fusion Framework",
+                "X-Framework": "Fusion",
+                "X-Fusion-Version": "1.2.2",
+            }
 
     def middleware(request: RequestDict, call_next: Callable[[RequestDict], Any]) -> Any:
-        return _merge_response_headers(call_next(request), extra)
+        return _call_next_merge_headers(call_next, request, extra)
 
     return middleware
 

fusion_framework-1.2.2/python/fusion_framework/test_middleware.py

@@ -0,0 +1,87 @@
+"""Unit tests for middleware chain (no server required)."""
+
+import asyncio
+import inspect
+
+from fusion_framework.middleware import (
+    bearer_jwt,
+    clear_active_global,
+    dispatch_route,
+    framework_headers,
+    require_roles,
+    set_active_global,
+)
+
+
+def _handler(request):
+    return {"status": 200, "body": {"state": request.get("state", {})}}
+
+
+async def _async_handler(request):
+    return {"status": 200, "body": {"ok": True, "path": request.get("path")}}
+
+
+def _sync_invoker_like(request):
+    """Mirrors PyO3 HandlerInvoker: sync ``__call__`` that may return a coroutine."""
+    return _async_handler(request)
+
+
+def test_require_roles_allows_matching_role():
+    request = {"headers": {}, "state": {"jwt": {"roles": ["admin"]}}}
+    chain = [require_roles("admin", "super_admin")]
+    result = dispatch_route(request, _handler, chain)
+    assert result["status"] == 200
+
+
+def test_require_roles_blocks_missing_role():
+    request = {"headers": {}, "state": {"jwt": {"roles": ["user"]}}}
+    chain = [require_roles("admin")]
+    result = dispatch_route(request, _handler, chain)
+    assert result["status"] == 403
+
+
+def test_bearer_jwt_populates_state():
+    token = "eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJzdWIiOiIxIiwicm9sZXMiOlsiYWRtaW4iXX0."
+    request = {"headers": {"Authorization": f"Bearer {token}"}}
+    set_active_global([bearer_jwt()])
+    try:
+        result = dispatch_route(request, _handler, [])
+        assert result["status"] == 200
+        assert result["body"]["state"]["jwt"]["sub"] == "1"
+    finally:
+        clear_active_global()
+
+
+def test_framework_headers_awaits_async_handler():
+    """Regression: sync framework_headers must not stringify coroutine bodies.
+
+    HandlerInvoker is sync, so the chain stays sync; call_next returns a raw
+    coroutine that must be awaited before headers are merged.
+    """
+    clear_active_global()
+    set_active_global([framework_headers()])
+    try:
+        request = {"path": "/membership", "headers": {}, "method": "GET"}
+        result = dispatch_route(request, _sync_invoker_like, [])
+        assert inspect.isawaitable(result), "async handler result must stay awaitable for Rust"
+        resolved = asyncio.run(result)
+        assert resolved["status"] == 200
+        assert resolved["body"] == {"ok": True, "path": "/membership"}
+        headers = {str(k).lower(): v for k, v in (resolved.get("headers") or {}).items()}
+        assert "x-powered-by" in headers
+        body = resolved.get("body")
+        assert not (isinstance(body, str) and body.startswith("<coroutine"))
+    finally:
+        clear_active_global()
+
+
+def test_sync_middleware_propagates_async_handler_coroutine():
+    clear_active_global()
+    try:
+        request = {"path": "/x", "headers": {}, "state": {"jwt": {"roles": ["admin"]}}}
+        result = dispatch_route(request, _sync_invoker_like, [require_roles("admin")])
+        assert inspect.isawaitable(result)
+        resolved = asyncio.run(result)
+        assert resolved["body"]["ok"] is True
+    finally:
+        clear_active_global()

fusion_framework-1.2.0/python/fusion_framework/test_middleware.py

@@ -1,30 +0,0 @@
-"""Unit tests for middleware chain (no server required)."""
-
-from fusion_framework.middleware import bearer_jwt, dispatch_route, require_roles, set_active_global
-
-
-def _handler(request):
-    return {"status": 200, "body": {"state": request.get("state", {})}}
-
-
-def test_require_roles_allows_matching_role():
-    request = {"headers": {}, "state": {"jwt": {"roles": ["admin"]}}}
-    chain = [require_roles("admin", "super_admin")]
-    result = dispatch_route(request, _handler, chain)
-    assert result["status"] == 200
-
-
-def test_require_roles_blocks_missing_role():
-    request = {"headers": {}, "state": {"jwt": {"roles": ["user"]}}}
-    chain = [require_roles("admin")]
-    result = dispatch_route(request, _handler, chain)
-    assert result["status"] == 403
-
-
-def test_bearer_jwt_populates_state():
-    token = "eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJzdWIiOiIxIiwicm9sZXMiOlsiYWRtaW4iXX0."
-    request = {"headers": {"Authorization": f"Bearer {token}"}}
-    set_active_global([bearer_jwt()])
-    result = dispatch_route(request, _handler, [])
-    assert result["status"] == 200
-    assert result["body"]["state"]["jwt"]["sub"] == "1"