sqlspec 0.25.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

sqlspec/__init__.py

@@ -2,7 +2,6 @@
 
 from sqlspec import adapters, base, builder, core, driver, exceptions, extensions, loader, migrations, typing, utils
 from sqlspec.__metadata__ import __version__
-from sqlspec._sql import SQLFactory, sql
 from sqlspec.base import SQLSpec
 from sqlspec.builder import (
     Column,
@@ -15,7 +14,9 @@ from sqlspec.builder import (
     Merge,
     QueryBuilder,
     Select,
+    SQLFactory,
     Update,
+    sql,
 )
 from sqlspec.config import AsyncDatabaseConfig, SyncDatabaseConfig
 from sqlspec.core import (
@@ -34,16 +35,10 @@ from sqlspec.core import (
 from sqlspec.core import filters as filters
 from sqlspec.driver import AsyncDriverAdapterBase, ExecutionResult, SyncDriverAdapterBase
 from sqlspec.loader import SQLFile, SQLFileLoader
-from sqlspec.typing import (
-    ConnectionT,
-    DictRow,
-    ModelDTOT,
-    ModelT,
-    PoolT,
-    RowT,
-    StatementParameters,
-    SupportedSchemaModel,
-)
+from sqlspec.typing import ConnectionT, PoolT, SchemaT, StatementParameters, SupportedSchemaModel
+from sqlspec.utils.logging import suppress_erroneous_sqlglot_log_messages
+
+suppress_erroneous_sqlglot_log_messages()
 
 __all__ = (
     "SQL",
@@ -57,26 +52,23 @@ __all__ = (
     "ConnectionT",
     "CreateTable",
     "Delete",
-    "DictRow",
     "DropTable",
     "ExecutionResult",
     "FunctionColumn",
     "Insert",
     "Merge",
-    "ModelDTOT",
-    "ModelT",
     "ParameterConverter",
     "ParameterProcessor",
     "ParameterStyle",
     "ParameterStyleConfig",
     "PoolT",
     "QueryBuilder",
-    "RowT",
     "SQLFactory",
     "SQLFile",
     "SQLFileLoader",
     "SQLResult",
     "SQLSpec",
+    "SchemaT",
     "Select",
     "Statement",
     "StatementConfig",

sqlspec/_serialization.py

@@ -1,11 +1,37 @@
+"""Enhanced serialization module with byte-aware encoding and class-based architecture.
+
+Provides a Protocol-based serialization system that users can extend.
+Supports msgspec, orjson, and standard library JSON with automatic fallback.
+
+Features optional numpy array serialization when numpy is installed.
+Arrays are automatically converted to lists during JSON encoding.
+"""
+
+import contextlib
 import datetime
 import enum
-from typing import Any
+import json
+from abc import ABC, abstractmethod
+from typing import Any, Final, Literal, Protocol, overload
+
+from sqlspec._typing import NUMPY_INSTALLED
+from sqlspec.typing import MSGSPEC_INSTALLED, ORJSON_INSTALLED, PYDANTIC_INSTALLED, BaseModel
+
 
-from sqlspec.typing import PYDANTIC_INSTALLED, BaseModel
+def _type_to_string(value: Any) -> Any:  # pragma: no cover
+    """Convert special types to strings for JSON serialization.
 
+    Handles datetime, date, enums, Pydantic models, and numpy arrays.
 
-def _type_to_string(value: Any) -> str:  # pragma: no cover
+    Args:
+        value: Value to convert.
+
+    Returns:
+        Serializable representation of the value (string, list, dict, etc.).
+
+    Raises:
+        TypeError: If value cannot be serialized.
+    """
     if isinstance(value, datetime.datetime):
         return convert_datetime_to_gmt_iso(value)
     if isinstance(value, datetime.date):
@@ -14,41 +40,233 @@ def _type_to_string(value: Any) -> str:  # pragma: no cover
         return str(value.value)
     if PYDANTIC_INSTALLED and isinstance(value, BaseModel):
         return value.model_dump_json()
+    if NUMPY_INSTALLED:
+        import numpy as np
+
+        if isinstance(value, np.ndarray):
+            return value.tolist()
     try:
         return str(value)
     except Exception as exc:
-        raise TypeError from exc
+        msg = f"Cannot serialize {type(value).__name__}"
+        raise TypeError(msg) from exc
 
 
-try:
-    from msgspec.json import Decoder, Encoder
+class JSONSerializer(Protocol):
+    """Protocol for JSON serialization implementations.
 
-    encoder, decoder = Encoder(enc_hook=_type_to_string), Decoder()
-    decode_json = decoder.decode
+    Users can implement this protocol to create custom serializers.
+    """
 
-    def encode_json(data: Any) -> str:  # pragma: no cover
-        return encoder.encode(data).decode("utf-8")
+    def encode(self, data: Any, *, as_bytes: bool = False) -> str | bytes:
+        """Encode data to JSON.
 
-except ImportError:
-    try:
-        from orjson import (  # pyright: ignore[reportMissingImports]
+        Args:
+            data: Data to encode.
+            as_bytes: Whether to return bytes instead of string.
+
+        Returns:
+            JSON string or bytes depending on as_bytes parameter.
+        """
+        ...
+
+    def decode(self, data: str | bytes, *, decode_bytes: bool = True) -> Any:
+        """Decode from JSON.
+
+        Args:
+            data: JSON string or bytes to decode.
+            decode_bytes: Whether to decode bytes input.
+
+        Returns:
+            Decoded Python object.
+        """
+        ...
+
+
+class BaseJSONSerializer(ABC):
+    """Base class for JSON serializers with common functionality."""
+
+    __slots__ = ()
+
+    @abstractmethod
+    def encode(self, data: Any, *, as_bytes: bool = False) -> str | bytes:
+        """Encode data to JSON."""
+        ...
+
+    @abstractmethod
+    def decode(self, data: str | bytes, *, decode_bytes: bool = True) -> Any:
+        """Decode from JSON."""
+        ...
+
+
+class MsgspecSerializer(BaseJSONSerializer):
+    """Msgspec-based JSON serializer."""
+
+    __slots__ = ("_decoder", "_encoder")
+
+    def __init__(self) -> None:
+        """Initialize msgspec encoder and decoder."""
+        from msgspec.json import Decoder, Encoder
+
+        self._encoder: Final[Encoder] = Encoder(enc_hook=_type_to_string)
+        self._decoder: Final[Decoder] = Decoder()
+
+    def encode(self, data: Any, *, as_bytes: bool = False) -> str | bytes:
+        """Encode data using msgspec."""
+        try:
+            if as_bytes:
+                return self._encoder.encode(data)
+            return self._encoder.encode(data).decode("utf-8")
+        except (TypeError, ValueError):
+            if ORJSON_INSTALLED:
+                return OrjsonSerializer().encode(data, as_bytes=as_bytes)
+            return StandardLibSerializer().encode(data, as_bytes=as_bytes)
+
+    def decode(self, data: str | bytes, *, decode_bytes: bool = True) -> Any:
+        """Decode data using msgspec."""
+        if isinstance(data, bytes):
+            if decode_bytes:
+                try:
+                    return self._decoder.decode(data)
+                except (TypeError, ValueError):
+                    if ORJSON_INSTALLED:
+                        return OrjsonSerializer().decode(data, decode_bytes=decode_bytes)
+                    return StandardLibSerializer().decode(data, decode_bytes=decode_bytes)
+            return data
+
+        try:
+            return self._decoder.decode(data.encode("utf-8"))
+        except (TypeError, ValueError):
+            if ORJSON_INSTALLED:
+                return OrjsonSerializer().decode(data, decode_bytes=decode_bytes)
+            return StandardLibSerializer().decode(data, decode_bytes=decode_bytes)
+
+
+class OrjsonSerializer(BaseJSONSerializer):
+    """Orjson-based JSON serializer with native datetime/UUID support.
+
+    Automatically enables numpy serialization if numpy is installed.
+    """
+
+    __slots__ = ()
+
+    def encode(self, data: Any, *, as_bytes: bool = False) -> str | bytes:
+        """Encode data using orjson.
+
+        Args:
+            data: Data to encode.
+            as_bytes: Whether to return bytes instead of string.
+
+        Returns:
+            JSON string or bytes depending on as_bytes parameter.
+        """
+        from orjson import (
             OPT_NAIVE_UTC,  # pyright: ignore[reportUnknownVariableType]
-            OPT_SERIALIZE_NUMPY,  # pyright: ignore[reportUnknownVariableType]
             OPT_SERIALIZE_UUID,  # pyright: ignore[reportUnknownVariableType]
         )
-        from orjson import dumps as _encode_json  # pyright: ignore[reportUnknownVariableType,reportMissingImports]
-        from orjson import loads as decode_json  # type: ignore[no-redef,assignment,unused-ignore]
+        from orjson import dumps as _orjson_dumps  # pyright: ignore[reportMissingImports]
+
+        options = OPT_NAIVE_UTC | OPT_SERIALIZE_UUID
 
-        def encode_json(data: Any) -> str:  # pragma: no cover
-            return _encode_json(
-                data, default=_type_to_string, option=OPT_SERIALIZE_NUMPY | OPT_NAIVE_UTC | OPT_SERIALIZE_UUID
-            ).decode("utf-8")
+        if NUMPY_INSTALLED:
+            from orjson import OPT_SERIALIZE_NUMPY  # pyright: ignore[reportUnknownVariableType]
 
-    except ImportError:
-        from json import dumps as encode_json  # type: ignore[assignment]
-        from json import loads as decode_json  # type: ignore[assignment]
+            options |= OPT_SERIALIZE_NUMPY
 
-__all__ = ("convert_date_to_iso", "convert_datetime_to_gmt_iso", "decode_json", "encode_json")
+        result = _orjson_dumps(data, default=_type_to_string, option=options)
+        return result if as_bytes else result.decode("utf-8")
+
+    def decode(self, data: str | bytes, *, decode_bytes: bool = True) -> Any:
+        """Decode data using orjson."""
+        from orjson import loads as _orjson_loads  # pyright: ignore[reportMissingImports]
+
+        if isinstance(data, bytes):
+            if decode_bytes:
+                return _orjson_loads(data)
+            return data
+        return _orjson_loads(data)
+
+
+class StandardLibSerializer(BaseJSONSerializer):
+    """Standard library JSON serializer as fallback."""
+
+    __slots__ = ()
+
+    def encode(self, data: Any, *, as_bytes: bool = False) -> str | bytes:
+        """Encode data using standard library json."""
+        json_str = json.dumps(data, default=_type_to_string)
+        return json_str.encode("utf-8") if as_bytes else json_str
+
+    def decode(self, data: str | bytes, *, decode_bytes: bool = True) -> Any:
+        """Decode data using standard library json."""
+        if isinstance(data, bytes):
+            if decode_bytes:
+                return json.loads(data.decode("utf-8"))
+            return data
+        return json.loads(data)
+
+
+_default_serializer: JSONSerializer | None = None
+
+
+def get_default_serializer() -> JSONSerializer:
+    """Get the default serializer based on available libraries.
+
+    Priority: msgspec > orjson > stdlib
+
+    Returns:
+        The best available JSON serializer.
+    """
+    global _default_serializer
+
+    if _default_serializer is None:
+        if MSGSPEC_INSTALLED:
+            with contextlib.suppress(ImportError):
+                _default_serializer = MsgspecSerializer()
+
+        if _default_serializer is None and ORJSON_INSTALLED:
+            with contextlib.suppress(ImportError):
+                _default_serializer = OrjsonSerializer()
+
+        if _default_serializer is None:
+            _default_serializer = StandardLibSerializer()
+
+    assert _default_serializer is not None
+    return _default_serializer
+
+
+@overload
+def encode_json(data: Any, *, as_bytes: Literal[False] = ...) -> str: ...  # pragma: no cover
+
+
+@overload
+def encode_json(data: Any, *, as_bytes: Literal[True]) -> bytes: ...  # pragma: no cover
+
+
+def encode_json(data: Any, *, as_bytes: bool = False) -> str | bytes:
+    """Encode to JSON, optionally returning bytes.
+
+    Args:
+        data: The data to encode.
+        as_bytes: Whether to return bytes instead of string.
+
+    Returns:
+        JSON string or bytes depending on as_bytes parameter.
+    """
+    return get_default_serializer().encode(data, as_bytes=as_bytes)
+
+
+def decode_json(data: str | bytes, *, decode_bytes: bool = True) -> Any:
+    """Decode from JSON string or bytes efficiently.
+
+    Args:
+        data: JSON string or bytes to decode.
+        decode_bytes: Whether to decode bytes input.
+
+    Returns:
+        Decoded Python object.
+    """
+    return get_default_serializer().decode(data, decode_bytes=decode_bytes)
 
 
 def convert_datetime_to_gmt_iso(dt: datetime.datetime) -> str:  # pragma: no cover
@@ -75,3 +293,17 @@ def convert_date_to_iso(dt: datetime.date) -> str:  # pragma: no cover
         The ISO formatted date string.
     """
     return dt.isoformat()
+
+
+__all__ = (
+    "BaseJSONSerializer",
+    "JSONSerializer",
+    "MsgspecSerializer",
+    "OrjsonSerializer",
+    "StandardLibSerializer",
+    "convert_date_to_iso",
+    "convert_datetime_to_gmt_iso",
+    "decode_json",
+    "encode_json",
+    "get_default_serializer",
+)

sqlspec/_typing.py

@@ -6,9 +6,9 @@ from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
 from enum import Enum
 from importlib.util import find_spec
-from typing import Any, ClassVar, Final, Optional, Protocol, Union, cast, runtime_checkable
+from typing import Any, ClassVar, Final, Literal, Protocol, cast, runtime_checkable
 
-from typing_extensions import Literal, TypeVar, dataclass_transform
+from typing_extensions import TypeVar, dataclass_transform
 
 
 @runtime_checkable
@@ -38,15 +38,15 @@ class BaseModelStub:
         self,
         /,
         *,
-        include: "Optional[Any]" = None,  # noqa: ARG002
-        exclude: "Optional[Any]" = None,  # noqa: ARG002
-        context: "Optional[Any]" = None,  # noqa: ARG002
+        include: "Any | None" = None,  # noqa: ARG002
+        exclude: "Any | None" = None,  # noqa: ARG002
+        context: "Any | None" = None,  # noqa: ARG002
         by_alias: bool = False,  # noqa: ARG002
         exclude_unset: bool = False,  # noqa: ARG002
         exclude_defaults: bool = False,  # noqa: ARG002
         exclude_none: bool = False,  # noqa: ARG002
         round_trip: bool = False,  # noqa: ARG002
-        warnings: "Union[bool, Literal['none', 'warn', 'error']]" = True,  # noqa: ARG002
+        warnings: "bool | Literal['none', 'warn', 'error']" = True,  # noqa: ARG002
         serialize_as_any: bool = False,  # noqa: ARG002
     ) -> "dict[str, Any]":
         """Placeholder implementation."""
@@ -56,15 +56,15 @@ class BaseModelStub:
         self,
         /,
         *,
-        include: "Optional[Any]" = None,  # noqa: ARG002
-        exclude: "Optional[Any]" = None,  # noqa: ARG002
-        context: "Optional[Any]" = None,  # noqa: ARG002
+        include: "Any | None" = None,  # noqa: ARG002
+        exclude: "Any | None" = None,  # noqa: ARG002
+        context: "Any | None" = None,  # noqa: ARG002
         by_alias: bool = False,  # noqa: ARG002
         exclude_unset: bool = False,  # noqa: ARG002
         exclude_defaults: bool = False,  # noqa: ARG002
         exclude_none: bool = False,  # noqa: ARG002
         round_trip: bool = False,  # noqa: ARG002
-        warnings: "Union[bool, Literal['none', 'warn', 'error']]" = True,  # noqa: ARG002
+        warnings: "bool | Literal['none', 'warn', 'error']" = True,  # noqa: ARG002
         serialize_as_any: bool = False,  # noqa: ARG002
     ) -> str:
         """Placeholder implementation."""
@@ -78,9 +78,9 @@ class TypeAdapterStub:
         self,
         type: Any,  # noqa: A002
         *,
-        config: "Optional[Any]" = None,  # noqa: ARG002
+        config: "Any | None" = None,  # noqa: ARG002
         _parent_depth: int = 2,  # noqa: ARG002
-        module: "Optional[str]" = None,  # noqa: ARG002
+        module: "str | None" = None,  # noqa: ARG002
     ) -> None:
         """Initialize."""
         self._type = type
@@ -90,10 +90,10 @@ class TypeAdapterStub:
         object: Any,
         /,
         *,
-        strict: "Optional[bool]" = None,  # noqa: ARG002
-        from_attributes: "Optional[bool]" = None,  # noqa: ARG002
-        context: "Optional[dict[str, Any]]" = None,  # noqa: ARG002
-        experimental_allow_partial: "Union[bool, Literal['off', 'on', 'trailing-strings']]" = False,  # noqa: ARG002
+        strict: "bool | None" = None,  # noqa: ARG002
+        from_attributes: "bool | None" = None,  # noqa: ARG002
+        context: "dict[str, Any] | None" = None,  # noqa: ARG002
+        experimental_allow_partial: "bool | Literal['off', 'on', 'trailing-strings']" = False,  # noqa: ARG002
     ) -> Any:
         """Validate Python object."""
         return object
@@ -143,8 +143,8 @@ def convert_stub(  # noqa: PLR0913
     *,
     strict: bool = True,  # noqa: ARG001
     from_attributes: bool = False,  # noqa: ARG001
-    dec_hook: "Optional[Any]" = None,  # noqa: ARG001
-    builtin_types: "Optional[Any]" = None,  # noqa: ARG001
+    dec_hook: "Any | None" = None,  # noqa: ARG001
+    builtin_types: "Any | None" = None,  # noqa: ARG001
     str_keys: bool = False,  # noqa: ARG001
 ) -> Any:
     """Placeholder implementation."""
@@ -177,6 +177,14 @@ except ImportError:
     MSGSPEC_INSTALLED = False  # pyright: ignore[reportConstantRedefinition]
 
 
+try:
+    import orjson  # noqa: F401
+
+    ORJSON_INSTALLED = True  # pyright: ignore[reportConstantRedefinition]
+except ImportError:
+    ORJSON_INSTALLED = False  # pyright: ignore[reportConstantRedefinition]
+
+
 # Always define stub type for DTOData
 @runtime_checkable
 class DTODataStub(Protocol[T]):
@@ -300,7 +308,7 @@ class EmptyEnum(Enum):
     EMPTY = 0
 
 
-EmptyType = Union[Literal[EmptyEnum.EMPTY], UnsetType]
+EmptyType = Literal[EmptyEnum.EMPTY] | UnsetType
 Empty: Final = EmptyEnum.EMPTY
 
 
@@ -328,18 +336,18 @@ class ArrowTableResult(Protocol):
     def from_arrays(
         self,
         arrays: list[Any],
-        names: "Optional[list[str]]" = None,
-        schema: "Optional[Any]" = None,
-        metadata: "Optional[Mapping[str, Any]]" = None,
+        names: "list[str] | None" = None,
+        schema: "Any | None" = None,
+        metadata: "Mapping[str, Any] | None" = None,
     ) -> Any:
         return None
 
     def from_pydict(
-        self, mapping: dict[str, Any], schema: "Optional[Any]" = None, metadata: "Optional[Mapping[str, Any]]" = None
+        self, mapping: dict[str, Any], schema: "Any | None" = None, metadata: "Mapping[str, Any] | None" = None
     ) -> Any:
         return None
 
-    def from_batches(self, batches: Iterable[Any], schema: Optional[Any] = None) -> Any:
+    def from_batches(self, batches: Iterable[Any], schema: Any | None = None) -> Any:
         return None
 
 
@@ -365,7 +373,7 @@ class ArrowRecordBatchResult(Protocol):
     def column(self, i: int) -> Any:
         return None
 
-    def slice(self, offset: int = 0, length: "Optional[int]" = None) -> Any:
+    def slice(self, offset: int = 0, length: "int | None" = None) -> Any:
         return None
 
 
@@ -381,6 +389,24 @@ except ImportError:
     PYARROW_INSTALLED = False  # pyright: ignore[reportConstantRedefinition]
 
 
+@runtime_checkable
+class NumpyArrayStub(Protocol):
+    """Protocol stub for numpy.ndarray when numpy is not installed.
+
+    Provides minimal interface for type checking and serialization support.
+    """
+
+    def tolist(self) -> "list[Any]":
+        """Convert array to Python list."""
+        ...
+
+
+try:
+    from numpy import ndarray as NumpyArray  # noqa: N812
+except ImportError:
+    NumpyArray = NumpyArrayStub  # type: ignore[assignment,misc]
+
+
 try:
     from opentelemetry import trace  # pyright: ignore[reportMissingImports, reportAssignmentType]
     from opentelemetry.trace import (  # pyright: ignore[reportMissingImports, reportAssignmentType]
@@ -401,16 +427,16 @@ except ImportError:
         def record_exception(
             self,
             exception: "Exception",
-            attributes: "Optional[Mapping[str, Any]]" = None,
-            timestamp: "Optional[int]" = None,
+            attributes: "Mapping[str, Any] | None" = None,
+            timestamp: "int | None" = None,
             escaped: bool = False,
         ) -> None:
             return None
 
-        def set_status(self, status: Any, description: "Optional[str]" = None) -> None:
+        def set_status(self, status: Any, description: "str | None" = None) -> None:
             return None
 
-        def end(self, end_time: "Optional[int]" = None) -> None:
+        def end(self, end_time: "int | None" = None) -> None:
             return None
 
         def __enter__(self) -> "Span":
@@ -437,8 +463,8 @@ except ImportError:
         def get_tracer(
             self,
             instrumenting_module_name: str,
-            instrumenting_library_version: "Optional[str]" = None,
-            schema_url: "Optional[str]" = None,
+            instrumenting_library_version: "str | None" = None,
+            schema_url: "str | None" = None,
             tracer_provider: Any = None,
         ) -> Tracer:
             return Tracer()  # type: ignore[abstract] # pragma: no cover
@@ -514,9 +540,6 @@ try:
     from aiosql.types import (  # pyright: ignore[reportMissingImports, reportAssignmentType]
         AsyncDriverAdapterProtocol as AiosqlAsyncProtocol,  # pyright: ignore[reportMissingImports, reportAssignmentType]
     )
-    from aiosql.types import (  # pyright: ignore[reportMissingImports, reportAssignmentType]
-        DriverAdapterProtocol as AiosqlProtocol,  # pyright: ignore[reportMissingImports, reportAssignmentType]
-    )
     from aiosql.types import ParamType as AiosqlParamType  # pyright: ignore[reportMissingImports, reportAssignmentType]
     from aiosql.types import (
         SQLOperationType as AiosqlSQLOperationType,  # pyright: ignore[reportMissingImports, reportAssignmentType]
@@ -545,7 +568,7 @@ except ImportError:
     aiosql = _AiosqlShim()  # type: ignore[assignment]
 
     # Placeholder types for aiosql protocols
-    AiosqlParamType = Union[dict[str, Any], list[Any], tuple[Any, ...], None]  # type: ignore[misc]
+    AiosqlParamType = Any  # type: ignore[misc]
 
     class AiosqlSQLOperationType(Enum):  # type: ignore[no-redef]
         """Enumeration of aiosql operation types."""
@@ -558,12 +581,6 @@ except ImportError:
         SELECT_ONE = 5
         SELECT_VALUE = 6
 
-    @runtime_checkable
-    class AiosqlProtocol(Protocol):  # type: ignore[no-redef]
-        """Placeholder for aiosql DriverAdapterProtocol"""
-
-        def process_sql(self, query_name: str, op_type: Any, sql: str) -> str: ...
-
     @runtime_checkable
     class AiosqlSyncProtocol(Protocol):  # type: ignore[no-redef]
         """Placeholder for aiosql SyncDriverAdapterProtocol"""
@@ -572,16 +589,16 @@ except ImportError:
 
         def process_sql(self, query_name: str, op_type: Any, sql: str) -> str: ...
         def select(
-            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Optional[Any]" = None
+            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Any | None" = None
         ) -> Any: ...
         def select_one(
-            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Optional[Any]" = None
-        ) -> "Optional[Any]": ...
-        def select_value(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Optional[Any]": ...
+            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Any | None" = None
+        ) -> "Any | None": ...
+        def select_value(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Any | None": ...
         def select_cursor(self, conn: Any, query_name: str, sql: str, parameters: Any) -> Any: ...
         def insert_update_delete(self, conn: Any, query_name: str, sql: str, parameters: Any) -> int: ...
         def insert_update_delete_many(self, conn: Any, query_name: str, sql: str, parameters: Any) -> int: ...
-        def insert_returning(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Optional[Any]": ...
+        def insert_returning(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Any | None": ...
 
     @runtime_checkable
     class AiosqlAsyncProtocol(Protocol):  # type: ignore[no-redef]
@@ -591,16 +608,16 @@ except ImportError:
 
         def process_sql(self, query_name: str, op_type: Any, sql: str) -> str: ...
         async def select(
-            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Optional[Any]" = None
+            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Any | None" = None
         ) -> Any: ...
         async def select_one(
-            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Optional[Any]" = None
-        ) -> "Optional[Any]": ...
-        async def select_value(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Optional[Any]": ...
+            self, conn: Any, query_name: str, sql: str, parameters: Any, record_class: "Any | None" = None
+        ) -> "Any | None": ...
+        async def select_value(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Any | None": ...
         async def select_cursor(self, conn: Any, query_name: str, sql: str, parameters: Any) -> Any: ...
         async def insert_update_delete(self, conn: Any, query_name: str, sql: str, parameters: Any) -> None: ...
         async def insert_update_delete_many(self, conn: Any, query_name: str, sql: str, parameters: Any) -> None: ...
-        async def insert_returning(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Optional[Any]": ...
+        async def insert_returning(self, conn: Any, query_name: str, sql: str, parameters: Any) -> "Any | None": ...
 
     AIOSQL_INSTALLED = False  # pyright: ignore[reportConstantRedefinition]  # pyright: ignore[reportConstantRedefinition]
 
@@ -621,6 +638,7 @@ __all__ = (
     "NUMPY_INSTALLED",
     "OBSTORE_INSTALLED",
     "OPENTELEMETRY_INSTALLED",
+    "ORJSON_INSTALLED",
     "PGVECTOR_INSTALLED",
     "PROMETHEUS_INSTALLED",
     "PYARROW_INSTALLED",
@@ -629,7 +647,6 @@ __all__ = (
     "UNSET_STUB",
     "AiosqlAsyncProtocol",
     "AiosqlParamType",
-    "AiosqlProtocol",
     "AiosqlSQLOperationType",
     "AiosqlSyncProtocol",
     "ArrowRecordBatch",
@@ -651,6 +668,8 @@ __all__ = (
     "FailFastStub",
     "Gauge",
     "Histogram",
+    "NumpyArray",
+    "NumpyArrayStub",
     "Span",
     "Status",
     "StatusCode",