micrOSDevToolKit 2.8.4__py3-none-any.whl → 2.8.6__py3-none-any.whl

{micrOSDevToolKit-2.8.4.dist-info → micrOSDevToolKit-2.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.8.4
+Version: 2.8.6
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{micrOSDevToolKit-2.8.4.dist-info → micrOSDevToolKit-2.8.6.dist-info}/RECORD

@@ -129,10 +129,10 @@ micrOS/source/urequests.py,sha256=1zVeNtnIExKfsgyXSenG9BNXTzpdqNBJoTi-vsys-Yk,58
 micrOS/source/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 micrOS/source/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 micrOS/source/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-micrOSDevToolKit-2.8.4.data/scripts/devToolKit.py,sha256=CVgEETK2JwWgtEFw_dAZPEfOpAQTYZfTb6810E1j2Hg,10660
+micrOSDevToolKit-2.8.6.data/scripts/devToolKit.py,sha256=CVgEETK2JwWgtEFw_dAZPEfOpAQTYZfTb6810E1j2Hg,10660
 toolkit/DevEnvCompile.py,sha256=H19-60ZpHzP30C-wqR5QTzMDHHpWrTk0Uzh--TZHxvw,12148
 toolkit/DevEnvOTA.py,sha256=OkEtO5cpym-kEgGpE3TQbyZ-nQOzZpGzbFdbgCibe7I,25356
-toolkit/DevEnvUSB.py,sha256=BxMminjUIdkzAwFGhpHtfslTBse57zjYKaMivGbkXAI,33990
+toolkit/DevEnvUSB.py,sha256=qnMTXupUZPHa3hkT7GSCWfofE1TEM82CAs4X4Hvqgl4,34030
 toolkit/Gateway.py,sha256=F0ZyiB0wIzOdMScXZQN-ZKRTadRpmZTj_FDY91af_us,25346
 toolkit/LM_to_compile.dat,sha256=iLUISab186sbCiiocDllbZhnVnHKK_WAQcAJi7hD0y4,581
 toolkit/MicrOSDevEnv.py,sha256=Uk_eitqQAQde9AiuCtgCrxBFp-IRakYSjXyTYLaFj80,12550
@@ -174,7 +174,7 @@ toolkit/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolkit/lib/file_extensions.py,sha256=0DpayBGjKQg7y2ZGJXf5wVPnre_4C5j-7YIViNGvYz4,372
 toolkit/lib/macroScript.py,sha256=Hic98kyOR1Up18T6Lrpnnv_8bkNdocnIbiXdv6R7jrI,13854
 toolkit/lib/micrOSClient.py,sha256=T-s5vYSnMgmYOkpET_P-AIjU-7M6mmx-oALT9dNsOZc,17009
-toolkit/lib/pip_package_installer.py,sha256=QrRygkao90MVDzz3IiMIdbHbRwiSrXcmvoBuMdXmpFI,3539
+toolkit/lib/pip_package_installer.py,sha256=jpC-y1KR72_PJlqyUR6-U5b6l1szVqnIZ4nrSgUsOTM,4262
 toolkit/simulator_lib/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 toolkit/simulator_lib/IO_darwin.py,sha256=f8HOfQKJvniShvjpBe6f4nisr6oJd9SnvxPsbdNIGQk,2336
 toolkit/simulator_lib/camera.py,sha256=BIyj6dF_PoszzTZ3Ea_-gsJ3aly_xGy5NMKeJGVSbFI,1485
@@ -352,6 +352,7 @@ toolkit/workspace/precompiled/main.py,sha256=cVlhoWwU9dSKEol0HWPihFAPzrUUvzSGwZN
 toolkit/workspace/precompiled/micrOS.mpy,sha256=pOonq19sxElxlJ9_U9wF5xNZL0c0JhwnKzGnMG8rGcQ,1160
 toolkit/workspace/precompiled/micrOSloader.mpy,sha256=IH2glrM5WUvoICfIoaqKLaHF4jiADasclhv6jEGjXtk,1818
 toolkit/workspace/precompiled/microIO.mpy,sha256=M3dYO7C6W7epptY_VW4b4Evg0g8Vr0CE5U0etvkrK48,1516
+toolkit/workspace/precompiled/node_config.json,sha256=tAuB8IHyul0YDi2ZLPkFB9Atk1hn82HNHRfyAGM1mys,827
 toolkit/workspace/precompiled/reset.mpy,sha256=EHTL8NYWph5jeaqWwZ41KRwHWwCp7msGAQk203Zzo_k,214
 toolkit/workspace/precompiled/uapi.js,sha256=DlCRyA0ZJmW8BGcpHnHhpeDPdZgsLA2uPNvGzurLx4E,3024
 toolkit/workspace/precompiled/udashboard.js,sha256=42mPR_NU3jOqUgLi7yZv2L7bN6uGqw9LpScDrGGF58c,4581
@@ -359,8 +360,8 @@ toolkit/workspace/precompiled/urequests.mpy,sha256=piW1W0cQTfcXteBRGLK6G8osBIpD6
 toolkit/workspace/precompiled/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 toolkit/workspace/precompiled/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 toolkit/workspace/precompiled/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-micrOSDevToolKit-2.8.4.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-micrOSDevToolKit-2.8.4.dist-info/METADATA,sha256=ZoFyKlZU7-oslzgHineblgsy5P0mUWp2apY1sPK-enA,52937
-micrOSDevToolKit-2.8.4.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-micrOSDevToolKit-2.8.4.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
-micrOSDevToolKit-2.8.4.dist-info/RECORD,,
+micrOSDevToolKit-2.8.6.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+micrOSDevToolKit-2.8.6.dist-info/METADATA,sha256=gB-_bMWbKAlK2CkEoVZW1kAfV0QD2jacI0-dHSZKjrE,52937
+micrOSDevToolKit-2.8.6.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+micrOSDevToolKit-2.8.6.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
+micrOSDevToolKit-2.8.6.dist-info/RECORD,,

toolkit/DevEnvUSB.py

@@ -35,29 +35,29 @@ class USB(Compile):
         self.esptool_interface = self.get_valid_esptool_cmd()
         self.dev_types_and_cmds = \
             {'esp32':
-                 {'erase': '{self.esptool_interface} --port {dev} erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
+                 {'erase': '{esptool_interface} --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
                   'ampy_cmd': 'ampy -p {dev} -b 115200 -d 2 {args}',
                   'mpremote_cmd': None,
                   'cmd_line_info': '[!HINT!] PRESS [EN] BUTTON TO ENABLE DEVICE ERASE...'},
              'esp32cam':
-                  {'erase': '{self.esptool_interface} --port {dev} erase_flash',
-                   'deploy': '{self.esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
+                  {'erase': '{esptool_interface} --port {dev} erase_flash',
+                   'deploy': '{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
                    'mpremote_cmd': 'mpremote',
                    'cmd_line_info': '*** [!DISCLAIMER!] ***\n\tUSB copy not works with some serial interface\n\tCopy manually: toolkit/workspace/precompiled/micrOSloader.mpy\n\tNetwork.mpy Debug.mpy ConfigHandler.mpy main.py\n\tThen push OTA update over AP mode... Then you are done'},
              'esp32s2':
-                 {'erase': '{self.esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32s2 --port {dev} --after no_reset --baud 460800 write_flash -z 0x1000 {micropython}',
+                 {'erase': '{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32s2 --port {dev} --after no_reset --baud 460800 write_flash -z 0x1000 {micropython}',
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': '[!HINT!] Hold on Button 0 -> Press Button Reset -> Release Button 0 TO ENABLE DEVICE ERASE...'},
              'tinypico':
-                 {'erase': '{self.esptool_interface} --port {dev} erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
+                 {'erase': '{esptool_interface} --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': ''},
              'tinypico_usbc':
-                 {'erase': '{self.esptool_interface} --port {dev} erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}',
+                 {'erase': '{esptool_interface} --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}',
                   'ampy_cmd': 'ampy -p {dev} -b 115200 -d 2 {args}',
                   'mpremote_cmd': None,
                   'cmd_line_info': ''},
@@ -67,18 +67,18 @@ class USB(Compile):
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': '[!!!] Experimental device - no stable micropython yet'},
              'esp32s3_spiram_oct':
-                 {'erase': '{self.esptool_interface} --chip esp32s3 --port {dev} erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
+                 {'erase': '{esptool_interface} --chip esp32s3 --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': '[!!!] Fully automatic deployment.'},
              'esp32s3':
-                 {'erase': '{self.esptool_interface} --chip esp32s3 --port {dev} erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
+                 {'erase': '{esptool_interface} --chip esp32s3 --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': '[!!!] Fully automatic deployment.'},
              'esp32c3':
-                 {'erase': '{self.esptool_interface} --chip esp32c3 --port {dev} erase_flash',
-                  'deploy': '{self.esptool_interface} --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}',
+                 {'erase': '{esptool_interface} --chip esp32c3 --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}',
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': '[!HINT!] Fully automatic deployment...'},
              }
@@ -155,7 +155,7 @@ class USB(Compile):
 
         selected_device = self.get_devices()[0]
         print("selected_device_port: {}".format(selected_device))
-        command = erase_cmd.format(dev=selected_device)
+        command = erase_cmd.format(dev=selected_device, esptool_interface=self.esptool_interface)
         self.console("CMD: {}".format(command))
         if self.dry_run:
             exitcode = 0
@@ -189,7 +189,8 @@ class USB(Compile):
 
         selected_device = self.get_devices()[0]
         selected_micropython = self.selected_micropython_bin
-        command = deploy_cmd.format(dev=selected_device, micropython=selected_micropython)
+        command = deploy_cmd.format(dev=selected_device, micropython=selected_micropython,
+                                    esptool_interface=self.esptool_interface)
         self.console("CMD: {}".format(command))
         if self.dry_run:
             exitcode = 0

toolkit/lib/pip_package_installer.py

@@ -1,10 +1,11 @@
 import sys
-from sys import executable
 import os
 import subprocess
+import getpass
+USER = getpass.getuser()
 MYPATH = os.path.dirname(__file__)
 USER_DATA_OPT_INST_DONE = os.path.join(MYPATH, '../user_data/.opt_dep_install')
-INTERPRETER = executable
+INTERPRETER = sys.executable
 
 sys.path.append(os.path.join(MYPATH, '../'))
 from DevEnvCompile import Compile
@@ -40,21 +41,38 @@ def list_packages():
     return AVAILABLE_PACKAGES
 
 
+def run_subprocess(cmd_list: list):
+    try:
+        result = subprocess.run(
+            cmd_list,
+            capture_output=True,  # Captures stdout and stderr
+            text=True,  # Decodes output into strings
+            check=True  # Raises CalledProcessError for non-zero exit codes
+        )
+        print(f"Subprocess output: {result.stdout}")
+        return True, result.stdout
+    except subprocess.CalledProcessError as e:
+        print(f"{TerminalColors.Colors.ERR}Subprocess error:{TerminalColors.Colors.NC} {e.stderr}")
+        return False, e.stderr
+
 def install_package(name, additional_pip_param=None):
+    print(f"Install optional dependency (pip): {name}")
     try:
         if additional_pip_param is None:
-            state = subprocess.check_call([INTERPRETER, '-m', 'pip', 'install', name])
+            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', USER, name])
         else:
-            state = subprocess.check_call([INTERPRETER, '-m', 'pip', 'install', name, additional_pip_param])
+            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', USER, name, additional_pip_param])
         if state:
             print(f"{TerminalColors.Colors.OK}[PIP] install {name} OK{TerminalColors.Colors.NC}")
         else:
             print(f"{TerminalColors.Colors.WARN}[PIP] install {name} NOK{TerminalColors.Colors.NC}")
+            # Support brew installed python
+            if "This environment is externally managed" in out:
+                if "brew install" in out:
+                    print(f"Install optional dependency (brew): {name}")
+                    state, out = run_subprocess(["brew", "install", name])
     except subprocess.CalledProcessError as e:
         print(f"{TerminalColors.Colors.ERR}[PIP] error: {e}{TerminalColors.Colors.NC}")
-        if "externally-managed-environment" in str(e) and additional_pip_param is None:
-            print("|- Retry with --break-system-packages parameter")
-            return install_package(name, additional_pip_param='--break-system-packages')
         state = False
     return state
 

toolkit/workspace/precompiled/node_config.json

@@ -0,0 +1 @@
+{"irq2": false, "irq2_cbf": "n/a", "irq3_cbf": "n/a", "timirq": false, "irq4": false, "auth": false, "irq4_cbf": "n/a", "devip": "192.168.3.239", "soctout": 100, "appwd": "ADmin123", "timirqcbf": "n/a", "timirqseq": 1000, "hwuid": "micr7c9ebd6147c4OS", "staessid": "Researchers", "irq1_cbf": "n/a", "cron": false, "irq4_trig": "n/a", "nwmd": "STA", "boothook": "bme280 load; dimmer load; distance load;veml7700 load;#rencoder load", "version": "2.7.0-0", "irq_prell_ms": 300, "crontasks": "n/a", "aioqueue": 5, "utc": 60, "boostmd": true, "irq1_trig": "n/a", "guimeta": "...", "socport": 9008, "webui": false, "cstmpmap": "buzzer:23", "telegram": "5878434165:AAFqTfjh60XKlyW6Bi41yIoYkxzlrID2OWU", "irq3_trig": "n/a", "dbg": true, "irq2_trig": "n/a", "irq3": false, "devfid": "TestBird", "stapwd": "rWVc8F76Kubp", "irq1": false}