fix: Fixed filtering based on data_source for ODFVs (#5593)

ntkathole · web-flow · commit c3e6c5623937 · 2025-09-02T07:26:54.000-06:00
Signed-off-by: ntkathole &lt;nikhilkathole2683@gmail.com&gt;
diff --git a/sdk/python/feast/registry_server.py b/sdk/python/feast/registry_server.py
@@ -493,6 +493,16 @@ def ListAllFeatureViews(
                     ):
                         if feature_view_obj.stream_source.name == request.data_source:
                             data_source_match = True
+                    if (
+                        hasattr(feature_view_obj, "source_request_sources")
+                        and feature_view_obj.source_request_sources
+                    ):
+                        for (
+                            request_source
+                        ) in feature_view_obj.source_request_sources.values():
+                            if request_source.name == request.data_source:
+                                data_source_match = True
+                                break
                     if not data_source_match:
                         include_feature_view = False
 
diff --git a/sdk/python/tests/unit/api/test_api_rest_registry.py b/sdk/python/tests/unit/api/test_api_rest_registry.py
@@ -8,7 +8,9 @@
 
 from feast import Entity, FeatureService, FeatureStore, FeatureView, Field, FileSource
 from feast.api.registry.rest.rest_registry_server import RestRegistryServer
+from feast.data_source import RequestSource
 from feast.infra.offline_stores.file_source import SavedDatasetFileStorage
+from feast.on_demand_feature_view import on_demand_feature_view
 from feast.repo_config import RepoConfig
 from feast.saved_dataset import SavedDataset
 from feast.types import Float64, Int64
@@ -107,6 +109,24 @@ def fastapi_test_app():
         storage=saved_dataset_storage,
         tags={"environment": "test", "version": "1.0"},
     )
+    input_request = RequestSource(
+        name="input_request_source",
+        schema=[
+            Field(name="request_feature", dtype=Float64),
+        ],
+    )
+
+    @on_demand_feature_view(
+        sources=[user_profile_feature_view, input_request],
+        schema=[
+            Field(name="combined_feature", dtype=Float64),
+        ],
+        description="On-demand feature view with request source for testing",
+    )
+    def test_on_demand_feature_view(features_df: pd.DataFrame) -> pd.DataFrame:
+        df = pd.DataFrame()
+        df["combined_feature"] = features_df["age"] + features_df["request_feature"]
+        return df
 
     # Apply objects
     store.apply(
@@ -116,6 +136,7 @@ def fastapi_test_app():
             user_behavior_feature_view,
             user_preferences_feature_view,
             user_feature_service,
+            test_on_demand_feature_view,
         ]
     )
     store._registry.apply_saved_dataset(test_saved_dataset, "demo_project")
@@ -181,7 +202,7 @@ def test_feature_views_type_field_via_rest(fastapi_test_app):
     for fv in data["featureViews"]:
         assert "type" in fv
         assert fv["type"] is not None
-        assert fv["type"] == "featureView"
+        assert fv["type"] in ["featureView", "onDemandFeatureView"]
 
     # Test single endpoint
     response = fastapi_test_app.get("/feature_views/user_profile?project=demo_project")
@@ -245,6 +266,26 @@ def test_feature_views_comprehensive_filtering_via_rest(fastapi_test_app):
     data_source_filtered_views = data["featureViews"]
     assert len(data_source_filtered_views) <= len(all_feature_views)
 
+    # Test filtering on-demand feature views by request source data source
+    response = fastapi_test_app.get(
+        "/feature_views?project=demo_project&data_source=input_request_source"
+    )
+    assert response.status_code == 200
+    data = response.json()
+    assert "featureViews" in data
+    odfv_data_source_filtered_views = data["featureViews"]
+
+    # Should find the on-demand feature view that uses the request source
+    assert len(odfv_data_source_filtered_views) > 0
+    odfv_found = False
+    for fv in odfv_data_source_filtered_views:
+        if fv["type"] == "onDemandFeatureView":
+            odfv_found = True
+            break
+    assert odfv_found, (
+        "On-demand feature view should be found when filtering by request source data source"
+    )
+
     response = fastapi_test_app.get(
         "/feature_views?project=demo_project&feature_service=user_service"
     )
