add Model.__init__ typechecking

django-stubs/contrib/admin/models.pyi

@@ -1,20 +1,17 @@
-import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Optional, Union
 from uuid import UUID
 
-from django.db import models
+from django.contrib.contenttypes.models import ContentType
 from django.db.models.base import Model
 
+from django.db import models
+
 ADDITION: int
 CHANGE: int
 DELETION: int
 ACTION_FLAG_CHOICES: Any
 
 class LogEntryManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def log_action(
         self,
         user_id: int,
@@ -22,23 +19,18 @@ class LogEntryManager(models.Manager):
         object_id: Union[int, str, UUID],
         object_repr: str,
         action_flag: int,
-        change_message: Union[
-            Dict[str, Dict[str, List[str]]], List[Dict[str, Dict[str, Union[List[str], str]]]], str
-        ] = ...,
+        change_message: Any = ...,
     ) -> LogEntry: ...
 
 class LogEntry(models.Model):
-    content_type_id: int
-    id: None
-    user_id: int
-    action_time: datetime.datetime = ...
-    user: Any = ...
-    content_type: Any = ...
-    object_id: str = ...
-    object_repr: str = ...
-    action_flag: int = ...
-    change_message: str = ...
-    objects: Any = ...
+    action_time: models.DateTimeField = ...
+    user: models.ForeignKey = ...
+    content_type: models.ForeignKey[ContentType] = ...
+    object_id: models.TextField = ...
+    object_repr: models.CharField = ...
+    action_flag: models.PositiveSmallIntegerField = ...
+    change_message: models.TextField = ...
+    objects: LogEntryManager = ...
     def is_addition(self) -> bool: ...
     def is_change(self) -> bool: ...
     def is_deletion(self) -> bool: ...

django-stubs/contrib/auth/models.pyi

@@ -1,46 +1,33 @@
-import datetime
 from typing import Any, List, Optional, Set, Tuple, Type, Union
 
 from django.contrib.auth.base_user import AbstractBaseUser as AbstractBaseUser, BaseUserManager as BaseUserManager
+from django.contrib.contenttypes.models import ContentType
 from django.db.models.manager import EmptyManager
 
+from django.contrib.auth.validators import UnicodeUsernameValidator
 from django.db import models
 
 def update_last_login(sender: Type[AbstractBaseUser], user: AbstractBaseUser, **kwargs: Any) -> None: ...
 
 class PermissionManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def get_by_natural_key(self, codename: str, app_label: str, model: str) -> Permission: ...
 
 class Permission(models.Model):
     content_type_id: int
-    id: int
-    name: str = ...
-    content_type: Any = ...
+    name: models.CharField = ...
+    content_type: models.ForeignKey[ContentType] = ...
     codename: str = ...
     def natural_key(self) -> Tuple[str, str, str]: ...
 
 class GroupManager(models.Manager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def get_by_natural_key(self, name: str) -> Group: ...
 
 class Group(models.Model):
-    id: None
-    name: str = ...
-    permissions: Any = ...
+    name: models.CharField = ...
+    permissions: models.ManyToManyField[Permission] = ...
     def natural_key(self): ...
 
 class UserManager(BaseUserManager):
-    creation_counter: int
-    model: None
-    name: None
-    use_in_migrations: bool = ...
     def create_user(
         self, username: str, email: Optional[str] = ..., password: Optional[str] = ..., **extra_fields: Any
     ) -> AbstractUser: ...
@@ -49,9 +36,9 @@ class UserManager(BaseUserManager):
     ) -> AbstractBaseUser: ...
 
 class PermissionsMixin(models.Model):
-    is_superuser: Any = ...
-    groups: Any = ...
-    user_permissions: Any = ...
+    is_superuser: models.BooleanField = ...
+    groups: models.ManyToManyField[Group] = ...
+    user_permissions: models.ManyToManyField[Permission] = ...
     def get_group_permissions(self, obj: None = ...) -> Set[str]: ...
     def get_all_permissions(self, obj: Optional[str] = ...) -> Set[str]: ...
     def has_perm(self, perm: Union[Tuple[str, Any], str], obj: Optional[str] = ...) -> bool: ...
@@ -59,14 +46,13 @@ class PermissionsMixin(models.Model):
     def has_module_perms(self, app_label: str) -> bool: ...
 
 class AbstractUser(AbstractBaseUser, PermissionsMixin):  # type: ignore
