micrOSDevToolKit 2.9.10__py3-none-any.whl → 2.10.2__py3-none-any.whl

micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -21,7 +21,7 @@
             1
         ],
         "Tasks.py": [
-            9.55,
+            9.38,
             12
         ],
         "Config.py": [
@@ -33,11 +33,11 @@
             0
         ],
         "Shell.py": [
-            9.11,
+            9.34,
             1
         ],
         "Notify.py": [
-            8.46,
+            9.74,
             3
         ],
         "Types.py": [
@@ -49,12 +49,12 @@
             4
         ],
         "Common.py": [
-            8.71,
+            9.78,
             34
         ],
         "InterConnect.py": [
-            9.4,
-            1
+            9.41,
+            3
         ],
         "Debug.py": [
             8.4,
@@ -65,7 +65,7 @@
             8
         ],
         "Espnow.py": [
-            8.86,
+            9.43,
             1
         ],
         "Scheduler.py": [
@@ -109,11 +109,11 @@
             0
         ],
         "LM_oled_ui.py": [
-            9.02,
+            8.64,
             0
         ],
         "LM_system.py": [
-            8.26,
+            8.19,
             5
         ],
         "LM_robustness.py": [
@@ -233,7 +233,7 @@
             0
         ],
         "LM_oledui.py": [
-            8.16,
+            7.95,
             0
         ],
         "LM_espnow.py": [
@@ -241,7 +241,7 @@
             0
         ],
         "LM_telegram.py": [
-            9.57,
+            9.58,
             0
         ],
         "LM_OV2640.py": [
@@ -261,7 +261,7 @@
             0
         ],
         "LM_light_sensor.py": [
-            8.97,
+            9.17,
             0
         ],
         "LM_rp2w.py": [
@@ -269,7 +269,7 @@
             0
         ],
         "LM_presence.py": [
-            8.77,
+            8.9,
             4
         ],
         "LM_trackball.py": [
@@ -298,7 +298,7 @@
         ],
         "LM_intercon.py": [
             8.18,
-            4
+            0
         ],
         "LM_ds18.py": [
             6.0,
@@ -315,11 +315,11 @@
     },
     "summary": {
         "core": [
-            3367,
+            3380,
             23
         ],
         "load": [
-            9061,
+            9077,
             55
         ],
         "core_dep": [
@@ -330,8 +330,8 @@
             true,
             5
         ],
-        "core_score": 9.09,
-        "load_score": 8.21,
-        "version": "2.9.9-0"
+        "core_score": 9.22,
+        "load_score": 8.2,
+        "version": "2.10.2-0"
     }
 }

micrOS/source/Common.py

@@ -2,7 +2,6 @@
 micrOS Load Module programming Official API-s
     Designed by Marcell Ban aka BxNxM
 """
-
 from Server import Server, WebCli
 from Debug import errlog_add, console_write
 from Logger import logger, log_get
@@ -126,18 +125,19 @@ def manage_task(tag, operation):
     raise Exception(f"Invalid operation: {operation}")
 
 
-def exec_cmd(cmd, skip_check=False):
+def exec_cmd(cmd, jsonify:bool=None, skip_check=False):
     """
     [LM] Single (sync) LM execution
     :param cmd: command string list
+    :param jsonify: request json output
     :param skip_check: skip cmd type check, micropython bug
     return state, output
     """
     # [BUG] Solution with isinstance/type is not reliable... micropython 1.22
     #          Invalid type, must be list: <class list>" ...
     if skip_check:
-        return lm_exec(cmd)
-    return lm_exec(cmd) if isinstance(cmd, list) else False, f"Invalid type, must be list: {type(cmd)}"
+        return lm_exec(cmd, jsonify=jsonify)
+    return lm_exec(cmd, jsonify=jsonify) if isinstance(cmd, list) else False, f"CMD {type(cmd)}, must be list!"
 
 
 def notify(text=None) -> bool:

micrOS/source/InterConnect.py

@@ -1,6 +1,6 @@
 from socket import getaddrinfo, SOCK_STREAM
 from re import compile
-import uasyncio as asyncio
+from uasyncio import open_connection
 from Debug import errlog_add
 from Config import cfgget
 from Server import Server
@@ -22,7 +22,7 @@ class InterCon:
         pattern = compile(r'^(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$')
         return bool(pattern.match(str_in))
 
-    async def send_cmd(self, host, cmd):
+    async def send_cmd(self, host:str, cmd:list):
         """
         Async Main method to implement device-device communication with
         - dhcp host resolve and IP caching
@@ -50,7 +50,7 @@ class InterCon:
         if InterCon.validate_ipv4(host):
             try:
                 # Create socket object
