simo 2.5.2__py3-none-any.whl → 2.5.3__py3-none-any.whl

simo/core/controllers.py

@@ -695,6 +695,8 @@ class RGBWLight(ControllerBase, TimerMixin, OnOffPokerMixin):
     def _validate_val(self, value, occasion=None):
         assert 0 <= value['active'] <= 4
         assert isinstance(value['is_on'], bool)
+        if 'scenes' not in value:
+            value['scenes'] = self.component.value['scenes']
         for color in value['scenes']:
             if not is_hex_color(color):
                 raise ValidationError("Bad color value!")
@@ -704,8 +706,7 @@ class RGBWLight(ControllerBase, TimerMixin, OnOffPokerMixin):
             else:
                 if len(color) != 7:
                     raise ValidationError("Bad color value!")
-        if 'scenes' not in value:
-            value['scenes'] = self.component.value['scenes']
+
         return value
 
     def turn_off(self):

simo/core/management/update.py

@@ -10,8 +10,10 @@ HUB_DIR = '/etc/SIMO/hub'
 
 def perform_update():
 
+    pip_executable = os.path.join(os.path.dirname(sys.executable), 'pip')
+
     proc = subprocess.Popen(
-        ['pip', 'install', 'simo', '--upgrade'],
+        [pip_executable, 'install', 'simo', '--upgrade'],
         cwd=HUB_DIR, stderr=subprocess.PIPE
     )
     out, err = proc.communicate()
@@ -19,7 +21,7 @@ def perform_update():
         raise Exception(err.decode())
 
     proc = subprocess.Popen(
-        [os.path.join(HUB_DIR, 'manage.py'), 'migrate'],
+        [sys.executable, os.path.join(HUB_DIR, 'manage.py'), 'migrate'],
         cwd=HUB_DIR,
         stderr=subprocess.PIPE
     )
