rucio 37.3.0__py3-none-any.whl → 37.4.0__py3-none-any.whl

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

@@ -13,18 +13,18 @@
 # limitations under the License.
 
 import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union, cast
 
 import flask
 from flask import Flask, Response
 
-from rucio.common.exception import RequestNotFound
+from rucio.common.exception import AccessDenied, RequestNotFound
 from rucio.common.utils import APIEncoder, render_json
 from rucio.core.rse import get_rses_with_attribute_value
-from rucio.db.sqla.constants import RequestState
+from rucio.db.sqla.constants import RequestState, TransferLimitDirection
 from rucio.gateway import request
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, parse_scope_name, response_headers, try_stream
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, parse_scope_name, response_headers, try_stream
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -178,7 +178,7 @@ class RequestGet(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, flask.request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, flask.request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -187,8 +187,8 @@ class RequestGet(ErrorHandlingMethodView):
                 scope=scope,
                 name=name,
                 rse=rse,
-                issuer=flask.request.environ.get('issuer'),
-                vo=flask.request.environ.get('vo'),
+                issuer=flask.request.environ['issuer'],
+                vo=flask.request.environ['vo'],
             )
             return Response(json.dumps(request_data, cls=APIEncoder), content_type='application/json')
         except RequestNotFound as error:
@@ -343,7 +343,7 @@ class RequestHistoryGet(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scope, name = parse_scope_name(scope_name, flask.request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, flask.request.environ['vo'])
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -352,8 +352,8 @@ class RequestHistoryGet(ErrorHandlingMethodView):
                 scope=scope,
                 name=name,
                 rse=rse,
-                issuer=flask.request.environ.get('issuer'),
-                vo=flask.request.environ.get('vo'),
+                issuer=flask.request.environ['issuer'],
+                vo=flask.request.environ['vo'],
             )
             return Response(json.dumps(request_data, cls=APIEncoder), content_type='application/json')
         except RequestNotFound as error:
@@ -564,11 +564,11 @@ class RequestList(ErrorHandlingMethodView):
         src_rses = []
         dst_rses = []
         if src_site:
-            src_rses = get_rses_with_attribute_value(key='site', value=src_site, vo=flask.request.environ.get('vo'))
+            src_rses = get_rses_with_attribute_value(key='site', value=src_site, vo=flask.request.environ['vo'])
             if not src_rses:
                 return generate_http_error_flask(404, 'NotFound', f'Could not resolve site name {src_site} to RSE')
             src_rses = [rse['rse_name'] for rse in src_rses]
-            dst_rses = get_rses_with_attribute_value(key='site', value=dst_site, vo=flask.request.environ.get('vo'))
+            dst_rses = get_rses_with_attribute_value(key='site', value=dst_site, vo=flask.request.environ['vo'])
             if not dst_rses:
                 return generate_http_error_flask(404, 'NotFound', f'Could not resolve site name {dst_site} to RSE')
             dst_rses = [rse['rse_name'] for rse in dst_rses]
@@ -576,11 +576,15 @@ class RequestList(ErrorHandlingMethodView):
             dst_rses = [dst_rse]
             src_rses = [src_rse]
 
+        # Manual cast to list[str] as static code analysis erroneously sees these as list[Optional[str]]
+        src_rses = cast("list[str]", src_rses)
+        dst_rses = cast("list[str]", dst_rses)
+
         def generate(issuer, vo):
             for result in request.list_requests(src_rses, dst_rses, states, issuer=issuer, vo=vo):
                 yield render_json(**result) + '\n'
 
-        return try_stream(generate(issuer=flask.request.environ.get('issuer'), vo=flask.request.environ.get('vo')))
+        return try_stream(generate(issuer=flask.request.environ['issuer'], vo=flask.request.environ['vo']))
 
 
 class RequestHistoryList(ErrorHandlingMethodView):
@@ -779,8 +783,8 @@ class RequestHistoryList(ErrorHandlingMethodView):
         src_site = flask.request.args.get('src_site', default=None)
         dst_site = flask.request.args.get('dst_site', default=None)
         request_states = flask.request.args.get('request_states', default=None)