-                self.reader, self.writer = await asyncio.open_connection(host, InterCon.PORT)
+                self.reader, self.writer = await open_connection(host, InterCon.PORT)
                 # Send command over TCP/IP
                 output = await self.__run_command(cmd, hostname)
             except OSError as e:
@@ -72,14 +72,13 @@ class InterCon:
             errlog_add(f"[ERR][intercon] Invalid host: {host}")
         return ''
 
-    async def __run_command(self, cmd, hostname):
+    async def __run_command(self, cmd:list, hostname:str):
         """
         Implements receive data on open connection, command query and result collection
         :param cmd: command string to server socket shell
         :param hostname: hostname for prompt checking
         Return None here will trigger retry mechanism... + deletes cached IP
         """
-        cmd = str.encode(cmd)
         data, prompt = await self.__receive_data()
         if "Connection is busy. Bye!" in prompt:
             return None
@@ -87,7 +86,7 @@ class InterCon:
         if hostname is None or prompt is None or str(prompt).replace('$', '').strip() == str(hostname).split('.')[0]:
             # Run command on validated device
             # TODO: Handle multiple cmd as input, separated by ; (????)
-            self.writer.write(cmd)
+            self.writer.write(str.encode(' '.join(cmd)))
             await self.writer.drain()
             data, _ = await self.__receive_data(prompt=prompt)
             if data == '\0':
@@ -141,7 +140,7 @@ class InterCon:
         return data, prompt
 
 
-async def _send_cmd(host, cmd, com_obj):
+async def _send_cmd(host:str, cmd:list, com_obj):
     """
     Async send command wrapper for further async task integration and sync send_cmd usage (main)
     :param host: hostname / IP address
@@ -154,12 +153,12 @@ async def _send_cmd(host, cmd, com_obj):
             out = await com_obj.send_cmd(host, cmd)     # Send CMD
             if out is not None:                         # Retry mechanism
                 break
-            await asyncio.sleep_ms(100)                 # Retry mechanism
+            await com_obj.task.feed(sleep_ms=100)       # Retry mechanism
         com_obj.task.out = '' if out is None else out
     return com_obj.task.out
 
 
-def send_cmd(host, cmd):
+def send_cmd(host:str, cmd:list|str) -> dict:
     """
     Sync wrapper of async _send_cmd (InterCon.send_cmd consumer with retry)
     :param host: hostname / IP address
@@ -167,11 +166,15 @@ def send_cmd(host, cmd):
     """
     def _tagify():
         nonlocal host, cmd
-        _mod = cmd.split(' ')[0].strip()
+        _mod = cmd[0]
         if InterCon.validate_ipv4(host):
             return f"{'.'.join(host.split('.')[-2:])}.{_mod}"
         return f"{host.replace('.local', '')}.{_mod}"
 
+    # Handle legacy string input
+    if isinstance(cmd, str):
+        cmd = cmd.split()
+
     com_obj = InterCon()
     tag = f"con.{_tagify()}"
     started = com_obj.task.create(callback=_send_cmd(host, cmd, com_obj), tag=tag)
@@ -182,7 +185,7 @@ def send_cmd(host, cmd):
     return result
 
 
-def host_cache():
+def host_cache() -> dict:
     """
     Dump InterCon connection cache
     """

micrOS/source/LM_espnow.py

@@ -1,23 +1,49 @@
 import Espnow
 
 def load():
+    """
+    Initialize ESPNOW protocal
+    """
     return Espnow.initialize()
 
-def send(peer, msg='ping'):
+def send(peer, msg='modules'):
+    """
+    Send message to peer (by mac address)
+    :param peer: mac address of espnow device
+    :param msg: message string/load module call
+    """
     return Espnow.espnow_send(peer, msg)
 
 def start_server():
+    """
+    Start ESPNOW server/listener
+    - this can receive espnow messages
+    - it includes Load Module execution logic (beta)
+    """
     return Espnow.espnow_server()
 
 def stats():
+    """
+    Get ESPNOW stats
+    """
     return Espnow.stats()
 
 def add_peer(peer):
+    """
+    Add ESPNOW peer to known hosts
+    - It is needed before first send(...)
+    """
     now = Espnow.initialize()
     return Espnow.add_peer(now, peer)
 
 def mac_address():
+    """
+    Get ESPNOW compatible mac address
+    """
     return Espnow.mac_address()
 
 def help():
+    """
+    [beta] ESPNOW sender/receiver with LM execution
+    """
     return 'load', 'send <peer> "ping"', 'start_server', 'add_peer <peer>', 'stats', 'mac_address'

micrOS/source/LM_intercon.py

@@ -4,6 +4,7 @@ from Common import syslog
 
 def sendcmd(*args, **kwargs):
     """
