Use Model instead of Self in parms and add AltersData inheritance

django-stubs/db/models/base.pyi

@@ -8,6 +8,7 @@ from django.core.exceptions import ObjectDoesNotExist, ObjectNotUpdated, Validat
 from django.db.models import BaseConstraint, Field, QuerySet
 from django.db.models.manager import Manager
 from django.db.models.options import Options
+from django.db.models.utils import AltersData
 from typing_extensions import Self, override
 
 _Self = TypeVar("_Self", bound=Model)
@@ -35,7 +36,7 @@ class ModelBase(type):
     @property
     def _default_manager(cls: type[_Self]) -> Manager[_Self]: ...  # type: ignore[misc]
 
-class Model(metaclass=ModelBase):
+class Model(AltersData, metaclass=ModelBase):
     # Note: these two metaclass generated attributes don't really exist on the 'Model'
     # class, runtime they are only added on concrete subclasses of 'Model'. The
     # metaclass also sets up correct inheritance from concrete parent models exceptions.
@@ -59,7 +60,7 @@ class Model(metaclass=ModelBase):
         def __getstate__(self) -> dict: ...
     else:
         def __getstate__(self) -> dict: ...
-    def _get_pk_val(self, meta: Options[Self] | None = None) -> str: ...
+    def _get_pk_val(self, meta: Options[Model] | None = None) -> str: ...
     def get_deferred_fields(self) -> set[str]: ...
     def refresh_from_db(
         self,
@@ -114,7 +115,7 @@ class Model(metaclass=ModelBase):
     def clean(self) -> None: ...
     def validate_unique(self, exclude: Collection[str] | None = None) -> None: ...
     def date_error_message(self, lookup_type: str, field_name: str, unique_for: str) -> ValidationError: ...
-    def unique_error_message(self, model_class: type[Self], unique_check: Sequence[str]) -> ValidationError: ...
+    def unique_error_message(self, model_class: type[Model], unique_check: Sequence[str]) -> ValidationError: ...
     def get_constraints(self) -> list[tuple[type[Model], Sequence[BaseConstraint]]]: ...
     def validate_constraints(self, exclude: Collection[str] | None = None) -> None: ...
     def full_clean(

django-stubs/db/models/query.pyi

@@ -8,6 +8,7 @@ from django.db.models import Manager
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, OrderBy
 from django.db.models.sql.query import Query, RawQuery
+from django.db.models.utils import AltersData
 from django.utils.functional import cached_property
 from typing_extensions import Self, TypeVar, override
 
@@ -63,7 +64,7 @@ class _SupportsContains(Generic[_ContainsT]):
     def __contains__(self, item: _ContainsT, /) -> bool: ...
 
 # Using `object` (not `_Row | None`) to satisfy Collection protocol and support `User | AnonymousUser` patterns
-class QuerySet(_SupportsContains[object], Iterable[_Row], Sized, Generic[_Model, _Row]):
+class QuerySet(AltersData, _SupportsContains[object], Iterable[_Row], Sized, Generic[_Model, _Row]):
     model: type[_Model]
     query: Query
     _iterable_class: type[BaseIterable]

tests/assert_type/db/models/test_base.py

@@ -0,0 +1,38 @@
+from collections.abc import Iterable
+
+from django.db import models
+from django.db.models.query import QuerySet
+from typing_extensions import assert_type, override
+
+
+class MyModel(models.Model):
+    class Meta:
+        app_label = "myapp"
+
+
+class OtherModel(models.Model):
+    class Meta:
+        app_label = "myapp"
+
+
+# Override with QuerySet[Model] — valid
+class OverrideWithModel(models.Model):
+    @override
+    def refresh_from_db(
+        self,
+        using: str | None = None,
+        fields: Iterable[str] | None = None,
+        from_queryset: QuerySet[models.Model] | None = None,
+    ) -> None: ...
+
+    class Meta:
+        app_label = "myapp"
+
+
+def test_correct_queryset(m: MyModel, qs: QuerySet[MyModel]) -> None:
+    m.refresh_from_db(from_queryset=qs)
+    assert_type(m.refresh_from_db(), None)
+
+
+def test_wrong_queryset(m: MyModel, qs: QuerySet[OtherModel]) -> None:
+    m.refresh_from_db(from_queryset=qs)  # type: ignore[arg-type]  # pyright: ignore[reportArgumentType]  # pyrefly: ignore[bad-argument-type]