From 128a2f1b24629671203e754cdf7672dc213bd634 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 17:36:40 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- diracx-cli/src/diracx/cli/internal/legacy.py | 6 +++--- diracx-client/src/diracx/client/_serialization.py | 8 +++++--- diracx-core/src/diracx/core/config/__init__.py | 9 +++------ diracx-core/src/diracx/core/exceptions.py | 3 +-- diracx-core/src/diracx/core/properties.py | 1 + diracx-core/src/diracx/core/s3.py | 1 + diracx-db/src/diracx/db/os/utils.py | 3 +-- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/diracx-cli/src/diracx/cli/internal/legacy.py b/diracx-cli/src/diracx/cli/internal/legacy.py index fbdc00b9..995b53df 100644 --- a/diracx-cli/src/diracx/cli/internal/legacy.py +++ b/diracx-cli/src/diracx/cli/internal/legacy.py @@ -289,9 +289,9 @@ def generate_helm_values( # Sandboxstore settings # TODO: Integrate minio for production use (ingress, etc) # By default, take the server hostname and prepend "sandboxes" - diracx_settings[ - "DIRACX_SANDBOX_STORE_BUCKET_NAME" - ] = f"{diracx_hostname.split('.')[0]}-sandboxes" + diracx_settings["DIRACX_SANDBOX_STORE_BUCKET_NAME"] = ( + f"{diracx_hostname.split('.')[0]}-sandboxes" + ) diracx_settings["DIRACX_SANDBOX_STORE_S3_CLIENT_KWARGS"] = json.dumps( { "endpoint_url": "FILL ME", diff --git a/diracx-client/src/diracx/client/_serialization.py b/diracx-client/src/diracx/client/_serialization.py index f5c9e575..03d04398 100644 --- a/diracx-client/src/diracx/client/_serialization.py +++ b/diracx-client/src/diracx/client/_serialization.py @@ -799,9 +799,11 @@ def query(self, name, data, data_type, **kwargs): if data_type.startswith("["): internal_data_type = data_type[1:-1] data = [ - self.serialize_data(d, internal_data_type, **kwargs) - if d is not None - else "" + ( + self.serialize_data(d, internal_data_type, **kwargs) + if d is not None + else "" + ) for d in data ] if not kwargs.get("skip_quote", False): diff --git a/diracx-core/src/diracx/core/config/__init__.py b/diracx-core/src/diracx/core/config/__init__.py index 6f91dc79..e13de328 100644 --- a/diracx-core/src/diracx/core/config/__init__.py +++ b/diracx-core/src/diracx/core/config/__init__.py @@ -49,16 +49,13 @@ class ConfigSource(metaclass=ABCMeta): scheme: str @abstractmethod - def __init__(self, *, backend_url: ConfigSourceUrl) -> None: - ... + def __init__(self, *, backend_url: ConfigSourceUrl) -> None: ... @abstractmethod - def latest_revision(self) -> tuple[str, datetime]: - ... + def latest_revision(self) -> tuple[str, datetime]: ... @abstractmethod - def read_raw(self, hexsha: str, modified: datetime) -> Config: - ... + def read_raw(self, hexsha: str, modified: datetime) -> Config: ... def __init_subclass__(cls) -> None: if cls.scheme in cls.__registry: diff --git a/diracx-core/src/diracx/core/exceptions.py b/diracx-core/src/diracx/core/exceptions.py index 65d143e0..2d045589 100644 --- a/diracx-core/src/diracx/core/exceptions.py +++ b/diracx-core/src/diracx/core/exceptions.py @@ -15,8 +15,7 @@ def __init__(self, detail: str = "Unknown"): self.detail = detail -class AuthorizationError(DiracError): - ... +class AuthorizationError(DiracError): ... class PendingAuthorizationError(AuthorizationError): diff --git a/diracx-core/src/diracx/core/properties.py b/diracx-core/src/diracx/core/properties.py index 8bf80201..7287d319 100644 --- a/diracx-core/src/diracx/core/properties.py +++ b/diracx-core/src/diracx/core/properties.py @@ -1,6 +1,7 @@ """ Just listing the possible Properties This module contains list of Properties that can be assigned to users and groups """ + from __future__ import annotations import inspect diff --git a/diracx-core/src/diracx/core/s3.py b/diracx-core/src/diracx/core/s3.py index 6fc56657..b840f0cd 100644 --- a/diracx-core/src/diracx/core/s3.py +++ b/diracx-core/src/diracx/core/s3.py @@ -1,4 +1,5 @@ """Utilities for interacting with S3-compatible storage.""" + from __future__ import annotations __all__ = ( diff --git a/diracx-db/src/diracx/db/os/utils.py b/diracx-db/src/diracx/db/os/utils.py index 96665201..224c48c0 100644 --- a/diracx-db/src/diracx/db/os/utils.py +++ b/diracx-db/src/diracx/db/os/utils.py @@ -34,8 +34,7 @@ class BaseOSDB(metaclass=ABCMeta): index_prefix: str @abstractmethod - def index_name(self, doc_id: int) -> str: - ... + def index_name(self, doc_id: int) -> str: ... def __init__(self, connection_kwargs: dict[str, Any]) -> None: self._client: AsyncOpenSearch | None = None