dynamicforms 0.77.8__tar.gz → 0.77.10__tar.gz

{dynamicforms-0.77.8 → dynamicforms-0.77.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicforms
-Version: 0.77.8
+Version: 0.77.10
 Summary: DynamicForms performs all the visualisation & data entry of your DRF Serializers & ViewSets and adds some candy of its own
 Project-URL: Homepage, https://github.com/velis74/DynamicForms
 Project-URL: Repository, https://github.com/velis74/DynamicForms

{dynamicforms-0.77.8 → dynamicforms-0.77.10}/dynamicforms/__init__.py

@@ -1,5 +1,5 @@
 __title__ = "DynamicForms"
-__version__ = '0.77.8'
+__version__ = '0.77.10'
 __author__ = "Jure Erznožnik"
 __email__ = "jure.erznoznik@gmail.com"
 __license__ = "BSD 3-Clause"

dynamicforms-0.77.10/dynamicforms/apps.py

@@ -0,0 +1,78 @@
+from django.apps import AppConfig
+
+
+class DynamicformsConfig(AppConfig):
+    name = "dynamicforms"
+
+    def ready(self):
+        import django
+
+        if django.VERSION >= (5, 0):
+            # Django 5.x introduces ValueError if related objects are fetched on non saved instance.
+            # This gives us troubles when we create forms for new entries and filter forms.
+            # Also (mostly) on __str__ functions of instances, until they are saved.
+            #
+            # So here is monkeypatch of this django function when in such case we return empty queryset.
+
+            from django.db.models.fields.related_descriptors import (
+                create_forward_many_to_many_manager,
+                create_reverse_many_to_one_manager,
+            )
+
+            # Shranimo originalno funkcijo
+            original_create_reverse_many_to_one_manager = create_reverse_many_to_one_manager
+            original_create_forward_many_to_many_manager = create_forward_many_to_many_manager
+
+            def patched_create_reverse_many_to_one_manager(superclass, rel):
+                # Dobimo originalni RelatedManager razred
+                manager_class = original_create_reverse_many_to_one_manager(superclass, rel)
+
+                # Shranimo njegovo originalno get_queryset metodo
+                original_get_queryset = manager_class.get_queryset
+
+                # Naredimo novo get_queryset metodo
+                def patched_get_queryset(_self):
+                    try:
+                        return original_get_queryset(_self)
+                    except ValueError as e:
+                        if "instance needs to have a primary key value" in str(e):
+                            return _self.model.objects.none()
+                        raise
+
+                # Zamenjamo metodo na razredu
+                manager_class.get_queryset = patched_get_queryset
+
+                # Vrnemo modificiran razred
+                return manager_class
+
+            def patched_create_forward_many_to_many_manager(superclass, rel, reverse):
+                manager_class = original_create_forward_many_to_many_manager(superclass, rel, reverse)
+
+                # noinspection PyTypeChecker
+                original_init = manager_class.__init__
+
+                def patched_init(_self, instance=None):
+                    try:
+                        # noinspection PyArgumentList
+                        original_init(_self, instance)
+                    except ValueError as e:
+                        if (
+                            ("needs to have a value for field" in str(e))
+                            or ("instance needs to have a primary key value before" in str(e))
+                        ) and ("many-to-many relationship can be used." in str(e)):
+                            # Adding filter that will make sure that returned queryset is empty.
+                            _self.core_filters["id"] = None
+                            pass
+                        else:
+                            raise
+
+                manager_class.__init__ = patched_init
+                return manager_class
+
+            # Zamenjamo originalno funkcijo
+            django.db.models.fields.related_descriptors.create_reverse_many_to_one_manager = (
+                patched_create_reverse_many_to_one_manager
+            )
+            django.db.models.fields.related_descriptors.create_forward_many_to_many_manager = (
+                patched_create_forward_many_to_many_manager
+            )

{dynamicforms-0.77.8 → dynamicforms-0.77.10}/dynamicforms/mixins/related_field_ajax.py

@@ -98,7 +98,8 @@ class RelatedFieldAJAXMixin(object):
             ))
             if len(res["choices"]) > 100:
                 print(
-                    f"WARNING: {self.parent.__class__.__name__}.{self.field_name} should be converted to AJAX.",
+                    f"WARNING: {self.parent.__class__.__name__}.{self.field_name} has more than 100 choices and "
+                    f"should be converted to AJAX.",
                     file=sys.stderr
                 )
         return res

dynamicforms-0.77.10/dynamicforms_legacy/apps.py

