simpledomcontrol 0.4.8__tar.gz → 0.4.11__tar.gz

{simpledomcontrol-0.4.8 → simpledomcontrol-0.4.11}/PKG-INFO

@@ -1,28 +1,29 @@
 Metadata-Version: 2.1
-Name: simpledomcontrol
-Version: 0.4.8
+Name: SimpleDomControl
+Version: 0.4.11
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0
 Keywords: django,MVC
 Author: Martin Starman
 Author-email: private@martin-starman.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: Environment :: Web Environment
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: attrs (>=23.1.0,<24.0.0)
+Requires-Dist: attrs (>=23.2.0,<24.0.0)
 Requires-Dist: channels (>=4.0.0,<5.0.0)
-Requires-Dist: channels-redis (>=4.1.0,<5.0.0)
+Requires-Dist: channels-redis (>=4.2.0,<5.0.0)
 Requires-Dist: daphne (>=4.0.0,<5.0.0)
-Requires-Dist: django (>=4.2.7,<5.0.0)
+Requires-Dist: django (>=5.0.1,<6.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
+Requires-Dist: regex (>=2023.12.25,<2024.0.0)
 Description-Content-Type: text/markdown
 
 simpleDomControl

{simpledomcontrol-0.4.8 → simpledomcontrol-0.4.11}/README.md

@@ -1 +1 @@
-simpleDomControl
+simpleDomControl

{simpledomcontrol-0.4.8 → simpledomcontrol-0.4.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.4.8"
+version = "0.4.11"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"
@@ -18,13 +18,14 @@ classifiers = [
 homepage = "https://github.com/StarmanMartin/sdc"
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 daphne = "^4.0.0"
 channels = "^4.0.0"
-channels-redis = "^4.1.0"
-django = "^4.2.7"
+channels-redis = "^4.2.0"
+django = "^5.0.1"
 psycopg2-binary = "^2.9.9"
-attrs = "^23.1.0"
+attrs = "^23.2.0"
+regex = "^2023.12.25"
 
 [tool.pytest.ini_options]
 pythonpath = [
@@ -36,6 +37,7 @@ testpaths = [
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.2.2"
+pillow = "^10.1.0"
 
 [build-system]
 requires = ["poetry-core"]

simpledomcontrol-0.4.11/sdc_core/apps.py

@@ -0,0 +1,27 @@
+import os.path
+
+from django.apps import AppConfig
+
+
+class SdcCoreConfig(AppConfig):
+    name = 'sdc_core'
+    def ready(self):
+        import sys
+        from django.conf import settings
+
+        if settings.DEBUG and os.path.exists('./Assets'):
+            env_vars = {}
+            if os.path.exists('./Assets/.sdc_env'):
+                with open('./Assets/.sdc_env', 'r', encoding='utf8') as f_read:
+                    for line in f_read:
+                        if not line.startswith('#') and line.strip():
+                            key, value = line.strip().split('=', 1)
+                            env_vars[key] = value
+            env_vars['JSON_DATA_DUMP'] = env_vars.get('JSON_DATA_DUMP', f'"Assets/tests/dumps/test_data_dump.json"')
+            env_vars['COPY_DEFAULT_DB'] = env_vars.get('COPY_DEFAULT_DB', "1 # 0 for false or 1 for true")
+            env_vars['DB_PYTHON_SCRIPT'] = env_vars.get('DB_PYTHON_SCRIPT', "0 # Add path to pythonscript to prepare DB")
+            with open('./Assets/.sdc_env', 'w+', encoding='utf8') as f:
+                f.write('\n'.join([f'{x}={y}' for (x,y) in env_vars.items()]))
+
+            with open('./Assets/.sdc_python_env', 'w+', encoding='utf8') as f:
+                f.write(f'PYTHON="{sys.executable}"')

{simpledomcontrol-0.4.8 → simpledomcontrol-0.4.11}/sdc_core/consumers.py

@@ -9,6 +9,7 @@ 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
 
 from asgiref.sync import async_to_sync
@@ -18,6 +19,12 @@ import json
 from sdc_core.sdc_extentions.models import SdcModel
 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
+
+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__')
@@ -28,7 +35,7 @@ importlist = []
 
 class MsgManager:
     _messages = None
-    _msg_filepath = os.path.abspath(settings.BASE_DIR /  'templates/sdc_strings.json')
+    _msg_filepath = os.path.abspath(settings.BASE_DIR / 'templates/sdc_strings.json')
 
     @property
     def messages(self):
@@ -68,15 +75,14 @@ class ConsumerSerializer(Serializer):
 
     def handle_m2m_field(self, obj, field):
         super().handle_m2m_field(obj, field)
-        #self._current[field.name] = {
+        # 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(
+        # 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}
@@ -142,11 +148,19 @@ class SDCConsumer(WebsocketConsumer):
     def receive(self, text_data=None, bytes_data=None):
         json_data = {}
         try:
+            session = self.scope['session'].load()
             json_data = json.loads(text_data)
             if json_data['event'] == 'sdc_call':
                 controller_name = self.to_camel_case(json_data['controller'])
                 controller = import_function("%s.sdc_views.%s" % (json_data['app'], controller_name))
+                c_instance = controller()
+                if isinstance(c_instance, SdcAccessMixin):
+                    if not c_instance.check_requirements(self.scope['user']):
+                        raise PermissionDenied()
                 method = getattr(controller(), json_data['function'])
+
+                logger.info(f"SDC call Socket received: {json_data['app']}.{controller_name}.{json_data['function']}")
+
                 return_vals = method(channel=self, **json_data.get('args', {}))
                 return_vals_generator = []
                 if isinstance(return_vals, types.GeneratorType):
@@ -160,20 +174,8 @@ class SDCConsumer(WebsocketConsumer):
                     'is_error': False
                 }))
                 for x in return_vals_generator: pass
-            elif json_data['event'] == 'sdc_add_group':
-                if json_data['group'] not in self.group_list:
-                    self.group_list.append(json_data['group'])
-                    async_to_sync(self.channel_layer.group_add)(
-                        json_data['group'],
-                        self.channel_name
-                    )
-            elif json_data['event'] == 'sdc_remove_group':
-                if json_data['group'] in self.group_list:
-                    self.group_list.remove(json_data['group'])
-                    async_to_sync(self.channel_layer.group_discard)(
-                        json_data['group'],
-                        self.channel_name
-                    )
+            else:
+                raise ValueError("event must be sdc_call")
 
         except PermissionDenied:
             self.state_error({
@@ -182,11 +184,10 @@ class SDCConsumer(WebsocketConsumer):
             }, json_data.get('id'))
 
         except Exception as e:
-            if settings.DEBUG:
-                extracted_list = traceback.extract_tb(e.__traceback__)
-                traceback.print_tb(e.__traceback__)
-                e_text = e.__str__() + '\n'.join([item for item in traceback.StackSummary.from_list(extracted_list).format()])
-            else:
+            extracted_list = traceback.extract_tb(e.__traceback__)
+            e_text = [e.__str__()] + [item for item in traceback.StackSummary.from_list(extracted_list).format()]
+            logger.error('\n'.join(e_text))
+            if not settings.DEBUG:
                 e_text = _f('Something went wrong')
             self.state_error({
                 'msg': e_text,
@@ -237,37 +238,40 @@ class SDCModelConsumer(WebsocketConsumer):
             'type': event.get('type', 'error'),
             'is_error': True,
             'msg': event.get('msg', ''),
+            'event_id': event.get('event_id'),
             'header': event.get('header', ''),
         }))
 
     def receive(self, text_data=None, bytes_data=None):
         msg_type = 'error'
+        json_data = {}
         try:
             json_data = json.loads(text_data)
             self.scope['request'] = json_data
             msg_type = json_data.get('event_type', msg_type)
             self.scope['event_type'] = msg_type
             event_type = "%s_%s" % (json_data['event'], json_data['event_type'])
-            self.queryset = json_data['args']['model_query']
+            logger.debug("Socket received: " + event_type)
+            self.queryset = json_data['args'].get('model_query', {})
             if not self.model.is_authorised(self.scope['user'], msg_type, self.queryset):
                 raise PermissionDenied
             if event_type == 'model_connect':
                 self._init_connection(json_data)
-            if event_type == 'model_edit_form':
+            elif event_type == 'model_edit_form':
                 self._load_edit_form(json_data)
-            if event_type == 'model_create_form':
+            elif event_type == 'model_create_form':
                 self._load_create_form(json_data)
-            if event_type == 'model_list_view':
+            elif event_type == 'model_list_view':
                 self._load_list_view(json_data)
-            if event_type == 'model_detail_view':
+            elif event_type == 'model_detail_view':
                 self._load_detail_view(json_data)
-            if event_type == 'model_save':
+            elif event_type == 'model_save':
                 self._save_element(json_data)
-            if event_type == 'model_create':
+            elif event_type == 'model_create':
                 self._create_element(json_data)
-            if event_type == 'model_upload':
+            elif event_type == 'model_upload':
                 self._upload_file(json_data)
-            if event_type == 'model_delete':
+            elif event_type == 'model_delete':
                 self._delete_element(json_data)
             elif event_type == 'model_load':
                 model_data = ConsumerSerializer().serialize(self._load_model())
@@ -280,23 +284,30 @@ class SDCModelConsumer(WebsocketConsumer):
                     },
                     'is_error': False
                 }))
+            else:
+                raise ValueError(
+                    f"{json_data['event']} must be 'model' and {json_data['event_type']} must be in [load, delete, upload, create, save, detail_view, 'connect', 'edit_form', 'create_form', 'list_view']")
         except PermissionDenied as e:
+            logger.error("403 Not allowed!")
             self.state_error({
                 'type': msg_type,
                 'msg': _f('403 Not allowed!'),
+                'event_id': json_data.get('event_id'),
                 'header': _f('Upps!!')
             })
 
         except Exception as e:
+            extracted_list = traceback.extract_tb(e.__traceback__)
+            e_text = [e.__str__()] + [item for item in traceback.StackSummary.from_list(extracted_list).format()]
             if settings.DEBUG:
-                extracted_list = traceback.extract_tb(e.__traceback__)
                 traceback.print_tb(e.__traceback__)
-                e_text = e.__str__() + '\n'.join([item for item in traceback.StackSummary.from_list(extracted_list).format()])
             else:
+                logger.error(e_text)
                 e_text = _f('Something went wrong')
             self.state_error({
                 'type': msg_type,
                 'msg': e_text,
+                'event_id': json_data.get('event_id'),
                 'header': _f('Upps!!')
             })