rucio 34.4.2__tar.gz → 34.5.0__tar.gz

{rucio-34.4.2 → rucio-34.5.0}/PKG-INFO

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

{rucio-34.4.2 → rucio-34.5.0}/bin/rucio

@@ -234,6 +234,8 @@ def get_client(args):
                  'oidc_issuer': args.oidc_issuer,
                  'oidc_username': args.oidc_username,
                  'oidc_password': args.oidc_password}
+    elif auth_type == "x509":
+        creds = {'client_cert': args.certificate, "client_key": args.client_key}
     else:
         creds = None
 
@@ -1854,7 +1856,8 @@ def get_parser():
                          + 'to the keys configured in the /etc/idpsecrets.json auth server configuration file.')  # NOQA: W503
 
     # Options for the x509  auth_strategy
-    oparser.add_argument('--certificate', dest='certificate', default=None, help='Client certificate file.')
+    oparser.add_argument('--certificate', dest='certificate', default=None, help='Client certificate file for x509 Authentication.')
+    oparser.add_argument('--client_key', dest='client_key', default=None, help='Client key for x509 Authentication.')
     oparser.add_argument('--ca-certificate', dest='ca_certificate', default=None, help='CA certificate to verify peer against (SSL).')
 
     # Ping command

{rucio-34.4.2 → rucio-34.5.0}/lib/rucio/api/rule.py

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from collections.abc import Iterator
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from rucio.api.permission import has_permission
 from rucio.common.config import config_get_bool
@@ -25,11 +24,13 @@ from rucio.core import rule
 from rucio.db.sqla.session import read_session, stream_session, transactional_session
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator, Sequence
+
     from sqlalchemy.orm import Session
 
 
 @read_session
-def is_multi_vo(*, session: "Session"):
+def is_multi_vo(*, session: "Session") -> bool:
     """
     Check whether this instance is configured for multi-VO
     returns: Boolean True if running in multi-VO
@@ -38,9 +39,33 @@ def is_multi_vo(*, session: "Session"):
 
 
 @transactional_session
-def add_replication_rule(dids, copies, rse_expression, weight, lifetime, grouping, account, locked, subscription_id, source_replica_expression,
-                         activity, notify, purge_replicas, ignore_availability, comment, ask_approval, asynchronous, delay_injection, priority,
-                         split_container, meta, issuer, vo='def', *, session: "Session"):
+def add_replication_rule(
+    dids: "Sequence[dict[str, str]]",
+    copies: int,
+    rse_expression: str,
+    weight: Optional[str],
+    lifetime: Optional[int],
+    grouping: Literal['ALL', 'DATASET', 'NONE'],
+    account: str,
+    locked: bool,
+    subscription_id: Optional[str],
+    source_replica_expression: Optional[str],
+    activity: Optional[str],
+    notify: Optional[Literal['Y', 'N', 'C', 'P']],
+    purge_replicas: bool,
+    ignore_availability: bool,
+    comment: Optional[str],
+    ask_approval: bool,
+    asynchronous: bool,
+    delay_injection: Optional[int],
+    priority: int,
+    split_container: bool,
+    meta: Optional[dict[str, Any]],
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> list[str]:
     """
     Adds a replication rule.
 
