rucio 35.7.0__py3-none-any.whl → 37.0.0__py3-none-any.whl

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

@@ -13,16 +13,16 @@
 # limitations under the License.
 
 
-import calendar
 import datetime
+import json
 import uuid
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 
 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 ErrorHandlingMethodView, json_parameters, response_headers
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, response_headers
 
 if TYPE_CHECKING:
     from typing import Optional
@@ -32,6 +32,36 @@ if TYPE_CHECKING:
 
 class Trace(ErrorHandlingMethodView):
 
+    def __handle_payload_item(self, payload: dict) -> None:
+        """
+        Handles and processes a single trace payload item by adding various trace information.
+
+        Args:
+          payload (dict): The payload dictionary to be processed.
+
+        Modifies:
+          payload (dict): Adds the following keys to the payload:
+            - 'traceTimeentry': The current UTC timestamp.
+            - 'traceTimeentryUnix': The Unix timestamp with microsecond precision.
+            - 'traceIp': The client's IP address, either from 'X-Forwarded-For' header or remote address.
+            - 'traceId': A unique identifier for the trace, generated as a UUID without hyphens.
+
+        Calls:
+          trace(payload): A function to handle the processed payload.
+        """
+        # generate entry timestamp
+        payload["traceTimeentry"] = datetime.datetime.now(datetime.timezone.utc)
+        payload["traceTimeentryUnix"] = payload["traceTimeentry"].timestamp()
+
+        # guess client IP
+        payload["traceIp"] = request.headers.get(
+            "X-Forwarded-For", default=request.remote_addr
+        )
+
+        # generate unique ID
+        payload["traceId"] = str(uuid.uuid4()).replace("-", "").lower()
+        trace(payload=payload)
+
     def get_headers(self) -> "Optional[HeadersType]":
         headers = Headers()
         headers.set('Content-Type', 'application/octet-stream')
@@ -57,8 +87,13 @@ class Trace(ErrorHandlingMethodView):
           content:
             application/json:
               schema:
-                description: The trace information.
+          oneOf:
+            - type: object
+              description: A single trace object.
+            - type: array
+              items:
                 type: object
+              description: A list of trace objects.
         responses:
           201:
             description: OK
