sqlspec 0.45.0__tar.gz → 0.46.0__tar.gz

{sqlspec-0.45.0 → sqlspec-0.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlspec
-Version: 0.45.0
+Version: 0.46.0
 Summary: SQL Experiments in Python
 Project-URL: Discord, https://discord.gg/litestar
 Project-URL: Issue, https://github.com/litestar-org/sqlspec/issues/

{sqlspec-0.45.0 → sqlspec-0.46.0}/pyproject.toml

@@ -24,7 +24,7 @@ maintainers = [{ name = "Litestar Developers", email = "hello@litestar.dev" }]
 name = "sqlspec"
 readme = "README.md"
 requires-python = ">=3.10, <4.0"
-version = "0.45.0"
+version = "0.46.0"
 
 [project.urls]
 Discord = "https://discord.gg/litestar"
@@ -264,7 +264,7 @@ opt_level = "3"   # Maximum optimization (0-3)
 allow_dirty = true
 commit = false
 commit_args = "--no-verify"
-current_version = "0.45.0"
+current_version = "0.46.0"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"

{sqlspec-0.45.0 → sqlspec-0.46.0}/sqlspec/adapters/oracledb/core.py

@@ -800,7 +800,7 @@ def build_profile() -> "DriverParameterProfile":
         allow_mixed_parameter_styles=False,
         preserve_original_params_for_many=False,
         json_serializer_strategy="driver",
-        custom_type_coercions={**build_uuid_coercions()},
+        custom_type_coercions={**build_uuid_coercions(native=True)},
         default_dialect="oracle",
     )
 

{sqlspec-0.45.0 → sqlspec-0.46.0}/sqlspec/extensions/litestar/plugin.py

