model-bakery 1.19.3__py3-none-any.whl → 1.19.5__py3-none-any.whl

model_bakery/__about__.py

@@ -1 +1 @@
-__version__ = "1.19.3"
+__version__ = "1.19.5"

model_bakery/baker.py

@@ -695,21 +695,27 @@ class Baker(Generic[M]):
     def _handle_generic_foreign_keys(self, instance: Model, attrs: Dict[str, Any]):
         """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"]
+            ct_field_name = data["content_type_field"]
+            oid_field_name = data["object_id_field"]
             value = data["value"]
-            if value is None:
-                continue
             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)
+            if value is None:
+                # when GFK is None, we should try to set the content type and object id to None
+                content_type_field = instance._meta.get_field(ct_field_name)
+                object_id_field = instance._meta.get_field(oid_field_name)
+                if content_type_field.null:
+                    setattr(instance, ct_field_name, None)
+                if object_id_field.null:
+                    setattr(instance, oid_field_name, None)
+            else:
+                setattr(instance, field_name, value)
+                setattr(
+                    instance,
+                    ct_field_name,
+                    contenttypes_models.ContentType.objects.get_for_model(value),
+                )
+                setattr(instance, oid_field_name, value.pk)
 
     def _remote_field(
         self, field: Union[ForeignKey, OneToOneField]

model_bakery/generators.py

@@ -108,7 +108,7 @@ default_mapping = {
     DecimalField: random_gen.gen_decimal,
     BinaryField: random_gen.gen_byte_string,
     CharField: random_gen.gen_string,
-    TextField: random_gen.gen_text,
+    TextField: random_gen.gen_string,
     SlugField: random_gen.gen_slug,
     UUIDField: random_gen.gen_uuid,
     DateField: random_gen.gen_date,
@@ -133,7 +133,7 @@ if CICharField:
 if CIEmailField:
     default_mapping[CIEmailField] = random_gen.gen_email
 if CITextField:
-    default_mapping[CITextField] = random_gen.gen_text
+    default_mapping[CITextField] = random_gen.gen_string
 if DecimalRangeField:
     default_mapping[DecimalRangeField] = random_gen.gen_pg_numbers_range(Decimal)
 if IntegerRangeField:

model_bakery/random_gen.py

@@ -134,6 +134,15 @@ gen_slug.required = ["max_length"]  # type: ignore[attr-defined]
 
 
 def gen_text() -> str:
+    warnings.warn(
+        "\n"
+        "Accessing `model_bakery.random_gen.gen_text` is deprecated "
+        "and will be removed in a future major release. Please use "
+        "`model_bakery.random_gen.gen_string` instead."
+        "\n",
+        DeprecationWarning,
+        stacklevel=2,
+    )
     return gen_string(MAX_LENGTH)
 
 

{model_bakery-1.19.3.dist-info → model_bakery-1.19.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: model-bakery
-Version: 1.19.3
+Version: 1.19.5
 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.3.dist-info → model_bakery-1.19.5.dist-info}/RECORD

@@ -1,19 +1,19 @@
-model_bakery/__about__.py,sha256=hwO9b47mihV_ShO2KBpaKnSRFB7jsALia0ojxDiFh7k,23
+model_bakery/__about__.py,sha256=eWKm9BJxlaMtgEAYPWMoZAydgtccEcvysPaz3EjVIko,23
 model_bakery/__init__.py,sha256=yY0xZUrr_mskBm07iF-MFBEiXzOuKrlMwpKWkXZs8v0,31
 model_bakery/_types.py,sha256=P0iKC5-Cnh3lyzyZs1mlCfOW31zbEZpxqWCuYonucKo,130
-model_bakery/baker.py,sha256=kZx4vsB8xlQyMo8ZANmsAChRFMRSB9Kya4t1gCST7AE,30195
+model_bakery/baker.py,sha256=bsyj9UkwSx69URU5znyAJ0_N1Vkz1qHyic7MbbQNLZI,30655
 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/generators.py,sha256=weuPptRtWnznjXGB658ftLQtSj5RMwngx-ryBXapNjE,5173
 model_bakery/gis.py,sha256=eTNOfT98_ncLAb4KmOYJhE-3ALU2_pQbUpWPTolFZJI,1028
 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=IYhDhqsRBftceQRHtc9B4bUWLTjvEXkgEwhNhp9DajE,9787
+model_bakery/random_gen.py,sha256=3rvZCg5px6NOY1Q3fHSqw51BY6iQfCmOoRX4SsCOp6U,10084
 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.3.dist-info/METADATA,sha256=0n4eZedWjZn3P4gyjbAcVseuiFvUFLKZs06rK5A_9NE,4355
-model_bakery-1.19.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-model_bakery-1.19.3.dist-info/licenses/LICENSE,sha256=kCwHls7z8Y7NyZCmdnV1qLSdLrQ8bHrXLji5HOasgUc,611
-model_bakery-1.19.3.dist-info/RECORD,,
+model_bakery-1.19.5.dist-info/METADATA,sha256=gPM0GPMLgOGqJFQKBYLNcy-Gg1OM5NkryKzwaY9fVUo,4355
+model_bakery-1.19.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+model_bakery-1.19.5.dist-info/licenses/LICENSE,sha256=kCwHls7z8Y7NyZCmdnV1qLSdLrQ8bHrXLji5HOasgUc,611
+model_bakery-1.19.5.dist-info/RECORD,,