yamcs-cli 1.4.10__py3-none-any.whl → 1.4.11__py3-none-any.whl

yamcs/cli/__main__.py

@@ -1,10 +1,10 @@
 import argparse
-import logging
 import sys
+import traceback
 
 import argcomplete
 import pkg_resources
-from yamcs.core.exceptions import Unauthorized
+from yamcs.client import Unauthorized
 
 from yamcs.cli import utils
 from yamcs.cli.alarms import AlarmsCommand
@@ -115,12 +115,12 @@ def main():
         sys.exit(1)
     except Unauthorized:
         if args.debug:
-            eprint(logging.traceback.format_exc())
+            eprint(traceback.format_exc())
         eprint("Unauthorized. Run: 'yamcs login' to login to Yamcs")
         sys.exit(1)
     except Exception as e:
         if args.debug:
-            eprint(logging.traceback.format_exc())
+            eprint(traceback.format_exc())
         else:
             eprint(e)
         sys.exit(1)

yamcs/cli/commands.py

@@ -4,7 +4,7 @@ from typing import Any, List
 from yamcs.client import YamcsClient
 
 from yamcs.cli import utils
-from yamcs.cli.completers import CommandCompleter, ProcessorCompleter
+from yamcs.cli.completers import CommandCompleter, ProcessorCompleter, StreamCompleter
 
 
 class CommandsCommand(utils.Command):
@@ -26,7 +26,7 @@ class CommandsCommand(utils.Command):
         subparser = self.create_subparser(subparsers, "run", "Run a command")
         subparser.set_defaults(func=self.run)
         subparser.add_argument(
-            "command", metavar="NAME", type=str, help="name of the command"
+            "command", metavar="NAME", type=str, help="Name of the command"
         ).completer = CommandCompleter
         subparser.add_argument("--arg-file", help="Read arguments from a file")
         subparser.add_argument(
@@ -37,7 +37,10 @@ class CommandsCommand(utils.Command):
             help="Set arguments",
         )
         subparser.add_argument(
-            "--processor", type=str, help="name of the processor", default="realtime"
+            "--stream", type=str, help="Name of the stream"
+        ).completer = StreamCompleter
+        subparser.add_argument(
+            "--processor", type=str, help="Name of the processor", default="realtime"
         ).completer = ProcessorCompleter
         subparser.add_argument(
             "--sequence-number",
@@ -131,6 +134,7 @@ class CommandsCommand(utils.Command):
             args=command_args,
             dry_run=args.dry_run,
             comment=args.comment,
+            stream=args.stream,
             **kwargs,
         )
         print(command.id)

yamcs/cli/dbshell.py

@@ -10,8 +10,7 @@ from pydoc import pager
 from typing import Any, List
 
 from google.protobuf import json_format
-from yamcs.client import YamcsClient
-from yamcs.core.exceptions import YamcsError
+from yamcs.client import YamcsClient, YamcsError
 from yamcs.protobuf.events import events_pb2
 
 from yamcs.cli import utils

yamcs/cli/events.py

@@ -69,6 +69,12 @@ class EventsCommand(utils.Command):
             type=str,
             help="Include events not newer than the specified date",
         )
+        subparser.add_argument(
+            "--filter",
+            metavar="EXPRESSION",
+            type=str,
+            help="Apply a filter expression to each event",
+        )
         subparser.set_defaults(func=self.log)
 
     def create(self, args):
