rucio 36.3.0__tar.gz → 36.5.0__tar.gz

{rucio-36.3.0 → rucio-36.5.0}/AUTHORS.rst

@@ -68,6 +68,7 @@ Individual contributors to the source code
 - Elena Gazzarrini <gazzarrini.elena@gmail.com>, 2022-2023
 - Maximilian Linhoff, <maximilian.linhoff@tu-dortmund.de>, 2024
 - Eric Banzuzi, <eric.banzuzi@gmail.com>, 2024
+- Paul Millar, <paul.millar@desy.de>, 2025
 
 Organisations employing contributors
 ------------------------------------
@@ -96,3 +97,4 @@ Organisations employing contributors
 - University of Chicago (USA)
 - Purdue University (USA)
 - TU Dortmund University (Germany)
+- Deutsches Elektronen-Synchrotron DESY (Germany)

{rucio-36.3.0 → rucio-36.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rucio
-Version: 36.3.0
+Version: 36.5.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-36.3.0 → rucio-36.5.0}/bin/rucio

@@ -90,29 +90,33 @@ def map_legacy_command() -> Optional[list[str]]:
             "touch": ["did", "update", "--touch"],
             "add-lifetime-exception": ["lifetime-exception", "add"],
         }
-        try:
-            new_command = command_map[command]
-        except KeyError:
-            pass
+        new_command = command_map.get(command)
 
     return new_command
 
 
 if __name__ == "__main__":
