micrOSDevToolKit 2.25.2__tar.gz → 2.26.0__tar.gz

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.25.2
+Version: 2.26.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -598,22 +598,49 @@ Version **3.0.0-0** `micrOS-Autonomous`
 
 		- (6) [DONE] Proper mip installer support (/modules or /lib or /web)
 			- Note: Autonomous package management over wifi (github)
-				- pacman install             [DONE]
-				- pacman uninstall           [DONE]
-				- pacman ls                  [DONE]
-				- pacman dirtree             [DONE]
-				- pacman ...
-
+				- pacman install <package-url>
+				- pacman uninstall <package-name>
+				- pacman upgrade <package-name>
+				- pacman ls
+				- pacman dirtree
 		- (7) [DONE] /config/requirements.txt handling (native micropython requirements syntax)
-			-  pacman download "requirements.txt"
-
+			-  pacman install "requirements.txt"
 		- (8) [DONE] micrOS/packages - submodule to create individual installable applications for micrOS
 			- Application registry (package.json and pacman.json): https://github.com/BxNxM/micrOSPackages 
+			- micrOS devToolKit micrOS/packages Load Module feature rendering (same as for built-in LMs)
+				- sfuncman.json and sfuncman.html - external packages highlight
 
 		- (9) [DONE] micropython uplift to `1.27`
-			- [DONE] fix micrOS USB update config restore issue 
+			- [DONE] fix micrOS USB update config restore issue
+
+		- (10) [DONE] WebEngine: Web mounts/aliases for /data and /modules
+			- Default web mount: /web
+			- Extended web mounts (if in this dict logic): 
+				WEB_MOUNTS = {
+					#             PATH
+    				"$modules": "/modules",
+    				"$data": "/data",
+    				...
+				}
+		   - Absolute usr input path check (Files.py)
+			- Fileserver integration
+				- custom listing for /modules (without .mpy files)
+				- mount pathes write access handlig
+				- mount pathes read (+visibility) access handlig
+
+		- (11) [TODO][CONCEPT] @Common.RequireSudo decorator
+			- When node_config["auth"] == True 
+			- Require pwd="<password>" parameter
+			- Two modes:
+				- Always require
+				- Require when force=True (_when_force=True)
+			- Apply this to:
+				- pacman rm
+				- pacman rmdir
+				- pacman uninstall
+				- pacman upgrade ... force=True
+				- ...
 
-			
 	[TODO] TESTING + RELEASE  `./micrOS/release_info/micrOS_ReleaseInfo`
 		- Create release notes (legacy: `release_3.0.0-0_note_esp32.md`)
 		- Introduce automatic release metrics generation...
@@ -627,6 +654,11 @@ Version **3.1.0-0** `micrOS-Waterbear`
     Core:
     - Low power mode (wake on event, hibernate command)?
     	- Remote controller / Sensor UseCase
