eva-shell 0.2.37__tar.gz → 0.2.39__tar.gz

{eva_shell-0.2.37 → eva_shell-0.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.37
+Version: 0.2.39
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva_shell-0.2.37 → eva_shell-0.2.39}/eva4_shell/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.2.37'
+__version__ = '0.2.39'
 
 DEFAULT_REPOSITORY_URL = 'https://pub.bma.ai/eva4'

{eva_shell-0.2.37 → eva_shell-0.2.39}/eva4_shell/ap.py

@@ -12,7 +12,7 @@ neotermcolor.readline_always_safe = True
 
 from .sharedobj import common, current_command
 from .tools import print_tb, err, is_local_shell
-from .compl import ComplOID, ComplSvc, ComplNode, ComplDeployFile, ComplDobj
+from .compl import ComplOID, ComplSvc, ComplNode, ComplDeployFile, ComplAnyFile, ComplDobj
 from .compl import ComplOIDtp, ComplSvcRpcMethod, ComplSvcRpcParams, ComplEdit
 from .client import call_rpc, DEFAULT_DB_SERVICE, DEFAULT_REPL_SERVICE
 from .client import DEFAULT_ACL_SERVICE, DEFAULT_AUTH_SERVICE
@@ -523,6 +523,12 @@ def append_svc_cli(root_sp):
         'purge', help='purge service (destroy and delete all service data)')
     p.add_argument('i', metavar='SVC').completer = ComplSvc()
 
+    p = sp.add_parser('flash', help='flash the service binary')
+    p.add_argument('i', metavar='SVC').completer = ComplSvc()
+    p.add_argument(
+        'file', metavar='FILE',
+        help='service file to reflash with').completer = ComplAnyFile()
+
 
 def append_acl_cli(root_sp):
     ap = root_sp.add_parser('acl', help='ACL commands')
@@ -764,6 +770,9 @@ def append_item_cli(root_sp):
     p.add_argument('i', metavar='MASK').completer = ComplOID('state')
     p.add_argument('-y', '--full', action='store_true')
 
+    p = sp.add_parser('stream-info', help='item stream info')
+    p.add_argument('i', metavar='MASK').completer = ComplOID('state')
+
     p = sp.add_parser('history', help='item state history')
     p.add_argument('i', metavar='OID').completer = ComplOID('state')
     p.add_argument('-a',
@@ -820,6 +829,12 @@ def append_item_cli(root_sp):
 
     p = sp.add_parser('create', help='create an item')
     p.add_argument('i', metavar='OID').completer = ComplOID()
+    p.add_argument(
+        '-p',
+        '--python',
+        help=
+        'For Python lmacro: assign eva.controller.py as action svc and edit code after creation',
+        action='store_true')
 
     p = sp.add_parser('destroy', help='destroy item(s)')
     p.add_argument('i', metavar='MASK').completer = ComplOID()
@@ -832,6 +847,10 @@ def append_item_cli(root_sp):
 
     p = sp.add_parser('edit', help='edit item config')
     p.add_argument('i', metavar='OID').completer = ComplOID()
+    p.add_argument('-p',
+                   '--python',
+                   help='For Python lmacro: edit code',
+                   action='store_true')
 
     p = sp.add_parser('set', help='set item state')
     p.add_argument('i', metavar='OID').completer = ComplOID()
@@ -1183,6 +1202,7 @@ def append_cloud_cli(root_sp):
                    help='update without any confirmations',
                    action='store_true')
 
+
 def append_video_cli(root_sp):
     ap_generator = root_sp.add_parser('video', help='video commands')
     sp_generator = ap_generator.add_subparsers(dest='_subc', help='sub command')
@@ -1192,12 +1212,8 @@ def append_video_cli(root_sp):
 
     p = sp.add_parser('create', help='create a video recording')
     p.add_argument('i', metavar='source')
-    p.add_argument('--keep',
-                   type=float,
-                   help='Keep (seconds)')
-    p.add_argument('--enabled',
-                   help='Enable recording',
-                   action='store_true')
+    p.add_argument('--keep', type=float, help='Keep (seconds)')
+    p.add_argument('--enabled', help='Enable recording', action='store_true')
     p.add_argument(
         '-a',
         '--video-svc',
@@ -1243,7 +1259,8 @@ def append_video_cli(root_sp):
         help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
         default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
 
-    p = sp.add_parser('export', help='export video recording config(s) to a deployment file')
+    p = sp.add_parser(
+        'export', help='export video recording config(s) to a deployment file')
     p.add_argument('i', metavar='MASK')
     p.add_argument(
         '-a',
@@ -1253,7 +1270,8 @@ def append_video_cli(root_sp):
     p.add_argument('-o', '--output', metavar='FILE',
                    help='output file').completer = ComplDeployFile()
 
-    p = sp.add_parser('deploy', help='deploy video recording(s) from a deployment file')
+    p = sp.add_parser('deploy',
+                      help='deploy video recording(s) from a deployment file')
     p.add_argument(
         '-a',
         '--video-svc',
@@ -1262,8 +1280,8 @@ def append_video_cli(root_sp):
     p.add_argument('-f', '--file', metavar='FILE',
                    help='deployment file').completer = ComplDeployFile()
 
-    p = sp.add_parser('undeploy',
-                      help='undeploy video recordings(s) using a deployment file')
+    p = sp.add_parser(
+        'undeploy', help='undeploy video recordings(s) using a deployment file')
     p.add_argument(
         '-a',
         '--video-svc',
@@ -1272,6 +1290,7 @@ def append_video_cli(root_sp):
     p.add_argument('-f', '--file', metavar='FILE',
                    help='deployment file').completer = ComplDeployFile()
 
+
 def append_generator_cli(root_sp):
     source_types = [
         'random', 'random_float', 'counter', 'time', 'wave', 'udp_float'

{eva_shell-0.2.37 → eva_shell-0.2.39}/eva4_shell/cli.py

@@ -6,20 +6,18 @@ from functools import partial
 from collections import OrderedDict
 
 import busrt
-from evaics.sdk import pack
+from evaics.sdk import pack, VideoFrame
 from neotermcolor import colored
 from rapidtables import format_table, FORMAT_GENERATOR, FORMAT_GENERATOR_COLS
 
 from .tools import print_result, ok
 from .tools import edit_config, edit_remote_file, read_file, write_file
 from .tools import print_action_result, format_value, prepare_time, err, warn
-from .tools import get_node_svc_info, edit_file, get_term_size, exec_cmd, xc
+from .tools import get_node_svc_info, get_term_size, exec_cmd, xc
 from .tools import get_my_ip, check_local_shell
 from .client import call_rpc, DEFAULT_REPL_SERVICE, connect
 from .sharedobj import common, current_command
 
-from . import DEFAULT_REPOSITORY_URL
-
 
 def eva_control_c(c, pfx=''):
     check_local_shell()
@@ -27,6 +25,12 @@ def eva_control_c(c, pfx=''):
     os.system(cmd)
 
 
+def format_python_fname(i):
+    short_id = i.rsplit('/', 1)[-1].rsplit(':', 1)[-1]
+    fname = f'xc/py/{short_id}.py'
+    return fname
+
+
 class CLI:
 
     def __init__(self, *args, **kwargs):
@@ -661,6 +665,11 @@ class CLI:
         call_rpc('svc.restart', dict(i=i))
         ok()
 
+    def svc_flash(self, i, file):
+        binary = open(file, 'rb').read()
+        call_rpc('svc.flash', dict(i=i, binary=binary))
+        ok()
+
     def svc_destroy(self, i):
         call_rpc('svc.undeploy', dict(svcs=[i]))
         ok()
@@ -1134,8 +1143,13 @@ class CLI:
         print(f'{len(items)} item(s) undeployed')
         print()
 
-    def item_create(self, i):
-        call_rpc('item.create', dict(i=i))
+    def item_create(self, i, python=False):
+        if python:
+            cfg = {'oid': i, 'action': {'svc': 'eva.controller.py'}}
+            call_rpc('item.deploy', dict(items=[cfg]))
+            return self.edit(format_python_fname(i), 'eva.filemgr.main')
+        else:
+            call_rpc('item.create', dict(i=i))
         ok()
 
     def item_destroy(self, i):
@@ -1146,7 +1160,10 @@ class CLI:
         call_rpc('item.enable', dict(i=i))
         ok()
 
-    def item_edit(self, i):
+    def item_edit(self, i, python=False):
+
+        if python:
+            return self.edit(format_python_fname(i), 'eva.filemgr.main')
 
         def deploy_edited_item(cfg, i):
             call_rpc('item.deploy', dict(items=[cfg]))
@@ -1173,6 +1190,33 @@ class CLI:
                          't|n=set time|f=time', 'node', 'connected', 'act'
                      ])
 
+    def item_stream_info(self, i):
+        data = call_rpc(
+            'item.state',
+            dict(i=i, include_binary_values=True),
+        )
+        for d in data:
+            value = d['value']
+            del d['value']
+            if value is None:
+                d['format'] = 'nodata'
+            else:
+                try:
+                    frame = VideoFrame(value)
+                    d['format'] = frame.format_name()
+                    d['dims'] = [frame.width, frame.height]
+                except:
+                    d['format'] = 'not-a-stream'
+
+        print_result(data,
+                     cols=[
+                         'oid',
+                         'status',
+                         'format',
+                         'dims',
+                         't|n=set time|f=time',
+                     ])
+
     def item_slog(self, i, db_svc, time_start, time_end, time_zone, limit):
         time_start = prepare_time(time_start)
         time_end = prepare_time(time_end)

{eva_shell-0.2.37 → eva_shell-0.2.39}/eva4_shell/compl.py

@@ -96,6 +96,38 @@ class ComplSvcRpcParams:
                 if p.startswith(prefix) and not p in pp:
                     yield f'{p}='
 
+class ComplAnyFile:
+
+    def __call__(self, prefix, **kwargs):
+        import glob
+        expanded = None
+
+        def expand_user(pfx):
+            nonlocal expanded
+            if pfx.startswith('~'):
+                expanded = os.path.expanduser('~')
+                return expanded + pfx[1:]
+            else:
+                return pfx
+
+        def contract_user(pfx):
+            nonlocal expanded
+            if expanded is None:
+                return pfx
+            else:
+                return '~' + pfx[len(expanded):]
+
+        if not prefix:
+            masks = ['*']
+        else:
+            prefix = expand_user(prefix)
+            masks = [f'{prefix}*']
+        for mask in masks:
+            for f in glob.glob(mask):
+                yield contract_user(f)
+            for f in glob.glob(f'{prefix}*'):
+                if os.path.isdir(f):
+                    yield contract_user(f'{f}/')
 
 class ComplDeployFile:
 

{eva_shell-0.2.37 → eva_shell-0.2.39}/eva_shell.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.37
+Version: 0.2.39
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech

{eva_shell-0.2.37 → eva_shell-0.2.39}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.37'
+__version__ = '0.2.39'
 
 import setuptools