-    is_superuser: bool
-    username_validator: Any = ...
-    username: str = ...
-    first_name: str = ...
-    last_name: str = ...
-    email: str = ...
-    is_staff: bool = ...
-    date_joined: datetime.datetime = ...
+    username_validator: UnicodeUsernameValidator = ...
+    username: models.CharField = ...
+    first_name: models.CharField = ...
+    last_name: models.CharField = ...
+    email: models.EmailField = ...
+    is_staff: models.BooleanField = ...
+    date_joined: models.DateTimeField = ...
     EMAIL_FIELD: str = ...
     USERNAME_FIELD: str = ...
     def clean(self) -> None: ...

django-stubs/contrib/postgres/fields/__init__.pyi

@@ -8,3 +8,4 @@ from .ranges import (
     DateRangeField as DateRangeField,
     DateTimeRangeField as DateTimeRangeField,
 )
+from .hstore import HStoreField as HStoreField

django-stubs/contrib/postgres/fields/array.pyi

@@ -13,14 +13,8 @@ class ArrayField(CheckFieldDefaultMixin, Field, Generic[_T]):
     default_validators: Any = ...
     from_db_value: Any = ...
     def __init__(self, base_field: _T, size: Optional[int] = ..., **kwargs: Any) -> None: ...
-    def check(self, **kwargs: Any) -> List[Any]: ...
     @property
     def description(self): ...
-    def get_db_prep_value(self, value: Any, connection: Any, prepared: bool = ...): ...
-    def to_python(self, value: Any): ...
-    def value_to_string(self, obj: Any): ...
     def get_transform(self, name: Any): ...
-    def validate(self, value: Any, model_instance: Any) -> None: ...
-    def run_validators(self, value: Any) -> None: ...
-    def __set__(self, instance, value: Sequence[_T]): ...
+    def __set__(self, instance, value: Sequence[_T]) -> None: ...
     def __get__(self, instance, owner) -> List[_T]: ...

django-stubs/contrib/postgres/fields/hstore.pyi

@@ -0,0 +1,17 @@
+from typing import Any
+
+from django.db.models import Field, Transform
+from .mixins import CheckFieldDefaultMixin
+
+class HStoreField(CheckFieldDefaultMixin, Field):
+    def get_transform(self, name) -> Any: ...
+
+class KeyTransform(Transform):
+    def __init__(self, key_name: str, *args: Any, **kwargs: Any): ...
+
+class KeyTransformFactory:
+    def __init__(self, key_name: str): ...
+    def __call__(self, *args, **kwargs) -> KeyTransform: ...
+
+class KeysTransform(Transform): ...
+class ValuesTransform(Transform): ...

django-stubs/db/models/fields/__init__.pyi

@@ -1,6 +1,6 @@
 import uuid
 from datetime import date, time, datetime, timedelta
-from typing import Any, Optional, Tuple, Iterable, Callable, Dict, Union, Type
+from typing import Any, Optional, Tuple, Iterable, Callable, Dict, Union, Type, TypeVar
 import decimal
 
 from django.db.models import Model

django-stubs/db/models/query.pyi

@@ -95,13 +95,14 @@ class QuerySet(Iterable[_T], Sized):
     def raw(
         self, raw_query: str, params: Any = ..., translations: Optional[Dict[str, str]] = ..., using: None = ...
     ) -> RawQuerySet: ...
-    def values(self, *fields: Union[str, Combinable], **expressions: Any) -> ValuesIterable: ...
-    @overload
-    def values_list(self, *fields: Union[str, Combinable], named: Literal[True]) -> NamedValuesListIterable: ...
-    @overload
-    def values_list(self, *fields: Union[str, Combinable], flat: Literal[True]) -> FlatValuesListIterable: ...
-    @overload
-    def values_list(self, *fields: Union[str, Combinable]) -> ValuesListIterable: ...
+    def values(self, *fields: Union[str, Combinable], **expressions: Any) -> QuerySet: ...
+    def values_list(self, *fields: Union[str, Combinable], flat: bool = ..., named: bool = ...) -> QuerySet: ...
+    # @overload
+    # def values_list(self, *fields: Union[str, Combinable], named: Literal[True]) -> NamedValuesListIterable: ...
+    # @overload
+    # def values_list(self, *fields: Union[str, Combinable], flat: Literal[True]) -> FlatValuesListIterable: ...
+    # @overload
+    # def values_list(self, *fields: Union[str, Combinable]) -> ValuesListIterable: ...
     def dates(self, field_name: str, kind: str, order: str = ...) -> QuerySet: ...
     def datetimes(self, field_name: str, kind: str, order: str = ..., tzinfo: None = ...) -> QuerySet: ...
     def none(self) -> QuerySet[_T]: ...