+    [!!!] OBSOLETE - NEW SYNTAX: system top >>node01.local
     Implements send command function towards micrOS devices
         example: sendcmd "hello" host="IP/hostname.local") OR sendcmd host="IP/hostname.local" cmd="system rssi")
     :param host[0]: host IP or Hostname
@@ -34,6 +35,7 @@ def sendcmd(*args, **kwargs):
 
 def addr_cache():
     """
+    [!!!] OBSOLETE -> new command: system hosts
     Dump intercon connection cache
     :return dict: device-ip pairs
     """
@@ -46,6 +48,7 @@ def addr_cache():
 
 def help(widgets=False):
     """
+    [!!!] OBSOLETE
     [i] micrOS LM naming convention - built-in help message
     :return tuple:
         (widgets=False) list of functions implemented by this application

micrOS/source/LM_light_sensor.py

@@ -5,12 +5,8 @@ ADC.ATTN_2_5DB — the full range voltage: 1.5V
 ADC.ATTN_6DB — the full range voltage: 2.0V
 ADC.ATTN_11DB — the full range voltage: 3.3V
 """
-from Common import SmartADC, micro_task
+from Common import SmartADC, micro_task, exec_cmd
 from Types import resolve
-try:
-    import LM_intercon as InterCon
-except:
-    InterCon = None
 from microIO import bind_pin, pinmap_search
 
 
@@ -76,19 +72,15 @@ async def _task(on, off, threshold, tolerance=2, check_ms=5000):
             # TURN ON
             if percent <= threshold:
                 if on != last_ev:
-                    if InterCon is not None:
-                        host = on[0]
-                        cmd = ' '.join(on[1:])
-                        InterCon.send_cmd(host, cmd)
-                    my_task.out = f"{percent}% <= threshold: {threshold}% - ON"
+                    host = on[0]
+                    state, _ = exec_cmd(on[1:] + [f">>{host}"], jsonify=True, skip_check=True)
+                    my_task.out = f"{percent}% <= threshold: {threshold}% - ON [{'OK' if state else 'NOK'}]"
                     last_ev = on
             elif percent > threshold+tolerance:     # +tolerance to avoid "on/off/on/off" on threshold limit
                 if off != last_ev:
-                    if InterCon is not None:
-                        host = off[0]
-                        cmd = ' '.join(off[1:])
-                        InterCon.send_cmd(host, cmd)
-                    my_task.out = f"{percent}% > threshold: {threshold+tolerance}% - OFF"
+                    host = off[0]
+                    state, _ = exec_cmd(off[1:] + [f">>{host}"], jsonify=True, skip_check=True)
+                    my_task.out = f"{percent}% > threshold: {threshold+tolerance}% - OFF [{'OK' if state else 'NOK'}]"
                     last_ev = off
             await my_task.feed(sleep_ms=check_ms)   # Sample every <check_ms> sec
 

micrOS/source/LM_oled_ui.py

@@ -7,13 +7,9 @@ from Common import syslog, exec_cmd, manage_task
 from machine import Pin
 from Types import resolve
 try:
-    from LM_system import memory_usage
+    from LM_system import memory_usage, hosts
 except:
     memory_usage = None         # Optional function handling
-try:
-    import LM_intercon as InterCon
-except:
-    InterCon = None             # Optional function handling
 try:
     from LM_gameOfLife import next_gen as gol_nextgen, reset as gol_reset
 except:
@@ -228,6 +224,7 @@ class PageUI:
                         self.page_callback_list[self.active_page]()             # <== Execute page functions
                 except Exception as e:
                     PageUI.PAGE_UI_OBJ.show_msg = f"Err: {e}"                   # Show page error in msgbox
+                    syslog(f"oled_ui render error: {e}")
             PageUI.DISPLAY.show()
             self.__power_save()
         else:
@@ -322,7 +319,7 @@ class PageUI:
     #####################################
     #           PAGE GENERATORS         #
     #####################################
-    def intercon_page(self, host, cmd, run=False):
+    def intercon_page(self, host:str, cmd:list, run=False):
         """Generic interconnect page core - create multiple page with it"""
         posx, posy = 5, 12
 
@@ -331,10 +328,13 @@ class PageUI:
             self.open_intercons.append(host)
             try:
                 # Send CMD to other device & show result
