micrOSDevToolKit 2.9.4__tar.gz → 2.9.7__tar.gz

{microsdevtoolkit-2.9.4/micrOSDevToolKit.egg-info → microsdevtoolkit-2.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.9.4
+Version: 2.9.7
 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.9.4 → microsdevtoolkit-2.9.7}/devToolKit.py

@@ -10,8 +10,9 @@ if len(sys.argv) > 1 and sys.argv[1] in ['light', '--light']:
 else:
     # INSTALL OPTIONAL DEPENDENCIES - PIP HACK
     from toolkit.lib import pip_package_installer as pip_install
-    pip_install.install_optional_dependencies(['PyQt5', 'opencv-python', 'PyAudio', 'mpy-cross==1.20.0', 'matplotlib'])
-
+    pip_install.install_optional_dependencies(['PyQt5', 'opencv-python', 'PyAudio', 'mpy-cross==1.24.1.post2', 'matplotlib'])
+    if sys.platform.startswith("win"):
+        pip_install.install_optional_dependencies(['pyreadline3'])
 
 # NORMAL CODE ...
 MYPATH = os.path.dirname(__file__)

{microsdevtoolkit-2.9.4 → microsdevtoolkit-2.9.7}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -13,11 +13,11 @@
             1
         ],
         "Server.py": [
-            9.5,
+            9.51,
             3
         ],
         "Web.py": [
-            9.25,
+            9.26,
             1
         ],
         "Tasks.py": [
@@ -25,11 +25,11 @@
             12
         ],
         "Config.py": [
-            9.49,
+            9.48,
             17
         ],
         "reset.py": [
-            8.75,
+            10.0,
             0
         ],
         "Shell.py": [
@@ -45,7 +45,7 @@
             29
         ],
         "Logger.py": [
-            8.75,
+            8.85,
             4
         ],
         "Common.py": [
@@ -73,7 +73,7 @@
             1
         ],
         "microIO.py": [
-            9.26,
+            9.38,
             42
         ],
         "micrOS.py": [
@@ -89,7 +89,7 @@
             0
         ],
         "urequests.py": [
-            8.79,
+            9.02,
             5
         ],
         "LM_roboarm.py": [
@@ -100,6 +100,10 @@
             8.9,
             1
         ],
+        "LM_pacman.py": [
+            8.94,
+            0
+        ],
         "LM_genIO.py": [
             9.19,
             0
@@ -109,7 +113,7 @@
             0
         ],
         "LM_system.py": [
-            8.36,
+            8.26,
             5
         ],
         "LM_robustness.py": [
@@ -121,7 +125,7 @@
             0
         ],
         "LM_rest.py": [
-            7.78,
+            7.95,
             0
         ],
         "LM_oled.py": [
@@ -237,7 +241,7 @@
             0
         ],
         "LM_telegram.py": [
-            9.53,
+            9.57,
             0
         ],
         "LM_OV2640.py": [
@@ -284,10 +288,6 @@
             8.57,
             0
         ],
-        "LM_lmpacman.py": [
-            8.38,
-            0
-        ],
         "LM_gameOfLife.py": [
             9.29,
             3
@@ -315,11 +315,11 @@
     },
     "summary": {
         "core": [
-            3274,
+            3305,
             23
         ],
         "load": [
-            8939,
+            9060,
             55
         ],
         "core_dep": [
@@ -330,8 +330,8 @@
             true,
             6
         ],
-        "core_score": 9.06,
-        "load_score": 8.22,
-        "version": "2.9.4-0"
+        "core_score": 9.13,
+        "load_score": 8.23,
+        "version": "2.9.7-0"
     }
 }

{microsdevtoolkit-2.9.4 → microsdevtoolkit-2.9.7}/micrOS/source/Config.py

@@ -12,9 +12,9 @@ Designed by Marcell Ban aka BxNxM
 #################################################################
 #                           IMPORTS                             #
 #################################################################
-from os import remove
 from re import search
 from json import load, dump
+from uos import remove
 from utime import sleep
 from Debug import DebugCfg, console_write, errlog_add
 try:
