simo 2.0.42__py3-none-any.whl → 2.1.2__py3-none-any.whl

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/tasks.py

@@ -2,20 +2,23 @@ import time
 import os
 import io
 import json
-import base64
 import datetime
 import requests
 import subprocess
 import threading
 import pkg_resources
+import sys
+import traceback
 from django.db.models import Q
-from django.db import connection
+from django.db import connection, transaction
 from django.template.loader import render_to_string
 from celeryc import celery_app
 from django.utils import timezone
+from actstream.models import Action
 from easy_thumbnails.files import get_thumbnailer
 from simo.conf import dynamic_settings
 from simo.core.utils.helpers import get_self_ip
+from simo.users.models import PermissionsRole, InstanceUser
 from .models import Instance, Component, ComponentHistory, HistoryAggregate
 
 
@@ -99,19 +102,15 @@ def save_config(data):
 def sync_with_remote():
     from simo.users.models import User
 
-    instances = Instance.objects.all()
-    if not instances:
-        # No initial configuration yet
-        return
-
     report_data = {
         'simo_version': pkg_resources.get_distribution('simo').version,
         'local_http': 'https://%s' % get_self_ip(),
         'hub_uid': dynamic_settings['core__hub_uid'],
         'hub_secret': dynamic_settings['core__hub_secret'],
+        'remote_conn_version': dynamic_settings['core__remote_conn_version'],
         'instances': []
     }
