eva-shell 0.2.36__tar.gz → 0.2.38__tar.gz

{eva_shell-0.2.36 → eva_shell-0.2.38}/PKG-INFO

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

{eva_shell-0.2.36 → eva_shell-0.2.38}/eva4_shell/__init__.py

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

{eva_shell-0.2.36 → eva_shell-0.2.38}/eva4_shell/ap.py

@@ -12,12 +12,12 @@ 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
 from .client import DEFAULT_KIOSK_SERVICE, DEFAULT_GENERATOR_SERVICE
-from .client import DEFAULT_ACCOUNTING_SERVICE, DEFAULT_ALARM_SERVICE
+from .client import DEFAULT_ACCOUNTING_SERVICE, DEFAULT_ALARM_SERVICE, DEFAULT_VIDEO_SERVICE
 
 ALARM_OP_CODES = [
     'TT', 'TL', 'LL', 'SS', 'SD', 'OS', 'CC', 'AA', 'US', 'RD', 'IS'
@@ -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')
@@ -820,6 +826,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 +844,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()
@@ -1184,6 +1200,94 @@ def append_cloud_cli(root_sp):
                    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')
+
+    ap = sp_generator.add_parser('rec', help='video recordings')
+    sp = ap.add_subparsers(dest='_subc2', help='sub command')
+
+    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(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
+
+    p = sp.add_parser('list', help='list video recordings')
+    p.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
+
+    p = sp.add_parser('edit', help='edit a video recording config')
+    p.add_argument('i', metavar='source')
+    p.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
+
+    p = sp.add_parser('enable', help='enable (start) a video recording')
+    p.add_argument('i', metavar='source')
+    p.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
+
+    p = sp.add_parser('disable', help='disable (stop) a video recording')
+    p.add_argument('i', metavar='source')
+    p.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
+
+    p = sp.add_parser('destroy', help='destroy a video recording')
+    p.add_argument('i', metavar='source')
+    p.add_argument(
+        '-a',
+        '--video-svc',
+        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.add_argument('i', metavar='MASK')
+    p.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('videosrv')
+    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.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('generator')
+    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.add_argument(
+        '-a',
+        '--video-svc',
+        help=f'video service (default: {DEFAULT_VIDEO_SERVICE})',
+        default=DEFAULT_VIDEO_SERVICE).completer = ComplSvc('generator')
+    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'
@@ -1589,6 +1693,7 @@ def init_ap():
         'lvar': [],
         'mirror': [],
         'node': [],
+        'video': [],
         'server': [],
         'spoint': [],
         'system': [],
@@ -1627,6 +1732,7 @@ def init_ap():
     if is_local_shell():
         append_mirror_cli(sp)
     append_node_cli(sp)
+    append_video_cli(sp)
     if is_local_shell():
         append_server_cli(sp)
     append_spoint_cli(sp)

{eva_shell-0.2.36 → eva_shell-0.2.38}/eva4_shell/cli.py

@@ -13,13 +13,11 @@ 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]))
@@ -1707,6 +1724,99 @@ class CLI:
         call_rpc('kiosk.dev_close', dict(i=i), target=kiosk_svc)
         ok()
 
+    def video_rec_list(self, video_svc):
+        data = call_rpc('rec.list', target=video_svc)
+        print_result(data, cols=['oid', 'keep', 'enabled'])
+
+    def video_rec_create(self, i, keep, enabled, video_svc):
+        payload = {
+            'oid': i,
+        }
+        if keep:
+            payload['keep'] = keep
+        if enabled:
+            payload['enabled'] = enabled
+        call_rpc('rec.deploy',
+                 dict(video_recordings=[payload]),
+                 target=video_svc)
+        ok()
+
+    def video_rec_destroy(self, i, video_svc):
+        payload = {
+            'oid': i,
+        }
+        call_rpc('rec.undeploy',
+                 dict(video_recordings=[payload]),
+                 target=video_svc)
+        ok()
+
+    def video_rec_enable(self, i, video_svc):
+        call_rpc('rec.enable', dict(i=i), target=video_svc)
+        ok()
+
+    def video_rec_disable(self, i, video_svc):
+        call_rpc('rec.disable', dict(i=i), target=video_svc)
+        ok()
+
+    def video_rec_edit(self, i, video_svc):
+
+        def deploy(cfg, i):
+            call_rpc('rec.deploy',
+                     dict(video_recordings=[cfg]),
+                     target=video_svc)
+            print(f'video recording config re-deployed: {i}')
+            print()
+
+        config = call_rpc('rec.get_config', dict(i=i), target=video_svc)
+        edit_config(config,
+                    f'video.rec|{i}|config',
+                    deploy_fn=partial(deploy, i=i))
+
+    def video_rec_export(self, i, video_svc, output=None):
+        c = 0
+        configs = []
+        for source in call_rpc('rec.list', target=video_svc):
+            oid = source['oid']
+            if (i.startswith('*') and oid.endswith(i[1:])) or \
+                (i.endswith('*') and oid.startswith(i[:-1])) or \
+                (i.startswith('*') and i.endswith('*') and i[1:-1] in oid) or \
+                i == oid:
+                c += 1
+                config = call_rpc('rec.get_config',
+                                  dict(i=oid),
+                                  target=video_svc)
+                configs.append(config)
+        result = dict(video_recordings=configs)
+        if current_command.json:
+            print_result(result)
+        else:
+            import yaml
+            dump = yaml.dump(result, default_flow_style=False)
+            if output is None:
+                print(dump)
+            else:
+                write_file(output, dump)
+                print(f'{c} video recording configuration(s) exported')
+                print()
+
+    def video_rec_deploy(self, video_svc, file=None):
+        import yaml
+        sources = yaml.safe_load(
+            read_file(file).decode()).pop('video_recordings')
+        call_rpc('rec.deploy', dict(video_recordings=sources), target=video_svc)
+        print(f'{len(sources)} video recording configuration(s) deployed')
+        print()
+
+    def video_rec_undeploy(self, video_svc, file=None):
+        import yaml
+        sources = yaml.safe_load(
+            read_file(file).decode()).pop('video_recordings')
+        call_rpc('rec.undeploy',
+                 dict(video_recordings=sources),
+                 target=video_svc)
+        print(f'{len(sources)} video recording configuration(s) undeployed')
+        print()
+
     def generator_source_list(self, generator_svc):
         data = call_rpc('source.list', target=generator_svc)
         print_result(data, cols=['name', 'kind', 'active'])

{eva_shell-0.2.36 → eva_shell-0.2.38}/eva4_shell/client.py

@@ -16,6 +16,7 @@ DEFAULT_ACL_SERVICE = 'eva.aaa.acl'
 DEFAULT_AUTH_SERVICE = 'eva.aaa.localauth'
 DEFAULT_KIOSK_SERVICE = 'eva.kioskman.default'
 DEFAULT_GENERATOR_SERVICE = 'eva.generator.default'
+DEFAULT_VIDEO_SERVICE = 'eva.videosrv.default'
 DEFAULT_ACCOUNTING_SERVICE = 'eva.aaa.accounting'
 DEFAULT_ALARM_SERVICE = 'eva.alarm.default'
 

{eva_shell-0.2.36 → eva_shell-0.2.38}/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.36 → eva_shell-0.2.38}/eva_shell.egg-info/PKG-INFO

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

{eva_shell-0.2.36 → eva_shell-0.2.38}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.36'
+__version__ = '0.2.38'
 
 import setuptools