simo 2.0.41__py3-none-any.whl → 2.1.0__py3-none-any.whl

simo/core/migrations/0037_auto_20240606_1057.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2024-06-06 10:57
+
+from django.db import migrations
+
+def forwards_func(apps, schema_editor):
+
+    Component = apps.get_model("core", "Component")
+    Gateway = apps.get_model('core', "Gateway")
+
+    generic_gateway = Gateway.objects.filter(
+        type='simo.generic.gateways.GenericGatewayHandler'
+    ).first()
+    if not generic_gateway:
+        return
+
+    Component.objects.filter(
+        controller_uid='simo.generic.controllers.StateSelect'
+    ).update(gateway=generic_gateway)
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0036_auto_20240521_0823'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/core/models.py

@@ -12,6 +12,7 @@ from timezone_utils.choices import ALL_TIMEZONES_CHOICES
 from location_field.models.plain import PlainLocationField
 from model_utils import FieldTracker
 from dirtyfields import DirtyFieldsMixin
+from actstream import action
 from simo.core.utils.mixins import SimoAdminMixin
 from simo.core.storage import OverwriteStorage
 from simo.core.utils.validators import validate_svg
@@ -399,6 +400,8 @@ def is_in_alarm(self):
 
     controller_cls = None
 
+    _controller_initiated = False
+
     _mqtt_client = None
     _on_change_function = None
     _obj_ct_id = 0
@@ -408,15 +411,21 @@ def is_in_alarm(self):
         verbose_name_plural = _("Components")
         ordering = 'zone', 'base_type', 'name'
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.prepare_controller()
-
     def __str__(self):
         if self.zone:
             return '%s | %s' % (self.zone.name, self.name)
         return self.name
 
+    def __getattribute__(self, attr):
+        try:
+            return super().__getattribute__(attr)
+        except Exception as e:
+            if not attr.startswith('_') and not self._controller_initiated:
+                self._controller_initiated = True
+                self.prepare_controller()
+                return super().__getattribute__(attr)
+            raise e
+
     @cached_property
     def controller(self):
         from .utils.type_constants import (
@@ -425,13 +434,13 @@ def is_in_alarm(self):
         )
         self._meta.get_field('controller_uid').choices = CONTROLLER_TYPES_CHOICES
         if self.controller_uid:
-            controller_cls = None
-            if not controller_cls:
-                controller_cls = CONTROLLERS_BY_GATEWAY.get(
+            self.controller_cls = None
+            if not self.controller_cls:
+                self.controller_cls = CONTROLLERS_BY_GATEWAY.get(
                     self.gateway.type, {}
                 ).get(self.controller_uid)
-            if controller_cls:
-                return controller_cls(self)
+            if self.controller_cls:
+                return self.controller_cls(self)
 
     def prepare_controller(self):
         if self.controller:
@@ -483,6 +492,11 @@ def is_in_alarm(self):
                     component=self, type='value', value=self.value,
                     user=actor
                 )
+                action.send(
+                    actor, target=self, verb="value change",
+                    instance_id=self.zone.instance.id,
+                    action_type='comp_value', value=self.value
+                )
                 action_performed = True
                 self.last_change = timezone.now()
             if 'arm_status' in dirty_fields:
@@ -490,6 +504,11 @@ def is_in_alarm(self):
                     component=self, type='security',
                     value=self.arm_status, user=actor
                 )
+                action.send(
+                    actor, target=self, verb="security event",
+                    instance_id=self.zone.instance.id,
+                    action_type='security', value=self.value
+                )
                 action_performed = True
                 self.last_change = timezone.now()
             if action_performed:

simo/core/permissions.py

@@ -10,9 +10,12 @@ class InstancePermission(BasePermission):
         if not request.user.is_active:
             return False
 
-        instance = Instance.objects.filter(
-            slug=request.resolver_match.kwargs.get('instance_slug')
-        ).first()
+        instance = getattr(view, 'instance', None)
+        if not instance:
+            instance = Instance.objects.filter(
+                slug=request.resolver_match.kwargs.get('instance_slug')
+            ).first()
+
         if not instance:
             raise Http404()
 

simo/core/serializers.py

@@ -1,9 +1,8 @@
 import inspect
 import datetime
-import json
+import re
 from django import forms
 from collections import OrderedDict
-from django.forms.utils import ErrorDict
 from django.conf import settings
 from collections.abc import Iterable
 from easy_thumbnails.files import get_thumbnailer
@@ -11,7 +10,13 @@ from simo.core.middleware import get_current_request
 from rest_framework import serializers
 from rest_framework.fields import SkipField
 from rest_framework.relations import Hyperlink, PKOnlyObject
+from actstream.models import Action
 from simo.core.forms import HiddenField, FormsetField
