Fix error when adding custom fields generators to bakery via settings file

model_bakery/baker.py

@@ -1,9 +1,8 @@
 from os.path import dirname, join
 
 from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
+from django.contrib import contenttypes
 from django.apps import apps
-from django.contrib.contenttypes.fields import GenericRelation
 
 from django.db.models.base import ModelBase
 from django.db.models import (
@@ -403,6 +402,8 @@ def is_rel_field(x):
         ]
 
     def _skip_field(self, field):
+        from django.contrib.contenttypes.fields import GenericRelation
+
         # check for fill optional argument
         if isinstance(self.fill_in_optional, bool):
             field.fill_optional = self.fill_in_optional
@@ -493,9 +494,9 @@ def generate_value(self, field, commit=True):
         elif getattr(field, "choices"):
             generator = random_gen.gen_from_choices(field.choices)
         elif isinstance(field, ForeignKey) and issubclass(
-            self._remote_field(field).model, ContentType
+            self._remote_field(field).model, contenttypes.models.ContentType
         ):
-            generator = self.type_mapping[ContentType]
+            generator = self.type_mapping[contenttypes.models.ContentType]
         elif generators.get(field.__class__):
             generator = generators.get(field.__class__)
         elif field.__class__ in self.type_mapping:

model_bakery/generators.py

@@ -1,4 +1,3 @@
-from django.contrib.contenttypes.models import ContentType
 from django.db.models import (
     BigIntegerField,
     BinaryField,
@@ -30,7 +29,6 @@
 )
 
 from . import random_gen
-from .gis import default_gis_mapping
 from .utils import import_from_str
 
 try:
@@ -88,7 +86,6 @@
     FileField: random_gen.gen_file_field,
     ImageField: random_gen.gen_image_field,
     DurationField: random_gen.gen_interval,
-    ContentType: random_gen.gen_content_type,
 }
 
 if ArrayField:
@@ -105,11 +102,16 @@
     default_mapping[CITextField] = random_gen.gen_text
 
 # Add GIS fields
-default_mapping.update(default_gis_mapping)
 
 
 def get_type_mapping():
+    from django.contrib.contenttypes.models import ContentType
+    from .gis import default_gis_mapping
+
     mapping = default_mapping.copy()
+    mapping[ContentType] = random_gen.gen_content_type
+    default_mapping.update(default_gis_mapping)
+
     return mapping.copy()
 
 

tests/conftest.py

@@ -29,6 +29,7 @@ def pytest_configure():
         ] + installed_apps
     else:
         raise NotImplementedError("Tests for % are not supported", test_db)
+
     settings.configure(
         DATABASES={"default": {"ENGINE": db_engine, "NAME": db_name}},
         INSTALLED_APPS=installed_apps,
@@ -37,4 +38,9 @@ def pytest_configure():
         MIDDLEWARE=(),
         USE_TZ=os.environ.get("USE_TZ", False),
     )
+
+    from model_bakery import baker
+
+    baker.generators.add("tests.generic.fields.CustomFieldWithGenerator", None)
+
     django.setup()