rucio-clients 37.6.0__tar.gz → 37.7.1__tar.gz

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/PKG-INFO

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

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/cli/bin_legacy/rucio.py

@@ -26,7 +26,7 @@ import uuid
 from copy import deepcopy
 from datetime import datetime
 from logging import DEBUG
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from rich.console import Console
 from rich.padding import Padding
@@ -58,6 +58,9 @@ from rucio.common.extra import import_extras
 from rucio.common.test_rucio_server import TestRucioServer
 from rucio.common.utils import Color, StoreAndDeprecateWarningAction, chunks, extract_scope, parse_did_filter_from_string, parse_did_filter_from_string_fe, setup_logger, sizefmt
 
+if TYPE_CHECKING:
+    from rucio.common.types import FileToUploadDict
+
 EXTRA_MODULES = import_extras(['argcomplete'])
 
 if EXTRA_MODULES['argcomplete']:
@@ -947,29 +950,44 @@ def upload(args, client, logger, console, spinner):
         elif len(did) == 2:
             logger.warning('Ignoring input {} because dataset DID is already set {}:{}'.format(arg, dsscope, dsname))
 
-    items = []
+    items: list[FileToUploadDict] = []
     for arg in args.args:
         if arg.count(':') > 0:
             continue
+        if args.pfn and args.impl:
+            logger.warning('Ignoring --impl option because --pfn option given')
+            args.impl = None
+
+        item: FileToUploadDict = {'path': arg, 'rse': args.rse}
+
+        if args.scope:
+            item['did_scope'] = args.scope
+        if args.name:
+            item['did_name'] = args.name
+        if dsscope:
+            item['dataset_scope'] = dsscope
+        if dsname:
+            item['dataset_name'] = dsname
+        if args.impl:
+            item['impl'] = args.impl
+        if args.protocol:
+            item['force_scheme'] = args.protocol
         if args.pfn:
-            if args.impl:
-                logger.warning('Ignoring --impl option because --pfn option given')
-                args.impl = None
-        items.append({'path': arg,
-                      'rse': args.rse,
-                      'did_scope': args.scope,
-                      'did_name': args.name,
-                      'impl': args.impl,
-                      'dataset_scope': dsscope,
-                      'dataset_name': dsname,
-                      'force_scheme': args.protocol,
-                      'pfn': args.pfn,
-                      'no_register': args.no_register,
-                      'lifetime': args.lifetime,
-                      'register_after_upload': args.register_after_upload,
-                      'transfer_timeout': args.transfer_timeout,
-                      'guid': args.guid,
-                      'recursive': args.recursive})
+            item['pfn'] = args.pfn
+        if args.no_register:
+            item['no_register'] = True
+        if args.register_after_upload:
+            item['register_after_upload'] = True
+        if args.lifetime is not None:
+            item['lifetime'] = int(args.lifetime)
+        if args.transfer_timeout is not None:
+            item['transfer_timeout'] = int(args.transfer_timeout)
+        if args.guid:
+            item['guid'] = args.guid
+        if args.recursive:
+            item['recursive'] = True
+
+        items.append(item)
 
     if len(items) < 1:
         raise InputValidationError('No files could be extracted from the given arguments')
@@ -978,6 +996,7 @@ def upload(args, client, logger, console, spinner):
         logger.error("A single GUID was specified on the command line, but there are multiple files to upload.")
         logger.error("If GUID auto-detection is not used, only one file may be uploaded at a time")
         raise InputValidationError('Invalid input argument composition')
+
     if len(items) > 1 and args.name:
         logger.error("A single LFN was specified on the command line, but there are multiple files to upload.")
         logger.error("If LFN auto-detection is not used, only one file may be uploaded at a time")
@@ -991,7 +1010,7 @@ def upload(args, client, logger, console, spinner):
     from rucio.client.uploadclient import UploadClient
     upload_client = UploadClient(client, logger=logger)
     summary_file_path = 'rucio_upload.json' if args.summary else None
-    upload_client.upload(items, summary_file_path)
+    upload_client.upload(items=items, summary_file_path=summary_file_path)
     return SUCCESS
 
 

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/cli/rule.py

