rucio-clients 38.3.0__py3-none-any.whl → 38.5.0__py3-none-any.whl

rucio/client/didclient.py

@@ -20,6 +20,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import DeprecationError
 from rucio.common.utils import build_url, date_to_str, render_json
 
@@ -28,7 +29,6 @@ if TYPE_CHECKING:
 
 
 class DIDClient(BaseClient):
-
     """DataIdentifier client class for working with data identifiers"""
 
     DIDS_BASEURL = 'dids'
@@ -64,7 +64,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), 'dids', 'search'])
 
         # stringify dates.
-        if isinstance(filters, dict):   # backwards compatibility for filters as single {}
+        if isinstance(filters, dict):  # backwards compatibility for filters as single {}
             filters = [filters]
         for or_group in filters:
             for key, value in or_group.items():
@@ -80,7 +80,7 @@ class DIDClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             dids = self._load_json_data(r)
@@ -148,7 +148,7 @@ class DIDClient(BaseClient):
             data['dids'] = dids
         if rse:
             data['rse'] = rse
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return True
         else:
@@ -161,7 +161,7 @@ class DIDClient(BaseClient):
         """
         path = '/'.join([self.DIDS_BASEURL])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=render_json(dids))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(dids))
         if r.status_code == codes.created:
             return True
         else:
@@ -245,7 +245,8 @@ class DIDClient(BaseClient):
         lifetime :
             DID's lifetime (in seconds).
         """
-        return self.add_did(scope=scope, name=name, did_type='CONTAINER', statuses=statuses, meta=meta, rules=rules, lifetime=lifetime)
+        return self.add_did(scope=scope, name=name, did_type='CONTAINER', statuses=statuses, meta=meta, rules=rules,
+                            lifetime=lifetime)
 
     def add_containers(self, cnts: "Sequence[dict[str, Any]]") -> bool:
         """
@@ -284,7 +285,7 @@ class DIDClient(BaseClient):
         data: dict[str, Any] = {'dids': dids}
         if rse:
             data['rse'] = rse
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return True
         else:
@@ -313,7 +314,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'dids'])
         url = build_url(choice(self.list_hosts), path=path)
         data = {'dids': dids}
-        r = self._send_request(url, type_='DEL', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.DELETE, data=render_json(**data))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -339,7 +340,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, 'attachments'])
         url = build_url(choice(self.list_hosts), path=path)
         data = {'ignore_duplicate': ignore_duplicate, 'attachments': attachments}
-        r = self._send_request(url, type_='POST', data=dumps(data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code in (codes.ok, codes.no_content, codes.created):
             return True
 
@@ -482,9 +483,9 @@ class DIDClient(BaseClient):
         return self.attach_dids(scope=scope, name=name, dids=cnts)
 
     def list_content(
-        self,
-        scope: str,
-        name: str
+            self,
+            scope: str,
+            name: str
     ) -> "Iterator[dict[str, Any]]":
         """
         List data identifier contents.
@@ -499,7 +500,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'dids'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -524,7 +525,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'dids', 'history'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -555,7 +556,7 @@ class DIDClient(BaseClient):
             payload['long'] = True
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -576,7 +577,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, 'bulkfiles'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=dumps(data), stream=True)
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(data), stream=True)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -613,7 +614,7 @@ class DIDClient(BaseClient):
         elif dynamic:
             params['dynamic_depth'] = 'FILE'
         url = build_url(choice(self.list_hosts), path=path, params=params)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return next(self._load_json_data(r))
         else:
@@ -642,7 +643,7 @@ class DIDClient(BaseClient):
         url = build_url(choice(self.list_hosts), path=path)
         payload = {}
         payload['plugin'] = plugin
-        r = self._send_request(url, type_='GET', params=payload)
+        r = self._send_request(url, method=HTTPMethod.GET, params=payload)
         if r.status_code == codes.ok:
             meta = self._load_json_data(r)
             return next(meta)
@@ -670,7 +671,7 @@ class DIDClient(BaseClient):
         data = {'dids': dids, 'inherit': inherit, 'plugin': plugin}
         path = '/'.join([self.DIDS_BASEURL, 'bulkmeta'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -703,7 +704,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'meta', key])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'value': value, 'recursive': recursive})
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:
@@ -734,7 +735,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'meta'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'meta': meta, 'recursive': recursive})
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:
@@ -760,7 +761,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, 'bulkdidsmeta'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'dids': dids, 'recursive': recursive})
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:
@@ -788,7 +789,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'status'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps(kwargs)
-        r = self._send_request(url, type_='PUT', data=data)
+        r = self._send_request(url, method=HTTPMethod.PUT, data=data)
         if r.status_code in (codes.ok, codes.no_content, codes.created):
             return True
 
