simo 2.7.1__py3-none-any.whl → 2.7.3__py3-none-any.whl

simo/core/controllers.py

@@ -608,6 +608,15 @@ class Dimmer(ControllerBase, TimerMixin, OnOffPokerMixin):
         else:
             self.turn_on()
 
+    def fade_up(self):
+        raise NotImplemented()
+
+    def fade_down(self):
+        raise NotImplemented()
+
+    def fade_stop(self):
+        raise NotImplemented()
+
 
 class DimmerPlus(ControllerBase, TimerMixin, OnOffPokerMixin):
     name = _("Dimmer Plus")
@@ -689,6 +698,16 @@ class DimmerPlus(ControllerBase, TimerMixin, OnOffPokerMixin):
             self.turn_on()
 
 
+    def fade_up(self):
+        raise NotImplemented()
+
+    def fade_down(self):
+        raise NotImplemented()
+
+    def fade_stop(self):
+        raise NotImplemented()
+
+
 class RGBWLight(ControllerBase, TimerMixin, OnOffPokerMixin):
     name = _("RGB(W) Light")
     base_type = 'rgbw-light'
@@ -747,6 +766,16 @@ class RGBWLight(ControllerBase, TimerMixin, OnOffPokerMixin):
         self.send(self.component.value)
 
 
+    def fade_up(self):
+        raise NotImplemented()
+
+    def fade_down(self):
+        raise NotImplemented()
+
+    def fade_stop(self):
+        raise NotImplemented()
+
+
 class MultiSwitchBase(ControllerBase):
 
     def _validate_val(self, value, occasion=None):

simo/fleet/forms.py

@@ -306,6 +306,12 @@ class ColonelButtonConfigForm(ColonelComponentForm):
             ('up', "UP (On +5V delivery)")
         )
     )
+    btn_type = forms.ChoiceField(
+        label="Type", initial='momentary',
+        choices=(
+            ('momentary', "Momentary"), ('toggle', "Toggle")
+        )
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

simo/generic/controllers.py

@@ -33,6 +33,7 @@ from .app_widgets import (
     WeatherWidget
 )
 from .forms import (
+    DimmableLightsGroupConfigForm, SwitchGroupConfigForm,
     ThermostatConfigForm, AlarmGroupConfigForm,
     IPCameraConfigForm, WeatherForm,
     WateringConfigForm, StateSelectForm, MainStateSelectForm,
@@ -43,6 +44,17 @@ from .forms import (
 
 
 
+class DimmableLightsGroup(Dimmer):
+    name = _("Dimmable Lights Group")
+    gateway_class = GenericGatewayHandler
+    config_form = DimmableLightsGroupConfigForm
+
+
+class SwitchGroup(Switch):
+    name = _("On/Off Group")
+    gateway_class = GenericGatewayHandler
+    config_form = SwitchGroupConfigForm
+
 
 class Thermostat(ControllerBase):
     name = _("Thermostat")

simo/generic/forms.py

@@ -16,7 +16,7 @@ from simo.core.form_fields import (
     Select2ModelChoiceField, Select2ListChoiceField,
     Select2ModelMultipleChoiceField
 )
-
+from simo.core.forms import DimmerConfigForm, SwitchForm
 
 ACTION_METHODS = (
     ('turn_on', "Turn ON"), ('turn_off', "Turn OFF"),
@@ -26,6 +26,46 @@ ACTION_METHODS = (
 )
 
 
+class ControlForm(forms.Form):
+    button = Select2ModelChoiceField(
+        queryset=Component.objects.filter(base_type='button'),
+        url='autocomplete-component'
+    )
+    prefix = 'controls'
+
+
+class DimmableLightsGroupConfigForm(DimmerConfigForm):
+    slaves = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(
+            base_type__in=('dimmer', 'switch')
+        ),
+        url='autocomplete-component',
+        forward=(forward.Const(['dimmer', 'switch'], 'base_type'),),
+        required=False
+    )
+    controls = FormsetField(
+        formset_factory(
+            ControlForm, can_delete=True, can_order=True, extra=0, max_num=999
+        )
+    )
+
+
+class SwitchGroupConfigForm(SwitchForm):
+    slaves = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.filter(
+            base_type__in=('dimmer', 'switch')
+        ),
+        url='autocomplete-component',
+        forward=(forward.Const(['dimmer', 'switch'], 'base_type'),),
+        required=False
+    )
+    controls = FormsetField(
+        formset_factory(
+            ControlForm, can_delete=True, can_order=True, extra=0, max_num=999
+        )
+    )
+
+
 class ThermostatConfigForm(BaseComponentForm):
     temperature_sensor = Select2ModelChoiceField(
         queryset=Component.objects.filter(

simo/generic/gateways.py

@@ -59,6 +59,82 @@ class CameraWatcher(threading.Thread):
 
 
 
+class GroupButtonsHandler:
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.group_buttons = {}
+        self.fade_directions = {}
+
+    def watch_groups(self):
+        from .controllers import DimmableLightsGroup, SwitchGroup
+        current_group_buttons = {}
+        for group_comp in Component.objects.filter(
+            controller_uid__in=(DimmableLightsGroup.uid, SwitchGroup.uid)
+        ):
+            for ctrl in group_comp.config.get('controls', []):
+                if ctrl['button'] not in current_group_buttons:
+                    current_group_buttons[ctrl['button']] = set(group_comp.id)
+                else:
+                    current_group_buttons[ctrl['button']].add(group_comp.id)
+
+                if ctrl['button'] not in self.group_buttons:
+                    self.group_buttons[ctrl['button']] = set()
+                if group_comp.id not in self.group_buttons[ctrl['button']]:
+                    self.group_buttons[ctrl['button']].add(group_comp.id)
+                    btn = Component.objects.filter(id=ctrl['button']).first()
+                    if btn:
+                        btn.on_change(self.watch_group_button)
+
+        # remove groups and buttons that are no longer in use
+        for btn_id, groups in self.group_buttons.items():
+            if btn_id not in current_group_buttons:
+                self.group_buttons[btn_id] = set()
+                continue
+            self.group_buttons[btn_id] = current_group_buttons[btn_id]
+
+
+    def watch_group_button(self, button):
+        group_ids = self.group_buttons.get(button.id)
+        if not group_ids:
+            return
+
+        btn_type = button.config.get('btn_type', 'momentary')
+
+        if btn_type == 'momentary':
+            if button.value not in ('click', 'hold', 'up', 'double-click'):
+                return
+            for g_id in group_ids:
+                group = Component.objects.filter(id=g_id).first()
+                if not group:
+                    continue
+                if button.value == 'click':
+                    group.toggle()
+                elif button.value == 'double-click':
+                    group.send(group.config.get('max', 100))
+                elif button.value == 'down':
+                    if self.fade_directions.get(group.id, 0) < 0:
+                        self.fade_directions[group.id] = 1
+                        group.fade_up()
+                    else:
+                        self.fade_directions[group.id] = -1
+                        group.fade_down()
+                elif button.value == 'up':
+                    if self.fade_directions.get(group.id):
+                        self.fade_directions[group.id] = 0
+                        group.fade_stop()
+
+        else: # toggle
+            if button.value not in ('down', 'up'):
+                return
+            for g_id in group_ids:
+                group = Component.objects.filter(id=g_id).first()
+                if not group:
+                    continue
+                group.toggle()
+
+
+
 class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Generic"
     config_form = BaseGatewayForm
@@ -259,8 +335,8 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
         if state.config.get('away_on_no_action'):
             for sensor in Component.objects.filter(
-                    zone__instance=state.zone.instance,
-                    base_type='binary-sensor', alarm_category='security'
+                zone__instance=state.zone.instance,
+                base_type='binary-sensor', alarm_category='security'
             ):
                 if state.id not in self.sensors_on_watch:
                     self.sensors_on_watch[state.id] = {}
@@ -313,10 +389,9 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                 print(traceback.format_exc(), file=sys.stderr)
 
 
-
     def security_sensor_change(self, sensor):
         self.last_sensor_actions[
-            self.sensors_on_watch[sensor.id]
+            sensor.zone.instance.id
         ] = time.time()
 
 

{simo-2.7.1.dist-info → simo-2.7.3.dist-info}/METADATA

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

{simo-2.7.1.dist-info → simo-2.7.3.dist-info}/RECORD

@@ -70,7 +70,7 @@ simo/core/auto_urls.py,sha256=FBDclIeRp5UVWomIUbRzUgY-AoMk-r2qC2htlwKD4Lo,1106
 simo/core/autocomplete_views.py,sha256=x3MKOZvXYS3xVQ-V1S7Liv_U5bxr-uc0gePa85wv5nA,4561
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
-simo/core/controllers.py,sha256=9O5tr9rrHq3k-C__gv5le54VBCEcIyBYbSZp9-ZQk3I,36277
+simo/core/controllers.py,sha256=Js4r5SBi-61IlXN24FJtIbdD8sFIrNamObBVX3zGyuE,36786
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
@@ -103,7 +103,7 @@ simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=ib_ns5Ko8ybfrdJJWYVV1jevih
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=rZzjrxAir0HzN9uKPoXIY753f1CSdFWaSW7QBDen3qc,4448
 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=6xiOzM5B7G2mZ0s80FTVC5bbBhvosziWAD6At_wLyuc,30714
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=669Uz5CUb10fh7PHePJxLngnbOCB3Cc4skapyvEVbhs,31829
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
 simo/core/__pycache__/events.cpython-38.pyc,sha256=1y8YaZsiDkBOeIWzH7SQz4holmMG_RLlMWi8kuSZcoE,5280
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=WBBDwcDQwOmgbrRhyUxenSN80rU4Eq9jQ6RcrRGCP_o,2440
@@ -117,7 +117,7 @@ simo/core/__pycache__/models.cpython-38.pyc,sha256=po4B4bMyA-KDBu8qbVwGjrpUZJQPV
 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=xegjaPbTp71RK9pfle_vgbHiUhr4CQIq34A7RxpvNGg,19817
-simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=hz56sQNQgsXTReWvBSggmF222kB_g-17tGKSgYayVdo,4932
+simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=v-qSKC9KX--aw9-vSNX8z8HXNFr0yOII0Aw8JxrYM0U,4920
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=KqbO1cOewodVPcy0-htVefyUjCuELKV0o7fOfYqfgPc,8490
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
 simo/core/__pycache__/tasks.cpython-38.pyc,sha256=GFIC8IsQ_bK4rgNRl_oGbMCQHhbcgGS7dx-rjPcLy08,11220
@@ -10256,7 +10256,7 @@ simo/fleet/auto_urls.py,sha256=vrfrooPyY4pDuQjya-eLxCgZldfhwbEeEiXa7diO_CY,847
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=PezfOT-1N_UONSsbyTXEIyGO6Po57KdEBRv4yzk_sw0,28605
-simo/fleet/forms.py,sha256=jXeReRgXleYTFjC_BZCAtT7-MHMrgkBTXQu3rj_N3aw,66741
+simo/fleet/forms.py,sha256=cA0iqixII5k9LUqbMPWzTyvfu9SNH23ChH_Mt6C6Ggk,66913
 simo/fleet/gateways.py,sha256=C7dyapWDlJ5erYPNLkSoH50I8kj0lIXicSno0_CrdXc,5783
 simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
 simo/fleet/models.py,sha256=zPplx_v64nfKBmb-nCb74aCVtEeY3m3SjEy-VhbnydU,17511
@@ -10272,8 +10272,8 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rZ1mkfkaMBEXhi9sw_jTKdk2CPJhBNx
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=jHsvfwAumiBusr91QK1-qC-nmpPEC3r2uMGG8g0fABE,769
 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=UtuihR455FLsHFAtMBh6haJzypp_HTyo3o8kPH02gnI,24739
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=k6vnmP4eO_x60Lxm5rDDKpK-BfzNSCxiwWtDHSEboHA,45117
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=vH7mK1K4JBcLU9eKtqTJwbgB0SFMJ-s7WvO0qOsWjrg,24739
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=lNb_jc66-aO1NkYIJs4TWOX7uS8H2a8oCP-HCLJZoNY,45169
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=MIpXuGWitGNdsxJ99fWvMXJ6sVE96ac7iR4K4aM4Sds,5148
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=Vmm23zoQnS3-uS5_WJt2n3wtjhLiEhLWaYxXJCU6Gts,1339
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=AXk1Q_nnHDXirHYgM3EW5pLsrR2CaPWk4EuvGCuDUpI,14131
@@ -10376,18 +10376,18 @@ simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LS
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=y8W3jR76Hh26O9pPQyg2SophMbYIOtAWD33MPKbB8Mg,856
 simo/generic/base_types.py,sha256=u3SlfpNYaCwkVBwomWgso4ODzL71ay9MhiAW-bxgnDU,341
-simo/generic/controllers.py,sha256=bcN4xhERgDgLjvNAFi6nQjGToIiHRJliOWKK1qUY8WU,45705
-simo/generic/forms.py,sha256=yGmYWTRyFxR1N0TvY9aanzPXd1yb6FNLqOZ3Ze1p10M,21712
-simo/generic/gateways.py,sha256=j-cBvjhF__ZfxSINWzgloYD9HX5sA8thG4fBFTTHUZs,12195
+simo/generic/controllers.py,sha256=_WN2TTJ4JQWmnB-Zoew8p5J_xbbuQc-vVtXt4crS9sQ,46067
+simo/generic/forms.py,sha256=kQL8NdK_9-PxFcoPK6fMMCmtroY2Nbx_MqERgBoRg6g,22933
+simo/generic/gateways.py,sha256=x_rVCNwL7tCfL0S2lUkIMiMfaRJKgzLPi8hd_kPkVRo,15218
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-qaQ,1757
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=D9b13pbMlirgHmjDnQhfLIDGSVINoSouHb4SWOeCRrs,1642
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
-simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=QIuQdbmvrh9OfJoTDLmBgOQbbbigqhnphNTF0KwSuPw,29623
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=2k7XABbFdElGy8kIKAHHxgXnfaxeWYBp8zaOYmWoaRg,16271
-simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=yOYb5JHIDxaCOypZQnIQICn7V0yI1R9YO7nPgYRdb3E,9518
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=-QCIswFOwMP9jKONuPUcmcVEaZOzwKXfJimkUJXyBpg,30118
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=2rmamwhD9wdrW2zO73oAAbeAMZiJqGKB1lizwTRuGZs,17258
+simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=ZVlY3Fixz0s-D2hGz3-iZvvkAd7DpC6_YKDbWuVp3jY,11362
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=qJO5kvQLWhsQDOr1AtAtsAybuRWioxSkQei3Pc7rdP0,1737
@@ -10603,9 +10603,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.7.1.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.7.1.dist-info/METADATA,sha256=9DQF5eS56HxB-FA_WqJJGzA2HN1S1hxE3moxoFQmK04,1952
-simo-2.7.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.7.1.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.7.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.7.1.dist-info/RECORD,,
+simo-2.7.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.7.3.dist-info/METADATA,sha256=retVvXZoSbqPfz_EkmsP55-k3SOTce0bl-z53SLm7Os,1952
+simo-2.7.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.7.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.7.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.7.3.dist-info/RECORD,,