esp-rainmaker-cli 1.12.0__tar.gz → 1.13.1__tar.gz

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esp-rainmaker-cli
-Version: 1.12.0
+Version: 1.13.1
 Summary: A python utility to perform host based claiming
 Home-page: https://github.com/espressif/esp-rainmaker-cli
 Author: Espressif Systems
@@ -18,6 +18,8 @@ Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -32,11 +34,16 @@ Requires-Dist: future>=0.15.2
 Requires-Dist: pyparsing>=2.4.0
 Requires-Dist: pyelftools>=0.22
 Requires-Dist: esptool>=4.4
-Requires-Dist: esp-secure-cert-tool==1.0.1
+Requires-Dist: esp-secure-cert-tool>=2.3.6
 Requires-Dist: setuptools
 Requires-Dist: esp_idf_nvs_partition_gen>=0.1.6
 Requires-Dist: bleak>=0.20.0
 Requires-Dist: zeroconf>=0.131.0
+Requires-Dist: aiortc>=1.6.0
+Requires-Dist: boto3>=1.28.0
+Requires-Dist: websockets>=11.0
+Requires-Dist: opencv-python>=4.8.0
+Requires-Dist: numpy>=1.24.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -115,6 +122,22 @@ Changelog
 
 All major changes to ESP RainMaker CLI will be documented in this file.
 
+## [1.13.1] - 23-Apr-2026
+### Added
+- Node sharing enhancements:
+  - Support for sharing as "primary"
+  - Transferring nodes
+  - Adding sub-roles
+
+## [1.13.0] - 08-Apr-2026
+### Added
+- New `stream` command for WebRTC video streaming from ESP RainMaker camera devices via Amazon Kinesis Video Streams (KVS) signaling:
+  - Live video display with optional recording to file (`--output` / `-o`)
+  - Duration-limited streaming (`--duration`)
+  - Parallel ICE server fetch and WebSocket connection for faster stream setup
+  - Graceful handling of device disconnects, reboots, and frame timeouts
+  - Suppression of macOS FFmpeg duplicate library warnings during import
+
 ## [1.12.0] - 19-Feb-2026
 ### Added
 - Local node cache layer for faster `--local` control operations:

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/esp_rainmaker_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esp-rainmaker-cli
-Version: 1.12.0
+Version: 1.13.1
 Summary: A python utility to perform host based claiming
 Home-page: https://github.com/espressif/esp-rainmaker-cli
 Author: Espressif Systems
@@ -18,6 +18,8 @@ Classifier: Topic :: Software Development :: Embedded Systems
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -32,11 +34,16 @@ Requires-Dist: future>=0.15.2
 Requires-Dist: pyparsing>=2.4.0
 Requires-Dist: pyelftools>=0.22
 Requires-Dist: esptool>=4.4
-Requires-Dist: esp-secure-cert-tool==1.0.1
+Requires-Dist: esp-secure-cert-tool>=2.3.6
 Requires-Dist: setuptools
 Requires-Dist: esp_idf_nvs_partition_gen>=0.1.6
 Requires-Dist: bleak>=0.20.0
 Requires-Dist: zeroconf>=0.131.0
+Requires-Dist: aiortc>=1.6.0
+Requires-Dist: boto3>=1.28.0
+Requires-Dist: websockets>=11.0
+Requires-Dist: opencv-python>=4.8.0
+Requires-Dist: numpy>=1.24.0
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -115,6 +122,22 @@ Changelog
 
 All major changes to ESP RainMaker CLI will be documented in this file.
 
+## [1.13.1] - 23-Apr-2026
+### Added
+- Node sharing enhancements:
+  - Support for sharing as "primary"
+  - Transferring nodes
+  - Adding sub-roles
+
+## [1.13.0] - 08-Apr-2026
+### Added
+- New `stream` command for WebRTC video streaming from ESP RainMaker camera devices via Amazon Kinesis Video Streams (KVS) signaling:
+  - Live video display with optional recording to file (`--output` / `-o`)
+  - Duration-limited streaming (`--duration`)
+  - Parallel ICE server fetch and WebSocket connection for faster stream setup
+  - Graceful handling of device disconnects, reboots, and frame timeouts
+  - Suppression of macOS FFmpeg duplicate library warnings during import
+
 ## [1.12.0] - 19-Feb-2026
 ### Added
 - Local node cache layer for faster `--local` control operations:

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/esp_rainmaker_cli.egg-info/SOURCES.txt

