Merge remote-tracking branch 'upstream/main' into pin-actions-by-sha

Author: YuriiMotov

.pre-commit-config.yaml

@@ -28,9 +28,9 @@ repos:
         language: unsupported
         types: [python]
 
-      - id: local-mypy
-        name: mypy check
-        entry: uv run mypy sqlmodel tests/test_select_typing.py
+      - id: local-ty
+        name: ty check
+        entry: uv run ty check sqlmodel tests/test_select_typing.py
         require_serial: true
         language: unsupported
         pass_filenames: false
@@ -41,6 +41,13 @@ repos:
         entry: uv run ./scripts/generate_select.py
         files: ^scripts/generate_select\.py|sqlmodel/sql/_expression_select_gen\.py\.jinja2$
 
+      - id: add-release-date
+        language: unsupported
+        name: add date to latest release header
+        entry: uv run python scripts/add_latest_release_date.py
+        files: ^docs/release-notes\.md$
+        pass_filenames: false
+
       - id: generate-readme
         language: unsupported
         name: generate README.md from index.md

docs/contributing.md

@@ -92,9 +92,9 @@ That way, you can edit the documentation/source files and see the changes live.
 
 /// tip
 
-Alternatively, you can perform the same steps that scripts does manually.
+Alternatively, you can perform the same steps that the script does manually.
 
