Style: aligned black with ruff settings, added pyupgrade

environment.yml

@@ -30,7 +30,7 @@ dependencies:
   - httpx
   - isodate
   - mypy
-  - pydantic =1.10.10
+  - pydantic =1.10.12
   - pytest
   - pytest-asyncio
   - pytest-cov

pyproject.toml

@@ -7,7 +7,15 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
 
 [tool.ruff]
-select = ["E", "F", "B", "I", "PLE"]
+select = [
+    "E",    # pycodestyle errrors
+    "F",    # pyflakes
+    "B",    # flake8-bugbear
+    "I",    # isort
+    "PLE",  # pylint errors
+    "UP",   # pyUpgrade
+    "FLY",  # flynt
+]
 ignore = ["B905", "B008", "B006"]
 line-length = 120
 src = ["src", "tests"]
@@ -17,6 +25,12 @@ exclude = ["src/diracx/client/"]
 # Allow default arguments like, e.g., `data: List[str] = fastapi.Query(None)`.
 extend-immutable-calls = ["fastapi.Depends", "fastapi.Query", "fastapi.Path", "fastapi.Body", "fastapi.Header"]
 
+[tool.black]
+line-length = 120
+
+[tool.isort]
+profile = "black"
+
 [tool.mypy]
 plugins = ["sqlalchemy.ext.mypy.plugin", "pydantic.mypy"]
 exclude = ["^src/diracx/client", "^tests/", "^build/"]

src/diracx/cli/__init__.py