@@ -11,22 +11,26 @@ rainmaker/__init__.py
 rainmaker/rainmaker.py
 rainmaker/version.py
 rmaker_cmd/__init__.py
+rmaker_cmd/automation.py
 rmaker_cmd/browserlogin.py
 rmaker_cmd/cache.py
 rmaker_cmd/cmd_response.py
 rmaker_cmd/group.py
 rmaker_cmd/node.py
 rmaker_cmd/provision.py
+rmaker_cmd/stream.py
 rmaker_cmd/test.py
 rmaker_cmd/user.py
 rmaker_cmd/html/welcome.html
 rmaker_lib/__init__.py
+rmaker_lib/aws_credentials.py
 rmaker_lib/cmd_response.py
 rmaker_lib/configmanager.py
 rmaker_lib/constants.py
 rmaker_lib/device.py
 rmaker_lib/envval.py
 rmaker_lib/exceptions.py
+rmaker_lib/kvs_streaming.py
 rmaker_lib/local_control.py
 rmaker_lib/logger.py
 rmaker_lib/node.py

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/esp_rainmaker_cli.egg-info/requires.txt

@@ -9,8 +9,13 @@ future>=0.15.2
 pyparsing>=2.4.0
 pyelftools>=0.22
 esptool>=4.4
-esp-secure-cert-tool==1.0.1
+esp-secure-cert-tool>=2.3.6
 setuptools
 esp_idf_nvs_partition_gen>=0.1.6
 bleak>=0.20.0
 zeroconf>=0.131.0
+aiortc>=1.6.0
+boto3>=1.28.0
+websockets>=11.0
+opencv-python>=4.8.0
+numpy>=1.24.0

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/rainmaker/rainmaker.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2020-2026 Espressif Systems (Shanghai) CO LTD
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -16,7 +16,9 @@ from rmaker_cmd.provision import provision
 from rmaker_cmd.test import test
 from rmaker_lib.logger import log
 from rmaker_cmd.group import group_add, group_remove, group_edit, group_list, group_show, group_add_nodes, group_remove_nodes, group_list_nodes
+from rmaker_cmd.automation import automation_add, automation_edit, automation_remove, automation_get
 from rmaker_cmd.cache import cache_manage
+from rmaker_cmd.stream import stream_video
 
 # Import the version
 from rainmaker.version import VERSION
@@ -666,6 +668,29 @@ def main():
                                "format: <nodeid1>,<nodeid2>,...",
                                required=True)
 
+    add_op_parser.add_argument('--sub_role',
+                               type=int,
+                               metavar='<sub_role>',
+                               choices=range(1, 5),
+                               help='Sub-role for the secondary user (1-4)',
+                               default=None)
+
+    add_op_parser.add_argument('--primary',
+                               action='store_true',
+                               help='Set "primary":true in the sharing request')
+
+    add_op_parser.add_argument('--transfer',
+                               action='store_true',
+                               help='Transfer node ownership to the specified user')
+
+    add_op_parser.add_argument('--new_role',
+                               type=str,
+                               metavar='<new_role>',
+                               choices=['primary', 'secondary'],
+                               help='New role for the current user after transfer (primary/secondary).\n'
+                               'Only used with --transfer',
+                               default=None)
+
     add_profile_argument(add_op_parser)
     add_op_parser.set_defaults(func=node_sharing_ops, parser=add_op_parser)
 
@@ -909,6 +934,76 @@ def main():
     add_profile_argument(group_list_nodes_parser)
     group_list_nodes_parser.set_defaults(func=group_list_nodes)
 
+    # Automation Management
+    automation_parser = subparsers.add_parser('automations',
+                                              help='Manage automation triggers')
+    automation_parser.set_defaults(func=lambda vars=None: automation_parser.print_help())
+    automation_subparsers = automation_parser.add_subparsers(dest='automation_command',
+                                                             help='Automation operations')
+
+    # automations add
+    auto_add_parser = automation_subparsers.add_parser('add', help='Create a new automation trigger')
+    auto_add_parser.add_argument('--name', type=str, required=True, help='Name of the automation')
+    auto_add_parser.add_argument('--event-type', type=str, required=True,
+                                 choices=['params', 'weather', 'daylight'],
+                                 help='Event type (params, weather, daylight)')
+    auto_add_parser.add_argument('--event', type=str, required=True, action='append',
+                                 help='Event JSON object (repeatable). '
+                                      'E.g., \'{"params": {"Light": {"Brightness": 100}}, "check": "=="}\'')
+    auto_add_parser.add_argument('--action', type=str, required=True,
+                                 help='Action JSON (object or array of objects). '
+                                      'E.g., \'{"node_id": "xxx", "params": {"Light": {"Output": true}}}\'')
+    auto_add_parser.add_argument('--node-id', type=str,
+                                 help='Node ID (required for event-type params)')
+    auto_add_parser.add_argument('--location', type=str,
+                                 help='Location as lat,long (required for event-type weather/daylight). '
+                                      'E.g., 18.521428,73.8544541')
+    auto_add_parser.add_argument('--event-operator', type=str, choices=['AND', 'OR'],
+                                 help='Logical operator for multiple events (AND/OR)')
+    auto_add_parser.add_argument('--retrigger', action='store_true', default=False,
+                                 help='Allow retriggering for the same event')
+    auto_add_parser.add_argument('--metadata', type=str, help='Metadata as JSON string')
+    add_profile_argument(auto_add_parser)
+    auto_add_parser.set_defaults(func=automation_add)
+
+    # automations edit
+    auto_edit_parser = automation_subparsers.add_parser('edit', help='Edit an existing automation trigger')
+    auto_edit_parser.add_argument('--id', type=str, required=True, help='Automation ID')
+    auto_edit_parser.add_argument('--name', type=str, help='New name for the automation')
+    auto_edit_parser.add_argument('--event', type=str, action='append',
+                                  help='Event JSON object (repeatable)')
+    auto_edit_parser.add_argument('--action', type=str,
+                                  help='Action JSON (object or array of objects)')
+    auto_edit_parser.add_argument('--node-id', type=str, help='Node ID')
+    auto_edit_parser.add_argument('--location', type=str,
+                                  help='Location as lat,long')
+    auto_edit_parser.add_argument('--event-operator', type=str, choices=['AND', 'OR'],
+                                  help='Logical operator for multiple events (AND/OR)')
+    auto_edit_parser.add_argument('--retrigger', action='store_true', default=False,
+                                  help='Enable retriggering')
+    auto_edit_parser.add_argument('--no-retrigger', action='store_true', default=False,
+                                  help='Disable retriggering')
+    auto_edit_parser.add_argument('--enabled', action='store_true', default=False,
+                                  help='Enable the automation')
+    auto_edit_parser.add_argument('--disabled', action='store_true', default=False,
+                                  help='Disable the automation')
+    auto_edit_parser.add_argument('--metadata', type=str, help='Metadata as JSON string')
+    add_profile_argument(auto_edit_parser)
+    auto_edit_parser.set_defaults(func=automation_edit)
+
+    # automations remove
+    auto_remove_parser = automation_subparsers.add_parser('remove', help='Remove an automation trigger')
+    auto_remove_parser.add_argument('--id', type=str, required=True, help='Automation ID to remove')
+    add_profile_argument(auto_remove_parser)
+    auto_remove_parser.set_defaults(func=automation_remove)
+
+    # automations get
+    auto_get_parser = automation_subparsers.add_parser('get', help='Get automation triggers')
+    auto_get_parser.add_argument('--id', type=str, help='Automation ID (omit to list all)')
+    auto_get_parser.add_argument('--node-id', type=str, help='Filter by node ID')
+    add_profile_argument(auto_get_parser)
+    auto_get_parser.set_defaults(func=automation_get)
+
     # Node Management (tags, metadata)
     node_parser = subparsers.add_parser('node',
                                         help='Manage node properties (tags, metadata)')
@@ -1018,6 +1113,31 @@ def main():
     add_profile_argument(raw_api_parser)
     raw_api_parser.set_defaults(func=raw_api_call)
 
+    # Video Streaming
+    stream_parser = subparsers.add_parser('stream',
+                                          help='Stream video from a camera device')
+    stream_parser.add_argument('nodeid',
+                               type=str,
+                               metavar='<nodeid>',
+                               help='Node ID for the camera device')
+    stream_parser.add_argument('--output', '-o',
+                               type=str,
+                               metavar='<path>',
+                               help='Save video to file (MP4)')
+    stream_parser.add_argument('--region',
+                               type=str,
+                               metavar='<region>',
+                               help='AWS region override')
+    stream_parser.add_argument('--duration',
+                               type=int,
+                               metavar='<seconds>',
+                               help='Stream duration in seconds')
+    stream_parser.add_argument('--stats-only',
+                               action='store_true',
+                               help='Show statistics only, no video display')
+    add_profile_argument(stream_parser)
+    stream_parser.set_defaults(func=stream_video)
+
     args = parser.parse_args()
 
     if args.func is not None:

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/rainmaker/version.py

