Rebase

Signed-off-by: Mihai Criveti <[email protected]>

Author: crivetimihai

mcpgateway/alembic/versions/aac21d6f9522_merge_ca_cert_and_observability_heads.py

@@ -6,21 +6,19 @@
 Create Date: 2025-11-08 21:43:56.381588
 
 """
+# Standard
 from typing import Sequence, Union
 
-
 # revision identifiers, used by Alembic.
-revision: str = 'aac21d6f9522'
-down_revision: Union[str, Sequence[str], None] = ('f9101f3b00e3', 'j4d5e6f7g8h9')
+revision: str = "aac21d6f9522"
+down_revision: Union[str, Sequence[str], None] = ("f9101f3b00e3", "j4d5e6f7g8h9")
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
-    pass
 
 
 def downgrade() -> None:
     """Downgrade schema."""
-    pass

mcpgateway/services/tool_service.py

@@ -39,17 +39,17 @@
 from sqlalchemy.orm import Session
 
 # First-Party
+from mcpgateway.common.models import Gateway as PydanticGateway
+from mcpgateway.common.models import TextContent
+from mcpgateway.common.models import Tool as PydanticTool
+from mcpgateway.common.models import ToolResult
 from mcpgateway.config import settings
 from mcpgateway.db import A2AAgent as DbA2AAgent
 from mcpgateway.db import EmailTeam
 from mcpgateway.db import Gateway as DbGateway
 from mcpgateway.db import server_tool_association
 from mcpgateway.db import Tool as DbTool
 from mcpgateway.db import ToolMetric
-from mcpgateway.common.models import Gateway as PydanticGateway
-from mcpgateway.common.models import TextContent
-from mcpgateway.common.models import Tool as PydanticTool
-from mcpgateway.common.models import ToolResult
 from mcpgateway.observability import create_span
 from mcpgateway.plugins.framework import GlobalContext, HttpHeaderPayload, PluginError, PluginManager, PluginViolationError, ToolHookType, ToolPostInvokePayload, ToolPreInvokePayload
 from mcpgateway.plugins.framework.constants import GATEWAY_METADATA, TOOL_METADATA
@@ -446,7 +446,7 @@ def _extract_and_validate_structured_content(self, tool: DbTool, tool_result: "T
 
         Examples:
                 >>> from mcpgateway.services.tool_service import ToolService
-                >>> from mcpgateway.models import TextContent, ToolResult
+                >>> from mcpgateway.common.models import TextContent, ToolResult
                 >>> import json
                 >>> service = ToolService()
                 >>> # No schema declared -> nothing to validate