rucio-clients 35.1.1__tar.gz → 35.2.1__tar.gz

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/MANIFEST.in

@@ -2,7 +2,7 @@ include MANIFEST.in pylintrc
 include AUTHORS
 include LICENSE
 include ChangeLog
-include README.rst
+include README.md
 include setuputil.py
 include setup.py
 include setup.cfg

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/PKG-INFO

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

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/lib/rucio/client/baseclient.py

@@ -137,6 +137,7 @@ class BaseClient:
             self.logger.debug('No trace_host passed. Using rucio_host instead')
 
         self.list_hosts = [self.host]
+        self.account = account
         self.ca_cert = ca_cert
         self.auth_token = ""
         self.headers = {}
@@ -171,9 +172,7 @@ class BaseClient:
                     self.logger.debug('No ca_cert found in configuration. Falling back to Mozilla default CA bundle (certifi).')
                     self.ca_cert = True
 
-        if account is not None:
-            self.account = account
-        else:
+        if account is None:
             self.logger.debug('No account passed. Trying to get it from the RUCIO_ACCOUNT environment variable or the config file.')
             try:
                 self.account = environ['RUCIO_ACCOUNT']

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/lib/rucio/common/types.py

@@ -27,7 +27,7 @@ else:
 
 if TYPE_CHECKING:
     from rucio.common.constants import SUPPORTED_PROTOCOLS_LITERAL
-    from rucio.db.sqla.constants import AccountType, IdentityType
+    from rucio.db.sqla.constants import AccountType, IdentityType, RequestState, RequestType
 
 
 class InternalType:
@@ -343,3 +343,57 @@ class FileToUploadWithCollectedInfoDict(FileToUploadDict):
 class FileToUploadWithCollectedAndDatasetInfoDict(FileToUploadWithCollectedInfoDict):
     dataset_scope: str
     dataset_name: str
+
+
+class RequestGatewayDict(TypedDict):
+    """
+    Request dict expected as input to gateway
+    """
+    scope: str
+    name: str
+    account: Optional[str]
+    dest_rse_id: str
+    request_type: "RequestType"
+    attributes: "RequestAttributesDict"
+
+
+class RequestDict(TypedDict):
+    """
+    Requested dict used in core
+    """
+    id: str
+    request_id: str
+    scope: InternalScope
+    name: str
+    source_rse_id: str
+    dest_rse_id: str
+    dest_url: str
+    state: "RequestState"
+    account: NotRequired[InternalAccount]
+    rule_id: str
+    adler32: str
+    bytes: int
+    err_msg: str
+    sources: list[dict[str, Any]]
+    request_type: "RequestType"
+    retry_count: Optional[int]
+    previous_attempt_id: str
+    external_host: str
+    external_id: str
+    transfertool: str
+    attributes: "RequestAttributesDict"
+
+
+class RequestAttributesDict(TypedDict):
+    activity: str
+    bytes: int
+    md5: str
+    adler32: str
+    is_intermediate_hop: bool
+
+
+class FilterDict(TypedDict):
+    rule_id: str
+    request_id: str
+    older_than: datetime
+    activities: Union[list[str], str]

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '35.1.1',
+    'version': '35.2.1',
     'branch_nick': 'release-35-LTS',
-    'revision_id': '018b82c198120381bb9ba2966f1b8524c4f50094',
-    'revno': 13115
+    'revision_id': 'd16287dcea81790562e5c63066feb522bf57ab8d',
+    'revno': 13130
 }

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/setup.cfg

@@ -4,7 +4,7 @@ force-manifest = 1
 
 [metadata]
 description-file = 
-	README.rst
+	README.md
 
 [egg_info]
 tag_build = 

{rucio_clients-35.1.1 → rucio_clients-35.2.1}/tests/test_dumper_consistency.py

@@ -17,7 +17,7 @@ import os
 from datetime import datetime
 from unittest import mock
 
-from rucio.common.dumper.consistency import Consistency, _try_to_advance, compare3, gnu_sort, min3, parse_and_filter_file
+from rucio.common.dumper.consistency import Consistency, _try_to_advance, compare3, gnu_sort, min_value, parse_and_filter_file
 from rucio.tests.common import make_temp_file
 
 RSEPROTOCOL = {
@@ -282,17 +282,17 @@ class TestConsistency:
         ]
         assert value == expected
 
-    def test_min3_simple_strings(self, tmp_path):
+    def test_min_value_simple_strings(self, tmp_path):
         ''' DUMPER '''
-        assert min3('a', 'b', 'c') == 'a'
+        assert min_value('a', 'b', 'c') == 'a'
 
-    def test_min3_repeated_strings(self, tmp_path):
+    def test_min_value_repeated_strings(self, tmp_path):
         ''' DUMPER '''
-        assert min3('b', 'a', 'a') == 'a'
+        assert min_value('b', 'a', 'a') == 'a'
 
-    def test_min3_parsing_the_strings_is_not_a_responsability_of_this_function(self, tmp_path):
+    def test_min_value_parsing_the_strings_is_not_a_responsability_of_this_function(self, tmp_path):
         ''' DUMPER '''
-        assert min3('a,b', 'cab', 'b,a') == 'a,b'
+        assert min_value('a,b', 'cab', 'b,a') == 'a,b'
 
     def test_parse_and_filter_file_default_parameters(self, tmp_path):
         ''' DUMPER '''