@@ -22,8 +22,8 @@
 @app.async_command()
 async def login(
     vo: str,
-    group: Optional[str] = None,
-    property: Optional[list[str]] = Option(
+    group: Optional[str] = None,  # noqa: UP007
+    property: Optional[list[str]] = Option(  # noqa: UP007
         None, help="Override the default(s) with one or more properties"
     ),
 ):
@@ -61,9 +61,7 @@
             raise RuntimeError("Device authorization flow expired")
 
     CREDENTIALS_PATH.parent.mkdir(parents=True, exist_ok=True)
-    expires = datetime.now(tz=timezone.utc) + timedelta(
-        seconds=response.expires_in - EXPIRES_GRACE_SECONDS
-    )
+    expires = datetime.now(tz=timezone.utc) + timedelta(seconds=response.expires_in - EXPIRES_GRACE_SECONDS)
     credential_data = {
         "access_token": response.access_token,
         # TODO: "refresh_token":
@@ -82,7 +80,7 @@
 
 
 @app.callback()
-def callback(output_format: Optional[str] = None):
+def callback(output_format: Optional[str] = None):  # noqa: UP007
     if "DIRACX_OUTPUT_FORMAT" not in os.environ:
         output_format = output_format or "rich"
     if output_format is not None:

src/diracx/cli/internal.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 from pathlib import Path
 
@@ -47,11 +45,7 @@ def generate_cs(
         IdP=IdpConfig(URL=idp_url, ClientID=idp_client_id),
         DefaultGroup=user_group,
         Users={},
-        Groups={
-            user_group: GroupConfig(
-                JobShare=None, Properties=["NormalUser"], Quota=None, Users=[]
-            )
-        },
+        Groups={user_group: GroupConfig(JobShare=None, Properties=["NormalUser"], Quota=None, Users=[])},
     )
     config = Config(
         Registry={vo: registry},
@@ -105,7 +99,5 @@ def add_user(
     config_data = json.loads(config.json(exclude_unset=True))
     yaml_path.write_text(yaml.safe_dump(config_data))
     repo.index.add([yaml_path.relative_to(repo_path)])
-    repo.index.commit(
-        f"Added user {sub} ({preferred_username}) to vo {vo} and user_group {user_group}"
-    )
+    repo.index.commit(f"Added user {sub} ({preferred_username}) to vo {vo} and user_group {user_group}")
     typer.echo(f"Successfully added user to {config_repo}", err=True)

src/diracx/cli/jobs.py

@@ -104,9 +104,5 @@
 @app.async_command()
 async def submit(jdl: list[FileText]):
     async with Dirac(endpoint="http://localhost:8000") as api:
-        jobs = await api.jobs.submit_bulk_jobs(
-            [x.read() for x in jdl], headers=get_auth_headers()
-        )
-    print(
-        f"Inserted {len(jobs)} jobs with ids: {','.join(map(str, (job.job_id for job in jobs)))}"
-    )
+        jobs = await api.jobs.submit_bulk_jobs([x.read() for x in jdl], headers=get_auth_headers())
+    print(f"Inserted {len(jobs)} jobs with ids: {','.join(map(str, (job.job_id for job in jobs)))}")

src/diracx/client/__init__.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.9.5, generator: @autorest/python@6.4.11)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -7,8 +6,8 @@
 from ._client import Dirac
 
 try:
-    from ._patch import __all__ as _patch_all
     from ._patch import *  # pylint: disable=unused-wildcard-import
+    from ._patch import __all__ as _patch_all
 except ImportError:
     _patch_all = []
 from ._patch import patch_sdk as _patch_sdk

src/diracx/client/_client.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.9.5, generator: @autorest/python@6.4.11)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -40,28 +39,18 @@ def __init__(  # pylint: disable=missing-client-constructor-parameter-credential
         self, *, endpoint: str = "", **kwargs: Any
     ) -> None:
         self._config = DiracConfiguration(**kwargs)
-        self._client: PipelineClient = PipelineClient(
-            base_url=endpoint, config=self._config, **kwargs
-        )
+        self._client: PipelineClient = PipelineClient(base_url=endpoint, config=self._config, **kwargs)
 
-        client_models = {
-            k: v for k, v in _models.__dict__.items() if isinstance(v, type)
-        }
+        client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
         self._serialize.client_side_validation = False
-        self.well_known = WellKnownOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
+        self.well_known = WellKnownOperations(self._client, self._config, self._serialize, self._deserialize)
         self.auth = AuthOperations(  # pylint: disable=abstract-class-instantiated
             self._client, self._config, self._serialize, self._deserialize
         )
-        self.config = ConfigOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.jobs = JobsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
+        self.config = ConfigOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
 
     def send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.

src/diracx/client/_configuration.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 # --------------------------------------------------------------------------
 # Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.9.5, generator: @autorest/python@6.4.11)
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -20,30 +19,18 @@ class DiracConfiguration(Configuration):  # pylint: disable=too-many-instance-at
     """
 
     def __init__(self, **kwargs: Any) -> None:
-        super(DiracConfiguration, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
-        kwargs.setdefault("sdk_moniker", "dirac/{}".format(VERSION))
+        kwargs.setdefault("sdk_moniker", f"dirac/{VERSION}")
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
-        self.user_agent_policy = kwargs.get(
-            "user_agent_policy"
-        ) or policies.UserAgentPolicy(**kwargs)
-        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(
-            **kwargs
-        )
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
         self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
-        self.logging_policy = kwargs.get(
-            "logging_policy"
-        ) or policies.NetworkTraceLoggingPolicy(**kwargs)
-        self.http_logging_policy = kwargs.get(
-            "http_logging_policy"
-        ) or policies.HttpLoggingPolicy(**kwargs)
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs)
         self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
-        self.custom_hook_policy = kwargs.get(
-            "custom_hook_policy"
-        ) or policies.CustomHookPolicy(**kwargs)
-        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(
-            **kwargs
-        )
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
         self.authentication_policy = kwargs.get("authentication_policy")

src/diracx/client/_patch.py

@@ -8,9 +8,7 @@
 """
 from typing import List
 
-__all__: List[
-    str
-] = []  # Add all objects you want publicly available to users at this package level
+__all__: list[str] = []  # Add all objects you want publicly available to users at this package level
 
 
 def patch_sdk():