Changes from development branch

.github/workflows/build.yml

@@ -5,12 +5,9 @@ on:
         tags:
             - v*
         branches:
-            - master
+            - main
         paths:
             - "src/**"
-    pull_request:
-        branches:
-            - master
 
 concurrency:
     group: build-${{ github.head_ref }}

.github/workflows/lint.yml

@@ -0,0 +1,26 @@
+name: Lint
+
+on:
+    pull_request:
+        branches:
+            - main
+
+concurrency:
+    group: build-${{ github.head_ref }}
+    cancel-in-progress: true
+
+jobs:
+    lint:
+        name: Lint source code
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v3
+              with:
+                  fetch-depth: 0
+
+            - name: Install Hatch
+              run: pip install hatch
+
+            - name: Run linter
+              run: hatch fmt -l

.github/workflows/tests.yml

@@ -3,10 +3,10 @@ name: Tests
 on:
     push:
         branches:
-            - master
+            - main
     pull_request:
         branches:
-            - master
+            - main
 
 concurrency:
     group: test-${{ github.head_ref }}

.pre-commit-config.yaml

@@ -8,8 +8,12 @@ repos:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
 
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.14.10
     hooks:
-      - id: black
-        language_version: python3.13
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Peter Bierma <[email protected]>
+Copyright (c) 2025-present Peter Bierma <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 <div align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ZeroIntensity/view.py/master/assets/logo_theme_dark.png" alt="view.py logo (dark)"  width=450 height=auto>
-      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ZeroIntensity/view.py/master/assets/logo_theme_light.png" alt="view.py logo (light)"  width=450 height=auto>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ZeroIntensity/view.py/main/logos/logo_theme_dark.png" alt="view.py logo (dark)"  width=450 height=auto>
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ZeroIntensity/view.py/main/logos/logo_theme_light.png" alt="view.py logo (light)"  width=450 height=auto>
       <img alt="view.py logo">
     </picture>
 </div>

hatch.toml

@@ -11,8 +11,17 @@ packages = ["src/view"]
 extra-args = ["-vv"]
 extra-dependencies = [
     "pytest-asyncio",
-    "requests"
+    "requests",
+    "uvicorn",
+    "hypercorn",
+    "daphne",
+    "gunicorn",
+    "werkzeug",
 ]
+randomize = true
+retries = 3
+retries-delay = 1
+parallel = false
 
 [[envs.hatch-test.matrix]]
 python = ["3.14", "3.13", "3.12", "3.11", "3.10"]

pyproject.toml

@@ -34,3 +34,23 @@ Funding = "https://github.com/sponsors/ZeroIntensity"
 [project.scripts]
 view = "view.__main__:main"
 view-py = "view.__main__:main"
+
+[tool.ruff]
+exclude = ["tests/"]
+line-length = 79
+indent-width = 4
+
+[tool.ruff.lint]
+ignore = [
+  "S101", # We intentionally want assertions to be debug-only
+  "EM101", # Improves traceback readability(?), but damages code readability
+  "EM102", # Same as above
+  "TRY003", # Moves relevant messages away from where they are raised.
+  "PLC0415", # This is generally done to avoid circular imports.
+]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["PLC0414"]
+"status_codes.py" = ["N818"]
+"primitives.py" = ["A001", "A002", "B008"]
+"servers.py" = ["PLC0415", "RET503"]

src/view/__init__.py

@@ -9,4 +9,4 @@
 from view import run as run
 from view import testing as testing
 from view import utils as utils
-from view.__about__ import *
+from view.__about__ import *  # noqa: F403

src/view/__main__.py

@@ -1,5 +1,5 @@
 def main():
-    print()
+    pass
 
 
 if __name__ == "__main__":

src/view/cache.py

@@ -3,13 +3,20 @@
 import math
 import time
 from abc import ABC, abstractmethod
-from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Generic, ParamSpec, TypeVar
+from typing import TYPE_CHECKING, Generic, ParamSpec, TypeVar
 
-from multidict import CIMultiDict
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
-from view.core.response import Response, TextResponse, ViewResult, wrap_view_result
+    from multidict import CIMultiDict
+
+from view.core.response import (
+    Response,
+    TextResponse,
+    ViewResult,
+    wrap_view_result,
+)
 
 __all__ = ("in_memory_cache",)
 
@@ -32,7 +39,9 @@ def invalidate(self) -> None:
         """
 
     @abstractmethod
-    async def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Response: ...
+    async def __call__(
+        self, *args: P.args, **kwargs: P.kwargs
+    ) -> Response: ...
 
 
 @dataclass(slots=True, frozen=True)
@@ -73,7 +82,9 @@ async def __call__(self, *args: P.args, **kwargs: P.kwargs) -> Response:
             self._cached_response = cached
             return cached.as_response()
 
-        if (time.time() - self._cached_response.last_reset) > self.reset_frequency:
+        if (
+            time.time() - self._cached_response.last_reset
+        ) > self.reset_frequency:
             self.invalidate()
             return await self(*args, **kwargs)
 
@@ -104,6 +115,8 @@ def in_memory_cache(
     """
 
     def decorator_factory(function: Callable[P, T], /) -> InMemoryCache[P, T]:
-        return InMemoryCache(function, reset_frequency=reset_frequency or math.inf)
+        return InMemoryCache(
+            function, reset_frequency=reset_frequency or math.inf
+        )
 
     return decorator_factory

src/view/core/app.py

@@ -20,7 +20,13 @@
     wrap_view_result,
 )
 from view.core.router import FoundRoute, Route, Router, RouteView
-from view.core.status_codes import Forbidden, HTTPError, InternalServerError, NotFound
+from view.core.status_codes import (
+    Forbidden,
+    HTTPError,
+    InternalServerError,
+    NotFound,
+)
+from view.exceptions import InvalidTypeError
 from view.utils import reraise
 
 if TYPE_CHECKING:
@@ -127,6 +133,7 @@ def run(
             warnings.warn(
                 f"The app was run with {production=}, but Python's {__debug__=}",
                 RuntimeWarning,
+                stacklevel=2,
             )
 
         logger.info(f"Serving app on http://localhost:{port}")
@@ -136,7 +143,7 @@ def run(
             settings.run_app_on_any_server()
         except KeyboardInterrupt:
             logger.info("CTRL^C received, shutting down")
-        except Exception:
+        except Exception:  # noqa
             logger.exception("Error in server lifecycle")
         finally:
             logger.info("Server finished")
@@ -177,7 +184,9 @@ async def _execute_view_internal(
         result = view(*args, **kwargs)
         return await wrap_view_result(result)
     except HTTPError as error:
-        logger.opt(colors=True).info(f"<red>HTTP Error {error.status_code}</red>")
+        logger.opt(colors=True).info(
+            f"<red>HTTP Error {error.status_code}</red>"
+        )
         raise
 
 
@@ -191,10 +200,11 @@ async def execute_view(
         if isinstance(exception, HTTPError):
             raise
         logger.exception(exception)
+
         if __debug__:
-            raise InternalServerError.from_current_exception()
-        else:
-            raise InternalServerError()
+            raise InternalServerError.from_current_exception() from exception
+
+        raise InternalServerError from exception
 
 
 SingleView = Callable[["Request"], ViewResult]
@@ -223,13 +233,15 @@ def as_app(view: SingleView, /) -> SingleViewApp:
     Decorator for using a single function as an app.
     """
     if __debug__ and not callable(view):
-        raise InvalidType(view, Callable)
+        raise InvalidTypeError(view, Callable)
 
     return SingleViewApp(view)
 
 
 RouteDecorator: TypeAlias = Callable[[RouteView], Route]
-SubRouterView: TypeAlias = Callable[[str], ResponseLike | Awaitable[ResponseLike]]
+SubRouterView: TypeAlias = Callable[
+    [str], ResponseLike | Awaitable[ResponseLike]
+]
 SubRouterViewT = TypeVar("SubRouterViewT", bound=SubRouterView)
 
 
@@ -251,7 +263,7 @@ async def _process_request_internal(self, request: Request) -> Response:
             request.path, request.method
         )
         if found_route is None:
-            raise NotFound()
+            raise NotFound
 
         # Extend instead of replacing?
         request.path_parameters = found_route.path_parameters
@@ -274,14 +286,13 @@ def route(self, path: str, /, *, method: Method) -> RouteDecorator:
         """
 
         if __debug__ and not isinstance(path, str):
-            raise InvalidType(path, str)
+            raise InvalidTypeError(path, str)
 
         if __debug__ and not isinstance(method, Method):
-            raise InvalidType(method, Method)
+            raise InvalidTypeError(method, Method)
 
         def decorator(view: RouteView, /) -> Route:
-            route = self.router.push_route(view, path, method)
-            return route
+            return self.router.push_route(view, path, method)
 
         return decorator
 
@@ -352,13 +363,15 @@ def decorator(view: RouteView, /) -> RouteView:
 
         return decorator
 
-    def subrouter(self, path: str) -> Callable[[SubRouterViewT], SubRouterViewT]:
+    def subrouter(
+        self, path: str
+    ) -> Callable[[SubRouterViewT], SubRouterViewT]:
         if __debug__ and not isinstance(path, str):
-            raise InvalidType(path, str)
+            raise InvalidTypeError(path, str)
 
         def decorator(function: SubRouterViewT, /) -> SubRouterViewT:
             if __debug__ and not callable(function):
-                raise InvalidType(Callable, function)
+                raise InvalidTypeError(Callable, function)
 
             def router_function(path_from_url: str) -> Route:
                 def route() -> ResponseLike | Awaitable[ResponseLike]:
@@ -373,18 +386,18 @@ def route() -> ResponseLike | Awaitable[ResponseLike]:
 
     def static_files(self, path: str, directory: str | Path) -> None:
         if __debug__ and not isinstance(directory, (str, Path)):
-            raise InvalidType(directory, str, Path)
+            raise InvalidTypeError(directory, str, Path)
 
         directory = Path(directory)
 
         @self.subrouter(path)
         def serve_static_file(path_from_url: str) -> ResponseLike:
             file = directory / path_from_url
             if not file.is_file():
-                raise NotFound()
+                raise NotFound
 
             if not file.is_relative_to(directory):
-                raise Forbidden()
+                raise Forbidden
 
             with reraise(Forbidden, OSError):
                 return FileResponse.from_file(file)