@@ -135,6 +141,7 @@ class EventsCommand(utils.Command):
         most_recent_only = start is None and stop is None and args.lines != "all"
 
         iterator = archive.list_events(
+            filter=args.filter,
             descending=most_recent_only,
             start=start,
             stop=stop,

yamcs/cli/login.py

@@ -2,8 +2,7 @@ import os
 from getpass import getpass
 from typing import Optional
 
-from yamcs.client import YamcsClient
-from yamcs.core import auth
+from yamcs.client import Credentials, YamcsClient
 
 from yamcs.cli import utils
 from yamcs.cli.utils import eprint
@@ -112,7 +111,7 @@ class LoginCommand(utils.Command):
             eprint("*** Password may not be empty")
             return False
 
-        return auth.Credentials(username=username, password=password)
+        return Credentials(username=username, password=password)
 
     def save_client_config(
         self,

yamcs/cli/storage.py

@@ -4,8 +4,7 @@ import sys
 import tempfile
 from typing import Any, List
 
-from yamcs.client import YamcsClient
-from yamcs.core.helpers import to_isostring
+from yamcs.client import YamcsClient, to_isostring
 
 from yamcs.cli import utils
 from yamcs.cli.completers import BucketCompleter, BucketOrObjectCompleter

yamcs/cli/utils.py

@@ -8,8 +8,7 @@ from typing import Any, List
 
 import pkg_resources
 from dateutil import parser
-from yamcs.core import auth
-from yamcs.core.helpers import parse_server_timestring, to_isostring
+from yamcs.client import Credentials, parse_server_timestring, to_isostring
 
 from yamcs.cli.exceptions import NoInstanceError, NoServerError
 
@@ -39,20 +38,18 @@ def save_config(config):
         config.write(f)
 
 
-def save_credentials(credentials):
+def save_credentials(credentials: Credentials):
     if not os.path.exists(CONFIG_DIR):
         os.makedirs(CONFIG_DIR)
 
     with open(CREDENTIALS_FILE, "wt") as f:
-        json.dump(
-            {
-                "access_token": credentials.access_token,
-                "refresh_token": credentials.refresh_token,
-                "expiry": to_isostring(credentials.expiry),
-            },
-            f,
-            indent=2,
-        )
+        obj = {
+            "access_token": credentials.access_token,
+            "refresh_token": credentials.refresh_token,
+        }
+        if credentials.expiry:
+            obj["expiry"] = to_isostring(credentials.expiry)
+        json.dump(obj, f, indent=2)
 
 
 def read_credentials():
@@ -65,7 +62,7 @@ def read_credentials():
             access_token = d["access_token"]
             refresh_token = d["refresh_token"]
             expiry = parse_server_timestring(d["expiry"]) if "expiry" in d else None
-            return auth.Credentials(
+            return Credentials(
                 access_token=access_token,
                 refresh_token=refresh_token,
                 expiry=expiry,

{yamcs_cli-1.4.10.dist-info → yamcs_cli-1.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yamcs-cli
-Version: 1.4.10
+Version: 1.4.11
 Summary: Yamcs Command-Line Tools
 Home-page: https://github.com/yamcs/yamcs-cli
 Author: Space Applications Services
@@ -14,33 +14,28 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: argcomplete
 Requires-Dist: python-dateutil
-Requires-Dist: yamcs-client (>=1.9.8)
+Requires-Dist: yamcs-client (>=1.11.0)
 Provides-Extra: kerberos
-Requires-Dist: yamcs-client-kerberos (>=1.2.2) ; extra == 'kerberos'
+Requires-Dist: yamcs-client-kerberos (>=1.3.0) ; extra == 'kerberos'
 
 # Command-Line Interface
 
 ## Development Setup
 
-Install build dependencies (you may want to do this in a virtualenv):
-
-    pip install -r requirements.txt
-
-
 Install `yamcs-cli` from the source base:
 
-    python setup.py develop
+    pip install -e .
 
 Changes to any source file have immediate impact.

{yamcs_cli-1.4.10.dist-info → yamcs_cli-1.4.11.dist-info}/RECORD

@@ -1,17 +1,17 @@
-yamcs/cli/__main__.py,sha256=MJ5DeJ1Rt6jgRaxeD4a2iZGf8x0956MH4wt89eaxkqU,4257
+yamcs/cli/__main__.py,sha256=JWPpQt2tBuZYnuABr7Sx940wwaj5-sWw3WIs34BlZQ0,4234
 yamcs/cli/alarms.py,sha256=cHLwveHqvpnLHddktGA5LCyOt9FRljcwid9Q7TYd5FI,7126
 yamcs/cli/algorithms.py,sha256=Oqw0tiIv_mmK7smPYIdI00uUfM2KxHMbrySGi8Ywlcc,1622
 yamcs/cli/bash_completion.sh,sha256=sQOPhbykD68uMYkcWudqJNJKuSQh2Blzozt2kkawRo4,1032
-yamcs/cli/commands.py,sha256=vdsKDjjWQWCVC_CaGs5ZBPv8PbB4dH09sD6n7NekIyQ,6286
+yamcs/cli/commands.py,sha256=ANOyAIeMDhJkk7hNyYAkwqjWDfFIpKpfR-fLkSxmEj0,6465
 yamcs/cli/completers.py,sha256=tteufAU2XeS2rATY8jQ5L4fxlUtbPq1Lj2NSxZvQgU4,4445
 yamcs/cli/config.py,sha256=WeuE6rfRSGt7f5nuD2tJmH_gXl5RSPlLRvufnWj4IGM,2996
 yamcs/cli/containers.py,sha256=vjFoqeAd8Qzw-jp0XxO_HVi2852OEUz3mmtdrBAVqHE,1621
-yamcs/cli/dbshell.py,sha256=W3a_aWKwAMT_zKzy91wP-Y4LPm1yJi26rTLkjDKUXtE,16752
-yamcs/cli/events.py,sha256=QzqPzxHg4AT_SWcerNL-oXDl9vZHJye4UZM0D_pwyd4,5403
+yamcs/cli/dbshell.py,sha256=p86OUmwe1IGAqbxFdc1iXYeUDwkgZi4Bhlxfe7OhRUo,16719
+yamcs/cli/events.py,sha256=waOT7Is909EOWE1uqXla8G2QGXJXf7MstUgYjVufzs4,5617
 yamcs/cli/exceptions.py,sha256=0RcpLLR_jubALmuSlZ1DQ0KUcfKadOl-1VRPi0LxHSw,238
 yamcs/cli/instances.py,sha256=RBfHQUGZB4hU_MGdhPmZgzO_WkA2Sj54KpxT7BSyLeQ,2119
 yamcs/cli/links.py,sha256=RmdeYLqC1agtORso2T8MUcgp3f-zJKIfeb0UsupsXzc,3330
-yamcs/cli/login.py,sha256=2plonlIbwqJKUCQkw9rj2j5gv1O_VFzjGJ_gGIKJrrk,4989
+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=U9-nY71lVGlBdmN20ltuccGa9U7rB_l6odigXtaMB4k,1881
@@ -20,10 +20,10 @@ yamcs/cli/processors.py,sha256=9BJlQywmq6x_ea3tWT66dB2wBry9divqWhG3VWKM6Nw,1988
 yamcs/cli/rocksdb.py,sha256=28VjE9ldHUrGCxMeNNOn8FhnvdRJbiMlKjnjErgrl1k,1947
 yamcs/cli/services.py,sha256=4sE7vOB977EmNfA4X9YJSyi3bSmhfqOj3cScGYGR4Lc,2171
 yamcs/cli/space_systems.py,sha256=hsjDzRNZLlUSlBuO-WJGyUXmIpoQYk0n84sgQ4y8wEA,2285
-yamcs/cli/storage.py,sha256=5pwvgeUMDY1r9iiDbIxaW_n-QF13zqwhT8Gb_G12Rig,9801
+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=sCQPSGK9o-T-26TWbOI768fSeXWOjnZZPWdovkj_Dwo,7784
+yamcs/cli/utils.py,sha256=cQ1A_hEFvkcuF09UDVLm9UEzWMSmv8M_qi8xN16DSRs,7762
 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.10.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-yamcs_cli-1.4.10.dist-info/METADATA,sha256=wU38qbIbQtkkRXdx3pWXFgRGBs2jze6iz7t9EpyHiZY,1538
-yamcs_cli-1.4.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-yamcs_cli-1.4.10.dist-info/entry_points.txt,sha256=M6Juk3MbdDMR1v3htR2aHEebitGHW-E3ujHmYQLwEas,50
-yamcs_cli-1.4.10.dist-info/top_level.txt,sha256=EsFTpWxnHBl6f_5Wf-CrENGPSoY7xP4T-JpgBMwsk8Q,6
-yamcs_cli-1.4.10.dist-info/RECORD,,
+yamcs_cli-1.4.11.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+yamcs_cli-1.4.11.dist-info/METADATA,sha256=INvWD7ueYwv1LJg785NQzJGeJeOGZgEdNGtolRjrKyc,1424
+yamcs_cli-1.4.11.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+yamcs_cli-1.4.11.dist-info/entry_points.txt,sha256=M6Juk3MbdDMR1v3htR2aHEebitGHW-E3ujHmYQLwEas,50
+yamcs_cli-1.4.11.dist-info/top_level.txt,sha256=EsFTpWxnHBl6f_5Wf-CrENGPSoY7xP4T-JpgBMwsk8Q,6
+yamcs_cli-1.4.11.dist-info/RECORD,,