-        offset = flask.request.args.get('offset', default=0)
-        limit = flask.request.args.get('limit', default=100)
+        offset = flask.request.args.get('offset', type=int, default=0)
+        limit = flask.request.args.get('limit', type=int, default=100)
 
         if not request_states:
             return generate_http_error_flask(400, 'MissingParameter', 'Request state is missing')
@@ -801,11 +805,11 @@ class RequestHistoryList(ErrorHandlingMethodView):
         src_rses = []
         dst_rses = []
         if src_site:
-            src_rses = get_rses_with_attribute_value(key='site', value=src_site, vo=flask.request.environ.get('vo'))
+            src_rses = get_rses_with_attribute_value(key='site', value=src_site, vo=flask.request.environ['vo'])
             if not src_rses:
                 return generate_http_error_flask(404, 'NotFound', f'Could not resolve site name {src_site} to RSE')
             src_rses = [rse['rse_name'] for rse in src_rses]
-            dst_rses = get_rses_with_attribute_value(key='site', value=dst_site, vo=flask.request.environ.get('vo'))
+            dst_rses = get_rses_with_attribute_value(key='site', value=dst_site, vo=flask.request.environ['vo'])
             if not dst_rses:
                 return generate_http_error_flask(404, 'NotFound', f'Could not resolve site name {dst_site} to RSE')
             dst_rses = [rse['rse_name'] for rse in dst_rses]
@@ -813,11 +817,15 @@ class RequestHistoryList(ErrorHandlingMethodView):
             dst_rses = [dst_rse]
             src_rses = [src_rse]
 
+        # Manual cast to list[str] as static code analysis erroneously sees these as list[Optional[str]]
+        src_rses = cast("list[str]", src_rses)
+        dst_rses = cast("list[str]", dst_rses)
+
         def generate(issuer, vo):
             for result in request.list_requests_history(src_rses, dst_rses, states, issuer=issuer, vo=vo, offset=offset, limit=limit):
                 yield render_json(**result) + '\n'
 
-        return try_stream(generate(issuer=flask.request.environ.get('issuer'), vo=flask.request.environ.get('vo')))
+        return try_stream(generate(issuer=flask.request.environ['issuer'], vo=flask.request.environ['vo']))
 
 
 class RequestMetricsGet(ErrorHandlingMethodView):
@@ -960,8 +968,8 @@ class RequestMetricsGet(ErrorHandlingMethodView):
             src_rse=src_rse,
             activity=activity,
             group_by_rse_attribute=group_by_rse_attribute,
-            issuer=flask.request.environ.get('issuer'),
-            vo=flask.request.environ.get('vo')
+            issuer=flask.request.environ['issuer'],
+            vo=flask.request.environ['vo']
         )
 
         if format == 'panda':
@@ -972,6 +980,187 @@ class RequestMetricsGet(ErrorHandlingMethodView):
                 yield render_json(**result) + '\n'
         return try_stream(generate())
 