-Go into the docs director at `docs/`:
+Go into the docs directory at `docs/`:
 
 ```console
 $ cd docs/

docs/release-notes.md

@@ -82,9 +82,9 @@ tests = [
     "fastapi >=0.128.0",
     "httpx >=0.28.1",
     "jinja2 >=3.1.6",
-    "mypy >=1.19.1",
     "pytest >=7.0.1",
     "ruff >=0.15.6",
+    "ty>=0.0.25",
     "typing-extensions >=4.15.0",
 ]
 
@@ -125,16 +125,6 @@ exclude_lines = [
 [tool.coverage.html]
 show_contexts = true
 
-[tool.mypy]
-strict = true
-exclude = "sqlmodel.sql._expression_select_gen"
-
-[[tool.mypy.overrides]]
-module = "docs_src.*"
-disallow_incomplete_defs = false
-disallow_untyped_defs = false
-disallow_untyped_calls = false
-
 [tool.ruff.lint]
 select = [
     "E",  # pycodestyle errors
@@ -161,3 +151,6 @@ known-third-party = ["sqlmodel", "sqlalchemy", "pydantic", "fastapi"]
 [tool.ruff.lint.pyupgrade]
 # Preserve types, even if a file imports `from __future__ import annotations`.
 keep-runtime-typing = true
+
+[tool.ty.terminal]
+error-on-warning = true

pyproject.toml

@@ -0,0 +1,40 @@
+"""Check release-notes.md and add today's date to the latest release header if missing."""
+
+import re
+import sys
+from datetime import date
+
+RELEASE_NOTES_FILE = "docs/release-notes.md"
+RELEASE_HEADER_PATTERN = re.compile(r"^## (\d+\.\d+\.\d+)\s*(\(.*\))?\s*$")
+
+
+def main() -> None:
+    with open(RELEASE_NOTES_FILE) as f:
+        lines = f.readlines()
+
+    for i, line in enumerate(lines):
+        match = RELEASE_HEADER_PATTERN.match(line)
+        if not match:
+            continue
+
+        version = match.group(1)
+        date_part = match.group(2)
+
+        if date_part:
+            print(f"Latest release {version} already has a date: {date_part}")
+            sys.exit(0)
+
+        today = date.today().isoformat()
+        lines[i] = f"## {version} ({today})\n"
+        print(f"Added date: {version} ({today})")
+
+        with open(RELEASE_NOTES_FILE, "w") as f:
+            f.writelines(lines)
+        sys.exit(0)
+
+    print("No release header found")
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

scripts/add_latest_release_date.py

@@ -37,7 +37,7 @@ class Arg(BaseModel):
             else:
                 t_type = f"_T{i}"
                 t_var = f"_TCCA[{t_type}]"
-                arg = Arg(name=f"__ent{i}", annotation=t_var)
+                arg = Arg(name=f"ent{i}", annotation=t_var)
                 ret_type = t_type
             args.append(arg)
             return_types.append(ret_type)

scripts/generate_select.py

@@ -3,7 +3,7 @@
 set -e
 set -x
 
-mypy sqlmodel
-mypy tests/test_select_typing.py
+ty check sqlmodel
+ty check tests/test_select_typing.py
 ruff check sqlmodel tests docs_src scripts
 ruff format sqlmodel tests docs_src scripts --check

scripts/lint.sh

@@ -1,4 +1,4 @@
-__version__ = "0.0.37"
+__version__ = "0.0.38"
 
 # Re-export from SQLAlchemy
 from sqlalchemy.engine import create_engine as create_engine

sqlmodel/__init__.py

@@ -3,7 +3,6 @@
 import builtins
 import ipaddress
 import uuid
-import weakref
 from collections.abc import Callable, Mapping, Sequence, Set
 from dataclasses import dataclass
 from datetime import date, datetime, time, timedelta
@@ -52,7 +51,7 @@
 from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
 from typing_extensions import deprecated
 
-from ._compat import (  # type: ignore[attr-defined]
+from ._compat import (
     PYDANTIC_MINOR_VERSION,
     BaseConfig,
     ModelMetaclass,
@@ -101,7 +100,7 @@ def __dataclass_transform__(
     return lambda a: a
 
 
-class FieldInfo(PydanticFieldInfo):  # type: ignore[misc]
+class FieldInfo(PydanticFieldInfo):  # ty: ignore[subclass-of-final-class]
     # mypy - ignore that PydanticFieldInfo is @final
     def __init__(self, default: Any = Undefined, **kwargs: Any) -> None:
         primary_key = kwargs.pop("primary_key", False)
@@ -177,7 +176,7 @@ def __init__(
         cascade_delete: bool | None = False,
         passive_deletes: bool | Literal["all"] | None = False,
         link_model: Any | None = None,
-        sa_relationship: RelationshipProperty | None = None,  # type: ignore
+        sa_relationship: RelationshipProperty | None = None,
         sa_relationship_args: Sequence[Any] | None = None,
         sa_relationship_kwargs: Mapping[str, Any] | None = None,
     ) -> None:
@@ -398,7 +397,7 @@ def Field(
     nullable: bool | UndefinedType = Undefined,
     index: bool | UndefinedType = Undefined,
     sa_type: type[Any] | UndefinedType = Undefined,
-    sa_column: Column | UndefinedType = Undefined,  # type: ignore
+    sa_column: Column | UndefinedType = Undefined,
     sa_column_args: Sequence[Any] | UndefinedType = Undefined,
     sa_column_kwargs: Mapping[str, Any] | UndefinedType = Undefined,
     schema_extra: dict[str, Any] | None = None,
@@ -525,13 +524,13 @@ class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
     model_fields: ClassVar[dict[str, FieldInfo]]
 
     # Replicate SQLAlchemy
-    def __setattr__(cls, name: str, value: Any) -> None:
+    def __setattr__(cls, name: str, value: Any) -> None:  # ty: ignore[invalid-method-override]
         if is_table_model_class(cls):
             DeclarativeMeta.__setattr__(cls, name, value)
         else:
             super().__setattr__(name, value)
 
-    def __delattr__(cls, name: str) -> None:
+    def __delattr__(cls, name: str) -> None:  # ty: ignore[invalid-method-override]
         if is_table_model_class(cls):
             DeclarativeMeta.__delattr__(cls, name)
         else:
@@ -609,10 +608,10 @@ def get_config(name: str) -> Any:
             # This could be done by reading new_cls.model_config['table'] in FastAPI, but
             # that's very specific about SQLModel, so let's have another config that
             # other future tools based on Pydantic can use.
-            new_cls.model_config["read_from_attributes"] = True  # type: ignore[typeddict-unknown-key]
+            new_cls.model_config["read_from_attributes"] = True  # ty: ignore[invalid-key]
             # For compatibility with older versions
             # TODO: remove this in the future
-            new_cls.model_config["read_with_orm_mode"] = True  # type: ignore[typeddict-unknown-key]
+            new_cls.model_config["read_with_orm_mode"] = True  # ty: ignore[invalid-key]
 
         config_registry = get_config("registry")
         if config_registry is not Undefined:
@@ -649,7 +648,7 @@ def __init__(
                     # Plain forward references, for models not yet defined, are not
                     # handled well by SQLAlchemy without Mapped, so, wrap the
                     # annotations in Mapped here
-                    cls.__annotations__[rel_name] = Mapped[ann]  # type: ignore[valid-type]
+                    cls.__annotations__[rel_name] = Mapped[ann]
                 relationship_to = get_relationship_to(
                     name=rel_name, rel_info=rel_info, annotation=ann
                 )
@@ -738,7 +737,7 @@ def get_sqlalchemy_type(field: Any) -> Any:
     raise ValueError(f"{type_} has no matching SQLAlchemy type")
 
 
-def get_column_from_field(field: Any) -> Column:  # type: ignore
+def get_column_from_field(field: Any) -> Column:
     field_info = field
     sa_column = _get_sqlmodel_field_value(field_info, "sa_column", Undefined)
     if isinstance(sa_column, Column):
@@ -773,7 +772,7 @@ def get_column_from_field(field: Any) -> Column:  # type: ignore
         assert isinstance(foreign_key, str)
         assert isinstance(ondelete_value, (str, type(None)))  # for typing
         args.append(ForeignKey(foreign_key, ondelete=ondelete_value))
-    kwargs = {
+    kwargs: dict[str, Any] = {
         "primary_key": primary_key,
         "nullable": nullable,
         "index": index,
@@ -797,8 +796,6 @@ def get_column_from_field(field: Any) -> Column:  # type: ignore
     return Column(sa_type, *args, **kwargs)
 
 
-class_registry = weakref.WeakValueDictionary()  # type: ignore
-
 default_registry = registry()
 
 _TSQLModel = TypeVar("_TSQLModel", bound="SQLModel")
@@ -814,7 +811,9 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
     __allow_unmapped__ = True  # https://docs.sqlalchemy.org/en/20/changelog/migration_20.html#migration-20-step-six
     model_config = SQLModelConfig(from_attributes=True)
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> Any:
+    # Typing spec says `__new__` returning `Any` overrides normal constructor
+    # behavior, but a missing annotation does not:
+    def __new__(cls, *args: Any, **kwargs: Any):  # type: ignore[no-untyped-def]
         new_object = super().__new__(cls)
         # SQLAlchemy doesn't call __init__ on the base class when querying from DB
         # Ref: https://docs.sqlalchemy.org/en/14/orm/constructors.html
@@ -850,7 +849,7 @@ def __setattr__(self, name: str, value: Any) -> None:
             return
         else:
             # Set in SQLAlchemy, before Pydantic to trigger events and updates
-            if is_table_model_class(self.__class__) and is_instrumented(self, name):  # type: ignore[no-untyped-call]
+            if is_table_model_class(self.__class__) and is_instrumented(self, name):
                 set_attribute(self, name, value)
             # Set in Pydantic model to trigger possible validation changes, only for
             # non relationship values
@@ -870,7 +869,7 @@ def __tablename__(cls) -> str:
         return cls.__name__.lower()
 
     @classmethod
-    def model_validate(  # type: ignore[override]
+    def model_validate(  # ty: ignore[invalid-method-override]
         cls: type[_TSQLModel],
         obj: Any,
         *,

sqlmodel/main.py

@@ -20,13 +20,13 @@ def where(self, *whereclause: _ColumnExpressionArgument[bool] | bool) -> Self:
         """Return a new `Select` construct with the given expression added to
         its `WHERE` clause, joined to the existing clause via `AND`, if any.
         """
-        return super().where(*whereclause)  # type: ignore[arg-type]
+        return super().where(*whereclause)
 
     def having(self, *having: _ColumnExpressionArgument[bool] | bool) -> Self:
         """Return a new `Select` construct with the given expression added to
         its `HAVING` clause, joined to the existing clause via `AND`, if any.
         """
-        return super().having(*having)  # type: ignore[arg-type]
+        return super().having(*having)
 
 
 class Select(SelectBase[_T]):