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

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

@@ -178,7 +178,7 @@ class RSEs(ErrorHandlingMethodView):
                     for rse in parse_rse_expression(expression, vo=vo):
                         yield render_json(rse=rse) + '\n'
 
-                return try_stream(generate(vo=request.environ.get('vo')))
+                return try_stream(generate(vo=request.environ['vo']))
             except (InvalidRSEExpression, InvalidObject) as error:
                 return generate_http_error_flask(400, error)
         else:
@@ -187,7 +187,7 @@ class RSEs(ErrorHandlingMethodView):
                     rse['availability'] = Availability(rse['availability_read'], rse['availability_write'], rse['availability_delete']).integer
                     yield render_json(**rse) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
 
 
 class RSE(ErrorHandlingMethodView):
@@ -316,8 +316,8 @@ class RSE(ErrorHandlingMethodView):
             for keyword in kwargs.keys():
                 kwargs[keyword] = param_get(parameters, keyword, default=kwargs[keyword])
 
-        kwargs['issuer'] = request.environ.get('issuer')
-        kwargs['vo'] = request.environ.get('vo')
+        kwargs['issuer'] = request.environ['issuer']
+        kwargs['vo'] = request.environ['vo']
         try:
             add_rse(rse, **kwargs)
         except InvalidObject as error:
@@ -408,8 +408,8 @@ class RSE(ErrorHandlingMethodView):
         """
         kwargs = {
             'parameters': json_parameters(optional=True),
-            'issuer': request.environ.get('issuer'),
-            'vo': request.environ.get('vo'),
+            'issuer': request.environ['issuer'],
+            'vo': request.environ['vo'],
         }
         try:
             update_rse(rse, **kwargs)
@@ -508,7 +508,7 @@ class RSE(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            rse = get_rse(rse=rse, vo=request.environ.get('vo'))
+            rse = get_rse(rse=rse, vo=request.environ['vo'])
             rse['availability'] = Availability(rse['availability_read'], rse['availability_write'], rse['availability_delete']).integer
             return Response(render_json(**rse), content_type="application/json")
         except RSENotFound as error:
@@ -537,7 +537,7 @@ class RSE(ErrorHandlingMethodView):
             description: RSE not found
         """
         try:
-            del_rse(rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            del_rse(rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (RSENotFound, RSEOperationNotSupported, CounterNotFound) as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:
@@ -600,7 +600,7 @@ class Attributes(ErrorHandlingMethodView):
         parameters = json_parameters()
         value = param_get(parameters, 'value')
         try:
-            add_rse_attribute(rse=rse, key=key, value=value, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            add_rse_attribute(rse=rse, key=key, value=value, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except Duplicate as error:
@@ -643,7 +643,7 @@ class Attributes(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            rse_attr = list_rse_attributes(rse, vo=request.environ.get('vo'))
+            rse_attr = list_rse_attributes(rse, vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except RSENotFound as error:
@@ -680,7 +680,7 @@ class Attributes(ErrorHandlingMethodView):
             description: RSE or RSE attribute not found
         """
         try:
-            del_rse_attribute(rse=rse, key=key, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            del_rse_attribute(rse=rse, key=key, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except (RSENotFound, RSEAttributeNotFound) as error:
@@ -831,7 +831,7 @@ class ProtocolList(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            p_list = get_rse_protocols(rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            p_list = get_rse_protocols(rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (RSEOperationNotSupported, RSENotFound, RSEProtocolNotSupported, RSEProtocolDomainNotSupported) as error:
             return generate_http_error_flask(404, error)
 
@@ -909,7 +909,7 @@ class LFNS2PFNS(ErrorHandlingMethodView):
         operation = request.args.get('operation', default='write')
 
         try:
-            rse_settings = get_rse_protocols(rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            rse_settings = get_rse_protocols(rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (RSENotFound, RSEProtocolNotSupported, RSEProtocolDomainNotSupported) as error:
             return generate_http_error_flask(404, error)
 
@@ -1009,7 +1009,7 @@ class Protocol(ErrorHandlingMethodView):
         parameters['scheme'] = scheme
 
         try:
-            add_protocol(rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'), data=parameters)
+            add_protocol(rse, issuer=request.environ['issuer'], vo=request.environ['vo'], data=parameters)
         except (RSENotFound, RSEProtocolDomainNotSupported) as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:
@@ -1167,7 +1167,7 @@ class Protocol(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            p_list = get_rse_protocols(rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            p_list = get_rse_protocols(rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (RSENotFound, RSEProtocolNotSupported, RSEProtocolDomainNotSupported) as error:
             return generate_http_error_flask(404, error)
 
@@ -1334,8 +1334,8 @@ class Protocol(ErrorHandlingMethodView):
         try:
             update_protocols(
                 rse,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
                 scheme=scheme,
                 hostname=hostname,
                 port=int(port) if port else None,
@@ -1395,8 +1395,8 @@ class Protocol(ErrorHandlingMethodView):
         try:
             del_protocols(
                 rse,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
                 scheme=scheme,
                 hostname=hostname,
                 port=int(port) if port else None
@@ -1485,10 +1485,10 @@ class Usage(ErrorHandlingMethodView):
 
             return try_stream(
                 generate(
-                    issuer=request.environ.get('issuer'),
+                    issuer=request.environ['issuer'],
                     source=request.args.get('source'),
                     per_account=per_account,
-                    vo=request.environ.get('vo'),
+                    vo=request.environ['vo'],
                 )
             )
         except RSENotFound as error:
@@ -1544,7 +1544,7 @@ class Usage(ErrorHandlingMethodView):
             kwargs[keyword] = param_get(parameters, keyword, default=kwargs[keyword])
 
         try:
-            set_rse_usage(rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'), **kwargs)
+            set_rse_usage(rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'], **kwargs)
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except RSENotFound as error:
@@ -1615,7 +1615,7 @@ class UsageHistory(ErrorHandlingMethodView):
                 for usage in list_rse_usage_history(rse=rse, issuer=issuer, source=source, vo=vo):
                     yield render_json(**usage) + '\n'
 
-            return try_stream(generate(issuer=request.environ.get('issuer'), source=request.args.get('source'), vo=request.environ.get('vo')))
+            return try_stream(generate(issuer=request.environ['issuer'], source=request.args.get('source'), vo=request.environ['vo']))
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -1658,7 +1658,7 @@ class Limits(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            limits = get_rse_limits(rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            limits = get_rse_limits(rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
             return Response(render_json(**limits), content_type="application/json")
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
@@ -1705,7 +1705,7 @@ class Limits(ErrorHandlingMethodView):
             kwargs[keyword] = param_get(parameters, keyword, default=kwargs[keyword])
 
         try:
-            set_rse_limits(rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'), **kwargs)
+            set_rse_limits(rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'], **kwargs)
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except RSENotFound as error:
@@ -1752,7 +1752,7 @@ class Limits(ErrorHandlingMethodView):
         name = param_get(parameters, 'name')
 
         try:
-            delete_rse_limits(rse=rse, name=name, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            delete_rse_limits(rse=rse, name=name, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except RSENotFound as error:
@@ -1820,7 +1820,7 @@ class RSEAccountUsageLimit(ErrorHandlingMethodView):
                 for usage in get_rse_account_usage(rse=rse, vo=vo):
                     yield render_json(**usage) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')), content_type='application/json')
+            return try_stream(generate(vo=request.environ['vo']), content_type='application/json')
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -1882,7 +1882,7 @@ class Distance(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            distance = get_distance(source=source, destination=destination, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            distance = get_distance(source=source, destination=destination, issuer=request.environ['issuer'], vo=request.environ['vo'])
             return Response(dumps(distance, cls=APIEncoder), content_type="application/json")
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
@@ -1946,8 +1946,8 @@ class Distance(ErrorHandlingMethodView):
                 source=source,
                 destination=destination,
                 distance=distance,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
             )
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
@@ -2017,8 +2017,8 @@ class Distance(ErrorHandlingMethodView):
                 source=source,
                 destination=destination,
                 distance=distance,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
             )
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
@@ -2066,8 +2066,8 @@ class Distance(ErrorHandlingMethodView):
             delete_distance(
                 source=source,
                 destination=destination,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo')
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo']
             )
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
@@ -2117,7 +2117,7 @@ class QoSPolicy(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            add_qos_policy(rse=rse, qos_policy=policy, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            add_qos_policy(rse=rse, qos_policy=policy, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -2155,7 +2155,7 @@ class QoSPolicy(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            delete_qos_policy(rse=rse, qos_policy=policy, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            delete_qos_policy(rse=rse, qos_policy=policy, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -2201,7 +2201,7 @@ class QoSPolicy(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            qos_policies = list_qos_policies(rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            qos_policies = list_qos_policies(rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
             return Response(dumps(qos_policies, cls=APIEncoder), content_type='application/json')
         except RSENotFound as error:
             return generate_http_error_flask(404, error)

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

@@ -92,7 +92,7 @@ class Rule(ErrorHandlingMethodView):
             return generate_http_error_flask(501, "NotImplemented", exc_msg="estimate_ttc is not implemented!")
 
         try:
-            rule = get_replication_rule(rule_id, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            rule = get_replication_rule(rule_id, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except RuleNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -177,7 +177,7 @@ class Rule(ErrorHandlingMethodView):
         parameters = json_parameters()
         options: dict[str, Any] = param_get(parameters, 'options')
         try:
-            update_replication_rule(rule_id=rule_id, options=options, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            update_replication_rule(rule_id=rule_id, options=options, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except (RuleNotFound, AccountNotFound) as error:
@@ -212,7 +212,7 @@ class Rule(ErrorHandlingMethodView):
         parameters = json_parameters()
         purge_replicas = param_get(parameters, 'purge_replicas', default=None)
         try:
-            delete_replication_rule(rule_id=rule_id, purge_replicas=purge_replicas, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            delete_replication_rule(rule_id=rule_id, purge_replicas=purge_replicas, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (AccessDenied, UnsupportedOperation) as error:
             return generate_http_error_flask(401, error)
         except RuleNotFound as error:
@@ -250,7 +250,7 @@ class AllRule(ErrorHandlingMethodView):
                 for rule in list_replication_rules(filters=filters, vo=vo):
                     yield dumps(rule, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(filters=dict(request.args.items(multi=False)), vo=request.environ.get('vo')))
+            return try_stream(generate(filters=dict(request.args.items(multi=False)), vo=request.environ['vo']))
         except RuleNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -397,8 +397,8 @@ class AllRule(ErrorHandlingMethodView):
                 priority=param_get(parameters, 'priority', default=3),
                 split_container=param_get(parameters, 'split_container', default=False),
                 meta=param_get(parameters, 'meta', default=None),
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
             )
         except (
             InvalidReplicationRule,
@@ -477,7 +477,7 @@ class ReplicaLocks(ErrorHandlingMethodView):
             for lock in get_replica_locks_for_rule_id(rule_id, vo=vo):
                 yield render_json(**lock) + '\n'
 
-        return try_stream(generate(vo=request.environ.get('vo')))
+        return try_stream(generate(vo=request.environ['vo']))
 
 
 class ReduceRule(ErrorHandlingMethodView):
@@ -531,8 +531,8 @@ class ReduceRule(ErrorHandlingMethodView):
             rule_ids = reduce_replication_rule(rule_id=rule_id,
                                                copies=copies,
                                                exclude_expression=exclude_expression,
-                                               issuer=request.environ.get('issuer'),
-                                               vo=request.environ.get('vo'))
+                                               issuer=request.environ['issuer'],
+                                               vo=request.environ['vo'])
         # TODO: Add all other error cases here
         except RuleReplaceFailed as error:
             return generate_http_error_flask(409, error)
@@ -612,8 +612,8 @@ class MoveRule(ErrorHandlingMethodView):
             rule_ids = move_replication_rule(rule_id=rule_id,
                                              rse_expression=rse_expression,
                                              override=override,
-                                             issuer=request.environ.get('issuer'),
-                                             vo=request.environ.get('vo'))
+                                             issuer=request.environ['issuer'],
+                                             vo=request.environ['vo'])
         except RuleReplaceFailed as error:
             return generate_http_error_flask(409, error)
         except RuleNotFound as error:
@@ -676,7 +676,7 @@ class RuleHistory(ErrorHandlingMethodView):
             for history in list_replication_rule_history(rule_id, issuer=issuer, vo=vo):
                 yield render_json(**history) + '\n'
 
-        return try_stream(generate(issuer=request.environ.get('issuer'), vo=request.environ.get('vo')))
+        return try_stream(generate(issuer=request.environ['issuer'], vo=request.environ['vo']))
 
 
 class RuleHistoryFull(ErrorHandlingMethodView):
@@ -740,13 +740,13 @@ class RuleHistoryFull(ErrorHandlingMethodView):
             description: Not acceptable.
         """
         try:
-            scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
+            scope, name = parse_scope_name(scope_name, request.environ['vo'])
 
             def generate(vo):
                 for history in list_replication_rule_full_history(scope, name, vo=vo):
                     yield render_json(**history) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo')))
+            return try_stream(generate(vo=request.environ['vo']))
         except ValueError as error:
             return generate_http_error_flask(400, error)
 
@@ -819,7 +819,7 @@ class RuleAnalysis(ErrorHandlingMethodView):
           406:
             description: Not acceptable.
         """
-        analysis = examine_replication_rule(rule_id, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+        analysis = examine_replication_rule(rule_id, issuer=request.environ['issuer'], vo=request.environ['vo'])
         return Response(render_json(**analysis), content_type='application/json')
 
 

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

@@ -46,7 +46,7 @@ class Scope(ErrorHandlingMethodView):
           406:
             description: Not acceptable
         """
-        return jsonify(list_scopes(vo=request.environ.get('vo')))
+        return jsonify(list_scopes(vo=request.environ['vo']))
 
     def post(self, account, scope):
         """
@@ -84,7 +84,7 @@ class Scope(ErrorHandlingMethodView):
             description: Scope already exists
         """
         try:
-            add_scope(scope, account, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            add_scope(scope, account, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except Duplicate as error:
             return generate_http_error_flask(409, error)
         except AccountNotFound as error:
@@ -129,7 +129,7 @@ class AccountScopeList(ErrorHandlingMethodView):
             description: Not acceptable
         """
         try:
-            scopes = get_scopes(account, vo=request.environ.get('vo'))
+            scopes = get_scopes(account, vo=request.environ['vo'])
         except AccountNotFound as error:
             return generate_http_error_flask(404, error)
 

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)