diff --git a/trustgraph-base/trustgraph/base/agent_service.py b/trustgraph-base/trustgraph/base/agent_service.py
index b28ee04b..06190546 100644
--- a/trustgraph-base/trustgraph/base/agent_service.py
+++ b/trustgraph-base/trustgraph/base/agent_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Agent manager service completion base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import time
 import logging
 from prometheus_client import Histogram
diff --git a/trustgraph-base/trustgraph/base/document_embeddings_query_service.py b/trustgraph-base/trustgraph/base/document_embeddings_query_service.py
index 86fb19fc..d5bf8421 100644
--- a/trustgraph-base/trustgraph/base/document_embeddings_query_service.py
+++ b/trustgraph-base/trustgraph/base/document_embeddings_query_service.py
@@ -1,12 +1,12 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Document embeddings query service.  Input is vectors.  Output is list of
 embeddings.
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import logging
 
 from .. schema import DocumentEmbeddingsRequest, DocumentEmbeddingsResponse
diff --git a/trustgraph-base/trustgraph/base/document_embeddings_store_service.py b/trustgraph-base/trustgraph/base/document_embeddings_store_service.py
index 0d081ce1..0c7921db 100644
--- a/trustgraph-base/trustgraph/base/document_embeddings_store_service.py
+++ b/trustgraph-base/trustgraph/base/document_embeddings_store_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Document embeddings store base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import logging
 
 from .. schema import DocumentEmbeddings
diff --git a/trustgraph-base/trustgraph/base/dynamic_tool_service.py b/trustgraph-base/trustgraph/base/dynamic_tool_service.py
index 7c8e7692..bcfb71ab 100644
--- a/trustgraph-base/trustgraph/base/dynamic_tool_service.py
+++ b/trustgraph-base/trustgraph/base/dynamic_tool_service.py
@@ -1,7 +1,3 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Base class for dynamically pluggable tool services.
 
@@ -14,6 +10,10 @@ Uses direct Pulsar topics (no flow configuration required):
 - Response: non-persistent://tg/response/{topic}
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import json
 import logging
 import asyncio
diff --git a/trustgraph-base/trustgraph/base/embeddings_service.py b/trustgraph-base/trustgraph/base/embeddings_service.py
index 0f8f7f82..0f5e6237 100644
--- a/trustgraph-base/trustgraph/base/embeddings_service.py
+++ b/trustgraph-base/trustgraph/base/embeddings_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Embeddings resolution base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import time
 import logging
 from prometheus_client import Histogram
diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py b/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py
index cc96a398..55c8efa9 100644
--- a/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py
+++ b/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py
@@ -1,12 +1,12 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Graph embeddings query service.  Input is vectors.  Output is list of
 embeddings.
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import logging
 
 from .. schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse
diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py b/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py
index e133cf1e..09bbbe6a 100644
--- a/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py
+++ b/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Graph embeddings store base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import logging
 
 from .. schema import GraphEmbeddings
diff --git a/trustgraph-base/trustgraph/base/llm_service.py b/trustgraph-base/trustgraph/base/llm_service.py
index 9b96edf6..6af11670 100644
--- a/trustgraph-base/trustgraph/base/llm_service.py
+++ b/trustgraph-base/trustgraph/base/llm_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 LLM text completion base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import time
 import logging
 from prometheus_client import Histogram, Info
diff --git a/trustgraph-base/trustgraph/base/tool_service.py b/trustgraph-base/trustgraph/base/tool_service.py
index 27ffbfac..3ff977d1 100644
--- a/trustgraph-base/trustgraph/base/tool_service.py
+++ b/trustgraph-base/trustgraph/base/tool_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Tool invocation base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import json
 import logging
 from prometheus_client import Counter
diff --git a/trustgraph-base/trustgraph/base/triples_query_service.py b/trustgraph-base/trustgraph/base/triples_query_service.py
index b72f37a3..832ff6f1 100644
--- a/trustgraph-base/trustgraph/base/triples_query_service.py
+++ b/trustgraph-base/trustgraph/base/triples_query_service.py
@@ -1,12 +1,12 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Triples query service.  Input is a (s, p, o) triple, some values may be
 null.  Output is a list of triples.
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import logging
 
 from .. schema import TriplesQueryRequest, TriplesQueryResponse, Error
diff --git a/trustgraph-base/trustgraph/base/triples_store_service.py b/trustgraph-base/trustgraph/base/triples_store_service.py
index f09377bf..abd3aab8 100644
--- a/trustgraph-base/trustgraph/base/triples_store_service.py
+++ b/trustgraph-base/trustgraph/base/triples_store_service.py
@@ -1,11 +1,11 @@
-from __future__ import annotations
-
-from argparse import ArgumentParser
-
 """
 Triples store base class
 """
 
+from __future__ import annotations
+
+from argparse import ArgumentParser
+
 import logging
 
 from .. schema import Triples