simo 3.0.1__py3-none-any.whl → 3.0.4__py3-none-any.whl

simo/automation/gateways.py

@@ -257,23 +257,43 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                 # however the process is actually still running
                 process.kill()
                 self.last_death = time.time()
-                self.running_scripts.pop(id, None) # no longer running for sure!
-                if not comp or comp.value != 'running':
-                    continue
-
-                if id not in self.terminating_scripts: # was not intentionaly terminated
-                    if comp:
+                # If component exists and is marked running, attempt to persist error
+                # BEFORE removing from in-memory tracking, so we can retry if DB is down.
+                if comp and comp.value == 'running' and id not in self.terminating_scripts:
+                    try:
                         tz = pytz.timezone(comp.zone.instance.timezone)
                         timezone.activate(tz)
-                    logger = get_component_logger(comp)
-                    logger.log(logging.INFO, "-------DEAD!-------")
-                    comp.value = 'error'
-                    comp.save()
+                        logger = get_component_logger(comp)
+                        logger.log(logging.INFO, "-------DEAD!-------")
+                        comp.value = 'error'
+                        comp.save()
+                    except Exception:
+                        # Leave entry in running_scripts to retry on next tick
+                        continue
+                # For any other case or after successful DB update, drop tracking entry
+                self.running_scripts.pop(id, None)
 
         if self.last_death and time.time() - self.last_death < 5:
             # give 10s air before we wake these dead scripts up!
             return
 
+        # Reconcile scripts marked as 'running' in DB but not tracked or with dead PID
+        for comp in Component.objects.filter(base_type='script', value='running'):
+            if comp.id in self.running_scripts:
+                continue
+            pid = None
+            try:
+                pid = int(comp.meta.get('pid')) if comp.meta and 'pid' in comp.meta else None
+            except Exception:
+                pid = None
+            is_pid_alive = bool(pid) and os.path.exists(f"/proc/{pid}")
+            if not is_pid_alive:
+                try:
+                    comp.value = 'error'
+                    comp.save(update_fields=['value'])
+                except Exception:
+                    pass
+
         for script in Component.objects.filter(
             base_type='script', config__keep_alive=True
         ).exclude(value__in=('running', 'stopped', 'finished')):
@@ -357,13 +377,9 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
         print("START SCRIPT %s" % str(component))
 
         if component.id in self.running_scripts:
-            # it appears that the script is running and is perfectly healthy
-            # so we make sure it has correct value, do nothing else and return!
+            # Script appears to be healthy; do nothing and return.
             if component.id not in self.terminating_scripts \
             and self.running_scripts[component.id]['proc'].is_alive():
-                if component.value != 'running':
-                    component.value = 'running'
-                    component.save()
                 return
 
             # script is in terminating state or is no longer alive
@@ -429,4 +445,4 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
             self.running_scripts.pop(component.id, None)
             logger.handlers = []
 
-        threading.Thread(target=kill, daemon=True).start()
+        threading.Thread(target=kill, daemon=True).start()

simo/fleet/controllers.py

@@ -991,6 +991,8 @@ class TempHumSensor(FleetDeviceMixin, BasicSensorMixin, BaseMultiSensor):
             ['temperature', 0, self.sys_temp_units],
             ['humidity', 20, '%'],
             ['real_feel', 0, self.sys_temp_units],
+            ['temp_raw', 0, 'C'],
+            ['hum_raw', 0, '%'],
             ['core', 0, 'C'],
             ['outside', 0, 'C']
         ]
@@ -1015,6 +1017,8 @@ class TempHumSensor(FleetDeviceMixin, BasicSensorMixin, BaseMultiSensor):
             ['temperature', temp, self.sys_temp_units],
             ['humidity', humidity, '%'],
             ['real_feel', 0, self.sys_temp_units],
+            ['temp_raw', value.get('temp_raw'), 'C'],
+            ['hum_raw', value.get('hum_raw'), '%'],
             ['core', value.get('core'), 'C'],
             ['outside', value.get('out'), 'C']
         ]
@@ -1034,6 +1038,7 @@ class AmbientLightSensor(FleetDeviceMixin, BaseNumericSensor):
     gateway_class = FleetGatewayHandler
     name = "Ambient lighting sensor"
     manual_add = False
+    default_value_units = 'lux'
     default_config = {
         'widget': 'numeric-sensor',
         'value_units': 'lux',
@@ -1045,6 +1050,7 @@ class AmbientLightSensor(FleetDeviceMixin, BaseNumericSensor):
     }
 
 
+
 class RoomPresenceSensor(FleetDeviceMixin, BaseBinarySensor):
     gateway_class = FleetGatewayHandler
     name = "Human presence sensor"
@@ -1148,6 +1154,12 @@ class RoomZonePresenceSensor(FleetDeviceMixin, BaseBinarySensor):
         ).publish()
 
 
+class SmokeDetector(FleetDeviceMixin, BaseBinarySensor):
+    name = _("Dust/pollution detector")
+    gateway_class = FleetGatewayHandler
+    manual_add = False
+
+
 class VoiceAssistant(FleetDeviceMixin, BaseBinarySensor):
     base_type = VoiceAssistantType
     name = _("AI Voice Assistant")