@@ -116,13 +116,17 @@ def move(ctx, rule_id, rses, activity, source_rses):
 @click.option("--comment", help="Comment about the replication rule")
 @click.option("--account", help="The account owning the rule")
 @click.option("--stuck", is_flag=True, default=False, help="Set state to STUCK.")
+@click.option('--suspend', is_flag=True, default=None, help='Set state to SUSPENDED.')
 @click.option("--activity", help="Activity of the rule.")
 @click.option("--cancel-requests", is_flag=True, default=False, help="Cancel requests when setting rules to stuck.")
 @click.option("--priority", help="Priority of the requests of the rule.")
 @click.option("--child-rule-id", help='Child rule id of the rule. Use "None" to remove an existing parent/child relationship.')
 @click.option("--boost-rule", is_flag=True, default=False, help="Quickens the transition of a rule from STUCK to REPLICATING.")
 @click.pass_context
-def update(ctx, rule_id, lifetime, locked, source_rses, activity, comment, account, stuck, cancel_requests, priority, child_rule_id, boost_rule):
+def update(
+    ctx, rule_id: str, lifetime: str, locked: bool, source_rses: str, activity: str, comment: str,
+    account: str, stuck: bool, suspend: bool, cancel_requests: bool, priority: str, child_rule_id: str, boost_rule: bool
+):
     """Update an existing rule"""
     args = Arguments(
         {
@@ -134,6 +138,7 @@ def update(ctx, rule_id, lifetime, locked, source_rses, activity, comment, accou
             "rule_account": account,
             "source_replica_expression": source_rses,
             "state_stuck": stuck,
+            "state_suspended": suspend,
             "cancel_requests": cancel_requests,
             "priority": priority,
             "child_rule_id": child_rule_id,
@@ -144,15 +149,14 @@ def update(ctx, rule_id, lifetime, locked, source_rses, activity, comment, accou
 
 
 @rule.command("list")
-@click.option("--did")
-@click.option("--id", "rule_id", help="List by rule id", hidden=True)  # TODO: Remove. This doesn't work and does the same thing as show
+@click.argument("did")
 @click.option("--traverse", is_flag=True, default=False, help="Traverse the did tree and search for rules affecting this did")
 @click.option("--csv", is_flag=True, default=False, help="Comma Separated Value output")
 @click.option("--file", help="Filter by file")
 @click.option("--account", help="Filter by account")
 @click.option("--subscription", help="Filter by subscription name")
 @click.pass_context
-def list_(ctx, did, rule_id, traverse, csv, file, account, subscription):
+def list_(ctx, did, traverse, csv, file, account, subscription):
     """List all rules impacting a given DID"""
-    args = Arguments({"no_pager": ctx.obj.no_pager, "did": did, "rule_id": rule_id, "traverse": traverse, "csv": csv, "file": file, "subscription": (account if account is not None else ctx.obj.client.account, subscription)})
+    args = Arguments({"no_pager": ctx.obj.no_pager, "did": did, "rule_id": None, "traverse": traverse, "csv": csv, "file": file, "subscription": (account if account is not None else ctx.obj.client.account, subscription)})
     list_rules(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/client/baseclient.py

@@ -38,6 +38,7 @@ from requests.status_codes import codes
 from rucio import version
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_has_section
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import CannotAuthenticate, ClientProtocolNotFound, ClientProtocolNotSupported, ConfigNotFound, MissingClientParameter, MissingModuleException, NoAuthInformation, ServerConnectionException
 from rucio.common.extra import import_extras
 from rucio.common.utils import build_url, get_tmp_dir, my_key_generator, parse_response, setup_logger, ssh_sign
@@ -225,10 +226,10 @@ class BaseClient:
                     self.vo = config_get('client', 'vo')
                 except (NoOptionError, NoSectionError):
                     self.logger.debug('No VO found. Using default VO.')
-                    self.vo = 'def'
+                    self.vo = DEFAULT_VO
                 except ConfigNotFound:
                     self.logger.debug('No configuration found. Using default VO.')
-                    self.vo = 'def'
+                    self.vo = DEFAULT_VO
 
         self.auth_token_file_path, self.token_exp_epoch_file, self.token_file, self.token_path = self._get_auth_tokens()
         self.__authenticate()
@@ -251,7 +252,7 @@ class BaseClient:
 
         else:
             token_path = self.TOKEN_PATH_PREFIX + getpass.getuser()
-            if self.vo != 'def':
+            if self.vo != DEFAULT_VO:
                 token_path += '@%s' % self.vo
 
             token_file = token_path + '/' + self.TOKEN_PREFIX + token_filename_suffix

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/client/downloadclient.py

@@ -32,6 +32,7 @@ from rucio.client.client import Client
 from rucio.common.checksum import CHECKSUM_ALGO_DICT, GLOBALLY_SUPPORTED_CHECKSUMS, PREFERRED_CHECKSUM, adler32
 from rucio.common.client import detect_client_location
 from rucio.common.config import config_get
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.didtype import DID
 from rucio.common.exception import InputValidationError, NoFilesDownloaded, NotAllFilesDownloaded, RucioException
 from rucio.common.pcache import Pcache
@@ -213,7 +214,7 @@ class DownloadClient:
         self.trace_tpl['hostname'] = self.client_location['fqdn']
         self.trace_tpl['localSite'] = self.client_location['site']
         self.trace_tpl['account'] = self.client.account
-        if self.client.vo != 'def':
+        if self.client.vo != DEFAULT_VO:
             self.trace_tpl['vo'] = self.client.vo
         self.trace_tpl['eventType'] = 'download'
         self.trace_tpl['eventVersion'] = 'api_%s' % version.RUCIO_VERSION[0]

rucio_clients-37.7.1/lib/rucio/client/exportclient.py

@@ -0,0 +1,91 @@
+# Copyright European Organization for Nuclear Research (CERN) since 2012
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import Any
+
+from requests.status_codes import codes
+
+from rucio.client.baseclient import BaseClient, choice
+from rucio.common.utils import build_url, parse_response
+
+
+class ExportClient(BaseClient):
+    """RSE client class for exporting data from Rucio"""
+
+    EXPORT_BASEURL = 'export'
+
+    def export_data(self, distance: bool = True) -> dict[str, Any]:
+        """
+        Retrieve a detailed snapshot of the current RSE configuration.
+
+        The exported information includes all registered RSEs with their settings and
+        attributes. When `distance` is `True`, the RSE distance matrix is included as well.
+        The snapshot is intended for use cases such as configuration back‑ups, migrations
+        between instances, and monitoring (e.g. generating monitoring dashboards).
+
+        Parameters
+        ----------
+        distance
+            If *True* (default), the server also returns the inter‑RSE distance matrix in
+            the payload.
+
+            _**Note:**_ Omitting the distance information can significantly reduce the
+            response size and improve transfer times.
+
+        Returns
+        -------
+        dict[str, Any]
+            A nested dictionary that mirrors the server‑side JSON structure.
+            The top‑level keys are:
+
+            **`rses`**:
+                Per‑RSE settings (name, deterministic flag, QoS class, supported protocol, etc.).
+
+            **`distances`**:
+                Pairwise RSE‑to‑RSE distance values (only present when `distance=True`).
+
+        Raises
+        ------
+        RucioException
+            Raised if the HTTP status code is not *200 OK*.
+
+        Examples
+        --------
+        ??? Example
+
+            Retrieve a full export of all configured RSEs, including their attributes and
+            inter-RSE distances:
+
+            ```python
+            from rucio.client.exportclient import ExportClient
+
+            export_client = ExportClient()
+
+            try:
+                rse_data = export_client.export_data()  # distance=True by default
+                print(f"Full RSE properties: {rse_data}")
+            except Exception as err:
+                print(f"Action failed: {err}")
+            ```
+        """
+        payload = {'distance': distance}
+        path = '/'.join([self.EXPORT_BASEURL])
+        url = build_url(choice(self.list_hosts), path=path, params=payload)
+
+        r = self._send_request(url, type_='GET')
+        if r.status_code == codes.ok:
+            return parse_response(r.text)
+        else:
+            exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
+            raise exc_cls(exc_msg)

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/client/pingclient.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import loads
+from typing import Any
 
 from requests.status_codes import codes
 
@@ -21,16 +22,46 @@ from rucio.common.utils import build_url
 
 
 class PingClient(BaseClient):
-
     """Ping client class"""
 
-    def ping(self):
+    def ping(self) -> dict[str, Any]:
         """
-        Sends a ping request to the rucio server.
+        This is a light‑weight “are you alive?” call (*ping* request) to the configured Rucio.
+
+        A quick way to verify (without any required authentication):
+
+        - Network connectivity between the client and the server.
+
+        - Whether the server process is running and able to respond.
+
+        - The server’s build / version.
 
         Returns
+        -------
+        dict[str, Any]
+            A dictionary with a single key: the server version (e.g. {'version': '37.0.0'})
+
+        Raises
+        ------
+        rucio.common.exception.RucioException
+            If the HTTP status code is not *200 OK*.
+
+        Examples
         --------
-            Dictionary with server information
+        ??? Example
+
+            Basic connectivity check:
+
+            ```python
+            from rucio.client.pingclient import PingClient
+            ping_client = PingClient()
+
+            try:
+                info = ping_client.ping()
+                print(f"Connected to Rucio {info['version']}")
+            except Exception as err:
+                print(f"Ping failed: {err}")
+            ```
         """
 
         headers = None

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/client/touchclient.py

@@ -18,6 +18,7 @@ from typing import Optional
 from requests import post
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import RucioException, UnsupportedDIDType
 
 
@@ -63,7 +64,7 @@ class TouchClient(BaseClient):
         trace['eventType'] = 'touch'
         trace['clientState'] = 'DONE'
         trace['account'] = self.account
-        if self.vo != 'def':
+        if self.vo != DEFAULT_VO:
             trace['vo'] = self.vo
 
         if rse:

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/client/uploadclient.py

@@ -29,7 +29,7 @@ from rucio.common.bittorrent import bittorrent_v2_merkle_sha256
 from rucio.common.checksum import GLOBALLY_SUPPORTED_CHECKSUMS, adler32, md5
 from rucio.common.client import detect_client_location
 from rucio.common.config import config_get, config_get_bool, config_get_int
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import (
     DataIdentifierAlreadyExists,
     DataIdentifierNotFound,
@@ -120,7 +120,7 @@ class UploadClient:
             'account': self.client.account,
             'eventType': 'upload',
             'eventVersion': version.RUCIO_VERSION[0],
-            'vo': self.client.vo if self.client.vo != 'def' else None
+            'vo': self.client.vo if self.client.vo != DEFAULT_VO else None
         }
 
     def upload(
@@ -135,6 +135,7 @@ class UploadClient:
         Uploads one or more files to an RSE (Rucio Storage Element) and optionally registers them.
 
         An overview of this method's performed actions:
+
         1. Collects and validates file info from the passed `items` (directories may be
             also included), ensuring valid paths exist on the local filesystem. If an RSE
             expression is provided, a single RSE is picked at random from it.

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/cache.py

@@ -16,8 +16,7 @@ from typing import TYPE_CHECKING, Optional
 
 from dogpile.cache.region import CacheRegion
 
-from rucio.common.client import is_client
-from rucio.common.config import config_get
+from rucio.common.config import config_get, is_client
 
 if TYPE_CHECKING:
     from collections.abc import Callable

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/client.py

@@ -17,44 +17,18 @@ import socket
 from configparser import NoOptionError, NoSectionError
 from typing import TYPE_CHECKING
 
-from rucio.common.config import config_get, config_has_section
-from rucio.common.exception import ConfigNotFound
+from rucio.common.config import config_get
+from rucio.common.constants import DEFAULT_VO
 
 if TYPE_CHECKING:
     from rucio.common.types import IPWithLocationDict
 
 
-def is_client() -> bool:
-    """"
-    Checks if the function is called from a client or from a server/daemon
-
-    :returns client_mode: True if is called from a client, False if it is called from a server/daemon
-    """
-    if 'RUCIO_CLIENT_MODE' not in os.environ:
-        try:
-            if config_has_section('database'):
-                client_mode = False
-            elif config_has_section('client'):
-                client_mode = True
-            else:
-                client_mode = False
-        except (RuntimeError, ConfigNotFound):
-            # If no configuration file is found the default value should be True
-            client_mode = True
-    else:
-        if os.environ['RUCIO_CLIENT_MODE']:
-            client_mode = True
-        else:
-            client_mode = False
-
-    return client_mode
-
-
 def get_client_vo() -> str:
     """
     Get the client VO from the environment or the configuration file.
 
-    :returns vo: The client VO as a string; default = 'def'.
+    :returns vo: The client VO as a string; default = DEFAULT_VO.
     """
     if 'RUCIO_VO' in os.environ:
         vo = os.environ['RUCIO_VO']
@@ -62,7 +36,7 @@ def get_client_vo() -> str:
         try:
             vo = str(config_get('client', 'vo'))
         except (NoOptionError, NoSectionError):
-            vo = 'def'
+            vo = DEFAULT_VO
     return vo
 
 

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/config.py

@@ -57,6 +57,32 @@ def _convert_to_boolean(value: Union[str, bool]) -> bool:
     raise ValueError('Not a boolean: %s' % value)
 
 
+def is_client() -> bool:
+    """"
+    Checks if the function is called from a client or from a server/daemon
+
+    :returns client_mode: True if is called from a client, False if it is called from a server/daemon
+    """
+    if 'RUCIO_CLIENT_MODE' not in os.environ:
+        try:
+            if config_has_section('database'):
+                client_mode = False
+            elif config_has_section('client'):
+                client_mode = True
+            else:
+                client_mode = False
+        except (RuntimeError, ConfigNotFound):
+            # If no configuration file is found the default value should be True
+            client_mode = True
+    else:
+        if os.environ['RUCIO_CLIENT_MODE']:
+            client_mode = True
+        else:
+            client_mode = False
+
+    return client_mode
+
+
 @overload
 def config_get(
         section: str,
@@ -192,7 +218,6 @@ def config_get(
         return convert_type_fnc(get_config().get(section, option))
     except (configparser.NoOptionError, configparser.NoSectionError, ConfigNotFound) as err:
 
-        from rucio.common.client import is_client
         client_mode = is_client()
 
         if not client_mode and check_config_table:

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/constants.py

@@ -27,6 +27,8 @@ RESERVED_KEYS = ['scope', 'name', 'account', 'did_type', 'is_open', 'monotonic',
 # collection_keys =
 # file_keys =
 
+DEFAULT_VO = 'def'
+
 KEY_TYPES = ['ALL', 'COLLECTION', 'FILE', 'DERIVED']
 # all(container, dataset, file), collection(dataset or container), file, derived(compute from file for collection)
 
@@ -213,4 +215,4 @@ RSE_ATTRS_BOOL = Literal[
 ]
 
 SUPPORTED_SIGN_URL_SERVICES_LITERAL = Literal['gcs', 's3', 'swift']
-SUPPORTED_SIGN_URL_SERVICES = list(get_args(SUPPORTED_SIGN_URL_SERVICES_LITERAL))
+SUPPORTED_SIGN_URL_SERVICES = list(get_args(SUPPORTED_SIGN_URL_SERVICES_LITERAL))

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/plugins.py

@@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, Any, TypeVar
 from packaging.specifiers import SpecifierSet
 
 from rucio.common import config
-from rucio.common.client import get_client_vo, is_client
+from rucio.common.client import get_client_vo
 from rucio.common.exception import InvalidAlgorithmName, PolicyPackageIsNotVersioned, PolicyPackageVersionError
 from rucio.version import current_version
 
@@ -132,7 +132,7 @@ class PolicyPackageAlgorithms:
             cls._try_importing_policy()
         else:
             # on client, only register algorithms for selected VO
-            if is_client():
+            if config.is_client():
                 vo = get_client_vo()
                 cls._try_importing_policy(vo)
             # on server, list all VOs and register their algorithms

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/policy.py

@@ -23,6 +23,7 @@ from dogpile.cache import make_region
 from dogpile.cache.api import NoValue
 
 from rucio.common.config import config_get
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import UndefinedPolicy
 
 if TYPE_CHECKING:
@@ -41,8 +42,8 @@ def get_policy(logger: 'LoggerFunction' = logging.log) -> str:
             try:
                 policy = config_get('permission', 'policy')
             except (NoOptionError, NoSectionError):
-                policy = 'def'
-                logger(logging.WARNING, "Policy not specified, falling back to 'def'")
+                policy = DEFAULT_VO
+                logger(logging.WARNING, "Policy not specified, falling back to DEFAULT_VO")
         policy = os.environ.get('POLICY', policy)
         REGION.set('policy', policy)
     return policy

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/schema/__init__.py

@@ -22,6 +22,7 @@ from typing import TYPE_CHECKING, Any
 from jsonschema import ValidationError, validate
 
 from rucio.common import config, exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.plugins import check_policy_module_version
 
 if TYPE_CHECKING:
@@ -94,7 +95,7 @@ if not _is_multivo():
     except ImportError:
         raise exception.ErrorLoadingPolicyPackage(policy)
 
-    schema_modules["def"] = module
+    schema_modules[DEFAULT_VO] = module
     if hasattr(module, 'SCOPE_NAME_REGEXP'):
         scope_name_regexps.append(module.SCOPE_NAME_REGEXP)
 
@@ -141,7 +142,7 @@ def load_schema_for_vo(vo: str) -> None:
     schema_modules[vo] = module
 
 
-def validate_schema(name: str, obj: Any, vo: str = 'def') -> None:
+def validate_schema(name: str, obj: Any, vo: str = DEFAULT_VO) -> None:
     if obj:
         if vo not in schema_modules:
             load_schema_for_vo(vo)
@@ -156,7 +157,7 @@ def validate_schema(name: str, obj: Any, vo: str = 'def') -> None:
             raise exception.InvalidObject(f'Problem validating {name}: {error}')
 
 
-def get_schema_value(key: str, vo: str = 'def') -> Any:
+def get_schema_value(key: str, vo: str = DEFAULT_VO) -> Any:
     if vo not in schema_modules:
         load_schema_for_vo(vo)
     if not hasattr(schema_modules[vo], key):

{rucio_clients-37.6.0 → rucio_clients-37.7.1}/lib/rucio/common/types.py

@@ -16,6 +16,8 @@ import sys
 from collections.abc import Callable
 from os import PathLike
 
+from rucio.common.constants import DEFAULT_VO
+
 if sys.version_info < (3, 11):  # pragma: no cover
     from typing_extensions import TYPE_CHECKING, Any, Literal, NotRequired, Optional, TypedDict, TypeGuard, Union  # noqa: UP035
     PathTypeAlias = Union[PathLike, str]
@@ -35,7 +37,7 @@ class InternalType:
     '''
     Base for Internal representations of string types
     '''
-    def __init__(self, value: Optional[str], vo: str = 'def', from_external: bool = True):
+    def __init__(self, value: Optional[str], vo: str = DEFAULT_VO, from_external: bool = True):
         if value is None:
             self.external = None
             self.internal = None
@@ -87,7 +89,7 @@ class _RepresentationCalculator:
         """
         split = internal.split('@', 1)
         if len(split) == 1:  # if cannot convert, vo is '' and this is single vo
-            vo = 'def'
+            vo = DEFAULT_VO
             external = split[0]
         else:
             vo = split[1]
@@ -104,7 +106,7 @@ class _RepresentationCalculator:
 
         :returns: internal representation
         """
-        if vo == 'def':
+        if vo == DEFAULT_VO:
             return external
         internal = '{}@{}'.format(external, vo)
         return internal
@@ -114,7 +116,7 @@ class InternalAccount(InternalType):
     '''
     Internal representation of an account
     '''
-    def __init__(self, account: Optional[str], vo: str = 'def', from_external: bool = True):
+    def __init__(self, account: Optional[str], vo: str = DEFAULT_VO, from_external: bool = True):
         super(InternalAccount, self).__init__(value=account, vo=vo, from_external=from_external)
 
 
@@ -122,7 +124,7 @@ class InternalScope(InternalType):
     '''
     Internal representation of a scope
     '''
-    def __init__(self, scope: Optional[str], vo: str = 'def', from_external: bool = True):
+    def __init__(self, scope: Optional[str], vo: str = DEFAULT_VO, from_external: bool = True):
         super(InternalScope, self).__init__(value=scope, vo=vo, from_external=from_external)