model-bakery 1.19.1__py3-none-any.whl → 1.19.2__py3-none-any.whl

model_bakery/__about__.py

@@ -1 +1 @@
-__version__ = "1.19.1"
+__version__ = "1.19.2"

model_bakery/baker.py

@@ -519,14 +519,20 @@ class Baker(Generic[M]):
                 auto_now_keys[k] = attrs[k]
 
             if BAKER_CONTENTTYPES and isinstance(field, GenericForeignKey):
-                generic_foreign_keys[k] = attrs.pop(k)
+                generic_foreign_keys[k] = {
+                    "value": attrs.pop(k),
+                    "content_type_field": field.ct_field,
+                    "object_id_field": field.fk_field,
+                }
 
         instance = self.model(**attrs)
+
+        self._handle_generic_foreign_keys(instance, generic_foreign_keys)
+
         if _commit:
             instance.save(**_save_kwargs)
             self._handle_one_to_many(instance, one_to_many_keys)
             self._handle_m2m(instance)
-            self._handle_generic_foreign_keys(instance, generic_foreign_keys)
             self._handle_auto_now(instance, auto_now_keys)
 
             if _from_manager:
@@ -603,7 +609,7 @@ class Baker(Generic[M]):
         ]
 
         if BAKER_CONTENTTYPES:
-            other_fields_to_skip.append(GenericRelation)
+            other_fields_to_skip.extend([GenericRelation, GenericForeignKey])
 
         if isinstance(field, tuple(other_fields_to_skip)):
             return True
@@ -687,8 +693,21 @@ class Baker(Generic[M]):
                     make(through_model, _using=self._using, **base_kwargs)
 
     def _handle_generic_foreign_keys(self, instance: Model, attrs: Dict[str, Any]):
-        for key, value in attrs.items():
-            setattr(instance, key, value)
+        """Set content type and object id for GenericForeignKey fields."""
+        for field_name, data in attrs.items():
+            content_type_field = data["content_type_field"]
+            object_id_field = data["object_id_field"]
+            value = data["value"]
+            if is_iterator(value):
+                value = next(value)
+
+            setattr(instance, field_name, value)
+            setattr(
+                instance,
+                content_type_field,
+                contenttypes_models.ContentType.objects.get_for_model(value),
+            )
+            setattr(instance, object_id_field, value.pk)
 
     def _remote_field(
         self, field: Union[ForeignKey, OneToOneField]

model_bakery/content_types.py

@@ -7,11 +7,8 @@ default_contenttypes_mapping = {}
 __all__ = ["BAKER_CONTENTTYPES", "default_contenttypes_mapping"]
 
 if BAKER_CONTENTTYPES:
-    from django.contrib.contenttypes.fields import GenericForeignKey
     from django.contrib.contenttypes.models import ContentType
 
     from . import random_gen
 
     default_contenttypes_mapping[ContentType] = random_gen.gen_content_type
-    # a small hack to generate random object for GenericForeignKey
-    default_contenttypes_mapping[GenericForeignKey] = random_gen.gen_content_type

{model_bakery-1.19.1.dist-info → model_bakery-1.19.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: model-bakery
-Version: 1.19.1
+Version: 1.19.2
 Summary: Smart object creation facility for Django.
 Project-URL: Homepage, https://github.com/model-bakers/model_bakery
 Author-email: berin <bernardoxhc@gmail.com>, amureki <amureki@hey.com>

{model_bakery-1.19.1.dist-info → model_bakery-1.19.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-model_bakery/__about__.py,sha256=RpcrQoR9OTKxJcUGch7tBAck5gXFRixMwDygqyMiSto,23
+model_bakery/__about__.py,sha256=V14nqouh0fns5BAgWrw5Aw8DW-D9yIY3TtnyECKUNxM,23
 model_bakery/__init__.py,sha256=yY0xZUrr_mskBm07iF-MFBEiXzOuKrlMwpKWkXZs8v0,31
 model_bakery/_types.py,sha256=P0iKC5-Cnh3lyzyZs1mlCfOW31zbEZpxqWCuYonucKo,130
-model_bakery/baker.py,sha256=J3O_ST9URyw2_eR-3BWlZNBgdaqO3FCZT875NP-BnYE,29418
-model_bakery/content_types.py,sha256=O66pJZYrue0NsgKIEpVPwXb7mT-K4kEmomuFodvmZyo,613
+model_bakery/baker.py,sha256=NSDx3hezvEG0HpWVXJd1uJPLxhJjc2tI-ipCzMbmWvw,30140
+model_bakery/content_types.py,sha256=3POJ12aqPuSvCdKYuwb1GlJpSocgByG2JW5kw7VBNxQ,395
 model_bakery/exceptions.py,sha256=q1oBZvfxL7HAD-F9aWgiYs4P4rz-hJ5TjeX7gcb3Q0I,333
 model_bakery/generators.py,sha256=agY6pH14vjehVI0wJDw3Q-u4zt7mq2M1a3CUPTkAxp0,5169
 model_bakery/gis.py,sha256=eTNOfT98_ncLAb4KmOYJhE-3ALU2_pQbUpWPTolFZJI,1028
@@ -13,7 +13,7 @@ model_bakery/random_gen.py,sha256=IYhDhqsRBftceQRHtc9B4bUWLTjvEXkgEwhNhp9DajE,97
 model_bakery/recipe.py,sha256=3PVg8y-vvfOf7Z4o9J7QPoO8eegGmejFCVWco19AWIs,8378
 model_bakery/timezone.py,sha256=rd-KGVHqJoHdHKBgENPMBTRqqxgKE91CM9C0f9nS90M,325
 model_bakery/utils.py,sha256=fw4ewtwkJ6wZ9PbDzBGvODX7CV81ozy2_6JAQmITmX4,4581
-model_bakery-1.19.1.dist-info/METADATA,sha256=6kn2jbIbcPJS31uebIGjcYstoqT5MTOwEKiRDbtxpE8,4355
-model_bakery-1.19.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-model_bakery-1.19.1.dist-info/licenses/LICENSE,sha256=kCwHls7z8Y7NyZCmdnV1qLSdLrQ8bHrXLji5HOasgUc,611
-model_bakery-1.19.1.dist-info/RECORD,,
+model_bakery-1.19.2.dist-info/METADATA,sha256=LjZgSNHtbrNUhoAHVpEwA0dgPudklKLP9jtJMkfYo0g,4355
+model_bakery-1.19.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+model_bakery-1.19.2.dist-info/licenses/LICENSE,sha256=kCwHls7z8Y7NyZCmdnV1qLSdLrQ8bHrXLji5HOasgUc,611
+model_bakery-1.19.2.dist-info/RECORD,,