+    - WebEngine additional path shering:
+    	- web shared root (already done): /web
+    	- optional additional pathes:
+    		- @modules -> /modules
+    		- @data    -> /data
 ```
 
 
@@ -663,6 +695,7 @@ Version **3.X.0-0** `micrOS-SecurePower`
 |  **v 1.21.0-4** | [release_Info-1.21.0-4](./micrOS/release_info/micrOS_ReleaseInfo/release_1.21.0-4_note_esp32.md) |  **57.3%** 63 728 byte | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_1.21.0-4.json) | Full async core system with advanced task management and device to device communication, task scheduling and much more ... with more then 30 application/pheriphery support.
 |  **v 2.0.0-0** | [release_Info-2.0.0-0](./micrOS/release_info/micrOS_ReleaseInfo/release_2.0.0-0_note_esp32.md) |  **45.4%** 68.7 kb | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_2.0.0-0.json) | Optimizations, WebCli with web frontends, Camera support. Micropython 1.21 async maxed out :D
 |  **v 2.6.0-0** | [release_Info-2.6.0-0](./micrOS/release_info/micrOS_ReleaseInfo/release_2.6.0-0_note_esp32.md) |  **48.3%** 72.6 kb  | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_2.6.0-0.json) | WebCli http server enhancements. New webapps: dashboard. Core system official interface finalization towards Load Modules: Common.py, Types.py (frontend generation), microIO.py (pinout handling).
+|  **v 3.0.0-0** | [release_Info-3.0.0-0](./micrOS/release_info/micrOS_ReleaseInfo/release_3.0.0-0_note_esp32.md) |  **??%** ?? kb  | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_3.0.0-0.json) | ... Coming soon ...
 
 ----------------------------------------
 ----------------------------------------

microsdevtoolkit-2.25.2/micrOSDevToolKit.egg-info/PKG-INFO → microsdevtoolkit-2.26.0/README.md

@@ -1,41 +1,3 @@
-Metadata-Version: 2.4
-Name: micrOSDevToolKit
-Version: 2.25.2
-Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
-Home-page: https://github.com/BxNxM/micrOS
-Author: Marcell Ban
-Author-email: miros.framework@gmail.com
-License: MIT
-Project-URL: Bug Tracker, https://github.com/BxNxM/micrOS/issues
-Project-URL: GitHub Discussions, https://github.com/BxNxM/micrOS/discussions
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: adafruit-ampy
-Requires-Dist: mpremote
-Requires-Dist: esptool
-Requires-Dist: ipaddress
-Requires-Dist: netaddr
-Requires-Dist: pylint
-Requires-Dist: pyserial
-Requires-Dist: resources
-Requires-Dist: flask
-Requires-Dist: flask_restful
-Requires-Dist: numpy
-Requires-Dist: json2html
-Requires-Dist: requests
-Requires-Dist: Flask-BasicAuth
-Requires-Dist: soundfile
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-dist
-Dynamic: summary
-
 # ![LOGO](./media/logo_mini.png?raw=true) micrOS
 
 > **"The mini yet powerful operating system for DIY projects."**
@@ -598,22 +560,49 @@ Version **3.0.0-0** `micrOS-Autonomous`
 
 		- (6) [DONE] Proper mip installer support (/modules or /lib or /web)
 			- Note: Autonomous package management over wifi (github)
-				- pacman install             [DONE]
-				- pacman uninstall           [DONE]
-				- pacman ls                  [DONE]
-				- pacman dirtree             [DONE]
-				- pacman ...
-
+				- pacman install <package-url>
+				- pacman uninstall <package-name>
+				- pacman upgrade <package-name>
+				- pacman ls
+				- pacman dirtree
 		- (7) [DONE] /config/requirements.txt handling (native micropython requirements syntax)
-			-  pacman download "requirements.txt"
-
+			-  pacman install "requirements.txt"
 		- (8) [DONE] micrOS/packages - submodule to create individual installable applications for micrOS
 			- Application registry (package.json and pacman.json): https://github.com/BxNxM/micrOSPackages 
+			- micrOS devToolKit micrOS/packages Load Module feature rendering (same as for built-in LMs)
+				- sfuncman.json and sfuncman.html - external packages highlight
 
 		- (9) [DONE] micropython uplift to `1.27`
-			- [DONE] fix micrOS USB update config restore issue 
+			- [DONE] fix micrOS USB update config restore issue
+
+		- (10) [DONE] WebEngine: Web mounts/aliases for /data and /modules
+			- Default web mount: /web
+			- Extended web mounts (if in this dict logic): 
+				WEB_MOUNTS = {
+					#             PATH
+    				"$modules": "/modules",
+    				"$data": "/data",
+    				...
+				}
+		   - Absolute usr input path check (Files.py)
+			- Fileserver integration
+				- custom listing for /modules (without .mpy files)
+				- mount pathes write access handlig
+				- mount pathes read (+visibility) access handlig
+
+		- (11) [TODO][CONCEPT] @Common.RequireSudo decorator
+			- When node_config["auth"] == True 
+			- Require pwd="<password>" parameter
+			- Two modes:
+				- Always require
+				- Require when force=True (_when_force=True)
+			- Apply this to:
+				- pacman rm
+				- pacman rmdir
+				- pacman uninstall
+				- pacman upgrade ... force=True
+				- ...
 
-			
 	[TODO] TESTING + RELEASE  `./micrOS/release_info/micrOS_ReleaseInfo`
 		- Create release notes (legacy: `release_3.0.0-0_note_esp32.md`)
 		- Introduce automatic release metrics generation...
@@ -627,6 +616,11 @@ Version **3.1.0-0** `micrOS-Waterbear`
     Core:
     - Low power mode (wake on event, hibernate command)?
     	- Remote controller / Sensor UseCase
+    - WebEngine additional path shering:
+    	- web shared root (already done): /web
+    	- optional additional pathes:
+    		- @modules -> /modules
+    		- @data    -> /data
 ```
 
 