@@ -25,7 +25,11 @@ except:
 
 
 class Data:
-    # micrOS config path
+    """
+    Data class for managing configuration data.
+    """
+    __slots__ = []
+
     CONFIG_PATH = "node_config.json"
     CONFIG_CACHE = {"version": "n/a",
                     "auth": False,
@@ -145,20 +149,16 @@ class Data:
         value_in_cfg = Data.CONFIG_CACHE[key]
         try:
             if isinstance(value_in_cfg, bool):
-                del value_in_cfg
                 if str(value).lower() == 'true':
                     return True
                 if str(value).lower() == 'false':
                     return False
                 raise Exception("type_handler type handling error")
             if isinstance(value_in_cfg, str):
-                del value_in_cfg
                 return str(value)
             if isinstance(value_in_cfg, int):
-                del value_in_cfg
                 return int(value)
             if isinstance(value_in_cfg, float):
-                del value_in_cfg
                 return float(value)
         except Exception as e:
             console_write(f"Input value type error! {e}")

microsdevtoolkit-2.9.7/micrOS/source/LM_pacman.py

@@ -0,0 +1,248 @@
+from uos import listdir, remove, stat
+from sys import modules
+from Common import socket_stream
+
+WEB_EXT = ('html', 'js', 'css')
+DATA_TYPES = ('log', 'pds', 'dat')
+
+def _is_app_resource(path='/'):
+    if stat(path)[0] & 0x4000:      # Dir check
+        return True, 'd'
+    file_name = path.split("/")[-1]
+    if file_name.startswith('LM_') or file_name.split('.')[-1] in WEB_EXT + DATA_TYPES:
+        return True, 'f'
+    return False, '?'
+
+
+#############################################
+#     Safe file system handler functions    #
+#############################################
+
+def ls(path="/", content='*', raw=False):
+    """
+    Linux like ls command - list app resources and app folders
+    :param path: path to list, default: /
+    :param content: content type, default all, f-file, d-dir can be selected
+    :param raw: keep raw output [(is_app, type), ...]
+    """
+    path = path if path.endswith('/') else f"{path}/"
+    items = []
+    for item in listdir(path):
+        is_app, item_type = _is_app_resource(path + item)
+        if is_app and (content == "*" or item_type == content):
+            items.append((item_type, item))
+    if raw:
+        return items
+    formatted_output = ""
+    i = 0
+    for f in items:
+        i += 1
+        spacer = " " * (4 - len(str(i)))
+        formatted_output += f"{i}{spacer}{f[0]}   {f[1]}\n"
+    return formatted_output
+
+
+def rm(path):
+    """
+    Linux like rm command - delete app resources and folders
+    :param path: app resource name/path, ex.: LM_robustness.py
+    """
+    if 'pacman.' in path or 'system.' in path or "/" == path.strip():
+        return f'Load module {path} is protected, skip delete.'
+    is_app, item_type = _is_app_resource(path)
+    if is_app:
+        remove(path)
+        return f"Remove: {path} {'dir' if item_type == 'd' else 'file'}"
+    return f"Invalid path {path}"
+
+
+def dirtree(path="/", raw=False):
+    """Return only directories from a given path."""
+    path = path if path.endswith('/') else f"{path}/"
+    folders = [f"{path}/{item}" for item in listdir(path) if _is_app_resource(f"{path}{item}")[1] == 'd']
+    folder_contents = {folder:listdir(folder) for folder in folders}
+    if raw:
+        return folder_contents
+    formatted_output = ""
+    for k, v in folder_contents.items():
+        formatted_output += f"{k}\n"
+        for val in v:
+            formatted_output += f"\t{val}\n"
+    return formatted_output
+
+
+def download(url=None, package=None):
+    """
+    [BETA] Load Module downloader with mip
+    :param url: github url path, ex. BxNxM/micrOS/master/toolkit/workspace/precompiled/LM_robustness.py
+    :param package: mip package name or raw url (hack)
+    """
+    if url is None and package is None:
+        return "Nothing to download, url=None package=None"
+    if package is None:
+        base_url = "https://raw.githubusercontent.com/"
+        file_name = url.split("/")[-1]
+        if not(file_name.endswith("py") and file_name.startswith("LM_")):
+            return "Invalid file name in url ending, hint: /LM_*.mpy or /LM_*.py"
+        # Convert GitHub URL to raw content URL
+        if "github.com" in url and "blob" in url:
+            url = url.replace("https://github.com/", base_url).replace("/blob", "")
+        else:
+            url = f"{base_url}{url}"
+    else:
+        url = package
+    from mip import install
+    verdict = ""
+    try:
+        verdict += f"Install {url}\n"
+        install(url)
+        verdict += "\n|- Done"
+    except Exception as e:
+        verdict += f"|- Cannot install: {url}\n{e}"
+    return verdict
+
+
+def del_duplicates():
+    """
+    Load module package manager (Not just load modules)
+    - delete duplicated .mpy and .py resources, keep .mpy resource!
+    """
+    msg_buf = []
+    py = list((res.split('.')[0] for res in listdir() if res.endswith('.py')))       # Normally smaller list
+    mpy = (res.split('.')[0] for res in listdir() if res.endswith('.mpy'))
+    for m in mpy:
+        # Iterate over mpy resources
+        state = True
+        if m in py and m != 'main':
+            to_delete = f'{m}.py'
+            try:
+                remove(to_delete)
+            except:
+                state = False
+            msg_buf.append(f'   Delete {to_delete} {state}')
+    return '\n'.join(msg_buf) if len(msg_buf) > 0 else 'Nothing to delete.'
+
+
+def moduls(unload=None):
+    """
+    List / unload loaded upython Load Modules
+    :param unload: module name to unload
+    :param unload: None - list active modules
+    :return str: verdict
+    """
+    if unload is None:
+        return list(modules.keys())
+    if unload in modules.keys():
+        del modules[unload]
+        return f"Module unload {unload} done."
+    return f"Module unload {unload} failed."
+
+
+@socket_stream
+def cachedump(delpds=None, msgobj=None):
+    """
+    Cache system persistent data storage files (.pds)
+    :param delpds: cache name to delete
+    """
+    if delpds is None:
+        # List pds files aka application cache
+        msg_buf = []
+        for pds in (_pds for _pds in listdir() if _pds.endswith('.pds')):
+            with open(pds, 'r') as f:
+                if msgobj is None:
+                    msg_buf.append(f'{pds}: {f.read()}')
+                else:
+                    msgobj(f'{pds}: {f.read()}')
+        return msg_buf if len(msg_buf) > 0 else ''
+    # Remove given pds file
+    try:
+        remove(f'{delpds}.pds')
+        return f'{delpds}.pds delete done.'
+    except:
+        return f'{delpds}.pds not exists'
+
+
+def dat_dump():
+    """
+    Generic .dat file dump
+    - logged data from LMs, sensor datat, etc...
+    """
+    logs_dir = "/logs/"
+    dats = (f for f in listdir(logs_dir) if f.endswith('.dat'))
+    out = {}
+    for dat in dats:
+        with open(f"{logs_dir}{dat}", 'r') as f:
+            out[dat] = f.read()
+    return out
+
+#############################################
+#              Legacy features              #
+#############################################
+
+
+@socket_stream
+def listmods(msgobj=None):
+    """
+    Load module package manager
+    - list all load modules
+    """
+    # Dump available LMs
+    msg_buf = []
+    for k in (res.replace('LM_', '') for res in listdir("/")
+              if res.startswith('LM_') or res.split('.')[-1] in WEB_EXT):
+        if msgobj is None:
+            msg_buf.append(f'   {k}')
+        else:
+            msgobj(f'   {k}')
+    return msg_buf if len(msg_buf) > 0 else ''
+
+
+def delmod(mod=None):
+    """
+    Module package manager
+    :param mod:
+        Delete Load Module with full name: module.py or module.mpy
+        OR delete any web resource: *.js, *.css, *.html
+    """
+    if mod is not None and (mod.endswith('py') or mod.split('.')[-1] in WEB_EXT):
+        # LM exception list - system and pacman cannot be deleted
+        if 'pacman.' in mod or 'system.' in mod:
+            return f'Load module {mod} is in use, skip delete.'
+        try:
+            to_remove = mod if mod.split('.')[-1] in WEB_EXT else f'LM_{mod}'
+            remove(to_remove)
+            return f'Delete module: {mod}'
+        except Exception as e:
+            return f'Cannot delete: {mod}: {e}'
+    return f'Invalid value: {mod}'
+
+
+@socket_stream
+def micros_checksum(msgobj=None):
+    from hashlib import sha1
+    from binascii import hexlify
+    from Config import cfgget
+
+    for f_name in (_pds for _pds in listdir() if _pds.endswith('py')):
+        with open(f_name, 'rb') as f:
+            cs = hexlify(sha1(f.read()).digest()).decode('utf-8')
+        msgobj(f"{cs} {f_name}")
+    # GC collect?
+    return f"micrOS version: {cfgget('version')}"
+
+
+def help(widgets=False):
+    """
+    [i] micrOS LM naming convention - built-in help message
+    :return tuple:
+        (widgets=False) list of functions implemented by this application
+        (widgets=True) list of widget json for UI generation
+    """
+    return ('listmods', 'delmod mod=<module>.py/.mpy or .js/.html/.css', 'del_duplicates',
+            'moduls unload="LM_rgb/None"',
+            'cachedump delpds="rgb/None"',
+            'dat_dump',
+            'download url="BxNxM/micrOS/master/toolkit/workspace/precompiled/LM_robustness.py"',
+            'micros_checksum',
+            'ls path="/" content="*/f/d"',
+            'rm <path>', 'dirtree path="/"')

{microsdevtoolkit-2.9.4 → microsdevtoolkit-2.9.7}/micrOS/source/LM_rest.py

@@ -1,4 +1,3 @@
-import uasyncio as asyncio
 from urequests import get as http_get
 from urequests import aget as http_aget
 from Common import micro_task

{microsdevtoolkit-2.9.4 → microsdevtoolkit-2.9.7}/micrOS/source/LM_robustness.py

@@ -9,8 +9,8 @@ def raise_error(msgobj=None):
     """
     if msgobj is not None:
         msgobj("Raise test exception")
-    syslog('Robustness TeSt ErRoR')
-    raise Exception("Test exception")
+    state = syslog('Robustness TeSt ErRoR')
+    raise Exception(f"Test exception: {'OK' if state else 'NOK'}")
 
 
 @socket_stream

{microsdevtoolkit-2.9.4 → microsdevtoolkit-2.9.7}/micrOS/source/LM_system.py

@@ -1,4 +1,4 @@
-from os import statvfs, getcwd, listdir, uname
+from uos import statvfs, getcwd, listdir, uname
 from utime import localtime
 from network import WLAN, STA_IF, AP_IF
 from binascii import hexlify
@@ -190,6 +190,7 @@ def pinmap(keys='builtin irq1 irq2 irq3 irq4'):
     map["search"] = pinmap_search(keys)
     return map
 
+
 @socket_stream
 def alarms(clean=False, msgobj=None):
     """
@@ -204,19 +205,6 @@ def alarms(clean=False, msgobj=None):
     return {'NOK alarm': errcnt} if errcnt > 0 else {'OK alarm': errcnt}
 
 
-def dat_dump():
-    """
-    Generic .dat file dump
-    - logged data from LMs
-    """
-    dats = (f for f in listdir() if f.endswith('.dat'))
-    out = {}
-    for dat in dats:
-        with open(dat, 'r') as f:
-            out[dat] = f.read()
-    return out
-
-
 def ifconfig():
     """
     Show network ifconfig
@@ -224,7 +212,7 @@ def ifconfig():
     return network_config()
 
 
-def urequests_host_cache():
+def urequest_hosts():
     """
     Debug function for urequests address caching
     - returns all known http(s) host addresses
@@ -258,4 +246,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', 'dat_dump', 'urequests_host_cache'), widgets=widgets)
+                    'disk_usage', 'urequest_hosts'), widgets=widgets)