simo 1.7.20__py3-none-any.whl → 2.0.1__py3-none-any.whl

simo/core/templates/admin/wizard/discovery.html

@@ -0,0 +1,188 @@
+{% extends "admin/base_site.html" %}
+{% load i18n admin_urls static admin_modify %}
+
+{% block extrahead %}{{ block.super }}
+<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
+{{ form.media }}
+{% endblock %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" 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' %}">{% trans '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 %}{% blocktrans with name=opts.verbose_name %}Discover {{ name }}{% endblocktrans %}{% else %}{{ original|truncatewords:"18" }}{% endif %}
+</div>
+{% endblock %}
+{% endif %}
+
+{% block content %}<div id="content-main">
+{% block object-tools %}
+{% if change %}{% if not is_popup %}
+  <ul class="object-tools">
+    {% block object-tools-items %}
+      {% change_form_object_tools %}
+    {% endblock %}
+  </ul>
+{% endif %}{% endif %}
+{% endblock %}
+<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" 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 form.non_field_errors %}
+    <p class="errornote">
+    {% if form.non_field_errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
+    </p>
+    {{ form.non_field_errors }}
+{% endif %}
+
+{% block field_sets %}
+  <h3 style="margin-bottom: 20px; text-align: center">Step {{ current_step }} of {{ total_steps }}</h3>
+
+  <fieldset class="module aligned">
+    {% if selected_gateway %}
+      <div class="form-row ">
+        <label class="required"><label for="id_gateway">Gateway:</label></label>
+        <div class="readonly" style="font-weight:bold;">{{ selected_gateway }}</div>
+      </div>
+    {% endif %}
+    {% if selected_type %}
+      <div class="form-row ">
+        <label class="required"><label for="id_base_type">Base type:</label></label>
+        <div class="readonly" style="font-weight:bold;">{{ selected_type }}</div>
+      </div>
+    {% endif %}
+    
+    <div id="running-discovery">
+      <p style="margin: 30px 15px">
+        <i class="fas fa-spinner fa-spin fa-lg" style="margin-right: 10px"></i> DISCOVERY MODE ACTIVATED! <br>
+        Your new components will appear down bellow once discovered.
+      </p>
+      {% if discovery_msg %}
+        <p style="margin: 30px 15px">{{ discovery_msg }}</p>
+      {% endif %}
+    </div>
+    <div id="discovery-finished" style="display:none;">
+      <p style="margin: 30px 15px">Discovery process finished!</p>
+      <p style="margin: 30px 15px; font-weight: bold;">
+        <a href="#" id="retry-btn" style="padding: 10px 20px; border: 1px solid;">
+          <i class="fas fa-redo"></i> Retry!
+        </a>
+      </p>
+    </div>
+    
+    <style>
+      #components-discovered{
+        padding: 0 20px;
+      }
+      .discovered-component{
+        padding: 10px 30px;
+        margin-bottom: 30px;
+        font-weight: bold;
+      }
+      .discovered-component.error{
+        color: red;
+      }
+    </style>
+    <div id="components-discovered">
+    
+    </div>
+    
+
+  </fieldset>
+
+{% endblock %}
+
+
+
+{% block submit_buttons_bottom %}
+
+    <div class="submit-row" style="text-align: left;">
+
+    <a href="{% url 'admin:core_component_changelist' %}" class="cancel-link" style="display: block; padding:9px 15px">
+      <i class="fa fa-check"></i> Done
+    </a>
+
+    </div>
+
+{% endblock %}
+
+{% block admin_change_form_document_ready %}
+    <script type="text/javascript"
+            id="django-admin-form-add-constants"
+            src="{% static 'admin/js/change_form.js' %}"
+            {% if adminform and add %}
+                data-model-name="{{ opts.model_name }}"
+            {% endif %}>
+    </script>
+{% endblock %}
+
+{# JavaScript for prepopulated fields #}
+{% prepopulated_fields_js %}
+
+<script>
+  (function() {
+    var api_check_url = '{{ api_check_url }}';
+    var api_retry_url = '{{ api_retry_url }}';
+    var api_components_url = '{{ api_components_url }}';
+    console.log("API CHECK URL: ", api_check_url);
+    
+    function checkDiscoveryStatus(){
+      $.ajax({
+        url: api_check_url,
+        success: function(response){
+          for (var i=0; i<response.length; i++) {
+            var discovery = response[i];
+            if (discovery.finished > 0){
+              $('#running-discovery').hide();
+              $('#discovery-finished').show();
+            } else {
+              $('#running-discovery').show();
+              $('#discovery-finished').hide();
+            }
+            for (var j=0; j<discovery.result.length; j++){
+              if (discovery.result[j].error === undefined){
+                var comp_id = discovery.result[j];
+                if ($('#discovered-component-' + comp_id).length < 1){
+                  $.ajax({
+                    url: api_components_url + comp_id + '/',
+                    success: function(component){
+                      $('#components-discovered').append(
+                        '<p class="discovered-component" id="discovered-component-' + comp_id +'"><a href="/admin/core/component/' + comp_id + '">' +
+                        component.name + '</a></p>'
+                      );
+                    }
+                  })
+                }
+              } else{
+                if ($('#discovery-error-' + j).length < 1) {
+                  $('#components-discovered').append('<p class="discovered-component error" id="discovery-error-' + j + '">' + discovery.result[j].error + '</p>');
+                }
+              }
+            }
+          }
+        }
+      });
+    }
+    setInterval(checkDiscoveryStatus, 1000);
+    
+    $('#retry-btn').on('click', function(e){
+      e.preventDefault();
+      $.get(api_retry_url);
+    });
+  })();
+</script>
+
+</div>
+</form></div>
+
+{% endblock %}

simo/core/templates/admin/wizard/wizard_add.html

@@ -80,11 +80,11 @@
     <div class="submit-row" style="text-align: left;">
 
     <button class="button" name="prev" style="padding: 10px 15px" type="submit" value="1" {% if is_first %}disabled{% endif %}>{% trans "< Prev" %}</button>
-    <div style="display:inline-block; margin-left: 15px;">
-      <a href="{% url 'admin:core_component_changelist' %}" class="cancel-link" style="padding:9px 15px">
-        <i class="fa fa-times"></i> Cancel
-      </a>
-    </div>
+
+    <a href="{% url 'admin:core_component_changelist' %}" class="cancel-link" style="display:block; margin-left: 15px; padding:9px 15px">
+      <i class="fa fa-times"></i> Cancel
+    </a>
+
 
     <input type="submit" value="{% if is_last %}Finish!{% else %}Next >{% endif %}" class="default" name="_save">
 

simo/core/utils/admin.py

@@ -1,9 +1,16 @@
-from django.contrib import admin
+from django import forms
 from django.shortcuts import render, redirect
 from django.contrib.admin.helpers import Fieldset
-from adminsortable2.admin import SortableAdminMixin
 
 
+class AdminFormActionForm(forms.Form):
+
+    def __init__(self, modeladmin, request, queryset, *args, **kwargs):
+        self.modeladmin = modeladmin
+        self.request = request
+        self.queryset = queryset
+        super().__init__(*args, **kwargs)
+
 
 class FormAction:
 

simo/core/utils/formsets.py

@@ -27,19 +27,21 @@ class FormsetWidget(forms.Widget):
     use_cached = False
 
     class Media:
-        css = {
-            'all': ['adminsortable2/css/sortable.css']
-        }
+        pass
+        # No longer works with adminsortable2-2
+        # css = {
+        #     'all': ['adminsortable2/css/sortable.css']
+        # }
         js = (
             'admin/js/inlines.js',
-            'adminsortable2/js/plugins/admincompat.js',
-            'adminsortable2/js/libs/jquery.ui.core-1.11.4.js',
-            'adminsortable2/js/libs/jquery.ui.widget-1.11.4.js',
-            'adminsortable2/js/libs/jquery.ui.mouse-1.11.4.js',
-            'adminsortable2/js/libs/jquery.ui.touch-punch-0.2.3.js',
-            'adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
-            'adminsortable2/js/inline-tabular.js',
-            'adminsortable2/js/inline-sortable.js',
+            # 'adminsortable2/js/plugins/admincompat.js',
+            # 'adminsortable2/js/libs/jquery.ui.core-1.11.4.js',
+            # 'adminsortable2/js/libs/jquery.ui.widget-1.11.4.js',
+            # 'adminsortable2/js/libs/jquery.ui.mouse-1.11.4.js',
+            # 'adminsortable2/js/libs/jquery.ui.touch-punch-0.2.3.js',
+            # 'adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
+            # 'adminsortable2/js/inline-tabular.js',
+            # 'adminsortable2/js/inline-sortable.js',
         )
 
     def render(self, name, value, attrs=None, renderer=None):
@@ -115,7 +117,6 @@ class FormsetWidget(forms.Widget):
         return formset_data
 
 
-
 class FormsetField(forms.Field):
     widget = FormsetWidget
     formset_cls = None
@@ -127,7 +128,6 @@ class FormsetField(forms.Field):
         self.widget.formset_cls = formset_cls
         self.widget.prefix = self.prefix
 
-
     def clean(self, formset_data):
 
         try:
@@ -149,12 +149,14 @@ class FormsetField(forms.Field):
                 continue
             form_data = {}
             for field_name, field in self.formset_cls().form.declared_fields.items():
-                print(field)
                 form_data[field_name] = formset_data.get(
                     '%s-%d-%s' % (prefix, i, field_name)
                 )
                 if isinstance(field, forms.models.ModelChoiceField):
-                    form_data[field_name] = int(form_data[field_name])
+                    if isinstance(form_data[field_name], models.Model):
+                        form_data[field_name] = form_data[field_name].pk
+                    else:
+                        form_data[field_name] = int(form_data[field_name])
                 elif isinstance(field, forms.models.ModelMultipleChoiceField):
                     form_data[field_name] = [
                         obj.pk for obj in form_data[field_name]
@@ -174,7 +176,6 @@ class FormsetField(forms.Field):
             for i in range(len(cleaned_value)):
                 cleaned_value[i].pop('order')
 
-        print("CLEANED VALUE: ", cleaned_value)
         return cleaned_value
 
 

simo/core/utils/helpers.py

@@ -14,6 +14,7 @@ class classproperty(property):
     def __get__(self, cls, owner):
         return self.fget.__get__(None, owner)()
 
+
 def get_random_string(
     size=20, chars=string.ascii_uppercase + string.ascii_lowercase + string.digits
 ):

simo/core/utils/serialization.py

@@ -0,0 +1,56 @@
+import json
+from django.core import serializers as model_serializers
+from django.db import models
+from collections.abc import Iterable
+
+
+
+def serialize_form_data(data):
+    serialized_data = {}
+    for field_name, val in data.items():
+        is_model = False
+        if isinstance(val, Iterable):
+            for v in val:
+                if isinstance(v, models.Model):
+                    is_model = True
+                    break
+        elif isinstance(val, models.Model):
+            is_model = True
+        if is_model:
+            if isinstance(val, Iterable):
+                serialized_data[field_name] = {
+                    'model': 'many',
+                    'val': json.loads(model_serializers.serialize(
+                        'json', val
+                    ))
+                }
+            else:
+                serialized_data[field_name] = {
+                    'model': 'single',
+                    'val': json.loads(model_serializers.serialize(
+                        'json', [val]
+                    ))
+                }
+        else:
+            serialized_data[field_name] = val
+    return serialized_data
+
+
+def deserialize_form_data(data):
+    deserialized_data = {}
+    for field_name, val in data.items():
+        if isinstance(val, dict) and val.get('model'):
+            deserializer_generator = model_serializers.deserialize(
+                'json', json.dumps(val['val'])
+            )
+            if val['model'] == 'single':
+                for item in deserializer_generator:
+                    deserialized_data[field_name] = item.object
+                    break
+            else:
+                deserialized_data[field_name] = []
+                for item in deserializer_generator:
+                    deserialized_data[field_name].append(item.object)
+        else:
+            deserialized_data[field_name] = val
+    return deserialized_data

simo/core/utils/type_constants.py

@@ -40,7 +40,7 @@ def get_controller_types_choices(gateway=None):
     return choices
 
 
-# ALL_CONTROLLER_TYPES = get_controller_types_map()
+#ALL_CONTROLLER_TYPES = get_controller_types_map()
 # CONTROLLER_TYPE_CHOICES = [
 #     (slug, cls.name) for slug, cls in ALL_CONTROLLER_TYPES.items()
 # ]

simo/core/utils/validators.py

@@ -1,4 +1,5 @@
 import xml.etree.cElementTree as et
+from django import forms
 from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ValidationError
 
@@ -28,4 +29,16 @@ def validate_flr(f):
     return f
     # if not f.endswith('.flr'):
     #     raise ValidationError("Only .flr files accepted")
-    # return f
+    # return f
+
+
+def validate_slaves(slaves, component, master_component=None):
+    for slave in slaves:
+        if slave == component:
+            raise forms.ValidationError(_(f"{component} is already a slave of {slave}"))
+        if slave == master_component:
+            raise forms.ValidationError(_(f"{master_component} is already a slave of {slave}"))
+        subslaves = slave.slaves.all()
+        if subslaves.count():
+            validate_slaves(subslaves, slave, master_component=None)
+    return slaves

simo/core/views.py

@@ -9,10 +9,12 @@ from django.contrib.gis.geos import Point
 from django.contrib import messages
 from simo.users.models import User
 from simo.conf import dynamic_settings
+from .models import Instance
 from .tasks import update as update_task, supervisor_restart
 from .forms import (
     HubConfigForm, CoordinatesForm, TermsAndConditionsForm
 )
+from .middleware import introduce_instance
 
 
 def get_timestamp(request):
@@ -139,3 +141,14 @@ def reboot(request):
     if request.META.get('HTTP_REFERER'):
         return redirect(request.META.get('HTTP_REFERER'))
     return redirect(reverse('admin:index'))
+
+
+@login_required
+def set_instance(request, instance_slug):
+    instance = Instance.objects.filter(slug=instance_slug).first()
+    if instance:
+        introduce_instance(instance, request)
+        
+    if request.META.get('HTTP_REFERER'):
+        return redirect(request.META.get('HTTP_REFERER'))
+    return redirect(reverse('admin:index'))

simo/fleet/admin.py

@@ -4,7 +4,7 @@ from django.template.loader import render_to_string
 from django.templatetags.static import static
 from simo.core.models import Component
 from simo.core.utils.admin import FormAction
-from .models import Colonel, I2CInterface
+from .models import Colonel, I2CInterface, ColonelPin
 from .forms import ColonelAdminForm, MoveColonelForm, I2CInterfaceAdminForm
 
 
@@ -14,29 +14,63 @@ class I2CInterfaceInline(admin.TabularInline):
     form = I2CInterfaceAdminForm
 
 
+class ColonelPinsInline(admin.TabularInline):
+    model = ColonelPin
+    extra = 0
+    fields = 'id_display', 'label', 'occupied_by_display',
+    readonly_fields = fields
+
+    def occupied_by_display(self, obj):
+        if not obj.occupied_by:
+            return
+        try:
+            admin_url = obj.occupied_by.get_admin_url()
+        except:
+            admin_url = None
+        txt = f'{obj.occupied_by_content_type}: {obj.occupied_by}'
+        if admin_url:
+            return mark_safe(f'<a href="{admin_url}">{txt}</a>')
+        return txt
+
+    occupied_by_display.short_description = "Occupied By"
+
+
+    def id_display(self, obj):
+        return obj.id
+    id_display.short_description = "ID"
+
+    def has_add_permission(self, request, obj):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+
 @admin.register(Colonel)
 class ColonelAdmin(admin.ModelAdmin):
     form = ColonelAdminForm
     list_display = (
         '__str__', 'instance', 'type', 'connected', 'last_seen', 'firmware_version',
-        'newer_firmware_available', 'is_authorized'
+        'newer_firmware_available',
     )
     readonly_fields = (
         'type', 'uid', 'connected', 'last_seen',
-        'firmware_version', 'newer_firmware_available', 'occupied_pins',
-        'components_display', 'is_authorized'
+        'firmware_version', 'newer_firmware_available',
     )
-    # inlines = ColonelComponentInline, ColonelBLEDeviceInline
     fields = (
         'name', 'instance', 'enabled', 'firmware_auto_update'
     ) + readonly_fields + ('pwm_frequency', 'logs_stream', 'log', )
 
     actions = (
-        'update_firmware', 'check_for_upgrade', 'update_config', 'restart',
-        FormAction(MoveColonelForm, 'move_colonel_to', "Move to other Colonel")
+        'check_for_upgrade', 'update_firmware', 'update_config', 'restart',
+        FormAction(MoveColonelForm, 'move_colonel_to', "Move to other Colonel"),
+        'rebuild_occupied_pins'
     )
 
-    inlines = I2CInterfaceInline,
+    inlines = I2CInterfaceInline, ColonelPinsInline
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
@@ -44,28 +78,9 @@ class ColonelAdmin(admin.ModelAdmin):
             return qs
         return qs.filter(instance__in=request.user.instances)
 
-
-    def components_display(self, obj=None):
-        resp = ''
-        for pin_no, item in obj.occupied_pins.items():
-            try:
-                component = Component.objects.get(pk=item)
-            except:
-                continue
-            resp += '<a href="%s" target=_blank>%s</a><br>' % (
-                component.get_admin_url(), str(component)
-            )
-        return mark_safe(resp)
-    components_display.short_description = 'Components'
-
     def has_add_permission(self, request):
         return False
 
-    def save_model(self, request, obj, form, change):
-        res = super().save_model(request, obj, form, change)
-        obj.restart()
-        return res
-
     def update_firmware(self, request, queryset):
         count = 0
         for colonel in queryset:
@@ -83,7 +98,7 @@ class ColonelAdmin(admin.ModelAdmin):
         )
 
     def move_colonel_to(self, request, queryset, form):
-        if form.cleaned_data['colonel'] not in request.user.instances:
+        if form.cleaned_data['colonel'].instance not in request.user.instances:
             return
         moved = 0
         for colonel in queryset:
@@ -96,7 +111,6 @@ class ColonelAdmin(admin.ModelAdmin):
                 request, "%d colonels were moved." % moved
             )
 
-
     def restart(self, request, queryset):
         restarted = 0
         for colonel in queryset:
@@ -128,6 +142,16 @@ class ColonelAdmin(admin.ModelAdmin):
             request, "%d colonels checked." % queryset.count()
         )
 
+    def rebuild_occupied_pins(self, request, queryset):
+        affected = 0
+        for obj in queryset:
+            affected += 1
+            obj.rebuild_occupied_pins()
+
+        self.message_user(
+            request, f"Occupied pins where rebuilt on {affected} colonels."
+        )
+
     def connected(self, obj):
         if obj.is_connected:
             return mark_safe('<img src="%s" alt="True">' % static('admin/img/icon-yes.svg'))

simo/fleet/api.py

@@ -1,13 +1,69 @@
+from django.db.models import Count
+from django.utils.translation import gettext_lazy as _
 from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.exceptions import ValidationError as APIValidationError
 from simo.core.api import InstanceMixin
-from .models import InstanceOptions
-from .serializers import InstanceOptionsSerializer
+from simo.core.permissions import IsInstanceSuperuser
+from .models import InstanceOptions, Colonel
+from .serializers import InstanceOptionsSerializer, ColonelSerializer
 
 
 class InstanceOptionsViewSet(InstanceMixin, viewsets.ReadOnlyModelViewSet):
     url = 'fleet/options'
-    basename = 'fleet-options'
+    basename = 'options'
     serializer_class = InstanceOptionsSerializer
 
     def get_queryset(self):
         return InstanceOptions.objects.filter(instance=self.instance)
+
+
+class ColonelsViewSet(InstanceMixin, viewsets.ModelViewSet):
+    url = 'fleet/colonels'
+    basename = 'colonels'
+    serializer_class = ColonelSerializer
+
+    def get_permissions(self):
+        permissions = super().get_permissions()
+        permissions.append(IsInstanceSuperuser())
+        return permissions
+
+    def get_queryset(self):
+        return Colonel.objects.filter(instance=self.instance)
+
+    @action(detail=True, methods=['post'])
+    def check_for_upgrade(self, request, pk=None, *args, **kwargs):
+        colonel = self.get_object()
+        colonel.check_for_upgrade()
+
+    @action(detail=True, methods=['post'])
+    def upgrade(self, request, pk=None, *args, **kwargs):
+        colonel = self.get_object()
+        if colonel.major_upgrade_available:
+            colonel.update_firmware(colonel.major_upgrade_available)
+        elif colonel.minor_upgrade_available:
+            colonel.update_firmware(colonel.minor_upgrade_available)
+
+    @action(detail=True, methods=['post'])
+    def restart(self, request, pk=None, *args, **kwargs):
+        colonel = self.get_object()
+        colonel.restart()
+
+    @action(detail=True, methods=['post'])
+    def update_config(self, request, pk=None, *args, **kwargs):
+        colonel = self.get_object()
+        colonel.update_config()
+
+
+    @action(detail=True, methods=['post'])
+    def move_to(self, request, pk, *args, **kwargs):
+        colonel = self.get_object()
+        target = Colonel.objects.annotate(
+            components_count=Count('components')
+        ).filter(
+            pk=request.POST.get('target'),
+            components_count=0, type=colonel.type
+        )
+        if not target:
+            raise APIValidationError(_('Invalid target.'), code=400)
+        colonel.move_to(target)