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

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

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

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

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

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

@@ -17,7 +17,7 @@ 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'
@@ -481,6 +481,10 @@ def append_svc_cli(root_sp):
                    metavar='FILE',
                    help='read call params payload form the file ("-" for stdin)'
                   ).completer = ComplDeployFile()
+    p.add_argument('-o', '--output', metavar='FILE', help='output file')
+    p.add_argument('--passthrough',
+                   action='store_true',
+                   help='do not unpack the result (requires the output file)')
     p.add_argument('method', metavar='METHOD').completer = ComplSvcRpcMethod()
     p.add_argument(
         'params',
@@ -1179,6 +1183,94 @@ 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')
+
+    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 = [
@@ -1585,6 +1677,7 @@ def init_ap():
         'lvar': [],
         'mirror': [],
         'node': [],
+        'video': [],
         'server': [],
         'spoint': [],
         'system': [],
@@ -1623,6 +1716,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.35 → eva_shell-0.2.37}/eva4_shell/cli.py

@@ -669,7 +669,14 @@ class CLI:
         call_rpc('svc.purge', dict(svcs=[i]))
         ok()
 
-    def svc_call(self, i, file, method, params, trace=False):
+    def svc_call(self,
+                 i,
+                 file,
+                 output,
+                 passthrough,
+                 method,
+                 params,
+                 trace=False):
         if file:
             import yaml
             payload = yaml.safe_load(read_file(file))
@@ -678,11 +685,22 @@ class CLI:
             for p in params:
                 n, v = p.split('=', 1)
                 payload[n] = format_value(v, advanced=True, name=n)
+        if passthrough and not output:
+            raise ValueError(
+                'output file is required when passthrought is enabled')
         result = call_rpc(method,
                           payload if payload else None,
                           target=i,
-                          trace=trace)
-        if current_command.json or isinstance(result, list):
+                          trace=trace,
+                          unpack_result=not passthrough)
+        if passthrough:
+            write_file(output, result, mode='wb')
+            ok()
+        elif output:
+            import json
+            write_file(output, json.dumps(result, indent=4, sort_keys=True))
+            ok()
+        elif current_command.json or isinstance(result, list):
             print_result(result)
         elif isinstance(result, dict):
             print_result(result, name_value=True)
@@ -1689,6 +1707,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.35 → eva_shell-0.2.37}/eva4_shell/client.py

@@ -16,9 +16,11 @@ 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'
 
+
 def print_trace_msg(msg):
     level = msg['l']
     print('[', end='')
@@ -53,7 +55,7 @@ def connect():
         common.rpc.on_frame = on_frame
 
 
-def call_rpc(method, params=None, target='eva.core', trace=False):
+def call_rpc(method, params=None, target='eva.core', trace=False, unpack_result=True):
     common.bus_conn_no += 1
     connect()
     if current_command.debug:
@@ -85,5 +87,7 @@ def call_rpc(method, params=None, target='eva.core', trace=False):
             print()
     if result.is_empty():
         return None
-    else:
+    elif unpack_result:
         return unpack(result.get_payload())
+    else:
+        return result.get_payload()

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

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

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

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