+from simo.core.form_fields import (
+    Select2ListChoiceField, Select2ListChoiceField,
+    Select2ModelChoiceField, Select2ListMultipleChoiceField
+)
+from simo.core.models import Component
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
 from .drf_braces.serializers.form_serializer import (
     FormSerializer, FormSerializerBase, reduce_attr_dict_from_instance,
@@ -106,6 +111,7 @@ class ComponentFormsetField(FormSerializer):
         form = forms.Form
         field_mapping = {
             HiddenField: HiddenSerializerField,
+            Select2ListChoiceField: serializers.ChoiceField,
             forms.ModelChoiceField: FormsetPrimaryKeyRelatedField,
             forms.TypedChoiceField: serializers.ChoiceField,
             forms.FloatField: serializers.FloatField,
@@ -249,6 +255,9 @@ class ComponentSerializer(FormSerializer):
     arm_status = ObjectSerializerMethodField()
     battery_level = ObjectSerializerMethodField()
     controller_methods = serializers.SerializerMethodField()
+    info = serializers.SerializerMethodField()
+
+    _forms = {}
 
     class Meta:
         form = ComponentAdminForm
@@ -258,11 +267,27 @@ class ComponentSerializer(FormSerializer):
             forms.FloatField: serializers.FloatField,
             forms.SlugField: serializers.CharField,
             forms.ModelChoiceField: ComponentPrimaryKeyRelatedField,
+            Select2ModelChoiceField: ComponentPrimaryKeyRelatedField,
             forms.ModelMultipleChoiceField: ComponentManyToManyRelatedField,
+            Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
             FormsetField: ComponentFormsetField,
         }
 
+
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Set proper instance for OPTIONS request
+        if not self.instance:
+            res = re.findall(
+                r'.*\/core\/components\/(?P<component_id>[0-9]+)\/',
+                self.context['request'].path
+            )
+            if res:
+                self.instance = Component.objects.filter(id=res[0]).first()
+
     def get_fields(self):
+
         self.set_form_cls()
 
         ret = OrderedDict()
@@ -322,6 +347,7 @@ class ComponentSerializer(FormSerializer):
             if name in ret:
                 continue
             ret[name] = field
+
         return ret
 
     def _get_field_kwargs(self, form_field, serializer_field_class):
@@ -359,7 +385,15 @@ class ComponentSerializer(FormSerializer):
                 if controller:
                     self.Meta.form = controller.config_form
 
-    def get_form(self, data=None, **kwargs):
+    def get_form(self, data=None, instance=None, **kwargs):
+        form_key = None
+        if not data:
+            form_key = 0
+            if instance:
+                form_key = instance.id
+        if form_key in self._forms:
+            return self._forms[form_key]
+
         self.set_form_cls()
         if not self.instance or isinstance(self.instance, Iterable):
             #controller_uid = 'simo.generic.controllers.AlarmClock'
@@ -368,7 +402,7 @@ class ComponentSerializer(FormSerializer):
             controller_uid = self.instance.controller_uid
         form = self.Meta.form(
             data=data, request=self.context['request'],
-            controller_uid=controller_uid,
+            controller_uid=controller_uid, instance=instance,
             **kwargs
         )
         if not self.context['request'].user.is_master:
@@ -380,6 +414,10 @@ class ComponentSerializer(FormSerializer):
                     if field_name not in form.basic_fields:
                         print("DELETE FIELD: ", field_name)
                         del form.fields[field_name]
+
+        if form_key is not None:
+            self._forms[form_key] = form
+
         return form
 
     def accomodate_formsets(self, form, data):
@@ -426,7 +464,6 @@ class ComponentSerializer(FormSerializer):
         a_data = self.accomodate_formsets(form, validated_data)
         form = self.get_form(instance=instance, data=a_data)
         if form.is_valid():
-            print("FORM FIELDS", form.fields)
             instance = form.save(commit=True)
             return instance
         raise serializers.ValidationError(form.errors)
@@ -450,6 +487,10 @@ class ComponentSerializer(FormSerializer):
             c_methods.extend(['arm', 'disarm'])
         return c_methods
 
+    def get_info(self, obj):
+        if obj.controller:
+            return obj.controller.info()
+
     def get_read_only(self, obj):
         user = self.context.get('user')
         if not user:
@@ -507,3 +548,34 @@ class ComponentHistorySerializer(serializers.ModelSerializer):
     class Meta:
         model = ComponentHistory
         fields = '__all__'
+
+
+class ActionSerializer(serializers.ModelSerializer):
+    timestamp = TimestampField()
+    actor = serializers.SerializerMethodField()
+    target = serializers.SerializerMethodField()
+    action_type = serializers.SerializerMethodField()
+    value = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Action
+        fields = (
+            'id', 'timestamp', 'actor', 'target', 'verb',
+            'action_type', 'value'
+        )
+
+    def get_actor(self, obj):
+        if obj.actor:
+            return str(obj.actor)
+
+    def get_target(self, obj):
+        if obj.target:
+            return str(obj.target)
+
+
+    def get_action_type(self, obj):
+        return obj.data.get('action_type')
+
+    def get_value(self, obj):
+        return obj.data.get('value')
+

simo/core/signal_receivers.py

@@ -5,6 +5,7 @@ from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 from django.utils import timezone
 from django.conf import settings
+from actstream import action
 from simo.users.models import PermissionsRole
 from .models import Instance, Gateway, Component, Icon, Zone, Category
 
@@ -14,6 +15,14 @@ def create_instance_defaults(sender, instance, created, **kwargs):
     if not created:
         return
 
+    from simo.users.middleware import get_current_user
+    actor = get_current_user()
+    action.send(
+        actor, target=instance, verb="instance created",
+        instance_id=instance.id,
+        action_type='management_event'
+    )
+
     # Create default zones
 
     for zone_name in (
@@ -86,6 +95,22 @@ def create_instance_defaults(sender, instance, created, **kwargs):
     )
 
 
+@receiver(post_save, sender=Zone)
+@receiver(post_save, sender=Category)
+def post_save_actions_dispatcher(sender, instance, created, **kwargs):
+    from simo.users.middleware import get_current_user
+    actor = get_current_user()
+    if created:
+        verb = 'created'
+    else:
+        verb = 'modified'
+    action.send(
+        actor, target=instance, verb=verb,
+        instance_id=instance.instance.id,
+        action_type='management_event'
+    )
+
+
 @receiver(post_save, sender=Component)
 @receiver(post_save, sender=Gateway)
 def post_save_change_events(sender, instance, created, **kwargs):

simo/core/static/admin/css/simo.css

@@ -363,3 +363,17 @@ body .submit-row a.deletelink{
   }
 }
 
