rucio-clients 34.5.0__tar.gz → 34.6.0__tar.gz

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/PKG-INFO

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

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/bin/rucio

@@ -1929,7 +1929,7 @@ To list the missing replica of a dataset of a given RSE-expression::
     list_file_replicas_parser.add_argument('--no-resolve-archives', dest='no_resolve_archives', default=False, action='store_true', help='Do not resolve archives which may contain the files.', required=False)
     list_file_replicas_parser.add_argument('--sort', dest='sort', default=None, action='store', help='Replica sort algorithm. Available options: geoip (default), random', required=False)
     list_file_replicas_parser.add_argument('--rses', dest='rses', default=None, action='store', help='The RSE filter expression. A comprehensive help about RSE expressions\
-            can be found in ' + Color.BOLD + 'http://rucio.cern.ch/documentation/rse_expressions/' + Color.END)
+            can be found in ' + Color.BOLD + 'https://rucio.cern.ch/documentation/started/concepts/rse_expressions' + Color.END)
 
     # The list-dataset-replicas command
     list_dataset_replicas_parser = subparsers.add_parser('list-dataset-replicas', help='List the dataset replicas.',
@@ -2431,13 +2431,13 @@ You can filter by account::
     list_rses_parser = subparsers.add_parser('list-rses', help='Show the list of all the registered Rucio Storage Elements (RSEs).')
     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 + 'http://rucio.cern.ch/documentation/rse_expressions/' + Color.END)
+can be found in ' + Color.BOLD + 'https://rucio.cern.ch/documentation/started/concepts/rse_expressions' + Color.END)
 
     # The list-suspicious-replicas command
     list_suspicious_replicas_parser = subparsers.add_parser('list-suspicious-replicas', help='Show the list of all replicas marked "suspicious".')
     list_suspicious_replicas_parser.set_defaults(function=list_suspicious_replicas)
     list_suspicious_replicas_parser.add_argument('--expression', dest='rse_expression', action='store', help='The RSE filter expression. A comprehensive help about RSE expressions \
-can be found in ' + Color.BOLD + 'http://rucio.cern.ch/documentation/rse_expressions/' + Color.END)
+can be found in ' + Color.BOLD + 'https://rucio.cern.ch/documentation/started/concepts/rse_expressions' + Color.END)
     list_suspicious_replicas_parser.add_argument('--younger_than', '--younger-than', new_option_string='--younger-than', dest='younger_than', action=StoreAndDeprecateWarningAction, help='List files that have been marked suspicious since the date "younger_than", e.g. 2021-11-29T00:00:00.')  # NOQA: E501
     list_suspicious_replicas_parser.add_argument('--nattempts', dest='nattempts', action='store', help='Minimum number of failed attempts to access a suspicious file.')
 

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/diracclient.py

@@ -13,12 +13,16 @@
 # limitations under the License.
 
 from json import dumps
+from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Mapping
+
 
 class DiracClient(BaseClient):
 
@@ -26,7 +30,12 @@ class DiracClient(BaseClient):
 
     DIRAC_BASEURL = 'dirac'
 
-    def add_files(self, lfns, ignore_availability=False, parents_metadata=None):
+    def add_files(
+            self,
+            lfns: "Iterable[Mapping[str, Any]]",
+            ignore_availability: bool = False,
+            parents_metadata: Optional["Mapping[str, Mapping[str, Any]]"] = None
+    ) -> Literal[True]:
         """
         Bulk add files :
         - Create the file and replica.

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/downloadclient.py

@@ -128,13 +128,19 @@ class DownloadClient:
         :param logger:           Optional: logging.Logger object. If None, default logger will be used.
         """
         self.check_pcache = check_pcache
-        if not logger:
+        if logger is None:
             self.logger = logging.log
         else:
-            self.logger = logger.log
+            if hasattr(logger, "debug"):
+                self.logger = logger.log
+            else:
+                self.logger = logger
+
         self.tracing = tracing
+
         if not self.tracing:
-            logger(logging.DEBUG, 'Tracing is turned off.')
+            self.logger(logging.DEBUG, 'Tracing is turned off.')
+
         self.is_human_readable = True
         self.client = client if client else Client()
         # if token should be used, use only JWT tokens
@@ -152,7 +158,7 @@ class DownloadClient:
                     break
         if self.is_admin:
             self.is_tape_excluded = False