@@ -28,7 +30,7 @@ def perform_update():
         raise Exception(err.decode())
 
     proc = subprocess.Popen(
-        [os.path.join(HUB_DIR, 'manage.py'), 'collectstatic',
+        [sys.executable, os.path.join(HUB_DIR, 'manage.py'), 'collectstatic',
          '--noinput'],
         cwd=HUB_DIR, stderr=subprocess.PIPE
     )

simo/generic/gateways.py

@@ -145,7 +145,10 @@ class ScriptRunHandler(multiprocessing.Process):
         else:
             code = self.component.config.get('code')
             def run_code():
+                start = time.time()
                 exec(code, globals())
+                if 'class Automation:' in code and time.time() - start < 1:
+                    Automation().run()
 
             if not code:
                 self.component.value = 'finished'

{simo-2.5.2.dist-info → simo-2.5.3.dist-info}/METADATA

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

{simo-2.5.2.dist-info → simo-2.5.3.dist-info}/RECORD

@@ -43,7 +43,7 @@ simo/core/auto_urls.py,sha256=nNXEgLAAAQAhRWQDA9AbDtw-zcPKmu_pufJaSa8g818,1102
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=qVh6MrXZEfN7bFOyFftC7u0yyz0PkvpsjllLBc6SCp4,616
 simo/core/context.py,sha256=snfPIGcZQTrx8iiZc5PI91A0dRQH6y5kH4uG_lfhU6Q,1486
-simo/core/controllers.py,sha256=oSi9_QSLKcWrpZuME6C59UBYYJyI94s-8BnxzJ3BpS8,30026
+simo/core/controllers.py,sha256=JeOvn1Y4MYGkimqEB_6u3B-KwJk3qLjY63ELlFXih14,30027
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=fH6d5HcPdDqT3R7CZPdo69qTszJ23j3GJt3IFOso3WA,4757
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -76,7 +76,7 @@ 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=ck1FcBljLB4__5F6poS2tEEn8IDDgK7pU3FcXDPc_mI,1329
-simo/core/__pycache__/controllers.cpython-38.pyc,sha256=SC9P0zs6hJGXNB_1pf61UxRevUZGOooIB4IH5zk9_i4,26897
+simo/core/__pycache__/controllers.cpython-38.pyc,sha256=ycGGRvBwNsOl2obNKl5t77UK5mkn8bEU4_1dE0K_Z9k,26897
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
 simo/core/__pycache__/events.cpython-38.pyc,sha256=yip7WSyX4pUy2wJE820W4fD7iwoIWGhdHfloFb_N0R8,5257
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
@@ -147,7 +147,7 @@ simo/core/drf_braces/tests/serializers/test_enforce_validation_serializer.py,sha
 simo/core/drf_braces/tests/serializers/test_form_serializer.py,sha256=IE2xQ1SzhSsOy2BFsBYw_Po-ujKBgIuNoTRxCzhyilE,12995
 simo/core/drf_braces/tests/serializers/test_swapping.py,sha256=o-B5YV5HDxHCVrXYGODeF7lB3rPDGtafNgClx97d6w4,1220
 simo/core/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/core/management/update.py,sha256=Fj7-Zm4kvngPAE2NaUG21GOQfg86lKVtW79ZRH2sZD8,1795
+simo/core/management/update.py,sha256=t-54NN9enr10ldWRemmIHEaSQSOHqTchbZzqucm1P6s,1911
 simo/core/management/__pycache__/__init__.cpython-38.pyc,sha256=Ptf1WzljXMt3wP1tzOy6q3JfLERYDs66wSHBVdrzjHg,169
 simo/core/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
@@ -10337,7 +10337,7 @@ simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
 simo/generic/controllers.py,sha256=NQelUJhAVsPH88RRiX4D0-NBb3pwwXcF2orMVdfneic,59918
 simo/generic/forms.py,sha256=GuB-5H-GX9_2Q-YjwrHVcryTDo5CuJb3rsFG7-mMr5A,32759
-simo/generic/gateways.py,sha256=cc_q_g2HsI2_rWmr8yZ3spnMPwsgoYS5ApWRimc11wU,18831
+simo/generic/gateways.py,sha256=JaX-wVaYh3CTkryq-Lq_UQfA4JWdxY42QkchstC12Sw,18982
 simo/generic/models.py,sha256=YEAFfkARsAellfDwmmqGSx7nKkEF5XngciRB4qP1MKk,7596
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-qaQ,1757
@@ -10346,7 +10346,7 @@ simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=0IoKRG9n1tkNRRkrqAeOQ
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7EihzvbhW9w7Y-G6kfDedU,555
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=QrZsXgBvwrlGtI0PwQAl8TFDD5RAkm3mjIvfmJSpbq8,37734
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=BS9XscqbEcTPIr6kzZzpya2SCgqiGkLGXWiACt0_IFo,23316
-simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=S7p2HSbXqYcsoOjj998pwpRlA7LfHStrdxS3UhPNsP8,13979
+simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=H5cK5eNQ6P24wSmoRUKvVhkggrKEJ1UGiCkQQ5g98xI,14073
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=ES8wXkdKn0m-yaJlvhyaIOSppuX9Ckz-bOs9DCpVvaQ,5825
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=qJO5kvQLWhsQDOr1AtAtsAybuRWioxSkQei3Pc7rdP0,1737
@@ -10543,9 +10543,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.5.2.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.2.dist-info/METADATA,sha256=DhQoAz8ExP_r5-BlDxQlGX7WuNRGaOqd6u54JSTVSlU,1923
-simo-2.5.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-simo-2.5.2.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.2.dist-info/RECORD,,
+simo-2.5.3.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.3.dist-info/METADATA,sha256=twUguJgwbaneN3x1oCPaSpfAtyfKV73LVKhxPl4NW8M,1923
+simo-2.5.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+simo-2.5.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.3.dist-info/RECORD,,