-    commands = ("-h", "--help", "--version", "account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
-    logger = setup_logger(module_name=__name__)
-    first_command = _get_first_command(sys.argv[1:])
+    commands = ("account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
 
-    is_legacy = '--legacy' in sys.argv
+    parser = argparse.ArgumentParser(add_help=False)
+    # Check for legacy flag
+    parser.add_argument("--legacy", action="store_true")
+    # Check for commands in the new command list
+    parser.add_argument("-h", "--help", action="store_true")
+    parser.add_argument("--version", action="store_true")
 
-    if (first_command in commands) and not is_legacy:
-        main()
+    args, _ = parser.parse_known_args()
 
-    elif is_legacy:
+    logger = setup_logger(module_name=__name__)
+
+    if args.legacy:
         make_warning(logger)
         sys.argv.pop(sys.argv.index('--legacy'))
         main_legacy()
 
+    elif (any(arg in commands for arg in sys.argv)) or args.help or args.version:
+        main()
+
     else:
         make_warning(logger)
         try:

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/client/commands/account.py

@@ -59,6 +59,7 @@ class Account(CommandBase):
         parser.add_argument("-a", "--account", dest="account", help="Account name")
         parser.add_argument("--id", dest="identity", action="store", help="Identity (e.g. DN)")
         parser.add_argument("--filters", dest="filters", action="store", help="Filter arguments in form `key=value,another_key=next_value`")
+        parser.add_argument("--csv", action='store_true', help="Output list of accounts as a csv")
 
     def add_namespace(self, parser: "ArgumentParser") -> None:
         parser.add_argument("--type", dest="account_type", help="Account Type", choices={"USER", "GROUP", "SERVICE"}, required=True)

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/client/commands/bin_legacy/rucio.py

@@ -1671,7 +1671,9 @@ def list_rses(args, client, logger, console, spinner):
         spinner.start()
 
     rses = client.list_rses(args.rses)
-    if cli_config == 'rich':
+    if args.csv:
+        print(*(rse['rse'] for rse in rses), sep='\n')
+    elif cli_config == 'rich':
         table = generate_table([[rse['rse']] for rse in sorted(rses, key=lambda elem: elem['rse'])], headers=['RSE'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
@@ -1985,7 +1987,8 @@ def add_lifetime_exception(args, client, logger, console, spinner):
         logger.error('inputfile is mandatory')
         return FAILURE
     with open(args.inputfile) as infile:
-        dids = list(set(line.strip() for line in infile))
+        # Deduplicate the content of the input file and ignore empty lines.
+        dids = set(did for line in infile if (did := line.strip()))
 
     dids_list = []
     containers = []
@@ -2040,6 +2043,7 @@ def add_lifetime_exception(args, client, logger, console, spinner):
                     else:
                         logger.info('%s:%s will be declared' % (scope, name))
                         datasets.append({'scope': scope, 'name': name})
+                        summary[4] += 1
 
     if not datasets:
         logger.error('Nothing to submit')
@@ -2713,6 +2717,7 @@ You can filter by account::
     list_rses_parser.set_defaults(function=list_rses)
     list_rses_parser.add_argument('--rses', dest='rses', action='store', help='The RSE filter expression. A comprehensive help about RSE expressions \
 can be found in ' + Color.BOLD + 'https://rucio.cern.ch/documentation/started/concepts/rse_expressions' + Color.END)
+    list_rses_parser.add_argument("--csv", action='store_true', help='Output a list of RSEs as a csv')
 
     # The list-suspicious-replicas command
     list_suspicious_replicas_parser = subparsers.add_parser('list-suspicious-replicas', help='Show the list of all replicas marked "suspicious".')

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/client/commands/bin_legacy/rucio_admin.py

@@ -151,7 +151,9 @@ def list_accounts(args, client, logger, console, spinner):
         for key, value in [(_.split('=')[0], _.split('=')[1]) for _ in args.filters.split(',')]:
             filters[key] = value
     accounts = client.list_accounts(identity=args.identity, account_type=args.account_type, filters=filters)
-    if cli_config == 'rich':
+    if args.csv:
+        print(*(account['account'] for account in accounts), sep=',')
+    elif cli_config == 'rich':
         table = generate_table([[account['account']] for account in accounts], headers=['ACCOUNT'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
@@ -327,7 +329,9 @@ def list_rses(args, client, logger, console, spinner):
         spinner.start()
 
     rses = client.list_rses()
-    if cli_config == 'rich':
+    if args.csv:
+        print(*(rse['rse'] for rse in rses), sep='\n')
+    elif cli_config == 'rich':
         table_data = [[rse['rse']] for rse in sorted(rses, key=lambda elem: elem['rse'])]
         table = generate_table(table_data, headers=['RSE'], col_alignments=['left'])
         spinner.stop()
@@ -1455,6 +1459,7 @@ def get_parser():
     list_account_parser.add_argument('--type', dest='account_type', action='store', help='Account Type (USER, GROUP, SERVICE)')
     list_account_parser.add_argument('--id', dest='identity', action='store', help='Identity (e.g. DN)')
     list_account_parser.add_argument('--filters', dest='filters', action='store', help='Filter arguments in form `key=value,another_key=next_value`')
+    list_account_parser.add_argument("--csv", action='store_true', help='List result as a csv')
     list_account_parser.set_defaults(which='list_accounts')
 
     # The list_account_attributes command
@@ -1753,6 +1758,7 @@ def get_parser():
                                                       '\n'
                                                       '    $ rucio list-rses --rses \"tier=2&type=DATADISK\"\n'
                                                       '\n')
+    list_rse_parser.add_argument("--csv", action='store_true', help='Output a list of RSEs as a csv')
     list_rse_parser.set_defaults(which='list_rses')
 
     # The add_rse command

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/client/commands/rse.py

@@ -83,9 +83,11 @@ class RSE(CommandBase):
 
     def list_namespace(self, parser: "ArgumentParser") -> None:
         parser.add_argument("--rses", "--rse-exp", dest="rses", help="RSE name or expression")
+        parser.add_argument("--csv", action='store_true', help="Output list of RSEs as a csv")
 
     def show_namespace(self, parser: "ArgumentParser") -> None:
         parser.add_argument("--rse", "--rse-name", help="RSE name", required=True)
+        parser.add_argument("--csv", action='store_true', help="Output list of RSE property key and values as a csv")
 
     def list_(self):
         list_rses(self.args, self.client, self.logger, self.console, self.spinner)
@@ -218,7 +220,7 @@ class Protocol(RSE):
 
     def usage_example(self) -> list[str]:
         return [
-            "$ rucio rse protocol --hostname jdoes.test.org --scheme gsiftp --prefix '/atlasdatadisk/rucio/' --port 8443 --rse JDOE_DATADISK  # Add a new protocol on jdoe.test.org that uses gsiftp",
+            "$ rucio rse protocol --host jdoes.test.org --scheme gsiftp --prefix '/atlasdatadisk/rucio/' --port 8443 --rse JDOE_DATADISK  # Add a new protocol on jdoe.test.org that uses gsiftp",
             "$ rucio rse protocol remove --scheme gsiftp --rse JDOE_DATADISK # Remove the existing gsiftp protocol",
         ]
 

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/client/commands/rule.py

@@ -51,7 +51,7 @@ class Rule(CommandBase):
         parser.add_argument("-a", "--account", dest="rule_account", action="store", help="The account of the rule")
         parser.add_argument("--activity", action="store", help="Activity to be used (e.g. User, Data Consolidation)")  # TODO More info on this
         parser.add_argument("--rule-id", help="The rule ID, for accessing an existing rule.")
-        parser.add_argument("--lifetime", dest="lifetime", action="store", type=int, help="Rule lifetime (in seconds)")
+        parser.add_argument("--lifetime", dest="lifetime", type=str, help="Rule lifetime (in seconds). Use 'None' for no set lifetime")
         parser.add_argument("--locked", action="store_true", help="Set the rule to locked")  # TODO More info on this
         parser.add_argument("--source-replica-expression", help="RSE Expression for RSEs to be considered for source replicas")
         parser.add_argument("--comment", dest="comment", action="store", help="Comment about the replication rule")

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/client/richclient.py

@@ -15,7 +15,7 @@
 import logging
 import pydoc
 import re
-import subprocess
+import shutil
 import sys
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Optional, Union
@@ -309,16 +309,9 @@ def get_pager() -> 'Callable[[str], None]':
     :returns: pager
     """
     default_pager = 'less'
-    try:
-        result = subprocess.run([default_pager], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        less_available = result.returncode == 0
-    except Exception:
-        less_available = False
-
-    def less_pager_function(text: str) -> None:
-        """Use the 'less' pager with -FRSXKM options."""
-        pydoc.pipepager(text, f'{default_pager} -FRSXKM')
-
-    if less_available:
-        return less_pager_function
+    # Attempt to use the default pager if available.
+    if shutil.which(default_pager) is not None:
+        return lambda text: pydoc.pipepager(text, f'{default_pager} -FRSXKM')
+
+    # Fall back to pydoc.pager if the default pager is not available.
     return pydoc.pager

{rucio-36.3.0 → rucio-36.5.0}/lib/rucio/common/config.py

@@ -547,12 +547,12 @@ def config_get_list(
         section: str,
         option: str,
         *,
-        default: list[str] = ...,
+        default: _T = ...,
         check_config_table: bool = ...,
         session: "Optional[Session]" = ...,
         use_cache: bool = ...,
         expiration_time: int = ...,
-) -> list[str]:
+) -> Union[list[str], _T]:
     ...