+class TransferLimits(ErrorHandlingMethodView):
+    """ REST API to get, set or delete transfer limits. """
+
+    @check_accept_header_wrapper_flask(['application/x-json-stream'])
+    def get(self) -> flask.Response:
+        """
+        ---
+        summary: Get Transfer Limits
+        description: Get all the transfer limits.
+        tags:
+          - Requests
+        responses:
+          200:
+            description: OK
+            content:
+              application/x-json-stream:
+                schema:
+                  description: All the transfer limits
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      id:
+                        description: The transfer limit id.
+                        type: string
+                      rse_expression:
+                        description: The RSE expression for which the limit applies.
+                        type: string
+                      direction:
+                        description: The direction in which this limit applies (source/destination)
+                        type: string
+                      max_transfers:
+                        description: Maximum number of transfers allowed.
+                        type: integer
+                      volume:
+                        description: Maximum transfer volume in bytes.
+                        type: integer
+                      deadline:
+                        description: Maximum waiting time in hours until a datasets gets released.
+                        type: integer
+                      strategy:
+                        description: defines how to handle datasets: `fifo` (each file released separately) or `grouped_fifo` (wait for the entire dataset to fit)
+                        type: string
+                      transfers:
+                        description: Current number of active transfers
+                        type: integer
+                      waitings:
+                        description: Current number of waiting transfers
+                        type: integer
+                      updated_at:
+                        description: Datetime of the last update.
+                        type: string
+                      created_at:
+                        description: Datetime of the creation of the transfer limit.
+                        type: string
+          401:
+            description: Invalid Auth Token
+        """
+        transfer_limits = request.list_transfer_limits(issuer=flask.request.environ['issuer'], vo=flask.request.environ['vo'])
+        def generate() -> "Iterator[str]":
+                for limit in transfer_limits:
+                    yield json.dumps(limit, cls=APIEncoder) + '\n'
+        return try_stream(generate())
+
+    def put(self) -> Union[flask.Response, tuple[str, int]]:
+        """
+        ---
+        summary: Set Transfer Limit
+        description: Create or update a transfer limit for a specific RSE expression and activity.
+        tags:
+          - Requests
+        requestBody:
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - rse_expression
+                  - max_transfers
+                properties:
+                  rse_expression:
+                    type: string
+                    description: The RSE expression for which the transfer limit is being set.
+                  activity:
+                    type: string
+                    description: The activity to which the transfer limit applies.
+                  max_transfers:
+                    type: integer
+                    description: The maximum number of transfers allowed.
+                  direction:
+                    type: string
+                    description: The direction of the transfer limit (source or destination).
+                    enum: ["SOURCE", "DESTINATION"]
+                    default: "DESTINATION"
+                  volume:
+                    type: integer
+                    description: The maximum transfer volume in bytes.
+                  deadline:
+                    type: integer
+                    description: The maximum waiting time in hours until a dataset is released.
+                  strategy:
+                    type: string
+                    description: The strategy for handling datasets (e.g., `fifo` or `grouped_fifo`).
+                  transfers:
+                    type: integer
+                    description: The current number of active transfers.
+                  waitings:
+                    type: integer
+                    description: The current number of waiting transfers.
+        responses:
+          201:
+            description: Transfer limit set successfully.
+          400:
+            description: Invalid input data.
+          401:
+            description: Invalid Auth Token.
+          500:
+            description: Internal server error.
+        """
+        parameters = json_parameters()
+        rse_expression = param_get(parameters, 'rse_expression')
+        max_transfers = param_get(parameters, 'max_transfers')
+
+        try:
+          request.set_transfer_limit(
+            rse_expression=rse_expression,
+            max_transfers=max_transfers,
+            activity=param_get(parameters, 'activity', default=None),
+            direction=param_get(parameters, 'direction', default=TransferLimitDirection.DESTINATION),
+            volume=param_get(parameters, 'volume', default=None),
+            deadline=param_get(parameters, 'deadline', default=None),
+            strategy=param_get(parameters, 'strategy', default=None),
+            transfers=param_get(parameters, 'transfers', default=None),
+            waitings=param_get(parameters, 'waitings', default=None),
+            issuer=flask.request.environ['issuer'],
+            vo=flask.request.environ['vo']
+          )
+        except AccessDenied as error:
+          return generate_http_error_flask(401, error)
+
+        return '', 201
+
+    def delete(self) -> Union[flask.Response, tuple[str, int]]:
+        """
+        ---
+        summary: Delete Transfer Limit
+        description: Delete a transfer limit for an RSE expression.
+        tags:
+          - Requests
+        parameters:
+          - name: rse_expression
+            in: query
+            description: The RSE expression to delete the limit for.
+            required: true
+            schema:
+              type: string
+        responses:
+          200:
+            description: Transfer limit deleted successfully.
+          400:
+            description: Invalid input data.
+          401:
+            description: Invalid Auth Token.
+          500:
+            description: Internal server error.
+        """
+        parameters = json_parameters()
+        rse_expression = param_get(parameters, 'rse_expression')
+
+        try:
+          request.delete_transfer_limit(
+            rse_expression=rse_expression,
+            activity=param_get(parameters, 'activity', default=None),
+            direction=param_get(parameters, 'direction', default=TransferLimitDirection.DESTINATION),
+            issuer=flask.request.environ['issuer'],
+            vo=flask.request.environ['vo']
+          )
+        except AccessDenied as error:
+          return generate_http_error_flask(401, error)
+
+        return '', 200
 
 def blueprint():
     bp = AuthenticatedBlueprint('requests', __name__, url_prefix='/requests')
@@ -986,6 +1175,8 @@ def blueprint():
     bp.add_url_rule('/history/list', view_func=request_history_list_view, methods=['get', ])
     request_metrics_view = RequestMetricsGet.as_view('request_metrics_get')
     bp.add_url_rule('/metrics', view_func=request_metrics_view, methods=['get', ])
