style: Reformat with new Black version

selfprivacy_api/actions/api_tokens.py

@@ -2,6 +2,7 @@
 App tokens actions.
 The only actions on tokens that are accessible from APIs
 """
+
 from datetime import datetime, timezone
 from typing import Optional
 from pydantic import BaseModel

selfprivacy_api/actions/ssh.py

@@ -1,4 +1,5 @@
 """Actions to manage the SSH."""
+
 from typing import Optional
 from pydantic import BaseModel
 from selfprivacy_api.actions.users import (

selfprivacy_api/actions/system.py

@@ -1,4 +1,5 @@
 """Actions to manage the system."""
+
 import os
 import subprocess
 import pytz

selfprivacy_api/actions/users.py

@@ -1,4 +1,5 @@
 """Actions to manage the users."""
+
 import re
 from typing import Optional
 from pydantic import BaseModel

selfprivacy_api/backup/__init__.py

@@ -1,6 +1,7 @@
 """
 This module contains the controller class for backups.
 """
+
 from datetime import datetime, timedelta, timezone
 import time
 import os

selfprivacy_api/backup/providers/provider.py

@@ -3,7 +3,8 @@ An abstract class for BackBlaze, S3 etc.
 It assumes that while some providers are supported via restic/rclone, others
 may require different backends
 """