@@ -39,7 +39,7 @@ from sqlspec.extensions.litestar.handlers import (
 from sqlspec.typing import NUMPY_INSTALLED, ConnectionT, PoolT, SchemaT
 from sqlspec.utils.correlation import CorrelationContext
 from sqlspec.utils.logging import get_logger, log_with_context
-from sqlspec.utils.serializers import numpy_array_dec_hook, numpy_array_enc_hook, numpy_array_predicate
+from sqlspec.utils.serializers import DEFAULT_TYPE_ENCODERS, numpy_array_dec_hook, numpy_array_predicate
 
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator, Callable
@@ -179,6 +179,23 @@ def _build_correlation_headers(*, primary: str, configured: list[str], auto_trac
     return tuple(_dedupe_headers(header_order))
 
 
+def _build_litestar_type_decoders() -> "list[tuple[Callable[[Any], bool], Callable[[type, Any], Any]]]":
+    """Build the Litestar-specific ``type_decoders`` list.
+
+    Decoders are predicate-tuples consumed by Litestar's request-body parsing,
+    not part of sqlspec's serializer registry — so they live here rather than
+    in :data:`sqlspec.utils.serializers.DEFAULT_TYPE_ENCODERS`.
+    """
+    decoders: list[tuple[Callable[[Any], bool], Callable[[type, Any], Any]]] = []
+    if NUMPY_INSTALLED:
+        decoders.append((numpy_array_predicate, numpy_array_dec_hook))
+    with suppress(ImportError):
+        import uuid_utils  # pyright: ignore[reportMissingImports]
+
+        decoders.append((lambda t: t is uuid_utils.UUID, lambda t, v: t(str(v))))
+    return decoders
+
+
 class CorrelationMiddleware:
     __slots__ = ("_app", "_headers")
 
@@ -467,28 +484,20 @@ class SQLSpecPlugin(InitPluginProtocol, CLIPlugin):
         existing_plugins = list(app_config.plugins or [])
         if not any(isinstance(p, _OffsetPaginationSchemaPlugin) for p in existing_plugins):
             existing_plugins.append(_OffsetPaginationSchemaPlugin())
-            app_config.plugins = existing_plugins
+        app_config.plugins = existing_plugins
 
         if app_config.exception_handlers is None:
             app_config.exception_handlers = {}
         app_config.exception_handlers.setdefault(NotFoundError, not_found_error_handler)
 
-        if NUMPY_INSTALLED:
-            import numpy as np
-
-            if app_config.type_encoders is None:
-                app_config.type_encoders = {np.ndarray: numpy_array_enc_hook}
-            else:
-                encoders_dict = dict(app_config.type_encoders)
-                encoders_dict[np.ndarray] = numpy_array_enc_hook
-                app_config.type_encoders = encoders_dict
-
-            if app_config.type_decoders is None:
-                app_config.type_decoders = [(numpy_array_predicate, numpy_array_dec_hook)]
-            else:
-                decoders_list = list(app_config.type_decoders)
-                decoders_list.append((numpy_array_predicate, numpy_array_dec_hook))
-                app_config.type_decoders = decoders_list
+        # Inject sqlspec's DEFAULT_TYPE_ENCODERS into Litestar's response serializer
+        # (user-supplied encoders win on conflict). Litestar's per-handler
+        # resolve_type_encoders() merges these with route/controller/router-level
+        # overrides automatically — no bidirectional thread needed.
+        app_config.type_encoders = {**DEFAULT_TYPE_ENCODERS, **(app_config.type_encoders or {})}
+        sqlspec_decoders = _build_litestar_type_decoders()
+        if sqlspec_decoders:
+            app_config.type_decoders = [*(app_config.type_decoders or []), *sqlspec_decoders]
 
         if self._correlation_headers:
             middleware = DefineMiddleware(CorrelationMiddleware, headers=self._correlation_headers)

{sqlspec-0.45.0 → sqlspec-0.46.0}/sqlspec/service.py

@@ -1,7 +1,7 @@
 """Service base classes for SQLSpec application services."""
 
 from contextlib import asynccontextmanager, contextmanager
-from typing import TYPE_CHECKING, Any, Generic, cast
+from typing import TYPE_CHECKING, Any, Generic, cast, overload
 
 from typing_extensions import TypeVar
 
@@ -51,6 +51,28 @@ class SQLSpecAsyncService(Generic[AsyncDriverT]):
         """Alias for :attr:`session` matching the recipe-doc terminology."""
         return self._session
 
+    @overload
+    async def paginate(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: "type[SchemaT]",
+        count_with_window: bool = False,
+        **kwargs: Any,
+    ) -> OffsetPagination[SchemaT]: ...
+
+    @overload
+    async def paginate(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: None = None,
+        count_with_window: bool = False,
+        **kwargs: Any,
+    ) -> OffsetPagination[dict[str, Any]]: ...
+
     async def paginate(
         self,
         statement: "Statement | QueryBuilder",
@@ -59,7 +81,7 @@ class SQLSpecAsyncService(Generic[AsyncDriverT]):
         schema_type: "type[SchemaT] | None" = None,
         count_with_window: bool = False,
         **kwargs: Any,
-    ) -> OffsetPagination[SchemaT]:
+    ) -> "OffsetPagination[SchemaT] | OffsetPagination[dict[str, Any]]":
         """Execute a paginated query and return an OffsetPagination container.
 
         Args:
@@ -78,6 +100,14 @@ class SQLSpecAsyncService(Generic[AsyncDriverT]):
             statement, *parameters, schema_type=schema_type, count_with_window=count_with_window, **kwargs
         )
 
+        if schema_type is None:
+            return OffsetPagination(
+                items=cast("list[dict[str, Any]]", items),
+                limit=limit_offset.limit if limit_offset is not None else len(items),
+                offset=limit_offset.offset if limit_offset is not None else 0,
+                total=total,
+            )
+
         return OffsetPagination(
             items=cast("list[SchemaT]", items),
             limit=limit_offset.limit if limit_offset is not None else len(items),
@@ -85,6 +115,39 @@ class SQLSpecAsyncService(Generic[AsyncDriverT]):
             total=total,
         )
 
+    @overload
+    async def get_one(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: "type[SchemaT]",
+        error_message: str | None = None,
+        **kwargs: Any,
+    ) -> SchemaT: ...
+
+    @overload
+    async def get_one(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: None = None,
+        error_message: str | None = None,
+        **kwargs: Any,
+    ) -> dict[str, Any]: ...
+
+    @overload
+    async def get_one(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: "type[SchemaT] | None" = None,
+        error_message: str | None = None,
+        **kwargs: Any,
+    ) -> "SchemaT | dict[str, Any]": ...
+
     async def get_one(
         self,
         statement: "Statement | QueryBuilder",
@@ -191,6 +254,28 @@ class SQLSpecSyncService(Generic[SyncDriverT]):
         """Alias for :attr:`session` matching the recipe-doc terminology."""
         return self._session
 
+    @overload
+    def paginate(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: "type[SchemaT]",
+        count_with_window: bool = False,
+        **kwargs: Any,
+    ) -> OffsetPagination[SchemaT]: ...
+
+    @overload
+    def paginate(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: None = None,
+        count_with_window: bool = False,
+        **kwargs: Any,
+    ) -> OffsetPagination[dict[str, Any]]: ...
+
     def paginate(
         self,
         statement: "Statement | QueryBuilder",
@@ -199,7 +284,7 @@ class SQLSpecSyncService(Generic[SyncDriverT]):
         schema_type: "type[SchemaT] | None" = None,
         count_with_window: bool = False,
         **kwargs: Any,
-    ) -> OffsetPagination[SchemaT]:
+    ) -> "OffsetPagination[SchemaT] | OffsetPagination[dict[str, Any]]":
         """Execute a paginated query and return an OffsetPagination container.
 
         Args:
@@ -218,6 +303,14 @@ class SQLSpecSyncService(Generic[SyncDriverT]):
             statement, *parameters, schema_type=schema_type, count_with_window=count_with_window, **kwargs
         )
 
+        if schema_type is None:
+            return OffsetPagination(
+                items=cast("list[dict[str, Any]]", items),
+                limit=limit_offset.limit if limit_offset is not None else len(items),
+                offset=limit_offset.offset if limit_offset is not None else 0,
+                total=total,
+            )
+
         return OffsetPagination(
             items=cast("list[SchemaT]", items),
             limit=limit_offset.limit if limit_offset is not None else len(items),
@@ -225,6 +318,39 @@ class SQLSpecSyncService(Generic[SyncDriverT]):
             total=total,
         )
 
+    @overload
+    def get_one(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: "type[SchemaT]",
+        error_message: str | None = None,
+        **kwargs: Any,
+    ) -> SchemaT: ...
+
+    @overload
+    def get_one(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: None = None,
+        error_message: str | None = None,
+        **kwargs: Any,
+    ) -> dict[str, Any]: ...
+
+    @overload
+    def get_one(
+        self,
+        statement: "Statement | QueryBuilder",
+        /,
+        *parameters: "StatementParameters | StatementFilter",
+        schema_type: "type[SchemaT] | None" = None,
+        error_message: str | None = None,
+        **kwargs: Any,
+    ) -> "SchemaT | dict[str, Any]": ...
+
     def get_one(
         self,
         statement: "Statement | QueryBuilder",

{sqlspec-0.45.0 → sqlspec-0.46.0}/sqlspec/utils/schema.py

@@ -79,6 +79,7 @@ def _safe_convert_key(key: Any, converter: Callable[[str], str]) -> Any:
 
     Returns:
         Converted key if conversion succeeds, original key otherwise.
+
     """
     if not isinstance(key, str):
         return key
@@ -132,6 +133,7 @@ def transform_dict_keys(data: dict | list | Any, converter: Callable[[str], str]
                 {"itemId": 2, "itemName": "Product B"}
             ]
         }
+
     """
     if isinstance(data, dict):
         return _transform_dict(data, converter)
@@ -149,6 +151,7 @@ def _transform_dict(data: dict, converter: Callable[[str], str]) -> dict:
 
     Returns:
         Dictionary with transformed keys and recursively transformed values.
+
     """
     transformed = {}
 
@@ -169,6 +172,7 @@ def _transform_list(data: list, converter: Callable[[str], str]) -> list:
 
     Returns:
         List with recursively transformed elements.
+
     """
     return [transform_dict_keys(item, converter) for item in data]
 
@@ -209,6 +213,7 @@ def _detect_schema_type(schema_type: type) -> "str | None":
 
     Returns:
         Type identifier string or None if unsupported
+
     """
     return (
         "typed_dict"
@@ -339,6 +344,7 @@ def _default_msgspec_deserializer(
 
     Returns:
         Converted value or original value if conversion not applicable
+
     """
     if NUMPY_INSTALLED:
         import numpy as np
@@ -393,6 +399,7 @@ def _convert_numpy_recursive(obj: Any) -> Any:
 
     Returns:
         Object with all numpy arrays converted to lists
+
     """
     if not NUMPY_INSTALLED:
         return obj
@@ -494,6 +501,7 @@ def _get_schema_converter(schema_type: type) -> "Callable[[Any, Any], Any] | Non
 
     Returns:
         Converter function if schema_type is a supported schema, None otherwise.
+
     """
     try:
         return _SCHEMA_CONVERTER_CACHE[schema_type]
@@ -546,6 +554,7 @@ def to_schema(data: Any, *, schema_type: Any = None) -> Any:
 
     Raises:
         SQLSpecError: If schema_type is not a supported type
+
     """
     if schema_type is None:
         return data
@@ -575,6 +584,7 @@ def _ensure_json_parsed(value: Any) -> Any:
 
     Returns:
         Parsed JSON object if value was a valid JSON string, otherwise the original value.
+
     """
     if isinstance(value, str):
         try:
@@ -592,6 +602,7 @@ def _try_parse_json(value: str) -> Any:
 
     Returns:
         Parsed JSON value, or None if parsing fails.
+
     """
     try:
         return from_json(value)
@@ -619,6 +630,7 @@ def _convert_to_int(value: Any) -> int:
 
     Raises:
         TypeError: If value cannot be converted to int.
+
     """
     if isinstance(value, bool):
         return int(value)
@@ -648,6 +660,7 @@ def _convert_to_float(value: Any) -> float:
 
     Raises:
         TypeError: If value cannot be converted to float.
+
     """
     if isinstance(value, bool):
         return float(value)
@@ -673,6 +686,7 @@ def _convert_to_bool(value: Any) -> bool:
 
     Raises:
         TypeError: If value cannot be converted to bool.
+
     """
     if isinstance(value, bool):
         return value
@@ -695,6 +709,7 @@ def _convert_to_datetime(value: Any) -> datetime.datetime:
 
     Raises:
         TypeError: If value cannot be converted to datetime.
+
     """
     if isinstance(value, datetime.datetime):
         return value
@@ -720,6 +735,7 @@ def _convert_to_date(value: Any) -> datetime.date:
 
     Raises:
         TypeError: If value cannot be converted to date.
+
     """
     if isinstance(value, datetime.datetime):
         return value.date()
@@ -750,6 +766,7 @@ def _convert_to_time(value: Any) -> datetime.time:
 
     Raises:
         TypeError: If value cannot be converted to time.
+
     """
     if isinstance(value, datetime.datetime):
         return value.time()
@@ -775,6 +792,7 @@ def _convert_to_decimal(value: Any) -> Decimal:
 
     Raises:
         TypeError: If value cannot be converted to Decimal.
+
     """
     if isinstance(value, Decimal):
         return value
@@ -798,6 +816,7 @@ def _convert_to_uuid(value: Any) -> UUID:
 
     Raises:
         TypeError: If value cannot be converted to UUID.
+
     """
     if isinstance(value, UUID):
         return value
@@ -826,6 +845,7 @@ def _convert_to_path(value: Any) -> Path:
 
     Raises:
         TypeError: If value cannot be converted to Path.
+
     """
     if isinstance(value, Path):
         return value
@@ -849,6 +869,7 @@ def _convert_to_dict(value: Any) -> dict[str, Any]:
 
     Raises:
         TypeError: If value cannot be converted to dict.
+
     """
     if isinstance(value, dict):
         return value
@@ -877,6 +898,7 @@ def _convert_to_list(value: Any) -> list[Any]:
 
     Raises:
         TypeError: If value cannot be converted to list.
+
     """
     if isinstance(value, list):
         return value
@@ -968,6 +990,7 @@ def to_value_type(value: Any, value_type: "type[ValueT]") -> "ValueT":
         1
         >>> to_value_type(False, int)
         0
+
     """
     # Fast path: already correct type (handles ~90% of cases)
     # Uses strict type() identity which correctly handles subclass gotchas:

{sqlspec-0.45.0 → sqlspec-0.46.0}/sqlspec/utils/serializers/__init__.py

@@ -1,5 +1,6 @@
 """Serialization utilities for SQLSpec."""
 
+from sqlspec.utils.serializers._json import DEFAULT_TYPE_ENCODERS, TypeEncodersMap
 from sqlspec.utils.serializers._json import decode_json as from_json
 from sqlspec.utils.serializers._json import encode_json as to_json
 from sqlspec.utils.serializers._numpy import numpy_array_dec_hook, numpy_array_enc_hook, numpy_array_predicate
@@ -13,7 +14,9 @@ from sqlspec.utils.serializers._schema import (
 )
 
 __all__ = (
+    "DEFAULT_TYPE_ENCODERS",
     "SchemaSerializer",
+    "TypeEncodersMap",
     "from_json",
     "get_collection_serializer",
     "get_serializer_metrics",