+    transfer_limits_view = TransferLimits.as_view('transfer_limits_get')
+    bp.add_url_rule('/transfer_limits', view_func=transfer_limits_view, methods=['get', 'put', 'delete'])
 
     bp.after_request(response_headers)
     return bp

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

@@ -112,7 +112,7 @@ class Subscription(ErrorHandlingMethodView):
                 for subscription in list_subscriptions(name=name, account=account, vo=vo):
                     yield render_json(**subscription) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except SubscriptionNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -193,7 +193,7 @@ class Subscription(ErrorHandlingMethodView):
             metadata[keyword] = param_get(options, keyword, default=metadata[keyword])
 
         try:
-            update_subscription(name=name, account=account, metadata=metadata, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            update_subscription(name=name, account=account, metadata=metadata, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (InvalidObject, TypeError) as error:
             return generate_http_error_flask(400, InvalidObject.__name__, error.args[0])
         except AccessDenied as error:
@@ -306,8 +306,8 @@ class Subscription(ErrorHandlingMethodView):
                 retroactive=retroactive,
                 dry_run=dry_run,
                 priority=priority,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
             )
         except (InvalidObject, TypeError) as error:
             return generate_http_error_flask(400, InvalidObject.__name__, error.args[0])
@@ -400,7 +400,7 @@ class SubscriptionName(ErrorHandlingMethodView):
                 for subscription in list_subscriptions(name=name, vo=vo):
                     yield render_json(**subscription) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except SubscriptionNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -454,7 +454,7 @@ class Rules(ErrorHandlingMethodView):
         """
         state = request.args.get('state', default=None)
         try:
-            subscriptions = [subscription['id'] for subscription in list_subscriptions(name=name, account=account, vo=request.environ.get('vo'))]
+            subscriptions = [subscription['id'] for subscription in list_subscriptions(name=name, account=account, vo=request.environ['vo'])]
 
             def generate(vo):
                 if len(subscriptions) > 0:
@@ -465,7 +465,7 @@ class Rules(ErrorHandlingMethodView):
                         for rule in list_replication_rules({'subscription_id': subscriptions[0]}, vo=vo):
                             yield render_json(**rule) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except (RuleNotFound, SubscriptionNotFound) as error:
             return generate_http_error_flask(404, error)
 
@@ -529,7 +529,7 @@ class States(ErrorHandlingMethodView):
             for row in list_subscription_rule_states(name=name, account=account, vo=vo):
                 yield dumps(row, cls=APIEncoder) + '\n'
 
-        return try_stream(generate(vo=request.environ.get('vo')))
+        return try_stream(generate(vo=request.environ['vo']))
 
 
 class SubscriptionId(ErrorHandlingMethodView):
@@ -607,7 +607,7 @@ class SubscriptionId(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            subscription = get_subscription_by_id(subscription_id, vo=request.environ.get('vo'))
+            subscription = get_subscription_by_id(subscription_id, vo=request.environ['vo'])
         except SubscriptionNotFound as error:
             return generate_http_error_flask(404, error)
 

{rucio-37.3.0.data → rucio-37.4.0.data}/data/rucio/etc/rucio.cfg.template

@@ -116,7 +116,6 @@ metrics_port = 8080
 [conveyor]
 scheme = srm,gsiftp,root,http,https
 transfertool = fts3
-ftshosts = https://fts3-pilot.cern.ch:8446, https://fts3-pilot.cern.ch:8446
 cacert = /opt/rucio/etc/web/ca.crt
 usercert = /opt/rucio/tools/x509up
 

{rucio-37.3.0.data → rucio-37.4.0.data}/data/rucio/etc/rucio_multi_vo.cfg.template

@@ -97,7 +97,6 @@ metrics_port = 8080
 [conveyor]
 scheme = srm,gsiftp,root,http,https
 transfertool = fts3
-ftshosts = https://fts3-pilot.cern.ch:8446, https://fts3-pilot.cern.ch:8446
 cacert = /opt/rucio/etc/web/ca.crt
 usercert = /opt/rucio/tools/x509up
 

{rucio-37.3.0.dist-info → rucio-37.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 37.3.0
+Version: 37.4.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio