diff --git a/src/authentication/__init__.py b/src/authentication/__init__.py
index c6d96cdfa..c7f7bf4d5 100644
--- a/src/authentication/__init__.py
+++ b/src/authentication/__init__.py
@@ -4,12 +4,12 @@
 
 import constants
 from authentication import (
+    api_key_token,
     jwk_token,
     k8s,
     noop,
     noop_with_token,
     rh_identity,
-    api_key_token,
 )
 from authentication.interface import AuthInterface
 from configuration import LogicError, configuration
diff --git a/src/authentication/api_key_token.py b/src/authentication/api_key_token.py
index 79909349d..ec24335c2 100644
--- a/src/authentication/api_key_token.py
+++ b/src/authentication/api_key_token.py
@@ -8,15 +8,15 @@
 
 import secrets
 
-from fastapi import Request, HTTPException, status
+from fastapi import HTTPException, Request, status
 
+from authentication.interface import AuthInterface
+from authentication.utils import extract_user_token
 from constants import (
     DEFAULT_USER_NAME,
-    DEFAULT_VIRTUAL_PATH,
     DEFAULT_USER_UID,
+    DEFAULT_VIRTUAL_PATH,
 )
-from authentication.interface import AuthInterface
-from authentication.utils import extract_user_token
 from log import get_logger
 from models.config import APIKeyTokenConfiguration
 
diff --git a/src/authentication/interface.py b/src/authentication/interface.py
index f513d402e..545623bb1 100644
--- a/src/authentication/interface.py
+++ b/src/authentication/interface.py
@@ -10,8 +10,8 @@
 from fastapi import Request
 
 from constants import (
-    DEFAULT_USER_NAME,
     DEFAULT_SKIP_USER_ID_CHECK,
+    DEFAULT_USER_NAME,
     DEFAULT_USER_UID,
     NO_USER_TOKEN,
 )
diff --git a/src/authentication/jwk_token.py b/src/authentication/jwk_token.py
index 1f0b9f436..e21600531 100644
--- a/src/authentication/jwk_token.py
+++ b/src/authentication/jwk_token.py
@@ -2,8 +2,8 @@
 
 import json
 from asyncio import Lock
-from typing import Any
 from collections.abc import Callable
+from typing import Any
 
 import aiohttp
 from authlib.jose import JsonWebKey, Key, KeySet, jwt
@@ -21,9 +21,9 @@
 from constants import (
     DEFAULT_VIRTUAL_PATH,
 )
+from log import get_logger
 from models.config import JwkConfiguration
 from models.responses import UnauthorizedResponse
-from log import get_logger
 
 logger = get_logger(__name__)
 
diff --git a/src/authentication/noop.py b/src/authentication/noop.py
index 259dd1168..d2786994d 100644
--- a/src/authentication/noop.py
+++ b/src/authentication/noop.py
@@ -2,13 +2,13 @@
 
 from fastapi import HTTPException, Request
 
+from authentication.interface import AuthInterface
 from constants import (
     DEFAULT_USER_NAME,
     DEFAULT_USER_UID,
-    NO_USER_TOKEN,
     DEFAULT_VIRTUAL_PATH,
+    NO_USER_TOKEN,
 )
-from authentication.interface import AuthInterface
 from log import get_logger
 
 logger = get_logger(__name__)
diff --git a/src/authentication/noop_with_token.py b/src/authentication/noop_with_token.py
index 6d7777044..c98648b89 100644
--- a/src/authentication/noop_with_token.py
+++ b/src/authentication/noop_with_token.py
@@ -11,13 +11,13 @@
 
 from fastapi import HTTPException, Request
 
+from authentication.interface import AuthInterface
+from authentication.utils import extract_user_token
 from constants import (
     DEFAULT_USER_NAME,
     DEFAULT_USER_UID,
     DEFAULT_VIRTUAL_PATH,
 )
-from authentication.interface import AuthInterface
-from authentication.utils import extract_user_token
 from log import get_logger
 
 logger = get_logger(__name__)
diff --git a/src/authentication/utils.py b/src/authentication/utils.py
index bad539f72..e4ff6cbdc 100644
--- a/src/authentication/utils.py
+++ b/src/authentication/utils.py
@@ -2,6 +2,7 @@
 
 from fastapi import HTTPException
 from starlette.datastructures import Headers
+
 from models.responses import UnauthorizedResponse
 
 
diff --git a/src/authorization/azure_token_manager.py b/src/authorization/azure_token_manager.py
index a92b8a4f8..bc1cf323d 100644
--- a/src/authorization/azure_token_manager.py
+++ b/src/authorization/azure_token_manager.py
@@ -10,8 +10,8 @@
 from pydantic import SecretStr
 
 from configuration import AzureEntraIdConfiguration
-from utils.types import Singleton
 from log import get_logger
+from utils.types import Singleton
 
 logger = get_logger(__name__)
 