-            logger(logging.DEBUG, 'Admin mode enabled')
+            self.logger(logging.DEBUG, 'Admin mode enabled')
 
         self.trace_tpl = {}
         self.trace_tpl['hostname'] = self.client_location['fqdn']

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/exportclient.py

@@ -12,6 +12,8 @@
 # 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
@@ -23,7 +25,7 @@ class ExportClient(BaseClient):
 
     EXPORT_BASEURL = 'export'
 
-    def export_data(self, distance=True):
+    def export_data(self, distance: bool = True) -> dict[str, Any]:
         """
         Export RSE data (RSE, settings, attributes and distance).
         :param distance: To include the distance.

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/fileclient.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import loads
+from typing import Any
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
@@ -26,7 +27,7 @@ class FileClient(BaseClient):
 
     BASEURL = 'files'
 
-    def list_file_replicas(self, scope, lfn):
+    def list_file_replicas(self, scope: str, lfn: str) -> list[dict[str, Any]]:
         """
         List file replicas.
 

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/importclient.py

@@ -12,6 +12,8 @@
 # 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
@@ -23,7 +25,7 @@ class ImportClient(BaseClient):
 
     IMPORT_BASEURL = 'import'
 
-    def import_data(self, data):
+    def import_data(self, data: dict[str, Any]) -> str:
         """
         Imports data into Rucio.
 

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/lockclient.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import TYPE_CHECKING, Any
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
@@ -19,6 +20,9 @@ from requests.status_codes import codes
 from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url, render_json
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator, Mapping
+
 
 class LockClient(BaseClient):
 
@@ -26,7 +30,11 @@ class LockClient(BaseClient):
 
     LOCKS_BASEURL = 'locks'
 
-    def get_dataset_locks(self, scope, name):
+    def get_dataset_locks(
+            self,
+            scope: str,
+            name: str
+    ) -> "Iterator[dict[str, Any]]":
         """
         Get a dataset locks of the specified dataset.
 
@@ -46,7 +54,11 @@ class LockClient(BaseClient):
                                                    status_code=result.status_code)
             raise exc_cls(exc_msg)
 
-    def get_locks_for_dids(self, dids, **filter_args):
+    def get_locks_for_dids(
+            self,
+            dids: list["Mapping[str, Any]"],
+            **filter_args: dict[str, Any]
+    ) -> list[dict[str, Any]]:
         """
         Get list of locks for for all the files found, recursively, in the listed datasets or containers.
 
@@ -76,7 +88,7 @@ class LockClient(BaseClient):
                                                    status_code=result.status_code)
             raise exc_cls(exc_msg)
 
-    def get_dataset_locks_by_rse(self, rse):
+    def get_dataset_locks_by_rse(self, rse: str) -> "Iterator[dict[str, Any]]":
         """
         Get all dataset locks of the specified rse.
 

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/client/rseclient.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import dumps, loads
+from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 from urllib.parse import quote
 
 from requests.status_codes import codes
@@ -20,13 +21,18 @@ from requests.status_codes import codes
 from rucio.client.baseclient import BaseClient, choice
 from rucio.common.utils import build_url
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable, Iterator
+
+    from rucio.common.constants import RSE_SUPPORTED_PROTOCOL_DOMAINS_LITERAL, RSE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_PROTOCOLS_LITERAL
+
 
 class RSEClient(BaseClient):
     """RSE client class for working with rucio RSEs"""
 
     RSE_BASEURL = 'rses'
 
-    def get_rse(self, rse):
+    def get_rse(self, rse: str) -> dict[str, Any]:
         """
         Returns details about the referred RSE.
 
@@ -41,13 +47,13 @@ class RSEClient(BaseClient):
 
         r = self._send_request(url, type_='GET')
         if r.status_code == codes.ok:
-            rse = loads(r.text)
-            return rse
+            rse_dict = loads(r.text)
+            return rse_dict
         else:
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def add_rse(self, rse, **kwargs):
+    def add_rse(self, rse: str, **kwargs) -> Literal[True]:
         """
         Sends the request to create a new RSE.
 
@@ -78,7 +84,7 @@ class RSEClient(BaseClient):
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
         raise exc_cls(exc_msg)
 
-    def update_rse(self, rse, parameters):
+    def update_rse(self, rse: str, parameters: dict[str, Any]) -> Literal[True]:
         """
         Update RSE properties like availability or name.
 
@@ -93,7 +99,7 @@ class RSEClient(BaseClient):
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
         raise exc_cls(exc_msg)
 
-    def delete_rse(self, rse):
+    def delete_rse(self, rse: str) -> Literal[True]:
         """
         Sends the request to delete a rse.
 
