Move method defined on BaseManager to Manager to follow runtime behavior (#2637)

* QuerySet method are proxied to `Manager`, not `BaseManager`

```
In [18]: Manager.ordered
---------------------------------------------------------------------------
AttributeError                            Traceback (most recent call last)
Cell In[18], line 1
----> 1 Manager.ordered

AttributeError: type object 'Manager' has no attribute 'ordered'
```

https://github.com/django/django/blob/fbdbccf27a7d969a92e6ab8d2b7754e21e69b050/django/db/models/query.py#L1803

Author: UnknownPlatypus

django-stubs/db/models/manager.pyi

@@ -32,6 +32,9 @@ class BaseManager(Generic[_T]):
     @property
     def db(self) -> str: ...
     def get_queryset(self) -> QuerySet[_T]: ...
+    def all(self) -> QuerySet[_T]: ...
+
+class Manager(BaseManager[_T]):
     # NOTE: The following methods are in common with QuerySet, but note that the use of QuerySet as a return type
     # rather than a self-type (_QS), since Manager's QuerySet-like methods return QuerySets and not Managers.
     def iterator(self, chunk_size: int | None = ...) -> Iterator[_T]: ...
@@ -92,8 +95,8 @@ class BaseManager(Generic[_T]):
     async def aexists(self) -> bool: ...
     def explain(self, *, format: Any | None = ..., **options: Any) -> str: ...
     async def aexplain(self, *, format: Any | None = ..., **options: Any) -> str: ...
-    def contains(self, objs: Model) -> bool: ...
-    async def acontains(self, objs: Model) -> bool: ...
+    def contains(self, obj: Model) -> bool: ...
+    async def acontains(self, obj: Model) -> bool: ...
     def raw(
         self,
         raw_query: str,
@@ -110,7 +113,6 @@ class BaseManager(Generic[_T]):
         self, field_name: str, kind: str, order: str = ..., tzinfo: datetime.tzinfo | None = ...
     ) -> QuerySet[_T, datetime.datetime]: ...
     def none(self) -> QuerySet[_T]: ...
-    def all(self) -> QuerySet[_T]: ...
     def filter(self, *args: Any, **kwargs: Any) -> QuerySet[_T]: ...
     def exclude(self, *args: Any, **kwargs: Any) -> QuerySet[_T]: ...
     def complex_filter(self, filter_obj: Any) -> QuerySet[_T]: ...
@@ -142,10 +144,6 @@ class BaseManager(Generic[_T]):
     def defer(self, *fields: Any) -> QuerySet[_T]: ...
     def only(self, *fields: Any) -> QuerySet[_T]: ...
     def using(self, alias: str | None) -> QuerySet[_T]: ...
-    @property
-    def ordered(self) -> bool: ...
-
-class Manager(BaseManager[_T]): ...
 
 class ManagerDescriptor:
     manager: BaseManager

mypy_django_plugin/main.py

@@ -136,7 +136,7 @@ def get_additional_deps(self, file: MypyFile) -> list[tuple[int, str, int]]:
         return list(deps) + [
             # for QuerySet.annotate
             self._new_dependency("django_stubs_ext"),
-            # For BaseManager.from_queryset
+            # For Manager.from_queryset
             self._new_dependency("django.db.models.query"),
         ]
 

scripts/stubtest/allowlist_todo.txt

@@ -927,67 +927,6 @@ django.db.models.lookups.Lookup.allowed_default
 django.db.models.lookups.Lookup.lookup_name
 django.db.models.lookups.Lookup.output_field
 django.db.models.lookups.PatternLookup.process_rhs
-django.db.models.manager.BaseManager.aaggregate
-django.db.models.manager.BaseManager.abulk_create
-django.db.models.manager.BaseManager.abulk_update
-django.db.models.manager.BaseManager.acontains
-django.db.models.manager.BaseManager.acount
-django.db.models.manager.BaseManager.acreate
-django.db.models.manager.BaseManager.aearliest
-django.db.models.manager.BaseManager.aexists
-django.db.models.manager.BaseManager.aexplain
-django.db.models.manager.BaseManager.afirst
-django.db.models.manager.BaseManager.aget
-django.db.models.manager.BaseManager.aget_or_create
-django.db.models.manager.BaseManager.aggregate
-django.db.models.manager.BaseManager.ain_bulk
-django.db.models.manager.BaseManager.aiterator
-django.db.models.manager.BaseManager.alast
-django.db.models.manager.BaseManager.alatest
-django.db.models.manager.BaseManager.alias
-django.db.models.manager.BaseManager.annotate
-django.db.models.manager.BaseManager.aupdate
-django.db.models.manager.BaseManager.aupdate_or_create
-django.db.models.manager.BaseManager.bulk_create
-django.db.models.manager.BaseManager.bulk_update
-django.db.models.manager.BaseManager.complex_filter
-django.db.models.manager.BaseManager.contains
-django.db.models.manager.BaseManager.count
-django.db.models.manager.BaseManager.create
-django.db.models.manager.BaseManager.dates
-django.db.models.manager.BaseManager.datetimes
-django.db.models.manager.BaseManager.defer
-django.db.models.manager.BaseManager.difference
-django.db.models.manager.BaseManager.distinct
-django.db.models.manager.BaseManager.earliest
-django.db.models.manager.BaseManager.exclude
-django.db.models.manager.BaseManager.exists
-django.db.models.manager.BaseManager.explain
-django.db.models.manager.BaseManager.extra
-django.db.models.manager.BaseManager.filter
-django.db.models.manager.BaseManager.first
-django.db.models.manager.BaseManager.get
-django.db.models.manager.BaseManager.get_or_create
-django.db.models.manager.BaseManager.in_bulk
-django.db.models.manager.BaseManager.intersection
-django.db.models.manager.BaseManager.iterator
-django.db.models.manager.BaseManager.last
-django.db.models.manager.BaseManager.latest
-django.db.models.manager.BaseManager.none
-django.db.models.manager.BaseManager.only
-django.db.models.manager.BaseManager.order_by
-django.db.models.manager.BaseManager.ordered
-django.db.models.manager.BaseManager.prefetch_related
-django.db.models.manager.BaseManager.raw
-django.db.models.manager.BaseManager.reverse
-django.db.models.manager.BaseManager.select_for_update
-django.db.models.manager.BaseManager.select_related
-django.db.models.manager.BaseManager.union
-django.db.models.manager.BaseManager.update
-django.db.models.manager.BaseManager.update_or_create
-django.db.models.manager.BaseManager.using
-django.db.models.manager.BaseManager.values
-django.db.models.manager.BaseManager.values_list
 django.db.models.options.Options.concrete_fields
 django.db.models.options.Options.installed
 django.db.models.options.Options.local_concrete_fields

tests/typecheck/fields/test_related.yml

@@ -727,10 +727,10 @@
         -   path: myapp/models.py
             content: |
                 from django.db import models
-                from django.db.models.manager import BaseManager
+                from django.db.models.manager import Manager
                 class TransactionQuerySet(models.QuerySet):
                     pass
-                TransactionManager = BaseManager.from_queryset(TransactionQuerySet)
+                TransactionManager = Manager.from_queryset(TransactionQuerySet)
                 class Transaction(models.Model):
                     pk = 0
                     objects = TransactionManager()
@@ -752,13 +752,13 @@
         -   path: myapp/models.py
             content: |
                 from django.db import models
-                from django.db.models.manager import BaseManager
+                from django.db.models.manager import Manager
                 class TransactionQuerySet(models.QuerySet):
                     def custom(self) -> None:
                         pass
 
-                def TransactionManager() -> BaseManager:
-                    return BaseManager.from_queryset(TransactionQuerySet)()
+                def TransactionManager() -> Manager:
+                    return Manager.from_queryset(TransactionQuerySet)()
 
                 class Transaction(models.Model):
                     objects = TransactionManager()
@@ -771,10 +771,9 @@
                 class TransactionLog(models.Model):
                     transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE)
     out: |