diff --git a/src/authorization/middleware.py b/src/authorization/middleware.py
index 431c9a771..043c29e3c 100644
--- a/src/authorization/middleware.py
+++ b/src/authorization/middleware.py
@@ -1,8 +1,8 @@
 """Authorization middleware and decorators."""
 
+from collections.abc import Callable
 from functools import lru_cache, wraps
 from typing import Any, Optional
-from collections.abc import Callable
 
 from fastapi import HTTPException
 from starlette.requests import Request
diff --git a/src/authorization/resolvers.py b/src/authorization/resolvers.py
index 3ce553c0c..5870476bd 100644
--- a/src/authorization/resolvers.py
+++ b/src/authorization/resolvers.py
@@ -1,16 +1,16 @@
 """Authorization resolvers for role evaluation and access control."""
 
-from abc import ABC, abstractmethod
 import base64
 import json
+from abc import ABC, abstractmethod
 from typing import Any
 
 from jsonpath_ng import parse
 
-from authentication.interface import AuthTuple
-from models.config import JwtRoleRule, AccessRule, JsonPathOperator, Action
 import constants
+from authentication.interface import AuthTuple
 from log import get_logger
+from models.config import AccessRule, Action, JsonPathOperator, JwtRoleRule
 
 logger = get_logger(__name__)
 
diff --git a/src/cache/cache_factory.py b/src/cache/cache_factory.py
index 2c890a96a..cbc066a29 100644
--- a/src/cache/cache_factory.py
+++ b/src/cache/cache_factory.py
@@ -1,13 +1,13 @@
 """Cache factory class."""
 
 import constants
-from models.config import ConversationHistoryConfiguration
 from cache.cache import Cache
-from cache.noop_cache import NoopCache
 from cache.in_memory_cache import InMemoryCache
+from cache.noop_cache import NoopCache
 from cache.postgres_cache import PostgresCache
 from cache.sqlite_cache import SQLiteCache
 from log import get_logger
+from models.config import ConversationHistoryConfiguration
 
 logger = get_logger(__name__)
 
diff --git a/src/cache/in_memory_cache.py b/src/cache/in_memory_cache.py
index 2461cb4ff..d4c7a2910 100644
--- a/src/cache/in_memory_cache.py
+++ b/src/cache/in_memory_cache.py
@@ -1,10 +1,10 @@
 """In-memory cache implementation."""
 
 from cache.cache import Cache
+from log import get_logger
 from models.cache_entry import CacheEntry
 from models.config import InMemoryCacheConfig
 from models.responses import ConversationData
-from log import get_logger
 from utils.connection_decorator import connection
 
 logger = get_logger(__name__)
diff --git a/src/cache/noop_cache.py b/src/cache/noop_cache.py
index f0fa757ff..6ae3ce0a5 100644
--- a/src/cache/noop_cache.py
+++ b/src/cache/noop_cache.py
@@ -1,9 +1,9 @@
 """No-operation cache implementation."""
 
 from cache.cache import Cache
+from log import get_logger
 from models.cache_entry import CacheEntry
 from models.responses import ConversationData
-from log import get_logger
 from utils.connection_decorator import connection
 
 logger = get_logger(__name__)
diff --git a/src/cache/postgres_cache.py b/src/cache/postgres_cache.py
index 3b5dfbefe..adbf3b16b 100644
--- a/src/cache/postgres_cache.py
+++ b/src/cache/postgres_cache.py
@@ -1,17 +1,18 @@
 """PostgreSQL cache implementation."""
 
 import json
+
 import psycopg2
 from psycopg2.extensions import AsIs
 
 from cache.cache import Cache
 from cache.cache_error import CacheError
+from log import get_logger
 from models.cache_entry import CacheEntry
 from models.config import PostgreSQLDatabaseConfiguration
 from models.responses import ConversationData
 from utils.connection_decorator import connection
 from utils.types import ReferencedDocument, ToolCallSummary, ToolResultSummary
-from log import get_logger
 
 logger = get_logger(__name__)
 
diff --git a/src/cache/sqlite_cache.py b/src/cache/sqlite_cache.py
index 777b00e92..92f4f2684 100644
--- a/src/cache/sqlite_cache.py
+++ b/src/cache/sqlite_cache.py
@@ -1,18 +1,17 @@
 """Cache that uses SQLite to store cached values."""
 
-from time import time
-
-import sqlite3
 import json
+import sqlite3
+from time import time
 
 from cache.cache import Cache
 from cache.cache_error import CacheError
+from log import get_logger
 from models.cache_entry import CacheEntry
 from models.config import SQLiteDatabaseConfiguration
 from models.responses import ConversationData
 from utils.connection_decorator import connection
 from utils.types import ReferencedDocument, ToolCallSummary, ToolResultSummary
-from log import get_logger
 
 logger = get_logger(__name__)