@@ -5,4 +5,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # This file contains the version information for the ESP RainMaker CLI
-VERSION = "1.12.0"
+VERSION = "1.13.1"

esp_rainmaker_cli-1.13.1/rmaker_cmd/automation.py

@@ -0,0 +1,217 @@
+# SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from rmaker_lib.profile_utils import get_session_with_profile
+import json
+
+
+def _handle_error(e, operation):
+    """Helper function to handle errors and extract descriptions from API responses"""
+    error_msg = str(e)
+    try:
+        if hasattr(e, 'response') and e.response is not None:
+            resp = e.response.json()
+            if 'description' in resp:
+                error_msg = resp['description']
+    except Exception:
+        pass
+    print(f"Failed to {operation}: {error_msg}")
+
+
+def _parse_json(value, field_name):
+    """Parse a JSON string, returning the parsed object or None on error."""
+    try:
+        return json.loads(value)
+    except Exception as e:
+        print(f"Invalid JSON for {field_name}: {e}")
+        return None
+
+
+def _parse_location(location_str):
+    """Parse 'lat,long' string into location dict."""
+    parts = location_str.split(',')
+    if len(parts) != 2:
+        print("Invalid location format. Use: lat,long (e.g., 18.521428,73.8544541)")
+        return None
+    return {"latitude": parts[0].strip(), "longitude": parts[1].strip()}
+
+
+def automation_add(vars=None):
+    try:
+        s = get_session_with_profile(vars or {})
+        name = vars['name']
+        event_type = vars['event_type']
+        event_jsons = vars['event']
+        action_json = vars['action']
+        node_id = vars.get('node_id')
+        location = vars.get('location')
+        event_operator = vars.get('event_operator')
+        retrigger = vars.get('retrigger', False)
+        metadata_arg = vars.get('metadata')
+
+        # Map 'params' to 'node_params' for the API
+        api_event_type = 'node_params' if event_type == 'params' else event_type
+
+        # Validate event_type-specific requirements
+        if event_type == 'params' and not node_id:
+            print("Error: --node-id is required when --event-type is 'params'")
+            return
+        if event_type in ('weather', 'daylight') and not location:
+            print(f"Error: --location is required when --event-type is '{event_type}'")
+            return
+
+        # Parse events
+        events = []
+        for ev in event_jsons:
+            parsed = _parse_json(ev, 'event')
+            if parsed is None:
+                return
+            events.append(parsed)
+
+        # Validate event_operator if multiple events
+        if len(events) > 1 and not event_operator:
+            print("Error: --event-operator (AND/OR) is required when multiple events are specified")
+            return
+
+        # Parse action
+        action = _parse_json(action_json, 'action')
+        if action is None:
+            return
+        if isinstance(action, dict):
+            actions = [action]
+        elif isinstance(action, list):
+            actions = action
+        else:
+            print("Error: --action must be a JSON object or array of objects")
+            return
+
+        # Build payload
+        payload = {
+            'name': name,
+            'event_type': api_event_type,
+            'events': events,
+            'actions': actions,
+            'retrigger': retrigger,
+        }
+        if node_id:
+            payload['node_id'] = node_id
+        if location:
+            loc = _parse_location(location)
+            if loc is None:
+                return
+            payload['location'] = loc
+        if event_operator:
+            payload['event_operator'] = event_operator.lower()
+        if metadata_arg:
+            metadata = _parse_json(metadata_arg, 'metadata')
+            if metadata is None:
+                return
+            payload['metadata'] = metadata
+
+        resp = s.create_automation(payload)
+        print("Automation created successfully:")
+        print(json.dumps(resp, indent=2))
+    except Exception as e:
+        _handle_error(e, "create automation")
+
+
+def automation_edit(vars=None):
+    try:
+        s = get_session_with_profile(vars or {})
+        automation_id = vars['id']
+
+        payload = {}
+        if vars.get('name'):
+            payload['name'] = vars['name']
+        if vars.get('node_id'):
+            payload['node_id'] = vars['node_id']
+        if vars.get('event'):
+            events = []
+            for ev in vars['event']:
+                parsed = _parse_json(ev, 'event')
+                if parsed is None:
+                    return
+                events.append(parsed)
+            payload['events'] = events
+        if vars.get('action'):
+            action = _parse_json(vars['action'], 'action')
+            if action is None:
+                return
+            if isinstance(action, dict):
+                payload['actions'] = [action]
+            elif isinstance(action, list):
+                payload['actions'] = action
+            else:
+                print("Error: --action must be a JSON object or array of objects")
+                return
+        if vars.get('event_operator'):
+            payload['event_operator'] = vars['event_operator'].lower()
+        if vars.get('location'):
+            loc = _parse_location(vars['location'])
+            if loc is None:
+                return
+            payload['location'] = loc
+        if vars.get('metadata'):
+            metadata = _parse_json(vars['metadata'], 'metadata')
+            if metadata is None:
+                return
+            payload['metadata'] = metadata
+
+        # Handle retrigger/no-retrigger
+        if vars.get('retrigger'):
+            payload['retrigger'] = True
+        elif vars.get('no_retrigger'):
+            payload['retrigger'] = False
+
+        # Handle enabled/disabled
+        if vars.get('enabled'):
+            payload['enabled'] = True
+        elif vars.get('disabled'):
+            payload['enabled'] = False
+
+        if not payload:
+            print("No fields to update. Provide at least one option to edit.")
+            return
+
+        resp = s.update_automation(automation_id, payload)
+        print("Automation updated successfully:")
+        print(json.dumps(resp, indent=2))
+    except Exception as e:
+        _handle_error(e, "update automation")
+
+
+def automation_remove(vars=None):
+    try:
+        s = get_session_with_profile(vars or {})
+        automation_id = vars['id']
+        resp = s.remove_automation(automation_id)
+        print("Automation removed successfully:")
+        print(json.dumps(resp, indent=2))
+    except Exception as e:
+        _handle_error(e, "remove automation")
+
+
+def automation_get(vars=None):
+    try:
+        s = get_session_with_profile(vars or {})
+        automation_id = vars.get('id')
+        node_id = vars.get('node_id')
+        resp = s.get_automations(automation_id=automation_id, node_id=node_id)
+
+        if not resp:
+            print("No automations found.")
+            return
+
+        automations = resp.get('automation_trigger_actions', [])
+        if not automations:
+            print("No automations found.")
+            return
+
+        if automation_id:
+            print("Automation details:")
+        else:
+            print(f"Automations ({len(automations)}):")
+        print(json.dumps(automations, indent=2))
+    except Exception as e:
+        _handle_error(e, "get automations")

