micrOSDevToolKit 2.9.8__py3-none-any.whl → 2.9.11__py3-none-any.whl

toolkit/dashboard_apps/uLightDemo.py

@@ -4,28 +4,23 @@ import os
 import sys
 import time
 MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
 sys.path.append(os.path.join(MYPATH, '../lib/'))
 from TerminalColors import Colors
 
-# FILL OUT
-DEVICE = 'node01'
-
-
-def base_cmd():
-    return ['--dev', DEVICE]
+try:
+    from ._app_base import AppBase
+except:
+    from _app_base import AppBase
 
+CLIENT = None
 
 def light_demo(modules, smooth=True, sample=10):
     verdict = [True, []]
     smooth_str = '[smooth]' if smooth else '[simple]'
 
-    if 'LM_rgb' in modules:
-        args = base_cmd() + [f'rgb random {smooth}'] * sample + ['rgb toggle False']
-        print(args)
+    if 'rgb' in modules:
         delta_t = time.time()
-        status_rgb, answer_rgb = socketClient.run(args)
+        status_rgb, answer_rgb =  CLIENT.run([f'rgb random {smooth}'] * sample + ['rgb toggle False'])
         delta_t = round((time.time() - delta_t) / sample, 2)
         if status_rgb:
             msg = f"{smooth_str} rgb module random color func: {Colors.OK}OK{Colors.NC} [{delta_t}sec]"
@@ -35,10 +30,9 @@ def light_demo(modules, smooth=True, sample=10):
             verdict[1].append(msg)
             verdict[0] &= False
 
-    if 'LM_cct' in modules:
-        args = base_cmd() + [f'cct random {smooth}'] * sample + ['cct toggle False']
+    if 'cct' in modules:
         delta_t = time.time()
-        status_cct, answer_cct = socketClient.run(args)
+        status_cct, answer_cct =  CLIENT.run([f'cct random {smooth}'] * sample + ['cct toggle False'])
         delta_t = round((time.time() - delta_t) / sample, 2)
         if status_cct:
             msg = f"{smooth_str} cct module random color func: {Colors.OK}OK{Colors.NC} [{delta_t}sec]"
@@ -48,10 +42,9 @@ def light_demo(modules, smooth=True, sample=10):
             verdict[1].append(msg)
             verdict[0] &= False
 
-    if 'LM_neopixel' in modules:
-        args = base_cmd() + [f'neopixel random {smooth}'] * sample + ['neopixel toggle False']
+    if 'neopixel' in modules:
         delta_t = time.time()
-        status_neo, answer_neo = socketClient.run(args)
+        status_neo, answer_neo = CLIENT.run([f'neopixel random {smooth}'] * sample + ['neopixel toggle False'])
         delta_t = round((time.time() - delta_t) / sample, 2)
         if status_neo:
             msg = f"{smooth_str} neopixel module random color func: {Colors.OK}OK{Colors.NC} [{delta_t}sec]"
@@ -63,19 +56,17 @@ def light_demo(modules, smooth=True, sample=10):
     return verdict
 
 
-def app(devfid=None):
+def app(devfid=None, pwd=None):
     """
     devfid: selected device input
         send command(s) over socket connection [socketClient.run(args)]
         list load module commands and send in single connection
     """
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
+    global CLIENT
+    CLIENT = AppBase(device=devfid, password=pwd)
 
     # Get loaded modules
-    args = base_cmd() + ['pacman module']
-    status, modules = socketClient.run(args)
+    status, modules = CLIENT.run(['modules'])
     print("status: {}\nanswer: {}".format(status, modules))
 
     if not status:

toolkit/lib/Repository.py

@@ -0,0 +1,64 @@
+import requests
+import zipfile
+import io
+import os
+
+try:
+    from .LocalMachine import CommandHandler
+except:
+    from LocalMachine import CommandHandler
+
+
+def git_clone_archive(url):
+    """
+    Clone git repo as archive (without git installed)
+    Note: No git history, it is just a snapshot
+    :param url: https://github.com/micropython/webrepl
+    """
+    print(f"CLONE ARCHIVE: {url}")
+    url = url.replace(".git", "") if url.endswith(".git") else url
+    # URL of the repository zip archive (adjust branch name if needed)
+    target_name = url.split("/")[-1].strip()
+    zip_url = f"{url}/archive/refs/heads/master.zip"
+    response = requests.get(zip_url)
+    if response.status_code == 200:
+        # Read the downloaded content as a binary stream
+        with zipfile.ZipFile(io.BytesIO(response.content)) as z:
+            for member in z.infolist():
+                # Each member's filename is something like 'webrepl-master/filename'
+                # Remove the first directory component
+                parts = member.filename.split('/', 1)
+                if len(parts) > 1:
+                    relative_path = parts[1]
+                else:
+                    relative_path = parts[0]
+
+                # Build the target path relative to the current directory
+                target_path = os.path.join(target_name, relative_path)
+
+                if member.is_dir():
+                    os.makedirs(target_path, exist_ok=True)
+                else:
+                    os.makedirs(os.path.dirname(target_path), exist_ok=True)
+                    with z.open(member) as source, open(target_path, 'wb') as target_file:
+                        target_file.write(source.read())
+        print(f"\tRepository extracted successfully: {target_name}")
+        return 0, zip_url, ""
+    print(f"\tFailed to download repository archive: {target_name}")
+    return 1, zip_url, ""
+
+
+def git_clone(url):
+    """
+    Git clone - subshell call
+    - git is needed to be preinstalled
+    """
+    print(f"GIT CLONE: {url}")
+    target_name = url.split("/")[-1].strip().replace(".git", "")
+    command = 'git clone {url} {name}'.format(name=target_name, url=url)
+    exitcode, stdout, stderr = CommandHandler.run_command(command, shell=True)
+    if exitcode == 0:
+        print(f"\tRepository was cloned successfully: {target_name}")
+    else:
+        print(f"\tRepository clone failed: {target_name}")
+    return exitcode, stdout, stderr

