micrOSDevToolKit 3.0.4__tar.gz → 3.0.7__tar.gz

{microsdevtoolkit-3.0.4/micrOSDevToolKit.egg-info → microsdevtoolkit-3.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 3.0.4
+Version: 3.0.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-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -2,7 +2,7 @@
     "files": {
         "Auth.py": [
             9.63,
-            4
+            5
         ],
         "Time.py": [
             9.38,
@@ -38,7 +38,7 @@
         ],
         "Config.py": [
             9.62,
-            17
+            18
         ],
         "Shell.py": [
             9.36,
@@ -49,7 +49,7 @@
             3
         ],
         "Types.py": [
-            8.54,
+            9.04,
             28
         ],
         "Logger.py": [
@@ -125,7 +125,7 @@
             0
         ],
         "modules/LM_web.py": [
-            7.14,
+            8.57,
             0
         ],
         "modules/LM_genIO.py": [
@@ -323,11 +323,11 @@
     },
     "summary": {
         "core": [
-            5303,
+            5311,
             27
         ],
         "load": [
-            8828,
+            8823,
             53
         ],
         "core_dep": [
@@ -336,10 +336,10 @@
         ],
         "load_dep": [
             true,
-            4
+            5
         ],
-        "core_score": 9.26,
-        "load_score": 8.44,
-        "version": "3.0.4-0"
+        "core_score": 9.28,
+        "load_score": 8.46,
+        "version": "3.0.7-0"
     }
 }

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/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 = '3.0.4-0'
+    MICROS_VERSION = '3.0.7-0'
 
     def __init__(self):
         """

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/Types.py

@@ -10,6 +10,8 @@ USAGE:
     SLIDER brightness br
     SLIDER brightness br=<0-100>
     SLIDER brightness br=<0-100-5>
+    GRAPH top
+    EMBED{"callback": "/cam/stream", "title": "live stream", "image": true}
 """
 from json import dumps, loads
 from Debug import syslog
@@ -18,18 +20,21 @@ from Debug import syslog
 #                 HELP TUPLE RESOLVER                  #
 ########################################################
 
-__TEMPLATE = {'type': 'n/a', 'lm_call': ''}
+__TEMPLATE = {'type': 'n/a', 'callback': ''}
 __RANGE_100 = {'range': (0, 100, 2)}
 __RANGE_255 = {'range': (0, 255, 2)}
 __OPTIONS = {'options': ("None",)}
 
-# Widget Types
-BUTTON = lambda: __TEMPLATE | {'type': 'button'} | __OPTIONS
-SLIDER = lambda: __TEMPLATE | {'type': 'slider'} | __RANGE_100
-TEXTBOX = lambda: __TEMPLATE | {'type': 'textbox', 'refresh': 10000}
-COLOR = lambda: __TEMPLATE | {'type': 'color'} | __RANGE_255
-WHITE = lambda: __TEMPLATE | {'type': 'white'} | __RANGE_255
-JOYSTICK = lambda: __TEMPLATE | {'type': 'joystick'} | __RANGE_100
+# Widget Types - Load Module Callbacks
+BUTTON = lambda: __TEMPLATE | {'type': 'button'} | __OPTIONS                        # pylint: disable=invalid-name
+SLIDER = lambda: __TEMPLATE | {'type': 'slider'} | __RANGE_100                      # pylint: disable=invalid-name
+TEXTBOX = lambda: __TEMPLATE | {'type': 'textbox', 'refresh': 10000}                # pylint: disable=invalid-name
+COLOR = lambda: __TEMPLATE | {'type': 'color'} | __RANGE_255                        # pylint: disable=invalid-name
+WHITE = lambda: __TEMPLATE | {'type': 'white'} | __RANGE_255                        # pylint: disable=invalid-name
+JOYSTICK = lambda: __TEMPLATE | {'type': 'joystick'} | __RANGE_100                  # pylint: disable=invalid-name
+GRAPH = lambda: __TEMPLATE | {'type': 'graph', 'refresh': 3000, 'limit': 30}        # pylint: disable=invalid-name
+# Widget Types - Web endpoints
+EMBED = lambda: __TEMPLATE | {'type': 'embed', 'image': False, 'title': None}    # pylint: disable=invalid-name
 
 
 ########################################################
@@ -76,7 +81,7 @@ def _generate(type_dict, help_msg):
             else:
                 param_str = f'{p}=:{"range" if "range" in type_dict else "options"}:'
                 valid_params.append(param_str)
-    type_dict['lm_call'] = f"{func} {' '.join(valid_params)}"
+    type_dict['callback'] = f"{func} {' '.join(valid_params)}"
     return dumps(type_dict | overwrite)
 
 
@@ -127,15 +132,19 @@ def resolve(help_data, widgets=False):
                     # Apply inline widget-only overrides, e.g. TEXTBOX{'refresh': 5000}
                     resolved_tag.update(overrides)
                 try:
-                    # Build a clean message for _generate, without inline {...}
-                    cleaned_msg = (tag + ' ' + cmd).strip()
-                    # Generate JSON output with TAG
-                    help_msg.append(_generate(resolved_tag, cleaned_msg))
+                    if not cmd and isinstance(resolved_tag, dict):
+                        help_msg.append(dumps(resolved_tag))
+                    else:
+                        # Build a clean message for _generate, without inline {...}
+                        cleaned_msg = (tag + ' ' + cmd).strip()
+                        # Generate JSON output with TAG
+                        help_msg.append(_generate(resolved_tag, cleaned_msg))
                 except Exception as e:
                     syslog(f"[ERR] resolve {tag} help msg: {e}")
                 continue
             # Widgets OFF - TAG exists - remove TAG from output
-            help_msg.append(cmd.strip())
+            if tag not in ('EMBED',):
+                help_msg.append(cmd.strip())
         elif not widgets:
             # No TAG - Widgets OFF output
             help_msg.append(msg)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/Web.py

@@ -199,7 +199,7 @@ class Buffer:
         return len(request)
 
     async def _response_handler(self, resp_handler):
-        if "closure" == type(resp_handler).__name__:
+        if type(resp_handler).__name__ in ("function", "closure"):
             for is_finished in resp_handler(self._send_buf):
                 await self._flush_response()
                 if is_finished:

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_OV2640.py

@@ -58,9 +58,7 @@ def _set_web_endpoints():
     # Register rest endpoint
     web_endpoint('cam/snapshot', _snapshot_clb)
     web_endpoint('cam/stream', _image_stream_clb)
-    web_endpoint('cam/photo', lambda _, body: \
-                 ('text/plain', photo() if not body else photo(body.encode('ascii'))))
-    return "Endpoint created: /cam/snapshot, /cam/stream, /cam/photo"
+    return "Endpoint created: /cam/snapshot, /cam/stream"
 
 
 def settings(quality=None, flip=None, mirror=None, effect=None, saturation=None, brightness=None, contrast=None, whitebalace=None, q=None):
@@ -242,12 +240,13 @@ def help(widgets=False):
     """
     return resolve(('load quality="medium/low/high" freq="default/high"',
         'settings quality=None flip=None mirror=None effect="NONE"',
+        'EMBED{"callback": "/cam/stream", "title": "camera stream", "image": true}',
         'SLIDER settings saturation=<0-100>',
         'SLIDER settings brightness=<0-100>',
         'SLIDER settings contrast=<0-100>',
         'BUTTON settings effect=<NONE,NEG,BW,RED,GREEN,BLUE,RETRO>',
         'capture',
-        'photo',
+        'BUTTON photo',
         'BUTTON flashlight state=None',
         '[Hint] after load you can access the /cam/snapshot and /cam/stream endpoints',
         'Thanks to :) https://github.com/lemariva/micropython-camera-driver'), widgets=widgets)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_aht10.py

@@ -136,4 +136,4 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure', 'reset', 'load', 'pinmap'), widgets=widgets)
+    return resolve(('GRAPH measure', 'reset', 'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_bme280.py

@@ -349,5 +349,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX{"refresh": 2000} measure ntfy=False',
+    return resolve(('GRAPH{"refresh": 2000} measure ntfy=False',
                              'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_cct.py

@@ -346,10 +346,10 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('WHITE white cw=<0-1000-5> ww smooth=True force=True',
-                             'BUTTON toggle state=<True,False> smooth=True', 'load',
-                             'SLIDER brightness percent=<0-100> smooth=True wake=True',
-                             'transition cw=None ww=None sec=1.0 wake=False',
-                             'hue_transition percent=<0-100> sec=1.0 wake=False',
-                             'BUTTON random smooth=True max_val=1000', 'status',
-                             'subscribe_presence', 'pinmap'), widgets=widgets)
+    return resolve(('WHITE white cw=<0-800-5> ww smooth=True force=True',
+                    'BUTTON toggle state=<True,False> smooth=True', 'load',
+                    'SLIDER brightness percent=<0-100> smooth=True wake=True',
+                    'transition cw=None ww=None sec=1.0 wake=False',
+                    'hue_transition percent=<0-100> sec=1.0 wake=False',
+                    'BUTTON random smooth=True max_val=1000', 'status',
+                    'subscribe_presence', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_dht11.py

@@ -78,5 +78,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure log=False',
+    return resolve(('GRAPH measure log=False',
                              'logger', 'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_dht22.py

@@ -79,5 +79,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure log=False',
+    return resolve(('GRAPH measure log=False',
                              'logger', 'load', 'pinmap'), widgets=widgets)

{microsdevtoolkit-3.0.4 → microsdevtoolkit-3.0.7}/micrOS/source/modules/LM_system.py

@@ -268,7 +268,7 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('info', 'TEXTBOX top', 'gclean', 'heartbeat', 'clock',
+    return resolve(('info', 'GRAPH{"refresh":5000} top', 'gclean', 'heartbeat', 'clock',
                     'setclock year month mday hour minute sec',
                     'ntp', 'rssi', 'list_stations', 'pinmap key="builtin"', 'alarms clean=False',
                     'notifications enable=<None,True,False>',

microsdevtoolkit-3.0.7/micrOS/source/modules/LM_web.py

@@ -0,0 +1,74 @@
+"""
+Web backend loader
+    - Dynamic application dashboard
+    - Fileserver
+"""
+
+from json import dumps
+
+from Common import web_endpoint, web_mounts
+from Config import cfgget
+from Auth import sudo
+
+_CFG_HIDE = ("webui", "hwuid", "guimeta", "socport", "version", "auth", "soctout")
+
+
+def load(dashboard=True, fileserver:bool=False, fs_explore:bool=False):
+    """
+    Centralized Web Backend Services Loader
+    - Dynamic application dashboard
+    - Fileserver
+    :param dashboard:  bool - enable*/disable application dashboard
+    :param fileserver: bool - enable/disable* fileserver
+    :param fs_explore: bool - enable all shared web mounts: modules, data
+    """
+    endpoints = []
+    if dashboard:
+        web_endpoint('dashboard', 'dashboard.html')
+        endpoints.append("Dashboard initialized, endpoint: /dashboard")
+    if fileserver:
+        import LM_fileserver
+        endpoints.append(LM_fileserver.load())
+        endpoints.append(web_mounts(fs_explore, fs_explore, fs_explore))
+    return endpoints
+
+
+@sudo
+def enable_config():
+    """
+    Enable web configuration option
+    """
+    web_endpoint("config", _cfg_get_clb)
+    web_endpoint("config", _cfg_set_clb, "POST")
+    web_endpoint("config/ui", 'config.html')
+    return "Endpoints: /config and /config/ui"
+
+
+def _cfg_json(data):
+    return "application/json", dumps(data)
+
+
+def _cfg_get_clb(*_):
+    """
+    Get system config
+    """
+    return _cfg_json({k: v for k, v in cfgget().items() if k not in _CFG_HIDE})
+
+
+def _cfg_set_clb(*_):
+    """
+    Set system config delta - not implemented yet
+    """
+    return _cfg_json({"state": False, "result": "Config set is not implemented"})
+
+
+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 ('load dashboard=True fileserver=False fs_explore=False',
+            'enable_config',
+            'help')

microsdevtoolkit-3.0.7/micrOS/source/web/config.html

@@ -0,0 +1,59 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Config</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
+  <link rel="stylesheet" href="../ustyle.css">
+  <style>
+    #top {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      flex-wrap: wrap;
+      margin-bottom: 12px;
+    }
+    #cfg {
+      width: 100%;
+      min-height: 70vh;
+      box-sizing: border-box;
+      font-family: monospace;
+      font-size: 14px;
+      resize: vertical;
+    }
+    #out {
+      white-space: pre-wrap;
+    }
+  </style>
+</head>
+<body>
+  <h1> micrOS Config </h1>
+  <p>Current node configuration as JSON.</p>
+  <div id="top">
+    <button onclick="loadConfig()">Reload</button>
+  </div>
+  <textarea id="cfg" spellcheck="false" readonly></textarea>
+  <pre id="out"></pre>
+
+  <script>
+    const cfg = document.getElementById('cfg');
+    const out = document.getElementById('out');
+
+    function show(value) {
+      out.textContent = typeof value === 'string' ? value : JSON.stringify(value, null, 2);
+    }
+
+    function loadConfig(report = true) {
+      return fetch('/config')
+        .then(r => r.json())
+        .then(data => {
+          cfg.value = JSON.stringify(data, null, 2);
+          if (report) { show('Config loaded'); }
+        })
+        .catch(e => show('Load failed: ' + e.message));
+    }
+
+    document.addEventListener('DOMContentLoaded', () => loadConfig());
+  </script>
+</body>
+</html>

{microsdevtoolkit-3.0.4/toolkit/workspace/precompiled → microsdevtoolkit-3.0.7/micrOS/source}/web/dashboard.html

@@ -33,7 +33,6 @@
     </style>
     <script src="uapi.js" ></script>
     <script src="uwidgets.js" ></script>
-    <script src="uwidgets_pro.js" ></script>
     <script src="udashboard.js" ></script>
 </head>
 <body>