From 2c5d09f733972c33dd7751f1311856d857d0db76 Mon Sep 17 00:00:00 2001 From: CyberRaccoonTeam Date: Tue, 14 Apr 2026 01:57:19 -0300 Subject: [PATCH] refactor: deduplicate imports and move __future__ after docstrings Addresses review feedback on PR #803: - Remove duplicate 'from argparse import ArgumentParser' across 12 files - Move 'from __future__ import annotations' to line 1 in all files - Clean up excessive blank lines --- trustgraph-base/trustgraph/base/agent_service.py | 3 +-- trustgraph-base/trustgraph/base/async_processor.py | 1 + trustgraph-base/trustgraph/base/consumer_spec.py | 1 - .../trustgraph/base/document_embeddings_query_service.py | 4 +--- .../trustgraph/base/document_embeddings_store_service.py | 3 +-- trustgraph-base/trustgraph/base/dynamic_tool_service.py | 3 +-- trustgraph-base/trustgraph/base/embeddings_service.py | 4 +--- trustgraph-base/trustgraph/base/flow_processor.py | 3 +-- trustgraph-base/trustgraph/base/graph_embeddings_client.py | 1 + .../trustgraph/base/graph_embeddings_query_service.py | 4 +--- .../trustgraph/base/graph_embeddings_store_service.py | 3 +-- trustgraph-base/trustgraph/base/llm_service.py | 3 +-- trustgraph-base/trustgraph/base/pubsub.py | 1 - trustgraph-base/trustgraph/base/request_response_spec.py | 1 - trustgraph-base/trustgraph/base/tool_service.py | 3 +-- trustgraph-base/trustgraph/base/triples_client.py | 1 + trustgraph-base/trustgraph/base/triples_query_service.py | 4 +--- trustgraph-base/trustgraph/base/triples_store_service.py | 3 +-- 18 files changed, 15 insertions(+), 31 deletions(-) diff --git a/trustgraph-base/trustgraph/base/agent_service.py b/trustgraph-base/trustgraph/base/agent_service.py index 338f3cd6..b28ee04b 100644 --- a/trustgraph-base/trustgraph/base/agent_service.py +++ b/trustgraph-base/trustgraph/base/agent_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -8,12 +9,10 @@ Agent manager service completion base class import time import logging from prometheus_client import Histogram -from argparse import ArgumentParser from .. schema import AgentRequest, AgentResponse, Error from .. exceptions import TooManyRequests from .. base import FlowProcessor, ConsumerSpec, ProducerSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/async_processor.py b/trustgraph-base/trustgraph/base/async_processor.py index 91b2be40..9b9328cb 100644 --- a/trustgraph-base/trustgraph/base/async_processor.py +++ b/trustgraph-base/trustgraph/base/async_processor.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser from typing import Any, Callable diff --git a/trustgraph-base/trustgraph/base/consumer_spec.py b/trustgraph-base/trustgraph/base/consumer_spec.py index 5b429eed..ae218b44 100644 --- a/trustgraph-base/trustgraph/base/consumer_spec.py +++ b/trustgraph-base/trustgraph/base/consumer_spec.py @@ -1,4 +1,3 @@ - from __future__ import annotations from typing import Any diff --git a/trustgraph-base/trustgraph/base/document_embeddings_query_service.py b/trustgraph-base/trustgraph/base/document_embeddings_query_service.py index 082fdc0e..86fb19fc 100644 --- a/trustgraph-base/trustgraph/base/document_embeddings_query_service.py +++ b/trustgraph-base/trustgraph/base/document_embeddings_query_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -7,16 +8,13 @@ embeddings. """ import logging -from argparse import ArgumentParser from .. schema import DocumentEmbeddingsRequest, DocumentEmbeddingsResponse from .. schema import Error, Term -from argparse import ArgumentParser from . flow_processor import FlowProcessor from . consumer_spec import ConsumerSpec from . producer_spec import ProducerSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/document_embeddings_store_service.py b/trustgraph-base/trustgraph/base/document_embeddings_store_service.py index 193bc428..0d081ce1 100644 --- a/trustgraph-base/trustgraph/base/document_embeddings_store_service.py +++ b/trustgraph-base/trustgraph/base/document_embeddings_store_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -6,12 +7,10 @@ Document embeddings store base class """ import logging -from argparse import ArgumentParser from .. schema import DocumentEmbeddings from .. base import FlowProcessor, ConsumerSpec from .. exceptions import TooManyRequests -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/dynamic_tool_service.py b/trustgraph-base/trustgraph/base/dynamic_tool_service.py index 98ea490d..7c8e7692 100644 --- a/trustgraph-base/trustgraph/base/dynamic_tool_service.py +++ b/trustgraph-base/trustgraph/base/dynamic_tool_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -18,7 +19,6 @@ import logging import asyncio import argparse from prometheus_client import Counter -from argparse import ArgumentParser from .. schema import ToolServiceRequest, ToolServiceResponse, Error from .. exceptions import TooManyRequests @@ -26,7 +26,6 @@ from . async_processor import AsyncProcessor from . consumer import Consumer from . producer import Producer from . metrics import ConsumerMetrics, ProducerMetrics -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/embeddings_service.py b/trustgraph-base/trustgraph/base/embeddings_service.py index d519eeb0..0f8f7f82 100644 --- a/trustgraph-base/trustgraph/base/embeddings_service.py +++ b/trustgraph-base/trustgraph/base/embeddings_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -8,12 +9,10 @@ Embeddings resolution base class import time import logging from prometheus_client import Histogram -from argparse import ArgumentParser from .. schema import EmbeddingsRequest, EmbeddingsResponse, Error from .. exceptions import TooManyRequests from .. base import FlowProcessor, ConsumerSpec, ProducerSpec, ParameterSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) @@ -116,4 +115,3 @@ class EmbeddingsService(FlowProcessor): FlowProcessor.add_args(parser) - diff --git a/trustgraph-base/trustgraph/base/flow_processor.py b/trustgraph-base/trustgraph/base/flow_processor.py index 19d7e64e..edf974b3 100644 --- a/trustgraph-base/trustgraph/base/flow_processor.py +++ b/trustgraph-base/trustgraph/base/flow_processor.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Any from argparse import ArgumentParser @@ -8,7 +9,6 @@ from argparse import ArgumentParser import json import logging -from argparse import ArgumentParser from .. schema import Error from .. schema import config_request_queue, config_response_queue @@ -16,7 +16,6 @@ from .. schema import config_push_queue from .. log_level import LogLevel from . async_processor import AsyncProcessor from . flow import Flow -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_client.py b/trustgraph-base/trustgraph/base/graph_embeddings_client.py index 0a38c2f6..fe717bf1 100644 --- a/trustgraph-base/trustgraph/base/graph_embeddings_client.py +++ b/trustgraph-base/trustgraph/base/graph_embeddings_client.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Any import logging diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py b/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py index 31d892a6..cc96a398 100644 --- a/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py +++ b/trustgraph-base/trustgraph/base/graph_embeddings_query_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -7,16 +8,13 @@ embeddings. """ import logging -from argparse import ArgumentParser from .. schema import GraphEmbeddingsRequest, GraphEmbeddingsResponse from .. schema import Error, Term -from argparse import ArgumentParser from . flow_processor import FlowProcessor from . consumer_spec import ConsumerSpec from . producer_spec import ProducerSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py b/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py index 1f128524..e133cf1e 100644 --- a/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py +++ b/trustgraph-base/trustgraph/base/graph_embeddings_store_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -6,12 +7,10 @@ Graph embeddings store base class """ import logging -from argparse import ArgumentParser from .. schema import GraphEmbeddings from .. base import FlowProcessor, ConsumerSpec from .. exceptions import TooManyRequests -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/llm_service.py b/trustgraph-base/trustgraph/base/llm_service.py index aa4cd6df..9fa27782 100644 --- a/trustgraph-base/trustgraph/base/llm_service.py +++ b/trustgraph-base/trustgraph/base/llm_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -8,12 +9,10 @@ LLM text completion base class import time import logging from prometheus_client import Histogram, Info -from argparse import ArgumentParser from .. schema import TextCompletionRequest, TextCompletionResponse, Error from .. exceptions import TooManyRequests from .. base import FlowProcessor, ConsumerSpec, ProducerSpec, ParameterSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/pubsub.py b/trustgraph-base/trustgraph/base/pubsub.py index 34dd2dc0..a7ae3719 100644 --- a/trustgraph-base/trustgraph/base/pubsub.py +++ b/trustgraph-base/trustgraph/base/pubsub.py @@ -1,4 +1,3 @@ - from __future__ import annotations import os diff --git a/trustgraph-base/trustgraph/base/request_response_spec.py b/trustgraph-base/trustgraph/base/request_response_spec.py index d9557d71..d19aae10 100644 --- a/trustgraph-base/trustgraph/base/request_response_spec.py +++ b/trustgraph-base/trustgraph/base/request_response_spec.py @@ -1,4 +1,3 @@ - from __future__ import annotations import uuid diff --git a/trustgraph-base/trustgraph/base/tool_service.py b/trustgraph-base/trustgraph/base/tool_service.py index efae8aae..27ffbfac 100644 --- a/trustgraph-base/trustgraph/base/tool_service.py +++ b/trustgraph-base/trustgraph/base/tool_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -8,12 +9,10 @@ Tool invocation base class import json import logging from prometheus_client import Counter -from argparse import ArgumentParser from .. schema import ToolRequest, ToolResponse, Error from .. exceptions import TooManyRequests from .. base import FlowProcessor, ConsumerSpec, ProducerSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/triples_client.py b/trustgraph-base/trustgraph/base/triples_client.py index 087ec610..a81a5cd0 100644 --- a/trustgraph-base/trustgraph/base/triples_client.py +++ b/trustgraph-base/trustgraph/base/triples_client.py @@ -1,4 +1,5 @@ from __future__ import annotations + from typing import Any from . request_response_spec import RequestResponse, RequestResponseSpec diff --git a/trustgraph-base/trustgraph/base/triples_query_service.py b/trustgraph-base/trustgraph/base/triples_query_service.py index 133430f9..b72f37a3 100644 --- a/trustgraph-base/trustgraph/base/triples_query_service.py +++ b/trustgraph-base/trustgraph/base/triples_query_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -7,16 +8,13 @@ null. Output is a list of triples. """ import logging -from argparse import ArgumentParser from .. schema import TriplesQueryRequest, TriplesQueryResponse, Error from .. schema import Term, Triple -from argparse import ArgumentParser from . flow_processor import FlowProcessor from . consumer_spec import ConsumerSpec from . producer_spec import ProducerSpec -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__) diff --git a/trustgraph-base/trustgraph/base/triples_store_service.py b/trustgraph-base/trustgraph/base/triples_store_service.py index 27b8e6ed..a465e53d 100644 --- a/trustgraph-base/trustgraph/base/triples_store_service.py +++ b/trustgraph-base/trustgraph/base/triples_store_service.py @@ -1,4 +1,5 @@ from __future__ import annotations + from argparse import ArgumentParser """ @@ -6,12 +7,10 @@ Triples store base class """ import logging -from argparse import ArgumentParser from .. schema import Triples from .. base import FlowProcessor, ConsumerSpec from .. exceptions import TooManyRequests -from argparse import ArgumentParser # Module logger logger = logging.getLogger(__name__)