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

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

@@ -139,7 +139,7 @@ class AccountScopeList(ErrorHandlingMethodView):
         return jsonify(scopes)
 
 
-def blueprint():
+def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('scopes', __name__, url_prefix='/scopes')
 
     scope_view = Scope.as_view('scope')

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

@@ -169,6 +169,10 @@ class Subscription(ErrorHandlingMethodView):
                       priority:
                         description: "The priority/policyid for the subscription. Stored as policyid."
                         type: integer
+                      state:
+                        description: "The state of the subscription. If not supplied, the state will be set to 'U' (updated)."
+                        type: string
+                        enum: ["A", "I", "N", "U", "B"]
         responses:
           201:
             description: "OK"
@@ -188,6 +192,7 @@ class Subscription(ErrorHandlingMethodView):
             'lifetime': None,
             'retroactive': None,
             'priority': None,
+            'state': None,
         }
         for keyword in list(metadata):
             metadata[keyword] = param_get(options, keyword, default=metadata[keyword])
@@ -614,7 +619,7 @@ class SubscriptionId(ErrorHandlingMethodView):
         return Response(render_json(**subscription), content_type="application/json")
 
 
-def blueprint():
+def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('subscriptions', __name__, url_prefix='/subscriptions')
 
     subscription_id_view = SubscriptionId.as_view('subscription_id')
@@ -631,14 +636,6 @@ def blueprint():
     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)
     return bp
 

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

@@ -118,7 +118,7 @@ class Trace(ErrorHandlingMethodView):
             return generate_http_error_flask(400, err)
 
 
-def blueprint():
+def blueprint() -> Blueprint:
     bp = Blueprint('traces', __name__, url_prefix='/traces')
 
     trace_view = Trace.as_view('trace')

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

@@ -255,7 +255,7 @@ class RecoverVO(ErrorHandlingMethodView):
         return 'Created', 201
 
 
-def blueprint():
+def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('vos', __name__, url_prefix='/vos')
 
     recover_view = RecoverVO.as_view('recover')

{rucio-37.7.0.data → rucio-38.0.0.data}/data/rucio/etc/alembic.ini.template

@@ -18,7 +18,7 @@
 # Choose one of the databases+schema below
 # Oracle, PostgreSQL, MySQL/MariaDB are fully supported
 
-sqlalchemy.url=oracle://user:pass@servicename
+sqlalchemy.url=oracle+oracledb://user:pass@servicename
 version_table_schema=rucio
 
 #sqlalchemy.url=postgresql+psycopg://rucio:rucio@psql-hostname:5432/rucio

{rucio-37.7.0.data → rucio-38.0.0.data}/data/rucio/etc/alembic_offline.ini.template

@@ -18,7 +18,7 @@
 # Choose one of the databases+schema below
 # Oracle, PostgreSQL, MySQL/MariaDB are fully supported
 
-#sqlalchemy.url=oracle://user:pass@servicename
+#sqlalchemy.url=oracle+oracledb://user:pass@servicename
 #version_table_schema=rucio
 
 #sqlalchemy.url=postgresql+psycopg://rucio:rucio@psql-hostname:5432/rucio

{rucio-37.7.0.data → rucio-38.0.0.data}/data/rucio/etc/rucio.cfg.template

@@ -73,8 +73,8 @@ default_mail_from = spamspamspam@cern.ch
 
 [database]
 default = sqlite:////tmp/rucio.db
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
 #schema=atlas_rucio  # only for cern oracle
 #default = mysql+pymysql://rucio:rucio@localhost/rucio
 #default = postgresql+psycopg://rucio:rucio@localhost/rucio

{rucio-37.7.0.data → rucio-38.0.0.data}/data/rucio/etc/rucio_multi_vo.cfg.template

@@ -56,8 +56,8 @@ default_mail_from = spamspamspam@cern.ch
 
 [database]
 default = sqlite:////tmp/rucio.db
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
-#default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=______))(ADDRESS=(PROTOCOL=TCP)(HOST=_________)(PORT=_____))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=__________)))
+#default = oracle+oracledb://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
 #schema=atlas_rucio  # only for cern oracle
 #default = mysql+pymysql://rucio:rucio@localhost/rucio
 #default = postgresql+psycopg://rucio:rucio@localhost/rucio
@@ -213,4 +213,4 @@ idpsecrets = /opt/rucio/etc/idpsecrets.json
 admin_issuer = wlcg
 
 [api]
-endpoints = accountlimits, accounts, config, credentials, dids, export, heartbeats, identities, import, lifetime_exceptions, locks, meta, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, traces, vos
+endpoints = accountlimits, accounts, config, credentials, dids, export, heartbeats, identities, import, lifetime_exceptions, locks, meta_conventions, ping, redirect, replicas, requests, rses, rules, scopes, subscriptions, traces, vos