@@ -109,7 +115,7 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def list_rses(self, rse_expression=None):
+    def list_rses(self, rse_expression: Optional[str] = None) -> "Iterator[dict[str, Any]]":
         """
         Sends the request to list all rucio locations(RSEs).
 
@@ -129,7 +135,12 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def add_rse_attribute(self, rse, key, value):
+    def add_rse_attribute(
+            self,
+            rse: str,
+            key: str,
+            value: Any
+    ) -> Literal[True]:
         """
         Sends the request to add a RSE attribute.
 
@@ -151,7 +162,7 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def delete_rse_attribute(self, rse, key):
+    def delete_rse_attribute(self, rse: str, key: str) -> Literal[True]:
         """
         Sends the request to delete a RSE attribute.
 
@@ -170,7 +181,7 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def list_rse_attributes(self, rse):
+    def list_rse_attributes(self, rse: str) -> dict[str, Any]:
         """
         Sends the request to get RSE attributes.
 
@@ -188,7 +199,7 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def add_protocol(self, rse, params):
+    def add_protocol(self, rse: str, params: dict[str, Any]) -> Literal[True]:
         """
         Sends the request to create a new protocol for the given RSE.
 
@@ -223,9 +234,16 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def get_protocols(self, rse, protocol_domain='ALL', operation=None, default=False, scheme=None):
+    def get_protocols(
+            self,
+            rse: str,
+            protocol_domain: "RSE_SUPPORTED_PROTOCOL_DOMAINS_LITERAL" = 'ALL',
+            operation: Optional["RSE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL"] = None,
+            default: bool = False,
+            scheme: Optional['SUPPORTED_PROTOCOLS_LITERAL'] = None
+    ) -> Any:
         """
-        Returns protocol information. Parameter comibantions are:
+        Returns protocol information. Parameter combinations are:
         (operation OR default) XOR protocol.
 
         :param rse: the RSE name.
@@ -235,7 +253,7 @@ class RSEClient(BaseClient):
         :param default: Indicates if only the default operations should be returned.
         :param scheme: The identifier of the requested protocol.
 
-        :returns: A list with details about each matching protocol.
+        :returns: A dict with details about each matching protocol.
 
         :raises RSENotFound: if the RSE doesn't exist.
         :raises RSEProtocolNotSupported: if no matching protocol entry could be found.
@@ -264,7 +282,14 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def lfns2pfns(self, rse, lfns, protocol_domain='ALL', operation=None, scheme=None):
+    def lfns2pfns(
+            self,
+            rse: str,
+            lfns: 'Iterable[str]',
+            protocol_domain: 'RSE_SUPPORTED_PROTOCOL_DOMAINS_LITERAL' = 'ALL',
+            operation: Optional['RSE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL'] = None,
+            scheme: Optional['SUPPORTED_PROTOCOLS_LITERAL'] = None
+    ) -> dict[str, str]:
         """
         Returns PFNs that should be used at a RSE, corresponding to requested LFNs.
         The PFNs are generated for the RSE *regardless* of whether a replica exists for the LFN.
@@ -303,7 +328,13 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def delete_protocols(self, rse, scheme, hostname=None, port=None):
+    def delete_protocols(
+            self,
+            rse: str,
+            scheme: 'SUPPORTED_PROTOCOLS_LITERAL',
+            hostname: Optional[str] = None,
+            port: Optional[int] = None
+    ) -> Literal[True]:
         """
         Deletes matching protocols from RSE. Protocols using the same identifier can be
         distinguished by hostname and port.
@@ -334,7 +365,13 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def update_protocols(self, rse, scheme, data, hostname=None, port=None):
+    def update_protocols(
+            self,
+            rse: str,
+            scheme: 'SUPPORTED_PROTOCOLS_LITERAL',
+            data: dict[str, Any],
+            hostname: Optional[str] = None,
+            port: Optional[int] = None):
         """
         Updates matching protocols from RSE. Protocol using the same identifier can be
         distinguished by hostname and port.
@@ -368,7 +405,14 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def swap_protocols(self, rse, domain, operation, scheme_a, scheme_b):
+    def swap_protocols(
+            self,
+            rse: str,
+            domain: 'RSE_SUPPORTED_PROTOCOL_DOMAINS_LITERAL',
+            operation: 'RSE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL',
+            scheme_a: 'SUPPORTED_PROTOCOLS_LITERAL',
+            scheme_b: 'SUPPORTED_PROTOCOLS_LITERAL'
+    ) -> bool:
         """
         Swaps the priorities of the provided operation.
 
