model-bakery 1.20.1__py3-none-any.whl → 1.20.3__py3-none-any.whl

model_bakery/__about__.py

@@ -1 +1 @@
-__version__ = "1.20.1"
+__version__ = "1.20.3"

model_bakery/baker.py

@@ -70,6 +70,10 @@ def _valid_quantity(quantity: Optional[Union[str, int]]) -> bool:
     return quantity is not None and (not isinstance(quantity, int) or quantity < 1)
 
 
+def _is_auto_datetime_field(field: Field) -> bool:
+    return getattr(field, "auto_now_add", False) or getattr(field, "auto_now", False)
+
+
 def seed(seed: Union[int, float, str, bytes, bytearray, None]) -> None:
     Baker.seed(seed)
 
@@ -513,10 +517,7 @@ class Baker(Generic[M]):
             if isinstance(field, ForeignRelatedObjectsDescriptor):
                 one_to_many_keys[k] = attrs.pop(k)
 
-            if hasattr(field, "field") and (
-                getattr(field.field, "auto_now_add", False)
-                or getattr(field.field, "auto_now", False)
-            ):
+            if hasattr(field, "field") and _is_auto_datetime_field(field.field):
                 auto_now_keys[k] = attrs[k]
 
             if BAKER_CONTENTTYPES and isinstance(field, GenericForeignKey):
@@ -589,6 +590,9 @@ class Baker(Generic[M]):
         else:
             field.fill_optional = field.name in self.fill_in_optional
 
+        if _is_auto_datetime_field(field):
+            return True
+
         if isinstance(field, FileField) and not self.create_files:
             return True
 
@@ -699,6 +703,8 @@ class Baker(Generic[M]):
             ct_field_name = data["content_type_field"]
             oid_field_name = data["object_id_field"]
             value = data["value"]
+            if callable(value):
+                value = value()
             if is_iterator(value):
                 value = next(value)
             if value is None:
@@ -714,7 +720,9 @@ class Baker(Generic[M]):
                 setattr(
                     instance,
                     ct_field_name,
-                    contenttypes_models.ContentType.objects.get_for_model(value),
+                    contenttypes_models.ContentType.objects.get_for_model(
+                        value, for_concrete_model=False
+                    ),
                 )
                 setattr(instance, oid_field_name, value.pk)
 

model_bakery/recipe.py

@@ -1,4 +1,5 @@
 import collections
+import copy
 import itertools
 from typing import (
     Any,
@@ -79,6 +80,8 @@ class Recipe(Generic[M]):
                     mapping[k] = v.recipe.prepare(_using=_using, **recipe_attrs)
             elif isinstance(v, related):
                 mapping[k] = v.make
+            elif isinstance(v, collections.abc.Container):
+                mapping[k] = copy.deepcopy(v)
 
         mapping.update(new_attrs)
         mapping.update(rel_fields_attrs)

{model_bakery-1.20.1.dist-info → model_bakery-1.20.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: model-bakery
-Version: 1.20.1
+Version: 1.20.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.20.1.dist-info → model_bakery-1.20.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
-model_bakery/__about__.py,sha256=RqzUQEsX4hUOb94B1GOAj7CGJi2Hi7fdu4qN6_hsF8I,23
+model_bakery/__about__.py,sha256=5kgpbRZNZ0S3xTW7W-SYXeJdcA29AHOdGGCQhbEDGaU,23
 model_bakery/__init__.py,sha256=yY0xZUrr_mskBm07iF-MFBEiXzOuKrlMwpKWkXZs8v0,31
 model_bakery/_types.py,sha256=P0iKC5-Cnh3lyzyZs1mlCfOW31zbEZpxqWCuYonucKo,130
-model_bakery/baker.py,sha256=KvAK_fAoqKgjik7ormzYZelHw-yxtuHiaHjtM9uXpu8,30905
+model_bakery/baker.py,sha256=NjF__SdtxetVTN5Vc8PI2vek3PC5APxcPc6JB8hj_cw,31150
 model_bakery/content_types.py,sha256=3POJ12aqPuSvCdKYuwb1GlJpSocgByG2JW5kw7VBNxQ,395
 model_bakery/exceptions.py,sha256=q1oBZvfxL7HAD-F9aWgiYs4P4rz-hJ5TjeX7gcb3Q0I,333
 model_bakery/generators.py,sha256=weuPptRtWnznjXGB658ftLQtSj5RMwngx-ryBXapNjE,5173
@@ -10,10 +10,10 @@ model_bakery/mock_file.txt,sha256=CO5zPS6Uydk48ZRnGcRKVEYKd2YjaUMa9QOgF5gGMCo,10
 model_bakery/mock_img.jpeg,sha256=iF2ybgAVtDvl48-8VKdv_QFHKfnqeOaeGwR6ZLexJkY,1916
 model_bakery/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 model_bakery/random_gen.py,sha256=3rvZCg5px6NOY1Q3fHSqw51BY6iQfCmOoRX4SsCOp6U,10084
-model_bakery/recipe.py,sha256=lxsfdrNKydHLgPRiUTVh7DssmG-z2f8gL6okJ7yoCSQ,8451
+model_bakery/recipe.py,sha256=rBiKxUhhc35GphptDcvv8R30yH5qXxvMigxKwHUJxhI,8568
 model_bakery/timezone.py,sha256=IvrzSer02FkUd_8DcJVOwTcRzeBn4qZ2pYvcI3QOr9E,345
 model_bakery/utils.py,sha256=NjUsWuPmCYy6kHLjWmYnH7l-MVqlqiqSh7uq1U7EWaI,4635
-model_bakery-1.20.1.dist-info/METADATA,sha256=sltjUvyyDEGAo78mSRFhpnUATUWPirCI15RNjq4hDpg,4406
-model_bakery-1.20.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-model_bakery-1.20.1.dist-info/licenses/LICENSE,sha256=kCwHls7z8Y7NyZCmdnV1qLSdLrQ8bHrXLji5HOasgUc,611
-model_bakery-1.20.1.dist-info/RECORD,,
+model_bakery-1.20.3.dist-info/METADATA,sha256=U1BlLchIR4sBgWtu5SKRi-ZnROYL_X8ZnkbfTXi0A6k,4406
+model_bakery-1.20.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+model_bakery-1.20.3.dist-info/licenses/LICENSE,sha256=kCwHls7z8Y7NyZCmdnV1qLSdLrQ8bHrXLji5HOasgUc,611
+model_bakery-1.20.3.dist-info/RECORD,,