sillo-framework 1.2.0__tar.gz → 1.2.1__tar.gz

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/CHANGELOG.md

@@ -5,7 +5,31 @@ All notable changes to Sillo are documented here.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.2.1] - 2026-10-19
+
+### Added
+
+- The `s3` storage driver the documentation and the `storage-s3` extra already
+  described now ships (#458, #485). `sillo.storage.drivers.s3.S3Driver`
+  implements the same `Driver` contract as the local and memory drivers,
+  signing requests with AWS Signature Version 4 in pure Python over `httpx`
+  rather than depending on boto3. It works with AWS S3, MinIO, Cloudflare R2,
+  Backblaze B2, DigitalOcean Spaces, Wasabi and Ceph, supports path-style and
+  virtual-hosted addressing, a key prefix, a separate public endpoint for
+  presigned URLs, streaming writes and range reads, paged listings, and
+  creating a missing bucket on first write. Install it with
+  `sillo[storage-s3]`.
+- `sillo.record.AnyJSONField` stores ordinary JSON-compatible Python values,
+  including bare strings, without requiring callers to pre-encode them (#460).
+
+### Fixed
+
+- `HTTPClient` with configured middleware no longer fails every request. The
+  middleware chain consumes each link with `async for`, but the terminal call
+  was `httpx.AsyncClient.send` -- a coroutine function -- passed in directly,
+  so any `middlewares=` entry raised `TypeError: 'async for' requires an object
+  with __aiter__` before a request left the process. The terminal call is now
+  adapted to the chain's async-iterator contract (#455).
 
 ## [1.2.0] - 2026-10-08
 

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sillo-framework
-Version: 1.2.0
+Version: 1.2.1
 Summary: Python with the pieces already in place: an async web framework whose ORM, auth, admin, queues, scheduler and WebSockets share one configuration model.
 Project-URL: Homepage, https://github.com/sillohq/core
 Project-URL: Repository, https://github.com/sillohq/core
@@ -69,7 +69,7 @@ Requires-Dist: pytest-asyncio<1.5.0,>=0.25.3; extra == 'dev'
 Requires-Dist: pytest<9.1.0,>=8.3.4; extra == 'dev'
 Requires-Dist: python-ulid>=2.0.0; extra == 'dev'
 Requires-Dist: redis>=5.0.0; extra == 'dev'
-Requires-Dist: ruff<0.17,>=0.16.0; extra == 'dev'
+Requires-Dist: ruff<0.18,>=0.16.0; extra == 'dev'
 Requires-Dist: scrypt>=0.8.0; extra == 'dev'
 Requires-Dist: tortoise-orm>=1.0; extra == 'dev'
 Requires-Dist: ty<0.1,>=0.0.63; extra == 'dev'

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/pyproject.toml

@@ -31,7 +31,7 @@ exclude = [
 
 [project]
 name = "sillo-framework"
-version = "1.2.0"
+version = "1.2.1"
 description = "Python with the pieces already in place: an async web framework whose ORM, auth, admin, queues, scheduler and WebSockets share one configuration model."
 authors = [
     {name = "Chidebele Dunamis", email = "techwithdunamix@gmail.com"}
@@ -204,7 +204,7 @@ dev = [
     # upstream release turns the build red with no change from us, and ty in
     # particular adds checks between patch releases. Upper-bounded so a
     # version bump is a commit somebody chose to make.
-    "ruff>=0.16.0,<0.17",
+    "ruff>=0.16.0,<0.18",
     "ty>=0.0.63,<0.1",
     # Type stubs
     "typing-extensions==4.16.0",
@@ -368,7 +368,7 @@ ignore = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.2.0"
+version = "1.2.1"
 version_files = [
     "pyproject.toml:version",
     "sillo/__init__.py:__version__"
@@ -409,7 +409,7 @@ dev = [
     # upstream release turns the build red with no change from us, and ty in
     # particular adds checks between patch releases. Upper-bounded so a
     # version bump is a commit somebody chose to make.
-    "ruff>=0.16.0,<0.17",
+    "ruff>=0.16.0,<0.18",
     "ty>=0.0.63,<0.1",
     # Type hints
     "typing-extensions>=4.12.2",

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/__init__.py

@@ -119,7 +119,7 @@ Common Patterns:
 
 from sillo.core.routing import Group, Route, Router, WebsocketRoute
 
-__version__: str = "1.2.0"
+__version__: str = "1.2.1"
 
 from sillo.core.dependencies import Depend
 

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/http/client/client.py

@@ -277,13 +277,32 @@ class HTTPClient:
                 )
             state.stats.cache_misses += 1
 
+        effective_follow_redirects = (
+            follow_redirects
+            if follow_redirects is not None
+            else self._config.follow_redirects
+        )
+
+        # The middleware chain consumes every link -- including the terminal
+        # one -- with `async for`, so the terminal call must return an async
+        # iterator. httpx's `AsyncClient.send` is a coroutine function, so it
+        # is adapted to the chain's contract here rather than passed directly.
+        async def _terminal_send(
+            req: httpx.Request,
+        ) -> typing.AsyncGenerator[httpx.Response, None]:
+            yield await self._http_client.send(
+                req,
+                auth=auth,
+                follow_redirects=effective_follow_redirects,
+            )
+
         # Middleware chain (only when middlewares are registered)
         mw_chain = state.middleware_chain
 
         try:
             if mw_chain and mw_chain._middlewares:
                 response = None
-                async for r in mw_chain.run(request, self._http_client.send):  # ty: ignore[invalid-argument-type]
+                async for r in mw_chain.run(request, _terminal_send):
                     response = r
                 if response is None:
                     raise HTTPStatusError(
@@ -296,11 +315,7 @@ class HTTPClient:
                 response = await self._http_client.send(
                     request,
                     auth=auth,
-                    follow_redirects=(
-                        follow_redirects
-                        if follow_redirects is not None
-                        else self._config.follow_redirects
-                    ),
+                    follow_redirects=effective_follow_redirects,
                 )
         except httpx.TimeoutException as exc:
             state.stats.requests_failed += 1

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/record/__init__.py

@@ -23,6 +23,7 @@ from .events import HasEvents, ModelObserver
 from .exceptions import register_db_exception_handlers
 from .factories import Factory, FactoryBuilder
 from .fields import (
+    AnyJSONField,
     CreatedAtField,
     SlugField,
     SoftDeleteField,
@@ -48,6 +49,7 @@ from .scopes import HasScopes, RecordManager, RecordQuerySet, ScopeRegistry
 from .transactions import TransactionContext, begin, commit, rollback, transaction
 
 __all__ = [
+    "AnyJSONField",
     "CascadesDeletesMixin",
     "Collection",
     "CreatedAtField",

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/record/fields.py

@@ -2,17 +2,52 @@
 sillo.record.fields — Custom Tortoise field types.
 
 - CreatedAtField / UpdatedAtField / SoftDeleteField
+- AnyJSONField — stores every JSON-compatible Python value, including strings
 - SlugField — auto-generated URL-safe slug
 - ULIDField — sortable primary key
 """
 
 from __future__ import annotations
 
+from typing import Any
+
 from tortoise import fields as _fields
+from tortoise.exceptions import FieldError
 
 from sillo.helpers.hashing import hash_password, is_hashed
 
 
+class AnyJSONField(_fields.JSONField):
+    """A JSON field that treats strings as values, not serialized JSON.
+
+    Tortoise's :class:`~tortoise.fields.JSONField` assumes every ``str`` is
+    already JSON-encoded. That makes a normal Python string such as
+    ``"authenticated"`` fail validation unless the caller encodes it first.
+    This field encodes strings in the same way as dictionaries, lists and
+    other JSON-compatible values.
+
+    Use the standard Tortoise field when callers intentionally supply encoded
+    JSON strings. With this field, a string that looks like serialized JSON is
+    stored as a JSON string rather than interpreted as an object or list.
+    """
+
+    def to_db_value(self, value: Any, instance: Any) -> Any:
+        """Encode Python strings as JSON string values."""
+        if isinstance(value, str):
+            self.validate(value)
+            return self.encoder(value)
+        return super().to_db_value(value, instance)
+
+    def to_python_value(self, value: Any) -> Any:
+        """Accept string scalars already decoded by a database driver."""
+        try:
+            return super().to_python_value(value)
+        except FieldError:
+            if isinstance(value, str):
+                return value
+            raise
+
+
 class PasswordField(_fields.CharField):
     """A CharField that stores a *hashed* password, never the plaintext.
 

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/record/models.py

@@ -27,7 +27,7 @@ from tortoise.exceptions import ConfigurationError, OperationalError
 from typing_extensions import Doc, Self
 
 from .casting import HasCasts
-from .fields import CreatedAtField, SoftDeleteField, UpdatedAtField
+from .fields import AnyJSONField, CreatedAtField, SoftDeleteField, UpdatedAtField
 from .scopes import HasScopes, RecordManager
 from .serialization import model_to_dict
 
@@ -110,7 +110,10 @@ class Model(_TortoiseModel, HasCasts, HasScopes):
                         f"{key} is non nullable field, but null was passed"
                     )
                 if key not in casts:
-                    value = field_object.to_python_value(value)
+                    is_any_json = isinstance(field_object, AnyJSONField)
+                    preserve_string = is_any_json and isinstance(value, str)
+                    if not preserve_string:
+                        value = field_object.to_python_value(value)
                 setattr(self, key, value)
             elif key in meta.backward_fk_fields:
                 raise ConfigurationError(

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/record/pydantic.py

@@ -9,10 +9,12 @@ from __future__ import annotations
 
 from typing import Annotated, Any, Optional
 
-from pydantic import BaseModel, Field, create_model
+from pydantic import BaseModel, Field, JsonValue, create_model
 from tortoise import fields as f
 from typing_extensions import Doc
 
+from .fields import AnyJSONField
+
 
 def pydantic_model_from_tortoise(
     model_class: type,
@@ -78,7 +80,7 @@ def pydantic_model_from_tortoise(
     )
 
 
-def _tortoise_to_python_type(field_obj) -> type:
+def _tortoise_to_python_type(field_obj) -> Any:
     """Map a Tortoise ORM field type to the corresponding Python type.
 
     Looks up the field instance against a hardcoded mapping of common
@@ -93,6 +95,9 @@ def _tortoise_to_python_type(field_obj) -> type:
         ``float``, ``dict``) or ``str`` as a fallback for unrecognised
         field types.
     """
+    if isinstance(field_obj, AnyJSONField):
+        return JsonValue
+
     mapping = {
         f.IntField: int,
         f.SmallIntField: int,

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/storage/__init__.py

@@ -34,6 +34,8 @@ Five properties this package is built around, each of which forces something:
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from .base import Action, Driver, FileInfo, Page, StorageEvent, Stored, chunks, collect
 from .bucket import Bucket
 from .config import BucketConfig, StorageConfig
@@ -52,6 +54,9 @@ from .signing import SignedGrant, Signer
 from .storage import Storage, StorageInstallable, bucket, setup_storage
 from .uploads import stream_upload
 
+if TYPE_CHECKING:
+    from .drivers.s3 import S3Driver
+
 __all__ = [
     "Action",
     "Bucket",
@@ -68,6 +73,7 @@ __all__ = [
     "Private",
     "Public",
     "ReadOnly",
+    "S3Driver",
     "SignatureInvalid",
     "Signed",
     "SignedGrant",
@@ -87,3 +93,11 @@ __all__ = [
     "setup_storage",
     "stream_upload",
 ]
+
+
+def __getattr__(name: str) -> object:
+    if name == "S3Driver":
+        from .drivers.s3 import S3Driver
+
+        return S3Driver
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/storage/config.py

@@ -28,6 +28,9 @@ class BucketConfig:
         region: The S3 region.
         access_key: The S3 access key. Read from the environment in practice.
         secret_key: The S3 secret key.
+        prefix: A key prefix for S3, so multiple buckets can share a remote bucket.
+        path_style: Address the S3 bucket in the path (MinIO, Ceph) instead of host.
+        public_endpoint: S3 origin reachable by browsers for presigned URLs.
         max_bytes: Largest object this bucket accepts. Zero for no limit.
         accepts: Content types this bucket accepts, after sniffing. Empty for
             anything. Stated as what the *sniffer* decided, so declaring
@@ -43,6 +46,9 @@ class BucketConfig:
     region: str = "us-east-1"
     access_key: str = ""
     secret_key: str = ""
+    prefix: str = ""
+    path_style: bool = True
+    public_endpoint: str = ""
     max_bytes: int = 0
     accepts: tuple[str, ...] = ()
 

{sillo_framework-1.2.0 → sillo_framework-1.2.1}/sillo/storage/drivers/__init__.py

@@ -9,7 +9,20 @@ contract suite the shipped ones are held to.
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from .local import LocalDriver
 from .memory import MemoryDriver
 
-__all__ = ["LocalDriver", "MemoryDriver"]
+if TYPE_CHECKING:
+    from .s3 import S3Driver
+
+__all__ = ["LocalDriver", "MemoryDriver", "S3Driver"]
+
+
+def __getattr__(name: str) -> object:
+    if name == "S3Driver":
+        from .s3 import S3Driver
+
+        return S3Driver
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")