rucio 32.8.6__py3-none-any.whl → 35.8.0__py3-none-any.whl

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,15 +16,12 @@ from json import dumps
 
 from flask import Flask, Response, request
 
-from rucio.api.rule import list_replication_rules
-from rucio.api.subscription import list_subscriptions, add_subscription, update_subscription, \
-    list_subscription_rule_states, get_subscription_by_id
-from rucio.common.exception import InvalidObject, SubscriptionDuplicate, SubscriptionNotFound, RuleNotFound, \
-    AccessDenied
-from rucio.common.utils import render_json, APIEncoder
+from rucio.common.exception import AccessDenied, InvalidObject, RuleNotFound, SubscriptionDuplicate, SubscriptionNotFound
+from rucio.common.utils import APIEncoder, render_json
+from rucio.gateway.rule import list_replication_rules
+from rucio.gateway.subscription import add_subscription, get_subscription_by_id, list_subscription_rule_states, list_subscriptions, update_subscription
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import check_accept_header_wrapper_flask, try_stream, \
-    response_headers, generate_http_error_flask, ErrorHandlingMethodView, json_parameters, param_get
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, response_headers, try_stream
 
 
 class Subscription(ErrorHandlingMethodView):
@@ -151,7 +147,7 @@ class Subscription(ErrorHandlingMethodView):
                   - options
                 properties:
                   options:
-                    description: The values for the new subcription.
+                    description: The values for the new subscription.
                     type: object
                     properties:
                       filter:
@@ -168,7 +164,7 @@ class Subscription(ErrorHandlingMethodView):
                         type: string
                         format: date-time
                       retroactive:
-                        description: If the retroactive is actiavted for a subscription.
+                        description: If the retroactive is activated for a subscription.
                         type: boolean
                       priority:
                         description: The priority/policyid for the subscription. Stored as policyid.
@@ -238,7 +234,7 @@ class Subscription(ErrorHandlingMethodView):
                   - options
                 properties:
                   options:
-                    description: The values for the new subcription.
+                    description: The values for the new subscription.
                     type: object
                     required:
                       - filter
@@ -261,7 +257,7 @@ class Subscription(ErrorHandlingMethodView):
                         type: string
                         format: date-time
                       retroactive:
-                        description: If the retroactive is actiavted for a subscription.
+                        description: If the retroactive is activated for a subscription.
                         type: boolean
                       priority:
                         description: The priority/policyid for the subscription. Stored as policyid.
@@ -530,7 +526,7 @@ class States(ErrorHandlingMethodView):
             description: Not acceptable
         """
         def generate(vo):
-            for row in list_subscription_rule_states(account=account, vo=vo):
+            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')))
@@ -622,17 +618,25 @@ def blueprint():
     bp = AuthenticatedBlueprint('subscriptions', __name__, url_prefix='/subscriptions')
 
     subscription_id_view = SubscriptionId.as_view('subscription_id')
-    bp.add_url_rule('/Id/<subscription_id>', view_func=subscription_id_view, methods=['get', ])
+    bp.add_url_rule('/id/<subscription_id>', view_func=subscription_id_view, methods=['get', ])
     states_view = States.as_view('states')
-    bp.add_url_rule('/<account>/<name>/Rules/States', view_func=states_view, methods=['get', ])
-    bp.add_url_rule('/<account>/Rules/States', view_func=states_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>/rules/states', view_func=states_view, methods=['get', ])
+    bp.add_url_rule('/<account>/rules/states', view_func=states_view, methods=['get', ])
     rules_view = Rules.as_view('rules')
-    bp.add_url_rule('/<account>/<name>/Rules', view_func=rules_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>/rules', view_func=rules_view, methods=['get', ])
     subscription_view = Subscription.as_view('subscription')
     bp.add_url_rule('/<account>/<name>', view_func=subscription_view, methods=['get', 'post', 'put'])
     bp.add_url_rule('/<account>', view_func=subscription_view, methods=['get', ])
     bp.add_url_rule('/', view_func=subscription_view, methods=['get', ])
     subscription_name_view = SubscriptionName.as_view('subscription_name')
+    bp.add_url_rule('/name/<name>', view_func=subscription_name_view, methods=['get', ])
+
+    # Legacy url support
+    # TODO: Take out with Rucio 38
+    bp.add_url_rule('/Id/<subscription_id>', view_func=subscription_id_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>/Rules/States', view_func=states_view, methods=['get', ])
+    bp.add_url_rule('/<account>/Rules/States', view_func=states_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>/Rules', view_func=rules_view, methods=['get', ])
     bp.add_url_rule('/Name/<name>', view_func=subscription_name_view, methods=['get', ])
 
     bp.after_request(response_headers)

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,15 +18,16 @@ import datetime
 import uuid
 from typing import TYPE_CHECKING
 
-from flask import Flask, Blueprint, request
+from flask import Blueprint, Flask, request
 from werkzeug.datastructures import Headers
 
 from rucio.core.trace import trace
-from rucio.web.rest.flaskapi.v1.common import response_headers, ErrorHandlingMethodView, json_parameters
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, json_parameters, response_headers
 
 if TYPE_CHECKING:
     from typing import Optional
-    from rucio.web.rest.flaskapi.v1.common import HeadersType
+
+    from rucio.web.rest.flaskapi.v1.types import HeadersType
 
 
 class Trace(ErrorHandlingMethodView):

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

@@ -0,0 +1,20 @@
+# Copyright European Organization for Nuclear Research (CERN) since 2012
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from collections.abc import Sequence
+from typing import Union
+
+from werkzeug.datastructures import Headers
+
+HeadersType = Union[Headers, dict[str, str], Sequence[tuple[str, str]]]

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +14,11 @@
 
 from flask import Flask, request
 
-from rucio.api.vo import add_vo, list_vos, recover_vo_root_identity, update_vo
-from rucio.common.exception import AccessDenied, AccountNotFound, Duplicate, VONotFound, UnsupportedOperation
+from rucio.common.exception import AccessDenied, AccountNotFound, Duplicate, UnsupportedOperation, VONotFound
 from rucio.common.utils import render_json
+from rucio.gateway.vo import add_vo, list_vos, recover_vo_root_identity, update_vo
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, check_accept_header_wrapper_flask, \
-    try_stream, generate_http_error_flask, ErrorHandlingMethodView, json_parameters, param_get
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, param_get, response_headers, try_stream
 
 
 class VOs(ErrorHandlingMethodView):

rucio/web/rest/main.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

rucio/web/rest/metrics.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

rucio/web/rest/ping.py

@@ -0,0 +1,27 @@
+# Copyright European Organization for Nuclear Research (CERN) since 2012
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from flask import Flask
+
+from rucio.common.logging import setup_logging
+from rucio.web.rest.flaskapi.v1.ping import blueprint as metrics_blueprint
+
+# Allow to run the /ping endpoint as a separate application on a separate PORT
+
+setup_logging()
+application = Flask(__name__)
+application.register_blueprint(metrics_blueprint(standalone=True))
+
+if __name__ == '__main__':
+    application.run()

{rucio-32.8.6.data → rucio-35.8.0.data}/data/rucio/etc/ldap.cfg.template

@@ -12,7 +12,7 @@ ldap_host = ldap-host.domain.name
 baseDN = dc=foo,dc=bar,dc=domain,dc=
 searchFilter = (objectClass=OpenLDAPperson)
 
-# set as DEFAULT to use annonymous bind
+# set as DEFAULT to use anonymous bind
 username = DEFAULT
 # Leave blank for prompt
 password =

rucio-35.8.0.data/data/rucio/requirements.server.txt

@@ -0,0 +1,268 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile requirements.server.in
+#
+aiohttp==3.9.5
+    # via geoip2
+aiosignal==1.3.1
+    # via aiohttp
+alembic==1.13.2
+    # via -r requirements.server.in
+annotated-types==0.7.0
+    # via pydantic
+argcomplete==3.4.0
+    # via -r requirements.server.in
+async-timeout==4.0.3
+    # via
+    #   aiohttp
+    #   redis
+attrs==23.2.0
+    # via
+    #   aiohttp
+    #   jsonschema
+    #   referencing
+bcrypt==4.1.3
+    # via paramiko
+blinker==1.8.2
+    # via flask
+boto3==1.34.142
+    # via -r requirements.server.in
+botocore==1.34.143
+    # via
+    #   boto3
+    #   s3transfer
+cachetools==5.3.3
+    # via google-auth
+certifi==2024.7.4
+    # via requests
+cffi==1.16.0
+    # via
+    #   cryptography
+    #   pynacl
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
+    # via flask
+cryptography==43.0.1
+    # via
+    #   globus-sdk
+    #   oic
+    #   paramiko
+    #   pyjwt
+    #   pyspnego
+    #   requests-kerberos
+cx-oracle==8.3.0
+    # via -r requirements.server.in
+decorator==5.1.1
+    # via
+    #   dogpile-cache
+    #   gssapi
+defusedxml==0.7.1
+    # via oic
+dnspython==2.6.1
+    # via pymongo
+docopt==0.6.2
+    # via stomp-py
+dogpile-cache==1.2.2
+    # via -r requirements.server.in
+flask==3.0.3
+    # via -r requirements.server.in
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
+future==1.0.0
+    # via pyjwkest
+geoip2==4.8.0
+    # via -r requirements.server.in
+globus-sdk==3.41.0
+    # via -r requirements.server.in
+google-auth==2.32.0
+    # via -r requirements.server.in
+greenlet==3.0.3
+    # via sqlalchemy
+gssapi==1.8.3
+    # via pyspnego
+idna==3.7
+    # via
+    #   requests
+    #   yarl
+importlib-metadata==8.0.0
+    # via flask
+isodate==0.6.1
+    # via python3-saml
+itsdangerous==2.2.0
+    # via flask
+jinja2==3.1.4
+    # via flask
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+jsonschema==4.23.0
+    # via -r requirements.server.in
+jsonschema-specifications==2023.12.1
+    # via jsonschema
+kerberos==1.3.1
+    # via -r requirements.server.in
+krb5==0.5.1
+    # via pyspnego
+libtorrent==2.0.9
+    # via -r requirements.server.in
+lxml==5.2.2
+    # via
+    #   python3-saml
+    #   xmlsec
+mako==1.3.5
+    # via
+    #   alembic
+    #   oic
+markupsafe==2.1.5
+    # via
+    #   jinja2
+    #   mako
+    #   werkzeug
+maxminddb==2.6.2
+    # via geoip2
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
+oic==1.7.0
+    # via -r requirements.server.in
+packaging==24.1
+    # via qbittorrent-api
+paramiko==3.4.1
+    # via -r requirements.server.in
+pbr==6.0.0
+    # via stevedore
+prometheus-client==0.20.0
+    # via -r requirements.server.in
+psycopg2-binary==2.9.9
+    # via -r requirements.server.in
+pyasn1==0.6.0
+    # via
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.4.0
+    # via google-auth
+pycparser==2.22
+    # via cffi
+pycryptodomex==3.20.0
+    # via
+    #   oic
+    #   pyjwkest
+pydantic==2.8.2
+    # via pydantic-settings
+pydantic-core==2.20.1
+    # via pydantic
+pydantic-settings==2.3.4
+    # via oic
+pyjwkest==1.4.2
+    # via oic
+pyjwt[crypto]==2.8.0
+    # via globus-sdk
+pykerberos==1.2.4
+    # via -r requirements.server.in
+pymemcache==4.0.0
+    # via -r requirements.server.in
+pymongo==4.8.0
+    # via -r requirements.server.in
+pymysql==1.1.1
+    # via -r requirements.server.in
+pynacl==1.5.0
+    # via paramiko
+pyspnego[kerberos]==0.11.0
+    # via requests-kerberos
+python-dateutil==2.9.0.post0
+    # via
+    #   -r requirements.server.in
+    #   botocore
+python-dotenv==1.0.1
+    # via pydantic-settings
+python-magic==0.4.27
+    # via -r requirements.server.in
+python-swiftclient==4.6.0
+    # via -r requirements.server.in
+python3-saml==1.16.0
+    # via -r requirements.server.in
+pyyaml==6.0.1
+    # via -r requirements.server.in
+qbittorrent-api==2023.11.57
+    # via -r requirements.server.in
+redis==5.0.7
+    # via -r requirements.server.in
+referencing==0.35.1
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+requests==2.32.3
+    # via
+    #   -r requirements.server.in
+    #   geoip2
+    #   globus-sdk
+    #   oic
+    #   pyjwkest
+    #   python-swiftclient
+    #   qbittorrent-api
+    #   requests-kerberos
+requests-kerberos==0.15.0
+    # via -r requirements.server.in
+rpds-py==0.19.0
+    # via
+    #   jsonschema
+    #   referencing
+rsa==4.9
+    # via google-auth
+s3transfer==0.10.2
+    # via boto3
+six==1.16.0
+    # via
+    #   isodate
+    #   pyjwkest
+    #   python-dateutil
+sqlalchemy==2.0.31
+    # via
+    #   -r requirements.server.in
+    #   alembic
+statsd==4.0.1
+    # via -r requirements.server.in
+stevedore==5.2.0
+    # via dogpile-cache
+stomp-py==8.1.2
+    # via -r requirements.server.in
+tabulate==0.9.0
+    # via -r requirements.server.in
+typing-extensions==4.12.2
+    # via
+    #   alembic
+    #   dogpile-cache
+    #   globus-sdk
+    #   pydantic
+    #   pydantic-core
+    #   sqlalchemy
+urllib3==1.26.19
+    # via
+    #   -r requirements.server.in
+    #   botocore
+    #   qbittorrent-api
+    #   requests
+websocket-client==1.8.0
+    # via stomp-py
+werkzeug==3.0.3
+    # via
+    #   -r requirements.server.in
+    #   flask
+xmlsec==1.3.13
+    # via
+    #   -r requirements.server.in
+    #   python3-saml
+yarl==1.9.4
+    # via aiohttp
+zipp==3.19.2
+    # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

{rucio-32.8.6.data → rucio-35.8.0.data}/data/rucio/tools/bootstrap.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,13 +19,14 @@
 # Verify for default SQLite:
 #   for i in `sqlite3 /tmp/rucio.db ".tables"`; do echo $i:; sqlite3 /tmp/rucio.db "select * from $i"; echo; done
 
-import sys
 import os.path
+import sys
+
 base_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(base_path)
 os.chdir(base_path)
 
-from rucio.db.sqla.util import (build_database, create_base_vo, create_root_account)  # noqa: E402
+from rucio.db.sqla.util import build_database, create_base_vo, create_root_account  # noqa: E402
 
 if __name__ == '__main__':
     build_database()

{rucio-32.8.6.data → rucio-35.8.0.data}/data/rucio/tools/merge_rucio_configs.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +13,11 @@
 # limitations under the License.
 
 import argparse
+import json
 import logging
-from pathlib import Path
-
 import os
-import json
 import sys
+from pathlib import Path
 
 try:
     import yaml
@@ -27,7 +25,6 @@ except ImportError:
     yaml = None
 import configparser
 
-
 # Multi-word sections used in kubernetes are slightly different from what rucio expects.
 # Usually, it's just a .replace('-', '_'), but not for hermes2, which doesn't follow any convention.
 multi_word_sections = {

{rucio-32.8.6.data → rucio-35.8.0.data}/data/rucio/tools/reset_database.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,15 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
 import os.path
+import sys
+
 base_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(base_path)
 os.chdir(base_path)
 
 from argparse import ArgumentParser  # noqa: E402
 
-from rucio.db.sqla.util import build_database, destroy_database, drop_everything, create_root_account, create_base_vo  # noqa: E402
+from rucio.db.sqla.util import build_database, create_base_vo, create_root_account, destroy_database, drop_everything  # noqa: E402
 
 if __name__ == '__main__':