+.markdownified-info{
+  padding: 15px;
+  background-color: #cfefff;
+}
+
+form .aligned .markdownified-info ul{
+    margin-left: 30px;
+}
+form .aligned .markdownified-info ul li {
+    list-style-type: square;
+}
+.markdownified-info hr {
+    background-color: #9f9f9f;
+}

simo/core/templates/admin/controller_widgets/button.html

@@ -0,0 +1,8 @@
+<div class="component-controller"
+       data-ws_url="{{ obj.get_socket_url|default_if_none:"" }}">
+{% if obj.is_down %}
+  <i class="fas fa-rectangle-landscape" style="color: #1b6082;"></i>
+{% else %}
+  <i class="far fa-rectangle-landscape" style="color: #a7a7a7;"></i>
+{% endif %}
+</div>

simo/core/templates/admin/core/component_change_form.html

@@ -0,0 +1,97 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls static admin_modify markdownify %}
+
+{% block extrahead %}{{ block.super }}
+<script src="{% url 'admin:jsi18n' %}"></script>
+{{ media }}
+{% endblock %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" href="{% static "admin/css/forms.css" %}">{% endblock %}
+
+{% block coltype %}colM{% endblock %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %}
+
+{% if not is_popup %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; {% if has_view_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}
+&rsaquo; {% if add %}{% blocktranslate with name=opts.verbose_name %}Add {{ name }}{% endblocktranslate %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+</div>
+{% endblock %}
+{% endif %}
+
+{% block content %}<div id="content-main">
+{% block object-tools %}
+{% if change and not is_popup %}
+  <ul class="object-tools">
+    {% block object-tools-items %}
+      {% change_form_object_tools %}
+    {% endblock %}
+  </ul>
+{% endif %}
+{% endblock %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}{% if form_url %}action="{{ form_url }}" {% endif %}method="post" id="{{ opts.model_name }}_form" novalidate>{% csrf_token %}{% block form_top %}{% endblock %}
+<div>
+{% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1">{% endif %}
+{% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">{% endif %}
+{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}
+{% if errors %}
+    <p class="errornote">
+    {% blocktranslate count counter=errors|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktranslate %}
+    </p>
+    {{ adminform.form.non_field_errors }}
+{% endif %}
+
+{% block field_sets %}
+	{% for fieldset in adminform %}
+	  {% if forloop.first %}
+	    <div style="display: flex">
+				<div style="flex-basis: 70%; margin-right: 15px;">
+					{% include "admin/includes/fieldset.html" %}
+				</div>
+				<div class="module" style="flex-basis: 30%; margin-left: 15px;">
+					<h2 style="background: linear-gradient(0.3turn, #5c7ca5, #5a95df);">Info</h2>
+					<div class="form-row">
+						{% if original.controller %}
+						  {{ original.info|markdownify }}
+						{% endif %}
+					</div>
+				</div>
+			</div>
+	  {% else %}
+	  
+	  {% endif %}
+	{% endfor %}
+{% endblock %}
+
+{% block after_field_sets %}{% endblock %}
+
+{% block inline_field_sets %}
+{% for inline_admin_formset in inline_admin_formsets %}
+    {% include inline_admin_formset.opts.template %}
+{% endfor %}
+{% endblock %}
+
+{% block after_related_objects %}{% endblock %}
+
+{% block submit_buttons_bottom %}{% submit_row %}{% endblock %}
+
+{% block admin_change_form_document_ready %}
+    <script id="django-admin-form-add-constants"
+            src="{% static 'admin/js/change_form.js' %}"
+            {% if adminform and add %}
+                data-model-name="{{ opts.model_name }}"
+            {% endif %}
+            async>
+    </script>
+{% endblock %}
+
+{# JavaScript for prepopulated fields #}
+{% prepopulated_fields_js %}
+
+</div>
+</form></div>
+{% endblock %}