toolkit/lib/micrOSClient.py

@@ -280,7 +280,7 @@ class micrOSClient:
         f_delta_t = "{}[{:.2f}]{}".format(color.OKGREEN, delta_time, color.NC)
         self.dbg_print("{}[⏰] {} {}reply: {}{}".format(f_delta_t, cmd, color.BOLD, out, color.NC))
 
-        # return output list
+        # return output list or None
         return out
 
     def send_cmd_retry(self, cmd, timeout=6, retry=5, stream=False):
@@ -317,10 +317,13 @@ class micrOSClient:
                 cmd = input()               # CANNOT contain prompt - it is coming back from response data
                 # send command
                 output = self.send_cmd(cmd, timeout=timeout, stream=True)
-                if history is not None and "Shell: for hints type help." not in output:   # History: Beta feature
+                if not (history is None or output is None) and "Shell: for hints type help." not in output:   # History: Beta feature
                     history.add_history(cmd)
                 if 'Bye!' in str(output):
                     break
+                if output is None:
+                    print("Exiting... client disconnected")
+                    break
             except KeyboardInterrupt:
                 print("Exiting...")
                 break
@@ -352,8 +355,9 @@ class micrOSClient:
             verdict.append(console_msg)
             print(f"===>\t\t{console_msg}")
         self.close()
-        verdict.append(f"SINGLE CONNECTION LOAD TEST X{cnt}, AVERAGE REPLY TIME: {round(delta_t_all/cnt, 3)} sec\n")
-        return verdict
+        delta_t_result = round(delta_t_all / cnt, 3)
+        verdict.append(f"SINGLE CONNECTION LOAD TEST X{cnt}, AVERAGE REPLY TIME: {delta_t_result} sec\n")
+        return verdict, delta_t_result
 
     def __del__(self):
         if self.dbg and self.avg_reply[1] > 0:
@@ -382,9 +386,10 @@ def micros_connection_metrics(address):
             print(f"\t\t{_console_msg}")
             all_reply.append(_console_msg)
         success_rate = int(round(_success / cnt, 2) * 100)
-        all_reply.append(f"MULTI CONNECTION LOAD TEST X{cnt}, AVERAGE REPLY TIME: {round(_all_delta_t/cnt, 3)}s, "
-                         f"SERVER AVAILABILITY: {success_rate}% ({round(_all_delta_t/_success, 3)}s)")
-        return all_reply
+        delta_t_result = round(_all_delta_t/cnt, 3)
+        all_reply.append(f"MULTI CONNECTION LOAD TEST X{cnt}, AVERAGE REPLY TIME: {delta_t_result}s, "
+                         f"SERVER AVAILABILITY: {success_rate}% ({int((_all_delta_t/_success)*1000)} ms)")
+        return all_reply, delta_t_result
 
     # ---------------------------------------------------- #
     high_level_verdict = []
@@ -392,12 +397,12 @@ def micros_connection_metrics(address):
     # [1] Create micrOSClient object + Run LOAD tests
     com_obj = micrOSClient(host=address, port=9008, pwd="ADmin123", dbg=True)
     # [1.1] Run load test in one connection
-    verdict_list = com_obj.load_test()
+    verdict_list, delta_t_single_session = com_obj.load_test()
     com_obj.close()
     high_level_verdict.append(verdict_list[-1])
 
     # [2] Run multi connection load test - reconnect - raw connection (without retry)
-    verdict_multi = multi_conn_load(address)
+    verdict_multi, delta_t_multi_session = multi_conn_load(address)
     high_level_verdict.append((verdict_multi[-1]))
 
     ############################################################################
@@ -409,7 +414,7 @@ def micros_connection_metrics(address):
     for k in verdict_multi:
         print(f"\t{k}")
 