@@ -385,22 +429,21 @@ class RSEClient(BaseClient):
         :raises KeyNotFound: if invalid data was provided for update.
         :raises AccessDenied: if not authorized.
         """
-        protocol_a = protocol_b = None
+
         protocols = self.get_protocols(rse, domain, operation, False, scheme_a)['protocols']
-        for p in protocols:
-            if p['scheme'] == scheme_a:
-                protocol_a = p
-            if p['scheme'] == scheme_b:
-                protocol_b = p
-        if (protocol_a or protocol_b) is None:
+        protocol_a = next((p for p in protocols if p['scheme'] == scheme_a), None)
+        protocol_b = next((p for p in protocols if p['scheme'] == scheme_b), None)
+
+        if protocol_a is None or protocol_b is None:
             return False
+
         priority_a = protocol_a['domains'][domain][operation]
         priority_b = protocol_b['domains'][domain][operation]
         self.update_protocols(rse, protocol_a['scheme'], {'domains': {domain: {operation: priority_b}}}, protocol_a['hostname'], protocol_a['port'])
         self.update_protocols(rse, protocol_b['scheme'], {'domains': {domain: {operation: priority_a}}}, protocol_b['hostname'], protocol_b['port'])
         return True
 
-    def add_qos_policy(self, rse, qos_policy):
+    def add_qos_policy(self, rse: str, qos_policy: str) -> Literal[True]:
         """
         Add a QoS policy from an RSE.
 
@@ -422,7 +465,7 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def delete_qos_policy(self, rse, qos_policy):
+    def delete_qos_policy(self, rse: str, qos_policy: str) -> Literal[True]:
         """
         Delete a QoS policy from an RSE.
 
@@ -443,7 +486,7 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def list_qos_policies(self, rse):
+    def list_qos_policies(self, rse: str) -> list[str]:
         """
         List all QoS policies of an RSE.
 
@@ -463,7 +506,14 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def set_rse_usage(self, rse, source, used, free, files=None):
+    def set_rse_usage(
+            self,
+            rse: str,
+            source: str,
+            used: int,
+            free: int,
+            files: Optional[int] = None
+    ) -> Literal[True]:
         """
         Set RSE usage information.
 
@@ -473,7 +523,7 @@ class RSEClient(BaseClient):
         :param free: the free in bytes.
         :param files: the number of files
 
-        :returns: True if successful, otherwise false.
+        :returns: True if successful
         """
         path = [self.RSE_BASEURL, rse, 'usage']
         path = '/'.join(path)
@@ -486,7 +536,11 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def get_rse_usage(self, rse, filters=None):
+    def get_rse_usage(
+            self,
+            rse: str,
+            filters: Optional[dict[str, Any]] = None
+    ) -> "Iterator[dict[str, Any]]":
         """
         Get RSE usage information.
 
@@ -505,7 +559,11 @@ class RSEClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def list_rse_usage_history(self, rse, filters=None):
+    def list_rse_usage_history(
+            self,
+            rse: str,
+            filters: Optional[dict[str, Any]] = None
+    ) -> "Iterator[dict[str, Any]]":
         """
         List RSE usage history information.
 
@@ -526,7 +584,12 @@ class RSEClient(BaseClient):
                                                    data=r.content)
             raise exc_cls(exc_msg)
 
-    def set_rse_limits(self, rse, name, value):
+    def set_rse_limits(
+            self,
+            rse: str,
+            name: str,
+            value: int
+    ) -> Literal[True]:
         """
         Set RSE limit information.
 
@@ -534,7 +597,7 @@ class RSEClient(BaseClient):
         :param name: The name of the limit.
         :param value: The feature value.
 
-        :returns: True if successful, otherwise false.
+        :returns: True if successful
         """
         path = [self.RSE_BASEURL, rse, 'limits']
         path = '/'.join(path)
@@ -547,13 +610,16 @@ class RSEClient(BaseClient):
                                                data=r.content)
         raise exc_cls(exc_msg)
 
-    def get_rse_limits(self, rse):
+    def get_rse_limits(
+            self,
+            rse: str
+    ) -> "Iterator[dict[str, Union[str, int]]]":
         """
         Get RSE limits.
 
         :param rse: The RSE name.
 
-        :returns: True if successful, otherwise false.
+        :returns: An iterator of RSE limits as dicts with 'name' and 'value' as keys.
         """
         path = [self.RSE_BASEURL, rse, 'limits']
         path = '/'.join(path)
