django-types 0.21.0__py3-none-any.whl → 0.23.0__py3-none-any.whl

django-stubs/core/mail/message.pyi

@@ -1,11 +1,11 @@
 from collections.abc import Sequence
-from email._policybase import Policy  # type: ignore
+from email._policybase import Policy
 from email.message import Message
 from email.mime.base import MIMEBase
 from email.mime.message import MIMEMessage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import Any, overload
+from typing import Any, TypeAlias, overload
 
 utf8_charset: Any
 utf8_charset_qp: Any
@@ -27,13 +27,13 @@ class MIMEMixin: ...
 class SafeMIMEMessage(MIMEMixin, MIMEMessage):
     defects: list[Any]
     epilogue: None  # pyright: ignore[reportIncompatibleVariableOverride]
-    policy: Policy  # type: ignore [no-any-unimported]
+    policy: Policy
     preamble: None  # pyright: ignore[reportIncompatibleVariableOverride]
 
 class SafeMIMEText(MIMEMixin, MIMEText):
     defects: list[Any]
     epilogue: None  # pyright: ignore[reportIncompatibleVariableOverride]
-    policy: Policy  # type: ignore [no-any-unimported]
+    policy: Policy
     preamble: None  # pyright: ignore[reportIncompatibleVariableOverride]
     encoding: str = ...
     def __init__(
@@ -43,7 +43,7 @@ class SafeMIMEText(MIMEMixin, MIMEText):
 class SafeMIMEMultipart(MIMEMixin, MIMEMultipart):
     defects: list[Any]
     epilogue: None  # pyright: ignore[reportIncompatibleVariableOverride]
-    policy: Policy  # type: ignore [no-any-unimported]
+    policy: Policy
     preamble: None  # pyright: ignore[reportIncompatibleVariableOverride]
     encoding: str = ...
     def __init__(
@@ -55,8 +55,8 @@ class SafeMIMEMultipart(MIMEMixin, MIMEMultipart):
         **_params: Any
     ) -> None: ...
 
-_AttachmentContent = bytes | EmailMessage | Message | SafeMIMEText | str
-_AttachmentTuple = (
+_AttachmentContent: TypeAlias = bytes | EmailMessage | Message | SafeMIMEText | str
+_AttachmentTuple: TypeAlias = (
     tuple[str, _AttachmentContent]
     | tuple[str | None, _AttachmentContent, str]
     | tuple[str, _AttachmentContent, None]

django-stubs/core/management/__init__.pyi

@@ -2,22 +2,24 @@ from typing import Any
 
 from .base import BaseCommand as BaseCommand
 from .base import CommandError as CommandError
+from .base import CommandParser as CommandParser
+from .base import handle_default_options as handle_default_options
 
 def find_commands(management_dir: str) -> list[str]: ...
 def load_command_class(app_name: str, name: str) -> BaseCommand: ...
 def get_commands() -> dict[str, str]: ...
 def call_command(
-    command_name: tuple[str] | BaseCommand | str, *args: Any, **options: Any
-) -> str: ...
+    command_name: str | BaseCommand, *args: Any, **options: Any
+) -> str | None: ...
 
 class ManagementUtility:
-    argv: list[str] = ...
-    prog_name: str = ...
-    settings_exception: None = ...
-    def __init__(self, argv: list[str] = ...) -> None: ...
-    def main_help_text(self, commands_only: bool = ...) -> Any: ...
+    argv: list[str]
+    prog_name: str
+    settings_exception: None
+    def __init__(self, argv: list[str] | None = ...) -> None: ...
+    def main_help_text(self, commands_only: bool = ...) -> str: ...
     def fetch_command(self, subcommand: str) -> BaseCommand: ...
     def autocomplete(self) -> None: ...
     def execute(self) -> None: ...
 
-def execute_from_command_line(argv: list[str] = ...) -> None: ...
+def execute_from_command_line(argv: list[str] | None = ...) -> None: ...

django-stubs/core/management/base.pyi

@@ -1,60 +1,69 @@
 from argparse import ArgumentParser, HelpFormatter, Namespace
-from collections.abc import Callable
-from io import StringIO, TextIOBase, TextIOWrapper
-from typing import Any
+from collections.abc import Callable, Sequence
+from typing import Any, NoReturn, TextIO
 
 from django.apps.config import AppConfig
 from django.core.management.color import Style
 
-class CommandError(Exception): ...
+class CommandError(Exception):
+    returncode: int
+    def __init__(self, *args: Any, returncode: int = ..., **kwargs: Any) -> None: ...
+
 class SystemCheckError(CommandError): ...
 
 class CommandParser(ArgumentParser):
-    missing_args_message: None = ...
-    called_from_command_line: bool = ...
-    def __init__(self, **kwargs: Any) -> None: ...
-    def error(self, message: str) -> Any: ...
+    missing_args_message: str | None
+    called_from_command_line: bool | None
+    def __init__(
+        self,
+        *,
+        missing_args_message: str | None = None,
+        called_from_command_line: bool | None = ...,
+        **kwargs: Any,
+    ) -> None: ...
+    def error(self, message: str) -> NoReturn: ...
 
 def handle_default_options(options: Namespace) -> None: ...
 def no_translations(handle_func: Callable[..., Any]) -> Callable[..., Any]: ...
 
 class DjangoHelpFormatter(HelpFormatter): ...
 
-class OutputWrapper(TextIOBase):
+class OutputWrapper:
     @property
-    def style_func(self) -> Any: ...
+    def style_func(self) -> Callable[[str], str]: ...
     @style_func.setter
-    def style_func(self, style_func: Callable[[str], str]) -> Any: ...
+    def style_func(self, style_func: Callable[[str], str]) -> None: ...
     ending: str = ...
     def __init__(
         self,
-        out: StringIO | TextIOWrapper,
-        style_func: Callable[[str], str] | None = ...,
+        out: TextIO,
         ending: str = ...,
     ) -> None: ...
-    def __getattr__(self, name: str) -> Callable[..., Any]: ...
+    def __getattr__(self, name: str) -> Any: ...
+    def flush(self) -> None: ...
     def isatty(self) -> bool: ...
-    def write(  # type: ignore[override]
+    def write(
         self,
-        msg: str,
+        msg: str = ...,
         style_func: Callable[[str], str] | None = ...,
         ending: str | None = ...,
     ) -> None: ...
 
 class BaseCommand:
-    help: str = ...
-    output_transaction: bool = ...
-    requires_migrations_checks: bool = ...
-    requires_system_checks: bool = ...
-    base_stealth_options: tuple[str, ...] = ...
-    stealth_options: tuple[str, ...] = ...
-    stdout: OutputWrapper = ...
-    stderr: OutputWrapper = ...
-    style: Style = ...
+    help: str
+    output_transaction: bool
+    requires_migrations_checks: bool
+    requires_system_checks: str
+    base_stealth_options: tuple[str, ...]
+    stealth_options: tuple[str, ...]
+    suppressed_base_arguments: set[str]
+    stdout: OutputWrapper
+    stderr: OutputWrapper
+    style: Style
     def __init__(
         self,
-        stdout: StringIO | None = ...,
-        stderr: StringIO | None = ...,
+        stdout: TextIO | None = ...,
+        stderr: TextIO | None = ...,
         no_color: bool = ...,
         force_color: bool = ...,
     ) -> None: ...
@@ -63,9 +72,13 @@ class BaseCommand:
         self, prog_name: str, subcommand: str, **kwargs: Any
     ) -> CommandParser: ...
     def add_arguments(self, parser: CommandParser) -> None: ...
+    def add_base_argument(
+        self, parser: CommandParser, *args: Any, **kwargs: Any
+    ) -> None: ...
     def print_help(self, prog_name: str, subcommand: str) -> None: ...
-    def run_from_argv(self, argv: list[str]) -> None: ...
+    def run_from_argv(self, argv: Sequence[str]) -> None: ...
     def execute(self, *args: Any, **options: Any) -> Any: ...
+    def get_check_kwargs(self, options: dict[str, Any]) -> dict[str, Any]: ...
     def check(
         self,
         app_configs: list[AppConfig] | None = ...,
@@ -73,15 +86,18 @@ class BaseCommand:
         display_num_errors: bool = ...,
         include_deployment_checks: bool = ...,
         fail_level: int = ...,
+        databases: list[str] | None = None,
     ) -> None: ...
     def check_migrations(self) -> None: ...
     def handle(self, *args: Any, **options: Any) -> str | None: ...
 
 class AppCommand(BaseCommand):
-    missing_args_message: str = ...
-    def handle_app_config(self, app_config: Any, **options: Any) -> None: ...
+    missing_args_message: str
+    def handle(self, *app_labels: str, **options: Any) -> str: ...
+    def handle_app_config(self, app_config: AppConfig, **options: Any) -> str: ...
 
 class LabelCommand(BaseCommand):
-    label: str = ...
-    missing_args_message: Any = ...
-    def handle_label(self, label: Any, **options: Any) -> None: ...
+    label: str
+    missing_args_message: str
+    def handle(self, *labels: str, **options: Any) -> str: ...
+    def handle_label(self, label: str, **options: Any) -> str: ...

django-stubs/core/management/commands/compilemessages.pyi

@@ -1,5 +1,5 @@
 import os
-from typing import Any
+from typing import Any, TypeAlias
 
 from django.core.management.base import BaseCommand as BaseCommand
 from django.core.management.base import CommandError as CommandError
@@ -7,7 +7,7 @@ from django.core.management.base import CommandParser as CommandParser
 from django.core.management.utils import find_command as find_command
 from django.core.management.utils import popen_wrapper as popen_wrapper
 
-_PathType = str | bytes | os.PathLike[Any]
+_PathType: TypeAlias = str | bytes | os.PathLike[Any]
 
 def has_bom(fn: _PathType) -> bool: ...
 def is_writable(path: _PathType) -> bool: ...

django-stubs/core/servers/basehttp.pyi

@@ -4,7 +4,7 @@ from typing import Any
 from wsgiref import simple_server
 
 from django.core.handlers.wsgi import WSGIHandler, WSGIRequest
-from django.core.wsgi import get_wsgi_application as get_wsgi_application  # noqa: F401
+from django.core.wsgi import get_wsgi_application as get_wsgi_application
 
 class WSGIServer(simple_server.WSGIServer):
     request_queue_size: int = ...

django-stubs/core/validators.pyi

@@ -1,14 +1,14 @@
 from collections.abc import Callable, Collection
 from decimal import Decimal
 from re import Pattern, RegexFlag
-from typing import Any
+from typing import Any, TypeAlias
 
 from django.core.files.base import File
 
 EMPTY_VALUES: Any
 
-_Regex = str | Pattern[str]
-_ErrorMessage = str | Any
+_Regex: TypeAlias = str | Pattern[str]
+_ErrorMessage: TypeAlias = str | Any
 
 def _lazy_re_compile(regex: _Regex, flags: int = ...) -> Any: ...
 
@@ -71,7 +71,7 @@ def validate_ipv4_address(value: str) -> None: ...
 def validate_ipv6_address(value: str) -> None: ...
 def validate_ipv46_address(value: str) -> None: ...
 
-_IPValidator = tuple[Callable[[Any], None], str]
+_IPValidator: TypeAlias = tuple[Callable[[Any], None], str]
 ip_address_validator_map: dict[str, _IPValidator]
 
 def ip_address_validators(protocol: str, unpack_ipv4: bool) -> _IPValidator: ...

django-stubs/db/backends/base/operations.pyi

@@ -1,7 +1,7 @@
 from collections.abc import Sequence
 from datetime import date, datetime, time, timedelta
 from decimal import Decimal
-from typing import Any
+from typing import Any, TypeAlias
 
 from django.core.management.color import Style
 from django.db import DefaultConnectionProxy
@@ -12,7 +12,7 @@ from django.db.models.expressions import Case, Expression
 from django.db.models.fields import Field
 from django.db.models.sql.compiler import SQLCompiler
 
-_Connection = DefaultConnectionProxy | BaseDatabaseWrapper
+_Connection: TypeAlias = DefaultConnectionProxy | BaseDatabaseWrapper
 
 class BaseDatabaseOperations:
     compiler_module: str = ...

django-stubs/db/backends/base/schema.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from contextlib import AbstractContextManager
+from types import TracebackType
 from typing import Any
 
 from django.db.backends.ddl_references import Statement
@@ -46,7 +47,12 @@ class BaseDatabaseSchemaEditor(AbstractContextManager[Any]):
     deferred_sql: Any = ...
     atomic: Any = ...
     def __enter__(self) -> BaseDatabaseSchemaEditor: ...
-    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: ...
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None: ...
     def execute(
         self,
         sql: Statement | str,

django-stubs/db/backends/utils.pyi

@@ -2,7 +2,7 @@ import types
 from collections.abc import Iterable, Iterator, Mapping, Sequence
 from datetime import date, datetime, time
 from decimal import Decimal
-from typing import IO, Any, Literal
+from typing import IO, Any, Literal, TypeAlias
 from uuid import UUID
 
 import psycopg2.extensions
@@ -12,8 +12,8 @@ from psycopg2.extensions import Column
 logger: Any
 
 # Python types that can be adapted to SQL.
-_Mixed = None | bool | int | float | Decimal | str | bytes | datetime | UUID
-_SQLType = _Mixed | Sequence[_Mixed] | Mapping[str, _Mixed]
+_Mixed: TypeAlias = None | bool | int | float | Decimal | str | bytes | datetime | UUID
+_SQLType: TypeAlias = _Mixed | Sequence[_Mixed] | Mapping[str, _Mixed]
 
 class CursorWrapper:
     cursor: psycopg2.extensions.cursor = ...

django-stubs/db/migrations/__init__.pyi

@@ -6,4 +6,4 @@ from .migration import Migration as Migration
 from .migration import swappable_dependency as swappable_dependency
 
 # FIXME: Add all operations here
-from .operations import *  # noqa:F403
+from .operations import *

django-stubs/db/migrations/migration.pyi

@@ -1,8 +1,7 @@
-from typing_extensions import Self
-
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations.operations.base import Operation
 from django.db.migrations.state import ProjectState
+from typing_extensions import Self
 
 class Migration:
     operations: list[Operation] = ...

django-stubs/db/migrations/operations/base.pyi

@@ -1,25 +1,50 @@
+import enum
+from collections.abc import Sequence
 from typing import Any
 
+from django.db.backends.base.schema import BaseDatabaseSchemaEditor
+from django.db.migrations.state import ProjectState
+from django.db.models import Model
+from typing_extensions import Self
+
+class OperationCategory(str, enum.Enum):
+    ADDITION = "+"
+    REMOVAL = "-"
+    ALTERATION = "~"
+    PYTHON = "p"
+    SQL = "s"
+    MIXED = "?"
+
 class Operation:
-    reversible: bool = ...
-    reduces_to_sql: bool = ...
-    atomic: bool = ...
-    elidable: bool = ...
-    serialization_expand_args: Any = ...
-    def deconstruct(self) -> Any: ...
-    def state_forwards(self, app_label: Any, state: Any) -> None: ...
+    reversible: bool
+    reduces_to_sql: bool
+    atomic: bool
+    elidable: bool
+    serialization_expand_args: list[Any]
+    category: OperationCategory | None
+    def __new__(cls, *args: Any, **kwargs: Any) -> Self: ...
+    def deconstruct(self) -> tuple[str, Sequence[Any], dict[str, Any]]: ...
+    def state_forwards(self, app_label: str, state: ProjectState) -> None: ...
     def database_forwards(
-        self, app_label: Any, schema_editor: Any, from_state: Any, to_state: Any
+        self,
+        app_label: str,
+        schema_editor: BaseDatabaseSchemaEditor,
+        from_state: ProjectState,
+        to_state: ProjectState,
     ) -> None: ...
     def database_backwards(
-        self, app_label: Any, schema_editor: Any, from_state: Any, to_state: Any
+        self,
+        app_label: str,
+        schema_editor: BaseDatabaseSchemaEditor,
+        from_state: ProjectState,
+        to_state: ProjectState,
     ) -> None: ...
     def describe(self) -> str: ...
-    def references_model(self, name: str, app_label: str = ...) -> bool: ...
-    def references_field(
-        self, model_name: str, name: str, app_label: str = ...
-    ) -> bool: ...
-    def allow_migrate_model(self, connection_alias: Any, model: Any) -> bool: ...
+    def references_model(self, name: str, app_label: str) -> bool: ...
+    def references_field(self, model_name: str, name: str, app_label: str) -> bool: ...
+    def allow_migrate_model(
+        self, connection_alias: str, model: type[Model]
+    ) -> bool | None: ...
     def reduce(
-        self, operation: Operation, in_between: list[Operation], app_label: str = ...
-    ) -> bool: ...
+        self, operation: Operation, app_label: str
+    ) -> list[Operation] | bool: ...

django-stubs/db/migrations/topological_sort.pyi

@@ -6,5 +6,5 @@ def topological_sort_as_sets(
     dependency_graph: dict[Operation, set[Operation]]
 ) -> Iterator[set[Operation]]: ...
 def stable_topological_sort(
-    l: list[Operation], dependency_graph: dict[Operation, set[Operation]]  # noqa:E741
+    l: list[Operation], dependency_graph: dict[Operation, set[Operation]]
 ) -> list[Operation]: ...

django-stubs/db/models/__init__.pyi

@@ -8,6 +8,7 @@ from .aggregates import Count as Count
 from .aggregates import Max as Max
 from .aggregates import Min as Min
 from .aggregates import StdDev as StdDev
+from .aggregates import StringAgg as StringAgg
 from .aggregates import Sum as Sum
 from .aggregates import Variance as Variance
 from .base import Model as Model
@@ -78,10 +79,12 @@ from .fields import TextField as TextField
 from .fields import TimeField as TimeField
 from .fields import URLField as URLField
 from .fields import UUIDField as UUIDField
+from .fields.composite import CompositePrimaryKey as CompositePrimaryKey
 from .fields.files import FieldFile as FieldFile
 from .fields.files import FileDescriptor as FileDescriptor
 from .fields.files import FileField as FileField
 from .fields.files import ImageField as ImageField
+from .fields.generated import GeneratedField as GeneratedField
 from .fields.json import JSONField as JSONField
 from .fields.proxy import OrderWrt as OrderWrt
 from .fields.related import ForeignKey as ForeignKey

django-stubs/db/models/aggregates.pyi

@@ -1,6 +1,6 @@
 from typing import Any
 
-from django.db.models.expressions import Func
+from django.db.models.expressions import Combinable, Func
 
 class Aggregate(Func):
     filter_template: str = ...
@@ -19,5 +19,9 @@ class Count(Aggregate): ...
 class Max(Aggregate): ...
 class Min(Aggregate): ...
 class StdDev(Aggregate): ...
+
+class StringAgg(Aggregate):
+    def __init__(self, expression: Combinable | str, delimiter: Combinable | str, **extra: Any) -> None: ...
+
 class Sum(Aggregate): ...
 class Variance(Aggregate): ...

django-stubs/db/models/base.pyi

@@ -1,6 +1,5 @@
 from collections.abc import Callable, Collection, Iterable
 from typing import Any, ClassVar
-from typing_extensions import Self
 
 from django.core.checks.messages import CheckMessage
 from django.core.exceptions import (
@@ -10,6 +9,7 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db.models.manager import BaseManager
 from django.db.models.options import Options
 from django.db.models.query import QuerySet
+from typing_extensions import Self
 
 class ModelStateFieldsCacheDescriptor: ...
 

django-stubs/db/models/constants.pyi

@@ -1 +1,8 @@
-LOOKUP_SEP: str = ...
+from enum import Enum
+from typing import cast
+
+LOOKUP_SEP: str
+
+class OnConflict(Enum):
+    IGNORE = cast(str, ...)
+    UPDATE = cast(str, ...)

django-stubs/db/models/constraints.pyi

@@ -1,16 +1,17 @@
 from collections.abc import Sequence
 from enum import Enum
-from typing import Any
-from typing_extensions import Self
+from typing import Any, cast, overload
+from typing_extensions import Self, deprecated
 
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.models.base import Model
 from django.db.models.expressions import BaseExpression, Combinable
 from django.db.models.query_utils import Q
+from typing_extensions import Self
 
 class Deferrable(Enum):
-    DEFERRED: str
-    IMMEDIATE: str
+    DEFERRED = cast(str, ...)
+    IMMEDIATE = cast(str, ...)
 
 class BaseConstraint:
     name: str
@@ -39,27 +40,65 @@ class BaseConstraint:
     def clone(self) -> Self: ...
 
 class CheckConstraint(BaseConstraint):
-    check: Q
+    check: Q | BaseExpression
+    condition: Q | BaseExpression
+
+    @overload
+    @deprecated(
+        "check keyword argument is deprecated in favor of condition and will be removed in Django 6.0"
+    )
     def __init__(
         self,
         *,
-        check: Q,
         name: str,
-        violation_error_message: str | None = ...,
+        condition: None = None,
+        check: Q | BaseExpression,
+        violation_error_code: str | None = None,
+        violation_error_message: str | None = None,
+    ) -> None: ...
+    @overload
+    def __init__(
+        self,
+        *,
+        name: str,
+        condition: Q | BaseExpression,
+        check: None = None,
+        violation_error_code: str | None = None,
+        violation_error_message: str | None = None,
     ) -> None: ...
 
 class UniqueConstraint(BaseConstraint):
-    fields: tuple[str]
+    expressions: Sequence[BaseExpression | Combinable]
+    fields: Sequence[str]
     condition: Q | None
+    deferrable: Deferrable | None
+    nulls_distinct: bool | None
+
+    @overload
     def __init__(
         self,
-        *expressions: BaseExpression | Combinable | str,
-        fields: Sequence[str] = ...,
-        name: str | None = ...,
-        condition: Q | None = ...,
-        deferrable: Deferrable | None = ...,
-        include: str | Sequence[str] | None = ...,
-        opclasses: Sequence[str] = ...,
-        violation_error_message: str | None = ...,
-        nulls_distinct: bool | None = ...,
+        *expressions: str | BaseExpression | Combinable,
+        fields: None = None,
+        name: str | None = None,
+        condition: Q | None = None,
+        deferrable: Deferrable | None = None,
+        include: Sequence[str] | None = None,
+        opclasses: Sequence[Any] = (),
+        nulls_distinct: bool | None = None,
+        violation_error_code: str | None = None,
+        violation_error_message: str | None = None,
+    ) -> None: ...
+    @overload
+    def __init__(
+        self,
+        *,
+        fields: Sequence[str],
+        name: str | None = None,
+        condition: Q | None = None,
+        deferrable: Deferrable | None = None,
+        include: Sequence[str] | None = None,
+        opclasses: Sequence[Any] = (),
+        nulls_distinct: bool | None = None,
+        violation_error_code: str | None = None,
+        violation_error_message: str | None = None,
     ) -> None: ...

django-stubs/db/models/enums.pyi

@@ -1,6 +1,6 @@
 import enum
 from collections.abc import Sequence
-from typing import Any, TypeVar
+from typing import Any, TypeAlias, TypeVar
 
 _EnumMemberT = TypeVar("_EnumMemberT")
 
@@ -13,6 +13,8 @@ class ChoicesMeta(enum.EnumMeta):
     @property
     def choices(self: type[_EnumMemberT]) -> Sequence[tuple[_EnumMemberT, str]]: ...
 
+ChoicesType: TypeAlias = ChoicesMeta
+
 class Choices(enum.Enum, metaclass=ChoicesMeta):
     def __str__(self) -> Any: ...
     @property

django-stubs/db/models/expressions.pyi

@@ -1,23 +1,23 @@
 from collections.abc import Callable, Iterable, Iterator, Sequence
 from datetime import datetime, timedelta
 from decimal import Decimal
-from typing import Any
-from typing_extensions import Self
+from typing import Any, TypeAlias
 
 from django.db.models import Q, QuerySet
 from django.db.models.fields import Field
 from django.db.models.lookups import Lookup
 from django.db.models.query import _BaseQuerySet
 from django.db.models.sql.compiler import SQLCompiler
+from typing_extensions import Self
 
-_OutputField = Field[Any, Any] | str
+_OutputField: TypeAlias = Field[Any, Any] | str
 
 class SQLiteNumericMixin:
     def as_sqlite(
         self, compiler: SQLCompiler, connection: Any, **extra_context: Any
     ) -> tuple[str, list[float]]: ...
 
-_Numeric = float | Decimal
+_Numeric: TypeAlias = float | Decimal
 
 class Combinable:
     ADD: str = ...
@@ -40,11 +40,11 @@ class Combinable:
     def __itruediv__(self, other: Combinable | _Numeric) -> Self: ...
     def __mod__(self, other: int | Combinable) -> Self: ...
     def __pow__(self, other: _Numeric | Combinable) -> Self: ...
-    def __and__(self, other: Combinable) -> Self: ...
+    def __and__(self, other: Combinable | Q) -> Self: ...
     def bitand(self, other: int) -> Self: ...
     def bitleftshift(self, other: int) -> Self: ...
     def bitrightshift(self, other: int) -> Self: ...
-    def __or__(self, other: Combinable) -> Self: ...
+    def __or__(self, other: Combinable | Q) -> Self: ...
     def bitor(self, other: int) -> Self: ...
     def __radd__(
         self, other: datetime | _Numeric | Combinable | None
@@ -99,7 +99,7 @@ class BaseExpression:
     def as_sqlite(self, compiler: SQLCompiler, connection: Any) -> Any: ...
     def as_sql(
         self, compiler: SQLCompiler, connection: Any, **extra_context: Any
-    ) -> Any: ...
+    ) -> tuple[str, list[Any] | tuple[Any]]: ...
     def as_mysql(self, compiler: Any, connection: Any) -> Any: ...
     def as_postgresql(self, compiler: Any, connection: Any) -> Any: ...
     def as_oracle(self, compiler: Any, connection: Any) -> Any: ...