-    return high_level_verdict
+    return high_level_verdict, delta_t_single_session, delta_t_multi_session
 
 
 if __name__ == "__main__":
@@ -443,7 +448,7 @@ if __name__ == "__main__":
     print(f"noconf out: {noconf_mode}")
     if force_close: com_obj.close()
 
-    verdict = micros_connection_metrics(address=address)
+    verdict, delta_t_single, delta_t_multi = micros_connection_metrics(address=address)
     for k in verdict:
         print(f"+\t\t{k}")
 

toolkit/micrOSlint.py

@@ -172,7 +172,7 @@ def core_dep_checker(categories, verbose=True):
 def load_module_checker(categories, verbose=True):
 
     def _is_allowed(_relation):
-        _allowed_whitelist = ['Common', 'microIO', 'Types']
+        _allowed_whitelist = ['Common', 'microIO', 'Types', 'urequests']
         _allowed = []
         for _allow in _relation:
             if _allow in _allowed_whitelist:
@@ -239,7 +239,7 @@ def _run_pylint(file_name):
 
 def run_pylint(categories, verbose=True, dry_run=False):
     # ERROR CONFIG: drop error if this is in pylint output
-    error_msg_core = ['syntax-error', 'undefined-variable', 'no-member']
+    error_msg_core = ['syntax-error', 'undefined-variable', 'bad-indentation']  # 'no-member' ?
     # BYPASS 'no-member' due to duty and sleep_ms micropython functions is drops false alarm, etc.
     error_msg_lm = ['syntax-error', 'undefined-variable']
 
@@ -467,7 +467,7 @@ def short_report(categories, states, verbose=True):
     print(f"load_module_checker:                load module dependency check (no core): {c_OK if lm_dep[0] else c_NOK} {'' if lm_dep[1] == 0 else f'{lm_dep[1]}{_vis(lm_dep_diff)} warning(s)'}")
     print(f"  core pylint score:                {core_pylint}{_pyl_vis(core_score_diff)}")
     print(f"load module pylint score:           {lm_pylint}{_pyl_vis(load_score_diff)}")
-    print(f"pylint resource check (syntax):     {c_OK if pylint_check[0] else f'{c_NOK}: {pylint_check[1]}' }")
+    print(f"pylint resource check (syntax?):     {c_OK if pylint_check[0] else f'{c_NOK}: {pylint_check[1]}' }")
 
     exitcode = sum([1 for k, v in states.items() if not v[0]])
     print(f"micrOSlint verdict: {c_OK if exitcode == 0 else c_NOK}")

toolkit/simulator_lib/aioespnow.py

@@ -0,0 +1,28 @@
+
+
+class AIOESPNow:
+
+    def __init__(self):
+        self._active = False
+        self.peers_table = None
+
+    def active(self, state=None):
+        if state is not None:
+            self._active = state
+        return self._active
+
+    def stats(self):
+        pass
+
+    def add_peer(self, mac):
+        pass
+
+    async def asend(self, mac, full_msg):
+        pass
+
+    def send(self, mac, full_msg):
+        pass
+
+    def __iter__(self):
+        return (i for i in range(0, 3))
+

toolkit/socketClient.py

@@ -4,7 +4,6 @@
 import sys
 import socket
 import os
-import select
 import time
 import json
 import threading

toolkit/workspace/precompiled/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'

toolkit/dashboard_apps/AirQualityBME280.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-import time
-MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
-
-# FILL OUT
-DEVICE = 'AirQualityPro'
-
-
-def base_cmd():
-    return ['--dev', DEVICE]
-
-
-def app(devfid=None):
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
-    for k in range(0, 20):
-        args = base_cmd() + ['bme280 measure']
-        try:
-            status, answer = socketClient.run(args)
-            if status:
-                print("|- [{}/20] OK".format(k+1))
-            else:
-                print("|- [{}/20] ERR".format(k+1))
-            time.sleep(3)
-        except KeyboardInterrupt:
-            break
-
-
-if __name__ == "__main__":
-    app()

toolkit/dashboard_apps/AirQualityDHT22_CO2.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-import time
-MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.append(os.path.dirname(MYPATH))
-import socketClient
-
-# FILL OUT
-DEVICE = 'airquality'
-
-
-def base_cmd():
-    return ['--dev', DEVICE]
-
-
-def app(devfid=None):
-    global DEVICE
-    if devfid is not None:
-        DEVICE = devfid
-    for k in range(0, 20):
-        args = base_cmd() + ['dht22 measure_w_co2']
-        try:
-            status, answer = socketClient.run(args)
-            if status:
-                print("|- [{}/20] OK".format(k+1))
-            else:
-                print("|- [{}/20] ERR".format(k+1))
-            time.sleep(3)
-        except KeyboardInterrupt:
-            break
-
-
-if __name__ == "__main__":
-    app()