@@ -66,21 +101,23 @@ class Trace(ErrorHandlingMethodView):
             description: Cannot decode json data.
         """
         headers = self.get_headers()
-        payload = json_parameters()
-
-        # generate entry timestamp
-        payload['traceTimeentry'] = datetime.datetime.utcnow()
-        payload['traceTimeentryUnix'] = calendar.timegm(payload['traceTimeentry'].timetuple()) + payload['traceTimeentry'].microsecond / 1e6
-
-        # guess client IP
-        payload['traceIp'] = request.headers.get('X-Forwarded-For', default=request.remote_addr)
-
-        # generate unique ID
-        payload['traceId'] = str(uuid.uuid4()).replace('-', '').lower()
-
-        trace(payload=payload)
-
-        return 'Created', 201, headers
+        req_body: str = request.get_data(as_text=True)
+        payload: Union[list, dict, None] = json.loads(req_body) if req_body else None
+
+        if payload is None:
+            return (
+                "Invalid JSON data. Please provide a single trace as a JSON object or a list of trace objects.",
+                400,
+                headers,
+            )
+
+        if isinstance(payload, list):
+            for item in payload:
+                self.__handle_payload_item(item)
+        else:
+            self.__handle_payload_item(payload)
+
+        return "Created", 201, headers
 
 
 def blueprint():

{rucio-35.7.0.data → rucio-37.0.0.data}/data/rucio/etc/alembic.ini.template

@@ -21,7 +21,7 @@
 sqlalchemy.url=oracle://user:pass@servicename
 version_table_schema=rucio
 
-#sqlalchemy.url=postgresql://rucio:rucio@psql-hostname:5432/rucio
+#sqlalchemy.url=postgresql+psycopg://rucio:rucio@psql-hostname:5432/rucio
 #version_table_schema=rucio
 
 #sqlalchemy.url=mysql+pymysql://rucio:rucio@rucio-hostname:3306/rucio

{rucio-35.7.0.data → rucio-37.0.0.data}/data/rucio/etc/alembic_offline.ini.template

@@ -21,7 +21,7 @@
 #sqlalchemy.url=oracle://user:pass@servicename
 #version_table_schema=rucio
 
-#sqlalchemy.url=postgresql://rucio:rucio@psql-hostname:5432/rucio
+#sqlalchemy.url=postgresql+psycopg://rucio:rucio@psql-hostname:5432/rucio
 #version_table_schema=rucio
 
 #sqlalchemy.url=mysql+pymysql://rucio:rucio@rucio-hostname:3306/rucio

{rucio-35.7.0.data → rucio-37.0.0.data}/data/rucio/etc/rucio.cfg.atlas.client.template

@@ -29,8 +29,9 @@ request_retries = 3
 auth_type = x509_proxy
 
 [policy]
-permission = atlas
-schema = atlas
+package = atlas_rucio_policy_package
+#permission = atlas
+#schema = atlas
 lfn2pfn_algorithm_default = hash
 support = hn-atlas-dist-analysis-help@cern.ch
 support_rucio = https://github.com/rucio/rucio/issues/

{rucio-35.7.0.data → rucio-37.0.0.data}/data/rucio/etc/rucio.cfg.template

@@ -77,7 +77,7 @@ default = sqlite:////tmp/rucio.db
 #default = oracle://_____________:___________@(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://rucio:rucio@localhost/rucio
+#default = postgresql+psycopg://rucio:rucio@localhost/rucio
 pool_recycle=3600
 echo=0
 pool_reset_on_return=rollback
@@ -211,27 +211,11 @@ fts_servers = https://fts3-pilot.cern.ch:8446, https://fts3-devel.cern.ch:8446,
 cache = /opt/rucio/auditor-cache
 results = /opt/rucio/auditor-results
 
-[c3po]
-placement_algorithm = t2_free_space
-elastic_url = http://aianalytics01.cern.ch:9200
-redis_host = localhost
-redis_port = 6379
-
-[c3po-popularity]
-elastic_url = http://rucio-logger-prod-01.cern.ch:9200
-
-[c3po-site-mapper]
-panda_url = http://atlas-agis-api.cern.ch/request/pandaqueue/query/list/?json
-ddm_url = http://atlas-agis-api.cern.ch/request/ddmendpoint/query/list/?json
-
-[c3po-workload]
-panda_url = http://bigpanda.cern.ch/jobs/?category=analysis&jobstatus=running
-window = 604800
-
 [policy]
-package = ATLASRucioPolicy
+package = atlas_rucio_policy_package
 permission = atlas
 schema = atlas
+extract_scope = atlas
 lfn2pfn_algorithm_default = hash
 support = hn-atlas-dist-analysis-help@cern.ch
 support_rucio = https://github.com/rucio/rucio/issues/

{rucio-35.7.0.data → rucio-37.0.0.data}/data/rucio/etc/rucio_multi_vo.cfg.template

@@ -60,7 +60,7 @@ default = sqlite:////tmp/rucio.db
 #default = oracle://_____________:___________@(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://rucio:rucio@localhost/rucio
+#default = postgresql+psycopg://rucio:rucio@localhost/rucio
 pool_recycle=3600
 echo=0
 pool_reset_on_return=rollback
@@ -191,23 +191,6 @@ fts_servers = https://fts3-pilot.cern.ch:8446, https://fts3-devel.cern.ch:8446,
 cache = /opt/rucio/auditor-cache
 results = /opt/rucio/auditor-results
 
-[c3po]
-placement_algorithm = t2_free_space
-elastic_url = http://aianalytics01.cern.ch:9200
-redis_host = localhost
-redis_port = 6379
-
-[c3po-popularity]
-elastic_url = http://rucio-logger-prod-01.cern.ch:9200
-
-[c3po-site-mapper]
-panda_url = http://atlas-agis-api.cern.ch/request/pandaqueue/query/list/?json
-ddm_url = http://atlas-agis-api.cern.ch/request/ddmendpoint/query/list/?json
-
-[c3po-workload]
-panda_url = http://bigpanda.cern.ch/jobs/?category=analysis&jobstatus=running
-window = 604800
-
 [policy]
 #package = GenericMultiVORucioPolicy #doesn't exist
 permission = generic_multi_vo

{rucio-35.7.0.data → rucio-37.0.0.data}/data/rucio/requirements.server.txt

@@ -2,50 +2,54 @@
 # This file is autogenerated by pip-compile with Python 3.9
 # by the following command:
 #
-#    pip-compile requirements.server.in
+#    pip-compile --strip-extras requirements.server.in
 #
-aiohttp==3.9.5
+aiohappyeyeballs==2.5.0
+    # via aiohttp
+aiohttp==3.11.13
     # via geoip2
-aiosignal==1.3.1
+aiosignal==1.3.2
     # via aiohttp
-alembic==1.13.2
+alembic==1.14.1
     # via -r requirements.server.in
 annotated-types==0.7.0
     # via pydantic
-argcomplete==3.4.0
+argcomplete==3.5.3
     # via -r requirements.server.in
-async-timeout==4.0.3
+async-timeout==5.0.1
     # via
     #   aiohttp
     #   redis
-attrs==23.2.0
+attrs==25.1.0
     # via
     #   aiohttp
     #   jsonschema
     #   referencing
-bcrypt==4.1.3
+bcrypt==4.3.0
     # via paramiko
-blinker==1.8.2
+blinker==1.9.0
     # via flask
-boto3==1.34.142
+boto3==1.37.5
     # via -r requirements.server.in
-botocore==1.34.143
+botocore==1.37.7
     # via
     #   boto3
     #   s3transfer
-cachetools==5.3.3
+cachetools==5.5.2
     # via google-auth
-certifi==2024.7.4
-    # via requests
-cffi==1.16.0
+certifi==2025.1.31
+    # via
+    #   elastic-transport
+    #   requests
+cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.2
+charset-normalizer==3.4.1
     # via requests
-click==8.1.7
+click==8.1.8
     # via flask
-cryptography==43.0.1
+cryptography==44.0.2
     # via
     #   globus-sdk
     #   oic
@@ -55,47 +59,49 @@ cryptography==43.0.1
     #   requests-kerberos
 cx-oracle==8.3.0
     # via -r requirements.server.in
-decorator==5.1.1
+decorator==5.2.1
     # via
     #   dogpile-cache
     #   gssapi
 defusedxml==0.7.1
     # via oic
-dnspython==2.6.1
+dnspython==2.7.0
     # via pymongo
 docopt==0.6.2
     # via stomp-py
 dogpile-cache==1.2.2
     # via -r requirements.server.in
-flask==3.0.3
+elastic-transport==8.17.0
+    # via elasticsearch
+elasticsearch==8.15.1
     # via -r requirements.server.in
-frozenlist==1.4.1
+flask==3.1.0
+    # via -r requirements.server.in
+frozenlist==1.5.0
     # via
     #   aiohttp
     #   aiosignal
 future==1.0.0
     # via pyjwkest
-geoip2==4.8.0
+geoip2==5.0.1
     # via -r requirements.server.in
 globus-sdk==3.41.0
     # via -r requirements.server.in
-google-auth==2.32.0
+google-auth==2.38.0
     # via -r requirements.server.in
-greenlet==3.0.3
-    # via sqlalchemy
-gssapi==1.8.3
+gssapi==1.9.0
     # via pyspnego
-idna==3.7
+idna==3.10
     # via
     #   requests
     #   yarl
-importlib-metadata==8.0.0
+importlib-metadata==8.6.1
     # via flask
-isodate==0.6.1
+isodate==0.7.2
     # via python3-saml
 itsdangerous==2.2.0
     # via flask
-jinja2==3.1.4
+jinja2==3.1.6
     # via flask
 jmespath==1.0.1
     # via
@@ -103,78 +109,94 @@ jmespath==1.0.1
     #   botocore
 jsonschema==4.23.0
     # via -r requirements.server.in
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via jsonschema
 kerberos==1.3.1
     # via -r requirements.server.in
-krb5==0.5.1
+krb5==0.7.1
     # via pyspnego
-libtorrent==2.0.9
+libtorrent==2.0.11
     # via -r requirements.server.in
-lxml==5.2.2
+lxml==5.3.1
     # via
     #   python3-saml
     #   xmlsec
-mako==1.3.5
+mako==1.3.9
     # via
     #   alembic
     #   oic
-markupsafe==2.1.5
+markdown-it-py==3.0.0
+    # via rich
+markupsafe==3.0.2
     # via
     #   jinja2
     #   mako
     #   werkzeug
-maxminddb==2.6.2
+maxminddb==2.6.3
     # via geoip2
-multidict==6.0.5
+mdurl==0.1.2
+    # via markdown-it-py
+multidict==6.1.0
     # via
     #   aiohttp
     #   yarl
 oic==1.7.0
     # via -r requirements.server.in
 packaging==24.1
-    # via qbittorrent-api
-paramiko==3.4.0
+    # via
+    #   -r requirements.server.in
+    #   qbittorrent-api
+paramiko==3.5.1
     # via -r requirements.server.in
-pbr==6.0.0
+pbr==6.1.1
     # via stevedore
-prometheus-client==0.20.0
+prometheus-client==0.21.1
     # via -r requirements.server.in
-psycopg2-binary==2.9.9
+propcache==0.3.0
+    # via
+    #   aiohttp
+    #   yarl
+psycopg==3.2.3 ; implementation_name == "cpython"
     # via -r requirements.server.in
-pyasn1==0.6.0
+psycopg-binary==3.2.3
+    # via psycopg
+psycopg-pool==3.2.4
+    # via psycopg
+pyasn1==0.6.1
     # via
     #   pyasn1-modules
     #   rsa
-pyasn1-modules==0.4.0
+pyasn1-modules==0.4.1
     # via google-auth
 pycparser==2.22
     # via cffi
-pycryptodomex==3.20.0
+pycryptodomex==3.21.0
     # via
     #   oic
     #   pyjwkest
-pydantic==2.8.2
+pydantic==2.10.6
     # via pydantic-settings
-pydantic-core==2.20.1
+pydantic-core==2.27.2
     # via pydantic
-pydantic-settings==2.3.4
+pydantic-settings==2.8.1
     # via oic
+pygments==2.19.1
+    # via rich
 pyjwkest==1.4.2
     # via oic
-pyjwt[crypto]==2.8.0
+pyjwt==2.10.1
     # 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
+pymongo==4.11.2
     # 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
+pyspnego==0.11.2
     # via requests-kerberos
 python-dateutil==2.9.0.post0
     # via
@@ -184,17 +206,17 @@ python-dotenv==1.0.1
     # via pydantic-settings
 python-magic==0.4.27
     # via -r requirements.server.in
-python-swiftclient==4.6.0
+python-swiftclient==4.7.0
     # via -r requirements.server.in
 python3-saml==1.16.0
     # via -r requirements.server.in
-pyyaml==6.0.1
+pyyaml==6.0.2
     # via -r requirements.server.in
-qbittorrent-api==2023.11.57
+qbittorrent-api==2025.2.0
     # via -r requirements.server.in
-redis==5.0.7
+redis==5.2.1
     # via -r requirements.server.in
-referencing==0.35.1
+referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -210,28 +232,29 @@ requests==2.32.3
     #   requests-kerberos
 requests-kerberos==0.15.0
     # via -r requirements.server.in
-rpds-py==0.19.0
+rich==13.9.4
+    # via -r requirements.server.in
+rpds-py==0.23.1
     # via
     #   jsonschema
     #   referencing
 rsa==4.9
     # via google-auth
-s3transfer==0.10.2
+s3transfer==0.11.4
     # via boto3
-six==1.16.0
+six==1.17.0
     # via
-    #   isodate
     #   pyjwkest
     #   python-dateutil
-sqlalchemy==2.0.31
+sqlalchemy==2.0.38
     # via
     #   -r requirements.server.in
     #   alembic
 statsd==4.0.1
     # via -r requirements.server.in
-stevedore==5.2.0
+stevedore==5.4.1
     # via dogpile-cache
-stomp-py==8.1.2
+stomp-py==8.2.0
     # via -r requirements.server.in
 tabulate==0.9.0
     # via -r requirements.server.in
@@ -240,18 +263,24 @@ typing-extensions==4.12.2
     #   alembic
     #   dogpile-cache
     #   globus-sdk
+    #   multidict
+    #   psycopg
+    #   psycopg-pool
     #   pydantic
     #   pydantic-core
+    #   referencing
+    #   rich
     #   sqlalchemy
 urllib3==1.26.19
     # via
     #   -r requirements.server.in
     #   botocore
+    #   elastic-transport
     #   qbittorrent-api
     #   requests
 websocket-client==1.8.0
     # via stomp-py
-werkzeug==3.0.3
+werkzeug==3.1.3
     # via
     #   -r requirements.server.in
     #   flask
@@ -259,9 +288,9 @@ xmlsec==1.3.13
     # via
     #   -r requirements.server.in
     #   python3-saml
-yarl==1.9.4
+yarl==1.18.3
     # via aiohttp
-zipp==3.19.2
+zipp==3.21.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file: