simo 2.0.12__py3-none-any.whl → 2.0.13__py3-none-any.whl

simo/core/admin.py

@@ -336,9 +336,9 @@ class ComponentAdmin(admin.ModelAdmin):
                         'alarm_category', 'arm_status'
                     ):
                         if field_neme in form.fields:
-                            form.fields.pop(field_neme)
+                            form.fields.pop(field_neme, None)
                     if 'slaves' not in form.declared_fields:
-                        form.fields.pop('slaves')
+                        form.fields.pop('slaves', None)
 
                 ctx['is_last'] = True
                 ctx['current_step'] = 3

simo/core/forms.py

@@ -287,8 +287,8 @@ class ComponentAdminForm(forms.ModelForm):
         model = Component
         fields = '__all__'
         exclude = (
-            'gateway', 'controller_uid', 'base_type', 'instance_methods'
-            'alive', 'value_type', 'value', 'arm_status',
+            'gateway', 'controller_uid', 'base_type', 'instance_methods',
+            'alive', 'value_type', 'value', 'arm_status', 'slaves',
         )
         widgets = {
             'icon': autocomplete.ModelSelect2(
@@ -331,7 +331,8 @@ class ComponentAdminForm(forms.ModelForm):
         main_fields = (
             'name', 'icon', 'zone', 'category',
             'show_in_app', 'battery_level',
-            'instance_methods', 'value_units',
+            #'instance_methods',
+            'value_units',
             'alarm_category', 'arm_status',
         )
         base_fields = ['id', 'gateway', 'base_type', 'name']
@@ -347,7 +348,7 @@ class ComponentAdminForm(forms.ModelForm):
 
         base_fields.append('show_in_app')
         base_fields.append('control')
-        base_fields.append('instance_methods')
+        #base_fields.append('instance_methods')
 
         fieldsets = [
             (_("Base settings"), {'fields': base_fields}),

simo/core/serializers.py

@@ -8,6 +8,8 @@ from collections.abc import Iterable
 from easy_thumbnails.files import get_thumbnailer
 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 simo.core.forms import HiddenField, FormsetField
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
 from .drf_braces.serializers.form_serializer import (
@@ -158,7 +160,30 @@ class ComponentFormsetField(FormSerializer):
         return kwargs
 
     def to_representation(self, instance):
-        return super(FormSerializerBase, self).to_representation(instance)
+        """
+        Object instance -> Dict of primitive datatypes.
+        """
+        ret = OrderedDict()
+        fields = self._readable_fields
+
+        for field in fields:
+            try:
+                attribute = field.get_attribute(instance)
+            except SkipField:
+                continue
+            except:
+                ret[field.field_name] = None
+                continue
+
+            check_for_none = attribute.pk if isinstance(
+                attribute, PKOnlyObject
+            ) else attribute
+            if check_for_none is None:
+                ret[field.field_name] = None
+            else:
+                ret[field.field_name] = field.to_representation(attribute)
+
+        return ret
 
     def get_form(self, data=None, **kwargs):
         form = super().get_form(data=data, **kwargs)
@@ -188,7 +213,7 @@ class ComponentManyToManyRelatedField(serializers.Field):
         super().__init__(*args, **kwargs)
 
     def to_representation(self, value):
-        return [obj.pk for obj in value]
+        return [obj.pk for obj in value.all()]
 
     def to_internal_value(self, data):
         if data == [] and self.allow_blank:
@@ -198,7 +223,6 @@ class ComponentManyToManyRelatedField(serializers.Field):
 
 class ComponentSerializer(FormSerializer):
     id = ObjectSerializerMethodField()
-    controller_methods = serializers.SerializerMethodField()
     last_change = TimestampField(read_only=True)
     read_only = serializers.SerializerMethodField()
     app_widget = serializers.SerializerMethodField()
@@ -214,7 +238,6 @@ class ComponentSerializer(FormSerializer):
 
     class Meta:
         form = ComponentAdminForm
-        exclude = ('instance_methods', )
         field_mapping = {
             HiddenField: HiddenSerializerField,
             forms.TypedChoiceField: serializers.ChoiceField,
@@ -228,7 +251,7 @@ class ComponentSerializer(FormSerializer):
     def get_fields(self):
         self.set_form_cls()
 
-        ret = super(FormSerializerBase, self).get_fields()
+        ret = OrderedDict()
 
         field_mapping = reduce_attr_dict_from_instance(
             self,
@@ -245,11 +268,11 @@ class ComponentSerializer(FormSerializer):
             if field_name in getattr(self.Meta, 'exclude', []):
                 continue
 
-            # if field is already defined via declared fields
-            # skip mapping it from forms which then honors
-            # the custom validation defined on the DRF declared field
-            if field_name in ret:
-                continue
+            # # if field is already defined via declared fields
+            # # skip mapping it from forms which then honors
+            # # the custom validation defined on the DRF declared field
+            # if field_name in ret:
+            #     continue
 
             form_field = form[field_name]
 
@@ -277,7 +300,10 @@ class ComponentSerializer(FormSerializer):
             ret[field_name].initial = form_field.initial
             ret[field_name].default = form_field.initial
 
-        print("Fields: ", ret)
+        for name, field in super(FormSerializerBase, self).get_fields().items():
+            if name in ret:
+                continue
+            ret[name] = field
         return ret
 
     def _get_field_kwargs(self, form_field, serializer_field_class):

simo/fleet/controllers.py

@@ -112,7 +112,6 @@ class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
 
 
 class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
-    manual_add = False
     app_widget = NumericSensorWidget
 
     def __init__(self, *args, **kwargs):
@@ -195,6 +194,29 @@ class BasicOutputMixin:
 class Switch(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
     config_form = ColonelSwitchConfigForm
 
+    def signal(self, pulses):
+        '''
+        Expecting list of tuples where each item represents component value
+        followed by duration in miliseconds.
+        Maximum of 20 pulses is accepted, each pulse might not be longer than 3000ms
+        If you need anything longer than this, use on(), off() methods instead.
+        :param pulses: [(True, 200), (False, 600), (True, 200)]
+        :return: None
+        '''
+        assert len(pulses) > 0, "At least on pulse is expected"
+        assert len(pulses) <= 20, "No more than 20 pulses is accepted"
+        for i, pulse in enumerate(pulses):
+            assert isinstance(pulse[0], bool), f"{i+1}-th pulse is not boolean!"
+            assert pulse[1] <= 3000, "Pulses must not exceed 3000ms"
+
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            command='call', method='signal', args=[pulses],
+            id=self.component.id,
+        ).publish()
+
+
 
 class PWMOutput(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
     name = "Dimmer"

{simo-2.0.12.dist-info → simo-2.0.13.dist-info}/METADATA

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

{simo-2.0.12.dist-info → simo-2.0.13.dist-info}/RECORD

@@ -25,7 +25,7 @@ simo/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3
 simo/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR96-Adda5Z8,1353
 simo/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/core/admin.py,sha256=MoYz7B5YaTkF2JeacaqsR177N2IagKXc-rG0FTXjJ1w,17622
+simo/core/admin.py,sha256=5QFmf7ZOqkSEba2Fo-UfJp5dVe-vhKUtOUlAnfQGhno,17634
 simo/core/api.py,sha256=OVvv3a7KYJGbuUgSOfWzPg8hoCCRhdDejQ2kVs0H2p8,23803
 simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
 simo/core/api_meta.py,sha256=dZkz7z-7GaMPVAsfQxOYCvpYaMPx_v2zynbY6JM8oD8,3477
@@ -38,7 +38,7 @@ simo/core/controllers.py,sha256=2D7YCLktx7a-4tn80DenQP2CdY0dc2bWg6IRU69YTZ8,2724
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
-simo/core/forms.py,sha256=QSBxiVD-mHG6b5M9ALvSw4mKTzZb3e0TY_m7bqD152A,21686
+simo/core/forms.py,sha256=H66FJCX_OJ8ADTfFHRLLl6xEg5AsaFH59rbd2rCE2c8,21711
 simo/core/gateways.py,sha256=s_c2W0v2_te89i6LS4Nj7F2wn9UwjZXPT7pfy6SToVo,3714
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=WoQ4OX3akIvoroSYji-nLVqXBSJzCiC1u_IiWkKbKmA,2413
@@ -46,7 +46,7 @@ simo/core/middleware.py,sha256=64PYjnyRnYf4sgMvPfR0oQqf9UEtxUwnhJe3RV6z_HI,2040
 simo/core/models.py,sha256=j5AymbJFt5HOIOYsHJ8UUKhb1TvIoqgH0T1y3BeGJuM,19408
 simo/core/permissions.py,sha256=UmFjGPDWtAUbaWxJsWORb2q6BREHqndv9mkSIpnmdLk,1379
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=aiFddwjss4Zwf05S1bMcDIePNUeBDPyTtJabNrZB26c,16351
+simo/core/serializers.py,sha256=dY2R9KPvmmwMP4Up_6AHM6lf0MY3BoON8Dn8ixFubAI,17118
 simo/core/signal_receivers.py,sha256=EZ8NSYZxUgSaLS16YZdK7T__l8dl0joMRllOxx5PUt4,2809
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
@@ -56,7 +56,7 @@ simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=hlAKpAbCbqI3a-uL5tDp532T2oLFiF0MBzKUJ_SNzo0,5833
 simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=y0IW37wBUIGa3Eh_ZG28pRqHKoLiPyTgUX2OnbkEPlc,158
-simo/core/__pycache__/admin.cpython-38.pyc,sha256=GP3lRW8djW3w_k5jgzs_fuW7j8wnmeysZcDtm5RFnD0,13442
+simo/core/__pycache__/admin.cpython-38.pyc,sha256=D9Hu5xMkclP6xFjEOLB-mBOe0ZMuCF10uilsROKkvmM,13446
 simo/core/__pycache__/api.cpython-38.pyc,sha256=W-CdACWTu_ebqH52riswadzT7z2mNRZJU8HngqbYXzw,18874
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=5UTBr3rDMERAfc0OuOVDwGeQkt6Q7GLBtZJAMBse1sg,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=7dDi_Aay7T4eSNYmEItMlb7yU91-5_pzEVg8GXXf4Qc,2783
@@ -69,7 +69,7 @@ simo/core/__pycache__/controllers.cpython-38.pyc,sha256=-NjuX7iGheE_ZMqkZ6g4ZnnV
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=Wn5ZNCT5nqYUQUghSbdppYa1v4Fd8tuEcZAYDbae8wo,18215
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=ikU7wTC6vxzsCJJul0VD5qFJlpXHvvksSkwGun8tYVM,18187
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0Aav-crzie9qtfqT9U,4599
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
@@ -77,7 +77,7 @@ simo/core/__pycache__/middleware.cpython-38.pyc,sha256=bGOFJNEhJeLbpsZp8LYn1VA3p
 simo/core/__pycache__/models.cpython-38.pyc,sha256=Gm36LWRxswvWiB3Wz0F7g32ZVXugh7chSSBz1lgBPZs,16995
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=uygjPbfRQiEzyo5-McCxsuMDJLbDYO_TLu55U7bJbR0,1809
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=8N_iZ3V8E5E-el3OQQRAMANJvNrYLGWb7hy91IHVtGc,16136
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=07FzXZGZBEHlx1vboZThhU98WpmJDSbcQP3uYWNKMDw,16551
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=sgjH_wv-1U99auH5uHb3or0qettPeHAlsz8P7B03ajY,2430
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=BTkYH8QQyjqI0WOtJC8fHNtgu0YA1vjqZclXjC2vCVI,1116
@@ -10168,7 +10168,7 @@ simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 simo/fleet/auto_urls.py,sha256=X04oKJWA48wFW5iXg3PPROY2KDdHn_a99orQSE28QC4,518
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=SypK2i_-0iNNVDr9CWtjFVUmFjC81mtwpAwRUI_xH-A,19561
+simo/fleet/controllers.py,sha256=rTxRFf-LKWAZxzixrsLZHHm51BmMx9a1PLdgf6inlNM,20533
 simo/fleet/forms.py,sha256=rLymJ2ovNgmwdKYJtxTfjuIm5Q4p3GLkIb7-Yo2DmS4,36375
 simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
@@ -10184,7 +10184,7 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYe
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=SqyTuaz_kEBvx-bL46SclsZEEP5RFh6U6TGKyXDdiOE,565
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
-simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=H7RNRVGyT8ZNW3Z32sCePbALxq1huzwOroLPak2kLck,17163
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=l9bz18Qp33C12TJOKPSn9vIXnlBKnBusODNk7Fg64qA,18103
 simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=-Sbb1kBxb246hV8A2ESlR4LVEISJNedVFiOK1IzRt6c,25954
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=YAcgTOqJbtjGI03lvEcU6keFfrwAHkObVmErYzfRvjk,3569
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
@@ -10444,8 +10444,8 @@ 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.0.12.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.12.dist-info/METADATA,sha256=WO2Mt2Kexp6wdYCPQ_aw7e4ebWdaCi8ZET12OdoZIs4,1700
-simo-2.0.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.12.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.12.dist-info/RECORD,,
+simo-2.0.13.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.13.dist-info/METADATA,sha256=rwjjG5hKGMgEGunNKlhYByM46Kepk1OFgrYTcoQ5bcg,1700
+simo-2.0.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.13.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.13.dist-info/RECORD,,