-from abc import ABC, abstractmethod
+
+from abc import ABC
 from selfprivacy_api.backup.backuppers import AbstractBackupper
 from selfprivacy_api.graphql.queries.providers import (
     BackupProvider as BackupProviderEnum,

selfprivacy_api/backup/storage.py

@@ -1,6 +1,7 @@
 """
 Module for storing backup related data in redis.
 """
+
 from typing import List, Optional
 from datetime import datetime
 

selfprivacy_api/backup/tasks.py

@@ -1,6 +1,7 @@
 """
 The tasks module contains the worker tasks that are used to back up and restore
 """
+
 from datetime import datetime, timezone
 
 from selfprivacy_api.graphql.common_types.backup import (

selfprivacy_api/graphql/__init__.py

@@ -1,4 +1,5 @@
 """GraphQL API for SelfPrivacy."""
+
 # pylint: disable=too-few-public-methods
 import typing
 from strawberry.permission import BasePermission

selfprivacy_api/graphql/common_types/backup.py

@@ -1,4 +1,5 @@
 """Backup"""
+
 # pylint: disable=too-few-public-methods
 from enum import Enum
 import strawberry

selfprivacy_api/graphql/common_types/jobs.py

@@ -1,4 +1,5 @@
 """Jobs status"""
+
 # pylint: disable=too-few-public-methods
 import datetime
 import typing

selfprivacy_api/graphql/common_types/service.py

@@ -247,9 +247,9 @@ def get_volume_by_id(volume_id: str) -> Optional[StorageVolume]:
     if volume is None:
         return None
     return StorageVolume(
-        total_space=str(volume.fssize)
+        total_space=(
-        if volume.fssize is not None
+            str(volume.fssize) if volume.fssize is not None else str(volume.size)
-        else str(volume.size),
+        ),
         free_space=str(volume.fsavail),
         used_space=str(volume.fsused),
         root=volume.name == "sda1",

selfprivacy_api/graphql/mutations/api_mutations.py

@@ -1,4 +1,5 @@
 """API access mutations"""
+
 # pylint: disable=too-few-public-methods
 import datetime
 import typing

selfprivacy_api/graphql/mutations/job_mutations.py

@@ -1,4 +1,5 @@
 """Manipulate jobs"""
+
 # pylint: disable=too-few-public-methods
 import strawberry
 

selfprivacy_api/graphql/mutations/services_mutations.py

@@ -1,4 +1,5 @@
 """Services mutations"""
+
 # pylint: disable=too-few-public-methods
 import typing
 import strawberry

selfprivacy_api/graphql/mutations/storage_mutations.py

@@ -1,4 +1,5 @@
 """Storage devices mutations"""
+
 import strawberry
 from selfprivacy_api.graphql import IsAuthenticated
 from selfprivacy_api.graphql.common_types.jobs import job_to_api_job

selfprivacy_api/graphql/mutations/system_mutations.py

@@ -1,4 +1,5 @@
 """System management mutations"""
+
 # pylint: disable=too-few-public-methods
 import typing
 import strawberry

selfprivacy_api/graphql/queries/logs.py

@@ -1,4 +1,5 @@
 """System logs"""
+
 from datetime import datetime
 import typing
 import strawberry

selfprivacy_api/graphql/schema.py

@@ -1,4 +1,5 @@
 """GraphQL API for SelfPrivacy."""
+
 # pylint: disable=too-few-public-methods
 
 import asyncio

selfprivacy_api/jobs/__init__.py

@@ -14,6 +14,7 @@ A job is a dictionary with the following keys:
     - error: error message if the job failed
     - result: result of the job
 """
+
 import typing
 import asyncio
 import datetime

selfprivacy_api/jobs/migrate_to_binds.py

@@ -1,4 +1,5 @@
 """Function to perform migration of app data to binds."""
+
 import subprocess
 import pathlib
 import shutil

selfprivacy_api/jobs/upgrade_system.py

@@ -3,6 +3,7 @@ A task to start the system upgrade or rebuild by starting a systemd unit.
 After starting, track the status of the systemd unit and update the Job
 status accordingly.
 """
+
 import subprocess
 from selfprivacy_api.utils.huey import huey
 from selfprivacy_api.jobs import JobStatus, Jobs, Job

selfprivacy_api/migrations/add_roundcube.py

@@ -22,6 +22,6 @@ class AddRoundcube(Migration):
     def migrate(self) -> None:
         with FlakeServiceManager() as manager:
             if "roundcube" not in manager.services:
-                manager.services[
+                manager.services["roundcube"] = (
-                    "roundcube"
+                    "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes&dir=sp-modules/roundcube"
-                ] = "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes&dir=sp-modules/roundcube"
+                )

selfprivacy_api/models/tokens/new_device_key.py

@@ -1,6 +1,7 @@
 """
 New device key used to obtain access token.
 """
+
 from datetime import datetime, timedelta, timezone
 import secrets
 from pydantic import BaseModel

selfprivacy_api/models/tokens/recovery_key.py

@@ -3,6 +3,7 @@ Recovery key used to obtain access token.
 
 Recovery key has a token string, date of creation, optional date of expiration and optional count of uses left.
 """
+
 from datetime import datetime, timezone
 import secrets
 from typing import Optional

selfprivacy_api/models/tokens/token.py

@@ -3,6 +3,7 @@ Model of the access token.
 
 Access token has a token string, device name and date of creation.
 """
+
 from datetime import datetime
 import secrets
 from pydantic import BaseModel

selfprivacy_api/repositories/tokens/redis_tokens_repository.py

@@ -1,6 +1,7 @@
 """
 Token repository using Redis as backend.
 """
+
 from typing import Any, Optional
 from datetime import datetime
 from hashlib import md5

selfprivacy_api/services/bitwarden/__init__.py

@@ -1,4 +1,5 @@
 """Class representing Bitwarden service"""
+
 import base64
 import subprocess
 from typing import List

selfprivacy_api/services/forgejo/__init__.py

@@ -1,4 +1,5 @@
 """Class representing Bitwarden service"""
+
 import base64
 import subprocess
 from typing import List

selfprivacy_api/services/generic_size_counter.py

@@ -1,4 +1,5 @@
 """Generic size counter using pathlib"""
+
 import pathlib
 
 

selfprivacy_api/services/jitsimeet/__init__.py

@@ -1,4 +1,5 @@
 """Class representing Jitsi Meet service"""
+
 import base64
 import subprocess
 from typing import List

selfprivacy_api/services/nextcloud/__init__.py

@@ -1,4 +1,5 @@
 """Class representing Nextcloud service."""
+
 import base64
 import subprocess
 from typing import List

selfprivacy_api/services/ocserv/__init__.py

@@ -1,4 +1,5 @@
 """Class representing ocserv service."""
+
 import base64
 import subprocess
 import typing

selfprivacy_api/services/pleroma/__init__.py

@@ -1,4 +1,5 @@
 """Class representing Nextcloud service."""
+
 import base64
 import subprocess
 from typing import List

selfprivacy_api/services/service.py

@@ -1,4 +1,5 @@
 """Abstract class for a service running on a server"""
+
 from abc import ABC, abstractmethod
 from typing import List, Optional
 

selfprivacy_api/services/test_service/__init__.py

@@ -1,4 +1,5 @@
 """Class representing Bitwarden service"""
+
 import base64
 import subprocess
 

selfprivacy_api/utils/block_devices.py

@@ -1,4 +1,5 @@
 """A block device API wrapping lsblk"""
+
 from __future__ import annotations
 import subprocess
 import json

selfprivacy_api/utils/huey.py

@@ -1,4 +1,5 @@
 """MiniHuey singleton."""
+
 from os import environ
 from huey import RedisHuey
 

selfprivacy_api/utils/singleton_metaclass.py

@@ -3,6 +3,7 @@ Singleton is a creational design pattern, which ensures that only
 one object of its kind exists and provides a single point of access
 to it for any other code.
 """
+
 from threading import Lock
 
 

selfprivacy_api/utils/systemd.py

@@ -1,4 +1,5 @@
 """Generic service status fetcher using systemctl"""
+
 import subprocess
 from typing import List
 

tests/conftest.py

@@ -1,4 +1,5 @@
 """Tests configuration."""
+
 # pylint: disable=redefined-outer-name
 # pylint: disable=unused-argument
 import os

tests/test_services.py

@@ -1,6 +1,7 @@
 """
     Tests for generic service methods
 """
+
 import pytest
 from pytest import raises