@@ -0,0 +1,78 @@
+from django.apps import AppConfig
+
+
+class DynamicformsConfig(AppConfig):
+    name = "dynamicforms"
+
+    def ready(self):
+        import django
+
+        if django.VERSION >= (5, 0):
+            # Django 5.x introduces ValueError if related objects are fetched on non saved instance.
+            # This gives us troubles when we create forms for new entries and filter forms.
+            # Also (mostly) on __str__ functions of instances, until they are saved.
+            #
+            # So here is monkeypatch of this django function when in such case we return empty queryset.
+
+            from django.db.models.fields.related_descriptors import (
+                create_forward_many_to_many_manager,
+                create_reverse_many_to_one_manager,
+            )
+
+            # Shranimo originalno funkcijo
+            original_create_reverse_many_to_one_manager = create_reverse_many_to_one_manager
+            original_create_forward_many_to_many_manager = create_forward_many_to_many_manager
+
+            def patched_create_reverse_many_to_one_manager(superclass, rel):
+                # Dobimo originalni RelatedManager razred
+                manager_class = original_create_reverse_many_to_one_manager(superclass, rel)
+
+                # Shranimo njegovo originalno get_queryset metodo
+                original_get_queryset = manager_class.get_queryset
+
+                # Naredimo novo get_queryset metodo
+                def patched_get_queryset(_self):
+                    try:
+                        return original_get_queryset(_self)
+                    except ValueError as e:
+                        if "instance needs to have a primary key value" in str(e):
+                            return _self.model.objects.none()
+                        raise
+
+                # Zamenjamo metodo na razredu
+                manager_class.get_queryset = patched_get_queryset
+
+                # Vrnemo modificiran razred
+                return manager_class
+
+            def patched_create_forward_many_to_many_manager(superclass, rel, reverse):
+                manager_class = original_create_forward_many_to_many_manager(superclass, rel, reverse)
+
+                # noinspection PyTypeChecker
+                original_init = manager_class.__init__
+
+                def patched_init(_self, instance=None):
+                    try:
+                        # noinspection PyArgumentList
+                        original_init(_self, instance)
+                    except ValueError as e:
+                        if (
+                            ("needs to have a value for field" in str(e))
+                            or ("instance needs to have a primary key value before" in str(e))
+                        ) and ("many-to-many relationship can be used." in str(e)):
+                            # Adding filter that will make sure that returned queryset is empty.
+                            _self.core_filters["id"] = None
+                            pass
+                        else:
+                            raise
+
+                manager_class.__init__ = patched_init
+                return manager_class
+
+            # Zamenjamo originalno funkcijo
+            django.db.models.fields.related_descriptors.create_reverse_many_to_one_manager = (
+                patched_create_reverse_many_to_one_manager
+            )
+            django.db.models.fields.related_descriptors.create_forward_many_to_many_manager = (
+                patched_create_forward_many_to_many_manager
+            )

{dynamicforms-0.77.8 → dynamicforms-0.77.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dynamicforms"
-version = "0.77.8"
+version = "0.77.10"
 description = "DynamicForms performs all the visualisation & data entry of your DRF Serializers & ViewSets and adds some candy of its own"
 readme = "README.md"
 requires-python = ">=3.8"

dynamicforms-0.77.8/dynamicforms/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DynamicformsConfig(AppConfig):
-    name = "dynamicforms"

dynamicforms-0.77.8/dynamicforms/management/commands/clean_dfpreuploaded_files.py

@@ -1,26 +0,0 @@
-import glob
-import os
-import pathlib
-import time
-
-from django.core.management.base import BaseCommand
-
-from dynamicforms.preupload_files import preuploaded_fs, UPLOADED_FILE_NAME_TIMESTAMP_SEPARATOR
-
-
-class Command(BaseCommand):
-    # TODO: this is redundant: the files should not be uploaded to any persistent storage, but instead to cache
-    #  with a really short timeout, max a few hours. After that, they're gone automatically. No need for a clean up
-    #  script nobody ever thought to setup to run in the first place. Task DF:#873
-    help = "Clean old temporary files which are generated when preloading files for df preloaded file field"
-
-    def handle(self, *args, **options):
-        current_timestamp: int = int(time.time())
-        margins_for_file_deletion: int = 86400  # one day od uploaded file retention
-        for file in glob.glob(f"{preuploaded_fs.location}/*"):
-            file_components: list = file.split(UPLOADED_FILE_NAME_TIMESTAMP_SEPARATOR)
-            if len(file_components) > 1:
-                file_path: pathlib.Path = pathlib.Path(file_components[1])
-                timestamp: int = int(file_path.stem)
-                if current_timestamp - timestamp > margins_for_file_deletion:
-                    os.remove(file)

dynamicforms-0.77.8/dynamicforms_legacy/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class DynamicformsConfig(AppConfig):
-    name = "dynamicforms"