drf-appkit 1.6.2__tar.gz → 1.6.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. {drf_appkit-1.6.2/drf_appkit.egg-info → drf_appkit-1.6.4}/PKG-INFO +1 -1
  2. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/filters.py +20 -0
  3. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/serializers.py +41 -5
  4. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/views.py +11 -0
  5. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/mixins.py +4 -4
  6. drf_appkit-1.6.4/appkit/migrations/0027_share.py +30 -0
  7. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/models.py +26 -4
  8. {drf_appkit-1.6.2 → drf_appkit-1.6.4/drf_appkit.egg-info}/PKG-INFO +1 -1
  9. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/drf_appkit.egg-info/SOURCES.txt +1 -0
  10. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/setup.cfg +1 -1
  11. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/LICENSE +0 -0
  12. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/MANIFEST.in +0 -0
  13. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/README.md +0 -0
  14. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/__init__.py +0 -0
  15. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/__init__.py +0 -0
  16. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/mixins.py +0 -0
  17. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/pagination.py +0 -0
  18. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/relations.py +0 -0
  19. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/renderers.py +0 -0
  20. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/api/tests.py +0 -0
  21. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/apps.py +0 -0
  22. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/auth/__init__.py +0 -0
  23. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/auth/backends.py +0 -0
  24. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/auth/decorators.py +0 -0
  25. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/auth/email.py +0 -0
  26. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/auth/permissions.py +0 -0
  27. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/debug.py +0 -0
  28. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/__init__.py +0 -0
  29. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/adapters.py +0 -0
  30. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/authentication.py +0 -0
  31. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/backends.py +0 -0
  32. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/endpoints.py +0 -0
  33. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/exceptions.py +0 -0
  34. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/fields.py +0 -0
  35. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/filters.py +0 -0
  36. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/permissions.py +0 -0
  37. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf/serializers.py +0 -0
  38. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf_appkit.egg-info/PKG-INFO +0 -0
  39. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf_appkit.egg-info/SOURCES.txt +0 -0
  40. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf_appkit.egg-info/dependency_links.txt +0 -0
  41. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/drf_appkit.egg-info/top_level.txt +0 -0
  42. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/forms/__init__.py +0 -0
  43. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/forms/widgets.py +0 -0
  44. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/handlers.py +0 -0
  45. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/jinja2/appkit/forms/widgets/money_widget.html +0 -0
  46. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/managers.py +0 -0
  47. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0001_initial.py +0 -0
  48. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0002_arrangement_tags.py +0 -0
  49. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0003_auto_20210221_0852.py +0 -0
  50. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0004_auto_20210309_0655.py +0 -0
  51. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0005_auto_20210324_1046.py +0 -0
  52. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0006_sitealias.py +0 -0
  53. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0007_auto_20211021_1901.py +0 -0
  54. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0008_update_autofields.py +0 -0
  55. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0009_alter_arrangement_unique_together_and_more.py +0 -0
  56. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0010_arrangement_name.py +0 -0
  57. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0011_alter_sitealias_options.py +0 -0
  58. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0012_alter_sitealias_site.py +0 -0
  59. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0013_usergroup.py +0 -0
  60. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0014_remove_note_notes_note_content_type_note_object_id.py +0 -0
  61. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0015_alter_note_content_type_alter_note_object_id.py +0 -0
  62. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0016_alter_arrangementitem_unique_together_and_more.py +0 -0
  63. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0017_alter_imageattachment_image.py +0 -0
  64. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0018_place_geoposition.py +0 -0
  65. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0019_alter_place_geoposition.py +0 -0
  66. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0020_remove_arrangement_type_arrangement_content_type.py +0 -0
  67. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0021_rename_content_type_arrangement_item_type.py +0 -0
  68. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0022_imageattachment_rendition_key_imageattachment_warm.py +0 -0
  69. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0023_delete_usergroup.py +0 -0
  70. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0024_place_city_place_country_place_postal_code_and_more.py +0 -0
  71. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0025_mediaattachment_placeholder.py +0 -0
  72. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/0026_mediaattachment_attributes_and_more.py +0 -0
  73. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/migrations/__init__.py +0 -0
  74. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/notification.py +0 -0
  75. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/settings.py +0 -0
  76. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/shortcuts.py +0 -0
  77. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/storages.py +0 -0
  78. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/tests.py +0 -0
  79. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/transformers.py +0 -0
  80. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/util.py +0 -0
  81. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/appkit/views.py +0 -0
  82. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/drf_appkit.egg-info/dependency_links.txt +0 -0
  83. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/drf_appkit.egg-info/top_level.txt +0 -0
  84. {drf_appkit-1.6.2 → drf_appkit-1.6.4}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: drf-appkit
