model-bakery 1.19.0__tar.gz → 1.19.2__tar.gz

{model_bakery-1.19.0 → model_bakery-1.19.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: model-bakery
-Version: 1.19.0
+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.2/model_bakery/__about__.py

@@ -0,0 +1 @@
+__version__ = "1.19.2"

{model_bakery-1.19.0 → model_bakery-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]
@@ -864,4 +883,18 @@ def bulk_create(baker: Baker[M], quantity: int, **kwargs) -> List[M]:
                         for obj in kwargs[field.name]
                     ]
                 )
+
+        # set many-to-many relations that are specified using related name from kwargs
+        for field in baker.model._meta.get_fields():
+            if field.many_to_many and hasattr(field, "related_model"):
+                reverse_relation_name = (
+                    field.related_query_name
+                    or field.related_name
+                    or f"{field.related_model._meta.model_name}_set"
+                )
+                if reverse_relation_name in kwargs:
+                    getattr(entry, reverse_relation_name).set(
+                        kwargs[reverse_relation_name]
+                    )
+
     return created_entries

{model_bakery-1.19.0 → model_bakery-1.19.2}/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.0/model_bakery/__about__.py

@@ -1 +0,0 @@
-__version__ = "1.19.0"