@@ -663,6 +657,7 @@ Version **3.X.0-0** `micrOS-SecurePower`
 |  **v 1.21.0-4** | [release_Info-1.21.0-4](./micrOS/release_info/micrOS_ReleaseInfo/release_1.21.0-4_note_esp32.md) |  **57.3%** 63 728 byte | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_1.21.0-4.json) | Full async core system with advanced task management and device to device communication, task scheduling and much more ... with more then 30 application/pheriphery support.
 |  **v 2.0.0-0** | [release_Info-2.0.0-0](./micrOS/release_info/micrOS_ReleaseInfo/release_2.0.0-0_note_esp32.md) |  **45.4%** 68.7 kb | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_2.0.0-0.json) | Optimizations, WebCli with web frontends, Camera support. Micropython 1.21 async maxed out :D
 |  **v 2.6.0-0** | [release_Info-2.6.0-0](./micrOS/release_info/micrOS_ReleaseInfo/release_2.6.0-0_note_esp32.md) |  **48.3%** 72.6 kb  | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_2.6.0-0.json) | WebCli http server enhancements. New webapps: dashboard. Core system official interface finalization towards Load Modules: Common.py, Types.py (frontend generation), microIO.py (pinout handling).
+|  **v 3.0.0-0** | [release_Info-3.0.0-0](./micrOS/release_info/micrOS_ReleaseInfo/release_3.0.0-0_note_esp32.md) |  **??%** ?? kb  | esp32 (tinyPico, esp32s2, esp32s3) | [App Profiles](./micrOS/release_info/node_config_profiles/) | [LM manual](./micrOS/client/sfuncman/sfuncman_3.0.0-0.json) | ... Coming soon ...
 
 ----------------------------------------
 ----------------------------------------

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -2,14 +2,14 @@
     "files": {
         "Time.py": [
             9.34,
-            6
+            5
         ],
         "Pacman.py": [
-            9.5,
-            2
+            9.48,
+            3
         ],
         "Files.py": [
-            9.69,
+            9.72,
             12
         ],
         "micrOSloader.py": [
@@ -21,12 +21,12 @@
             1
         ],
         "Server.py": [
-            9.53,
+            9.56,
             3
         ],
         "Web.py": [
-            9.36,
-            1
+            9.37,
+            2
         ],
         "Tasks.py": [
             9.48,
@@ -34,7 +34,7 @@
         ],
         "Config.py": [
             9.44,
-            19
+            16
         ],
         "Shell.py": [
             9.37,
@@ -42,11 +42,11 @@
         ],
         "Notify.py": [
             9.78,
-            4
+            3
         ],
         "Types.py": [
             9.21,
-            30
+            29
         ],
         "Logger.py": [
             8.84,
@@ -54,7 +54,7 @@
         ],
         "Common.py": [
             9.85,
-            36
+            34
         ],
         "InterConnect.py": [
             9.63,
@@ -94,7 +94,7 @@
         ],
         "urequests.py": [
             9.65,
-            5
+            6
         ],
         "helpers.py": [
             9.88,
@@ -113,11 +113,11 @@
             0
         ],
         "modules/LM_pacman.py": [
-            7.69,
+            7.7,
             0
         ],
         "modules/LM_web.py": [
-            6.67,
+            6.92,
             0
         ],
         "modules/LM_genIO.py": [
@@ -248,10 +248,6 @@
             8.82,
             0
         ],
-        "modules/LM_oledui.py": [
-            9.05,
-            0
-        ],
         "modules/LM_espnow.py": [
             7.14,
             0
@@ -261,7 +257,7 @@
             0
         ],
         "modules/LM_OV2640.py": [
-            9.35,
+            9.28,
             0
         ],
         "modules/LM_rgb.py": [
@@ -292,10 +288,6 @@
             8.6,
             0
         ],
-        "modules/LM_mqtt_client.py": [
-            9.55,
-            0
-        ],
         "modules/LM_dimmer.py": [
             8.32,
             0
@@ -317,7 +309,7 @@
             0
         ],
         "modules/LM_fileserver.py": [
-            9.08,
+            9.41,
             0
         ],
         "modules/LM_neomatrix.py": [
@@ -327,12 +319,12 @@
     },
     "summary": {
         "core": [
-            4595,
+            4700,
             25
         ],
         "load": [
-            9983,
-            56
+            9093,
+            54
         ],
         "core_dep": [
             true,
@@ -340,10 +332,10 @@
         ],
         "load_dep": [
             true,
-            5
+            3
         ],
         "core_score": 9.27,
-        "load_score": 8.46,
-        "version": "2.25.2-1"
+        "load_score": 8.44,
+        "version": "2.26.0-0"
     }
 }

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/micrOS/source/Common.py