{esp_rainmaker_cli-1.12.0 → esp_rainmaker_cli-1.13.1}/rmaker_cmd/node.py

@@ -897,7 +897,7 @@ def list_sharing_details(node_id=None, primary_user=False, request_id=None, list
 
     return node_json_resp
 
-def add_user_to_share_nodes(nodes=None, user=None, profile_override=None):
+def add_user_to_share_nodes(nodes=None, user=None, sub_role=None, primary=False, transfer=False, new_role=None, profile_override=None):
     """
     Add user to share nodes
 
@@ -932,6 +932,14 @@ def add_user_to_share_nodes(nodes=None, user=None, profile_override=None):
     api_input = {}
     api_input['nodes'] = node_id_list
     api_input['user_name'] = user
+    if sub_role is not None:
+        api_input['sub_role'] = sub_role
+    if primary:
+        api_input['primary'] = True
+    if transfer:
+        api_input['transfer'] = True
+        if new_role is not None:
+            api_input['new_role'] = new_role
     log.debug("API data set: {}".format(api_input))
 
     # API with profile-aware session
@@ -1116,7 +1124,7 @@ def node_sharing_ops(vars=None):
         if action == 'add_user':
             # Share nodes with user
             print("Adding user to share node(s)")
-            node_json_resp = add_user_to_share_nodes(nodes=vars['nodes'], user=vars['user'], profile_override=profile_override)
+            node_json_resp = add_user_to_share_nodes(nodes=vars['nodes'], user=vars['user'], sub_role=vars.get('sub_role'), primary=vars.get('primary', False), transfer=vars.get('transfer', False), new_role=vars.get('new_role'), profile_override=profile_override)
 
             # Print success response
             if 'status' in node_json_resp and node_json_resp['status'].lower() == 'success':