model-bakery 1.18.1__tar.gz → 1.18.3__tar.gz

{model_bakery-1.18.1 → model_bakery-1.18.3}/PKG-INFO

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

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

{model_bakery-1.18.1 → model_bakery-1.18.3}/model_bakery/baker.py

@@ -51,7 +51,7 @@ from .utils import (
 
 if BAKER_CONTENTTYPES:
     from django.contrib.contenttypes import models as contenttypes_models
-    from django.contrib.contenttypes.fields import GenericRelation
+    from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 else:
     contenttypes_models = None
     GenericRelation = None
@@ -501,6 +501,7 @@ class Baker(Generic[M]):
     ) -> M:
         one_to_many_keys = {}
         auto_now_keys = {}
+        generic_foreign_keys = {}
 
         for k in tuple(attrs.keys()):
             field = getattr(self.model, k, None)
@@ -517,12 +518,15 @@ class Baker(Generic[M]):
             ):
                 auto_now_keys[k] = attrs[k]
 
+            if BAKER_CONTENTTYPES and isinstance(field, GenericForeignKey):
+                generic_foreign_keys[k] = attrs.pop(k)
+
         instance = self.model(**attrs)
-        # m2m only works for persisted instances
         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:
@@ -622,7 +626,7 @@ class Baker(Generic[M]):
 
         if field.name not in self.model_attrs:  # noqa: SIM102
             if field.name not in self.rel_fields and (
-                field.null and not field.fill_optional
+                not field.fill_optional and field.null
             ):
                 return True
 
@@ -638,6 +642,9 @@ class Baker(Generic[M]):
         for key, values in attrs.items():
             manager = getattr(instance, key)
 
+            if callable(values):
+                values = values()
+
             for value in values:
                 # Django will handle any operation to persist nested non-persisted FK because
                 # save doesn't do so and, thus, raises constraint errors. That's why save()
@@ -659,6 +666,9 @@ class Baker(Generic[M]):
 
     def _handle_m2m(self, instance: Model):
         for key, values in self.m2m_dict.items():
+            if callable(values):
+                values = values()
+
             for value in values:
                 if not value.pk:
                     value.save()
@@ -676,6 +686,10 @@ 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)
+
     def _remote_field(
         self, field: Union[ForeignKey, OneToOneField]
     ) -> Union[OneToOneRel, ManyToOneRel]:
@@ -696,12 +710,16 @@ class Baker(Generic[M]):
         model.
         """
         is_content_type_fk = False
+        is_generic_fk = False
         if BAKER_CONTENTTYPES:
             is_content_type_fk = isinstance(field, ForeignKey) and issubclass(
                 self._remote_field(field).model, contenttypes_models.ContentType
             )
+            is_generic_fk = isinstance(field, GenericForeignKey)
+        if is_generic_fk:
+            generator = self.type_mapping[GenericForeignKey]
         # we only use default unless the field is overwritten in `self.rel_fields`
-        if field.has_default() and field.name not in self.rel_fields:
+        elif field.has_default() and field.name not in self.rel_fields:
             if callable(field.default):
                 return field.default()
             return field.default

{model_bakery-1.18.1 → model_bakery-1.18.3}/model_bakery/content_types.py

@@ -7,8 +7,11 @@ 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.18.1 → model_bakery-1.18.3}/model_bakery/recipe.py

@@ -78,7 +78,8 @@ class Recipe(Generic[M]):
                 else:
                     mapping[k] = v.recipe.prepare(_using=_using, **recipe_attrs)
             elif isinstance(v, related):
-                mapping[k] = v.make()
+                mapping[k] = v.make
+
         mapping.update(new_attrs)
         mapping.update(rel_fields_attrs)
         return mapping

{model_bakery-1.18.1 → model_bakery-1.18.3}/pyproject.toml

@@ -94,9 +94,7 @@ disallow_untyped_calls = true
 [tool.pytest.ini_options]
 addopts = "--tb=short -rxs --nomigrations"
 
-[tool.ruff]
-target-version = "py38"
-
+[tool.ruff.lint]
 select = [
     "S", # flake8-bandit
     "B", # flake8-bugbear
@@ -113,19 +111,19 @@ select = [
 
 ignore = ["B904", "E501", "S101", "D1", "D212"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "tests/test_*.py" = [
     "S",
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 combine-as-imports=true
 split-on-trailing-comma=true
 section-order = ["future", "standard-library", "django", "third-party", "first-party", "local-folder"]
 force-wrap-aliases=true
 
-[tool.ruff.isort.sections]
+[tool.ruff.lint.isort.sections]
 django = ["django"]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "google"

model_bakery-1.18.1/model_bakery/__about__.py

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