@@ -108,7 +108,7 @@ def notify(*args, **kwargs) -> bool:
     return False
 
 
-def web_endpoint(endpoint, function, method='GET', auto_enable=True) -> bool:
+def web_endpoint(endpoint, function, method='GET') -> bool:
     """
     [LM] Add test endpoint <localhost.local>/endpoint from Load Modules
     :param endpoint: simple string, name of the endpoint
@@ -122,12 +122,24 @@ def web_endpoint(endpoint, function, method='GET', auto_enable=True) -> bool:
         [3] String as file reference from /web
             Example: 'filesui.html'
     :param method: HTTP method name
-    :param auto_enable: if True will enable webui (if disabled) when register endpoint
     """
-    WebCli.register(endpoint=endpoint, callback=function, method=method, auto_enable=auto_enable)
+    WebCli.register(endpoint=endpoint, callback=function, method=method)
     return True
 
 
+def web_mounts(*args, **kwargs):
+    """
+    Extend web engine shared root path list
+    :param modules: add /modules to web shared path
+    :param data: add /data to web shared path
+    """
+    try:
+        return WebCli.web_mounts(*args, **kwargs)
+    except Exception as e:
+        syslog(f"[ERR] web_mounts error: {e}")
+        return {}
+
+
 def socket_stream(func):
     """
     [LM] Decorator for Socket message stream - adds msgobj to the decorated function arg list.

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/micrOS/source/Files.py

@@ -156,6 +156,20 @@ def path_join(*parts):
     return path
 
 
+def abs_path(path):
+    parts = path.split("/")
+    stack = []
+    for p in parts:
+        if not p or p == ".":
+            continue
+        if p == "..":
+            if stack:
+                stack.pop()   # prevent escaping root
+        else:
+            stack.append(p)
+    return "/" + "/".join(stack)
+
+
 # micrOS system file structure
 class OSPath:
     _ROOT = getcwd()

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/micrOS/source/Pacman.py

@@ -20,6 +20,7 @@ from mip import install as mipstall
 from uos import rename, mkdir
 from Files import OSPath, path_join, is_file, ilist_fs, is_dir, remove_file, remove_dir
 from Debug import syslog, console_write
+from urequests import get as uget
 
 
 # ---------------------------------------------------------------------
@@ -239,12 +240,13 @@ def install(ref):
 def uninstall(package_name):
     """
     Uninstalls package from /lib with its dependencies