@@ -89,12 +114,11 @@ def add_replication_rule(dids, copies, rse_expression, weight, lifetime, groupin
     if not has_permission(issuer=issuer, vo=vo, action='add_rule', kwargs=kwargs, session=session):
         raise AccessDenied('Account %s can not add replication rule' % (issuer))
 
-    account = InternalAccount(account, vo=vo)
-    for d in dids:
-        d['scope'] = InternalScope(d['scope'], vo=vo)
+    account_internal = InternalAccount(account, vo=vo)
+    dids_with_internal_scope = [{'name': d['name'], 'scope': InternalScope(d['scope'], vo=vo)} for d in dids]
 
-    return rule.add_rule(account=account,
-                         dids=dids,
+    return rule.add_rule(account=account_internal,
+                         dids=dids_with_internal_scope,
                          copies=copies,
                          rse_expression=rse_expression,
                          grouping=grouping,
@@ -118,7 +142,7 @@ def add_replication_rule(dids, copies, rse_expression, weight, lifetime, groupin
 
 
 @read_session
-def get_replication_rule(rule_id, issuer, vo='def', *, session: "Session"):
+def get_replication_rule(rule_id: str, issuer: str, vo: str = 'def', *, session: "Session") -> dict[str, Any]:
     """
     Get replication rule by it's id.
 
@@ -135,7 +159,12 @@ def get_replication_rule(rule_id, issuer, vo='def', *, session: "Session"):
 
 
 @stream_session
-def list_replication_rules(filters: Optional[dict[str, Any]] = None, vo: str = 'def', *, session: "Session") -> Iterator[dict[str, Any]]:
+def list_replication_rules(
+    filters: Optional[dict[str, Any]] = None,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> "Iterator[dict[str, Any]]":
     """
     Lists replication rules based on a filter.
 
@@ -164,7 +193,13 @@ def list_replication_rules(filters: Optional[dict[str, Any]] = None, vo: str = '
 
 
 @read_session
-def list_replication_rule_history(rule_id, issuer, vo='def', *, session: "Session"):
+def list_replication_rule_history(
+    rule_id: str,
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> "Iterator[dict[str, Any]]":
     """
     Lists replication rule history..
 
@@ -180,7 +215,13 @@ def list_replication_rule_history(rule_id, issuer, vo='def', *, session: "Sessio
 
 
 @stream_session
-def list_replication_rule_full_history(scope, name, vo='def', *, session: "Session"):
+def list_replication_rule_full_history(
+    scope: str,
+    name: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> "Iterator[dict[str, Any]]":
     """
     List the rule history of a DID.
 
@@ -189,14 +230,20 @@ def list_replication_rule_full_history(scope, name, vo='def', *, session: "Sessi
     :param vo: The VO to act on.
     :param session: The database session in use.
     """
-    scope = InternalScope(scope, vo=vo)
-    rules = rule.list_rule_full_history(scope, name, session=session)
+    scope_internal = InternalScope(scope, vo=vo)
+    rules = rule.list_rule_full_history(scope_internal, name, session=session)
     for r in rules:
         yield api_update_return_dict(r, session=session)
 
 
 @stream_session
-def list_associated_replication_rules_for_file(scope, name, vo='def', *, session: "Session"):
+def list_associated_replication_rules_for_file(
+    scope: str,
+    name: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> "Iterator[dict[str, Any]]":
     """
     Lists associated replication rules by file.
 
@@ -205,14 +252,21 @@ def list_associated_replication_rules_for_file(scope, name, vo='def', *, session
     :param vo: The VO to act on.
     :param session: The database session in use.
     """
-    scope = InternalScope(scope, vo=vo)
-    rules = rule.list_associated_rules_for_file(scope=scope, name=name, session=session)
+    scope_internal = InternalScope(scope, vo=vo)
+    rules = rule.list_associated_rules_for_file(scope=scope_internal, name=name, session=session)
     for r in rules:
         yield api_update_return_dict(r, session=session)
 
 
 @transactional_session
-def delete_replication_rule(rule_id, purge_replicas, issuer, vo='def', *, session: "Session"):
+def delete_replication_rule(
+    rule_id: str,
+    purge_replicas: Optional[bool],
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Deletes a replication rule and all associated locks.
 
@@ -232,7 +286,14 @@ def delete_replication_rule(rule_id, purge_replicas, issuer, vo='def', *, sessio
 
 
 @transactional_session
-def update_replication_rule(rule_id: str, options: dict[str, Any], issuer: str, vo: str = 'def', *, session: "Session"):
+def update_replication_rule(
+    rule_id: str,
+    options: dict[str, Any],
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> None:
     """
     Update lock state of a replication rule.
 
@@ -264,7 +325,15 @@ def update_replication_rule(rule_id: str, options: dict[str, Any], issuer: str,
 
 
 @transactional_session
-def reduce_replication_rule(rule_id, copies, exclude_expression, issuer, vo='def', *, session: "Session"):
+def reduce_replication_rule(
+    rule_id: str,
+    copies: int,
+    exclude_expression: Optional[str],
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> str:
     """
     Reduce the number of copies for a rule by atomically replacing the rule.
 
@@ -286,7 +355,13 @@ def reduce_replication_rule(rule_id, copies, exclude_expression, issuer, vo='def
 
 
 @read_session
-def examine_replication_rule(rule_id, issuer, vo='def', *, session: "Session"):
+def examine_replication_rule(
+    rule_id: str,
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> dict[str, Any]:
     """
     Examine a replication rule.
 
@@ -306,7 +381,15 @@ def examine_replication_rule(rule_id, issuer, vo='def', *, session: "Session"):
 
 
 @transactional_session
-def move_replication_rule(rule_id, rse_expression, override, issuer, vo='def', *, session: "Session"):
+def move_replication_rule(
+    rule_id: str,
+    rse_expression: str,
+    override: dict[str, Any],
+    issuer: str,
+    vo: str = 'def',
+    *,
+    session: "Session"
+) -> str:
     """
     Move a replication rule to another RSE and, once done, delete the original one.
 

{rucio-34.4.2 → rucio-34.5.0}/lib/rucio/client/accountlimitclient.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import dumps
+from typing import Literal
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
@@ -27,7 +28,13 @@ class AccountLimitClient(BaseClient):
 
     ACCOUNTLIMIT_BASEURL = 'accountlimits'
 
-    def set_account_limit(self, account, rse, bytes_, locality):
+    def set_account_limit(
+            self,
+            account: str,
+            rse: str,
+            bytes_: int,
+            locality: Literal['local', 'global']
+    ) -> bool:
         """
         Sets an account limit for a given limit scope.
 
@@ -46,7 +53,12 @@ class AccountLimitClient(BaseClient):
             from rucio.common.exception import UnsupportedOperation
             raise UnsupportedOperation('The provided scope (%s) for the account limit was invalid' % locality)
 
-    def delete_account_limit(self, account, rse, locality):
+    def delete_account_limit(
+            self,
+            account: str,
+            rse: str,
+            locality: Literal['local', 'global']
+    ) -> bool:
         """
         Deletes an account limit for a given limit scope.
 
@@ -64,7 +76,12 @@ class AccountLimitClient(BaseClient):
             from rucio.common.exception import UnsupportedOperation
             raise UnsupportedOperation('The provided scope (%s) for the account limit was invalid' % locality)
 
-    def set_local_account_limit(self, account, rse, bytes_):
+    def set_local_account_limit(
+            self,
+            account: str,
+            rse: str,
+            bytes_: int
+    ) -> bool:
         """
         Sends the request to set an account limit for an account.
 
@@ -86,7 +103,11 @@ class AccountLimitClient(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_local_account_limit(self, account, rse):
+    def delete_local_account_limit(
+            self,
+            account: str,
+            rse: str
+    ) -> bool:
         """
         Sends the request to remove an account limit.
 
@@ -108,7 +129,12 @@ class AccountLimitClient(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_global_account_limit(self, account, rse_expression, bytes_):
+    def set_global_account_limit(
+            self,
+            account: str,
+            rse_expression: str,
+            bytes_: int
+    ) -> bool:
         """
         Sends the request to set a global account limit for an account.
 
@@ -130,7 +156,11 @@ class AccountLimitClient(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_global_account_limit(self, account, rse_expression):
+    def delete_global_account_limit(
+            self,
+            account: str,
+            rse_expression: str
+    ) -> bool:
         """
         Sends the request to remove a global account limit.
 

{rucio-34.4.2 → rucio-34.5.0}/lib/rucio/client/baseclient.py

@@ -107,8 +107,6 @@ class BaseClient:
         :param logger: Logger object to use. If None, use the default LOG created by the module
         """
 
-        self.host = rucio_host
-        self.auth_host = auth_host
         self.logger = logger
         self.session = Session()
         self.user_agent = "%s/%s" % (user_agent, version.version_string())  # e.g. "rucio-clients/0.2.13"
@@ -117,9 +115,17 @@ class BaseClient:
         if self.script_id == '':  # Python interpreter used
             self.script_id = 'python'
         try:
-            if self.host is None:
+            if rucio_host is not None:
+                self.host = rucio_host
+            else:
                 self.host = config_get('client', 'rucio_host')
-            if self.auth_host is None:
+        except (NoOptionError, NoSectionError) as error:
+            raise MissingClientParameter('Section client and Option \'%s\' cannot be found in config file' % error.args[0])
+
+        try:
+            if auth_host is not None:
+                self.auth_host = auth_host
+            else:
                 self.auth_host = config_get('client', 'auth_host')
         except (NoOptionError, NoSectionError) as error:
             raise MissingClientParameter('Section client and Option \'%s\' cannot be found in config file' % error.args[0])
@@ -318,9 +324,12 @@ class BaseClient:
 
         :return: A rucio exception class and an error string.
         """
-        try:
-            data = parse_response(data)
-        except ValueError:
+        if data is not None:
+            try:
+                data = parse_response(data)
+            except ValueError:
+                data = {}
+        else:
             data = {}
 
         exc_cls = 'RucioException'

{rucio-34.4.2 → rucio-34.5.0}/lib/rucio/client/configclient.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import dumps
+from typing import Any, Optional
 
 from requests.status_codes import codes
 
@@ -26,7 +27,11 @@ class ConfigClient(BaseClient):
 
     CONFIG_BASEURL = 'config'
 
-    def get_config(self, section=None, option=None):
+    def get_config(
+            self,
+            section: Optional[str] = None,
+            option: Optional[str] = None
+    ) -> dict[str, Any]:
         """
         Sends the request to get the matching configuration.
 
@@ -53,7 +58,13 @@ class ConfigClient(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_config_option(self, section, option, value, use_body_for_params=True):
+    def set_config_option(
+            self,
+            section: str,
+            option: str,
+            value: Any,
+            use_body_for_params: bool = True
+    ) -> bool:
         """
         Sends the request to create or set an option within a section. Missing sections will be created.
 
@@ -90,7 +101,11 @@ class ConfigClient(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_config_option(self, section, option):
+    def delete_config_option(
+            self,
+            section: str,
+            option: str
+    ) -> bool:
         """
         Sends the request to remove an option from a section
 

{rucio-34.4.2 → rucio-34.5.0}/lib/rucio/client/credentialclient.py

@@ -23,7 +23,14 @@ class CredentialClient(BaseClient):
 
     CREDENTIAL_BASEURL = 'credentials'
 
-    def get_signed_url(self, rse, service, operation, url, lifetime=3600):
+    def get_signed_url(
+            self,
+            rse: str,
+            service: str,
+            operation: str,
+            url: str,
+            lifetime: int = 3600
+    ) -> str:
         """
         Return a signed version of the given URL for the given operation.