{rucio-37.7.0.data → rucio-38.0.0.data}/data/rucio/requirements.server.txt

@@ -57,7 +57,7 @@ cryptography==44.0.2
     #   pyjwt
     #   pyspnego
     #   requests-kerberos
-cx-oracle==8.3.0
+oracledb==3.1.1
     # via -r requirements.server.in
 decorator==5.2.1
     # via
@@ -75,7 +75,7 @@ elastic-transport==8.17.0
     # via elasticsearch
 elasticsearch==8.15.1
     # via -r requirements.server.in
-flask==3.1.0
+flask==3.1.1
     # via -r requirements.server.in
 frozenlist==1.5.0
     # via
@@ -89,6 +89,8 @@ globus-sdk==3.41.0
     # via -r requirements.server.in
 google-auth==2.38.0
     # via -r requirements.server.in
+greenlet==3.2.2
+    # via sqlalchemy
 gssapi==1.9.0
     # via pyspnego
 idna==3.10
@@ -129,6 +131,7 @@ markdown-it-py==3.0.0
     # via rich
 markupsafe==3.0.2
     # via
+    #   flask
     #   jinja2
     #   mako
     #   werkzeug
@@ -258,7 +261,7 @@ stomp-py==8.2.0
     # via -r requirements.server.in
 tabulate==0.9.0
     # via -r requirements.server.in
-typing-extensions==4.12.2
+typing-extensions==4.14.0
     # via
     #   alembic
     #   dogpile-cache

rucio-38.0.0.data/data/rucio/tools/reset_database.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+# 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.
+
+"""
+Reset, purge and/or (re)create a Rucio test database.
+
+Behavior
+------------------------+-----------------------+---------------------------+
+ Flag(s)                |  What happens         |  Subsequent actions       |
+------------------------+-----------------------+---------------------------+
+ (no flag)              | drop_orm_tables()     | build_database() +        |
+                        |                       | create_base_vo() +        |
+                        |                       | create_root_account()     |
+------------------------+-----------------------+---------------------------+
+ -b / --purge-build     | purge_db()            | build_database() +        |
+                        |                       | create_base_vo() +        |
+                        |                       | create_root_account()     |
+------------------------+-----------------------+---------------------------+
+ -p / --purge           | purge_db()            | nothing else..            |
+                        |                       | the script ends           |
+------------------------+-----------------------+---------------------------+
+"""
+
+import os.path
+import sys
+from argparse import ArgumentParser
+
+# Ensure package imports work when executed from any cwd
+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 (  # noqa: E402
+    build_database,  # noqa: E402
+    create_base_vo,  # noqa: E402
+    create_root_account,  # noqa: E402
+    drop_orm_tables,  # noqa: E402
+    purge_db,  # noqa: E402
+)
+
+if __name__ == '__main__':
+
+    parser = ArgumentParser(
+        prog="reset_database.py",
+        description="Reset the local Rucio database used in tests."
+    )
+    g = parser.add_mutually_exclusive_group()
+    g.add_argument(
+        "-b", "--purge-build",
+        action="store_true",
+        help="Purge EVERYTHING (tables, constraints, schema) "
+             "and then rebuild a fresh schema with base VO + root account.",
+    )
+    g.add_argument(
+        "-p", "--purge",
+        action="store_true",
+        help="Purge EVERYTHING and stop – do NOT recreate schema or accounts.",
+    )
+    args = parser.parse_args()
+
+    # ------------------------------------------------------------------
+    # 1. Decide how to reset
+    # ------------------------------------------------------------------
+    if args.purge_build or args.purge:
+        purge_db()
+    else:
+        drop_orm_tables()
+
+    # ------------------------------------------------------------------
+    # 2. Decide what to rebuild
+    # ------------------------------------------------------------------
+    if not args.purge:
+        build_database()
+        create_base_vo()
+        create_root_account()

{rucio-37.7.0.data → rucio-38.0.0.data}/scripts/rucio

