yamcs-cli 1.4.12__py3-none-any.whl → 1.4.14__py3-none-any.whl

yamcs/cli/__main__.py

@@ -1,9 +1,9 @@
 import argparse
 import sys
 import traceback
+from importlib.metadata import entry_points
 
 import argcomplete
-import pkg_resources
 from yamcs.client import Unauthorized
 
 from yamcs.cli import utils
@@ -95,8 +95,8 @@ def main():
     TablesCommand(subparsers)
 
     # Discover subcommand plugins
-    for entry in pkg_resources.iter_entry_points(group="yamcs.cli.subcommands"):
-        subcommand_cls = entry.load(subparsers)
+    for entry in entry_points(group="yamcs.cli.subcommands"):
+        subcommand_cls = entry.load()
         subcommand_cls(subparsers)
 
     # Provide bash autocompletion

yamcs/cli/packets.py

@@ -41,6 +41,12 @@ class PacketsCommand(utils.Command):
             type=str,
             help="Include packets not newer than the specified date",
         )
+        subparser.add_argument(
+            "--filter",
+            metavar="EXPRESSION",
+            type=str,
+            help="Apply a filter expression to each packet",
+        )
         subparser.set_defaults(func=self.log)
 
         subparser = self.create_subparser(
@@ -93,6 +99,7 @@ class PacketsCommand(utils.Command):
 
         iterator = archive.list_packets(
             name=args.packet,
+            filter=args.filter,
             descending=most_recent_only,
             start=start,
             stop=stop,

yamcs/cli/parameter_archive.py

@@ -1,3 +1,4 @@
+import argparse
 import sys
 
 from yamcs.client import YamcsClient
@@ -23,13 +24,27 @@ class ParameterArchiveCommand(utils.Command):
             "start",
             metavar="START",
             type=str,
-            help="Start time",
+            help=argparse.SUPPRESS,  # Deprecated
+            nargs="?",
         )
         subparser.add_argument(
             "stop",
             metavar="STOP",
             type=str,
-            help="Stop time",
+            help=argparse.SUPPRESS,  # Deprecated
+            nargs="?",
+        )
+        subparser.add_argument(
+            "-s",
+            "--since",
+            type=str,
+            help="Ignore data before the specified date",
+        )
+        subparser.add_argument(
+            "-u",
+            "--until",
+            type=str,
+            help="Ignore data after the specified date",
         )
         subparser = self.create_subparser(
             subparsers, "purge", "Remove all data from the Parameter Archive"
@@ -52,8 +67,25 @@ class ParameterArchiveCommand(utils.Command):
         client = YamcsClient(**opts.client_kwargs)
         archive = client.get_archive(opts.require_instance())
 
-        start = utils.parse_timestamp(args.start)
-        stop = utils.parse_timestamp(args.stop)
+        start = None
+        if args.start:
+            eprint(
+                "*** WARNING: deprecated use of positional 'START' argument. "
+                "Use --since START instead."
+            )
+            start = utils.parse_timestamp(args.start)
+        elif args.since:
+            start = utils.parse_timestamp(args.since)
+
+        stop = None
+        if args.stop:
+            eprint(
+                "*** WARNING: deprecated use of positional 'STOP' argument. "
+                "Use --until STOP instead."
+            )
+            stop = utils.parse_timestamp(args.stop)
+        elif args.until:
+            stop = utils.parse_timestamp(args.until)
 
         archive.rebuild_parameter_archive(start=start, stop=stop)
         eprint("Task submitted. It will finish asynchronously.")

yamcs/cli/tables.py

@@ -185,11 +185,12 @@ class TablesCommand(utils.Command):
             if args.dir:
                 path = os.path.join(args.dir, path)
             if args.gzip:
-                with gzip.open(path, "rb") as f:
-                    self.read_dump(f, archive, table, path)
+                with open(path, "rb") as f:
+                    with gzip.open(f, "rb") as uncompressed_f:
+                        self.read_dump(f, uncompressed_f, archive, table, path)
             else:
                 with open(path, "rb") as f:
-                    self.read_dump(f, archive, table, path)
+                    self.read_dump(f, f, archive, table, path)
 
     def rebuild_histogram(self, args):
         opts = utils.CommandOptions(args)
@@ -208,7 +209,8 @@ class TablesCommand(utils.Command):
             sys.stdout.write("done\n")
             sys.stdout.flush()
 
-    def read_dump(self, f, archive, table, path):
+    def read_dump(self, f, uncompressed_f, archive, table, path):
+        f_progress = 0
         txsize = 0
         t0 = time.time()
         t = t0
@@ -217,26 +219,30 @@ class TablesCommand(utils.Command):
         fsize = os.path.getsize(path)
 
         def report_load_stats(elapsed):
-            nonlocal path, fsize, txsize
+            nonlocal path, fsize, txsize, f_progress
             rate = (txsize / 1024 / 1024) / elapsed
             sys.stdout.write(
-                "\r{}: {:.2f} MB (tx: {:.2f} MB at {:.2f} MB/s)".format(
-                    path, fsize / 1024 / 1024, txsize / 1024 / 1024, rate
+                "\r{}: {:.2f}% (tx: {:.2f} MB at {:.2f} MB/s)".format(
+                    path,
+                    100 * (f_progress / fsize),
+                    txsize / 1024 / 1024,
+                    rate,
                 )
             )
             sys.stdout.flush()
 
         def read_in_chunks():
-            nonlocal f, txsize, t0, t, prev_t
-            chunk = f.read(chunk_size)
+            nonlocal f, uncompressed_f, f_progress, txsize, t0, t, prev_t
+            chunk = uncompressed_f.read(chunk_size)
             while chunk:
                 yield chunk
+                f_progress = f.tell()
                 txsize += len(chunk)
                 t = time.time()
                 if not prev_t or (t - prev_t > 0.5):  # Limit console writes
                     report_load_stats(t - t0)
                     prev_t = t
-                chunk = f.read(chunk_size)
+                chunk = uncompressed_f.read(chunk_size)
             if txsize > 0:
                 report_load_stats(t - t0)
                 sys.stdout.write("\n")

yamcs/cli/utils.py

@@ -4,9 +4,9 @@ import os
 import sys
 from configparser import ConfigParser
 from datetime import datetime, timedelta, timezone
+from importlib.metadata import version
 from typing import Any, List
 
-import pkg_resources
 from dateutil import parser
 from yamcs.client import Credentials, parse_server_timestring, to_isostring
 
@@ -19,8 +19,7 @@ CREDENTIALS_FILE = os.path.join(CONFIG_DIR, "credentials")
 
 
 def get_user_agent():
-    dist = pkg_resources.get_distribution("yamcs-cli")
-    return "Yamcs CLI v" + dist.version
+    return "Yamcs CLI v" + version("yamcs-cli")
 
 
 def read_config():

{yamcs_cli-1.4.12.dist-info → yamcs_cli-1.4.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: yamcs-cli
-Version: 1.4.12
+Version: 1.4.14
 Summary: Yamcs Command-Line Tools
 Home-page: https://github.com/yamcs/yamcs-cli
 Author: Space Applications Services
@@ -26,9 +26,22 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: argcomplete
 Requires-Dist: python-dateutil
-Requires-Dist: yamcs-client>=1.11.2
+Requires-Dist: yamcs-client>=1.12.0
 Provides-Extra: kerberos
 Requires-Dist: yamcs-client-kerberos>=1.3.0; extra == "kerberos"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Command-Line Interface
 

{yamcs_cli-1.4.12.dist-info → yamcs_cli-1.4.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-yamcs/cli/__main__.py,sha256=JWPpQt2tBuZYnuABr7Sx940wwaj5-sWw3WIs34BlZQ0,4234
+yamcs/cli/__main__.py,sha256=1CcXATPKWaKUx40MwXDK3RaoVtMyhMdKYKl_s0O_aOY,4228
 yamcs/cli/alarms.py,sha256=cHLwveHqvpnLHddktGA5LCyOt9FRljcwid9Q7TYd5FI,7126
 yamcs/cli/algorithms.py,sha256=Oqw0tiIv_mmK7smPYIdI00uUfM2KxHMbrySGi8Ywlcc,1622
 yamcs/cli/bash_completion.sh,sha256=sQOPhbykD68uMYkcWudqJNJKuSQh2Blzozt2kkawRo4,1032
@@ -13,8 +13,8 @@ yamcs/cli/instances.py,sha256=RBfHQUGZB4hU_MGdhPmZgzO_WkA2Sj54KpxT7BSyLeQ,2119
 yamcs/cli/links.py,sha256=RmdeYLqC1agtORso2T8MUcgp3f-zJKIfeb0UsupsXzc,3330
 yamcs/cli/login.py,sha256=VAIE--YGiCTwf8D79L3dHKKtTlmdSFcgkUcR37CwVzY,4969
 yamcs/cli/logout.py,sha256=XgIdxuAUHQ5VbPP6sZwN88cAvWQEm7GBPfvYj6vn9Rg,562
-yamcs/cli/packets.py,sha256=js-meTATi7a7IjVWC9nLiu56KdZNyDjZY9QBlRWfgD0,4645
-yamcs/cli/parameter_archive.py,sha256=rv1Evgi5iBsnE-AgSOtaQsFYiqekQDv1k3fVFiMK1iE,3007
+yamcs/cli/packets.py,sha256=am8CZxJWpqsWtA3wqSBuD3xck8uv0dYkAYfdwnfimOM,4860
+yamcs/cli/parameter_archive.py,sha256=KWdrtHXygGJNPhbAyHK5itxBAl1YqAwgQnkoDsd_5c4,3999
 yamcs/cli/parameters.py,sha256=ZDOfLly5gzKoUvfvg9vbDLMh_NYnh3mBi95n_sZCjSY,6012
 yamcs/cli/processors.py,sha256=9BJlQywmq6x_ea3tWT66dB2wBry9divqWhG3VWKM6Nw,1988
 yamcs/cli/rocksdb.py,sha256=28VjE9ldHUrGCxMeNNOn8FhnvdRJbiMlKjnjErgrl1k,1947
@@ -22,8 +22,8 @@ yamcs/cli/services.py,sha256=4sE7vOB977EmNfA4X9YJSyi3bSmhfqOj3cScGYGR4Lc,2171
 yamcs/cli/space_systems.py,sha256=hsjDzRNZLlUSlBuO-WJGyUXmIpoQYk0n84sgQ4y8wEA,2285
 yamcs/cli/storage.py,sha256=Ynqz5kIIqcPLTgfPJsnQ6dubOaqqE5_CmVOo0MzTnAQ,9771
 yamcs/cli/streams.py,sha256=RvB4OuqU0CiY_XAn356JiSlaO_AgIXEbHN1VRaHul64,2392
-yamcs/cli/tables.py,sha256=3Fc-31ViO3TT14SV0b9jhRPXa2NZsLcJMqr3tSYvHM4,8505
-yamcs/cli/utils.py,sha256=cQ1A_hEFvkcuF09UDVLm9UEzWMSmv8M_qi8xN16DSRs,7762
+yamcs/cli/tables.py,sha256=7my4-oDD1270qO1s7zgKZ9vH92HtDMOlePbmFv5-2O0,8795
+yamcs/cli/utils.py,sha256=MoefwXFjfYjYGHHrs_eHH23D1_pbvt8By7kBxb-RKaI,7733
 yamcs/cli/protobuf/activities_pb2.py,sha256=8V42hiw99laYl0pAMISd-B_PY6LAuXMkAeMOXwjyX88,2741
 yamcs/cli/protobuf/cmdhistory_pb2.py,sha256=8WK--s8OO9dCbDur86MraQXoMvJq-kU1ZMOHAJ4PvuI,4198
 yamcs/cli/protobuf/db_pb2.py,sha256=ObnWfpZZDoCCHQcBH7GRGRjXfnKgu8bKnw5fOZMo_e0,15789
@@ -31,9 +31,9 @@ yamcs/cli/protobuf/replication_pb2.py,sha256=0YzH8bVPi2DNmHcgxyv9m_XuhYnH83U0O6k
 yamcs/cli/protobuf/security_pb2.py,sha256=SbVHS7ghG_JDbZ_35p8GwVnV-3HuwNOGAWRVhFoWbPE,21569
 yamcs/cli/protobuf/tablespace_pb2.py,sha256=DLYPDKOgLm1xeZAT5F7WMLaGQJM_npeYfpZAFMSM6OU,37008
 yamcs/cli/protobuf/timeline_pb2.py,sha256=JUl7sGOYMS8IP6h0hCOCrQz8BaBtvxjf6lY7cpDYcfg,5004
-yamcs_cli-1.4.12.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-yamcs_cli-1.4.12.dist-info/METADATA,sha256=GDAyRQHDISQK3ug3tzlVW_QbyLyDCKa4AIzB9RAvXH0,1417
-yamcs_cli-1.4.12.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-yamcs_cli-1.4.12.dist-info/entry_points.txt,sha256=M6Juk3MbdDMR1v3htR2aHEebitGHW-E3ujHmYQLwEas,50
-yamcs_cli-1.4.12.dist-info/top_level.txt,sha256=EsFTpWxnHBl6f_5Wf-CrENGPSoY7xP4T-JpgBMwsk8Q,6
-yamcs_cli-1.4.12.dist-info/RECORD,,
+yamcs_cli-1.4.14.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+yamcs_cli-1.4.14.dist-info/METADATA,sha256=vnhGaxR6JHchZIpkHXQvFJeZcV73GVauI492xrSZsLY,1695
+yamcs_cli-1.4.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yamcs_cli-1.4.14.dist-info/entry_points.txt,sha256=M6Juk3MbdDMR1v3htR2aHEebitGHW-E3ujHmYQLwEas,50
+yamcs_cli-1.4.14.dist-info/top_level.txt,sha256=EsFTpWxnHBl6f_5Wf-CrENGPSoY7xP4T-JpgBMwsk8Q,6
+yamcs_cli-1.4.14.dist-info/RECORD,,

{yamcs_cli-1.4.12.dist-info → yamcs_cli-1.4.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.7.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any