3
- Version: 1.6.2
3
+ Version: 1.6.4
4
4
  Summary: A Django app providing generic CRUD functionality
5
5
  Author: Allan Hart
6
6
  Classifier: Environment :: Web Environment
@@ -11,8 +11,10 @@ from ..shortcuts import create_date_range_choices
11
11
 
12
12
  from ..models import (
13
13
  Arrangement,
14
+ ArrangementItem,
14
15
  Note,
15
16
  Region,
17
+ Share,
16
18
  Tag,
17
19
  )
18
20
 
@@ -64,6 +66,12 @@ class RegionFilter(FilterSet):
64
66
  }
65
67
 
66
68
 
69
+ class ShareFilter(FilterSet):
70
+ class Meta:
71
+ model = Share
72
+ fields = ('document_type', 'document_id', 'site',)
73
+
74
+
67
75
  class SiteFilter(FilterSet):
68
76
  class Meta:
69
77
  model = Site
@@ -140,6 +148,18 @@ class ArrangementFilter(DocumentFilter):
140
148
  ]
141
149
 
142
150
 
151
+ class ArrangementItemFilter(DocumentFilter):
152
+ arrangement = filters.RelatedFilter(
153
+ ArrangementFilter,
154
+ queryset=Arrangement.objects.all()
155
+ )
156
+
157
+ class Meta:
158
+ model = ArrangementItem
159
+ fields = {
160
+ 'id': ('exact', 'in',),
161
+ }
162
+
143
163
  # class UserProfileFilter(DocumentFilter):
144
164
  # user = filters.RelatedFilter(
145
165
  # UserFilter,
@@ -49,6 +49,7 @@ from ..models import (
49
49
  Note,
50
50
  Place,
51
51
  Region,
52
+ Share,
52
53
  SiteAlias,
53
54
  Tag,
54
55
  )
@@ -127,6 +128,41 @@ class SiteSerializer(serializers.ModelSerializer):
127
128
  return f'{request.scheme}://{domain}'
128
129
 
129
130
 
131
+ class ShareSerializer(serializers.HyperlinkedModelSerializer):
132
+ document_type = serializers.PrimaryKeyRelatedField(
133
+ queryset=ContentType.objects.all()
134
+ )
135
+ site = SiteSerializer(read_only=True)
136
+
137
+ class Meta:
138
+ model = Share
139
+ fields = ('document_type', 'document_id', 'site', 'url',)
140
+
141
+
142
+ class ShareCreateSerializer(serializers.HyperlinkedModelSerializer):
143
+ document_type = serializers.PrimaryKeyRelatedField(
144
+ queryset=ContentType.objects.all()
145
+ )
146
+
147
+ class Meta:
148
+ model = Share
149
+ fields = ('document_type', 'document_id', 'site',)
150
+
151
+ def validate(self, attrs):
152
+ validated_data = super().validate(attrs)
153
+
154
+ try:
155
+ content_type = validated_data['document_type']
156
+ document = content_type.get_object_for_this_type(pk=validated_data['document_id'])
157
+ except django_exceptions.ObjectDoesNotExist:
158
+ raise exceptions.NotFound()
159
+
160
+ if document.site != self.context['request'].site:
161
+ raise exceptions.PermissionDenied()
162
+
163
+ return validated_data
164
+
165
+
130
166
  class GroupSerializer(serializers.HyperlinkedModelSerializer):
131
167
  class Meta:
132
168
  model = Group
@@ -377,7 +413,7 @@ class UserCreateSerializer(DjoserUserCreateSerializer):
377
413
  def validate_email(self, value):
378
414
  try:
379
415
  User.objects.get(email__iexact=value)
380
- raise serializers.ValidationError('A user with email address "{}" already exists'.format(value))
416
+ raise exceptions.ValidationError(f'A user with email address "{value}" already exists')
381
417
  except User.DoesNotExist:
382
418
  return value
383
419
 
@@ -411,11 +447,11 @@ class ActivationSerializer(DjoserActivationSerializer):
411
447
  try:
412
448
  validate_password(attrs["new_password"], user)
413
449
  except django_exceptions.ValidationError as e:
414
- raise serializers.ValidationError({"new_password": list(e.messages)})
450
+ raise exceptions.ValidationError({"new_password": list(e.messages)})
415
451
 
416
452
  if attrs["new_password"] != attrs["re_new_password"]:
417
453
  error_messages = [self.default_error_messages['password_mismatch']]
418
- raise serializers.ValidationError({"re_new_password": error_messages})
454
+ raise exceptions.ValidationError({"re_new_password": error_messages})
419
455
 
420
456
  return attrs
421
457
 
@@ -463,9 +499,9 @@ class ForcePasswordSerializer(serializers.Serializer):
463
499
  user = attrs['user']
464
500
  validate_password(attrs["new_password"], user)
465
501
  except django_exceptions.ValidationError as e:
466
- raise serializers.ValidationError({"new_password": list(e.messages)})
502
+ raise exceptions.ValidationError({"new_password": list(e.messages)})
467
503
 
468
504
  if attrs["new_password"] != attrs["re_new_password"]:
469
- raise serializers.ValidationError({"re_new_password": list('The given passwords do not match')})
505
+ raise exceptions.ValidationError({"re_new_password": list('The given passwords do not match')})
470
506
 
471
507
  return attrs
@@ -25,6 +25,7 @@ from ..models import (
25
25
  Note,
26
26
  Place,
27
27
  Region,
28
+ Share,
28
29
  Tag,
29
30
  )
30
31
  from ..drf.filters import (
@@ -357,3 +358,13 @@ class NoteViewSet(mixins.DocumentViewSetMixin, MasterDetailViewSet):
357
358
  'retrieve': serializers.NoteDetailSerializer,
358
359
  'default': serializers.NoteListSerializer,
359
360
  }
361
+
362
+
363
+ class ShareViewSet(MasterDetailViewSet):
364
+ filterset_class = filters.ShareFilter
365
+ ordering = 'site__name'
366
+ queryset = Share.objects.all()
367
+ serializers = {
368
+ 'default': serializers.ShareSerializer,
369
+ 'create': serializers.ShareCreateSerializer,
370
+ }
@@ -8,7 +8,7 @@ from rest_framework.response import Response
8
8
  from rest_framework.settings import api_settings
9
9
 
10
10
 
