Fix MCP vectorizer cleanup on shutdown failure

Author: vishal-bala

redisvl/mcp/server.py

@@ -76,15 +76,16 @@ async def startup(self) -> None:
 
     async def shutdown(self) -> None:
         """Release owned vectorizer and Redis resources."""
+        vectorizer = self._vectorizer
+        self._vectorizer = None
         try:
-            if self._vectorizer is not None:
-                aclose = getattr(self._vectorizer, "aclose", None)
-                close = getattr(self._vectorizer, "close", None)
+            if vectorizer is not None:
+                aclose = getattr(vectorizer, "aclose", None)
+                close = getattr(vectorizer, "close", None)
                 if callable(aclose):
                     await aclose()
                 elif callable(close):
                     close()
-                self._vectorizer = None
         finally:
             if self._index is not None:
                 index = self._index

tests/integration/test_mcp/test_server_startup.py

@@ -239,3 +239,6 @@ async def test_server_shutdown_disconnects_index_when_vectorizer_close_fails(
         await server.shutdown()
 
     assert index.client is None
+
+    with pytest.raises(RuntimeError, match="has not been started"):
+        await server.get_vectorizer()