fenrir-framework 1.2.2__tar.gz → 2.2.2__tar.gz

{fenrir_framework-1.2.2 → fenrir_framework-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fenrir-framework
-Version: 1.2.2
+Version: 2.2.2
 Summary: A hybrid Python web framework combining Flask, FastAPI, Bottle, Falcon, and Sanic
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
@@ -11,6 +11,8 @@ Requires-Dist: asteri>=2.2.2
 Requires-Dist: itsdangerous>=2.0.0
 Requires-Dist: python-multipart>=0.0.18
 Requires-Dist: typing_extensions>=4.0.0
+Provides-Extra: redis
+Requires-Dist: redis>=4.0.0; extra == "redis"
 Dynamic: license-file
 
 <p align="center">
@@ -22,7 +24,7 @@ Dynamic: license-file
 [![PyPI version](https://img.shields.io/pypi/v/fenrir-framework.svg?color=blueviolet)](https://pypi.org/project/fenrir-framework/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Python Version](https://img.shields.io/badge/Python-3.8%2B-blue.svg)](https://www.python.org/)
-[![Tests](https://img.shields.io/badge/Tests-482%20Passed-brightgreen.svg)](https://github.com/IshikawaUta/fenrir/actions)
+[![Tests](https://img.shields.io/badge/Tests-528%20Passed-brightgreen.svg)](https://github.com/IshikawaUta/fenrir/actions)
 [![CI](https://github.com/IshikawaUta/fenrir/actions/workflows/test.yml/badge.svg)](https://github.com/IshikawaUta/fenrir/actions/workflows/test.yml)
 [![Performance](https://img.shields.io/badge/Performance-High--Speed%20ASGI-orange.svg)]()
 
@@ -83,7 +85,7 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger("demo")
 
 # Initialize the Hybrid App
-app = Fenrir(title="Fenrir Hybrid Demo", version="1.2.2")
+app = Fenrir(title="Fenrir Hybrid Demo", version="2.2.2")
 
 # --- 1. FastAPI-Style Validation & DI ---
 class UserRegister(BaseModel):
@@ -178,7 +180,7 @@ fenrir info demo_app:app
 
 ## 🧪 Comprehensive Test Suite
 
-Fenrir is thoroughly covered by an automated test suite comprising **482 tests** validating every single component, compat namespace, file upload, routing detail, and CLI functionality. The suite runs automatically via **GitHub Actions** on every push across Python **3.8 – 3.13**.
+Fenrir is thoroughly covered by an automated test suite comprising **528 tests** validating every single component, compat namespace, file upload, routing detail, and CLI functionality. The suite runs automatically via **GitHub Actions** on every push across Python **3.8 – 3.13**.
 
 Run the test suite locally:
 
@@ -188,13 +190,40 @@ PYTHONPATH=. pytest -v
 
 ### Output:
 ```text
-======================== 482 passed, 1 skipped in 3.4s ========================
+======================= 528 passed, 1 skipped in 3.4s ========================
 ```
 
 ---
 
 ## 🔄 Changelog
 
+### v2.2.2 — Major Feature Update
+
+New middleware, session backends, pagination, and more:
+
+**New Middleware (`fenrir.middleware`)**
+- **CORSMiddleware**: Full CORS support for HTTP and WebSocket with configurable origins, methods, headers, credentials, and max-age.
+- **GZipMiddleware**: Automatic gzip compression for responses above a configurable size threshold.
+- **RequestIDMiddleware**: Auto-generates unique request IDs or forwards client-provided IDs via configurable header.
+- **RateLimitMiddleware**: Sliding-window rate limiter per client IP with configurable limits and block status code.
+
+**New Session Backends (`fenrir.sessions`)**
+- **InMemorySessionInterface**: In-memory session storage with TTL expiration, suitable for single-process apps and testing.
+- **RedisSessionInterface**: Redis-backed session storage with support for both sync (`fakeredis`) and async (`redis.asyncio`) clients. Install with `pip install fenrir-framework[redis]`.
+
+**New Pagination Utilities (`fenrir.pagination`)**
+- **PaginationParams**: Pydantic model for query parameters (`page`, `page_size`, `sort_by`, `sort_order`).
+- **paginate()**: Utility to paginate SQLAlchemy-style query results with metadata.
+- **paginate_dict()**: Utility to paginate lists of dictionaries.
+
+**New Features**
+- **WebSocket per-route timeout**: `@app.websocket("/ws", timeout=5.0)` raises `WebSocketTimeout` if no message received within the timeout.
+- **Multiple response models per status**: `response_models={200: SuccessModel, 404: ErrorModel}` applies different models based on the actual response status code.
+
+**Improvements**
+- ASGI middleware stack is now built once and cached, with automatic invalidation when new middleware is added.
+- Zero deprecation warnings across the entire test suite (528 tests).
+
 ### v1.2.2 — Logo & Favicon Patch
 
 High-quality logo assets and resolved CLI template favicon issues:
@@ -213,7 +242,7 @@ Logo and favicon assets are now properly included in the package distribution:
   - Moved `logo.png` and `logo.jpg` from repository root to `fenrir/` package directory.
   - Added `[tool.setuptools.package-data]` configuration in `pyproject.toml` to include image files: `fenrir = ["logo.png", "logo.jpg"]`.
   - Updated `fenrir/cli.py` `cmd_new()` function to look for logos in the fenrir package directory first, with fallbacks for development mode.
-- **Result**: All tests pass (482 unit tests + 13 advanced tests). `fenrir new` now works correctly in all environments.
+- **Result**: All tests pass (528 unit tests). `fenrir new` now works correctly in all environments.
 
 ### v1.1.1 — Python 3.8–3.10 Full Compatibility Patch
 
@@ -245,7 +274,7 @@ Five test failures on Python 3.8 CI were identified and patched:
 
 ### v0.1.0 — Initial Release
 - Core ASGI framework with Flask, FastAPI, Sanic, Falcon, and Bottle hybridization.
-- 482 automated unit tests.
+- 528 automated unit tests.
 - Premium CLI tooling (`run`, `routes`, `shell`, `bench`, `new`, `info`).
 - Auto-generated OpenAPI/Swagger documentation.
 - WebSocket and Server-Sent Events support.

{fenrir_framework-1.2.2 → fenrir_framework-2.2.2}/README.md

@@ -7,7 +7,7 @@
 [![PyPI version](https://img.shields.io/pypi/v/fenrir-framework.svg?color=blueviolet)](https://pypi.org/project/fenrir-framework/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 [![Python Version](https://img.shields.io/badge/Python-3.8%2B-blue.svg)](https://www.python.org/)
-[![Tests](https://img.shields.io/badge/Tests-482%20Passed-brightgreen.svg)](https://github.com/IshikawaUta/fenrir/actions)
+[![Tests](https://img.shields.io/badge/Tests-528%20Passed-brightgreen.svg)](https://github.com/IshikawaUta/fenrir/actions)
 [![CI](https://github.com/IshikawaUta/fenrir/actions/workflows/test.yml/badge.svg)](https://github.com/IshikawaUta/fenrir/actions/workflows/test.yml)
 [![Performance](https://img.shields.io/badge/Performance-High--Speed%20ASGI-orange.svg)]()
 
@@ -68,7 +68,7 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger("demo")
 
 # Initialize the Hybrid App
-app = Fenrir(title="Fenrir Hybrid Demo", version="1.2.2")
+app = Fenrir(title="Fenrir Hybrid Demo", version="2.2.2")
 
 # --- 1. FastAPI-Style Validation & DI ---
 class UserRegister(BaseModel):
@@ -163,7 +163,7 @@ fenrir info demo_app:app
 
 ## 🧪 Comprehensive Test Suite
 
-Fenrir is thoroughly covered by an automated test suite comprising **482 tests** validating every single component, compat namespace, file upload, routing detail, and CLI functionality. The suite runs automatically via **GitHub Actions** on every push across Python **3.8 – 3.13**.
+Fenrir is thoroughly covered by an automated test suite comprising **528 tests** validating every single component, compat namespace, file upload, routing detail, and CLI functionality. The suite runs automatically via **GitHub Actions** on every push across Python **3.8 – 3.13**.
 
 Run the test suite locally:
 
@@ -173,13 +173,40 @@ PYTHONPATH=. pytest -v
 
 ### Output:
 ```text
-======================== 482 passed, 1 skipped in 3.4s ========================
+======================= 528 passed, 1 skipped in 3.4s ========================
 ```
 
 ---
 
 ## 🔄 Changelog
 
+### v2.2.2 — Major Feature Update
+
+New middleware, session backends, pagination, and more:
+
+**New Middleware (`fenrir.middleware`)**
+- **CORSMiddleware**: Full CORS support for HTTP and WebSocket with configurable origins, methods, headers, credentials, and max-age.
+- **GZipMiddleware**: Automatic gzip compression for responses above a configurable size threshold.
+- **RequestIDMiddleware**: Auto-generates unique request IDs or forwards client-provided IDs via configurable header.
+- **RateLimitMiddleware**: Sliding-window rate limiter per client IP with configurable limits and block status code.
+
+**New Session Backends (`fenrir.sessions`)**
+- **InMemorySessionInterface**: In-memory session storage with TTL expiration, suitable for single-process apps and testing.
+- **RedisSessionInterface**: Redis-backed session storage with support for both sync (`fakeredis`) and async (`redis.asyncio`) clients. Install with `pip install fenrir-framework[redis]`.
+
+**New Pagination Utilities (`fenrir.pagination`)**
+- **PaginationParams**: Pydantic model for query parameters (`page`, `page_size`, `sort_by`, `sort_order`).
+- **paginate()**: Utility to paginate SQLAlchemy-style query results with metadata.
+- **paginate_dict()**: Utility to paginate lists of dictionaries.
+
+**New Features**
+- **WebSocket per-route timeout**: `@app.websocket("/ws", timeout=5.0)` raises `WebSocketTimeout` if no message received within the timeout.
+- **Multiple response models per status**: `response_models={200: SuccessModel, 404: ErrorModel}` applies different models based on the actual response status code.
+
+**Improvements**
+- ASGI middleware stack is now built once and cached, with automatic invalidation when new middleware is added.
+- Zero deprecation warnings across the entire test suite (528 tests).
+
 ### v1.2.2 — Logo & Favicon Patch
 
 High-quality logo assets and resolved CLI template favicon issues:
@@ -198,7 +225,7 @@ Logo and favicon assets are now properly included in the package distribution:
   - Moved `logo.png` and `logo.jpg` from repository root to `fenrir/` package directory.
   - Added `[tool.setuptools.package-data]` configuration in `pyproject.toml` to include image files: `fenrir = ["logo.png", "logo.jpg"]`.
   - Updated `fenrir/cli.py` `cmd_new()` function to look for logos in the fenrir package directory first, with fallbacks for development mode.
-- **Result**: All tests pass (482 unit tests + 13 advanced tests). `fenrir new` now works correctly in all environments.
+- **Result**: All tests pass (528 unit tests). `fenrir new` now works correctly in all environments.
 
 ### v1.1.1 — Python 3.8–3.10 Full Compatibility Patch
 
@@ -230,7 +257,7 @@ Five test failures on Python 3.8 CI were identified and patched:
 
 ### v0.1.0 — Initial Release
 - Core ASGI framework with Flask, FastAPI, Sanic, Falcon, and Bottle hybridization.
-- 482 automated unit tests.
+- 528 automated unit tests.
 - Premium CLI tooling (`run`, `routes`, `shell`, `bench`, `new`, `info`).
 - Auto-generated OpenAPI/Swagger documentation.
 - WebSocket and Server-Sent Events support.

{fenrir_framework-1.2.2 → fenrir_framework-2.2.2}/fenrir/__init__.py

@@ -2,7 +2,7 @@ from fenrir.app import Fenrir, Blueprint
 from fenrir.context import request, g, current_app, session
 from fenrir.dependencies import Depends, Query, Header, Cookie, Body, Path, Form, File
 from fenrir.upload import UploadFile
-from fenrir.websocket import WebSocket, WebSocketDisconnect
+from fenrir.websocket import WebSocket, WebSocketDisconnect, WebSocketTimeout
 from fenrir.exceptions import (
     HTTPException,
     HTTPBadRequest,
@@ -47,14 +47,25 @@ import fenrir.bottle as bottle
 import fenrir.falcon as falcon
 import fenrir.sanic as sanic
 from fenrir.testing import TestClient, FenrirTestClient
-
-
+from fenrir.middleware import (
+    CORSMiddleware,
+    GZipMiddleware,
+    RequestIDMiddleware,
+    RateLimitMiddleware,
+)
+from fenrir.pagination import PaginationParams, paginate, paginate_dict
+from fenrir.sessions import (
+    RedisSessionInterface,
+    InMemorySessionInterface,
+    InMemorySessionBackend,
+    ServerSideSession,
+)
 
 
 # Re-export Annotated for convenient use with param markers
 from fenrir.compat import Annotated
 
-__version__ = "1.2.2"
+__version__ = "2.2.2"
 __all__ = [
     # Core app
     "Fenrir",
@@ -79,6 +90,7 @@ __all__ = [
     # WebSocket
     "WebSocket",
     "WebSocketDisconnect",
+    "WebSocketTimeout",
     # Exceptions
     "HTTPException",
     "HTTPBadRequest",
@@ -144,5 +156,19 @@ __all__ = [
     # Testing
     "TestClient",
     "FenrirTestClient",
+    # Middleware
+    "CORSMiddleware",
+    "GZipMiddleware",
+    "RequestIDMiddleware",
+    "RateLimitMiddleware",
+    # Pagination
+    "PaginationParams",
+    "paginate",
+    "paginate_dict",
+    # Server-side sessions
+    "RedisSessionInterface",
+    "InMemorySessionInterface",
+    "InMemorySessionBackend",
+    "ServerSideSession",
 ]
 

{fenrir_framework-1.2.2 → fenrir_framework-2.2.2}/fenrir/app.py

@@ -92,7 +92,7 @@ class Fenrir:
         self,
         import_name: str = None,
         title: str = "Fenrir API",
-        version: str = "1.2.2",
+        version: str = "2.2.2",
         template_folder: str = "templates",
         renderer: Any = None,
         docs_url: str = "/docs",
@@ -168,6 +168,7 @@ class Fenrir:
         self.router = Router(route_class=route_class)
         self.middlewares: Dict[str, List[Callable]] = {"request": [], "response": []}
         self._asgi_middlewares: List = []   # ASGI-style middleware stack
+        self._asgi_app: Any = None          # Built middleware app (cached)
         self._wsgi_mounts: List = []        # (prefix, WsgiToAsgi) pairs
         self.listeners: Dict[str, List[Callable]] = {
             "before_server_start": [],
@@ -204,9 +205,9 @@ class Fenrir:
             return handler
         return decorator
 
-    def websocket(self, path: str):
+    def websocket(self, path: str, timeout: float = None):
         def decorator(handler):
-            self.add_websocket_route(path, handler)
+            self.add_websocket_route(path, handler, ws_timeout=timeout)
             return handler
         return decorator
 
@@ -228,8 +229,8 @@ class Fenrir:
     def add_route(self, path: str, handler: Any, methods: List[str] = None, **route_kwargs):
         self.router.add_route(path, handler, methods, **route_kwargs)
 
-    def add_websocket_route(self, path: str, handler: Any):
-        self.router.add_websocket_route(path, handler)
+    def add_websocket_route(self, path: str, handler: Any, ws_timeout: float = None):
+        self.router.add_websocket_route(path, handler, ws_timeout=ws_timeout)
 
     def include_router(self, router: Router, prefix: str = ""):
         self.router.include_router(router, prefix=prefix)
@@ -241,6 +242,7 @@ class Fenrir:
         as ``await mw(scope, receive, send)``.
         """
         self._asgi_middlewares.append((middleware_class, options))
+        self._asgi_app = None  # invalidate cached middleware stack
 
     def mount_wsgi(self, path: str, wsgi_app: Any) -> None:
         """Mount a WSGI application (e.g. a Bottle app) under *path*.
@@ -398,12 +400,15 @@ class Fenrir:
         global _active_app
         _active_app = self
 
-        # Apply ASGI middleware stack (outermost first, added last)
-        if self._asgi_middlewares:
+        # Build ASGI middleware stack once and cache it
+        if self._asgi_middlewares and not self._asgi_app:
             app = self._dispatch
             for mw_class, mw_options in reversed(self._asgi_middlewares):
                 app = mw_class(app, **mw_options)
-            await app(scope, receive, send)
+            self._asgi_app = app
+
+        if self._asgi_app:
+            await self._asgi_app(scope, receive, send)
             return
 
         await self._dispatch(scope, receive, send)
@@ -450,7 +455,8 @@ class Fenrir:
                 await send({"type": "websocket.close", "code": 1008})
                 return
 
-            ws = WebSocket(scope, receive, send)
+            ws_timeout = getattr(route, "ws_timeout", None)
+            ws = WebSocket(scope, receive, send, timeout=ws_timeout)
             resp = Response(status=200)
             token_req = _request_ctx_var.set(req)
             token_g = _g_ctx_var.set(G())
@@ -569,6 +575,9 @@ class Fenrir:
                 elif hasattr(route, "response_model") and route.response_model is not None:
                     coerced = self._apply_response_model(route, response_obj)
                     response_obj = coerced
+                elif hasattr(route, "response_models") and route.response_models:
+                    coerced = self._apply_response_model(route, response_obj)
+                    response_obj = coerced
 
                 # Convert handler result to Response object (only if not already a Response)
                 if not isinstance(response_obj, Response):
@@ -678,11 +687,37 @@ class Fenrir:
             return await to_thread(func, *args, **kwargs)
 
     def _apply_response_model(self, route: Route, content: Any) -> Response:
-        """Serialise *content* through the route's response_model if defined."""
+        """Serialise *content* through the route's response_model if defined.
+
+        Also supports ``response_models`` dict: ``{status_code: model}`` for
+        multiple response models per status code (runtime validation).
+        """
+        # Determine actual status code from content tuple
+        actual_status = getattr(route, "status_code", 200)
+        actual_content = content
+        if isinstance(content, tuple):
+            if len(content) == 2:
+                actual_content, actual_status = content
+            elif len(content) == 3:
+                actual_content, actual_status, _ = content
+
+        # Check response_models dict first (multiple models per status)
+        response_models = getattr(route, "response_models", {})
+        if response_models and actual_status in response_models:
+            rm = response_models[actual_status]
+            return self._serialize_with_model(rm, actual_content, actual_status, route)
+
+        # Fall back to the single response_model
         rm = getattr(route, "response_model", None)
         if rm is None:
+            if isinstance(content, tuple):
+                return self._coerce_response(content)
             return self._coerce_response(content)
 
+        return self._serialize_with_model(rm, actual_content, actual_status, route)
+
+    def _serialize_with_model(self, rm: Any, content: Any, status: int, route: Route) -> Response:
+        """Serialize *content* through a Pydantic model."""
         try:
             from pydantic import BaseModel, TypeAdapter
 
@@ -690,13 +725,9 @@ class Fenrir:
             exclude_defaults = getattr(route, "response_model_exclude_defaults", False)
             include = getattr(route, "response_model_include", None)
             exclude = getattr(route, "response_model_exclude", None)
-            status = getattr(route, "status_code", 200)
 
             if isinstance(rm, type) and issubclass(rm, BaseModel):
-                # Always go through response_model.model_validate so extra fields
-                # from a different Pydantic model are properly stripped.
                 if isinstance(content, BaseModel):
-                    # Convert via dict to let response_model pick only its fields
                     raw_dict = content.model_dump()
                     validated = rm.model_validate(raw_dict)
                 elif isinstance(content, dict):

{fenrir_framework-1.2.2 → fenrir_framework-2.2.2}/fenrir/cli.py

@@ -375,7 +375,7 @@ def cmd_new(args):
 import os
 import sys
 
-app = Fenrir(title="My Fenrir Application", version="1.2.2")
+app = Fenrir(title="My Fenrir Application", version="2.2.2")
 
 @app.get("/")
 async def home():
@@ -682,7 +682,7 @@ if __name__ == "__main__":
             </div>
             <div class="info-item">
                 <span class="info-label">Framework Engine</span>
-                <span class="info-value">Fenrir v1.2.2</span>
+                <span class="info-value">Fenrir v2.2.2</span>
             </div>
         </div>