@@ -566,14 +632,14 @@ class RSEClient(BaseClient):
                                                data=r.content)
         raise exc_cls(exc_msg)
 
-    def delete_rse_limits(self, rse, name):
+    def delete_rse_limits(self, rse: str, name: str) -> Literal[True]:
         """
         Delete RSE limit information.
 
         :param rse: The RSE name.
         :param name: The name of the limit.
 
-        :returns: True if successful, otherwise false.
+        :returns: True if successful
         """
         path = [self.RSE_BASEURL, rse, 'limits']
         path = '/'.join(path)
@@ -585,9 +651,14 @@ class RSEClient(BaseClient):
                                                status_code=r.status_code,
                                                data=r.content)
 
-        return exc_cls(exc_msg)
+        raise exc_cls(exc_msg)
 
-    def add_distance(self, source, destination, parameters):
+    def add_distance(
+            self,
+            source: str,
+            destination: str,
+            parameters: dict[str, int]
+    ) -> Literal[True]:
         """
         Add a src-dest distance.
 
@@ -606,7 +677,12 @@ class RSEClient(BaseClient):
                                                data=r.content)
         raise exc_cls(exc_msg)
 
-    def update_distance(self, source, destination, parameters):
+    def update_distance(
+            self,
+            source: str,
+            destination: str,
+            parameters: dict[str, int]
+    ) -> Literal[True]:
         """
         Update distances with the given RSE ids.
 
@@ -625,7 +701,11 @@ class RSEClient(BaseClient):
                                                data=r.content)
         raise exc_cls(exc_msg)
 
-    def get_distance(self, source, destination):
+    def get_distance(
+            self,
+            source: str,
+            destination: str
+    ) -> list[dict[str, Union[str, int]]]:
         """
         Get distances between rses.
 
@@ -643,7 +723,11 @@ class RSEClient(BaseClient):
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
         raise exc_cls(exc_msg)
 
-    def delete_distance(self, source, destination):
+    def delete_distance(
+            self,
+            source: str,
+            destination: str
+    ) -> Literal[True]:
         """
         Delete distances with the given RSE ids.
 

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/common/constants.py

@@ -49,7 +49,12 @@ if config_get_bool('transfers', 'srm_https_compatibility', raise_exception=False
     SCHEME_MAP['davs'].append('srm')
 
 SUPPORTED_PROTOCOLS_LITERAL = Literal['gsiftp', 'srm', 'root', 'davs', 'http', 'https', 'file', 'storm', 'srm+https', 'scp', 'rsync', 'rclone', 'magnet']
-SUPPORTED_PROTOCOLS = list(get_args(SUPPORTED_PROTOCOLS_LITERAL))
+SUPPORTED_PROTOCOLS: list[str] = list(get_args(SUPPORTED_PROTOCOLS_LITERAL))
+
+RSE_SUPPORTED_PROTOCOL_DOMAINS_LITERAL = Literal['ALL', 'LAN', 'WAN']
+
+RSE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL = Literal['read', 'write', 'delete', 'third_party_copy_read', 'third_party_copy_write']
+RSE_SUPPORTED_PROTOCOL_OPERATIONS: list[str] = list(get_args(RSE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL))
 
 FTS_STATE = namedtuple('FTS_STATE', ['SUBMITTED', 'READY', 'ACTIVE', 'FAILED', 'FINISHED', 'FINISHEDDIRTY', 'NOT_USED',
                                      'CANCELED'])('SUBMITTED', 'READY', 'ACTIVE', 'FAILED', 'FINISHED', 'FINISHEDDIRTY',

{rucio_clients-34.5.0 → rucio_clients-34.6.0}/lib/rucio/common/utils.py

@@ -681,11 +681,6 @@ def execute(cmd: str) -> tuple[int, str, str]:
     return exitcode, out.decode(encoding='utf-8'), err.decode(encoding='utf-8')
 
 
-def rse_supported_protocol_operations() -> list[str]:
-    """ Returns a list with operations supported by all RSE protocols."""
-    return ['read', 'write', 'delete', 'third_party_copy_read', 'third_party_copy_write']
-
-
 def rse_supported_protocol_domains() -> list[str]:
     """ Returns a list with all supported RSE protocol domains."""
     return ['lan', 'wan']