11
- class DestroyModelMixin(object):
11
+ class DestroyModelMixin:
12
12
  """
13
13
  Override of DRF implementation in rest_framework/mixins.
14
14
  In the event that a record can not be deleted due to a protected foreign key,
@@ -33,7 +33,7 @@ class DestroyModelMixin(object):
33
33
  instance.delete()
34
34
 
35
35
 
36
- class DynamicSerializerMixin(object):
36
+ class DynamicSerializerMixin:
37
37
  def get_serializer_class(self):
38
38
  if not self.serializers:
39
39
  return super().get_serializer_class()
@@ -58,7 +58,7 @@ class DynamicSerializerMixin(object):
58
58
  return self.serializers['default']
59
59
 
60
60
 
61
- class ListExportMixin(object):
61
+ class ListExportMixin:
62
62
  @action(detail=False, methods=['get'])
63
63
  def export(self, request):
64
64
  item_qs = self.filter_queryset(self.get_queryset())
@@ -66,7 +66,7 @@ class ListExportMixin(object):
66
66
  return Response(serializer.data)
67
67
 
68
68
 
69
- class PaginationMixin(object):
69
+ class PaginationMixin:
70
70
  def pagination_class(self):
71
71
  pagination_class = api_settings.DEFAULT_PAGINATION_CLASS
72
72
  if pagination_class is None:
@@ -0,0 +1,30 @@
1
+ # Generated by Django 5.1.7 on 2025-06-23 01:22
2
+
3
+ import appkit.models
4
+ import django.db.models.deletion
5
+ from django.db import migrations, models
6
+
7
+
8
+ class Migration(migrations.Migration):
9
+
10
+ dependencies = [
11
+ ('appkit', '0026_mediaattachment_attributes_and_more'),
12
+ ('contenttypes', '0002_remove_content_type_name'),
13
+ ('sites', '0002_alter_domain_unique'),
14
+ ]
15
+
16
+ operations = [
17
+ migrations.CreateModel(
18
+ name='Share',
19
+ fields=[
20
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21
+ ('document_id', models.PositiveIntegerField()),
22
+ ('document_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
23
+ ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
24
+ ],
25
+ options={
26
+ 'constraints': [models.UniqueConstraint(fields=('document_type', 'document_id', 'site'), name='unique_object_share')],
27
+ },
28
+ bases=(appkit.models.DRFModelMixin, models.Model),
29
+ ),
30
+ ]
@@ -177,13 +177,13 @@ class Place(ModelBase):
177
177
  postal_code = models.CharField(max_length=7, blank=True)
178
178
 
179
179
  def __str__(self):
180
- if 'formatted_address' in self.info:
181
- return self.info['formatted_address']
180
+ if 'formattedAddress' in self.info:
181
+ return self.info['formattedAddress']
182
182
  return self.place_id
183
183
 
184
184
  def format(self, *component_types):
185
185
  try:
186
- address_components = self.info['address_components']
186
+ address_components = self.info['addressComponents']
187
187
  except KeyError:
188
188
  return self.info.get('formattedAddress')
189
189
 
@@ -191,7 +191,10 @@ class Place(ModelBase):
191
191
  for component_type in component_types:
192
192
  for address_component in address_components:
193
193
  if component_type in address_component['types']:
194
- address_parts.append(address_component['short_name'])
194
+ if 'shortText' in address_component:
195
+ address_parts.append(address_component['shortText'])
196
+ elif 'short_name' in address_component:
197
+ address_parts.append(address_component['short_name'])
195
198
  return ', '.join(address_parts)
196
199
 
197
200
 
@@ -395,11 +398,30 @@ class AbstractProduct(Thing):
395
398
  abstract = True
396
399
 
397
400
 
401
+ class Share(ModelBase):
402
+ document_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
403
+ document_id = models.PositiveIntegerField()
404
+ document = GenericForeignKey('document_type', 'document_id')
405
+ site = models.ForeignKey(Site, on_delete=models.CASCADE)
406
+
407
+ class Meta:
408
+ constraints = (
409
+ models.UniqueConstraint(fields=('document_type', 'document_id', 'site'), name='unique_object_share'),
410
+ )
411
+
412
+
398
413
  class Arrangement(Document):
399
414
  name = models.CharField(max_length=100)
400
415
  item_type = models.ForeignKey(ContentType, blank=True, null=True, on_delete=models.SET_NULL)
401
416
  attributes = models.JSONField(default=dict, encoder=DjangoJSONEncoder)
402
417
 
418
+ shares = GenericRelation(
419
+ Share,
420
+ content_type_field='document_type',
421
+ object_id_field='document_id',
422
+ related_query_name='shares'
423
+ )
424
+
403
425
  def __str__(self):
404
426
  if self.item_type:
405
427
  return f'{self.name} ({self.item_type})'
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: drf-appkit
3
- Version: 1.6.2
3
+ Version: 1.6.4
4
4
  Summary: A Django app providing generic CRUD functionality
5
5
  Author: Allan Hart
6
6
  Classifier: Environment :: Web Environment
@@ -75,6 +75,7 @@ appkit/migrations/0023_delete_usergroup.py
75
75
  appkit/migrations/0024_place_city_place_country_place_postal_code_and_more.py
76
76
  appkit/migrations/0025_mediaattachment_placeholder.py
77
77
  appkit/migrations/0026_mediaattachment_attributes_and_more.py
78
+ appkit/migrations/0027_share.py
78
79
  appkit/migrations/__init__.py
79
80
  drf_appkit.egg-info/PKG-INFO
80
81
  drf_appkit.egg-info/SOURCES.txt
@@ -1,6 +1,6 @@
1
1
  [metadata]
2
2
  name = drf-appkit
3
- version = 1.6.2
3
+ version = 1.6.4
4
4
  description = A Django app providing generic CRUD functionality
5
5
  license-file = BSD
6
6
  long_description = file: README.md
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes