micrOSDevToolKit 2.13.1__py3-none-any.whl → 2.17.0__py3-none-any.whl

micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -1,43 +1,43 @@
 {
     "files": {
         "Time.py": [
-            9.26,
+            9.34,
             6
         ],
         "Files.py": [
-            9.38,
-            8
+            9.64,
+            10
         ],
         "micrOSloader.py": [
-            7.33,
+            7.12,
             1
         ],
         "Hooks.py": [
-            9.67,
+            9.62,
             1
         ],
         "Server.py": [
-            9.51,
+            9.53,
             3
         ],
         "Web.py": [
-            9.64,
+            9.61,
             1
         ],
         "Tasks.py": [
-            9.38,
+            9.43,
             12
         ],
         "Config.py": [
-            9.48,
-            18
+            9.43,
+            19
         ],
         "reset.py": [
             10.0,
             0
         ],
         "Shell.py": [
-            9.36,
+            9.37,
             1
         ],
         "Notify.py": [
@@ -49,12 +49,12 @@
             28
         ],
         "Logger.py": [
-            9.05,
+            8.84,
             4
         ],
         "Common.py": [
-            9.74,
-            34
+            9.85,
+            35
         ],
         "InterConnect.py": [
             9.41,
@@ -62,15 +62,15 @@
         ],
         "Debug.py": [
             7.37,
-            18
+            17
         ],
         "Network.py": [
-            9.71,
+            9.81,
             8
         ],
         "Espnow.py": [
-            9.57,
-            2
+            9.5,
+            3
         ],
         "Scheduler.py": [
             9.62,
@@ -78,10 +78,10 @@
         ],
         "microIO.py": [
             9.44,
-            43
+            44
         ],
         "micrOS.py": [
-            9.27,
+            9.3,
             1
         ],
         "Interrupts.py": [
@@ -93,238 +93,242 @@
             0
         ],
         "urequests.py": [
-            9.31,
+            9.65,
             5
         ],
-        "LM_roboarm.py": [
+        "modules/LM_roboarm.py": [
             7.78,
             0
         ],
-        "LM_stepper.py": [
+        "modules/LM_stepper.py": [
             8.9,
-            1
+            0
+        ],
+        "modules/LM_L298N.py": [
+            8.25,
+            0
         ],
-        "LM_pacman.py": [
-            8.92,
+        "modules/LM_pacman.py": [
+            7.95,
             0
         ],
-        "LM_genIO.py": [
+        "modules/LM_genIO.py": [
             9.12,
             0
         ],
-        "LM_oled_ui.py": [
-            8.73,
+        "modules/LM_oled_ui.py": [
+            8.78,
             0
         ],
-        "LM_system.py": [
-            8.36,
-            5
+        "modules/LM_system.py": [
+            8.45,
+            0
         ],
-        "LM_robustness.py": [
-            7.57,
+        "modules/LM_robustness.py": [
+            8.36,
             0
         ],
-        "LM_qmi8658.py": [
+        "modules/LM_qmi8658.py": [
             9.1,
             0
         ],
-        "LM_co2.py": [
+        "modules/LM_co2.py": [
             8.5,
             0
         ],
-        "LM_rest.py": [
+        "modules/LM_rest.py": [
             8.18,
             0
         ],
-        "LM_tcs3472.py": [
-            9.02,
+        "modules/LM_tcs3472.py": [
+            9.0,
             0
         ],
-        "LM_oled.py": [
-            9.23,
-            4
+        "modules/LM_oled.py": [
+            9.37,
+            0
         ],
-        "LM_tinyrgb.py": [
+        "modules/LM_tinyrgb.py": [
             7.95,
             0
         ],
-        "LM_aht10.py": [
+        "modules/LM_aht10.py": [
             8.79,
             0
         ],
-        "LM_bme280.py": [
+        "modules/LM_bme280.py": [
             8.09,
             0
         ],
-        "LM_buzzer.py": [
+        "modules/LM_buzzer.py": [
             9.11,
             0
         ],
-        "LM_switch.py": [
+        "modules/LM_switch.py": [
             8.68,
-            1
+            0
         ],
-        "LM_servo.py": [
+        "modules/LM_servo.py": [
             7.73,
-            2
+            0
         ],
-        "LM_rgbcct.py": [
+        "modules/LM_rgbcct.py": [
             8.62,
             0
         ],
-        "LM_oled_sh1106.py": [
-            8.89,
-            2
+        "modules/LM_oled_sh1106.py": [
+            9.2,
+            0
         ],
-        "LM_haptic.py": [
+        "modules/LM_haptic.py": [
             9.25,
-            1
+            0
         ],
-        "LM_ld2410.py": [
+        "modules/LM_ld2410.py": [
             9.07,
             0
         ],
-        "LM_neopixel.py": [
-            7.66,
-            2
+        "modules/LM_neopixel.py": [
+            7.78,
+            0
         ],
-        "LM_cct.py": [
+        "modules/LM_cct.py": [
             9.04,
-            1
+            0
         ],
-        "LM_L9110_DCmotor.py": [
+        "modules/LM_L9110_DCmotor.py": [
             7.69,
             0
         ],
-        "LM_neoeffects.py": [
-            9.09,
+        "modules/LM_neoeffects.py": [
+            9.08,
             0
         ],
-        "LM_i2c.py": [
+        "modules/LM_i2c.py": [
             7.6,
             0
         ],
-        "LM_dht22.py": [
+        "modules/LM_dht22.py": [
             7.94,
             0
         ],
-        "LM_L298N_DCmotor.py": [
-            8.78,
-            0
-        ],
-        "LM_esp32.py": [
+        "modules/LM_esp32.py": [
             6.52,
-            1
+            0
         ],
-        "LM_veml7700.py": [
+        "modules/LM_veml7700.py": [
             7.62,
             0
         ],
-        "LM_pet_feeder.py": [
+        "modules/LM_pet_feeder.py": [
             7.94,
             0
         ],
-        "LM_rencoder.py": [
+        "modules/LM_rencoder.py": [
             8.65,
             0
         ],
-        "LM_keychain.py": [
+        "modules/LM_keychain.py": [
             9.17,
             0
         ],
-        "LM_dht11.py": [
+        "modules/LM_dht11.py": [
             7.94,
             0
         ],
-        "LM_sound_event.py": [
-            8.49,
+        "modules/LM_sound_event.py": [
+            8.52,
             0
         ],
-        "LM_oledui.py": [
-            8.34,
+        "modules/LM_cluster.py": [
+            8.87,
+            0
+        ],
+        "modules/LM_oledui.py": [
+            8.7,
             0
         ],
-        "LM_espnow.py": [
-            7.89,
+        "modules/LM_espnow.py": [
+            6.0,
             0
         ],
-        "LM_telegram.py": [
+        "modules/LM_telegram.py": [
             9.58,
             0
         ],
-        "LM_OV2640.py": [
-            9.19,
+        "modules/LM_OV2640.py": [
+            9.27,
             0
         ],
-        "LM_rgb.py": [
-            8.95,
-            1
+        "modules/LM_rgb.py": [
+            9.01,
+            0
         ],
-        "LM_distance.py": [
+        "modules/LM_distance.py": [
             8.87,
             0
         ],
-        "LM_VL53L0X.py": [
+        "modules/LM_VL53L0X.py": [
             9.07,
             0
         ],
-        "LM_light_sensor.py": [
+        "modules/LM_light_sensor.py": [
             9.17,
             0
         ],
-        "LM_rp2w.py": [
+        "modules/LM_rp2w.py": [
             4.44,
             0
         ],
-        "LM_presence.py": [
+        "modules/LM_presence.py": [
             8.9,
-            4
+            0
         ],
-        "LM_mqtt_pro.py": [
-            9.44,
+        "modules/LM_trackball.py": [
+            8.6,
             0
         ],
-        "LM_trackball.py": [
-            8.49,
-            1
+        "modules/LM_mqtt_client.py": [
+            8.45,
+            0
         ],
-        "LM_dashboard_be.py": [
+        "modules/LM_dashboard_be.py": [
             6.5,
             0
         ],
-        "LM_dimmer.py": [
+        "modules/LM_dimmer.py": [
             8.33,
-            1
+            0
         ],
-        "LM_gameOfLife.py": [
+        "modules/LM_gameOfLife.py": [
             9.29,
-            3
+            0
         ],
-        "LM_ds18.py": [
+        "modules/LM_ds18.py": [
             6.0,
-            2
+            0
         ],
-        "LM_i2s_mic.py": [
-            8.37,
-            2
+        "modules/LM_i2s_mic.py": [
+            8.43,
+            0
         ],
-        "LM_sdcard.py": [
+        "modules/LM_sdcard.py": [
             7.88,
             0
         ],
-        "LM_neomatrix.py": [
-            8.8,
+        "modules/LM_neomatrix.py": [
+            8.75,
             0
         ]
     },
     "summary": {
         "core": [
-            3751,
+            3923,
             24
         ],
         "load": [
-            9449,
-            55
+            9871,
+            56
         ],
         "core_dep": [
             true,
@@ -332,10 +336,10 @@
         ],
         "load_dep": [
             true,
-            5
+            4
         ],
-        "core_score": 9.23,
-        "load_score": 8.39,
-        "version": "2.13.0-0"
+        "core_score": 9.24,
+        "load_score": 8.35,
+        "version": "2.17.0-0"
     }
 }

micrOS/source/Common.py

@@ -7,7 +7,7 @@ from Debug import syslog as debug_syslog, console_write
 from Logger import logger, log_get
 from Files import OSPath, path_join
 from microIO import resolve_pin
-from Tasks import TaskBase, Manager, lm_exec
+from Tasks import TaskBase, Manager, lm_exec, lm_is_loaded
 from machine import Pin, ADC
 from Notify import Notify
 
@@ -15,27 +15,48 @@ from Notify import Notify
 #####################################################################################
 #                                     SYSTEM                                        #
 #####################################################################################
-
-def micro_task(tag:str, task=None):
+def micro_task(tag: str, task=None, _wrap=False):
     """
     [LM] Async task manager.
-    :param tag: task tag string
-    :param task: coroutine (or list of command arguments) to contract a task with the given async task callback
-    return bool|callable
+    Modes:
+      A) GET:
+         micro_task("tag") -> existing task object or None
+      B) CREATE:
+         micro_task("tag", task=...) -> True | None | False
+         Creates a new async task with the given tag if not already running.
+      C) CREATE AS DECORATOR (shortcut):
+         @micro_task("main", _wrap=True)
+         async def mytask(tag, ...): ...
+         # Calling mytask(...) will create/start a new task under "main._mytask"
+
+    :param tag: Task tag string
+    :param task: Coroutine (or list of command arguments) to contract a task with
+                 the given async task callback
+    :param _wrap: When True, return a decorator factory (for use as @micro_task(...))
+    :return: Task object (GET), bool|None|False (CREATE), or decorator (DECORATOR)
     """
-    if task is None:
-        # [1] Task is None -> Get task mode by tag
-        # RETURN task obj (access obj.out + obj.done (automatic - with keyword arg))
-        async_task = TaskBase.TASKS.get(tag, None)
-        return async_task
-    if TaskBase.is_busy(tag):
-        # [2] Shortcut: Check task state by tag
-        # RETURN: None - if task is already running
-        return None
-    # [3] Create task (not running) + task coroutine was provided
-    # RETURN task creation state - success (True) / fail (False)
-    state:bool = Manager().create_task(callback=task, tag=tag)
-    return state
+    # --- CREATE (original) ---
+    if task is not None:
+        if TaskBase.is_busy(tag):
+            return None     # task already running
+        return Manager().create_task(callback=task, tag=tag)
+
+    # --- CREATE WITH DECORATOR FACTORY (simplified) ---
+    if _wrap:
+        def _decorator(async_fn):
+            task_tag = f"{tag}._{async_fn.__name__}"
+            _launcher = (
+                lambda *args, **kwargs:
+                None if TaskBase.is_busy(task_tag)
+                else Manager().create_task(
+                    callback=async_fn(task_tag, *args, **kwargs),
+                    tag=task_tag)
+            )
+            return _launcher
+        return _decorator
+
+    # --- GET (_wrap=False): return task object or None if not existing ---
+    return TaskBase.TASKS.get(tag, None)
 
 
 def manage_task(tag:str, operation:str):
@@ -44,9 +65,6 @@ def manage_task(tag:str, operation:str):
     :param tag: task tag
     :param operation: kill / show / isbusy
     """
-    if Manager is None:
-        # RETURN: None - cannot utilize async task functionality
-        return None
     if operation == "show":
         return str(Manager().show(tag=tag))
     if operation == "kill":
@@ -56,14 +74,16 @@ def manage_task(tag:str, operation:str):
     raise Exception(f"Invalid operation: {operation}")
 
 
-def exec_cmd(cmd:list, jsonify:bool=None, skip_check=None):
+def exec_cmd(cmd:list, jsonify:bool=None, secure=False):
     """
     [LM] Single (sync) LM execution
     :param cmd: command string list, ex.: ['system', 'clock']
     :param jsonify: request json output
-    :param skip_check: legacy (check was removed) - remove parameter
+    :param secure: check LM is loaded, if NOT skip execution 'NotAllowed'
     return state, output
     """
+    if secure and not lm_is_loaded(cmd[0]):
+        return False, f"NotAllowed {cmd[0]}"
     return lm_exec(cmd, jsonify=jsonify)
 
 
@@ -87,7 +107,7 @@ def notify(text=None) -> bool:
     return False
 
 
-def web_endpoint(endpoint, function) -> bool:
+def web_endpoint(endpoint, function, method='GET', auto_enable=True) -> bool:
     """
     [LM] Add test endpoint <localhost.local>/endpoint from Load Modules
     :param endpoint: simple string, name of the endpoint
@@ -98,8 +118,10 @@ def web_endpoint(endpoint, function) -> bool:
         [2] Stream function return tuple (multipart_type, data):
             multipart/x-mixed-replace | multipart/form-data, <data>
                 <data>: {'callback':<func>, 'content-type': image/jpeg | audio/l16;*}
+    :param method: HTTP method name
+    :param auto_enable: if True will enable webui (if disabled) when register endpoint
     """
-    WebCli.register(endpoint=endpoint, callback=function)
+    WebCli.register(endpoint=endpoint, callback=function, method=method, auto_enable=auto_enable)
     return True
 
 

micrOS/source/Config.py

@@ -17,10 +17,12 @@ from json import load, dump
 from uos import remove
 from utime import sleep
 from Debug import DebugCfg, console_write, syslog
+from Files import OSPath, path_join, is_file
+from uos import rename as move_file
 try:
     from microIO import set_pinmap
 except:
-    syslog("[ERR] LogicalPins import: set_pinmap")
+    syslog("[ERR] microIO import: set_pinmap")
     set_pinmap = None
 
 
@@ -30,7 +32,8 @@ class Data:
     """
     __slots__ = []
 
-    CONFIG_PATH = "node_config.json"
+    CONFIG_NAME = "node_config.json"
+    CONFIG_PATH = path_join(OSPath.CONFIG, CONFIG_NAME)
     CONFIG_CACHE = {"version": "n/a",
                     "auth": False,
                     "staessid": "your_wifi_name",
@@ -73,10 +76,14 @@ class Data:
 
     @staticmethod
     def init():
+        # Migrate config from / to /config
+        if is_file(Data.CONFIG_NAME):
+            console_write(f"[CONF] Migrate {Data.CONFIG_NAME} to {Data.CONFIG_PATH}")
+            move_file(Data.CONFIG_NAME, Data.CONFIG_PATH)
         # Inject user config into template
         Data.__inject_default_conf()
         # [!!!] Init selected pinmap - default pinmap calculated by platform
-        if set_pinmap is not None:
+        if callable(set_pinmap):
             pinmap = set_pinmap(Data.CONFIG_CACHE['cstmpmap'])
             console_write(f"[PIN MAP] {pinmap}")
         # SET dbg based on config settings (inject user conf)
@@ -171,16 +178,17 @@ class Data:
         These kind of parameters are not cached in memory
         """
         # Write str value to file
+        offloaded_key = path_join(OSPath.CONFIG, f'.{key}.key')
         if isinstance(value, str) and key in Data.CONFIG_CACHE:
             try:
-                with open(f'.{key}.key', 'w') as f:
+                with open(offloaded_key, 'w') as f:
                     f.write(value)
                 return True
             except Exception:
                 return False
         # Read str value from file
         try:
-            with open(f'.{key}.key', 'r') as f:
+            with open(offloaded_key, 'r') as f:
                 return f.read().strip()
         except Exception:
             # Return default value if key not exists