merging

franciscojavierarceo · franciscojavierarceo · commit b76bf4e77e98 · 2024-09-29T15:06:29.000-04:00
Signed-off-by: Francisco Javier Arceo &lt;farceo@redhat.com&gt;
diff --git a/sdk/python/feast/feature_store.py b/sdk/python/feast/feature_store.py
@@ -608,6 +608,8 @@ def _make_inferences(
         update_feature_views_with_inferred_features_and_entities(
             sfvs_to_update, entities + entities_to_update, self.config
         )
+        # We need to attach the time stamp fields to the underlying data sources
+        # and cascade the dependencies
         update_feature_views_with_inferred_features_and_entities(
             odfvs_to_update, entities + entities_to_update, self.config
         )
diff --git a/sdk/python/feast/inference.py b/sdk/python/feast/inference.py
@@ -162,13 +162,8 @@ 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))
@@ -210,15 +205,12 @@ 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,
@@ -266,7 +258,6 @@ 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,
@@ -342,6 +333,4 @@ 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
@@ -162,6 +162,7 @@ def __init__(  # noqa: C901
                 self.source_request_sources[odfv_source.name] = odfv_source
             elif isinstance(odfv_source, FeatureViewProjection):
                 self.source_feature_view_projections[odfv_source.name] = odfv_source
+
             else:
                 self.source_feature_view_projections[odfv_source.name] = (
                     odfv_source.projection

Original file line number	Diff line number	Diff line change
`@@ -608,6 +608,8 @@ def _make_inferences(`
`608`	`608`	`update_feature_views_with_inferred_features_and_entities(`
`609`	`609`	`sfvs_to_update, entities + entities_to_update, self.config`
`610`	`610`	`)`
	`611`	`+ # We need to attach the time stamp fields to the underlying data sources`
	`612`	`+ # and cascade the dependencies`
`611`	`613`	`update_feature_views_with_inferred_features_and_entities(`
`612`	`614`	`odfvs_to_update, entities + entities_to_update, self.config`
`613`	`615`	`)`