simo/fleet/forms.py

@@ -1815,7 +1815,7 @@ class SentinelDeviceConfigForm(BaseComponentForm):
 
         from .controllers import (
             RoomSiren, AirQualitySensor, TempHumSensor, AmbientLightSensor,
-            RoomPresenceSensor, VoiceAssistant
+            RoomPresenceSensor, VoiceAssistant, SmokeDetector
         )
 
         org_name = self.cleaned_data['name']
@@ -1827,7 +1827,8 @@ class SentinelDeviceConfigForm(BaseComponentForm):
             (TempHumSensor, 'temperature-half', 'temperature', 'climate'),
             (AmbientLightSensor, 'brightness-low', 'brightness', 'light'),
             (RoomPresenceSensor, 'person', 'presence', 'security'),
-            (VoiceAssistant, 'microphone-lines', 'voice assistant', 'other')
+            (VoiceAssistant, 'microphone-lines', 'voice assistant', 'other'),
+            (SmokeDetector, 'fire-smoke', 'dust/pollution', 'security'),
         ):
             default_icon = Icon.objects.filter(slug=icon).first()
             self.cleaned_data['icon'] = default_icon.slug if default_icon else org_icon
@@ -1847,6 +1848,7 @@ class SentinelDeviceConfigForm(BaseComponentForm):
             )
             if form.is_valid():
                 comp = form.save()
+                comp.value_units = CtrlClass.default_value_units
                 comp.config['colonel'] = colonel.id
                 comp.save()
                 last_comp = comp

simo/fleet/voice_assistant.py

@@ -65,6 +65,11 @@ class VoiceAssistantSession:
             return
         self.active = True
         self.started_ts = time.time()
+        # Ensure a fresh session starts gated until arbitration grants winner
+        try:
+            self._cloud_gate.clear()
+        except Exception:
+            pass
         # is_vo_active will be set by arbitration via open_as_winner
 
     async def on_audio_chunk(self, payload: bytes):
@@ -668,6 +673,11 @@ class VoiceAssistantSession:
         self._start_session_notified = False
         self._start_session_inflight = False
         self._prewarm_requested = False
+        # Close cloud gate so subsequent sessions don't bypass arbitration
+        try:
+            self._cloud_gate.clear()
+        except Exception:
+            pass
         for t in (self._finalizer_task, self._cloud_task, self._play_task, self._followup_task):
             if t and not t.done():
                 t.cancel()

simo/generic/controllers.py

@@ -147,7 +147,7 @@ class Thermostat(ControllerBase):
             target_temp = sorted_options[-1][1]
             for timestr, target in sorted_options:
                 start_second = int(timestr.split(':')[0]) * 3600 \
-                             + int(timestr.split(':')[1] * 60)
+                             + int(timestr.split(':')[1]) * 60
                 if start_second < current_second:
                     target_temp = target
             return target_temp
@@ -364,7 +364,7 @@ class Thermostat(ControllerBase):
             self._get_default_user_config()
         )
         self.component.save()
-        self.evaluate()
+        self._evaluate()
 
 
     def hold(self, temperature=None):