-    for instance in instances:
+    for instance in Instance.objects.all():
         instance_data = {
             'uid': instance.uid,
             'name': instance.name,
@@ -131,10 +130,14 @@ def sync_with_remote():
             user_role = user.get_role(instance)
             if user_role and user_role.is_superuser:
                 is_superuser = True
+            is_owner = False
+            if user_role and user_role.is_owner:
+                is_owner = True
             instance_data['users'].append({
                 'email': user.email,
                 'is_hub_master': user.is_master,
                 'is_superuser': is_superuser,
+                'is_owner': is_owner,
                 'device_token': user.primary_device_token
             })
 
@@ -144,15 +147,6 @@ def sync_with_remote():
         if last_event:
             instance_data['last_event'] = last_event.date.timestamp()
 
-        if instance.cover_image and not instance.cover_image_synced:
-            thumbnailer = get_thumbnailer(instance.cover_image.path)
-            cover_imb_path = thumbnailer.get_thumbnail(
-                {'size': (880, 490), 'crop': True}
-            ).path
-            with open(cover_imb_path, 'rb') as img:
-                instance_data['cover_image'] = base64.b64encode(
-                    img.read()
-                ).decode()
         report_data['instances'].append(instance_data)
 
     print("Sync UP with remote: ", json.dumps(report_data))
@@ -169,11 +163,7 @@ def sync_with_remote():
     if 'hub_uid' in r_json:
         dynamic_settings['core__hub_uid'] = r_json['hub_uid']
 
-    for instance in instances:
-        instance.cover_image_synced = True
-        instance.save()
-
-    dynamic_settings['core__remote_http'] = r_json.get('hub_remote_http')
+    dynamic_settings['core__remote_http'] = r_json.get('hub_remote_http', '')
     if 'new_secret' in r_json:
         dynamic_settings['core__hub_secret'] = r_json['new_secret']
 
@@ -182,9 +172,14 @@ def sync_with_remote():
     dynamic_settings['core__remote_conn_version'] = r_json['remote_conn_version']
 
     for data in r_json['instances']:
-        instance = Instance.objects.get(uid=data['uid'])
+        users_data = data.pop('users', {})
+        instance_uid = data.pop('uid')
+        weather_forecast = data.pop('weather_forecast', None)
+        instance, new_instance = Instance.objects.update_or_create(
+            uid=instance_uid, defaults=data
+        )
 
-        if 'weather_forecast' in data:
+        if weather_forecast:
             from simo.generic.controllers import WeatherForecast
             weather_component = Component.objects.filter(
                 zone__instance=instance,
@@ -192,27 +187,55 @@ def sync_with_remote():
             ).first()
             if weather_component:
                 weather_component.track_history = False
-                weather_component.controller.set(data['weather_forecast'])
-
-        instance.save()
-
-    for user_data in r_json['users']:
-        try:
-            user = User.objects.get(email=user_data['email'])
-        except User.DoesNotExist:
-            continue
-        user.name = user_data['name']
-        if user_data.get('avatar_url') \
-        and user.avatar_url != user_data.get('avatar_url'):
-            user.avatar_url = user_data.get('avatar_url')
-            resp = requests.get(user.avatar_url)
-            user.avatar.save(
-                os.path.basename(user.avatar_url), io.BytesIO(resp.content)
-            )
-            user.avatar_url = user_data.get('avatar_url')
-            user.avatar_last_change = timezone.now()
-        user.ssh_key = user_data.get('ssh_key')
-        user.save()
+                weather_component.controller.set(weather_forecast)
+
+
+        for email, options in users_data.items():
+            with transaction.atomic():
+                if new_instance:
+                    # Create users for new instance!
+                    user, new_user = User.objects.update_or_create(
+                        email=email, defaults={
+                        'name': options.get('name'),
+                        'is_master': options.get('is_hub_master', False),
+                        'ssh_key': options.get('ssh_key')
+                    })
+                    role = None
+                    if options.get('is_superuser'):
+                        role = PermissionsRole.objects.filter(
+                            instance=new_instance, is_superuser=True
+                        ).first()
+                    elif options.get('is_owner'):
+                        role = PermissionsRole.objects.filter(
+                            instance=new_instance, is_owner=True
+                        ).first()
+                    InstanceUser.objects.update_or_create(
+                        user=user, instance=new_instance, defaults={
+                            'is_active': True, 'role': role
+                        }
+                    )
+                else:
+                    user = User.objects.filter(email=email).first()
+
+                if not user:
+                    continue
+
+                if user.name != options.get('name'):
+                    user.name = options['name']
+                    user.save()
+                if user.ssh_key != options.get('ssh_key'):
+                    user.ssh_key = options['ssh_key']
+                    user.save()
+
+                avatar_url = options.get('avatar_url')
+                if avatar_url and user.avatar_url != avatar_url:
+                    resp = requests.get(avatar_url)
+                    user.avatar.save(
+                        os.path.basename(avatar_url), io.BytesIO(resp.content)
+                    )
+                    user.avatar_url = avatar_url
+                    user.avatar_last_change = timezone.now()
+                    user.save()
 
 
 @celery_app.task
@@ -223,7 +246,10 @@ def watch_timers():
         component.meta['timer_to'] = 0
         component.meta['timer_start'] = 0
         component.save()
-        component.controller._on_timer_end()
+        try:
+            component.controller._on_timer_end()
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
 
 
 @celery_app.task
@@ -232,8 +258,15 @@ def clear_history():
         old_times = timezone.now() - datetime.timedelta(
             days=instance.history_days
         )
-        ComponentHistory.objects.filter(date__lt=old_times).delete()
-        HistoryAggregate.objects.filter(start__lt=old_times).delete()
+        ComponentHistory.objects.filter(
+            component__zone__instance=instance, date__lt=old_times
+        ).delete()
+        HistoryAggregate.objects.filter(
+            component__zone__instance=instance, start__lt=old_times
+        ).delete()
+        Action.objects.filter(
+            data__instance_id=instance.id, timestamp__lt=old_times
+        )
 
 
 @celery_app.task
@@ -300,6 +333,7 @@ def update_latest_version_available():
         return
     latest = list(resp.json()['releases'].keys())[-1]
     dynamic_settings['core__latest_version_available'] = latest
+    print("Got the latest version available!")
 
 
 @celery_app.task
@@ -358,7 +392,6 @@ def low_battery_notifications():
                 )
 
 
-
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(1, watch_timers.s())

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 %}

simo/core/templates/admin/formset_widget.html

@@ -1,122 +1,92 @@
 {% load i18n admin_urls static admin_modify %}
-<style>
-    .formset-table th, .formset-table th .label{
-        font-weight: normal;
-        color: var(--body-quiet-color);
-    }
-    .formset-table .label.required{
-        font-weight: bold;
-    }
-    form .aligned .formset-table ul{
-        margin-left:0;
-    }
-    .errors .formset-table input, .errors .formset-table select,
-    .errors .formset-table textarea{
-        border: 1px solid var(--border-color);
-    }
-    .errors .formset-table .select2-selection{
-        border-color: #aaa;
-    }
-    .formset-table td.errors input, .formset-table td.errors select,
-    .formset-table td.errors textarea{
-        border: 1px solid var(--error-fg);
-    }
-    .formset-table td.errors .select2-selection{
-        border-color: var(--error-fg);
-    }
-    .formset-table td.drag {
-        cursor: pointer;
-        background-image: url(/static/adminsortable2/icons/drag.png);
-        background-repeat: repeat;
-        width: 20px;
-    }
-    .formset-table .inline-deletelink{
-        float: left
-    }
-</style>
+<div class="js-inline-admin-formset inline-group" id="{{ formset.prefix }}-group"
+     data-inline-type="tabular"
+     data-inline-formset="{{ inline_formset_data }}"
+     style="width: 100%">
+  <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
+	{{ formset.management_form }}
+	<fieldset class="module sortable">
+		 {{ formset.non_form_errors }}
+		 <table>
+			 <thead><tr>
+				 <th class="original"></th>
+			 {% for field in empty_form %}
+				 {% if not field.is_hidden and not field.name == 'DELETE' %}
+					 <th class="column-{{ field.name }}{% if field.required %} required{% endif %}{% if field.widget.is_hidden %} hidden{% endif %}">
+						 {{ field.label|capfirst }}
+						 {% if field.help_text %}
+							 <img src="{% static "admin/img/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10"
+							 alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}">
+						 {% endif %}
+					 </th>
+				 {% endif %}
+			 {% endfor %}
+			 {% if formset.can_delete %}<th>{% translate "Delete?" %}</th>{% endif %}
+			 </tr></thead>
+	
+			 <tbody>
+				 {% for form in formset %}
+						{% if form.non_field_errors %}
+						<tr class="row-form-errors"><td colspan="{{ inline_admin_form|cell_count }}">{{ form.non_field_errors }}</td></tr>
+						{% endif %}
+						<tr class="form-row has_original" id="{{ formset.prefix }}-{{ forloop.counter0 }}">
+							
+						<td class="original">
+								<div style="display:none">
+									{% for field in form %}
+										{% if field.is_hidden %} {{ field }} {% endif %}
+									{% endfor %}
+								</div>
+								<p>
+									<span class="sort"><i class="move-begin" role="button" {% translate "Move to first position" as move_begin %}aria-label="{{ move_begin }}" title="{{ move_begin }}"></i><i class="move-end" role="button" {% translate "Move to last position" as move_end %}aria-label="{{ move_end }}" title="{{ move_end }}"></i></span>
+								</p>
+						</td>
+						
+						{% for field in form %}
+							{% if not field.is_hidden and not field.name == 'DELETE' %}
+							<td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
+									{{ field }}
+									{{ field.errors.as_ul }}
+							</td>
+							{% endif %}
+						{% endfor %}
+						
+						
+						{% if formset.can_delete %}
+							<td class="delete">{% if total_org_forms >= forloop.counter0 %}{{ form.DELETE }}{% endif %}</td>
+						{% endif %}
+						</tr>
+				 {% endfor %}
+				 
+				 <tr class="form-row has_original empty-form" id="{{ formset.prefix }}-empty">
 
