Refactor: Unify plugin check for model type info (#2286)

Author: flaeppe

mypy_django_plugin/transformers/managers.py

@@ -138,11 +138,7 @@ def _process_dynamic_method(
     args_types = method_type.arg_types[1:]
     if _has_compatible_type_vars(base_that_has_method):
         typed_var = manager_instance.args or queryset_info.bases[0].args
-        if (
-            typed_var
-            and isinstance(typed_var[0], Instance)
-            and typed_var[0].type.has_base(fullnames.MODEL_CLASS_FULLNAME)
-        ):
+        if typed_var and isinstance(typed_var[0], Instance) and helpers.is_model_type(typed_var[0].type):
             ret_type = _replace_type_var(ret_type, base_that_has_method.defn.type_vars[0].fullname, typed_var[0])
             args_types = [
                 _replace_type_var(arg_type, base_that_has_method.defn.type_vars[0].fullname, typed_var[0])

mypy_django_plugin/transformers/models.py

@@ -44,7 +44,7 @@
 from mypy_django_plugin.errorcodes import MANAGER_MISSING
 from mypy_django_plugin.exceptions import UnregisteredModelError
 from mypy_django_plugin.lib import fullnames, helpers
-from mypy_django_plugin.lib.fullnames import ANNOTATIONS_FULLNAME, MODEL_CLASS_FULLNAME
+from mypy_django_plugin.lib.fullnames import ANNOTATIONS_FULLNAME
 from mypy_django_plugin.transformers.fields import FieldDescriptorTypes, get_field_descriptor_types
 from mypy_django_plugin.transformers.managers import (
     MANAGER_METHODS_RETURNING_QUERYSET,
@@ -1124,7 +1124,7 @@ def handle_annotated_type(ctx: AnalyzeTypeContext, fullname: str) -> MypyType:
     if not args:
         return AnyType(TypeOfAny.from_omitted_generics) if is_with_annotations else ctx.type
     type_arg = ctx.api.analyze_type(args[0])
-    if not isinstance(type_arg, Instance) or not type_arg.type.has_base(MODEL_CLASS_FULLNAME):
+    if not isinstance(type_arg, Instance) or not helpers.is_model_type(type_arg.type):
         return type_arg
 
     fields_dict = None

mypy_django_plugin/transformers/querysets.py

@@ -14,7 +14,6 @@
 
 from mypy_django_plugin.django.context import DjangoContext, LookupsAreUnsupported
 from mypy_django_plugin.lib import fullnames, helpers
-from mypy_django_plugin.lib.fullnames import ANY_ATTR_ALLOWED_CLASS_FULLNAME
 from mypy_django_plugin.lib.helpers import parse_bool
 from mypy_django_plugin.transformers.models import get_annotated_type
 
@@ -33,7 +32,7 @@ def _extract_model_type_from_queryset(queryset_type: Instance, api: TypeChecker)
         if (
             len(base_type.args)
             and isinstance(base_type.args[0], Instance)
-            and base_type.args[0].type.has_base(fullnames.MODEL_CLASS_FULLNAME)
+            and helpers.is_model_type(base_type.args[0].type)
         ):
             return base_type.args[0]
     return None
@@ -46,7 +45,7 @@ def determine_proper_manager_type(ctx: FunctionContext) -> MypyType:
     outer_model_info = helpers.get_typechecker_api(ctx).scope.active_class()
     if (
         outer_model_info is None
-        or not outer_model_info.has_base(fullnames.MODEL_CLASS_FULLNAME)
+        or not helpers.is_model_type(outer_model_info)
         or outer_model_info.self_type is None
         or not default_return_type.type.is_generic()
     ):
@@ -123,7 +122,7 @@ def get_values_list_row_type(
                     typechecker_api,
                     "Row",
                     column_types,
-                    extra_bases=[typechecker_api.named_generic_type(ANY_ATTR_ALLOWED_CLASS_FULLNAME, [])],
+                    extra_bases=[typechecker_api.named_generic_type(fullnames.ANY_ATTR_ALLOWED_CLASS_FULLNAME, [])],
                 )
             else:
                 return helpers.make_oneoff_named_tuple(typechecker_api, "Row", column_types)
@@ -300,9 +299,7 @@ def extract_proper_type_queryset_annotate(ctx: MethodContext, django_context: Dj
                 row_type = AnyType(TypeOfAny.implementation_artifact)
             else:
                 row_type = api.named_generic_type("builtins.tuple", [AnyType(TypeOfAny.from_omitted_generics)])
-        elif isinstance(original_row_type, Instance) and original_row_type.type.has_base(
-            fullnames.MODEL_CLASS_FULLNAME
-        ):
+        elif isinstance(original_row_type, Instance) and helpers.is_model_type(original_row_type.type):
             row_type = annotated_type
     else:
         row_type = annotated_type