chore(format): pre-rebase autoflake + isort + black + ruff format pass

Applies formatter output from the current toolchain to align the branch
with upstream pre-commit hooks (ruff check + formatter, PR #5169) before
rebasing onto main. Absorbs trivial format-only conflicts (f-string
concatenation cleanup, import reordering, isort comment groupers) so the
rebase replays substantive work only.

No semantic changes.

Generated by:
  make autoflake isort black
  make ruff RUFF_MODE=format

Signed-off-by: Jonathan Springer <jps@s390x.com>

Author: jonpspri

mcpgateway/admin.py

@@ -3100,6 +3100,7 @@ async def admin_add_server(request: Request, db: Session = Depends(get_db), user
         # Ensure default visibility is private and assign to personal team when available
         team_id_cast = typing_cast(Optional[str], team_id)
         caller_token_teams = getattr(request.state, "token_teams", None)
+        # First-Party
         from mcpgateway.services.caller_context import CallerContext  # noqa: E402  pylint: disable=import-outside-toplevel
 
         await server_service.register_server(
@@ -3258,6 +3259,7 @@ async def admin_edit_server(
         )
 
         caller_token_teams = getattr(request.state, "token_teams", None)
+        # First-Party
         from mcpgateway.services.caller_context import CallerContext  # noqa: E402  pylint: disable=import-outside-toplevel
 
         await server_service.update_server(

mcpgateway/alembic/versions/3f7e9d1a2b4c_a2a_v1_domain_models.py

@@ -153,7 +153,7 @@ def upgrade() -> None:
 
         conn = op.get_bind()
         agents_with_auth = conn.execute(
-            sa.text("SELECT id, auth_type, auth_value, auth_query_params " "FROM a2a_agents " "WHERE auth_type IS NOT NULL " "AND id NOT IN (SELECT a2a_agent_id FROM a2a_agent_auth)")
+            sa.text("SELECT id, auth_type, auth_value, auth_query_params FROM a2a_agents WHERE auth_type IS NOT NULL AND id NOT IN (SELECT a2a_agent_id FROM a2a_agent_auth)")
         ).fetchall()
         for agent in agents_with_auth:
             # auth_query_params may be a Python dict (from a JSON column);

mcpgateway/alembic/versions/77243f5bfce5_add_tool_id_to_a2a_agents.py

@@ -47,9 +47,7 @@ def upgrade() -> None:
 
     # Fail if tools table doesn't exist - FK requires it
     if not inspector.has_table("tools"):
-        raise RuntimeError(
-            "Cannot proceed: a2a_agents table exists but tools table is missing. " "This migration adds a FK from a2a_agents.tool_id to tools.id. " "Please verify your database schema."
-        )
+        raise RuntimeError("Cannot proceed: a2a_agents table exists but tools table is missing. This migration adds a FK from a2a_agents.tool_id to tools.id. Please verify your database schema.")
 
     # Check current state
     columns = [col["name"] for col in inspector.get_columns("a2a_agents")]
@@ -64,10 +62,10 @@ def upgrade() -> None:
     # If column exists but FK doesn't, check for orphaned references that would block FK creation
     if not need_column and need_fk:
         # Use COUNT for efficiency, then fetch limited sample for error message
-        orphan_count = bind.execute(sa.text("SELECT COUNT(*) FROM a2a_agents WHERE tool_id IS NOT NULL " "AND tool_id NOT IN (SELECT id FROM tools)")).scalar() or 0
+        orphan_count = bind.execute(sa.text("SELECT COUNT(*) FROM a2a_agents WHERE tool_id IS NOT NULL AND tool_id NOT IN (SELECT id FROM tools)")).scalar() or 0
         if orphan_count > 0:
             # Fetch limited sample for error details
-            sample = bind.execute(sa.text("SELECT id, tool_id FROM a2a_agents WHERE tool_id IS NOT NULL " "AND tool_id NOT IN (SELECT id FROM tools) LIMIT 10")).fetchall()
+            sample = bind.execute(sa.text("SELECT id, tool_id FROM a2a_agents WHERE tool_id IS NOT NULL AND tool_id NOT IN (SELECT id FROM tools) LIMIT 10")).fetchall()
             orphan_details = "\n".join(f"  - agent {aid} -> tool {tid}" for aid, tid in sample)
             more_msg = f"\n  ... and {orphan_count - len(sample)} more" if orphan_count > len(sample) else ""
             raise RuntimeError(

mcpgateway/alembic/versions/ba202ac1665f_migrate_user_roles_to_configurable_.py

@@ -74,7 +74,7 @@ def _snapshot_config(bind, rev: str, values: dict) -> None:
     """
     inspector = sa.inspect(bind)
     if "migration_metadata" not in inspector.get_table_names():
-        logger.warning("migration_metadata table not found; skipping config snapshot. " "Downgrade will use live settings (non-hermetic).")
+        logger.warning("migration_metadata table not found; skipping config snapshot. Downgrade will use live settings (non-hermetic).")
         return
     for key, value in values.items():
         bind.execute(
@@ -360,7 +360,7 @@ def downgrade() -> None:
         new_team_member_role = snapshot.get("default_team_member_role", settings.default_team_member_role)
         print(f"  ✓ Loaded config snapshot from migration_metadata (revision={revision})")
     else:
-        logger.warning("No config snapshot found in migration_metadata. " "Falling back to live settings — downgrade correctness depends on env vars matching upgrade time.")
+        logger.warning("No config snapshot found in migration_metadata. Falling back to live settings — downgrade correctness depends on env vars matching upgrade time.")
         new_admin_role = settings.default_admin_role
         new_user_role = settings.default_user_role
         new_team_owner_role = settings.default_team_owner_role

mcpgateway/alembic/versions/f9a8b7c6d5e4_add_migration_metadata_table.py

@@ -77,7 +77,7 @@ def downgrade() -> None:
 
     count = bind.execute(text("SELECT COUNT(*) FROM migration_metadata")).scalar() or 0
     if count:
-        raise RuntimeError(f"Cannot drop migration_metadata — {count} snapshot row(s) remain. " "Downgrade dependent migrations first (e.g., ba202ac1665f).")
+        raise RuntimeError(f"Cannot drop migration_metadata — {count} snapshot row(s) remain. Downgrade dependent migrations first (e.g., ba202ac1665f).")
 
     op.drop_table("migration_metadata")
     print("  ✓ Dropped migration_metadata table")

mcpgateway/main.py

@@ -1331,9 +1331,7 @@ def _warn_if_rust_a2a_runtime_deprecated() -> None:
     release).
     """
     if getattr(settings, "experimental_rust_a2a_runtime_enabled", False):
-        logger.warning(
-            "EXPERIMENTAL_RUST_A2A_RUNTIME_ENABLED=true is DEPRECATED. " "The Rust A2A runtime is removed in the next release; " "Python dispatcher is the only path. This flag is now ignored."
-        )
+        logger.warning("EXPERIMENTAL_RUST_A2A_RUNTIME_ENABLED=true is DEPRECATED. The Rust A2A runtime is removed in the next release; Python dispatcher is the only path. This flag is now ignored.")
 
 
 @asynccontextmanager
@@ -4169,6 +4167,7 @@ async def create_server(
             team_id = team_id or token_team_id
 
         logger.debug(f"User {SecurityValidator.sanitize_log_message(user_email)} is creating a new server for team {team_id}")
+        # First-Party
         from mcpgateway.services.caller_context import CallerContext  # noqa: E402  pylint: disable=import-outside-toplevel
 
         result = await server_service.register_server(
@@ -4230,6 +4229,7 @@ async def update_server(
 
         user_email: str = get_user_email(user)
         caller_token_teams = getattr(request.state, "token_teams", None)
+        # First-Party
         from mcpgateway.services.caller_context import CallerContext  # noqa: E402  pylint: disable=import-outside-toplevel
 
         result = await server_service.update_server(

mcpgateway/middleware/a2a_path_rewrite.py

@@ -36,11 +36,14 @@
   reads the original path keeps its contract.
 """
 
+# Future
 from __future__ import annotations
 
+# Standard
 import logging
 import re
 
+# Third-Party
 from starlette.types import ASGIApp, Receive, Scope, Send
 
 logger = logging.getLogger(__name__)

mcpgateway/services/a2a_access_policy.py

@@ -51,17 +51,22 @@
 module-load time (the service module imports this policy module).
 """
 
+# Future
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Optional
+# Standard
+from typing import List, Optional, TYPE_CHECKING
 
+# Third-Party
 from sqlalchemy.orm import Session
 
+# First-Party
 from mcpgateway.db import Server as DbServer
 from mcpgateway.services.a2a_hooks import A2AAgentSnapshot
 from mcpgateway.services.a2a_server_service import _check_server_access
 
 if TYPE_CHECKING:  # pragma: no cover - import-time-only
+    # First-Party
     from mcpgateway.services.a2a_service import A2AAgentService
 
 

mcpgateway/services/a2a_hooks.py

@@ -42,10 +42,12 @@
 is resolved — see ``docs/docs/architecture/a2a-cpex-hook-proposal.md``.
 """
 
+# Future
 from __future__ import annotations
 
-import logging
+# Standard
 from dataclasses import dataclass, field
+import logging
 from typing import Any, Awaitable, Callable, Dict, List, Optional
 
 logger = logging.getLogger(__name__)

mcpgateway/services/a2a_service.py

@@ -33,16 +33,17 @@
 from mcpgateway.db import A2AAgent as DbA2AAgent
 from mcpgateway.db import A2AAgentMetric, A2AAgentMetricsHourly, A2ATask, EmailTeam
 from mcpgateway.db import EmailTeamMember as DbEmailTeamMember
-from mcpgateway.db import fresh_db_session, get_for_update, server_a2a_association
+from mcpgateway.db import fresh_db_session, get_for_update
 from mcpgateway.db import Server as DbServer
+from mcpgateway.db import server_a2a_association
 from mcpgateway.db import Tool as DbTool
+from mcpgateway.observability import create_span, set_span_attribute, set_span_error
+from mcpgateway.schemas import A2AAgentAggregateMetrics, A2AAgentCreate, A2AAgentMetrics, A2AAgentRead, A2AAgentUpdate
+from mcpgateway.schemas_a2a_native import AgentCapabilities, AgentCard, AgentSkill, SupportedInterface
 from mcpgateway.services.a2a_access_policy import (
     can_view_a2a_agent_directly,
     can_view_a2a_agent_in_server_context,
 )
-from mcpgateway.observability import create_span, set_span_attribute, set_span_error
-from mcpgateway.schemas import A2AAgentAggregateMetrics, A2AAgentCreate, A2AAgentMetrics, A2AAgentRead, A2AAgentUpdate
-from mcpgateway.schemas_a2a_native import AgentCapabilities, AgentCard, AgentSkill, SupportedInterface
 from mcpgateway.services.a2a_protocol import prepare_a2a_invocation
 from mcpgateway.services.base_service import BaseService
 from mcpgateway.services.encryption_service import protect_oauth_config_for_storage
@@ -1097,6 +1098,7 @@ async def resolve_agent_for_dispatch(
             if not server:
                 raise AgentNotInServerError(agent_name, server_id)
 
+            # First-Party
             from mcpgateway.services.a2a_hooks import A2AAgentSnapshot  # pylint: disable=import-outside-toplevel
 
             agent_snapshot = A2AAgentSnapshot.from_orm(agent)
@@ -1117,6 +1119,7 @@ async def resolve_agent_for_dispatch(
         # to the centralized policy module. Visibility miss surfaces as
         # A2AAgentNotFoundError per plan D11 / Oracle v2 #3 to prevent
         # existence-leak side channels.
+        # First-Party
         from mcpgateway.services.a2a_hooks import A2AAgentSnapshot  # pylint: disable=import-outside-toplevel
 
         agent_snapshot = A2AAgentSnapshot.from_orm(agent)
@@ -1212,6 +1215,7 @@ async def synthesize_agent_card(
         if not agent:
             return None
 
+        # First-Party
         from mcpgateway.services.a2a_hooks import A2AAgentSnapshot  # pylint: disable=import-outside-toplevel
 
         agent_snapshot = A2AAgentSnapshot.from_orm(agent)