micrOSDevToolKit 3.6.3__tar.gz → 3.7.0__tar.gz

{microsdevtoolkit-3.6.3/micrOSDevToolKit.egg-info → microsdevtoolkit-3.7.0}/PKG-INFO

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

{microsdevtoolkit-3.6.3 → microsdevtoolkit-3.7.0}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -33,7 +33,7 @@
             2
         ],
         "Tasks.py": [
-            9.35,
+            9.34,
             13
         ],
         "Config.py": [
@@ -117,7 +117,7 @@
             0
         ],
         "modules/LM_web.py": [
-            8.23,
+            8.52,
             0
         ],
         "modules/LM_genIO.py": [
@@ -200,10 +200,6 @@
             7.24,
             1
         ],
-        "modules/LM_veml7700.py": [
-            7.3,
-            0
-        ],
         "modules/LM_rencoder.py": [
             8.59,
             0
@@ -228,10 +224,6 @@
             8.95,
             1
         ],
-        "modules/LM_light_sensor.py": [
-            9.12,
-            0
-        ],
         "modules/LM_rp2w.py": [
             4.44,
             0
@@ -267,21 +259,21 @@
     },
     "summary": {
         "core": [
-            5492,
+            5488,
             27
         ],
         "load": [
-            6294,
-            39
+            6125,
+            37
         ],
         "packages": [
-            15029,
-            103,
-            24
+            15372,
+            108,
+            25
         ],
         "web": [
-            206654,
-            18
+            216082,
+            20
         ],
         "core_dep": [
             true,
@@ -292,7 +284,7 @@
             5
         ],
         "core_score": 9.26,
-        "load_score": 8.36,
-        "version": "3.6.3-0"
+        "load_score": 8.37,
+        "version": "3.7.0-0"
     }
 }

{microsdevtoolkit-3.6.3 → microsdevtoolkit-3.7.0}/micrOS/source/Shell.py

@@ -28,7 +28,7 @@ IMAGE_MODE = 'rel' if 'micrOS' in uname()[-1] else 'dev'
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '3.6.3-0'
+    MICROS_VERSION = '3.7.0-0'
 
     def __init__(self):
         """
@@ -163,28 +163,28 @@ class Shell:
             if msg_list_len == 1:
                 await self.a_send("[MICROS]")
                 await self.a_send("   hello     - device hello msg ID")
-                await self.a_send("   modules [all] - show active/all Load Modules")
+                await self.a_send("   modules [all] - show active / all Load Modules")
                 await self.a_send("   version   - show micrOS version")
                 await self.a_send("   exit      - exit shell session")
                 await self.a_send("   reboot    - system soft reboot (vm), hard reboot (hw): reboot -h")
                 await self.a_send("   webrepl   - start webrepl, for file transfers use with --update")
                 await self.a_send("[CONF] Configuration mode")
                 await self.a_send("  conf       - Enter conf mode")
-                await self.a_send("    dump [str] - Dump all / str filtered data")
+                await self.a_send("    dump <str> - Dump all / str filtered data")
                 await self.a_send("    key        - Get value")
                 await self.a_send("    key value  - Set value")
                 await self.a_send("  noconf     - Exit conf mode")
                 await self.a_send("[TASK] Task operations")
                 await self.a_send("  task list         - list tasks by tags")
-                await self.a_send("  task kill [tag]   - stop task")
-                await self.a_send("  task show [tag]   - show task output")
+                await self.a_send("  task kill <tag>   - stop task")
+                await self.a_send("  task show <tag>   - show task output")
                 await self.a_send("[EXEC] Command mode, syntax: <module> <function> <params> <postfix>")
                 await self.a_send("  Postfix hints:")
-                await self.a_send("    ... &[x]            - start one-shot task")
-                await self.a_send("    ... &&[x]           - start periodic task, where [x]: delay ms [x min: 20ms]")
-                await self.a_send("    ... >json           - request json formatted output")
-                await self.a_send("    ... >>hostname      - remote command execution (intercon)")
-                await self.a_send("help [all] [match]  - list active(-) / all modules with optional filtering")
+                await self.a_send("    ... &<ms>            - start one-shot task, where <ms> is delay (min: 20ms)")
+                await self.a_send("    ... &&<ms>           - start periodic task")
+                await self.a_send("    ... >json            - request json formatted output")
+                await self.a_send("    ... >>hostname       - remote command execution (intercon)")
+                await self.a_send("help [all] <match> - list active modules / all modules / match for modules ")
             # Help length: help [all/-] [match]
             if msg_list_len >= 2:
                 _loaded = msg_list[1].lower() != "all"

{microsdevtoolkit-3.6.3 → microsdevtoolkit-3.7.0}/micrOS/source/Tasks.py

@@ -576,6 +576,24 @@ def lm_exec(arg_list:list, jsonify:bool=None):
     return state, out
 
 
+def _func_params(cmd_list):
+    """Format command arguments, preserving quotes across split list entries."""
+    parts = []
+    quote = None
+    for position in range(2, len(cmd_list)):
+        for word in cmd_list[position].split(' '):
+            if word or quote:
+                if parts:
+                    parts.append(' ' if quote else ', ')
+                parts.append(word)
+            for char in word:
+                if char == quote:
+                    quote = None
+                elif quote is None and char in ('"', "'"):
+                    quote = char
+    return ''.join(parts)
+
+
 @exec_builtins
 def _exec_lm_core(cmd_list, jsonify):
     """
@@ -587,55 +605,30 @@ def _exec_lm_core(cmd_list, jsonify):
     :param jsonify: request json output
     Return Bool(OK/NOK), Str(Command output)
     """
-
-    def _func_params(param):
-        if not param:
-            return ''
-
-        chunks = []
-        current = ''
-        quote = None
-        for char in param:
-            if char in ('"', "'"):
-                if quote is None:
-                    quote = char
-                elif quote == char:
-                    quote = None
-                current += char
-                continue
-            if char == ' ' and quote is None:
-                if current:
-                    chunks.append(current)
-                    current = ''
-                continue
-            current += char
-
-        if current:
-            chunks.append(current)
-
-        return ', '.join(chunks)
+    hint = "Shell: for hints type help.\nShell: for LM exec: [1](LM)module [2]function [3...]optional params"
 
     # LoadModule execution
     if len(cmd_list) >= 2:
-        lm_mod, lm_func, lm_params = f"LM_{cmd_list[0]}", cmd_list[1], _func_params(' '.join(cmd_list[2:]))
+        lm_mod, lm_func, lm_params = f"LM_{cmd_list[0]}", cmd_list[1], _func_params(cmd_list)
         print(f"[DEBUG] LM exec: {lm_mod}.{lm_func}({lm_params})")
         try:
             # ------------- LM LOAD & EXECUTE ------------- #
             # [1] LOAD MODULE - OPTIMIZED by sys.modules
             if lm_mod not in modules:
                 exec(f"import {lm_mod}")
-            try:
-                # [2] EXECUTE FUNCTION FROM MODULE
-                lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
-            except Exception as e:
-                # Handle not proper module load (simulator), note: module in sys.modules BUT not available
-                if lm_mod in str(e):
-                    # [2.1] LOAD MODULE - FORCED
-                    exec(f"import {lm_mod}")
-                    # [2.2] EXECUTE FUNCTION FROM MODULE
-                    lm_output = eval(f"{lm_mod}.{lm_func}({lm_params})")
-                else:
-                    raise e
+            # [2] IMPORT GUARD: Allow local functions and explicitly advertised commands.
+            module = modules[lm_mod]
+            func = getattr(module, lm_func)
+            if not callable(func):
+                return False, hint
+            if getattr(func, '__globals__', {}).get('__name__') != lm_mod:
+                help_func = getattr(module, 'help', None)
+                if help_func is None or not any(entry.split(' ', 1)[0] == lm_func
+                                                for entry in help_func()):
+                    return False, hint
+            # [3] Execute the checked callable, keeping its decorator active.
+            # Explicit locals also work in MicroPython and the CPython simulator.
+            lm_output = eval(f"_func({lm_params})", globals(), {'_func': func, lm_mod: module})
             # ------------ LM output format: dict(jsonify) / str(raw) ------------- #
             # Handle LM output data
             if isinstance(lm_output, dict):
@@ -644,7 +637,7 @@ def _exec_lm_core(cmd_list, jsonify):
                     [f" {key}: {value}" for key, value in lm_output.items()])
             if lm_func == 'help':
                 # Special case:
-                #   jsonify (True) json output, (False) default, "human readable" formatted output)
+                #   jsonify (True) json output, (False) default, "human-readable" formatted output
                 lm_output = dumps(lm_output) if jsonify else '\n'.join([f" {out}," for out in lm_output])
             # Return LM exec result
             return True, str(lm_output)
@@ -657,7 +650,7 @@ def _exec_lm_core(cmd_list, jsonify):
                 gcollect()
             # LM EXECUTION ERROR
             return False, f"Core error: {lm_mod}->{lm_func}: {e}"
-    return False, "Shell: for hints type help.\nShell: for LM exec: [1](LM)module [2]function [3...]optional params"
+    return False, hint
 
 
 def lm_is_loaded(lm_name):

{microsdevtoolkit-3.6.3 → microsdevtoolkit-3.7.0}/micrOS/source/modules/LM_aht10.py

@@ -86,7 +86,7 @@ class AHT10:
 
 def load():
     """
-    Initialize AHT10 module
+    Initialize temp/hum AHT10 module
     """
     __init_AHT10()
     return "AHT10 temp/hum sensor - loaded"

{microsdevtoolkit-3.6.3 → microsdevtoolkit-3.7.0}/micrOS/source/modules/LM_web.py

@@ -4,13 +4,14 @@ Web backend loader
     - Fileserver
 """
 
-from json import dumps, loads
+from json import dumps, loads, dump as conf_dump, load as conf_load
 
-from Common import web_endpoint, web_mounts
+from Common import web_endpoint, conf_dir, syslog
 from Config import cfgget, cfgput
 from Auth import sudo
 
-def load(dashboard=True, fileserver:bool=False, fs_explore:bool=False, config=True):
+
+def load(dashboard:bool=None, fileserver:bool=None, fs_explore:bool=None, config:bool=None):
     """
     Centralized Web Backend Services Loader
     - Dynamic application dashboard
@@ -20,17 +21,59 @@ def load(dashboard=True, fileserver:bool=False, fs_explore:bool=False, config=Tr
     :param fs_explore: bool - enable/disable* all shared web mounts: modules, data
     :param config:     bool - enable*/disable micrOS web config with auth
     """
-    endpoints = []
+    msg = []
+    wsc = _web_apps("r")
+
+    dashboard = wsc["dashboard"] if dashboard is None else dashboard
     if dashboard:
         web_endpoint('dashboard', 'dashboard.html')
-        endpoints.append("Dashboard initialized, endpoint: /dashboard")
+        msg.append("Dashboard initialized, endpoint: /dashboard")
+    fileserver = wsc["fileserver"] if fileserver is None else fileserver
+    fs_explore = wsc["fs_explore"] if fs_explore is None else fs_explore
     if fileserver:
         import LM_fileserver
-        endpoints.append(LM_fileserver.load())
-        endpoints.append(web_mounts(fs_explore, fs_explore, fs_explore))
+        msg.append(LM_fileserver.load())
+        msg.append(LM_fileserver.extend_mounts(modules=fs_explore, data=fs_explore, logs=fs_explore))
+    config = wsc["config"] if config is None else config
     if config:
-        endpoints.append(enable_config())
-    return endpoints
+        msg.append(enable_config())
+
+    _web_apps('s', {"dashboard": dashboard,
+                                        "fileserver": fileserver, "fs_explore": fs_explore,
+                                        "config": config})
+    return msg
+
+
+def _web_apps(mode, conf=None):
+    """
+    :param mode (str): s - save or r - read
+    """
+    if mode == "s":
+        if conf is None:
+            return False
+        # Save config
+        try:
+            with open(conf_dir("webapps.json"), 'w') as f:
+                conf_dump(conf, f)
+            return True
+        except Exception as e:
+            syslog(f"[WARN] Web app conf save: {e}")
+            return False
+    # Load config (with fallback)
+    cfg = {"dashboard": True, "fileserver": False, "fs_explore": False, "config": True}
+    try:
+        with open(conf_dir("webapps.json"), 'r') as f:
+            cfg.update(conf_load(f))
+    except Exception as e:
+        syslog(f"[WARN] Web app conf load: {e}")
+    return cfg
+
+
+def status():
+    """
+    Web services status: dashboard, fileserver, fs_explore, config
+    """
+    return _web_apps('r')
 
 ######################## System Config ######################
 _CFG_HIDE = ("hwuid", "guimeta", "socport", "version", "auth", "soctout")
