rucio 37.7.0__py3-none-any.whl → 38.0.0rc1__py3-none-any.whl

rucio/rse/translation.py

@@ -50,7 +50,7 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
                 algorithm_name = "def"
             logger.debug("PFN2LFN: Falling back to %s algorithm.", 'default' if algorithm_name == 'def' else algorithm_name)
 
-        self.parser = self.get_parser(algorithm_name)
+        self.parser = self.get_parser(algorithm_name, vo)
 
     @classmethod
     def _module_init_(cls) -> None:
@@ -60,8 +60,14 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
         cls.register(cls._default, "def")
 
     @classmethod
-    def get_parser(cls, algorithm_name: str) -> 'Callable[..., Any]':
-        return super()._get_one_algorithm(cls._algorithm_type, algorithm_name)
+    def get_parser(cls, algorithm_name: str, vo: str) -> 'Callable[..., Any]':
+        result = None
+        if algorithm_name == vo:
+            # default algorithm for VO
+            result = super()._get_default_algorithm(RSEDeterministicScopeTranslation._algorithm_type, vo)
+        if result is None:
+            result = super()._get_one_algorithm(cls._algorithm_type, algorithm_name)
+        return result
 
     @classmethod
     def register(
@@ -111,7 +117,8 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
             self,
             rse: Optional[str] = None,
             rse_attributes: Optional["RSESettingsDict"] = None,
-            protocol_attributes: Optional[dict[str, Any]] = None
+            protocol_attributes: Optional[dict[str, Any]] = None,
+            vo: str = DEFAULT_VO
     ):
         """
         Initialize a translator object from the RSE, its attributes, and the protocol-specific
@@ -125,6 +132,7 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
         self.rse = rse
         self.rse_attributes = rse_attributes if rse_attributes else {}
         self.protocol_attributes = protocol_attributes if protocol_attributes else {}
+        self.vo = vo
 
     @classmethod
     def supports(
@@ -251,9 +259,12 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
             :returns: RSE specific URI of the physical file
         """
         algorithm = self.rse_attributes.get(RseAttr.LFN2PFN_ALGORITHM, 'default')
-        if algorithm == 'default':
+        algorithm_callable = None
+        if algorithm == 'default' or algorithm == RSEDeterministicTranslation._DEFAULT_LFN2PFN:
             algorithm = RSEDeterministicTranslation._DEFAULT_LFN2PFN
-        algorithm_callable = super()._get_one_algorithm(RSEDeterministicTranslation._algorithm_type, algorithm)
+            algorithm_callable = super()._get_default_algorithm(RSEDeterministicTranslation._algorithm_type, self.vo)
+        if algorithm_callable is None:
+            algorithm_callable = super()._get_one_algorithm(RSEDeterministicTranslation._algorithm_type, algorithm)
         return algorithm_callable(scope, name, self.rse, self.rse_attributes, self.protocol_attributes)
 
 

rucio/transfertool/fts3.py

@@ -1046,6 +1046,7 @@ class FTS3Transfertool(Transfertool):
                 t_file['scitag'] = self.scitags_exp_id << 6 | activity_id
 
         if t_file['metadata']['dst_type'] == 'TAPE':
+            t_file['metadata']['vo'] = rws.scope.vo
             for plugin in self.tape_metadata_plugins:
                 t_file = deep_merge_dict(source=plugin.hints(t_file['metadata']), destination=t_file)
 

rucio/transfertool/fts3_plugins.py

@@ -17,6 +17,7 @@ import sys
 from typing import TYPE_CHECKING, Any, Optional, TypeVar
 
 from rucio.common.config import config_get_int
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import InvalidRequest
 from rucio.common.plugins import PolicyPackageAlgorithms
 
@@ -85,7 +86,11 @@ class FTS3TapeMetadataPlugin(PolicyPackageAlgorithms):
         """
         return {"collocation_hints": collocation_func(**hints)}
 
-    def _default(self, *hints: dict) -> dict:
+    def _default(self, hint_dict: dict[str, Any]) -> dict:
+        vo = hint_dict['vo'] if 'vo' in hint_dict else DEFAULT_VO
+        default_algorithm = self._get_default_algorithm(self.ALGORITHM_NAME, vo=vo)
+        if default_algorithm is not None:
+            return default_algorithm(hint_dict)
         return {}
 
     def _verify_in_format(self, hint_dict: dict[str, Any]) -> None:

rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '37.7.0',
-    'branch_nick': 'release-37',
-    'revision_id': '61ed028cbd532ede88189a81bee971db566fcdec',
-    'revno': 13826
+    'version': '38.0.0rc1',
+    'branch_nick': 'master',
+    'revision_id': '7f986b67665c21ac40a2b32732b2f263bafd2f6c',
+    'revno': 13890
 }

rucio/web/rest/flaskapi/v1/common.py

@@ -20,11 +20,12 @@ import re
 from configparser import NoOptionError, NoSectionError
 from functools import wraps
 from time import time
-from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, Union
+from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, Union, cast
 from urllib.parse import unquote_plus
 
 import flask
 from flask.views import MethodView
+from typing_extensions import ParamSpec
 from werkzeug.datastructures import Headers
 from werkzeug.exceptions import HTTPException
 from werkzeug.wrappers import Request, Response
@@ -183,25 +184,44 @@ def response_headers(response: ResponseTypeVar) -> ResponseTypeVar:
     return response
 
 
-def check_accept_header_wrapper_flask(supported_content_types: 'Iterable[str]'):
-    """ Decorator to check if an endpoint supports the requested content type. """
+P = ParamSpec('P')
+R = TypeVar('R')
+
+
+def check_accept_header_wrapper_flask(
+        supported_content_types: 'Iterable[str]'
+) -> 'Callable[[Callable[P, R]], Callable[P, R]]':
+    """Decorator that refuses requests with an unsupported *Accept* header."""
+
+    def wrapper(
+            f: 'Callable[P, R]'
+    ) -> 'Callable[P, R]':
+        """Decorate *f* with an *Accept*-header check and return the new callable."""
 
-    def wrapper(f):
         @wraps(f)
-        def decorated(*args, **kwargs):
+        def decorated(*args: 'P.args', **kwargs: 'P.kwargs') -> 'R':
+            """Run the header check, then delegate to *f* (or return 406)."""
+
+            # 1. no Accept header → accept everything
             if not flask.request.accept_mimetypes.provided:
-                # accept anything, if Accept header is not provided
                 return f(*args, **kwargs)
 
-            for supported in supported_content_types:
-                if supported in flask.request.accept_mimetypes:
-                    return f(*args, **kwargs)
+            # 2. at least one acceptable media‑type → call the view
+            if any(s in flask.request.accept_mimetypes for s in supported_content_types):
+                return f(*args, **kwargs)
 
-            # none matched..
-            return generate_http_error_flask(
-                status_code=406,
-                exc=UnsupportedRequestedContentType.__name__,
-                exc_msg=f'The requested content type {flask.request.environ.get("HTTP_ACCEPT")} is not supported. Use {supported_content_types}.'
+            # 3. none matched → 406 response
+            return cast(
+                'R',
+                generate_http_error_flask(
+                    status_code=406,
+                    exc=UnsupportedRequestedContentType.__name__,
+                    exc_msg=(
+                        f'The requested content type '
+                        f'{flask.request.environ.get("HTTP_ACCEPT")} is not supported. '
+                        f'Use {supported_content_types}.'
+                    ),
+                ),
             )
 
         return decorated

rucio/web/rest/flaskapi/v1/config.py

@@ -281,7 +281,7 @@ class OptionSet(ErrorHandlingMethodView):
             return generate_http_error_flask(500, error, f"Could not set value '{value}' for section '{section}' option '{option}'")
 
 
-def blueprint():
+def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('config', __name__, url_prefix='/config')
 
     option_set_view = OptionSet.as_view('option_set')