add mcp fix

This commit is contained in:
larssand
2026-06-30 21:30:30 +02:00
parent baa3bb95e8
commit 6a63de0e37
2 changed files with 18 additions and 3 deletions

View File

@@ -66,8 +66,9 @@ class GraylogMcpClient:
credentials = base64.b64encode(f"{value}:token".encode("utf-8")).decode("ascii") credentials = base64.b64encode(f"{value}:token".encode("utf-8")).decode("ascii")
return f"Basic {credentials}" return f"Basic {credentials}"
def probe(self) -> dict[str, object]: def probe(self, *, force_new_session: bool = False) -> dict[str, object]:
self.session_id = None if force_new_session:
self.session_id = None
initialized = self._call( initialized = self._call(
"initialize", "initialize",
{"protocolVersion": "2025-06-18", "capabilities": {}, "clientInfo": {"name": "fgAI", "version": "0.1"}}, {"protocolVersion": "2025-06-18", "capabilities": {}, "clientInfo": {"name": "fgAI", "version": "0.1"}},
@@ -90,7 +91,7 @@ class GraylogMcpClient:
except RuntimeError as exc: except RuntimeError as exc:
if not self._should_reconnect(str(exc)): if not self._should_reconnect(str(exc)):
raise raise
self.probe() self.probe(force_new_session=True)
return self._call("tools/call", {"name": name, "arguments": arguments}) return self._call("tools/call", {"name": name, "arguments": arguments})
@staticmethod @staticmethod

View File

@@ -39,6 +39,20 @@ class GraylogMcpTests(unittest.TestCase):
self.assertEqual(status["status"], "connected") self.assertEqual(status["status"], "connected")
self.assertIn("search_messages", status["tools"]) self.assertIn("search_messages", status["tools"])
def test_probe_keeps_existing_session_unless_forced(self):
responses = iter([
_Response({"result": {"serverInfo": {"version": "7.1.6"}}}, session="session-1"),
_Response({}, session="session-1"),
_Response({"result": {"tools": []}}, session="session-1"),
])
client = GraylogMcpClient("http://graylog/api/mcp", "raw-token")
client.session_id = "existing-session"
with patch("fgai.graylog_mcp.request.urlopen", side_effect=responses):
client.probe()
self.assertEqual(client.session_id, "session-1")
def test_call_tool_reinitializes_after_stale_session_error(self): def test_call_tool_reinitializes_after_stale_session_error(self):
responses = iter([ responses = iter([
HTTPError("http://graylog/api/mcp", 404, "stale session", {}, None), HTTPError("http://graylog/api/mcp", 404, "stale session", {}, None),