rucio-clients 38.0.0rc2__tar.gz → 38.1.0__tar.gz

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.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_clients-38.0.0rc2 → rucio_clients-38.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio-clients
-Version: 38.0.0rc2
+Version: 38.1.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/bin/rucio

@@ -17,6 +17,7 @@ import argparse
 import sys
 from typing import TYPE_CHECKING, Optional
 
+from rucio.cli.bin_legacy.rucio import get_parser
 from rucio.cli.bin_legacy.rucio import main as main_legacy
 from rucio.cli.command import main
 from rucio.common.utils import setup_logger
@@ -119,9 +120,11 @@ if __name__ == "__main__":
         main()  # pylint: disable=E1120
 
     else:
-        make_warning(logger)
         try:
+            get_parser().parse_args()
+            make_warning(logger)
             main_legacy()
+
         # Make a custom warning - show the new help menu when invalid commands are called.
         except argparse.ArgumentError:
             logger.error("Invalid argument(s) - %s " % sys.argv[1:])

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/lib/rucio/cli/account.py

@@ -212,5 +212,5 @@ def identity_add(ctx, account_name, type_, id, email, password):
 @click.pass_context
 def identity_remove(ctx, account_name, type_, id):
     """Revoke a given ID's access from an account"""
-    args = Arguments({"no_pager": ctx.obj.no_pager, "account": account_name, "authtype": type_, "id": id})
+    args = Arguments({"no_pager": ctx.obj.no_pager, "account": account_name, "authtype": type_, "identity": id})
     identity_delete(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -32,7 +32,6 @@ from rich.status import Status
 from rich.text import Text
 from rich.theme import Theme
 from rich.traceback import install
-from rich.tree import Tree
 from tabulate import tabulate
 
 # rucio module has the same name as this executable module, so this rule fails. pylint: disable=no-name-in-module
@@ -716,64 +715,7 @@ def list_parent_dids(args, client, logger, console, spinner):
         spinner.update(status='Fetching parent DIDs')
         spinner.start()
 
-    if args.pfns:
-        dict_datasets = {}
-        output = []
-        for res in client.get_did_from_pfns(args.pfns):
-            for key in res:
-                if key not in dict_datasets:
-                    dict_datasets[key] = []
-                for rule in client.list_associated_rules_for_file(res[key]['scope'], res[key]['name']):
-                    if f"{rule['scope']}:{rule['name']}" not in dict_datasets[key]:
-                        dict_datasets[key].append(f"{rule['scope']}:{rule['name']}")
-
-        for i, pfn in enumerate(dict_datasets):
-            if cli_config == 'rich':
-                parent_tree = Tree('')
-                for parent in dict_datasets[pfn]:
-                    parent_tree.add(parent)
-                table = generate_table([['PFN', pfn], ['Parents', parent_tree]], col_alignments=['left', 'left'], row_styles=['none'])
-                output.append(table)
-            else:
-                print('PFN: ', pfn)
-                print('Parents: ', ','.join(dict_datasets[pfn]))
-
-        if cli_config == 'rich':
-            spinner.stop()
-            print_output(*output, console=console, no_pager=args.no_pager)
-    elif args.guids:
-        output = []
-        guids = []
-        for input_ in args.guids:
-            try:
-                uuid.UUID(input_)
-            except ValueError:
-                print(f'Ignoring invalid GUID: {input_}')
-                continue
-        dict_datasets = {}
-        for guid in guids:
-            for did in client.get_dataset_by_guid(guid):
-                if guid not in dict_datasets:
-                    dict_datasets[guid] = []
-                for rule in client.list_associated_rules_for_file(did['scope'], did['name']):
-                    if f"{rule['scope']}:{rule['name']}" not in dict_datasets[guid]:
-                        dict_datasets[guid].append(f"{rule['scope']}:{rule['name']}")
-
-        for i, guid in enumerate(dict_datasets):
-            if cli_config == 'rich':
-                parent_tree = Tree('')
-                for parent in dict_datasets[guid]:
-                    parent_tree.add(parent)
-                table = generate_table([['GUID', guid], ['Parents', parent_tree]], col_alignments=['left', 'left'], row_styles=['none'])
-                output.append(table)
-            else:
-                print('GUID: ', guid)
-                print('Parents : ', ','.join(dict_datasets[guid]))
-
-        if cli_config == 'rich':
-            spinner.stop()
-            print_output(*output, console=console, no_pager=args.no_pager)
-    elif args.did:
+    if args.did:
         table_data = []
         scope, name = get_scope(args.did, client)
         for dataset in client.list_parent_dids(scope=scope, name=name):
@@ -789,7 +731,7 @@ def list_parent_dids(args, client, logger, console, spinner):
         else:
             print(tabulate(table_data, tablefmt=tablefmt, headers=['SCOPE:NAME', '[DID TYPE]']))
     else:
-        raise InputValidationError('At least one option has to be given. Use -h to list the options.')
+        raise InputValidationError('A DID must be provided. Use -h to list the options.')
     return SUCCESS
 
 
@@ -2403,8 +2345,6 @@ You can filter by key/value, e.g.::
     ''')
     list_parent_parser.set_defaults(function=list_parent_dids)
     list_parent_parser.add_argument(dest='did', action='store', nargs='?', default=None, help='Data identifier.')
-    list_parent_parser.add_argument('--pfn', dest='pfns', action='store', nargs='+', help='List parent dids for these pfns.')
-    list_parent_parser.add_argument('--guid', dest='guids', action='store', nargs='+', help='List parent dids for these guids.')
 
     # argparse 2.7 does not allow aliases for commands, thus the list-parent-datasets is a copy&paste from list-parent-dids
     list_parent_datasets_parser = subparsers.add_parser('list-parent-datasets', help='List parent DIDs for a given DID', description='List all parents Data IDentifier that contains the target Data IDentifier.',
@@ -2423,8 +2363,6 @@ You can filter by key/value, e.g.::
 
     list_parent_datasets_parser.set_defaults(function=list_parent_dids)
     list_parent_datasets_parser.add_argument(dest='did', action='store', nargs='?', default=None, help='Data identifier.')
-    list_parent_datasets_parser.add_argument('--pfn', dest='pfns', action='store', nargs='+', help='List parent dids for these pfns.')
-    list_parent_datasets_parser.add_argument('--guid', dest='guids', action='store', nargs='+', help='List parent dids for these guids.')
 
     # The list-scopes command
     scope_list_parser = subparsers.add_parser('list-scopes', help='List all available scopes.',

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/lib/rucio/cli/did.py

@@ -37,11 +37,8 @@ def did():
 @click.option("--short", is_flag=True, default=False, help="Dump the list of DIDs")
 @click.argument("did-pattern", nargs=-1)
 @click.option("--parent", default=False, is_flag=True, help="List the parents of the DID - must use a full DID scope and name")
-# TODO Implement or remove option - view https://github.com/rucio/rucio/issues/7230
-@click.option("--pfn", hidden=True)
-@click.option("--guid", hidden=True)
 @click.pass_context
-def list_(ctx, did_pattern, recursive, filter_, short, parent, pfn, guid):
+def list_(ctx, did_pattern, recursive, filter_, short, parent):
     """
     List the Data IDentifiers matching certain pattern.
     Only the collections (i.e. dataset or container) are returned by default.

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/lib/rucio/common/exception.py

@@ -1215,7 +1215,7 @@ class OpenDataError(RucioException):
 
     def __init__(self, *args):
         super(OpenDataError, self).__init__(*args)
-        self._message = f"Error related to open data."
+        self._message = "Error related to open data."
         self.error_code = 115
 
 
@@ -1226,7 +1226,7 @@ class OpenDataDataIdentifierNotFound(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataDataIdentifierNotFound, self).__init__(*args)
-        self._message = f"Data identifier not found in the open data catalog."
+        self._message = "Data identifier not found in the open data catalog."
         self.error_code = 116
 
 
@@ -1237,7 +1237,7 @@ class OpenDataDataIdentifierAlreadyExists(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataDataIdentifierAlreadyExists, self).__init__(*args)
-        self._message = f"Data identifier already exists in the open data catalog."
+        self._message = "Data identifier already exists in the open data catalog."
         self.error_code = 117
 
 
@@ -1248,7 +1248,7 @@ class OpenDataInvalidState(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataInvalidState, self).__init__(*args)
-        self._message = f"Open data entry is in an invalid state."
+        self._message = "Open data entry is in an invalid state."
         self.error_code = 118
 
 
@@ -1259,5 +1259,5 @@ class OpenDataInvalidStateUpdate(OpenDataError):
 
     def __init__(self, *args):
         super(OpenDataInvalidStateUpdate, self).__init__(*args)
-        self._message = f"Invalid state update attempted on open data entry."
+        self._message = "Invalid state update attempted on open data entry."
         self.error_code = 119

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/lib/rucio/common/schema/__init__.py

@@ -59,23 +59,15 @@ def _get_generic_schema_module():
 if not _is_multivo():
     GENERIC_FALLBACK = 'generic'
 
-    if config.config_has_section('policy'):
-        try:
-            if 'RUCIO_POLICY_PACKAGE' in environ:
-                policy = environ['RUCIO_POLICY_PACKAGE']
-            else:
-                policy = config.config_get('policy', 'package', check_config_table=False)
-            package_module = importlib.import_module(policy)
-            check_policy_module_version(package_module)
-            policy = policy + ".schema"
-        except (NoOptionError, NoSectionError, ModuleNotFoundError):
-            # fall back to old system for now
-            try:
-                policy = config.config_get('policy', 'schema', check_config_table=False)
-            except (NoOptionError, NoSectionError):
-                policy = GENERIC_FALLBACK
-            policy = 'rucio.common.schema.' + policy.lower()
-    else:
+    try:
+        if 'RUCIO_POLICY_PACKAGE' in environ:
+            policy = environ['RUCIO_POLICY_PACKAGE']
+        else:
+            policy = config.config_get('policy', 'package', check_config_table=False, raise_exception=True)
+        package_module = importlib.import_module(policy)
+        check_policy_module_version(package_module)
+        policy = policy + ".schema"
+    except (NoOptionError, NoSectionError, ModuleNotFoundError):
         policy = 'rucio.common.schema.' + GENERIC_FALLBACK.lower()
 
     try:
@@ -102,24 +94,16 @@ if not _is_multivo():
 
 def load_schema_for_vo(vo: str) -> None:
     generic_fallback = 'generic_multi_vo'
-    if config.config_has_section('policy'):
-        try:
-            env_name = 'RUCIO_POLICY_PACKAGE_' + vo.upper()
-            if env_name in environ:
-                policy = environ[env_name]
-            else:
-                policy = config.config_get('policy', 'package-' + vo, check_config_table=False)
-            package_module = importlib.import_module(policy)
-            check_policy_module_version(package_module)
-            policy = policy + ".schema"
-        except (NoOptionError, NoSectionError, ModuleNotFoundError):
-            # fall back to old system for now
-            try:
-                policy = config.config_get('policy', 'schema', check_config_table=False)
-            except (NoOptionError, NoSectionError):
-                policy = generic_fallback
-            policy = 'rucio.common.schema.' + policy.lower()
-    else:
+    try:
+        env_name = 'RUCIO_POLICY_PACKAGE_' + vo.upper()
+        if env_name in environ:
+            policy = environ[env_name]
+        else:
+            policy = config.config_get('policy', 'package-' + vo, check_config_table=False, raise_exception=True)
+        package_module = importlib.import_module(policy)
+        check_policy_module_version(package_module)
+        policy = policy + ".schema"
+    except (NoOptionError, NoSectionError, ModuleNotFoundError):
         policy = 'rucio.common.schema.' + generic_fallback.lower()
 
     try:

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/lib/rucio/common/utils.py

@@ -399,7 +399,7 @@ class NonDeterministicPFNAlgorithms(PolicyPackageAlgorithms):
         Initialises a non-deterministic PFN construction object
         """
         super().__init__()
-        
+
         self.vo = vo
 
     def construct_non_deterministic_pfn(self, dsn: str, scope: Optional[str], filename: str, naming_convention: str) -> str:

rucio_clients-38.1.0/lib/rucio/vcsversion.py

@@ -0,0 +1,11 @@
+
+'''
+This file is automatically generated; Do not edit it. :)
+'''
+VERSION_INFO = {
+    'final': True,
+    'version': '38.1.0',
+    'branch_nick': 'release-38-LTS',
+    'revision_id': 'f63f25c84c254eac1701a9640e3cb658a7bbdd8e',
+    'revno': 13947
+}

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/pyproject.toml

@@ -4,8 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [tool.pytest.ini_options]
 pythonpath = [
-  ".",
-  "lib",
+    ".",
+    "lib",
+]
+testpaths = [
+    "tests",
+]
+filterwarnings = [
+    "ignore::BytesWarning",
 ]
 
 [tool.coverage.report]

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/tests/test_bin_rucio.py

@@ -89,7 +89,7 @@ def test_whoami():
     assert "ERROR" not in err
 
 
-def test_identity(random_account):
+def test_identity(random_account, rucio_client):
     """CLIENT(ADMIN): Add/list/delete identity"""
 
     cmd = f'rucio-admin identity add --account {random_account} --type GSS --id jdoe@CERN.CH --email jdoe@CERN.CH'
@@ -109,6 +109,22 @@ def test_identity(random_account):
     exitcode, out, _ = execute(cmd)
     assert 'jdoe@CERN.CH' not in out
 
+    # testing OIDC IDs
+
+    id = "CN=Joe Doe,CN=707658,CN=jdoe,OU=Users,OU=Organic Units,DC=cern,DC=ch"
+    cmd = f'rucio account identity add {random_account} --type OIDC --id "{id}" --email jdoe@CERN.CH'
+    exitcode, out, _ = execute(cmd)
+    assert exitcode == 0
+    assert f'Added new identity to account: {id}-{random_account}\n' in out
+
+    cmd = f'rucio -v account identity remove {random_account} --type OIDC --id "{id}"'
+    exitcode, _, err = execute(cmd)
+    assert exitcode == 0
+    assert "ERROR" not in err
+
+    ids = [i['type'] for i in rucio_client.list_identities(account=random_account.external)]
+    assert 'OIDC' not in ids
+
 
 def test_attributes(random_account):
     """CLIENT(ADMIN): Add/List/Delete attributes"""

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/tests/test_cli_client_structure.py

@@ -43,6 +43,11 @@ def test_main_args():
     assert "This method is being deprecated" in err
     assert "root" in out
 
+    # Ensure non-exist commands don't throw the deprecation error
+    non_existent_cmd = "rucio lfkdl --slkfdj 1"
+    _, _, err = execute(non_existent_cmd)
+    assert "This method is being deprecated" not in err
+
 
 def test_help_menus():
     """Verify help menus"""

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/tests/test_conveyor.py

@@ -1617,6 +1617,7 @@ def test_checksum_validation(rse_factory, did_factory, root_account):
 
 @pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
+@pytest.mark.needs_iam
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
 @pytest.mark.parametrize("file_config_mock", [
     {"overrides": [('oidc', 'admin_issuer', 'indigoiam')]},
@@ -1760,6 +1761,7 @@ def test_transfer_plugins(rse_factory, did_factory, root_account, file_config_mo
 
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
+@pytest.mark.needs_iam
 @pytest.mark.parametrize("file_config_mock", [{
     "overrides": [('client', 'register_bittorrent_meta', 'true')]
 }], indirect=True)

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/tests/test_hermes.py

@@ -59,16 +59,8 @@ class MyListener:
         {
             "table_content": [
                 ("hermes", "services_list", "influx,activemq,elastic,email"),
-                (
-                    "hermes",
-                    "elastic_endpoint",
-                    "http://localhost:9200/ddm_events/doc/_bulk",
-                ),
-                (
-                    "hermes",
-                    "influxdb_endpoint",
-                    "http://localhost:8086/api/v2/write?org=rucio&bucket=rucio",
-                ),
+                ("hermes", "elastic_endpoint", "http://elasticsearch:9200/ddm_events/doc/_bulk"),
+                ("hermes", "influxdb_endpoint", "http://influxdb:8086/api/v2/write?org=rucio&bucket=rucio"),
                 ("hermes", "influxdb_token", "mytoken"),
                 ("messaging-hermes", "destination", "/queue/events"),
                 ("messaging-hermes", "brokers", "localhost"),
@@ -76,22 +68,16 @@ class MyListener:
                 ("messaging-hermes", "username", "hermes"),
                 ("messaging-hermes", "password", "supersecret"),
                 ("messaging-hermes", "nonssl_port", 61613),
-                ("messaging-hermes", "send_email", False),
+                ("messaging-hermes", "send_email", True),
+                ("messaging-hermes", "smtp_host", "testing.host"),
+                ("messaging-hermes", "smtp_port", 1234),
             ]
         },
         {
             "table_content": [
                 ("hermes", "services_list", "influx,activemq,elastic,email"),
-                (
-                    "hermes",
-                    "elastic_endpoint",
-                    "http://localhost:9200/ddm_events/doc/_bulk",
-                ),
-                (
-                    "hermes",
-                    "influxdb_endpoint",
-                    "http://localhost:8086/api/v2/write?org=rucio&bucket=rucio",
-                ),
+                ("hermes", "elastic_endpoint", "http://elasticsearch:9200/ddm_events/doc/_bulk"),
+                ("hermes", "influxdb_endpoint", "http://influxdb:8086/api/v2/write?org=rucio&bucket=rucio"),
                 ("hermes", "influxdb_token", "mytoken"),
                 ("messaging-hermes", "destination", "/queue/events"),
                 ("messaging-hermes", "brokers", "localhost"),
@@ -99,9 +85,9 @@ class MyListener:
                 ("messaging-hermes", "username", "hermes"),
                 ("messaging-hermes", "password", "supersecret"),
                 ("messaging-hermes", "nonssl_port", 61613),
-                ("messaging-hermes", "send_email", False),
-                ("messaging-hermes", "smtp-host", "testing.host"),
-                ("messaging-hermes", "smtp-port", 1234),
+                ("messaging-hermes", "send_email", True),
+                ("messaging-hermes", "smtp_host", "testing.host"),
+                ("messaging-hermes", "smtp_port", 1234),
             ]
         }
     ],
@@ -205,7 +191,11 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
         smtp_mock = MagicMock()
         m.setattr(hermes.smtplib, "SMTP", smtp_mock)
         hermes.hermes(once=True)
-        smtp_mock.assert_called_with(host="testing.host", port=1234)
+        smtp_host = config_get("messaging-hermes", "smtp_host", default='', raise_exception=False)
+        if not smtp_host:
+            smtp_mock.assert_called_with()
+        else:
+            smtp_mock.assert_called_with(host="testing.host", port=1234)
     service_dict = {"influx": 0, "elastic": 0, "email": 0, "activemq": 0}
     messages = retrieve_messages(50, old_mode=False)
     for message in messages:
@@ -247,7 +237,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     # Checking influxDB
     assert service_dict["influx"] == 0
     res = requests.get(
-        "http://localhost:8086/query?db=rucio",
+        "http://influxdb:8086/query?db=rucio",
         headers={"Authorization": "Token mytoken"},
         params={"q": "SELECT * FROM deletion"},
     )
@@ -273,7 +263,7 @@ def test_hermes(core_config_mock, caches_mock, monkeypatch):
     data = ' { "query": { "match_all": {} } }'
     headers = {"Content-Type": "application/json"}
     response = requests.post(
-        "http://localhost:9200/_search?size=1000", data=data, headers=headers
+        "http://elasticsearch:9200/_search?size=1000", data=data, headers=headers
     )
     assert response.status_code == 200
     res = response.json()

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/tests/test_reaper.py

@@ -498,6 +498,7 @@ def test_reaper_without_rse_usage(vo, caches_mock):
 
 @skip_rse_tests_with_accounts
 @pytest.mark.dirty(reason="leaves files in XRD containers")
+@pytest.mark.needs_iam
 @pytest.mark.noparallel(groups=[NoParallelGroups.WEB])
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
     'rucio.daemons.reaper.reaper.REGION'

{rucio_clients-38.0.0rc2 → rucio_clients-38.1.0}/tests/test_transfer_plugins.py

@@ -157,7 +157,7 @@ def test_activity_missing(file_config_mock, did_factory, rse_factory, root_accou
 
 
 class TestCollocationHints:
-    class TestCollocationPlugin(FTS3TapeMetadataPlugin):
+    class MockCollocationPlugin(FTS3TapeMetadataPlugin):
         def __init__(self) -> None:
             self.register(
                 'test',
@@ -167,7 +167,7 @@ class TestCollocationHints:
         def _test_collocation(self, hints: dict[str, str]) -> dict[str, dict]:
             return {"collocation_hints": {"0": "", "1": "", "2": "", "3": ""}}
 
-    TestCollocationPlugin()
+    MockCollocationPlugin()
 
     @pytest.mark.parametrize("file_config_mock", [
         {

rucio_clients-38.0.0rc2/lib/rucio/vcsversion.py

@@ -1,11 +0,0 @@
-
-'''
-This file is automatically generated; Do not edit it. :)
-'''
-VERSION_INFO = {
-    'final': True,
-    'version': '38.0.0rc2',
-    'branch_nick': 'master',
-    'revision_id': 'aee8085264628fcd7a99c24b3fbe029a45ddbf52',
-    'revno': 13892
-}