-
-<div class="inline-group sortable" id="{{ formset.prefix }}-group">
-  <div class="tabular inline-related">
-{{ formset.management_form }}
-<fieldset class="module">
-   {{ formset.non_form_errors }}
-   <table class="formset-table">
-     <thead><tr>
-         <th>{% trans "Sort" %}</th>
-     {% for field in empty_form %}
-       {% if not field.is_hidden and not field.name == 'DELETE' %}
-         <th{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}
-         {% if field.help_text %}&nbsp;<img src="{% static "admin/img/icon-unknown.svg" %}" class="help help-tooltip" width="10" height="10" alt="({{ field.help_text|striptags }})" title="{{ field.help_text|striptags }}" />{% endif %}
-         </th>
-       {% endif %}
-     {% endfor %}
-     {% if formset.can_delete %}<th>{% trans "Delete?" %}</th>{% endif %}
-     </tr></thead>
-
-     <tbody>
-     {% for form in formset %}
-        {% if form.non_field_errors %}
-          <tr><td colspan="{{ total_org_forms }}">{{ form.non_field_errors }}</td></tr>
-        {% endif %}
-
-        <tr class="form-row has_original" id="{{ formset.prefix }}-{{ forloop.counter0 }}">
-            <td class="drag">&nbsp;</td>
-            <td class="original hidden">
-              {% for field in form %}
-                {% if field.is_hidden %} {{ field }} {% endif %}
-              {% endfor %}
-            </td>
-
-            {% for field in form %}
-              {% if not field.is_hidden and not field.name == 'DELETE' %}
-              <td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
-                  {{ field }}
-                  {{ field.errors.as_ul }}
-              </td>
-              {% endif %}
-            {% endfor %}
-
-            {% if formset.can_delete %}
-              <td class="delete">{% if total_org_forms >= forloop.counter0 %}{{ form.DELETE }}{% endif %}</td>
-            {% endif %}
-        </tr>
-
-     {% endfor %}
-
-     <tr class="form-row empty-form" id="{{ formset.prefix }}-empty">
-        <td class="drag">&nbsp;</td>
-        <td class="original hidden">
-          {% for field in empty_form %}
-            {% if field.is_hidden %} {{ field }} {% endif %}
-          {% endfor %}
-        </td>
-
-        {% for field in empty_form %}
-          {% if not field.is_hidden and not field.name == 'DELETE' %}
-          <td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
-              {{ field }}
-              {{ field.errors.as_ul }}
-          </td>
-          {% endif %}
-        {% endfor %}
-
-        {% if formset.can_delete %}
-          <td class="delete"></td>
-        {% endif %}
-     </tr>
-
-     </tbody>
-   </table>
-</fieldset>
+					<td class="original">
+						<div style="display:none">
+							{% for field in empty_form %}
+								{% if field.is_hidden %} {{ field }} {% endif %}
+							{% endfor %}
+						</div>
+						<p>
+							<span class="sort"><i class="move-begin" role="button" {% translate "Move to first position" as move_begin %}aria-label="{{ move_begin }}" title="{{ move_begin }}"></i><i class="move-end" role="button" {% translate "Move to last position" as move_end %}aria-label="{{ move_end }}" title="{{ move_end }}"></i></span>
+						</p>
+					</td>
+	
+					{% for field in empty_form %}
+						{% if not field.is_hidden and not field.name == 'DELETE' %}
+						<td{% if field.name %} class="field-{{ field.name }}"{% endif %}>
+								{{ field }}
+								{{ field.errors.as_ul }}
+						</td>
+						{% endif %}
+					{% endfor %}
+	
+					{% if formset.can_delete %}
+						<td class="delete"></td>
+					{% endif %}
+			   </tr>
+				 
+			 </tbody>
+		 </table>
+	  </fieldset>
   </div>
 </div>
-
-<script type="application/json" class="inline-tabular-config">
-{
-  "prefix": "{{ formset.prefix|escapejs }}",
-  "addText": "{% filter escapejs %}Add another{% endfilter %}",
-  "deleteText": "{% filter escapejs %}{% trans 'Remove' %}{% endfilter %}"
-}
-</script>
-<div class="default_order_field" default_order_field="ORDER" default_order_direction=""></div>