-                data_meta = InterCon.send_cmd(host, cmd)
-                self.cmd_task_tag = data_meta['tag']
-                if "Task is Busy" in data_meta['verdict'] and not run:
-                    self.cmd_out = data_meta['verdict']     # Otherwise the task start output not relevant on UI
+                state, data_meta = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
+                if state:
+                    self.cmd_task_tag = data_meta['tag']
+                    if "Task is Busy" in data_meta['verdict'] and not run:
+                        self.cmd_out = data_meta['verdict']     # Otherwise the task start output not relevant on UI
+                else:
+                    self.cmd_out = f"Error: {data_meta}"
             except Exception as e:
                 self.cmd_out = str(e)
             self.open_intercons.remove(host)
@@ -344,7 +344,7 @@ class PageUI:
             return
         # Draw host + cmd details
         PageUI.DISPLAY.text(host, 0, posy)
-        PageUI.DISPLAY.text(cmd, posx, posy+10)
+        PageUI.DISPLAY.text(' '.join(cmd), posx, posy+10)
         # Update display output with retrieved task result (by TaskID)
         if self.cmd_task_tag is not None:
             task_buffer = manage_task(self.cmd_task_tag, 'show').replace(' ', '')
@@ -373,7 +373,7 @@ class PageUI:
             try:
                 cmd_list = cmd.strip().split()
                 # Send CMD to other device & show result
-                state, out = exec_cmd(cmd_list)
+                state, out = exec_cmd(cmd_list, skip_check=True)
                 try:
                     self.cmd_out = ''.join(out.strip().split()).replace(' ', '')
                 except Exception:
@@ -409,13 +409,12 @@ def _sys_page():
 
 
 def _intercon_cache(line_limit=3):
-    if InterCon is None:
-        return False
     line_start = 15
     line_cnt = 1
     PageUI.DISPLAY.text("InterCon cache", 0, line_start)
-    if sum([1 for _ in InterCon.host_cache()]) > 0:
-        for key, val in InterCon.host_cache().items():
+    cache = hosts()["intercon"]
+    if sum([1 for _ in cache]) > 0:
+        for key, val in cache.items():
             key = key.split('.')[0]
             val = '.'.join(val.split('.')[-2:])
             PageUI.DISPLAY.text(f" {val} {key}", 0, line_start+(line_cnt*10))
@@ -502,7 +501,7 @@ def msgbox(msg='micrOS msg'):
     return 'Show msg'
 
 
-def intercon_genpage(cmd=None, run=False):
+def intercon_genpage(cmd:str=None, run=False):
     """
     Create intercon pages dynamically :)
     - based on cmd value.
@@ -512,7 +511,7 @@ def intercon_genpage(cmd=None, run=False):
     """
     raw = cmd.split()
     host = raw[0]
-    cmd = ' '.join(raw[1:])
+    cmd = raw[1:]
     try:
         # Create page for intercon command
         PageUI.PAGE_UI_OBJ.add_page(lambda: PageUI.PAGE_UI_OBJ.intercon_page(host, cmd, run=run))
@@ -522,7 +521,7 @@ def intercon_genpage(cmd=None, run=False):
     return True
 
 
-def cmd_genpage(cmd=None, run=False):
+def cmd_genpage(cmd:str=None, run=False):
     """
     Create load module execution pages dynamically :)
     - based on cmd value: load_module function (args)
@@ -530,9 +529,6 @@ def cmd_genpage(cmd=None, run=False):
     :param run: run button event at page init: True/False
     :return: page creation verdict
     """
-    if not isinstance(cmd, str):
-        return False
-
     try:
         # Create page for intercon command
         PageUI.PAGE_UI_OBJ.add_page(lambda: PageUI.PAGE_UI_OBJ.cmd_call_page(cmd, run=run))

micrOS/source/LM_oledui.py

@@ -4,13 +4,8 @@ from Types import resolve
 # Core modules
 from Config import cfgget
 from Time import uptime
-
 # Load Modules
-from LM_system import top, memory_usage, ifconfig, rssi as sta_rssi, list_stations
-try:
-    import LM_intercon as InterCon
-except:
-    InterCon = None             # Optional function handling
+from LM_system import top, memory_usage, ifconfig, rssi as sta_rssi, list_stations, hosts
 try:
     from LM_esp32 import temp as cpu_temp
 except Exception as e:
@@ -785,10 +780,13 @@ class PageUI:
             # Check open host connection
             try:
                 # Send CMD to other device & show result
