dynamicforms 0.77.16__tar.gz → 0.77.18__tar.gz

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicforms
-Version: 0.77.16
+Version: 0.77.18
 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
@@ -20,11 +20,13 @@ Requires-Dist: django-enumfields>=2.1.1
 Requires-Dist: django-filter
 Requires-Dist: django>=2
 Requires-Dist: djangorestframework>=3.14
+Requires-Dist: drf-spectacular
 Requires-Dist: jsonschema
 Requires-Dist: pillow
 Requires-Dist: pytz
 Requires-Dist: ruff
 Requires-Dist: ruff-lsp
+Requires-Dist: six
 Requires-Dist: versio
 Description-Content-Type: text/markdown
 

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/dynamicforms/__init__.py

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

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/dynamicforms/mixins/field_render.py

@@ -64,6 +64,7 @@ class FieldRenderMixin(object):
         table_classes: str = "",
         alignment: FieldAlignment = FieldAlignment.LEFT,
         render_params: Optional[Dict] = None,
+        placeholder: Optional[str] = None,
         **kwargs,
     ):
         """
@@ -88,6 +89,7 @@ class FieldRenderMixin(object):
         self.display_form = display_form or display or DisplayMode.FULL
         self.table_classes = table_classes
         self.alignment = alignment
+        self.placeholder = placeholder
 
         # render_params need not only include form renderer and table formatting function. add anything you need!
         render_params = render_params or {}
@@ -198,6 +200,7 @@ class FieldRenderMixin(object):
                 render_params=self.render_params,
                 help_text=res.get("help_text", ""),
                 allow_null=self.allow_null,
+                placeholder=self.placeholder or None,
             )
         )
         if "base_template" in self.style and self.style["base_template"] == "textarea.html":

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/dynamicforms/preupload_files.py

@@ -34,7 +34,7 @@ def count_user_cached_files(user_id: int) -> int:
     """Vrne število vseh cached datotek za uporabnika"""
     count = 0
 
-    if hasattr(cache, 'keys'):  # we expect redis in production
+    if hasattr(cache, "keys"):  # we expect redis in production
         for key in cache.keys(f"{CACHE_KEY_PREFIX}*"):
             file_data = cache.get(key)
             if file_data and file_data.get("user_id") == user_id:
@@ -42,6 +42,7 @@ def count_user_cached_files(user_id: int) -> int:
 
     return count
 
+
 class FileUploadView(APIView):
     def post(self, request):
         """Upload file to cache storage"""
@@ -90,7 +91,7 @@ class FileUploadView(APIView):
             raise ValidationError({"file_identifier": ["required"]})
 
         file_identifier = file_identifier.rstrip("/")  # remove the trailing slash
-        cached_file = get_cached_file(file_identifier, request.user.id)
+        cached_file = get_cached_file(file_identifier, request.user.id or -1)
         if not cached_file:
             raise NotFound(__("File not found"))
 

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/dynamicforms/serializers.py

@@ -495,19 +495,26 @@ class Serializer(DynamicFormsSerializer, serializers.Serializer):
 class DynamicModelMixin:
     MODEL_FUNC_SETTING_NAME = None
 
-    def determine_model_at_runtime(self, request) -> Optional[models.Model]:
+    @staticmethod
+    def determine_model_at_runtime_static(request, viewset=None, func_name=None):
         """
         Determines what model should be the basis for the serializer at runtime. Allows for dynamic model adjustments
         based on active code at the time of serialization
         :return:
         """
-        try:
-            model_func = import_string(getattr(settings, self.MODEL_FUNC_SETTING_NAME, None))
-            return model_func(self, request)
-        except ImportError:
-            pass
+        if not func_name and viewset:
+            func_name = getattr(settings, viewset.MODEL_FUNC_SETTING_NAME, None)
+        if request and func_name:
+            try:
+                model_func = import_string(func_name)
+                return model_func(viewset, request)
+            except ImportError:
+                pass
         return None
 
+    def determine_model_at_runtime(self, request) -> Optional[models.Model]:
+        return self.determine_model_at_runtime_static(request, self)
+
 
 class DynamicModelSerializerMixin(DynamicModelMixin):
     LAYOUT_FUNC_SETTING_NAME = None

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/examples/rest/advanced_fields.py

@@ -27,6 +27,8 @@ class AdvancedFieldsSerializer(serializers.ModelSerializer):
         error_messages={
             "invalid": "This value does not match the required pattern {regex_pattern}.".format(**locals())
         },
+        help_text="Regex pattern is (?<=abc)def",
+        placeholder="Enter value that complies to regex pattern",
     )
 
     choice_field = fields.ChoiceField(
@@ -94,7 +96,9 @@ class AdvancedFieldsSerializer(serializers.ModelSerializer):
         queryset=Relation.objects.all(), url_reverse="relation-list", value_field="id", text_field="name"
     )
     slug_related_field = fields.SlugRelatedField(slug_field="name", queryset=Relation.objects.all())
-    file_field = fields.FileField(max_length=None, allow_empty_file=False, use_url=False, allow_null=True, required=False)
+    file_field = fields.FileField(
+        max_length=None, allow_empty_file=False, use_url=False, allow_null=True, required=False
+    )
     file_field_two = fields.FileField(allow_empty_file=False, use_url=False, allow_null=True, required=False)
 
     # hyperlinked_identity_field = serializers.HyperlinkedIdentityField(view_name='relation-detail', read_only=True)
@@ -104,9 +108,6 @@ class AdvancedFieldsSerializer(serializers.ModelSerializer):
         layout = Layout(size="md")
         exclude = ("image_field", "hyperlinked_identity_field")
 
-    def create(self, validated_data):
-        return AdvancedFields.objects.create(**validated_data)
-
 
 class AdvancedFieldsViewset(ModelViewSet):
     pagination_class = ModelViewSet.generate_paged_loader(30)

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/examples/urls.py

@@ -1,13 +1,14 @@
 from django.conf.urls import include
 from django.urls import path, re_path
 from django.views.i18n import JavaScriptCatalog
-from rest_framework.documentation import include_docs_urls
+from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView
 
 from examples.rest import router
 
 urlpatterns = [
     re_path(r"^", include(router.urls)),
     re_path(r"^dynamicforms/", include("dynamicforms.urls")),
-    re_path(r"^api-docs/", include_docs_urls(title="Example API documentation")),
+    re_path(r"^api-schema/", SpectacularAPIView.as_view(), name="schema"),
+    re_path(r"^api-docs/", SpectacularRedocView.as_view(url_name="schema")),
     path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
 ]

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dynamicforms"
-version = "0.77.16"
+version = "0.77.18"
 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"
@@ -33,6 +33,8 @@ dependencies = [
     "versio",
     "ruff",
     "ruff-lsp",
+    "six",
+    "drf_spectacular",
 ]
 
 [project.urls]

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/requirements.txt

@@ -10,3 +10,5 @@ django-cors-headers
 versio
 ruff
 ruff-lsp
+six
+drf_spectacular

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/setup/settings.py

@@ -68,6 +68,7 @@ INSTALLED_APPS = [
     "dynamicforms_dev",
     "examples",
     "corsheaders",
+    "drf_spectacular",
 ]
 
 if not getattr(env, "DEPLOY", True):
@@ -164,6 +165,7 @@ REST_FRAMEWORK = {
         "dynamicforms.renderers.ComponentDefRenderer",
     ),
     "DEFAULT_FILTER_BACKENDS": ("dynamicforms.filters.FilterBackend",),
+    "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
 }
 
 DYNAMICFORMS = {

{dynamicforms-0.77.16 → dynamicforms-0.77.18}/tox.ini

@@ -28,6 +28,8 @@ deps =
   selenium
   versio
   parameterized
+  six
+  drf_spectacular
 
 commands =
     python manage.py test