rucio 37.7.0__tar.gz → 38.0.0__tar.gz

{rucio-37.7.0 → rucio-38.0.0}/AUTHORS.rst

@@ -69,6 +69,7 @@ Individual contributors to the source code
 - Maximilian Linhoff, <maximilian.linhoff@tu-dortmund.de>, 2024
 - Eric Banzuzi, <eric.banzuzi@gmail.com>, 2024
 - Paul Millar, <paul.millar@desy.de>, 2025
+- Vimalan S <vimalan.github@gmail.com>, 2025
 
 Organisations employing contributors
 ------------------------------------

{rucio-37.7.0 → rucio-38.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 37.7.0
+Version: 38.0.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -20,51 +20,52 @@ Classifier: Environment :: No Input/Output (Daemon)
 Requires-Python: >=3.9, <4
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: click
-Requires-Dist: requests
-Requires-Dist: urllib3
+Requires-Dist: requests<=2.32.3
+Requires-Dist: urllib3<=1.26.19
 Requires-Dist: dogpile-cache<=1.2.2
-Requires-Dist: packaging
-Requires-Dist: tabulate
-Requires-Dist: jsonschema
-Requires-Dist: rich
-Requires-Dist: typing_extensions
-Requires-Dist: argcomplete
+Requires-Dist: packaging<=24.1
+Requires-Dist: tabulate<=0.9.0
+Requires-Dist: jsonschema<=4.23.0
+Requires-Dist: rich<=13.9.4
+Requires-Dist: typing_extensions<=4.12.2
+Requires-Dist: argcomplete<=3.5.3
 Requires-Dist: boto
-Requires-Dist: python-magic
-Requires-Dist: paramiko
-Requires-Dist: boto3
-Requires-Dist: sqlalchemy
-Requires-Dist: alembic
-Requires-Dist: pymemcache
-Requires-Dist: python-dateutil
-Requires-Dist: stomp-py
-Requires-Dist: statsd
-Requires-Dist: geoip2
-Requires-Dist: google-auth
-Requires-Dist: redis
-Requires-Dist: flask
-Requires-Dist: oic
-Requires-Dist: prometheus_client
+Requires-Dist: python-magic<=0.4.27
+Requires-Dist: paramiko<=3.5.1
+Requires-Dist: boto3<=1.37.5
+Requires-Dist: sqlalchemy<=2.0.38
+Requires-Dist: alembic<=1.14.1
+Requires-Dist: pymemcache<=4.0.0
+Requires-Dist: python-dateutil<=2.9.0.post0
+Requires-Dist: stomp-py<=8.2.0
+Requires-Dist: statsd<=4.0.1
+Requires-Dist: geoip2<=5.0.1
+Requires-Dist: google-auth<=2.38.0
+Requires-Dist: redis<=5.2.1
+Requires-Dist: flask<=3.1.0
+Requires-Dist: oic<=1.7.0
+Requires-Dist: prometheus_client<=0.21.1
 Provides-Extra: oracle
-Requires-Dist: cx_oracle; extra == "oracle"
+Requires-Dist: oracledb<=3.1.1; extra == "oracle"
 Provides-Extra: mongo
-Requires-Dist: pymongo; extra == "mongo"
+Requires-Dist: pymongo<=4.11.2; extra == "mongo"
 Provides-Extra: elastic
-Requires-Dist: elasticsearch; extra == "elastic"
+Requires-Dist: elasticsearch<=8.15.1; extra == "elastic"
 Provides-Extra: postgresql
-Requires-Dist: psycopg[binary,pool]; extra == "postgresql"
+Requires-Dist: psycopg<=3.2.3; extra == "postgresql"
+Requires-Dist: psycopg-binary<=3.2.3; extra == "postgresql"
+Requires-Dist: psycopg-pool<=3.2.3; extra == "postgresql"
 Provides-Extra: mysql
-Requires-Dist: PyMySQL; extra == "mysql"
+Requires-Dist: PyMySQL<=1.1.1; extra == "mysql"
 Provides-Extra: kerberos
-Requires-Dist: kerberos; extra == "kerberos"
-Requires-Dist: pykerberos; extra == "kerberos"
-Requires-Dist: requests-kerberos; extra == "kerberos"
+Requires-Dist: kerberos<=1.3.1; extra == "kerberos"
+Requires-Dist: pykerberos<=1.2.4; extra == "kerberos"
+Requires-Dist: requests-kerberos<=0.15.0; extra == "kerberos"
 Provides-Extra: globus
-Requires-Dist: PyYAML; extra == "globus"
-Requires-Dist: globus-sdk; extra == "globus"
+Requires-Dist: PyYAML<=6.0.2; extra == "globus"
+Requires-Dist: globus-sdk<=3.41.0; extra == "globus"
 Provides-Extra: saml
-Requires-Dist: python3-saml; extra == "saml"
+Requires-Dist: python3-saml<=1.16.0; extra == "saml"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"

{rucio-37.7.0 → rucio-38.0.0}/bin/rucio

@@ -54,6 +54,7 @@ def map_legacy_command() -> Optional[list[str]]:
         command_map = {
             "list-file-replicas": ["replica", "list", "file"],
             "list-dataset-replicas": ["replica", "list", "dataset"],
+            "list-datasets-rse": ["replica", "list", "dataset", "--rse"],
             "add-dataset": ["did", "add", "--type dataset"],
             "add-container": ["did", "add", "--type container"],
             "attach": ["did", "content", "add"],
@@ -96,7 +97,7 @@ def map_legacy_command() -> Optional[list[str]]:
 
 
 if __name__ == "__main__":
-    commands = ("account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
+    commands = ("account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download", "opendata")
 
     parser = argparse.ArgumentParser(add_help=False)
     # Check for legacy flag

{rucio-37.7.0 → rucio-38.0.0}/etc/alembic.ini.template

@@ -18,7 +18,7 @@
 # Choose one of the databases+schema below
 # Oracle, PostgreSQL, MySQL/MariaDB are fully supported
 
-sqlalchemy.url=oracle://user:pass@servicename
+sqlalchemy.url=oracle+oracledb://user:pass@servicename
 version_table_schema=rucio
 
 #sqlalchemy.url=postgresql+psycopg://rucio:rucio@psql-hostname:5432/rucio

{rucio-37.7.0 → rucio-38.0.0}/etc/alembic_offline.ini.template

@@ -18,7 +18,7 @@
 # Choose one of the databases+schema below
 # Oracle, PostgreSQL, MySQL/MariaDB are fully supported
 
-#sqlalchemy.url=oracle://user:pass@servicename
+#sqlalchemy.url=oracle+oracledb://user:pass@servicename
 #version_table_schema=rucio
 
 #sqlalchemy.url=postgresql+psycopg://rucio:rucio@psql-hostname:5432/rucio

{rucio-37.7.0 → rucio-38.0.0}/etc/rucio.cfg.template

@@ -73,8 +73,8 @@ default_mail_from = spamspamspam@cern.ch
 
 [database]
 default = sqlite:////tmp/rucio.db
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
 #schema=atlas_rucio  # only for cern oracle
 #default = mysql+pymysql://rucio:rucio@localhost/rucio
 #default = postgresql+psycopg://rucio:rucio@localhost/rucio

{rucio-37.7.0 → rucio-38.0.0}/etc/rucio_multi_vo.cfg.template

@@ -56,8 +56,8 @@ default_mail_from = spamspamspam@cern.ch
 
 [database]
 default = sqlite:////tmp/rucio.db
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
 #schema=atlas_rucio  # only for cern oracle
 #default = mysql+pymysql://rucio:rucio@localhost/rucio
 #default = postgresql+psycopg://rucio:rucio@localhost/rucio
@@ -213,4 +213,4 @@ idpsecrets = /opt/rucio/etc/idpsecrets.json
 admin_issuer = wlcg
 
 [api]
-endpoints = accountlimits, accounts, config, credentials, dids, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, traces, vos
+endpoints = accountlimits, accounts, config, credentials, dids, export, heartbeats, identities, import, lifetime_exceptions, locks, meta_conventions, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, traces, vos

{rucio-37.7.0 → rucio-38.0.0}/lib/rucio/alembicrevision.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ALEMBIC_REVISION = '30d5206e9cad'  # the current alembic head revision
+ALEMBIC_REVISION = 'a62db546a1f1'  # the current alembic head revision

{rucio-37.7.0 → rucio-38.0.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -20,12 +20,10 @@ import os
 import signal
 import sys
 import time
-import traceback
 import unittest
 import uuid
 from copy import deepcopy
 from datetime import datetime
-from logging import DEBUG
 from typing import TYPE_CHECKING, Optional
 
 from rich.console import Console
@@ -45,13 +43,13 @@ from rucio.common.client import detect_client_location
 from rucio.common.config import config_get, config_get_float
 from rucio.common.constants import ReplicaState
 from rucio.common.exception import (
-    DIDFilterSyntaxError,
-    DuplicateCriteriaInDIDFilter,
     DuplicateRule,
     InputValidationError,
     InvalidObject,
     InvalidType,
+    RSENotFound,
     RucioException,
+    ScopeNotFound,
     UnsupportedOperation,
 )
 from rucio.common.extra import import_extras
@@ -109,8 +107,7 @@ def ping(args, client, logger, console, spinner):
     if server_info:
         print(server_info['version'])
         return SUCCESS
-    logger.error('Ping failed')
-    return FAILURE
+    raise RucioException('Ping failed')
 
 
 @exception_handler
@@ -232,11 +229,9 @@ def list_file_replicas(args, client, logger, console, spinner):
     table_data = []
     dids = []
     if args.missing and not args.rses:
-        print('Cannot use --missing without specifying a RSE')
-        return FAILURE
+        raise InputValidationError('Cannot use --missing without specifying a RSE')
     if args.link and ':' not in args.link:
-        print('The substitution parameter must equal --link="/pfn/dir:/dst/dir"')
-        return FAILURE
+        raise ValueError('The substitution parameter must equal --link="/pfn/dir:/dst/dir"')
 
     if cli_config == 'rich':
         spinner.update(status='Fetching file replicas')
@@ -398,14 +393,13 @@ def attach(args, client, logger, console, spinner):
 
     if args.fromfile:
         if len(dids) > 1:
-            logger.error("If --fromfile option is active, only one file is supported. The file should contain a list of dids, one per line.")
-            return FAILURE
+            raise ValueError('If --fromfile option is active, only one file is supported. The file should contain a list of dids, one per line.')
         try:
             f = open(dids[0], 'r')
             dids = [did.rstrip() for did in f.readlines()]
-        except OSError:
+        except OSError as error:
             logger.error("Can't open file '" + dids[0] + "'.")
-            return FAILURE
+            raise OSError from error
 
     dids = [{'scope': get_scope(did, client)[0], 'name': get_scope(did, client)[1]} for did in dids]
     if len(dids) <= limit:
@@ -468,35 +462,16 @@ def list_dids(args, client, logger, console, spinner):
         name = '*'
 
     if scope not in client.list_scopes():
-        logger.error('Scope not found.')
-        return FAILURE
+        raise ScopeNotFound
 
     if args.recursive and '*' in name:
-        logger.error('Option recursive cannot be used with wildcards.')
-        return FAILURE
+        raise InputValidationError('Option recursive cannot be used with wildcards.')
     else:
         if filters:
             if ('name' in filters) and (name != '*'):
-                logger.error('Must have a wildcard in did name if filtering by name.')
-                return FAILURE
+                raise ValueError('Must have a wildcard in did name if filtering by name.')
 
-    try:
-        filters, type_ = parse_did_filter_from_string_fe(args.filter, name)
-    except InvalidType as error:
-        logger.error(error)
-        return FAILURE
-    except DuplicateCriteriaInDIDFilter as error:
-        logger.error(error)
-        return FAILURE
-    except DIDFilterSyntaxError as error:
-        logger.error(error)
-        return FAILURE
-    except ValueError as error:
-        logger.error(error)
-        return FAILURE
-    except Exception as e:
-        logger.error(e)
-        return FAILURE
+    filters, type_ = parse_did_filter_from_string_fe(args.filter, name)
 
     if cli_config == 'rich':
         spinner.update(status='Fetching DIDs')
@@ -531,8 +506,7 @@ def list_dids_extended(args, client, logger, console, spinner):
 
     List the data identifiers for a given scope (DEPRECATED).
     """
-    logger.error("This command has been deprecated. Please use list_dids instead.")
-    return FAILURE
+    raise UnsupportedOperation('This command has been deprecated. Please use list_dids instead.')
 
 
 @exception_handler
@@ -542,15 +516,17 @@ def list_scopes(args, client, logger, console, spinner):
 
     List scopes.
     """
-    # For the moment..
-
-    if cli_config == 'rich':
+    if (cli_config == 'rich') or (not args.csv):
         spinner.update(status='Fetching scopes')
         spinner.start()
 
-    scopes = client.list_scopes()
-    if cli_config == 'rich':
-        table = generate_table([[scope] for scope in sorted(scopes)], headers=['SCOPE'], col_alignments=['left'])
+    if args.account:
+        scopes = client.list_scopes_for_account(args.account)
+    else:
+        scopes = client.list_scopes()
+    if (cli_config == 'rich') and (not args.csv):
+        scopes = [[scope] for scope in sorted(scopes)]
+        table = generate_table(scopes, headers=['SCOPE'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
     else:
@@ -813,8 +789,7 @@ def list_parent_dids(args, client, logger, console, spinner):
         else:
             print(tabulate(table_data, tablefmt=tablefmt, headers=['SCOPE:NAME', '[DID TYPE]']))
     else:
-        print('At least one option has to be given. Use -h to list the options.')
-        return FAILURE
+        raise InputValidationError('At least one option has to be given. Use -h to list the options.')
     return SUCCESS
 
 
@@ -931,13 +906,11 @@ def upload(args, client, logger, console, spinner):
     Upload files into Rucio
     """
     if args.lifetime and args.expiration_date:
-        logger.error("--lifetime and --expiration-date cannot be specified at the same time.")
-        return FAILURE
+        raise InputValidationError("--lifetime and --expiration-date cannot be specified at the same time.")
     elif args.expiration_date:
         expiration_date = datetime.strptime(args.expiration_date, "%Y-%m-%d-%H:%M:%S")
         if expiration_date < datetime.utcnow():
-            logger.error("The specified expiration date should be in the future!")
-            return FAILURE
+            raise ValueError("The specified expiration date should be in the future!")
         args.lifetime = (expiration_date - datetime.utcnow()).total_seconds()
 
     dsscope = None
@@ -1023,23 +996,18 @@ def download(args, client, logger, console, spinner):
     """
     # Input validation
     if not args.dids and not args.filter and not args.metalink_file:
-        logger.error('At least one did is mandatory')
-        return FAILURE
+        raise InputValidationError('At least one did is mandatory')
     elif not args.dids and args.filter and not args.scope:
-        logger.error('The argument scope is mandatory')
-        return FAILURE
+        raise InputValidationError('The argument scope is mandatory')
 
     if args.filter and args.metalink_file:
-        logger.error('Arguments filter and metalink cannot be used together.')
-        return FAILURE
+        raise InputValidationError('Arguments filter and metalink cannot be used together.')
 
     if args.dids and args.metalink_file:
-        logger.error('Arguments dids and metalink cannot be used together.')
-        return FAILURE
+        raise InputValidationError('Arguments dids and metalink cannot be used together.')
 
     if args.ignore_checksum and args.check_local_with_filesize_only:
-        logger.error('Arguments ignore-checksum and check-local-with-filesize-only cannot be used together.')
-        return FAILURE
+        raise InputValidationError('Arguments ignore-checksum and check-local-with-filesize-only cannot be used together.')
 
     trace_pattern = {}
 
@@ -1083,16 +1051,12 @@ def download(args, client, logger, console, spinner):
             filters, type_ = parse_did_filter_from_string(args.filter)
             if args.scope:
                 filters['scope'] = args.scope
-        except InvalidType as error:
+        except (InvalidType, ValueError) as error:
             logger.error(error)
-            return FAILURE
-        except ValueError as error:
-            logger.error(error)
-            return FAILURE
+            raise error
         except Exception as error:
-            logger.error(error)
             logger.error("Invalid Filter. Filter must be 'key=value', 'key>=value', 'key>value', 'key<=value', 'key<value'")
-            return FAILURE
+            raise error
         item_defaults['filters'] = filters
 
     if not args.pfn:
@@ -1148,8 +1112,7 @@ def download(args, client, logger, console, spinner):
 
             download_rse = _get_rse_for_pfn(replicas, args.pfn)
             if download_rse is None:
-                logger.error("Could not find RSE for pfn %s", args.pfn)
-                return FAILURE
+                raise RSENotFound("Could not find RSE for pfn %s" % args.pfn)
             else:
                 item_defaults['rse'] = download_rse
 
@@ -1354,8 +1317,7 @@ def delete_rule(args, client, logger, console, spinner):
     except ValueError:
         # Otherwise, trying to extract the scope, name from args.rule_id
         if not args.rses:
-            logger.error('A RSE expression must be specified if you do not provide a rule_id but a DID')
-            return FAILURE
+            raise InputValidationError('A RSE expression must be specified if you do not provide a rule_id but a DID')
         scope, name = get_scope(args.rule_id, client)
         rules = client.list_did_rules(scope=scope, name=name)
         if args.rule_account is None:
@@ -1372,8 +1334,7 @@ def delete_rule(args, client, logger, console, spinner):
                 client.delete_replication_rule(rule_id=rule['id'], purge_replicas=args.purge_replicas)
                 deletion_success = True
         if not deletion_success:
-            logger.error('No replication rule was deleted from the DID')
-            return FAILURE
+            raise RucioException('No replication rule was deleted from the DID')
     return SUCCESS
 
 
@@ -1394,8 +1355,8 @@ def update_rule(args, client, logger, console, spinner):
         elif args.locked.title() == "False":
             options['locked'] = False
         else:
-            logger.error('Locked must be True or False')
-            return FAILURE
+            raise InputValidationError('Locked must be True or False')
+
     if args.comment:
         options['comment'] = args.comment
     if args.rule_account:
@@ -1410,8 +1371,7 @@ def update_rule(args, client, logger, console, spinner):
         options['source_replica_expression'] = None if args.source_replica_expression.lower() == 'none' else args.source_replica_expression
     if args.cancel_requests:
         if 'state' not in options:
-            logger.error('--stuck or --suspend must be specified when running --cancel-requests')
-            return FAILURE
+            raise InputValidationError('--stuck or --suspend must be specified when running --cancel-requests')
         options['cancel_requests'] = True
     if args.priority:
         options['priority'] = int(args.priority)
@@ -1578,12 +1538,11 @@ def list_rules(args, client, logger, console, spinner):
     elif args.rule_account:
         rules = client.list_account_rules(account=args.rule_account)
     elif args.subscription:
-        account = args.subscription[0]
-        name = args.subscription[1]
+        account = args.rule_account if args.rule_account else client.account
+        name = args.subscription
         rules = client.list_subscription_rules(account=account, name=name)
     else:
-        print('At least one option has to be given. Use -h to list the options.')
-        return FAILURE
+        raise InputValidationError('At least one option has to be given. Use -h to list the options.')
     if args.csv:
         for rule in rules:
             print(rule['id'],
@@ -1990,21 +1949,18 @@ def add_lifetime_exception(args, client, logger, console, spinner):
     """
 
     if not args.reason:
-        logger.error('reason for the extension is mandatory')
-        return FAILURE
+        raise InputValidationError('reason for the extension is mandatory')
     reason = args.reason
     if not args.expiration:
-        logger.error('expiration is mandatory')
-        return FAILURE
+        raise InputValidationError('expiration is mandatory')
     try:
         expiration = datetime.strptime(args.expiration, "%Y-%m-%d")
     except Exception as err:
-        logger.error(err)
-        return FAILURE
+        msg = f'Cannot parse expiration date: {err}'
+        raise ValueError(msg)
 
     if not args.inputfile:
-        logger.error('inputfile is mandatory')
-        return FAILURE
+        raise InputValidationError('inputfile is mandatory')
     with open(args.inputfile) as infile:
         # Deduplicate the content of the input file and ignore empty lines.
         dids = set(did for line in infile if (did := line.strip()))
@@ -2067,22 +2023,8 @@ def add_lifetime_exception(args, client, logger, console, spinner):
     if not datasets:
         logger.error('Nothing to submit')
         return SUCCESS
-    try:
-        client.add_exception(dids=datasets, account=client.account, pattern='', comments=reason, expires_at=expiration)
-    except UnsupportedOperation as err:
-        logger.error(err)
-        return FAILURE
-    except Exception:
-        error_message = 'Failure to submit exception. Please retry.'
-        if cli_config == 'rich':
-            if logger.level == DEBUG:
-                logger.exception(error_message)
-            else:
-                logger.error(error_message)
-        else:
-            logger.error(error_message)
-            logger.debug(traceback.format_exc())
-        return FAILURE
+
+    client.add_exception(dids=datasets, account=client.account, pattern='', comments=reason, expires_at=expiration)
 
     logger.info('Exception successfully submitted. Summary below:')
     for key, data in error_summary.items():
@@ -2499,6 +2441,8 @@ You can filter by key/value, e.g.::
     ''')
 
     scope_list_parser.set_defaults(function=list_scopes)
+    scope_list_parser.add_argument("--csv", action="store_true", default=False, help="Comma Separated Value output.")
+    scope_list_parser.add_argument('--account', help='Filter scopes by account')
 
     # The close command
     close_parser = subparsers.add_parser('close', help='Close a dataset or container.')
@@ -2699,7 +2643,7 @@ You can filter by account::
     list_rules_parser.add_argument('--csv', dest='csv', action='store_true', default=False, help='Comma Separated Value output')
     list_rules_parser.add_argument('--file', dest='file', action='store', help='List associated rules of an affected file')
     list_rules_parser.add_argument('--account', dest='rule_account', action='store', help='List by account')
-    list_rules_parser.add_argument('--subscription', dest='subscription', action='store', help='List by account and subscription name', metavar=('ACCOUNT', 'SUBSCRIPTION'), nargs=2)
+    list_rules_parser.add_argument('--subscription', dest='subscription', action='store', help='List by subscription name')
 
     # The list_rules_history command
     list_rules_history_parser = subparsers.add_parser('list-rules-history', help='List replication rules history for a DID.')