merged

Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
feast-dev · franciscojavierarceo · Oct 10, 2024 · Sep 24, 2024 · Aug 17, 2024 · Sep 24, 2024
commit 58280aaa22a8792e8e382cca9d030d5f425fa7bf
@@ -608,6 +608,9 @@ def _make_inferences(
         update_feature_views_with_inferred_features_and_entities(
             sfvs_to_update, entities + entities_to_update, self.config
         )
+        update_feature_views_with_inferred_features_and_entities(
+            odfvs_to_update, entities + entities_to_update, self.config
+        )
         # TODO(kevjumba): Update schema inferrence
         for sfv in sfvs_to_update:
             if not sfv.schema:

diff --git a/sdk/python/feast/feature_view.py b/sdk/python/feast/feature_view.py
@@ -132,7 +132,6 @@ def __init__(
         """
         self.name = name
         self.entities = [e.name for e in entities] if entities else [DUMMY_ENTITY_NAME]
-        print('fv', self.entities)
         self.ttl = ttl
         schema = schema or []
 

@@ -16,6 +16,7 @@
 from feast.on_demand_feature_view import OnDemandFeatureView
 from feast.repo_config import RepoConfig
 from feast.stream_feature_view import StreamFeatureView
+from feast.on_demand_feature_view import OnDemandFeatureView
 from feast.types import String
 from feast.value_type import ValueType
 
@@ -161,8 +162,13 @@ def update_feature_views_with_inferred_features_and_entities(
 
         # Infer a dummy entity column for entityless feature views.
         if (
+<<<<<<< HEAD
             len(fv_entities) == 1
             and fv_entities[0] == DUMMY_ENTITY_NAME
+=======
+            len(fv.entities) == 1
+            and fv.entities[0] == DUMMY_ENTITY_NAME
+>>>>>>> 743ae513 (storing current progress...things are getting overriden in the _infer_features_and_entities() method in FeatureStore...that is another thing we have to chnage)
             and not entity_columns
         ):
             entity_columns.append(Field(name=DUMMY_ENTITY_ID, dtype=String))
@@ -204,11 +210,15 @@ def _infer_features_and_entities(
         run_inference_for_features: Whether to run inference for features.
         config: The config for the current feature store.
     """
+<<<<<<< HEAD
     if isinstance(fv, OnDemandFeatureView):
         return _infer_on_demand_features_and_entities(
             fv, join_keys, run_inference_for_features, config
         )
 
+=======
+    entity_columns = []
+>>>>>>> 743ae513 (storing current progress...things are getting overriden in the _infer_features_and_entities() method in FeatureStore...that is another thing we have to chnage)
     columns_to_exclude = {
         fv.batch_source.timestamp_field,
         fv.batch_source.created_timestamp_column,
@@ -233,9 +243,9 @@ def _infer_features_and_entities(
                 ),
             )
             if field.name not in [
-                entity_column.name for entity_column in fv.entity_columns
+                entity_column.name for entity_column in entity_columns
             ]:
-                fv.entity_columns.append(field)
+                entity_columns.append(field)
         elif not re.match(
             "^__|__$", col_name
         ):  # double underscores often signal an internal-use column
@@ -256,6 +266,7 @@ def _infer_features_and_entities(
                 if field.name not in [feature.name for feature in fv.features]:
                     fv.features.append(field)
 
+<<<<<<< HEAD
 
 def _infer_on_demand_features_and_entities(
     fv: OnDemandFeatureView,
@@ -331,4 +342,6 @@ def _infer_on_demand_features_and_entities(
                         feature.name for feature in source_feature_view.features
                     ]:
                         source_feature_view.features.append(field)
+=======
+>>>>>>> 743ae513 (storing current progress...things are getting overriden in the _infer_features_and_entities() method in FeatureStore...that is another thing we have to chnage)
     fv.entity_columns = entity_columns
diff --git a/sdk/python/feast/on_demand_feature_view.py b/sdk/python/feast/on_demand_feature_view.py
@@ -132,7 +132,6 @@ def __init__(  # noqa: C901
 
         schema = schema or []
         self.entities = [e.name for e in entities] if entities else [DUMMY_ENTITY_NAME]
-        print('odfv', self.entities)
         self.mode = mode.lower()
 
         if self.mode not in {"python", "pandas", "substrait"}:

@@ -183,9 +183,9 @@ def python_singleton_view(inputs: dict[str, Any]) -> dict[str, Any]:
             self.store.write_to_online_store(
                 feature_view_name="driver_hourly_stats", df=driver_df
             )
-            assert len(self.store.list_all_feature_views()) == 5
+            assert len(self.store.list_all_feature_views()) == 4
             assert len(self.store.list_feature_views()) == 1
-            assert len(self.store.list_on_demand_feature_views()) == 4
+            assert len(self.store.list_on_demand_feature_views()) == 3
             assert len(self.store.list_stream_feature_views()) == 0
 
     def test_python_pandas_parity(self):
@@ -616,6 +616,11 @@ def python_stored_writes_feature_view(
             assert len(self.store.list_feature_views()) == 1
             assert len(self.store.list_on_demand_feature_views()) == 1
             assert len(self.store.list_stream_feature_views()) == 0
+            assert driver_stats_fv.entity_columns == \
+                   self.store.get_feature_view('driver_hourly_stats').entity_columns
+            assert self.store.get_on_demand_feature_view('python_stored_writes_feature_view').entity_columns == \
+                     self.store.get_feature_view('driver_hourly_stats').entity_columns
+
     def test_stored_writes(self):
         current_datetime = _utc_now()
         entity_rows_to_write = [