{simo-3.0.1.dist-info → simo-3.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simo
-Version: 3.0.1
+Version: 3.0.4
 Summary: Smart Home Supremacy
 Author-email: "Simon V." <simon@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -33,7 +33,6 @@ Requires-Dist: itsdangerous==2.0.1
 Requires-Dist: redis==3.5.3
 Requires-Dist: django-redis==4.12.1
 Requires-Dist: webservices==0.7
-Requires-Dist: websockets==13.1
 Requires-Dist: numpy>=1.24.4
 Requires-Dist: geopy==2.2.0
 Requires-Dist: requests>=2.26.0

{simo-3.0.1.dist-info → simo-3.0.4.dist-info}/RECORD

@@ -21,7 +21,7 @@ simo/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/automation/app_widgets.py,sha256=gaqImMZjuMHm7nIb9a4D-Y3qipz_WhSPAHXcwGx4Uzs,199
 simo/automation/controllers.py,sha256=jtoG91nYlUPW-Pkl025bBoGELWFm8SQD3duTPsjRhfk,12230
 simo/automation/forms.py,sha256=NAQUS9qrXp2d4GuvdpVyWj0Yh7vqMyX6pzs5oX4ze5Y,9800
-simo/automation/gateways.py,sha256=L97hTJJgKneBw38pQQ4UwSk26FgxVzQ5tK2eQPAK4m8,16577
+simo/automation/gateways.py,sha256=nqqiNFTYmHnwyYCM2tI-AS4gCnEFPVoJojoMo2mytVM,17383
 simo/automation/helpers.py,sha256=iP-fxxB8HsFQy3k2CjFubu86aMqvWgmh-p24DiyOrek,4330
 simo/automation/models.py,sha256=zt-jkzyq5ddqGT864OkJzCsvov2vZ0nO4ez3hAeZkXg,934
 simo/automation/serializers.py,sha256=Pg-hMaASQPB5_BTAMkfqM6z4jdHWH8xMYWOvDxIvmx8,2126
@@ -10456,8 +10456,8 @@ simo/fleet/apps.py,sha256=je8mRXMcRq4lABQZlyF2G2hOCkBUicR9I2jvrLDA8eI,238
 simo/fleet/auto_urls.py,sha256=vrfrooPyY4pDuQjya-eLxCgZldfhwbEeEiXa7diO_CY,847
 simo/fleet/base_types.py,sha256=ksJAx-BzUJzv7VvfVxRtDybypHYKPG33UedWRGTBA_4,1243
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=YD7BO1-DFPtCqZVGUDNXNx6DQD5FEiqGHB6I7Xq2nvU,41148
-simo/fleet/forms.py,sha256=1qI_SpYAmFmKfm0F18XTs8bJjRfdNVFLaDGZOtjMGhU,68840
+simo/fleet/controllers.py,sha256=BExF9Aw5hUf8JWZwuly7aPqR5pQw1V5AMAAO0JE9WLg,41516
+simo/fleet/forms.py,sha256=9qJNkItANlZdKBPAUdM00ITTKf0nzf5OTS5P9whwFyE,68994
 simo/fleet/gateways.py,sha256=fmtMwoGcJr4ZWjwYvCpYZIr2WdZ2-Lc0KtiKJtfOSQg,6747
 simo/fleet/managers.py,sha256=DKU9kv5S6dAqAHWq4OgfEOeK5IJaQW7qdCednA0NpUA,858
 simo/fleet/models.py,sha256=itSd-v-t8SXVwxXJKCpL8oYwsNeOXAOqfLAOEdM2AVQ,20558
@@ -10467,7 +10467,7 @@ simo/fleet/socket_consumers.py,sha256=PBDQphnIQFZ5ThBJmRh2Fxf_k0RITmFktQAPFftOjs
 simo/fleet/tasks.py,sha256=OYiyhrASyTgLxifhjW9Cx4IaEK6hd1bEXbPGfjIg-zY,1323
 simo/fleet/utils.py,sha256=Ev6jl2oW6Gl7O3KwPBi1LDU1gvNpARchcRI4LQZlrEo,9564
 simo/fleet/views.py,sha256=3F8im6BsSOaK3KEuBNESE4sDbS_dWHYaOdhTR4cCLjE,5189
-simo/fleet/voice_assistant.py,sha256=dkCDYyiEBXaOcmap8DgDS3UhIBahgyh08RJUFd2zlK4,40049
+simo/fleet/voice_assistant.py,sha256=pEzSLjaMIubP66ozFXaFMHJCZ-ik0oni70-2ePdg2Eg,40388
 simo/fleet/__pycache__/__init__.cpython-312.pyc,sha256=WgOt0Rf4Q4Kz0CyQn-BwX6qKyVcylu4UR1R1bqNKmA0,123
 simo/fleet/__pycache__/__init__.cpython-38.pyc,sha256=pIZE7EL6-cuJ3pQtaSwjKLrKLsTYelp1k9sRhXKLh6s,159
 simo/fleet/__pycache__/admin.cpython-312.pyc,sha256=-gV2FumLvfZJXhfeRKNI0FxYoQcIbBp_krQlRoulgQs,9997
@@ -10670,7 +10670,7 @@ simo/fleet/templates/fleet/controllers_info/RoomZonePresenceSensor.md,sha256=Nun
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=y8W3jR76Hh26O9pPQyg2SophMbYIOtAWD33MPKbB8Mg,856
 simo/generic/base_types.py,sha256=gJUJYpd_gE-f1ogzagAPA1u2TYljhyU0_SMlgGUvCVk,2318
-simo/generic/controllers.py,sha256=VbaYmK3XUK3g_M1_6p1KHsrPGQ7TNlk7rZAd5dbEMvY,53272
+simo/generic/controllers.py,sha256=oQ7mLYU-MxO4lpCQEGJA0ClIw253Ayzx3pOAFbkqC_4,53273
 simo/generic/forms.py,sha256=0RIDtLLzCkiSb9OxlioicOQW9yp1OjLKekpjbxzGVfM,26272
 simo/generic/gateways.py,sha256=9K4KkTn0rHRsRba1o8hIQFtRpRtpoL2E33Vozcy-FzM,19458
 simo/generic/models.py,sha256=59fkYowOX0imviIhA6uwupvuharrpBykmBm674rJNoI,7279
@@ -11030,9 +11030,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-3.0.1.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-3.0.1.dist-info/METADATA,sha256=mf8ahF_UG3Z9Fkfvuyj_li4r7WKICp5Ax_CCCut0DsQ,2256
-simo-3.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-3.0.1.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-3.0.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-3.0.1.dist-info/RECORD,,
+simo-3.0.4.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-3.0.4.dist-info/METADATA,sha256=97WF3o8HGc6oNgTGXMBr8SYV-6A3eiYNhpBvmbKWmbA,2224
+simo-3.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+simo-3.0.4.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-3.0.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-3.0.4.dist-info/RECORD,,