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

simo/core/api.py

@@ -150,9 +150,9 @@ def get_components_queryset(instance, user):
     c_ids = set()
 
     from simo.generic.controllers import WeatherForecast
-    general_components = []
+
     if instance.indoor_climate_sensor:
-        general_components.append(instance.indoor_climate_sensor_id)
+        c_ids.add(instance.indoor_climate_sensor.id)
     wf_c = Component.objects.filter(
         zone__instance=instance,
         controller_uid=WeatherForecast.uid, config__is_main=True
@@ -170,7 +170,7 @@ def get_components_queryset(instance, user):
 
     for cp in user_role.component_permissions.all():
         if cp.read:
-            c_ids.add(cp.id)
+            c_ids.add(cp.component.id)
 
     return qs.filter(id__in=c_ids)
 

simo/generic/controllers.py

@@ -108,7 +108,7 @@ class PresenceLighting(Script):
     # script specific variables
     sensors = {}
     light_org_values = {}
-    is_on = None
+    is_on = False
     turn_off_task = None
 
     def _run(self):
@@ -130,7 +130,7 @@ class PresenceLighting(Script):
             self.sensors[sensor.id] = sensor
 
         presence_values = [s.value for id, s in self.sensors.items()]
-        if self.component.config.get('act_on', 0):
+        if self.component.config.get('act_on', 0) == 0:
             must_on = any(presence_values)
         else:
             must_on = all(presence_values)
@@ -173,7 +173,7 @@ class PresenceLighting(Script):
                 comp.controller.send(self.component.config['on_value'])
             return
 
-        if self.is_on or self.is_on is None:
+        if self.is_on:
             if not additional_conditions_met:
                 return self._turn_it_off()
             if not any(presence_values):

simo/generic/forms.py

@@ -204,6 +204,10 @@ class PresenceLightingConfigForm(BaseComponentForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.basic_fields.extend(
+            ['lights', 'on_value', 'off_value', 'presence_sensors',
+             'act_on', 'hold_time', 'conditions', 'autostart', 'keep_alive']
+        )
         if self.instance.pk:
             prefix = get_script_prefix()
             if prefix == '/':
@@ -216,9 +220,6 @@ class PresenceLightingConfigForm(BaseComponentForm):
             )
 
 
-
-
-
 class ThermostatConfigForm(BaseComponentForm):
     temperature_sensor = forms.ModelChoiceField(
         Component.objects.filter(

{simo-2.0.40.dist-info → simo-2.0.42.dist-info}/METADATA

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

{simo-2.0.40.dist-info → simo-2.0.42.dist-info}/RECORD

@@ -26,7 +26,7 @@ simo/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR9
 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=xVMFl1MvQ-THwrnAVSvIkhbfbIIc4r_dDGEkpkRoSBk,17751
-simo/core/api.py,sha256=xRsKR_ZiQOVDhBHnGnraDrhmWWI3wX3el7q8XmNKshc,25063
+simo/core/api.py,sha256=X5mIaWcTDpUAghYX_6EdajWarlxa_aNvIE9MBmD-j3w,25030
 simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
 simo/core/api_meta.py,sha256=ySmmhtVrWatI3yqnYPuP5ipapmJfyfEbl32w-7_W5O4,3551
 simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
@@ -57,7 +57,7 @@ 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=1OisxqtyWMbzpgeeu5vtBW3gp3Nts4Ei4ff1P-SPpq4,13545
-simo/core/__pycache__/api.cpython-38.pyc,sha256=DE7_vjXbIZk3nV2MlLcze6dj_l-iUvHnuwGWDL5mCAM,19903
+simo/core/__pycache__/api.cpython-38.pyc,sha256=Gk9AD-MQnCRfkYzeULfZ7KiWvMxbdXhftKdcqaXhJSA,19876
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=5UTBr3rDMERAfc0OuOVDwGeQkt6Q7GLBtZJAMBse1sg,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=94T3_rybn2T1_bkaDQnQRyjy21LBaGOnz-mmkJ6T0N8,2840
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=9Es2wZNduzUJv-jZ_HX0-L3vqwpXWBbseEwoC5K6b-w,3465
@@ -10287,8 +10287,8 @@ simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6Rn
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
-simo/generic/controllers.py,sha256=lxMdbNxbvoUPctoLBz8heCOb5aAUx9k3h56Y7ByRKdg,56036
-simo/generic/forms.py,sha256=sxNl_iAgZJ5cCDcwgK0m4S7fs-O8RJutoiFeC1w_DlQ,29522
+simo/generic/controllers.py,sha256=0XwPUlhjPKLKGhcZ5cqnw9BWGLA8xHfvhfwLhw1Kip0,56020
+simo/generic/forms.py,sha256=ICr_trZ7HRe2rQUqiqLdlBorG_LjbPsfPN3Yet2Vqqs,29708
 simo/generic/gateways.py,sha256=dZQPzO23UbW9q4dEB9fqgt9Meg8mX94euXnRvfwxusY,18004
 simo/generic/models.py,sha256=92TACMhJHadAg0TT9GnARO_R3_Sl6i-GGjhG_x7YdFI,7391
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
@@ -10296,8 +10296,8 @@ simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=0IoKRG9n1tkNRRkrqAeOQwWBPd_33u98JBcVtMVVCio,2374
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7EihzvbhW9w7Y-G6kfDedU,555
-simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=HtPEtQfdbHCwO9BejEGPIsJyqyCmo7owteXE09VXZ7Y,35588
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=g4N2Zcarce0dMovJZt3TQHAhKWA1W3k2nurBg1NqHaY,21297
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=2lEaWu6jNLSQtln6a0LzS8_pZWeCTP6gR0sW6D-Yv7k,35581
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=NpAI6871-9Y9PYqkTR7drmHPjN23ejmwT3jtCkp3Oqs,21328
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=B35GiB4wBRzvd91ugL89Z3vYADiLiERP0T-21CnLqKc,13324
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=PzlZsM1jxo3FVb7QDm3bny8UFwTsGrMQe4mj4tJ06eQ,5675
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
@@ -10468,8 +10468,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.40.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.40.dist-info/METADATA,sha256=FCujXv4zFHR57h_bX2NZr6pPfjkR-iuCn8zEJ4nhI7M,1730
-simo-2.0.40.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.40.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.40.dist-info/RECORD,,
+simo-2.0.42.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.42.dist-info/METADATA,sha256=h6oS3xPAonGIQ0s2nfnaLCOCRlFbEKfP3zteddVWKng,1730
+simo-2.0.42.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.42.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.42.dist-info/RECORD,,