@@ -124,4 +167,5 @@ def help(widgets=False):
     """
     return ('load dashboard=True fileserver=False fs_explore=False config=True',
             'enable_config',
+            'status',
             'help')

{microsdevtoolkit-3.6.3 → microsdevtoolkit-3.7.0}/micrOS/source/web/config.css

@@ -4,6 +4,7 @@
   --config-label: #d9d2ff;
   --config-success: #8ee88e;
   --config-danger: #ff9fa6;
+  --config-padding: 12px;
 }
 
 #configContainer {
@@ -119,7 +120,7 @@
 #configFields .config-wide-action-button, .config-dialog .config-wide-action-button { width: 100%; display: block; font-weight: bold; }
 .config-wide-action-output { width: 100%; box-sizing: border-box; }
 .config-dialog-backdrop { position: fixed; inset: 0; z-index: 2000; display: flex; align-items: center; justify-content: center; padding: 16px; background: rgba(0,0,0,0.62); }
-.config-dialog { width: min(420px, 100%); max-height: calc(100vh - 32px); overflow: auto; padding: 16px; border: 1px solid var(--config-border); border-radius: 8px; box-sizing: border-box; background: var(--config-surface); box-shadow: 0 16px 36px rgba(0,0,0,0.42); }
+.config-dialog { width: min(420px, 100%); max-height: calc(100vh - 32px); overflow: auto; border: 1px solid var(--config-border); border-radius: 8px; box-sizing: border-box; background: var(--config-surface); box-shadow: 0 16px 36px rgba(0,0,0,0.42); }
 .config-dialog-header { display: flex; align-items: center; justify-content: space-between; gap: 8px; }
 .config-dialog-title { margin: 0; }
 .config-dialog-message { margin: 12px 0 8px 0; }
@@ -135,7 +136,7 @@
 .config-action-row, .config-box {
   border: 1px solid var(--config-border); border-radius: 6px; background-color: var(--config-surface);
 }
-.config-action-row { padding: 10px; }
+.config-action-row, .config-box, .config-dialog, .schedule-overview { padding: var(--config-padding); }
 .config-action-header { justify-content: space-between; flex-wrap: wrap; }
 .config-action-label { flex: 1; min-width: 160px; }
 .config-button-group { flex-wrap: wrap; justify-content: flex-end; }
@@ -154,16 +155,15 @@
 .config-label-block { margin-bottom: 8px; }
 .config-label-tight { margin-bottom: 4px; }
 .config-stack { display: flex; flex-direction: column; gap: 8px; }
-.config-stack-large { gap: 16px; }
 .config-remove-button { cursor: pointer; }
 .config-legend { font-size: 1.1rem; }
 .config-package-tools { flex-direction: row; gap: 6px; margin-top: 8px; }
-.config-package-header { padding: 0 10px; box-sizing: border-box; }
+.config-package-header { padding: 0 var(--config-padding); box-sizing: border-box; }
 .config-package-title { flex: 1; margin: 0; }
 .config-package-install { display: flex; flex-wrap: wrap; align-items: center; gap: 6px; width: var(--config-input-width); max-width: 100%; margin: 8px 0; }
 #configFields .config-package-install input { flex: 1 1 240px; width: auto; }
 #configFields #packageCatalog { width: 180px; }
-.config-package-info { width: var(--config-input-width); max-width: 100%; box-sizing: border-box; padding: 10px; margin-bottom: 12px; overflow-wrap: anywhere; }
+.config-package-info { width: var(--config-input-width); max-width: 100%; box-sizing: border-box; margin-bottom: 12px; overflow-wrap: anywhere; }
 .config-package-info p { margin: 0 0 8px; }
 .config-package-info a { color: var(--config-label); }
 .config-pin-info { margin-top: 20px; }
@@ -179,6 +179,7 @@
   margin-bottom: 20px;
 }
 .config-field-group > .config-fieldset { margin-bottom: 0; }
+.config-fieldset > :last-child { margin-bottom: 0; }
 .config-fieldset .config-fieldset,
 .config-fieldset .config-input-row,
 .config-fieldset .param-row,
@@ -240,7 +241,7 @@
 .schedule-card {
   --schedule-control-gap: 12px;
   --schedule-muted: rgba(255,255,255,.7);
-  padding: 12px 20px 20px;
+  margin-bottom: 16px;
 }
 .schedule-card > .config-legend { display: block; padding: 0 6px; color: var(--config-label); }
 .schedule-card-header {
@@ -251,7 +252,7 @@
 .schedule-remove-button { color: var(--config-danger) !important; }
 .schedule-editor { grid-template-columns: minmax(0, .8fr) minmax(0, 1fr); gap: var(--schedule-control-gap) 18px; }
 .config-toggle.schedule-mode-buttons { width: 100%; box-sizing: border-box; }
-.schedule-overview { display: flex; grid-row: span 2; align-items: center; gap: 12px; padding: 12px; border-radius: 12px; background: rgba(255,255,255,.055); }
+.schedule-overview { display: flex; grid-row: span 2; align-items: center; gap: 12px; border-radius: 12px; background: rgba(255,255,255,.055); }
 .schedule-icon { flex: 0 0 48px; color: #ffbd32; }
 .schedule-icon svg { display: block; width: 48px; height: 48px; fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
 .schedule-icon .schedule-clock-icon { color: #8fd3ff; }
@@ -330,6 +331,19 @@ button.config-toggle-option.selected:hover {
   padding: 8px 16px;
 }
 
+/* Match the enabled Save button border, including compound config editors. */
+#configFields button.config-install-ready,
+#configFields button.config-unsaved,
+#configFields input.config-unsaved,
+#configFields select.config-unsaved,
+#configFields .config-unsaved input,
+#configFields .config-unsaved select,
+#configFields .config-unsaved:not([data-config-key="crontasks"]) fieldset,
+#configFields .config-unsaved .config-toggle-option,
+#configFields .config-unsaved:not([data-config-key="crontasks"]) .config-add-button {
+  border-color: rgba(142,232,142,0.58);
+}
+
 #menuToggle {
   display: none;
   align-items: center;
@@ -410,7 +424,6 @@ button.config-toggle-option.selected:hover {
     flex-basis: 88px;
   }
 
-  .schedule-card { padding: 12px 14px 14px; }
   .schedule-editor { grid-template-columns: 1fr; }
   .schedule-overview { grid-row: auto; }
   .schedule-tag-panel select { min-width: 150px; }