fix: from typing import, in place of import typing

selfprivacy_api/graphql/__init__.py

@@ -1,7 +1,7 @@
 """GraphQL API for SelfPrivacy."""
 
 # pylint: disable=too-few-public-methods
-import typing
+from typing import Any
 from strawberry.permission import BasePermission
 from strawberry.types import Info
 
@@ -13,7 +13,7 @@ class IsAuthenticated(BasePermission):
 
     message = "You must be authenticated to access this resource."
 
-    def has_permission(self, source: typing.Any, info: Info, **kwargs) -> bool:
+    def has_permission(self, source: Any, info: Info, **kwargs) -> bool:
         token = info.context["request"].headers.get("Authorization")
         if token is None:
             token = info.context["request"].query_params.get("token")

selfprivacy_api/graphql/common_types/dns.py

@@ -1,4 +1,4 @@
-import typing
+from typing import Optional
 import strawberry
 
 
@@ -11,5 +11,5 @@ class DnsRecord:
     name: str
     content: str
     ttl: int
-    priority: typing.Optional[int]
+    priority: Optional[int]
     display_name: str

selfprivacy_api/graphql/common_types/jobs.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=too-few-public-methods
 import datetime
-import typing
+from typing import Optional
 import strawberry
 
 from selfprivacy_api.jobs import Job, Jobs
@@ -17,13 +17,13 @@ class ApiJob:
     name: str
     description: str
     status: str
-    status_text: typing.Optional[str]
-    progress: typing.Optional[int]
+    status_text: Optional[str]
+    progress: Optional[int]
     created_at: datetime.datetime
     updated_at: datetime.datetime
-    finished_at: typing.Optional[datetime.datetime]
-    error: typing.Optional[str]
-    result: typing.Optional[str]
+    finished_at: Optional[datetime.datetime]
+    error: Optional[str]
+    result: Optional[str]
 
 
 def job_to_api_job(job: Job) -> ApiJob:
@@ -44,7 +44,7 @@ def job_to_api_job(job: Job) -> ApiJob:
     )
 
 
-def get_api_job_by_id(job_id: str) -> typing.Optional[ApiJob]:
+def get_api_job_by_id(job_id: str) -> Optional[ApiJob]:
     """Get a job for GraphQL by its ID."""
     job = Jobs.get_job(job_id)
     if job is None:

selfprivacy_api/graphql/common_types/user.py

@@ -40,7 +40,7 @@ class UserMutationReturn(MutationReturnInterface):
     user: Optional[User] = None
 
 
-def get_user_by_username(username: str) -> typing.Optional[User]:
+def get_user_by_username(username: str) -> Optional[User]:
     user = actions_get_user_by_username(username=username)
     if user is None:
         return None
@@ -57,7 +57,7 @@ def get_user_by_username(username: str) -> typing.Optional[User]:
     )
 
 
-def get_users() -> typing.List[User]:
+def get_users() -> list[User]:
     """Get users"""
     users = actions_get_users(exclude_root=True)
     return [

selfprivacy_api/graphql/mutations/api_mutations.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=too-few-public-methods
 import datetime
-import typing
+from typing import Optional
 import strawberry
 from strawberry.types import Info
 from selfprivacy_api.actions.api_tokens import (
@@ -27,20 +27,20 @@ from selfprivacy_api.graphql.mutations.mutation_interface import (
 
 @strawberry.type
 class ApiKeyMutationReturn(MutationReturnInterface):
-    key: typing.Optional[str]
+    key: Optional[str]
 
 
 @strawberry.type
 class DeviceApiTokenMutationReturn(MutationReturnInterface):
-    token: typing.Optional[str]
+    token: Optional[str]
 
 
 @strawberry.input
 class RecoveryKeyLimitsInput:
     """Recovery key limits input"""
 
-    expiration_date: typing.Optional[datetime.datetime] = None
-    uses: typing.Optional[int] = None
+    expiration_date: Optional[datetime.datetime] = None
+    uses: Optional[int] = None
 
 
 @strawberry.input
@@ -63,7 +63,7 @@ class UseNewDeviceKeyInput:
 class ApiMutations:
     @strawberry.mutation(permission_classes=[IsAuthenticated])
     def get_new_recovery_api_key(
-        self, limits: typing.Optional[RecoveryKeyLimitsInput] = None
+        self, limits: Optional[RecoveryKeyLimitsInput] = None
     ) -> ApiKeyMutationReturn:
         """Generate recovery key"""
         if limits is None:

selfprivacy_api/graphql/mutations/mutation_interface.py

@@ -1,5 +1,5 @@
+from typing import Optional
 import strawberry
-import typing
 
 from selfprivacy_api.graphql.common_types.jobs import ApiJob
 
@@ -18,4 +18,4 @@ class GenericMutationReturn(MutationReturnInterface):
 
 @strawberry.type
 class GenericJobMutationReturn(MutationReturnInterface):
-    job: typing.Optional[ApiJob] = None
+    job: Optional[ApiJob] = None

selfprivacy_api/graphql/mutations/services_mutations.py

@@ -1,7 +1,7 @@
 """Services mutations"""
 
 # pylint: disable=too-few-public-methods
-import typing
+from typing import Optional
 import strawberry
 
 from selfprivacy_api.utils import pretty_error
@@ -33,7 +33,7 @@ from selfprivacy_api.services import ServiceManager
 class ServiceMutationReturn(GenericMutationReturn):
     """Service mutation return type."""
 
-    service: typing.Optional[Service] = None
+    service: Optional[Service] = None
 
 
 @strawberry.input
@@ -93,7 +93,7 @@ class MoveServiceInput:
 class ServiceJobMutationReturn(GenericJobMutationReturn):
     """Service job mutation return type."""
 
-    service: typing.Optional[Service] = None
+    service: Optional[Service] = None
 
 
 @strawberry.type

selfprivacy_api/graphql/mutations/system_mutations.py

@@ -1,7 +1,7 @@
 """System management mutations"""
 
 # pylint: disable=too-few-public-methods
-import typing
+from typing import Optional
 import strawberry
 
 from selfprivacy_api.utils import pretty_error
@@ -26,7 +26,7 @@ from selfprivacy_api.actions.system import set_dns_provider
 class TimezoneMutationReturn(MutationReturnInterface):
     """Return type of the timezone mutation, contains timezone"""
 
-    timezone: typing.Optional[str]
+    timezone: Optional[str]
 
 
 @strawberry.type
@@ -65,8 +65,8 @@ class SetDnsProviderInput:
 class AutoUpgradeSettingsInput:
     """Input type for auto upgrade settings"""
 
-    enableAutoUpgrade: typing.Optional[bool] = None
-    allowReboot: typing.Optional[bool] = None
+    enableAutoUpgrade: Optional[bool] = None
+    allowReboot: Optional[bool] = None
 
 
 @strawberry.type

selfprivacy_api/graphql/queries/common.py

@@ -2,7 +2,7 @@
 
 from enum import Enum
 import datetime
-import typing
+from typing import Optional
 import strawberry
 
 
@@ -28,4 +28,4 @@ class Alert:
     severity: Severity
     title: str
     message: str
-    timestamp: typing.Optional[datetime.datetime]
+    timestamp: Optional[datetime.datetime]

selfprivacy_api/utils/__init__.py

@@ -6,7 +6,7 @@ import json
 import os
 import subprocess
 import portalocker
-import typing
+from typing import Optional
 import glob
 
 from traceback import format_tb as format_traceback
@@ -217,7 +217,7 @@ def parse_dkim(dkim: str) -> str:
     return dkim
 
 
-def get_dkim_key(domain: str, parse: bool = True) -> typing.Optional[str]:
+def get_dkim_key(domain: str, parse: bool = True) -> Optional[str]:
     """Get DKIM key from /var/dkim/<domain>.selector.txt"""
 
     dkim_path = os.path.join(DKIM_DIR, domain + ".selector.txt")