+    :param package_name: package name under /lib
     """
     pack_path = path_join(OSPath.LIB, package_name)
     pack_meta = path_join(pack_path, "pacman.json")
 
     if not is_dir(pack_path):
-        return f"No packaged found: {pack_path}"
+        return f"✗ No packaged found: {pack_path}"
 
     verdict = f"Uninstall {package_name}\n"
     if is_file(pack_meta):
@@ -275,3 +277,50 @@ def uninstall(package_name):
     # Delete package
     verdict += "  " + remove_dir(pack_path)
     return verdict
+
+def upgrade(package_name, force=False):
+    """
+    Update package based on package name and paccman.json[versions][package]
+    - embeds unified mip-based installer for micrOS.: install paccman.json[url]
+    :param package_name: package name under /lib
+    :param force: skip version check
+    """
+    pack_path = path_join(OSPath.LIB, package_name)
+    pack_meta = path_join(pack_path, "pacman.json")
+
+    if not is_dir(pack_path) or not is_file(pack_meta):
+        return f"✗ No packaged (metadata) found: {pack_path}"
+
+    verdict = f"Upgrade: collecting package info {package_name}\n"
+    # 1. Get local package info
+    with open(pack_meta, 'r') as f:
+        pm_json = load(f)
+    current_version = pm_json.get("versions", {"package": "0.0.0"}).get("package")
+    package_url = pm_json.get("url", "")
+    # 2. Get latest package version
+    latest_version = current_version
+    if package_url:
+        _part1 = '/'.join(package_url.split(':', 1)[1].split('/', 2)[:2])
+        _part2 = package_url.split(':', 1)[1].split('/', 2)[2]
+        package_json_url = f"https://raw.githubusercontent.com/{_part1}/refs/heads/main/{_part2}/package.json"
+        try:
+            code, body = uget(url=package_json_url, sock_size=256, jsonify=True)
+            if code == 200:
+                # Set remote/latest version for real
+                latest_version = body.get("version", current_version)
+            else:
+                verdict += f"  ✗ Failed to retrieve remote version, code: {code}"
+            del body    # Cleanup
+        except Exception as e:
+            verdict += f"  ✗ Failed to retrieve remote version: {e}"
+
+    # Evaluate package upgrade request
+    if force or current_version != latest_version:
+        if package_url:
+            verdict += f"  ✓ Upgrade package ({current_version}->{latest_version}): {package_url}\n"
+            verdict += install(package_url)
+        else:
+            verdict += f"  ✗ Skip upgrade, package URL unavailable: {package_url}\n"
+    else:
+        verdict += f"  ✓ Skip upgrade, up-to-date: {current_version} == {latest_version}\n"
+    return verdict

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/micrOS/source/Server.py

@@ -32,6 +32,15 @@ else:
         __slots__ = []
         def __init__(self, *args, **kwargs):
             pass
+        @staticmethod
+        def register(*args, **kwargs) -> None:
+            """Child class can implement"""
+            syslog(f"[WARN] webui disabled, skip register: {kwargs.get('endpoint')}")
+        @staticmethod
+        def web_mounts(*args, **kwargs) -> dict:
+            """Child class can implement"""
+            syslog(f"[WARN] webui disabled, skip web_mounts: {kwargs.get('endpoint')}")
+            return {}
 
 #########################################################
 #         SOCKET SERVER-CLIENT HANDLER CLASSES          #
@@ -179,28 +188,6 @@ class WebCli(Client, WebEngine):
         # Close connection
         await self.close()
 
-    @staticmethod
-    def register(endpoint:str, callback:callable, method:str='GET', auto_enable:bool=True):
-        """
-        :param endpoint: name of the endpoint
-        :param callback: callback function (WebEngine compatible: return:  html_type, content)
-        :param method: HTTP method name
-        :param auto_enable: enable webui when register (endpoint)
-        """
-        if cfgget('webui'):
-            if not endpoint in WebEngine.ENDPOINTS:
-                WebEngine.ENDPOINTS[endpoint] = {}
-            if method not in WebEngine.METHODS:
-                raise ValueError(f"method must be one of {WebEngine.METHODS}")
-            WebEngine.ENDPOINTS[endpoint][method] = callback
-            return
-        # AUTO ENABLE webui when register (endpoint) called and webui is False
-        if auto_enable:
-            from Config import cfgput
-            if cfgput('webui', True):  # SET webui to True
-                from machine import reset
-                reset()  # HARD RESET (REBOOT)
-
 
 class ShellCli(Client, Shell):
 

{microsdevtoolkit-2.25.2 → microsdevtoolkit-2.26.0}/micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import syslog
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.25.2-1'
+    MICROS_VERSION = '2.26.0-0'
 
     def __init__(self):
         """