simpledomcontrol 0.5.0__tar.gz → 0.5.2__tar.gz

{simpledomcontrol-0.5.0 → simpledomcontrol-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimpleDomControl
-Version: 0.5.0
+Version: 0.5.2
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0

{simpledomcontrol-0.5.0 → simpledomcontrol-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.05.00"
+version = "0.05.02"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"

{simpledomcontrol-0.5.0 → simpledomcontrol-0.5.2}/sdc_core/consumers.py

@@ -4,11 +4,9 @@ import traceback
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.core.files.uploadhandler import TemporaryFileUploadHandler
-from django.core.serializers.json import Serializer
+
 from django.utils.datastructures import MultiValueDict
 from django.utils.translation import gettext as _f
-from django.apps import apps
-from django.db.models import FileField
 from django.contrib.auth import get_user_model
 from channels.generic.websocket import WebsocketConsumer
 
@@ -16,7 +14,7 @@ from asgiref.sync import async_to_sync
 import importlib
 import json
 
-from sdc_core.sdc_extentions.models import SdcModel
+from sdc_core.sdc_extentions.models import SdcModel, ConsumerSerializer, all_models
 from sdc_core.sdc_extentions.response import sdc_link_factory, sdc_link_obj_factory
 from sdc_core.sdc_extentions.import_manager import import_function
 from sdc_core.sdc_extentions.views import SdcAccessMixin
@@ -26,12 +24,8 @@ import logging
 logger = logging.getLogger(__name__)
 User = get_user_model()
 
-ALL_MODELS = {
-    model.__name__: model for model in apps.get_models() if hasattr(model, '__is_sdc_model__')
-}
-
 importlist = []
-
+ALL_MODELS = all_models()
 
 class MsgManager:
     _messages = None
@@ -71,26 +65,6 @@ class MsgManager:
                 'delete': {'header': f'{model} was deleted', 'msg': '{0} was changed'}}
 
 
-class ConsumerSerializer(Serializer):
-
-    def handle_m2m_field(self, obj, field):
-        super().handle_m2m_field(obj, field)
-        self._current[field.name] = {
-           'pk': self._current[field.name],
-           'model': field.related_model.__name__,
-           '__is_sdc_model__': True
-        }
-
-    def _value_from_field(self, obj, field):
-        if hasattr(field, 'foreign_related_fields') and ALL_MODELS.get(
-               field.related_model.__name__) == field.related_model:
-           return {'pk': super()._value_from_field(obj, field), 'model': field.related_model.__name__,
-                   '__is_sdc_model__': True}
-        if issubclass(field.__class__, FileField):
-            return field.value_from_object(obj).url
-        return super()._value_from_field(obj, field)
-
-
 class SDCConsumer(WebsocketConsumer):
 
     def connect(self):
@@ -220,15 +194,13 @@ class SDCModelConsumer(WebsocketConsumer):
         pass
 
     def on_update(self, data):
-        if data['args']['data'].pk in self.ids:
-            data['args']['data'] = ConsumerSerializer().serialize([data['args']['data']])
+        if data['pk'] in self.ids:
             self.send(text_data=json.dumps(data))
 
     def on_create(self, data):
-        instance = data['args']['data']
+        instance = data['pk']
         try:
-            self._load_model().get(pk=instance.pk)
-            data['args']['data'] = ConsumerSerializer().serialize([instance])
+            self._load_model().get(pk=instance)
             self.send(text_data=json.dumps(data))
         except:
             pass

{simpledomcontrol-0.5.0 → simpledomcontrol-0.5.2}/sdc_core/sdc_extentions/models.py

@@ -4,13 +4,43 @@ from django.db.models import QuerySet
 from django.template.loader import render_to_string
 from django.db.models.signals import post_save, post_delete
 from django.dispatch.dispatcher import receiver
+from django.core.serializers.json import Serializer
+from django.db.models import FileField
+from django.apps import apps
 
 from channels.layers import get_channel_layer
 from django.contrib.auth import get_user_model
 
 User = get_user_model()
 
+_ALL_MODELS = None
 
+def all_models():
+    global _ALL_MODELS
+    if _ALL_MODELS is None:
+        _ALL_MODELS = {
+            model.__name__: model for model in apps.get_models() if hasattr(model, '__is_sdc_model__')
+        }
+    return _ALL_MODELS
+
+class ConsumerSerializer(Serializer):
+
+    def handle_m2m_field(self, obj, field):
+        super().handle_m2m_field(obj, field)
+        self._current[field.name] = {
+            'pk': self._current[field.name],
+            'model': field.related_model.__name__,
+            '__is_sdc_model__': True
+        }
+
+    def _value_from_field(self, obj, field):
+        if hasattr(field, 'foreign_related_fields') and all_models().get(
+                field.related_model.__name__) == field.related_model:
+            return {'pk': super()._value_from_field(obj, field), 'model': field.related_model.__name__,
+                    '__is_sdc_model__': True}
+        if issubclass(field.__class__, FileField):
+            return field.value_from_object(obj).url
+        return super()._value_from_field(obj, field)
 
 class SdcModel():
     __is_sdc_model__ = True
@@ -51,17 +81,20 @@ class SdcModel():
 @receiver(post_delete)  # instead of @receiver(post_save, sender=Rebel)
 def set_winner(sender, instance=None, created=False, **kwargs):
     if instance is not None and hasattr(sender, '__is_sdc_model__'):
+        serialize_instance = ConsumerSerializer().serialize([instance])
         if created:
             async_to_sync(get_channel_layer().group_send)(sender.__name__, {
                 'event_id': 'none',
                 'type': 'on_create',
-                'args': {'data': instance},
+                'pk': instance.pk,
+                'args': {'data': serialize_instance},
                 'is_error': False
             })
         else:
             async_to_sync(get_channel_layer().group_send)(sender.__name__, {
                 'event_id': 'none',
                 'type': 'on_update',
-                'args': {'data': instance},
+                'pk': instance.pk,
+                'args': {'data': serialize_instance},
                 'is_error': False
             })

{simpledomcontrol-0.5.0 → simpledomcontrol-0.5.2}/sdc_core/template_files/package.json

@@ -75,6 +75,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.05.00"
+    "sdc_client": "^0.05.02"
   }
 }