simo 2.2.2__py3-none-any.whl → 2.2.3__py3-none-any.whl

simo/core/forms.py

@@ -23,7 +23,7 @@ class HiddenField(forms.CharField):
         Hidden field used in API
     '''
     def __init__(self, *args, **kwargs):
-        super().__init__(widget=forms.HiddenInput())
+        super().__init__(widget=forms.HiddenInput(), *args, **kwargs)
 
 
 class AdminAuthenticationForm(OrgAdminAuthenticationForm):

simo/core/middleware.py

@@ -65,9 +65,8 @@ def instance_middleware(get_response):
 
         if not instance:
             if request.user.is_authenticated:
-                if len(request.user.instances) == 1:
-                    for inst in request.user.instances:
-                        instance = inst
+                if request.user.instances:
+                    instance = request.user.instances[0]
 
         if instance:
             introduce_instance(instance, request)

simo/generic/controllers.py

@@ -793,8 +793,6 @@ class Watering(ControllerBase):
             'ai_assist': True, 'soil_type': 'loamy', 'ai_assist_level': 50,
             'schedule': config_to_dict(self._get_default_schedule()),
             'estimated_moisture': 50,
-            'last_run': None,
-            'next_run': None,
         }
 
 
@@ -836,7 +834,7 @@ class Watering(ControllerBase):
     def start(self):
         self.component.refresh_from_db()
         if not self.component.value.get('program_progress', 0):
-            self.component.config['last_run'] = timezone.now().timestamp()
+            self.component.meta['last_run'] = timezone.now().timestamp()
             self.component.save()
         self.set(
             {'status': 'running_program',

simo/generic/forms.py

@@ -333,18 +333,20 @@ class AlarmBreachEventForm(forms.Form):
         if not self.cleaned_data.get('breach_action'):
             return self.cleaned_data
         component = self.cleaned_data.get('component')
-        if not hasattr(component, self.cleaned_data['breach_action']):
+        if not getattr(component, self.cleaned_data['breach_action'], None):
             self.add_error(
                 'breach_action',
                 f"{component} has no {self.cleaned_data['breach_action']} action!"
             )
         if self.cleaned_data.get('disarm_action'):
-            if not hasattr(component, self.cleaned_data['disarm_action']):
+            if not getattr(component, self.cleaned_data['disarm_action'], None):
                 self.add_error(
                     'disarm_action',
                     f"{component} has no "
                     f"{self.cleaned_data['disarm_action']} action!"
                 )
+        if not self.cleaned_data.get('uid'):
+            self.cleaned_data['uid'] = get_random_string(6)
         return self.cleaned_data
 
 
@@ -434,14 +436,6 @@ class AlarmGroupConfigForm(BaseComponentForm):
                 self.fields['is_main'].widget.attrs['disabled'] = 'disabled'
 
 
-    def clean_breach_events(self):
-        events = self.cleaned_data['breach_events']
-        for i, cont in enumerate(events):
-            if not cont.get('uid'):
-                cont['uid'] = get_random_string(6)
-        return events
-
-
     def recurse_check_alarm_groups(self, components, start_comp=None):
         for comp in components:
             check_cmp = start_comp if start_comp else comp

{simo-2.2.2.dist-info → simo-2.2.3.dist-info}/METADATA

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

{simo-2.2.2.dist-info → simo-2.2.3.dist-info}/RECORD

@@ -28,11 +28,11 @@ simo/core/dynamic_settings.py,sha256=U9pY7p_hoeD1LxobIvxZqQ7Zn_4MhYMqZvsr4O0PAYs
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
 simo/core/form_fields.py,sha256=9tIjiEN3IE55GPyB4tOlfkd51JDne3-h8pKhpL3tLFE,2220
-simo/core/forms.py,sha256=QTPEe7nxzhg8NNCQFsVJpoO1LQW6MNNTHkEhBs7keYw,21386
+simo/core/forms.py,sha256=kg_zAmEXy3lgvktOKSrIGAuWWeh5utoA8qo9varrd7c,21403
 simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
-simo/core/middleware.py,sha256=Go4DAdnXWd7i0ZEbftwfcZI5YGjZ31aQqDzWE4s676c,1970
+simo/core/middleware.py,sha256=iIwwiQ8cPqqY2timKnd7aJzhi0nQPeIbkJHyM1dR9Ok,1921
 simo/core/models.py,sha256=Mg6UjGQjA5WtxO2kq9fO-iW2f9UzDh58etcZ9-X5RSU,21570
 simo/core/permissions.py,sha256=D8JA3gdsbSfA1Lz6-AIP5ILsYYZ59_Rw4csLqVpuKuE,2928
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
@@ -56,16 +56,16 @@ simo/core/__pycache__/auto_urls.cpython-38.pyc,sha256=Tyf8PYHq5YqSwTp25Joy-eura_
 simo/core/__pycache__/autocomplete_views.cpython-38.pyc,sha256=hJ6JILI1LqrAtpQMvxnLvljGdW1v1gpvBsD79vFkZ58,3972
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=hmq22vvGyCmhbYyuV6bFAOOSIupspgW5yq_VzqWd-vY,759
 simo/core/__pycache__/context.cpython-38.pyc,sha256=MSZPDhqMhCpUuBJl3HCIBHZA3BntYeP8RAnQcdqAH9k,1278
-simo/core/__pycache__/controllers.cpython-38.pyc,sha256=hqSv7xLR6qhK-d7Ymu17aVeHfVqPkLR9IiTs646vV5E,26574
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=oGbgeiG7Jf_2YJ1819u2DRMISYsNoo3X2tY8mzorx3M,26563
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=9ge2uV4QBKdA4f2pIZp4EIGB9vY2z4IUb-UMc4ZY0I4,2384
 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__/form_fields.cpython-38.pyc,sha256=u0voKXkA64xbH6LY_-jMBHQS4mOJZZeuB9WTvtv9JWE,3433
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=gDYKULuBTMLxrKfzWXaLDbxuCJvhi2rwR5rIMC_IIVI,17672
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=euZTfdn_eWdBWok_cx6CnK_uC8Y46NsdOwkRMpXiVGE,17678
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-QWZfbkLiLlFOMtdU,4553
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
-simo/core/__pycache__/middleware.cpython-38.pyc,sha256=94jRByEYOhsIuiMgPq_oHrRKrvD8rgQw8plS0n1Mrz8,1933
+simo/core/__pycache__/middleware.cpython-38.pyc,sha256=h1aW1QlojpVM2NulRbsd3JiF-fV4euysv4e2MvcfsPc,1901
 simo/core/__pycache__/models.cpython-38.pyc,sha256=rKg-_vQ-3L3_NKbCd0HIij7Nyev1t7SOz32-6PS4Rds,17907
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=pg11ulzmKh4IeWGPIDJ-KYG-S0dKyY5lHh-S3iljb0E,2930
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
@@ -10174,7 +10174,7 @@ simo/core/utils/__pycache__/config_values.cpython-38.pyc,sha256=fqTVDhkjaWFv14Pr
 simo/core/utils/__pycache__/easing.cpython-38.pyc,sha256=LupxHv19OiBqL0VXmTbMCtAOpgvBpq_b0XwLU8El-Jk,2137
 simo/core/utils/__pycache__/form_fields.cpython-38.pyc,sha256=nBk6k9aj6BpWwdkpceIXdl5NU0fB6NPFhSBPaA-VtPs,1252
 simo/core/utils/__pycache__/form_widgets.cpython-38.pyc,sha256=MYAYEq0I4P0WErG9FamTJYWue7-cPartAWbFAiSSg5w,908
-simo/core/utils/__pycache__/formsets.cpython-38.pyc,sha256=S0ekEmo_ar_g9Jx8U1xYpYj8a133lM3jNdTcVFjf1_U,4946
+simo/core/utils/__pycache__/formsets.cpython-38.pyc,sha256=b0BuoiXFQwNgok0OWuMma8pwTC6s9c-s9yuet_YLlZk,4946
 simo/core/utils/__pycache__/helpers.cpython-38.pyc,sha256=jTGaN7kSJRwouP0EuYSaiJeMylo_RzJwSm-DKRwceHA,4291
 simo/core/utils/__pycache__/json.cpython-38.pyc,sha256=TKc88VpPKgimeaozhgx34WWJ1mwTWFWN6B9-VAH8qT0,532
 simo/core/utils/__pycache__/logs.cpython-38.pyc,sha256=BVVeQoOhfRHm3SHnCoE1d5G84kTpJZFmr_btc3jDYTU,2156
@@ -10300,8 +10300,8 @@ 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=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
-simo/generic/controllers.py,sha256=lnojSqDQ-1FArF2wH_c11y0qd906Wog-qrSG1DoqeXc,58284
-simo/generic/forms.py,sha256=IAfDtmEk1-CP0JBoetOD_ahLm64nK41GOUXjmbUzNtY,29550
+simo/generic/controllers.py,sha256=x7BQfz9wVP-QAplv_bmolOk3cmPaUKJZihvhx2CRxJs,58222
+simo/generic/forms.py,sha256=VzJJjZEuvpDEa2uObw9SkPmzQ4J_LkJ6UCNCoQImm0g,29427
 simo/generic/gateways.py,sha256=cc_q_g2HsI2_rWmr8yZ3spnMPwsgoYS5ApWRimc11wU,18831
 simo/generic/models.py,sha256=flpK2jsBFghrvRHzl6IKT-t3WZ-hNOj4ZP2vmBzx0K8,7657
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
@@ -10309,8 +10309,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=9ZnI6Z084og6Q-9fmhT-PZEM5w_yOC1rwMAHHA6af_Q,36460
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=v85YEQR9l0QyUgYW_uTKr5qFCjp8TYOAAnfYQvYActI,21227
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=ysLkKnwyh5vrhF8s7CPaz0me7HsMO4uz6vTd3SxAFig,36447
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=g-KKlxmRVWVN_mVOoXsuIGTNaVgs76BisphknIyD8vI,21071
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=8NbsLVDww3Ov5DKF--LKgyrgnrn8yVcKrY21cdvV5aA,13979
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=n3FeTMJYh4B6nCPiPKeXiWsUOOWkLHca7qTvfTK6Iik,5844
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
@@ -10505,9 +10505,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.2.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.2.2.dist-info/METADATA,sha256=Ru0FCahOkylESH_ERFdMhvY_J5YwYXMmIBsjAZvsdKY,1847
-simo-2.2.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-simo-2.2.2.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.2.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.2.2.dist-info/RECORD,,
+simo-2.2.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.2.3.dist-info/METADATA,sha256=BRSjaHYWMayEzqka-dRfmz589HhLBL-LEmrbGEXXkbk,1847
+simo-2.2.3.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+simo-2.2.3.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.2.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.2.3.dist-info/RECORD,,

{simo-2.2.2.dist-info → simo-2.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any