simo 2.6.6__py3-none-any.whl → 2.6.7__py3-none-any.whl

simo/core/api_meta.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 from django.urls import reverse
 from django.utils.encoding import force_str
+from django.forms.utils import pretty_name
 from rest_framework.metadata import SimpleMetadata
 from rest_framework import serializers
 from rest_framework.utils.field_mapping import ClassLookupDict
@@ -79,6 +80,7 @@ class SIMOAPIMetadata(SimpleMetadata):
                 field_info['autocomplete_url'] = reverse(form_field.url)
                 field_info['forward'] = form_field.forward
 
+
         attrs = [
             'read_only', 'label', 'help_text',
             'min_length', 'max_length',
@@ -94,7 +96,8 @@ class SIMOAPIMetadata(SimpleMetadata):
         if getattr(field, 'child', None):
             field_info['child'] = self.get_field_info(field.child)
         elif getattr(field, 'fields', None):
-            field_info['children'] = self.get_serializer_info(field)
+            field.Meta.form = form_field.formset_cls.form
+            field_info['children'] = self.get_formset_serializer_info(field)
 
         if form_field and hasattr(form_field, 'queryset'):
             if form_field.queryset.model == Icon:
@@ -122,4 +125,20 @@ class SIMOAPIMetadata(SimpleMetadata):
                 for choice_value, choice_name in field.choices.items()
             ]
 
-        return field_info
+        return field_info
+
+
+    def get_formset_serializer_info(self, serializer):
+        """
+        Given an instance of a serializer, return a dictionary of metadata
+        about its fields.
+        """
+        if hasattr(serializer, 'child'):
+            # If this is a `ListSerializer` then we want to examine the
+            # underlying child serializer instance instead.
+            serializer = serializer.child
+        return OrderedDict([
+            (field_name, self.get_field_info(field))
+            for field_name, field in serializer.get_fields().items()
+            if not isinstance(field, serializers.HiddenField)
+        ])

simo/core/autocomplete_views.py

@@ -1,4 +1,5 @@
 from dal import autocomplete
+from dal.views import BaseQuerySetView
 from django.db.models import Q
 from django.template.loader import render_to_string
 from simo.core.utils.helpers import search_queryset
@@ -13,7 +14,9 @@ class IconModelAutocomplete(autocomplete.Select2QuerySetView):
         if self.forwarded.get("id"):
             return qs.filter(pk=self.forwarded.get("id"))
 
-        if self.q:
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.q:
             qs = search_queryset(qs, self.q, ('slug', 'keywords'))
         return qs.distinct()
 
@@ -56,7 +59,9 @@ class CategoryAutocomplete(autocomplete.Select2QuerySetView):
             return qs.filter(pk=self.forwarded.get("id"))
 
         qs = qs.filter(all=False)
-        if self.q:
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.q:
             qs = search_queryset(qs, self.q, ('name'))
         return qs.distinct()
 
@@ -79,7 +84,9 @@ class ZoneAutocomplete(autocomplete.Select2QuerySetView):
         if self.forwarded.get("id"):
             return qs.filter(pk=self.forwarded.get("id"))
 
-        if self.q:
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.q:
             qs = search_queryset(qs, self.q, ('name',))
         return qs.distinct()
 
@@ -116,7 +123,9 @@ class ComponentAutocomplete(autocomplete.Select2QuerySetView):
                 Q(alarm_category__in=self.forwarded['alarm_category'])
             )
 
-        if self.q:
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.q:
             qs = search_queryset(qs, self.q, ('zone__name', 'name',))
         return qs.distinct()
 

simo/core/serializers.py

@@ -4,6 +4,7 @@ import re
 from django import forms
 from collections import OrderedDict
 from django.conf import settings
+from django.forms.utils import pretty_name
 from collections.abc import Iterable
 from easy_thumbnails.files import get_thumbnailer
 from simo.core.middleware import get_current_request
@@ -193,6 +194,9 @@ class ComponentFormsetField(FormSerializer):
             ret[field_name] = self._get_field(form_field, serializer_field_class)
             ret[field_name].initial = form_field.initial
             ret[field_name].default = form_field.initial
+            ret[field_name].label = form_field.label
+            if not ret[field_name].label:
+                ret[field_name].label = pretty_name(field_name)
 
         return ret
 
@@ -360,6 +364,8 @@ class ComponentSerializer(FormSerializer):
             )
             ret[field_name].initial = form_field.initial
             ret[field_name].default = form_field.initial
+            if not ret[field_name].label:
+                ret[field_name].label = pretty_name(field_name)
 
         for name, field in super(FormSerializerBase, self).get_fields().items():
             if name in ret:

simo/fleet/views.py

@@ -40,7 +40,10 @@ class PinsSelectAutocomplete(autocomplete.Select2QuerySetView):
         if self.forwarded.get('filters'):
             qs = qs.filter(**self.forwarded.get('filters'))
 
-        if self.q:
+
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.q:
             qs = search_queryset(qs, self.q, ('label', ))
 
         return qs
@@ -59,7 +62,9 @@ class InterfaceSelectAutocomplete(autocomplete.Select2QuerySetView):
 
         qs = Interface.objects.filter(colonel=colonel)
 
-        if self.forwarded.get('filters'):
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.forwarded.get('filters'):
             qs = qs.filter(**self.forwarded.get('filters'))
 
         return qs
@@ -81,15 +86,12 @@ class ControlInputSelectAutocomplete(autocomplete.Select2ListView):
             pins_qs = pins_qs.filter(
                 Q(occupied_by_id=None) | Q(id=int(self.forwarded['self'][4:]))
             )
-        else:
+        elif 'value' not in self.request.GET:
             pins_qs = pins_qs.filter(occupied_by_id=None)
 
         if self.forwarded.get('pin_filters'):
             pins_qs = pins_qs.filter(**self.forwarded.get('pin_filters'))
 
-        if self.q:
-            pins_qs = search_queryset(pins_qs, self.q, ('label',))
-
         buttons_qs = Component.objects.filter(
             base_type='button'
         ).select_related('zone')
@@ -97,10 +99,28 @@ class ControlInputSelectAutocomplete(autocomplete.Select2ListView):
         if self.forwarded.get('button_filters'):
             buttons_qs = buttons_qs.filter(**self.forwarded.get('button_filters'))
 
-        if self.q:
+        if self.request.GET.get('value'):
+            pin_ids = []
+            button_ids = []
+            for v in self.request.GET['value'].split(','):
+                try:
+                    t, id = v.split('-')
+                    id = int(id)
+                except:
+                    continue
+                if t == 'pin':
+                    pin_ids.append(id)
+                elif t == 'button':
+                    button_ids.append(id)
+            buttons_qs = buttons_qs.filter(id__in=button_ids)
+            pins_qs = pins_qs.filter(id__in=pin_ids)
+
+        elif self.q:
             buttons_qs = search_queryset(
                 buttons_qs, self.q, ('name', 'zone__name', 'category__name')
             )
+            pins_qs = search_queryset(pins_qs, self.q, ('label',))
+
 
         return [(f'pin-{pin.id}', str(pin)) for pin in pins_qs] + \
                [(f'button-{button.id}',

{simo-2.6.6.dist-info → simo-2.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.6.6
+Version: 2.6.7
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.6.6.dist-info → simo-2.6.7.dist-info}/RECORD

@@ -63,11 +63,11 @@ simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=nmFDO57D5hXHDfl0wjJ9J5jBxyCqW4Gp_uqHhpS2uuw,18564
 simo/core/api.py,sha256=HWyzmFGbULndSaW3sdrQa_kw2zfjd7yzfYxErAij7cY,29070
 simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
-simo/core/api_meta.py,sha256=EaiY-dCADP__9MvLpoHvhjytFT92IrxPZDv95xgqasU,4955
+simo/core/api_meta.py,sha256=7yvarprPAHV2VP7AZV8wOqmeWsJ_UInrzKMakkeXsXU,5686
 simo/core/app_widgets.py,sha256=VxZzapuc-a29wBH7JzpvNF2SK1ECrgNUySId5ke1ffc,2509
 simo/core/apps.py,sha256=CsqpiQerhmrMsH-wGiG-gQgXd9qEkIi-LUaA9cXpKSw,425
 simo/core/auto_urls.py,sha256=FBDclIeRp5UVWomIUbRzUgY-AoMk-r2qC2htlwKD4Lo,1106
-simo/core/autocomplete_views.py,sha256=Nu9sgc0X5OspRkJnpomeO2XdHCOg9ii9v4ZkGecCNjQ,3860
+simo/core/autocomplete_views.py,sha256=sQbT2g1Y9HGLLKazKaNfnZmwa6RJlTek9XzkGQcx4P8,4363
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
 simo/core/controllers.py,sha256=vAZwtwPb259Bw-3dPSXuDxIcErMnQ6YBpBaUh4HWghM,35656
@@ -83,7 +83,7 @@ simo/core/middleware.py,sha256=eUFf6iP-Snx_0TE3MoXsSwqrd5IjlukqZk2GQGStRCo,3385
 simo/core/models.py,sha256=QNVTnWeHAW6LVrs3eaR7WNMhwjICuQpXZ8vyH_2qCBo,22834
 simo/core/permissions.py,sha256=2YNRot2qoHjHKWPGOpO4PBseecctPbTlUQpepnFkCRs,3027
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=NgqZhBjY0or6dfN-N_EaaygR_EUoUBryuK1DbD4R3Fg,21810
+simo/core/serializers.py,sha256=JN1B2IcLkjZB3XiAetxK8Awx9WNHPOFwrCOrGqTLdbE,22118
 simo/core/signal_receivers.py,sha256=xUnQrWFBMF0Uasj6PzpERPr6h6BR-ZjUb1NSakRSzQo,9458
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
@@ -96,11 +96,11 @@ simo/core/__pycache__/__init__.cpython-38.pyc,sha256=ZJFM_XN0RmJMULQulgA_wFiOnEt
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=WAfdq_hAdkW-_QwJ0E7NSd25yxnPRi_HjJ-uKFMJzcg,14146
 simo/core/__pycache__/api.cpython-38.pyc,sha256=0kALbhViLcVqxcxzc_mmT9TzZcONc0ZNzZCWscbxjWE,22459
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=mi3mu5qEKio_PvfQEvr3Q6AhdPLAHxzxAxrMbAz_pKU,1712
-simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=VYx5ZeDyNBI4B_CBEIhV5B3GnLsMOx9s3rNZTSMODco,3703
+simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=CpiIoUPpQkX8db8o150LtGo79nHnBoEWKeRF8NoY69o,4391
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=oN657XMMZ6GYN9nblv7fX3kdnTEzSP9XV6PXM6Z0wl4,4358
 simo/core/__pycache__/apps.cpython-38.pyc,sha256=JL0BEqgXcSQvMlcK48PBpPfyDEkPMdO1Y0teqMRGirs,713
 simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=ib_ns5Ko8ybfrdJJWYVV1jevihxOFs39aBF4bez6Lzs,874
-simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=Of2ZFdN8XF1I4TmAUwqZonHqZd8O9CpX_DqIQMU_rdc,3967
+simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=Er4fS5KhE2FB9g7-ckjS_RIWOv7qysuzdt1Ab7HUL5Q,4318
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CX-qlF7CefRi_mCE954wYa9rUFR88mOl6g7fybDRu7g,803
 simo/core/__pycache__/context.cpython-38.pyc,sha256=NlTHt2GvXxA21AhBkeyOLfRFUuXw7wmwqyNhhcDl2cw,1373
 simo/core/__pycache__/controllers.cpython-38.pyc,sha256=Lt9JDheLB3qgaZZ9NACAEeg43IY9XxZHN3Y0c5JavMo,30710
@@ -116,7 +116,7 @@ simo/core/__pycache__/middleware.cpython-38.pyc,sha256=g3d4L2PwxFyRKIPMP9Hkdjk1P
 simo/core/__pycache__/models.cpython-38.pyc,sha256=po4B4bMyA-KDBu8qbVwGjrpUZJQPVBB6dkfncEBKYnM,18554
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=UdtxCTXPEbe99vgZOfRz9wfKSYvUn9hSRbpIV9CJSyI,2988
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=QvlVp7m13i3Vn1FOmjV-y_IpLfmcSIy74jhb66ecJbo,19403
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=xSz0o7EROKp4eKbMmTwm37j9jbAuTcN8PMqluRjZucQ,19551
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=h0AsNC33oLoADJlwUVfPB1suUYovfzjfc0SE41-3MjY,6778
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=KqbO1cOewodVPcy0-htVefyUjCuELKV0o7fOfYqfgPc,8490
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
@@ -10263,7 +10263,7 @@ simo/fleet/serializers.py,sha256=PQnjp7LaEpMts-om2OPV5XOU9ut6KFWiePPDCXK0M98,267
 simo/fleet/socket_consumers.py,sha256=4hVSvFNq9Hi44R7JmaujFoEtgmH5YBST2cFYtIiMDRA,18840
 simo/fleet/tasks.py,sha256=NX_opj-rbkK9eeQMeRNwHj_ZJ0LC4rYOZovMg9_r0kA,904
 simo/fleet/utils.py,sha256=wNJvURzLP3-aho3D3rfg07N9kWCaMIw5gOsmeeO9Nlg,4740
-simo/fleet/views.py,sha256=jT3GcGv_JEj3dqyfHH2whCnGqwT8YEAuFxRgIX4Dk9w,3237
+simo/fleet/views.py,sha256=jK5ajYTIPhz8ODgeHxHgZ9aWicWOD2D6PFJ_iq9B_ug,4051
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
 simo/fleet/__pycache__/admin.cpython-38.pyc,sha256=iweeu5AkaggBhQntP6-VF_eEodkNc6E7zKy0VjfwC2o,6652
 simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rZ1mkfkaMBEXhi9sw_jTKdk2CPJhBNxoImtjQ3Rf1VY,4016
@@ -10280,7 +10280,7 @@ simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=l_FzORWCM1hcSZV0AaGRO-p
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=m8sJWln-uyjeTD-alyoNikEJcHCxZGTe2vXnMGVNZog,14170
 simo/fleet/__pycache__/tasks.cpython-38.pyc,sha256=RoNxL2WUiW67s9O9DjaYVVjCBSZu2nje0Qn9FJkWVS0,1116
 simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=obUd-X2Y-ybx4icqUWq_qwIxrP9yyarJjexWAfO4MTI,3344
-simo/fleet/__pycache__/views.cpython-38.pyc,sha256=wilxSvZliSKQ5qC7JjWneYBSdbeZeTsF5uDrOQVmvms,3181
+simo/fleet/__pycache__/views.cpython-38.pyc,sha256=jffuwjfsNGY8EJchA6lnSBUXkDQkIqoov6DhWAO4yCA,3623
 simo/fleet/migrations/0001_initial.py,sha256=lce8nkD8Sz6pYr-XJSpDm4CMDuB6TA__WtnHpIp-eA4,1326
 simo/fleet/migrations/0002_auto_20220422_0743.py,sha256=sFOfAjnQOzcJjE8lHrrHgTaGilJNYswMdXphgVzUZqY,825
 simo/fleet/migrations/0003_auto_20220422_0752.py,sha256=VcH7DyMAniEwT76hDVofS8FTNpM3nxz_J9AC2zKHDSA,543
@@ -10599,9 +10599,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.6.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.6.6.dist-info/METADATA,sha256=U_rJSOAn0Y32OcYjYKHpnflh2C1SLDSmOxb5f6rWXXM,1952
-simo-2.6.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.6.6.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.6.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.6.6.dist-info/RECORD,,
+simo-2.6.7.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.6.7.dist-info/METADATA,sha256=Jar59TxU2gPodg0J4-1cPqMgEgAOOSb_Bfh9Hs_Qxuk,1952
+simo-2.6.7.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.6.7.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.6.7.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.6.7.dist-info/RECORD,,