rucio-clients 34.4.2__tar.gz → 34.4.3__tar.gz

{rucio_clients-34.4.2 → rucio_clients-34.4.3}/PKG-INFO

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

{rucio_clients-34.4.2 → rucio_clients-34.4.3}/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_clients-34.4.2 → rucio_clients-34.4.3}/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_clients-34.4.2 → rucio_clients-34.4.3}/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_clients-34.4.2 → rucio_clients-34.4.3}/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.
 

{rucio_clients-34.4.2 → rucio_clients-34.4.3}/lib/rucio/client/downloadclient.py

@@ -1231,7 +1231,7 @@ class DownloadClient:
                                                      resolve_parents=True,
                                                      nrandom=nrandom,
                                                      metalink=True)
-            file_items = parse_replicas_from_string(metalink_str)
+            file_items = parse_replicas_from_string(metalink_str)  # type: ignore
             for file in file_items:
                 if impl:
                     file['impl'] = impl

{rucio_clients-34.4.2 → rucio_clients-34.4.3}/lib/rucio/client/lifetimeclient.py

@@ -13,12 +13,19 @@
 # limitations under the License.
 
 from json import loads
+from typing import TYPE_CHECKING, Any, Optional
 
 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, Sequence
+    from datetime import datetime
+
+    from rucio.db.sqla.constants import LifetimeExceptionsState
+
 
 class LifetimeClient(BaseClient):
 
@@ -26,7 +33,11 @@ class LifetimeClient(BaseClient):
 
     LIFETIME_BASEURL = 'lifetime_exceptions'
 
-    def list_exceptions(self, exception_id=None, states=None):
+    def list_exceptions(
+            self,
+            exception_id: Optional[str] = None,
+            states: Optional['Sequence[LifetimeExceptionsState]'] = None
+    ) -> 'Iterator[dict[str, Any]]':
         """
         List exceptions to Lifetime Model.
 
@@ -50,7 +61,14 @@ class LifetimeClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=result.headers, status_code=result.status_code)
             raise exc_cls(exc_msg)
 
-    def add_exception(self, dids, account, pattern, comments, expires_at):
+    def add_exception(
+            self,
+            dids: list[dict[str, Any]],
+            account: str,
+            pattern: str,
+            comments: str,
+            expires_at: 'datetime'
+    ) -> dict[str, Any]:
         """
         Add exceptions to Lifetime Model.
 

{rucio_clients-34.4.2 → rucio_clients-34.4.3}/lib/rucio/client/requestclient.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, Optional
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
@@ -19,16 +20,23 @@ 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 Iterator, Sequence
+
 
 class RequestClient(BaseClient):
 
     REQUEST_BASEURL = 'requests'
 
-    def list_requests(self, src_rse, dst_rse, request_states):
+    def list_requests(
+            self,
+            src_rse: str,
+            dst_rse: str,
+            request_states: 'Sequence[str]'
+    ) -> 'Iterator[dict[str, Any]]':
         """Return latest request details
 
         :return: request information
-        :rtype: dict
         """
         path = '/'.join([self.REQUEST_BASEURL, 'list']) + '?' + '&'.join(['src_rse={}'.format(src_rse), 'dst_rse={}'.format(
             dst_rse), 'request_states={}'.format(request_states)])
@@ -41,11 +49,17 @@ class RequestClient(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_requests_history(self, src_rse, dst_rse, request_states, offset=0, limit=100):
+    def list_requests_history(
+            self,
+            src_rse: str,
+            dst_rse: str,
+            request_states: 'Sequence[str]',
+            offset: int = 0,
+            limit: int = 100
+    ) -> 'Iterator[dict[str, Any]]':
         """Return historical request details
 
         :return: request information
-        :rtype: dict
         """
         path = '/'.join([self.REQUEST_BASEURL, 'history', 'list']) + '?' + '&'.join(['src_rse={}'.format(src_rse), 'dst_rse={}'.format(
             dst_rse), 'request_states={}'.format(request_states), 'offset={}'.format(offset), 'limit={}'.format(limit)])
@@ -58,21 +72,23 @@ class RequestClient(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_request_by_did(self, name, rse, scope=None):
+    def list_request_by_did(
+            self,
+            name: str,
+            rse: str,
+            scope: Optional[str] = None
+    ) -> 'Iterator[dict[str, Any]]':
         """Return latest request details for a DID
 
         :param name: DID
-        :type name: str
         :param rse: Destination RSE name
-        :type rse: str
         :param scope: rucio scope, defaults to None
-        :param scope: str, optional
         :raises exc_cls: from BaseClient._get_exception
         :return: request information
-        :rtype: dict
         """
 
-        path = '/'.join([self.REQUEST_BASEURL, quote_plus(scope), quote_plus(name), rse])
+        if scope is not None:
+            path = '/'.join([self.REQUEST_BASEURL, quote_plus(scope), quote_plus(name), rse])
         url = build_url(choice(self.list_hosts), path=path)
         r = self._send_request(url, type_='GET')
 
@@ -82,21 +98,23 @@ class RequestClient(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_request_history_by_did(self, name, rse, scope=None):
+    def list_request_history_by_did(
+            self,
+            name: str,
+            rse: str,
+            scope: Optional[str] = None
+    ) -> 'Iterator[dict[str, Any]]':
         """Return latest request details for a DID
 
         :param name: DID
-        :type name: str
         :param rse: Destination RSE name
-        :type rse: str
         :param scope: rucio scope, defaults to None
-        :param scope: str, optional
         :raises exc_cls: from BaseClient._get_exception
         :return: request information
-        :rtype: dict
         """
 
-        path = '/'.join([self.REQUEST_BASEURL, 'history', quote_plus(scope), quote_plus(name), rse])
+        if scope is not None:
+            path = '/'.join([self.REQUEST_BASEURL, 'history', quote_plus(scope), quote_plus(name), rse])
         url = build_url(choice(self.list_hosts), path=path)
         r = self._send_request(url, type_='GET')
 

{rucio_clients-34.4.2 → rucio_clients-34.4.3}/lib/rucio/client/uploadclient.py

@@ -629,8 +629,9 @@ class UploadClient:
         # Auth. mostly for object stores
         if sign_service:
             protocol_read = self._create_protocol(rse_settings, 'read', domain=domain, impl=impl)
-            signed_read_pfn = self.client.get_signed_url(rse_settings['rse'], sign_service, 'read', pfn)    # NOQA pylint: disable=undefined-variable
-            pfn = self.client.get_signed_url(rse_settings['rse'], sign_service, 'write', pfn)       # NOQA pylint: disable=undefined-variable
+            if pfn is not None:
+                signed_read_pfn = self.client.get_signed_url(rse_settings['rse'], sign_service, 'read', pfn)
+                pfn = self.client.get_signed_url(rse_settings['rse'], sign_service, 'write', pfn)
 
         # Create a name of tmp file if renaming operation is supported
         pfn_tmp = '%s.rucio.upload' % pfn if protocol_write.renaming else pfn