-        myapp/models:11: error: Could not resolve manager type for "myapp.models.Transaction.objects"  [django-manager-missing]
         myapp/models:13: note: Revealed type is "django.db.models.fields.related_descriptors.RelatedManager[myapp.models.TransactionLog]"
-        myapp/models:15: note: Revealed type is "myapp.models.UnknownManager[myapp.models.Transaction]"
-        myapp/models:16: note: Revealed type is "Any"
+        myapp/models:15: note: Revealed type is "myapp.models.ManagerFromTransactionQuerySet[myapp.models.Transaction]"
+        myapp/models:16: note: Revealed type is "None"
 
 
 -   case: resolve_primary_keys_for_foreign_keys_with_abstract_self_model
@@ -914,12 +913,12 @@
         -   path: myapp/models/purchase.py
             content: |
                 from django.db import models
-                from django.db.models.manager import BaseManager
+                from django.db.models.manager import Manager
                 from .querysets import PurchaseQuerySet
                 from .store import Store
                 from .user import User
 
-                PurchaseManager = BaseManager.from_queryset(PurchaseQuerySet)
+                PurchaseManager = Manager.from_queryset(PurchaseQuerySet)
                 class Purchase(models.Model):
                     objects = PurchaseManager()
                     store = models.ForeignKey(to=Store, on_delete=models.CASCADE, related_name='purchases')
@@ -937,7 +936,7 @@
         -   path: myapp/models.py
             content: |
                 from django.db import models
-                from django.db.models.manager import BaseManager
+                from django.db.models.manager import Manager
 
                 class User(models.Model):
                     purchases: int
@@ -946,7 +945,7 @@
                     def queryset_method(self) -> "PurchaseQuerySet":
                         return self.all()
 
-                PurchaseManager = BaseManager.from_queryset(PurchaseQuerySet)
+                PurchaseManager = Manager.from_queryset(PurchaseQuerySet)
                 class Purchase(models.Model):
                     objects = PurchaseManager()
                     user = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name='purchases')