django-stubs/forms/widgets.pyi

@@ -1,7 +1,7 @@
 from datetime import time
 from decimal import Decimal
 from itertools import chain
-from typing import Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type, Union, Iterable
+from typing import Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type, Union, Iterable, Sequence
 
 from django.contrib.admin.options import BaseModelAdmin
 from django.core.files.base import File
@@ -114,6 +114,8 @@ class CheckboxInput(Input):
     check_test: Callable = ...
     def __init__(self, attrs: Optional[Dict[str, str]] = ..., check_test: Optional[Callable] = ...) -> None: ...
 
+_OptAttrs = Dict[str, Any]
+
 class ChoiceWidget(Widget):
     allow_multiple_selected: bool = ...
     input_type: Optional[str] = ...
@@ -123,17 +125,9 @@ class ChoiceWidget(Widget):
     checked_attribute: Any = ...
     option_inherits_attrs: bool = ...
     choices: List[List[Union[int, str]]] = ...
-    def __init__(
-        self,
-        attrs: Optional[Dict[str, Union[bool, str]]] = ...,
-        choices: Union[
-            Iterator[Any], List[List[Union[int, str]]], List[Tuple[Union[time, int], int]], List[int], Tuple
-        ] = ...,
-    ) -> None: ...
-    def options(self, name: str, value: List[str], attrs: Dict[str, Union[bool, str]] = ...) -> None: ...
-    def optgroups(
-        self, name: str, value: List[str], attrs: Optional[Dict[str, Union[bool, str]]] = ...
-    ) -> List[Tuple[Optional[str], List[Dict[str, Union[Dict[str, Union[bool, str]], time, int, str]]], int]]: ...
+    def __init__(self, attrs: Optional[_OptAttrs] = ..., choices: Sequence[Tuple[Any, Any]] = ...) -> None: ...
+    def options(self, name: str, value: List[str], attrs: Optional[_OptAttrs] = ...) -> None: ...
+    def optgroups(self, name: str, value: List[str], attrs: Optional[_OptAttrs] = ...) -> Any: ...
     def create_option(
         self,
         name: str,
@@ -142,8 +136,8 @@ class ChoiceWidget(Widget):
         selected: Union[Set[str], bool],
         index: int,
         subindex: Optional[int] = ...,
-        attrs: Optional[Dict[str, Union[bool, str]]] = ...,
-    ) -> Dict[str, Union[Dict[str, Union[bool, str]], Dict[str, bool], Set[str], time, int, str]]: ...
+        attrs: Optional[_OptAttrs] = ...,
+    ) -> Dict[str, Any]: ...
     def id_for_label(self, id_: str, index: str = ...) -> str: ...
 
 class Select(ChoiceWidget):
@@ -171,11 +165,7 @@ class CheckboxSelectMultiple(ChoiceWidget):
 class MultiWidget(Widget):
     template_name: str = ...
     widgets: List[Widget] = ...
-    def __init__(
-        self,
-        widgets: Union[List[Type[DateTimeBaseInput]], Tuple[Union[Type[TextInput], Input]]],
-        attrs: Optional[Dict[str, str]] = ...,
-    ) -> None: ...
+    def __init__(self, widgets: Sequence[Widget], attrs: Optional[_OptAttrs] = ...) -> None: ...
     @property
     def is_hidden(self) -> bool: ...
     def decompress(self, value: Any) -> Optional[Any]: ...
@@ -218,7 +208,7 @@ class SelectDateWidget(Widget):
     day_none_value: Any = ...
     def __init__(
         self,
-        attrs: None = ...,
+        attrs: Optional[_OptAttrs] = ...,
         years: Optional[Union[Tuple[Union[int, str]], range]] = ...,
         months: None = ...,
         empty_label: Optional[Union[Tuple[str, str], str]] = ...,