@@ -54,6 +54,7 @@ def map_legacy_command() -> Optional[list[str]]:
         command_map = {
             "list-file-replicas": ["replica", "list", "file"],
             "list-dataset-replicas": ["replica", "list", "dataset"],
+            "list-datasets-rse": ["replica", "list", "dataset", "--rse"],
             "add-dataset": ["did", "add", "--type dataset"],
             "add-container": ["did", "add", "--type container"],
             "attach": ["did", "content", "add"],
@@ -96,7 +97,7 @@ def map_legacy_command() -> Optional[list[str]]:
 
 
 if __name__ == "__main__":
-    commands = ("account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
+    commands = ("account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download", "opendata")
 
     parser = argparse.ArgumentParser(add_help=False)
     # Check for legacy flag

{rucio-37.7.0.dist-info → rucio-38.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 37.7.0
+Version: 38.0.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -20,51 +20,52 @@ Classifier: Environment :: No Input/Output (Daemon)
 Requires-Python: >=3.9, <4
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: click
-Requires-Dist: requests
-Requires-Dist: urllib3
+Requires-Dist: requests<=2.32.3
+Requires-Dist: urllib3<=1.26.19
 Requires-Dist: dogpile-cache<=1.2.2
-Requires-Dist: packaging
-Requires-Dist: tabulate
-Requires-Dist: jsonschema
-Requires-Dist: rich
-Requires-Dist: typing_extensions
-Requires-Dist: argcomplete
+Requires-Dist: packaging<=24.1
+Requires-Dist: tabulate<=0.9.0
+Requires-Dist: jsonschema<=4.23.0
+Requires-Dist: rich<=13.9.4
+Requires-Dist: typing_extensions<=4.12.2
+Requires-Dist: argcomplete<=3.5.3
 Requires-Dist: boto
-Requires-Dist: python-magic
-Requires-Dist: paramiko
-Requires-Dist: boto3
-Requires-Dist: sqlalchemy
-Requires-Dist: alembic
-Requires-Dist: pymemcache
-Requires-Dist: python-dateutil
-Requires-Dist: stomp-py
-Requires-Dist: statsd
-Requires-Dist: geoip2
-Requires-Dist: google-auth
-Requires-Dist: redis
-Requires-Dist: flask
-Requires-Dist: oic
-Requires-Dist: prometheus_client
+Requires-Dist: python-magic<=0.4.27
+Requires-Dist: paramiko<=3.5.1
+Requires-Dist: boto3<=1.37.5
+Requires-Dist: sqlalchemy<=2.0.38
+Requires-Dist: alembic<=1.14.1
+Requires-Dist: pymemcache<=4.0.0
+Requires-Dist: python-dateutil<=2.9.0.post0
+Requires-Dist: stomp-py<=8.2.0
+Requires-Dist: statsd<=4.0.1
+Requires-Dist: geoip2<=5.0.1
+Requires-Dist: google-auth<=2.38.0
+Requires-Dist: redis<=5.2.1
+Requires-Dist: flask<=3.1.0
+Requires-Dist: oic<=1.7.0
+Requires-Dist: prometheus_client<=0.21.1
 Provides-Extra: oracle
-Requires-Dist: cx_oracle; extra == "oracle"
+Requires-Dist: oracledb<=3.1.1; extra == "oracle"
 Provides-Extra: mongo
-Requires-Dist: pymongo; extra == "mongo"
+Requires-Dist: pymongo<=4.11.2; extra == "mongo"
 Provides-Extra: elastic
-Requires-Dist: elasticsearch; extra == "elastic"
+Requires-Dist: elasticsearch<=8.15.1; extra == "elastic"
 Provides-Extra: postgresql
-Requires-Dist: psycopg[binary,pool]; extra == "postgresql"
+Requires-Dist: psycopg<=3.2.3; extra == "postgresql"
+Requires-Dist: psycopg-binary<=3.2.3; extra == "postgresql"
+Requires-Dist: psycopg-pool<=3.2.3; extra == "postgresql"
 Provides-Extra: mysql
-Requires-Dist: PyMySQL; extra == "mysql"
+Requires-Dist: PyMySQL<=1.1.1; extra == "mysql"
 Provides-Extra: kerberos
-Requires-Dist: kerberos; extra == "kerberos"
-Requires-Dist: pykerberos; extra == "kerberos"
-Requires-Dist: requests-kerberos; extra == "kerberos"
+Requires-Dist: kerberos<=1.3.1; extra == "kerberos"
+Requires-Dist: pykerberos<=1.2.4; extra == "kerberos"
+Requires-Dist: requests-kerberos<=0.15.0; extra == "kerberos"
 Provides-Extra: globus
-Requires-Dist: PyYAML; extra == "globus"
-Requires-Dist: globus-sdk; extra == "globus"
+Requires-Dist: PyYAML<=6.0.2; extra == "globus"
+Requires-Dist: globus-sdk<=3.41.0; extra == "globus"
 Provides-Extra: saml
-Requires-Dist: python3-saml; extra == "saml"
+Requires-Dist: python3-saml<=1.16.0; extra == "saml"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-xdist; extra == "dev"