eva-shell 0.2.30__tar.gz → 0.2.32__tar.gz

{eva-shell-0.2.30 → eva_shell-0.2.32}/PKG-INFO

@@ -1,18 +1,26 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.30
+Version: 0.2.32
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech
 Author-email: div@altertech.com
 License: Apache License 2.0
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Communications
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: busrt>=0.1.0
+Requires-Dist: evaics>=0.0.32
+Requires-Dist: yedb[cli]>=0.2.25
+Requires-Dist: argcomplete>=2.0.0
+Requires-Dist: python-dateutil>=2.7.3
+Requires-Dist: neotermcolor>=2.0.10
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: pygments>=2.11.2
+Requires-Dist: pytz>=2024.1
+Requires-Dist: pwinput>=1.0.2
+Requires-Dist: tzlocal>=5.1
 
 # EVA ICS v4 shell
-
-

{eva-shell-0.2.30 → eva_shell-0.2.32}/eva4_shell/__init__.py

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

{eva-shell-0.2.30 → eva_shell-0.2.32}/eva4_shell/ap.py

@@ -1640,6 +1640,18 @@ def init_ap():
                    action='store_true',
                    help='create an encrypted service request')
 
+    p = sp.add_parser('rt',
+                      help='Monitor services, threads and real-time parameters')
+    p.add_argument('--sort',
+                   help='sort by column',
+                   choices=[
+                       'point', 'svc_id', 'name', 'pid', 'state', 'cpu',
+                       'cpu_usage', 'memory_usage', 'sched', 'priority'
+                   ])
+    p.add_argument('--sort-rev',
+                   help='sort in reverse order',
+                   action='store_true')
+
     p = sp.add_parser('edit', help='edit the configuration keys and xc files')
     p.add_argument(
         'fname',

{eva-shell-0.2.30 → eva_shell-0.2.32}/eva4_shell/cli.py

@@ -947,18 +947,22 @@ class CLI:
             print_result(data,
                          cols=[
                              'name', 'svc', 'type', 'online', 'timeout',
-                             'version', 'build'
+                             'ver', 'build'
                          ])
         else:
             data = call_rpc('node.list', target=repl_svc)
+            for d in data:
+                if d.get('api_enabled') is False:
+                    d['ping_interval'] = ''
+                    d['reload_interval'] = ''
+                    d['managed'] = ''
             print_result(data,
                          cols=[
                              'name', 'timeout', 'compress|n=compr',
-                             'ping_interval|n=ping int',
-                             'reload_interval|n=rel.int', 'static', 'enabled',
+                             'ping_interval|n=ping', 'reload_interval|n=rel',
+                             'static', 'enabled', 'api_enabled|n=api',
                              'managed', 'trusted', 'online',
-                             'link_uptime|n=link upt|f=round:0', 'version',
-                             'build'
+                             'link_uptime|n=upt|f=round:0', 'ver', 'build'
                          ])
 
     def node_append(self, i, repl_svc, untrusted):
@@ -2081,3 +2085,31 @@ class CLI:
                 'trig',
             ]
         print_result(data, cols=cols)
+
+    def rt(self, sort=None, sort_rev=None):
+        data = call_rpc('task.list', None, target='eva.svc.rtmon')
+        if isinstance(data, list):
+            if sort is not None:
+                data.sort(key=lambda x: x[sort])
+            if sort_rev:
+                data.reverse()
+            data = [format_rt_line(d) for d in data]
+            print_result(data,
+                         cols=[
+                             'point',
+                             'svc_id',
+                             'name',
+                             'pid',
+                             'state',
+                             'cpu',
+                             'cpu_usage|n=cpu%',
+                             'memory_usage|n=memMB',
+                             'sched',
+                             'priority|n=prio',
+                         ])
+
+
+def format_rt_line(d):
+    d['cpu_usage'] = f'{d["cpu_usage"]:.2f}'
+    d['memory_usage'] = f'{int(d["memory_usage"] / 1024 / 1024)}'
+    return d

{eva-shell-0.2.30 → eva_shell-0.2.32}/eva4_shell/shell.py

@@ -1,4 +1,5 @@
 import sys
+import signal
 import os
 from neotermcolor import colored
 
@@ -32,8 +33,7 @@ def launch():
             raise RuntimeError(
                 f'EVA ICS directory not found. Consider installing EVA ICS either '
                 f'in {dir_eva_default} or specifying EVA_DIR env variable. '
-                f'For For a remote host, set EVA_BUS=HOST:PORT env variable'
-            )
+                f'For For a remote host, set EVA_BUS=HOST:PORT env variable')
         common.bus_path = f'{common.dir_eva}/var/bus.ipc'
         common.bus_name = f'eva-shell.{os.getpid()}'
 
@@ -62,5 +62,19 @@ def launch():
         print()
         common.cli.version()
         common.interactive = True
+
+        def handle_signal(signum, frame):
+            import readline
+            if ap.interactive_history_file:
+                try:
+                    readline.write_history_file(
+                        os.path.expanduser(ap.interactive_history_file))
+                except:
+                    pass
+            sys.exit(0)
+
+        signal.signal(signal.SIGTERM, handle_signal)
+        signal.signal(signal.SIGHUP, handle_signal)
+
         ap.interactive()
         print('Bye')

{eva-shell-0.2.30 → eva_shell-0.2.32}/eva_shell.egg-info/PKG-INFO

@@ -1,18 +1,26 @@
 Metadata-Version: 2.1
 Name: eva-shell
-Version: 0.2.30
+Version: 0.2.32
 Summary: EVA ICS v4 shell
 Home-page: https://github.com/eva-ics/eva4
 Author: Bohemia Automation / Altertech
 Author-email: div@altertech.com
 License: Apache License 2.0
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Communications
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: busrt>=0.1.0
+Requires-Dist: evaics>=0.0.32
+Requires-Dist: yedb[cli]>=0.2.25
+Requires-Dist: argcomplete>=2.0.0
+Requires-Dist: python-dateutil>=2.7.3
+Requires-Dist: neotermcolor>=2.0.10
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: pygments>=2.11.2
+Requires-Dist: pytz>=2024.1
+Requires-Dist: pwinput>=1.0.2
+Requires-Dist: tzlocal>=5.1
 
 # EVA ICS v4 shell
-
-

{eva-shell-0.2.30 → eva_shell-0.2.32}/setup.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.30'
+__version__ = '0.2.32'
 
 import setuptools
 

{eva-shell-0.2.30 → eva_shell-0.2.32}/eva_shell.egg-info/requires.txt

@@ -1,11 +1,11 @@
-argcomplete>=2.0.0
 busrt>=0.1.0
 evaics>=0.0.32
+yedb[cli]>=0.2.25
+argcomplete>=2.0.0
+python-dateutil>=2.7.3
 neotermcolor>=2.0.10
-pwinput>=1.0.2
+pyyaml>=6.0
 pygments>=2.11.2
-python-dateutil>=2.7.3
 pytz>=2024.1
-pyyaml>=6.0
+pwinput>=1.0.2
 tzlocal>=5.1
-yedb[cli]>=0.2.25