more fixes

achals · achals · commit b988748e5d09 · 2022-06-08T10:06:40.000-07:00
Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;
diff --git a/sdk/python/feast/base_feature_view.py b/sdk/python/feast/base_feature_view.py
@@ -116,7 +116,14 @@ def __getitem__(self, item):
         assert isinstance(item, list)
 
         cp = self.__copy__()
-        cp.projection.features = item
+        if self.features:
+            referenced_features = []
+            for feature in self.features:
+                if feature.name in item:
+                    referenced_features.append(feature)
+            cp.projection.features = referenced_features
+        else:
+            cp.projection.desired_features = item
 
         return cp
 
diff --git a/sdk/python/feast/feature_service.py b/sdk/python/feast/feature_service.py
@@ -111,10 +111,23 @@ def infer_features(self, fvs_to_update: Optional[Dict[str, FeatureView]] = None)
             if isinstance(feature_grouping, BaseFeatureView):
                 # For feature services that depend on an unspecified feature view, apply inferred schema
                 if fvs_to_update and feature_grouping.name in fvs_to_update:
-                    if feature_grouping.projection.features:
-                        assert set(feature_grouping.projection.features).issubset(
-                            fvs_to_update[feature_grouping.name].features
+                    if feature_grouping.projection.desired_features:
+                        desired_features = set(
+                            feature_grouping.projection.desired_features
                         )
+                        actual_features = set(
+                            [
+                                f.name
+                                for f in fvs_to_update[feature_grouping.name].features
+                            ]
+                        )
+                        assert desired_features.issubset(actual_features)
+                        # We need to set the features for the projection at this point so we ensure we're starting with
+                        # an empty list.
+                        feature_grouping.projection.features = []
+                        for f in fvs_to_update[feature_grouping.name].features:
+                            if f.name in desired_features:
+                                feature_grouping.projection.features.append(f)
                     else:
                         feature_grouping.projection.features = fvs_to_update[
                             feature_grouping.name
diff --git a/sdk/python/feast/feature_view_projection.py b/sdk/python/feast/feature_view_projection.py
@@ -27,6 +27,7 @@ class FeatureViewProjection:
 
     name: str
     name_alias: Optional[str]
+    desired_features: List[str]
     features: List[Field]
     join_key_map: Dict[str, str] = {}
 
@@ -51,6 +52,7 @@ def from_proto(proto: FeatureViewProjectionProto):
             name_alias=proto.feature_view_name_alias,
             features=[],
             join_key_map=dict(proto.join_key_map),
+            desired_features=[],
         )
         for feature_column in proto.feature_columns:
             feature_view_projection.features.append(Field.from_proto(feature_column))
@@ -63,6 +65,7 @@ def from_definition(base_feature_view: "BaseFeatureView"):
             name=base_feature_view.name,
             name_alias=None,
             features=base_feature_view.features,
+            desired_features=[],
         )
 
     def get_feature(self, feature_name: str) -> Field:
diff --git a/sdk/python/feast/field.py b/sdk/python/feast/field.py
@@ -50,6 +50,9 @@ def __init__(
         self.tags = tags or {}
 
     def __eq__(self, other):
+        if type(self) != type(other):
+            return False
+
         if (
             self.name != other.name
             or self.dtype != other.dtype
diff --git a/sdk/python/tests/integration/registration/test_inference.py b/sdk/python/tests/integration/registration/test_inference.py
@@ -415,8 +415,10 @@ def test_update_feature_services_with_inferred_features(simple_dataset_1):
             name="fs_1", features=[feature_view_1[["string_col"]], feature_view_2]
         )
         assert len(feature_service.feature_view_projections) == 2
-        assert len(feature_service.feature_view_projections[0].features) == 1
+        assert len(feature_service.feature_view_projections[0].features) == 0
+        assert len(feature_service.feature_view_projections[0].desired_features) == 1
         assert len(feature_service.feature_view_projections[1].features) == 0
+        assert len(feature_service.feature_view_projections[1].desired_features) == 0
 
         update_feature_views_with_inferred_features_and_entities(
             [feature_view_1, feature_view_2],
