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

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

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

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

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

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

@@ -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',
@@ -1195,8 +1199,8 @@ def append_generator_cli(root_sp):
     p.add_argument('kind', choices=source_types)
     p.add_argument('-s',
                    '--sampling',
-                   default=1,
-                   type=int,
+                   default=1.0,
+                   type=float,
                    help='Sampling frequency')
     p.add_argument('--target',
                    action='append',
@@ -1215,8 +1219,8 @@ def append_generator_cli(root_sp):
     p.add_argument('kind', choices=source_types)
     p.add_argument('-s',
                    '--sampling',
-                   default=1,
-                   type=int,
+                   default=1.0,
+                   type=float,
                    help='Sampling frequency')
     p.add_argument('-d',
                    '--duration',
@@ -1246,8 +1250,8 @@ def append_generator_cli(root_sp):
     p.add_argument('kind', choices=source_types)
     p.add_argument('-s',
                    '--sampling',
-                   default=1,
-                   type=int,
+                   default=1.0,
+                   type=float,
                    help='Sampling frequency')
     p.add_argument('--target', action='append', help='target OID')
     p.add_argument('--start', required=True, help='Starting time')

{eva_shell-0.2.34 → eva_shell-0.2.36}/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)

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

@@ -19,6 +19,7 @@ DEFAULT_GENERATOR_SERVICE = 'eva.generator.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 +54,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 +86,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.34 → eva_shell-0.2.36}/eva_shell.egg-info/PKG-INFO

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

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

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