-                data_meta = InterCon.send_cmd(host, cmd)
-                self._cmd_task_tag = data_meta['tag']
-                if "Task is Busy" in data_meta['verdict'] and not run:
-                    self.app_frame.press_output = data_meta['verdict']     # Otherwise the task start output not relevant on UI
+                state, data_meta = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
+                if state:
+                    self._cmd_task_tag = data_meta['tag']
+                    if "Task is Busy" in data_meta['verdict'] and not run:
+                        self.app_frame.press_output = data_meta['verdict']     # Otherwise the task start output not relevant on UI
+                else:
+                    self.app_frame.press_output = f"Error: {data_meta}"
             except Exception as e:
                 self.app_frame.press_output = str(e)
 
@@ -803,7 +801,7 @@ class PageUI:
                     self._cmd_task_tag = None
             PageUI.write_lines(self.app_frame.press_output, display, x, y + 20, line_limit=2)
 
-        PageUI.write_lines(f"{host.split(".")[0]}:{cmd}", display, x, y, line_limit=2)
+        PageUI.write_lines(f"{host.split(".")[0]}:{' '.join(cmd)}", display, x, y, line_limit=2)
         if run:
             if self._cmd_task_tag is None:
                 _execute(display, w, h, x, y)
@@ -829,14 +827,13 @@ def _system_page(display, w, h, x, y):
     return True
 
 def _intercon_nodes_page(display, w, h, x, y):
-    if InterCon is None:
-        return False
     line_limit = 3
     line_start = y+5
     line_cnt = 1
     display.text("InterCon cache", x, line_start)
-    if sum([1 for _ in InterCon.host_cache()]) > 0:
-        for key, val in InterCon.host_cache().items():
+    cache = hosts()["intercon"]
+    if sum([1 for _ in cache]) > 0:
+        for key, val in cache.items():
             key = key.split('.')[0]
             val = '.'.join(val.split('.')[-2:])
             display.text(f" {val} {key}", x, line_start + (line_cnt * 10))
@@ -934,7 +931,7 @@ def intercon_genpage(cmd=None, run=False):
     """
     raw = cmd.split()
     host = raw[0]
-    cmd = ' '.join(raw[1:])
+    cmd = raw[1:]
     try:
         # Create page for intercon command
         PageUI.INSTANCE.add_page(lambda display, w, h, x, y: PageUI.INSTANCE.intercon_exec_page(host, cmd, run, display, w, h, x, y))

micrOS/source/LM_presence.py

@@ -1,10 +1,7 @@
 from microIO import bind_pin, pinmap_search
-from Common import SmartADC, micro_task, notify, syslog
+from Common import SmartADC, micro_task, notify, syslog, exec_cmd
 from utime import ticks_ms
-try:
-    import LM_intercon as InterCon
-except:
-    InterCon = None
+
 
 class Data:
     TASK_TAG = 'presence._capture'
@@ -68,9 +65,9 @@ def __run_intercon(state):
         try:
             cmd = Data.ON_INTERCON_CLBK.split()
             host = cmd[0]
-            cmd = ' '.join(cmd[1:])
-            # Send CMD to other device & show result
-            InterCon.send_cmd(host, cmd)
+            cmd = cmd[1:]
+            # Send CMD to other device
+            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
         except Exception as e:
             syslog(f"__run_intercon error: {e}")
     if state.lower() == "off":
@@ -79,9 +76,9 @@ def __run_intercon(state):
         try:
             cmd = Data.OFF_INTERCON_CLBK.split()
             host = cmd[0]
-            cmd = ' '.join(cmd[1:])
-            # Send CMD to other device & show result
-            InterCon.send_cmd(host, cmd)
+            cmd = cmd[1:]
+            # Send CMD to other device
+            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
         except Exception as e:
             syslog(f"__run_intercon error: {e}")
 

micrOS/source/LM_system.py

@@ -212,14 +212,15 @@ def ifconfig():
     return network_config()
 
 
-def urequest_hosts():
+def hosts():
     """
-    Debug function for urequests address caching
-    - returns all known http(s) host addresses
-    - cache only in memory
+    Dump cached hosts
+    - urequests (only memory cache)
+    - intercon connection cache
     """
     from urequests import host_cache
-    return host_cache()
+    from InterConnect import host_cache as ihost_cache
+    return {"urequests": host_cache(), "intercon":  ihost_cache()}
 
 
 def notifications(enable=None):
@@ -246,4 +247,4 @@ def help(widgets=False):
                     'ntp', 'rssi', 'list_stations', 'pinmap key="dhtpin"/None', 'alarms clean=False',
                     'notifications enable=<None,True,False>',
                     'sun refresh=False', 'ifconfig', 'memory_usage',
-                    'disk_usage', 'urequest_hosts'), widgets=widgets)
+                    'disk_usage', 'hosts'), widgets=widgets)