@@ -833,7 +834,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'meta'])
         url = build_url(choice(self.list_hosts), path=path, params={'key': key})
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         else:
@@ -858,7 +859,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -883,7 +884,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'associated_rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -907,7 +908,7 @@ class DIDClient(BaseClient):
 
         path = '/'.join([self.DIDS_BASEURL, guid, 'guid'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -941,7 +942,7 @@ class DIDClient(BaseClient):
             payload['recursive'] = True
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -967,7 +968,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.DIDS_BASEURL, quote_plus(scope), quote_plus(name), 'parents'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -1007,7 +1008,7 @@ class DIDClient(BaseClient):
             'nbfiles': str(nbfiles)
         })
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:
@@ -1025,7 +1026,7 @@ class DIDClient(BaseClient):
         """
         path = '/'.join([self.DIDS_BASEURL, 'resurrect'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(dids))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(dids))
         if r.status_code == codes.created:
             return True
         else:
@@ -1049,7 +1050,7 @@ class DIDClient(BaseClient):
         path = '/'.join([self.ARCHIVES_BASEURL, quote_plus(scope), quote_plus(name), 'files'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)

rucio/client/diracclient.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Literal, Optional
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -113,7 +114,7 @@ class DiracClient(BaseClient):
 
         r = self._send_request(
             url,
-            type_='POST',
+            method=HTTPMethod.POST,
             data=dumps({'lfns': lfns, 'ignore_availability': ignore_availability, 'parents_metadata': parents_metadata})
         )
 

rucio/client/downloadclient.py

@@ -1856,7 +1856,9 @@ class DownloadClient:
             did_name = did[1]
         elif len(did) == 1:
             if self.extract_scope_convention == 'belleii':
-                scopes = [scope for scope in self.client.list_scopes()]
+                scopes = self.client.list_scopes()
+                if not isinstance(scopes, list):
+                    scopes = [scope['scope'] for scope in scopes]
                 did_scope, did_name = extract_scope(did[0], scopes)
             else:
                 did = did_str.split('.')

rucio/client/exportclient.py

@@ -17,6 +17,7 @@ from typing import Any
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, parse_response
 
 
@@ -83,7 +84,7 @@ class ExportClient(BaseClient):
         path = '/'.join([self.EXPORT_BASEURL])
         url = build_url(choice(self.list_hosts), path=path, params=payload)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return parse_response(r.text)
         else:

rucio/client/importclient.py

@@ -17,6 +17,7 @@ from typing import Any
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, render_json
 
 
@@ -37,7 +38,7 @@ class ImportClient(BaseClient):
         path = '/'.join([self.IMPORT_BASEURL])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return r.text
         else:

rucio/client/lifetimeclient.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Optional
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, render_json
 
 if TYPE_CHECKING:
@@ -81,7 +82,7 @@ class LifetimeClient(BaseClient):
             params['states'] = exception_id
         url = build_url(choice(self.list_hosts), path=path, params=params)
 
-        result = self._send_request(url)
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:
             lifetime_exceptions = self._load_json_data(result)
             return lifetime_exceptions
@@ -133,7 +134,7 @@ class LifetimeClient(BaseClient):
         path = self.LIFETIME_BASEURL + '/'
         url = build_url(choice(self.list_hosts), path=path)
         data = {'dids': dids, 'account': account, 'pattern': pattern, 'comments': comments, 'expires_at': expires_at}
-        result = self._send_request(url, type_='POST', data=render_json(**data))
+        result = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if result.status_code == codes.created:
             return loads(result.text)
         exc_cls, exc_msg = self._get_exception(headers=result.headers, status_code=result.status_code, data=result.content)

rucio/client/lockclient.py

@@ -18,6 +18,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, render_json
 
 if TYPE_CHECKING:
@@ -50,7 +51,7 @@ class LockClient(BaseClient):
         path = '/'.join([self.LOCKS_BASEURL, quote_plus(scope), quote_plus(name)])
         url = build_url(choice(self.list_hosts), path=path, params={'did_type': 'dataset'})
 
-        result = self._send_request(url)
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable-msg=E1101
             locks = self._load_json_data(result)
             return locks
@@ -87,7 +88,7 @@ class LockClient(BaseClient):
         path = '/'.join([self.LOCKS_BASEURL, "bulk_locks_for_dids"])
         url = build_url(choice(self.list_hosts), path=path)
 
-        result = self._send_request(url, type_='POST', data=render_json(dids=dids))
+        result = self._send_request(url, method=HTTPMethod.POST, data=render_json(dids=dids))
         if result.status_code == codes.ok:   # pylint: disable-msg=E1101
             out = []
             for lock in self._load_json_data(result):
@@ -113,7 +114,7 @@ class LockClient(BaseClient):
         path = '/'.join([self.LOCKS_BASEURL, rse])
         url = build_url(choice(self.list_hosts), path=path, params={'did_type': 'dataset'})
 
-        result = self._send_request(url)
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable-msg=E1101
             locks = self._load_json_data(result)
             return locks

rucio/client/metaconventionsclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -63,7 +64,7 @@ class MetaConventionClient(BaseClient):
                       'value_regexp': value_regexp,
                       'key_type': key_type})
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -81,7 +82,7 @@ class MetaConventionClient(BaseClient):
         """
         path = self.META_BASEURL + '/'
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             keys = loads(r.text)
             return keys
@@ -99,7 +100,7 @@ class MetaConventionClient(BaseClient):
         """
         path = '/'.join([self.META_BASEURL, quote_plus(key)]) + '/'
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             values = loads(r.text)
             return values
@@ -131,7 +132,7 @@ class MetaConventionClient(BaseClient):
         path = '/'.join([self.META_BASEURL, quote_plus(key)]) + '/'
         data = dumps({'value': value})
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:

rucio/client/opendataclient.py

@@ -20,6 +20,7 @@ from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
 from rucio.common.config import config_get
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, render_json
 
 if TYPE_CHECKING:
@@ -85,7 +86,7 @@ class OpenDataClient(BaseClient):
             raise ValueError('state and public cannot be provided at the same time.')
 
         url = build_url(self.get_opendata_host(public=public), path=path)
-        r = self._send_request(url, type_='GET', params=params)
+        r = self._send_request(url, method=HTTPMethod.GET, params=params)
         if r.status_code == codes.ok:
             return json.loads(r.content.decode('utf-8'))
         else:
@@ -115,7 +116,7 @@ class OpenDataClient(BaseClient):
         path = '/'.join([self.opendata_private_dids_base_url, quote_plus(scope), quote_plus(name)])
         url = build_url(self.get_opendata_host(public=False), path=path)
 
-        r = self._send_request(url, type_='POST')
+        r = self._send_request(url, method=HTTPMethod.POST)
 
         if r.status_code == codes.created:
             return True
@@ -146,7 +147,7 @@ class OpenDataClient(BaseClient):
         path = '/'.join([self.opendata_private_dids_base_url, quote_plus(scope), quote_plus(name)])
         url = build_url(self.get_opendata_host(public=False), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.no_content:
             return True
@@ -162,7 +163,7 @@ class OpenDataClient(BaseClient):
             state: Optional["OPENDATA_DID_STATE_LITERAL"] = None,
             meta: Optional[dict] = None,
             doi: Optional[str] = None,
-    ) -> bool:
+    ) -> dict[str, Any]:
         """
         Update an existing Opendata DID in the Opendata catalog.
 
@@ -198,10 +199,10 @@ class OpenDataClient(BaseClient):
         if doi is not None:
             data['doi'] = doi
 
-        r = self._send_request(url, type_='PUT', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=render_json(**data))
 
         if r.status_code == codes.ok:
-            return True
+            return json.loads(r.content.decode('utf-8'))
         else:
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
@@ -236,7 +237,7 @@ class OpenDataClient(BaseClient):
         path = '/'.join([base_url, quote_plus(scope), quote_plus(name)])
         url = build_url(self.get_opendata_host(public=public), path=path)
 
-        r = self._send_request(url, type_='GET', params={
+        r = self._send_request(url, method=HTTPMethod.GET, params={
             'files': 1 if include_files else 0,
             'meta': 1 if include_metadata else 0,
             'doi': 1 if include_doi else 0,

rucio/client/pingclient.py

@@ -18,6 +18,7 @@ from typing import Any
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 
@@ -67,7 +68,7 @@ class PingClient(BaseClient):
         headers = None
         path = 'ping'
         url = build_url(self.host, path=path)
-        r = self._send_request(url, headers=headers, type_='GET')
+        r = self._send_request(url, headers=headers, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             server_info = loads(r.text)