fix: refactor MCP imports to use the correct module path

Signed-off-by: yassinnouh21 <yassinnouh21@gmail.com>
feast-dev · franciscojavierarceo · Jun 4, 2025 · May 29, 2025 · May 29, 2025 · May 30, 2025
commit 1bec81fbdadca9df3da9f9015c9623eb9c116b95
diff --git a/pyproject.toml b/pyproject.toml
@@ -116,6 +116,7 @@ snowflake = [
     "snowflake-connector-python[pandas]>=3.7,<4",
 ]
 sqlite_vec = ["sqlite-vec==v0.1.6"]
+mcp = ["fastapi_mcp"]
 
 ci = [
     "build",
@@ -162,13 +163,13 @@ ci = [
     "types-setuptools",
     "types-tabulate",
     "virtualenv<20.24.2",
-    "feast[aws, azure, cassandra, clickhouse, couchbase, delta, docling, duckdb, elasticsearch, faiss, gcp, ge, go, grpcio, hazelcast, hbase, ibis, ikv, k8s, milvus, mssql, mysql, opentelemetry, spark, trino, postgres, pytorch, qdrant, redis, singlestore, snowflake, sqlite_vec]"
+    "feast[aws, azure, cassandra, clickhouse, couchbase, delta, docling, duckdb, elasticsearch, faiss, gcp, ge, go, grpcio, hazelcast, hbase, ibis, ikv, k8s, mcp, milvus, mssql, mysql, opentelemetry, spark, trino, postgres, pytorch, qdrant, redis, singlestore, snowflake, sqlite_vec]"
 ]
 nlp = ["feast[docling, milvus, pytorch]"]
 dev = ["feast[ci]"]
 docs = ["feast[ci]"]
 # used for the 'feature-server' container image build
-minimal = ["feast[aws, gcp, snowflake, redis, go, mysql, postgres-c, opentelemetry, grpcio, k8s, duckdb, milvus]"]
+minimal = ["feast[aws, gcp, snowflake, redis, go, mysql, postgres-c, opentelemetry, grpcio, k8s, duckdb, mcp, milvus]"]
 minimal-sdist-build = [
     "feast[minimal]",
     "feast[ibis]",

@@ -463,7 +463,7 @@ def _add_mcp_support_if_enabled(app, store: "feast.FeatureStore"):
             and store.config.feature_server.type == "mcp"
             and getattr(store.config.feature_server, "mcp_enabled", False)
         ):
-            from feast.infra.feature_servers.mcp_server import add_mcp_support_to_app
+            from feast.infra.mcp_servers.mcp_server import add_mcp_support_to_app
 
             mcp_server = add_mcp_support_to_app(app, store, store.config.feature_server)
 

diff --git a/sdk/python/feast/infra/feature_servers/mcp_config.py b/sdk/python/feast/infra/feature_servers/mcp_config.py
diff --git a/sdk/python/feast/infra/feature_servers/mcp_server.py b/sdk/python/feast/infra/feature_servers/mcp_server.py
@@ -105,7 +105,7 @@
 
 FEATURE_SERVER_CONFIG_CLASS_FOR_TYPE = {
     "local": "feast.infra.feature_servers.local_process.config.LocalFeatureServerConfig",
-    "mcp": "feast.infra.feature_servers.mcp_config.McpFeatureServerConfig",
+    "mcp": "feast.infra.mcp_servers.mcp_config.McpFeatureServerConfig",
 }
 
 ALLOWED_AUTH_TYPES = ["no_auth", "kubernetes", "oidc"]

@@ -1,7 +1,7 @@
 from unittest.mock import Mock, patch
 
 from feast.feature_store import FeatureStore
-from feast.infra.feature_servers.mcp_config import McpFeatureServerConfig
+from feast.infra.mcp_servers.mcp_config import McpFeatureServerConfig
 
 
 class TestMcpFeatureServerConfig:
@@ -39,14 +39,14 @@ def test_custom_config(self):
         assert config.transformation_service_endpoint == "custom-host:8080"
 
 
-@patch("feast.infra.feature_servers.mcp_server.MCP_AVAILABLE", True)
+@patch("feast.infra.mcp_servers.mcp_server.MCP_AVAILABLE", True)
 class TestMCPIntegration:
     """Test MCP integration functionality."""
 
-    @patch("feast.infra.feature_servers.mcp_server.FastApiMCP")
+    @patch("feast.infra.mcp_servers.mcp_server.FastApiMCP")
     def test_add_mcp_support_success(self, mock_fast_api_mcp):
         """Test successful MCP support addition."""
-        from feast.infra.feature_servers.mcp_server import add_mcp_support_to_app
+        from feast.infra.mcp_servers.mcp_server import add_mcp_support_to_app
 
         mock_app = Mock()
         mock_store = Mock(spec=FeatureStore)
@@ -73,10 +73,10 @@ def test_add_mcp_support_success(self, mock_fast_api_mcp):
         # Verify the result
         assert result == mock_mcp_instance
 
-    @patch("feast.infra.feature_servers.mcp_server.FastApiMCP")
+    @patch("feast.infra.mcp_servers.mcp_server.FastApiMCP")
     def test_add_mcp_support_with_defaults(self, mock_fast_api_mcp):
         """Test MCP support addition with default configuration values."""
-        from feast.infra.feature_servers.mcp_server import add_mcp_support_to_app
+        from feast.infra.mcp_servers.mcp_server import add_mcp_support_to_app
 
         mock_app = Mock()
         mock_store = Mock(spec=FeatureStore)
@@ -99,13 +99,13 @@ def test_add_mcp_support_with_defaults(self, mock_fast_api_mcp):
         assert result == mock_mcp_instance
 
 
-@patch("feast.infra.feature_servers.mcp_server.MCP_AVAILABLE", False)
+@patch("feast.infra.mcp_servers.mcp_server.MCP_AVAILABLE", False)
 class TestMCPNotAvailable:
     """Test behavior when MCP is not available."""
 
     def test_add_mcp_support_mcp_not_available(self):
         """Test add_mcp_support_to_app when MCP is not available."""
-        from feast.infra.feature_servers.mcp_server import add_mcp_support_to_app
+        from feast.infra.mcp_servers.mcp_server import add_mcp_support_to_app
 
         mock_app = Mock()
         mock_store = Mock()
@@ -132,7 +132,7 @@ def test_add_mcp_support_if_enabled_exception(self, mock_logger):
 
         # Mock the import to raise an exception
         with patch(
-            "feast.infra.feature_servers.mcp_server.add_mcp_support_to_app",
+            "feast.infra.mcp_servers.mcp_server.add_mcp_support_to_app",
             side_effect=Exception("Test error"),
         ):
             _add_mcp_support_if_enabled(mock_app, mock_store)