diff --git a/authentik/blueprints/v1/tasks.py b/authentik/blueprints/v1/tasks.py index f2e98addb2..a78ea722f6 100644 --- a/authentik/blueprints/v1/tasks.py +++ b/authentik/blueprints/v1/tasks.py @@ -1,7 +1,5 @@ """v1 blueprints tasks""" -from django.utils.translation import gettext_lazy as _ - from dataclasses import asdict, dataclass, field from hashlib import sha512 from pathlib import Path @@ -12,6 +10,7 @@ from dacite.core import from_dict from django.db import DatabaseError, InternalError, ProgrammingError from django.utils.text import slugify from django.utils.timezone import now +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask, CurrentTaskNotFound from dramatiq.actor import actor from dramatiq.middleware import Middleware diff --git a/authentik/core/tasks.py b/authentik/core/tasks.py index 893318af16..1f398dc8b0 100644 --- a/authentik/core/tasks.py +++ b/authentik/core/tasks.py @@ -1,10 +1,9 @@ """authentik core tasks""" -from django.utils.translation import gettext_lazy as _ - from datetime import datetime, timedelta from django.utils.timezone import now +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from structlog.stdlib import get_logger diff --git a/authentik/crypto/tasks.py b/authentik/crypto/tasks.py index 63d677e932..5012aac1a5 100644 --- a/authentik/crypto/tasks.py +++ b/authentik/crypto/tasks.py @@ -1,13 +1,12 @@ """Crypto tasks""" -from django.utils.translation import gettext_lazy as _ - from glob import glob from pathlib import Path from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives.serialization import load_pem_private_key from cryptography.x509.base import load_pem_x509_certificate +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from structlog.stdlib import get_logger diff --git a/authentik/enterprise/policies/unique_password/tasks.py b/authentik/enterprise/policies/unique_password/tasks.py index 45bb71aa84..43fcd40541 100644 --- a/authentik/enterprise/policies/unique_password/tasks.py +++ b/authentik/enterprise/policies/unique_password/tasks.py @@ -1,8 +1,8 @@ from django.db.models.aggregates import Count +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from structlog import get_logger -from django.utils.translation import gettext_lazy as _ from authentik.enterprise.policies.unique_password.models import ( UniquePasswordPolicy, diff --git a/authentik/enterprise/providers/google_workspace/api/providers.py b/authentik/enterprise/providers/google_workspace/api/providers.py index 72c6d253d0..98b18fd0be 100644 --- a/authentik/enterprise/providers/google_workspace/api/providers.py +++ b/authentik/enterprise/providers/google_workspace/api/providers.py @@ -7,7 +7,6 @@ from authentik.core.api.used_by import UsedByMixin from authentik.enterprise.api import EnterpriseRequiredMixin from authentik.enterprise.providers.google_workspace.models import GoogleWorkspaceProvider from authentik.enterprise.providers.google_workspace.tasks import ( - google_workspace_sync, google_workspace_sync_objects, ) from authentik.lib.sync.outgoing.api import OutgoingSyncProviderStatusMixin diff --git a/authentik/enterprise/providers/google_workspace/tasks.py b/authentik/enterprise/providers/google_workspace/tasks.py index 7be8a9d461..00e9118513 100644 --- a/authentik/enterprise/providers/google_workspace/tasks.py +++ b/authentik/enterprise/providers/google_workspace/tasks.py @@ -1,10 +1,10 @@ """Google Provider tasks""" +from django.utils.translation import gettext_lazy as _ from dramatiq.actor import actor from authentik.enterprise.providers.google_workspace.models import GoogleWorkspaceProvider from authentik.lib.sync.outgoing.tasks import SyncTasks -from django.utils.translation import gettext_lazy as _ sync_tasks = SyncTasks(GoogleWorkspaceProvider) diff --git a/authentik/enterprise/providers/microsoft_entra/api/providers.py b/authentik/enterprise/providers/microsoft_entra/api/providers.py index df9877e847..5124d07dce 100644 --- a/authentik/enterprise/providers/microsoft_entra/api/providers.py +++ b/authentik/enterprise/providers/microsoft_entra/api/providers.py @@ -7,7 +7,6 @@ from authentik.core.api.used_by import UsedByMixin from authentik.enterprise.api import EnterpriseRequiredMixin from authentik.enterprise.providers.microsoft_entra.models import MicrosoftEntraProvider from authentik.enterprise.providers.microsoft_entra.tasks import ( - microsoft_entra_sync, microsoft_entra_sync_objects, ) from authentik.lib.sync.outgoing.api import OutgoingSyncProviderStatusMixin diff --git a/authentik/enterprise/providers/microsoft_entra/tasks.py b/authentik/enterprise/providers/microsoft_entra/tasks.py index 908d8f57f4..0c0f922f9f 100644 --- a/authentik/enterprise/providers/microsoft_entra/tasks.py +++ b/authentik/enterprise/providers/microsoft_entra/tasks.py @@ -1,10 +1,10 @@ """Microsoft Entra Provider tasks""" +from django.utils.translation import gettext_lazy as _ from dramatiq.actor import actor from authentik.enterprise.providers.microsoft_entra.models import MicrosoftEntraProvider from authentik.lib.sync.outgoing.tasks import SyncTasks -from django.utils.translation import gettext_lazy as _ sync_tasks = SyncTasks(MicrosoftEntraProvider) diff --git a/authentik/enterprise/providers/ssf/tasks.py b/authentik/enterprise/providers/ssf/tasks.py index c550308650..d842cc287a 100644 --- a/authentik/enterprise/providers/ssf/tasks.py +++ b/authentik/enterprise/providers/ssf/tasks.py @@ -1,9 +1,9 @@ from typing import Any -from django.utils.translation import gettext_lazy as _ from uuid import UUID from django.http import HttpRequest from django.utils.timezone import now +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from requests.exceptions import RequestException @@ -17,7 +17,6 @@ from authentik.enterprise.providers.ssf.models import ( Stream, StreamEvent, ) -from authentik.events.logs import LogEvent from authentik.lib.utils.http import get_http_session from authentik.lib.utils.time import timedelta_from_string from authentik.policies.engine import PolicyEngine diff --git a/authentik/enterprise/tasks.py b/authentik/enterprise/tasks.py index c429959671..7c5a3bbea0 100644 --- a/authentik/enterprise/tasks.py +++ b/authentik/enterprise/tasks.py @@ -1,7 +1,6 @@ """Enterprise tasks""" from django.utils.translation import gettext_lazy as _ - from dramatiq.actor import actor from authentik.enterprise.license import LicenseKey diff --git a/authentik/events/signals.py b/authentik/events/signals.py index 8e706a4c01..0ae2ca7857 100644 --- a/authentik/events/signals.py +++ b/authentik/events/signals.py @@ -12,7 +12,7 @@ from rest_framework.request import Request from authentik.core.models import AuthenticatedSession, User from authentik.core.signals import login_failed, password_changed -from authentik.events.models import Event, EventAction, NotificationRule +from authentik.events.models import Event, EventAction from authentik.flows.models import Stage from authentik.flows.planner import PLAN_CONTEXT_OUTPOST, PLAN_CONTEXT_SOURCE, FlowPlan from authentik.flows.views.executor import SESSION_KEY_PLAN diff --git a/authentik/events/tasks.py b/authentik/events/tasks.py index 5ef96577ca..0cdfe912d6 100644 --- a/authentik/events/tasks.py +++ b/authentik/events/tasks.py @@ -2,8 +2,8 @@ from uuid import UUID -from django.utils.translation import gettext_lazy as _ from django.db.models.query_utils import Q +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from guardian.shortcuts import get_anonymous_user diff --git a/authentik/lib/sync/outgoing/models.py b/authentik/lib/sync/outgoing/models.py index 01a909a0e6..6b9091ecb2 100644 --- a/authentik/lib/sync/outgoing/models.py +++ b/authentik/lib/sync/outgoing/models.py @@ -11,7 +11,6 @@ from authentik.core.models import Group, User from authentik.lib.sync.outgoing import PAGE_SIZE, PAGE_TIMEOUT_MS from authentik.lib.sync.outgoing.base import BaseOutgoingSyncClient from authentik.lib.utils.time import fqdn_rand -from authentik.tasks.models import TasksModel from authentik.tasks.schedules.lib import ScheduleSpec from authentik.tasks.schedules.models import ScheduledModel diff --git a/authentik/lib/sync/outgoing/signals.py b/authentik/lib/sync/outgoing/signals.py index 7ea85dc0d7..af7edb2d73 100644 --- a/authentik/lib/sync/outgoing/signals.py +++ b/authentik/lib/sync/outgoing/signals.py @@ -1,5 +1,4 @@ from django.db.models import Model -from django.db.models.query import Q from django.db.models.signals import m2m_changed, post_save, pre_delete from dramatiq.actor import Actor diff --git a/authentik/outposts/tasks.py b/authentik/outposts/tasks.py index bc3df2a827..7e21dfcd86 100644 --- a/authentik/outposts/tasks.py +++ b/authentik/outposts/tasks.py @@ -1,7 +1,5 @@ """outpost tasks""" -from django.utils.translation import gettext_lazy as _ - from hashlib import sha256 from os import R_OK, access from pathlib import Path @@ -14,6 +12,7 @@ from channels.layers import get_channel_layer from django.core.cache import cache from django.db.models.base import Model from django.utils.text import slugify +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from docker.constants import DEFAULT_UNIX_SOCKET from dramatiq.actor import actor diff --git a/authentik/providers/proxy/tasks.py b/authentik/providers/proxy/tasks.py index b86a79ff72..d3bf2674c2 100644 --- a/authentik/providers/proxy/tasks.py +++ b/authentik/providers/proxy/tasks.py @@ -2,12 +2,12 @@ from asgiref.sync import async_to_sync from channels.layers import get_channel_layer +from django.utils.translation import gettext_lazy as _ from dramatiq.actor import actor from authentik.outposts.consumer import OUTPOST_GROUP from authentik.outposts.models import Outpost, OutpostType from authentik.providers.oauth2.id_token import hash_session_key -from django.utils.translation import gettext_lazy as _ @actor(description=_("Terminate session on Proxy outpost.")) diff --git a/authentik/providers/scim/api/providers.py b/authentik/providers/scim/api/providers.py index e5faeab748..042790d6a0 100644 --- a/authentik/providers/scim/api/providers.py +++ b/authentik/providers/scim/api/providers.py @@ -6,7 +6,7 @@ from authentik.core.api.providers import ProviderSerializer from authentik.core.api.used_by import UsedByMixin from authentik.lib.sync.outgoing.api import OutgoingSyncProviderStatusMixin from authentik.providers.scim.models import SCIMProvider -from authentik.providers.scim.tasks import scim_sync, scim_sync_objects +from authentik.providers.scim.tasks import scim_sync_objects class SCIMProviderSerializer(ProviderSerializer): diff --git a/authentik/providers/scim/tasks.py b/authentik/providers/scim/tasks.py index 8674248654..f4e374e2f4 100644 --- a/authentik/providers/scim/tasks.py +++ b/authentik/providers/scim/tasks.py @@ -1,10 +1,10 @@ """SCIM Provider tasks""" +from django.utils.translation import gettext_lazy as _ from dramatiq.actor import actor from authentik.lib.sync.outgoing.tasks import SyncTasks from authentik.providers.scim.models import SCIMProvider -from django.utils.translation import gettext_lazy as _ sync_tasks = SyncTasks(SCIMProvider) diff --git a/authentik/sources/kerberos/api/source.py b/authentik/sources/kerberos/api/source.py index 3105804fb8..fa9dabd528 100644 --- a/authentik/sources/kerberos/api/source.py +++ b/authentik/sources/kerberos/api/source.py @@ -1,12 +1,11 @@ """Source API Views""" from django.core.cache import cache -from rest_framework.fields import BooleanField, SerializerMethodField +from rest_framework.fields import SerializerMethodField from rest_framework.viewsets import ModelViewSet from authentik.core.api.sources import SourceSerializer from authentik.core.api.used_by import UsedByMixin -from authentik.core.api.utils import PassiveSerializer from authentik.sources.kerberos.models import KerberosSource from authentik.sources.kerberos.tasks import CACHE_KEY_STATUS diff --git a/authentik/sources/kerberos/signals.py b/authentik/sources/kerberos/signals.py index b475ac6be2..3b1bc99ec6 100644 --- a/authentik/sources/kerberos/signals.py +++ b/authentik/sources/kerberos/signals.py @@ -1,6 +1,5 @@ """authentik kerberos source signals""" -from django.db.models.signals import post_save from django.dispatch import receiver from kadmin.exceptions import PyKAdminException from rest_framework.serializers import ValidationError diff --git a/authentik/sources/kerberos/tasks.py b/authentik/sources/kerberos/tasks.py index 0f1a7a8e95..19e10c4924 100644 --- a/authentik/sources/kerberos/tasks.py +++ b/authentik/sources/kerberos/tasks.py @@ -1,11 +1,11 @@ """Kerberos Sync tasks""" from django.core.cache import cache +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from structlog.stdlib import get_logger -from django.utils.translation import gettext_lazy as _ from authentik.lib.config import CONFIG from authentik.lib.sync.outgoing.exceptions import StopSync from authentik.lib.utils.errors import exception_to_string diff --git a/authentik/sources/ldap/tasks.py b/authentik/sources/ldap/tasks.py index 2ef1907255..10bbb18197 100644 --- a/authentik/sources/ldap/tasks.py +++ b/authentik/sources/ldap/tasks.py @@ -3,13 +3,13 @@ from uuid import uuid4 from django.core.cache import cache +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from dramatiq.composition import group from dramatiq.message import Message from ldap3.core.exceptions import LDAPException from structlog.stdlib import get_logger -from django.utils.translation import gettext_lazy as _ from authentik.lib.config import CONFIG from authentik.lib.sync.outgoing.exceptions import StopSync diff --git a/authentik/sources/oauth/tasks.py b/authentik/sources/oauth/tasks.py index be1c2e56de..ce36ba2dde 100644 --- a/authentik/sources/oauth/tasks.py +++ b/authentik/sources/oauth/tasks.py @@ -2,11 +2,11 @@ from json import dumps +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from requests import RequestException from structlog.stdlib import get_logger -from django.utils.translation import gettext_lazy as _ from authentik.lib.utils.http import get_http_session from authentik.sources.oauth.models import OAuthSource diff --git a/authentik/sources/plex/tasks.py b/authentik/sources/plex/tasks.py index e627f7aa5d..ff2c54e81e 100644 --- a/authentik/sources/plex/tasks.py +++ b/authentik/sources/plex/tasks.py @@ -1,5 +1,6 @@ """Plex tasks""" +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from requests import RequestException @@ -9,7 +10,6 @@ from authentik.lib.utils.errors import exception_to_string from authentik.sources.plex.models import PlexSource from authentik.sources.plex.plex import PlexAuth from authentik.tasks.models import Task -from django.utils.translation import gettext_lazy as _ @actor(description=_("Check the validity of a Plex source.")) diff --git a/authentik/stages/authenticator_webauthn/tasks.py b/authentik/stages/authenticator_webauthn/tasks.py index 43c4f759ac..a5e0370bd7 100644 --- a/authentik/stages/authenticator_webauthn/tasks.py +++ b/authentik/stages/authenticator_webauthn/tasks.py @@ -6,10 +6,10 @@ from pathlib import Path from django.core.cache import cache from django.db.transaction import atomic +from django.utils.translation import gettext_lazy as _ from django_dramatiq_postgres.middleware import CurrentTask from dramatiq.actor import actor from fido2.mds3 import filter_revoked, parse_blob -from django.utils.translation import gettext_lazy as _ from authentik.stages.authenticator_webauthn.models import ( UNKNOWN_DEVICE_TYPE_AAGUID, diff --git a/authentik/tasks/schedules/api.py b/authentik/tasks/schedules/api.py index 42a7e03d46..e98b6ac5a1 100644 --- a/authentik/tasks/schedules/api.py +++ b/authentik/tasks/schedules/api.py @@ -22,7 +22,6 @@ from authentik.core.api.utils import ModelSerializer from authentik.rbac.decorators import permission_required from authentik.tasks.schedules.models import Schedule - LOGGER = get_logger() diff --git a/authentik/tasks/schedules/scheduler.py b/authentik/tasks/schedules/scheduler.py index d6aca6ef54..c5acb0467b 100644 --- a/authentik/tasks/schedules/scheduler.py +++ b/authentik/tasks/schedules/scheduler.py @@ -1,7 +1,5 @@ -from time import sleep import pglock -from django_dramatiq_postgres.conf import Conf from django_dramatiq_postgres.scheduler import Scheduler as SchedulerBase from structlog.stdlib import get_logger diff --git a/packages/django-dramatiq-postgres/django_dramatiq_postgres/middleware.py b/packages/django-dramatiq-postgres/django_dramatiq_postgres/middleware.py index 94f41c7cbd..3f762ce780 100644 --- a/packages/django-dramatiq-postgres/django_dramatiq_postgres/middleware.py +++ b/packages/django-dramatiq-postgres/django_dramatiq_postgres/middleware.py @@ -1,13 +1,10 @@ import contextvars -from threading import Event -from typing import Any, override +from typing import Any -from django.core.exceptions import ImproperlyConfigured from django.db import ( close_old_connections, connections, ) -from django.utils.module_loading import import_string from dramatiq.actor import Actor from dramatiq.broker import Broker from dramatiq.logging import get_logger @@ -16,7 +13,6 @@ from dramatiq.middleware.middleware import Middleware from django_dramatiq_postgres.conf import Conf from django_dramatiq_postgres.models import TaskBase -from django_dramatiq_postgres.scheduler import Scheduler class DbConnectionMiddleware(Middleware): diff --git a/packages/django-dramatiq-postgres/django_dramatiq_postgres/scheduler.py b/packages/django-dramatiq-postgres/django_dramatiq_postgres/scheduler.py index fd820ed05a..63e6aee34e 100644 --- a/packages/django-dramatiq-postgres/django_dramatiq_postgres/scheduler.py +++ b/packages/django-dramatiq-postgres/django_dramatiq_postgres/scheduler.py @@ -1,5 +1,3 @@ -from threading import Event, Thread -from time import sleep import pglock from django.db import router, transaction