Skip to content

Commit 58280aa

Browse files
franciscojavierarceofranciscojavierarceo
committed
merged
Signed-off-by: Francisco Javier Arceo <farceo@redhat.com>
1 parent 9d496ba commit 58280aa

File tree

5 files changed

+25
-6
lines changed

5 files changed

+25
-6
lines changed

‎sdk/python/feast/feature_store.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,9 @@ def _make_inferences(
608608
update_feature_views_with_inferred_features_and_entities(
609609
sfvs_to_update, entities + entities_to_update, self.config
610610
)
611+
update_feature_views_with_inferred_features_and_entities(
612+
odfvs_to_update, entities + entities_to_update, self.config
613+
)
611614
# TODO(kevjumba): Update schema inferrence
612615
for sfv in sfvs_to_update:
613616
if not sfv.schema:

‎sdk/python/feast/feature_view.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ def __init__(
132132
"""
133133
self.name = name
134134
self.entities = [e.name for e in entities] if entities else [DUMMY_ENTITY_NAME]
135-
print('fv', self.entities)
136135
self.ttl = ttl
137136
schema = schema or []
138137

‎sdk/python/feast/inference.py‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
from feast.on_demand_feature_view import OnDemandFeatureView
1717
from feast.repo_config import RepoConfig
1818
from feast.stream_feature_view import StreamFeatureView
19+
from feast.on_demand_feature_view import OnDemandFeatureView
1920
from feast.types import String
2021
from feast.value_type import ValueType
2122

@@ -161,8 +162,13 @@ def update_feature_views_with_inferred_features_and_entities(
161162

162163
# Infer a dummy entity column for entityless feature views.
163164
if (
165+
<<<<<<< HEAD
164166
len(fv_entities) == 1
165167
and fv_entities[0] == DUMMY_ENTITY_NAME
168+
=======
169+
len(fv.entities) == 1
170+
and fv.entities[0] == DUMMY_ENTITY_NAME
171+
>>>>>>> 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)
166172
and not entity_columns
167173
):
168174
entity_columns.append(Field(name=DUMMY_ENTITY_ID, dtype=String))
@@ -204,11 +210,15 @@ def _infer_features_and_entities(
204210
run_inference_for_features: Whether to run inference for features.
205211
config: The config for the current feature store.
206212
"""
213+
<<<<<<< HEAD
207214
if isinstance(fv, OnDemandFeatureView):
208215
return _infer_on_demand_features_and_entities(
209216
fv, join_keys, run_inference_for_features, config
210217
)
211218

219+
=======
220+
entity_columns = []
221+
>>>>>>> 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)
212222
columns_to_exclude = {
213223
fv.batch_source.timestamp_field,
214224
fv.batch_source.created_timestamp_column,
@@ -233,9 +243,9 @@ def _infer_features_and_entities(
233243
),
234244
)
235245
if field.name not in [
236-
entity_column.name for entity_column in fv.entity_columns
246+
entity_column.name for entity_column in entity_columns
237247
]:
238-
fv.entity_columns.append(field)
248+
entity_columns.append(field)
239249
elif not re.match(
240250
"^__|__$", col_name
241251
): # double underscores often signal an internal-use column
@@ -256,6 +266,7 @@ def _infer_features_and_entities(
256266
if field.name not in [feature.name for feature in fv.features]:
257267
fv.features.append(field)
258268

269+
<<<<<<< HEAD
259270

260271
def _infer_on_demand_features_and_entities(
261272
fv: OnDemandFeatureView,
@@ -331,4 +342,6 @@ def _infer_on_demand_features_and_entities(
331342
feature.name for feature in source_feature_view.features
332343
]:
333344
source_feature_view.features.append(field)
345+
=======
346+
>>>>>>> 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)
334347
fv.entity_columns = entity_columns

‎sdk/python/feast/on_demand_feature_view.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ def __init__( # noqa: C901
132132

133133
schema = schema or []
134134
self.entities = [e.name for e in entities] if entities else [DUMMY_ENTITY_NAME]
135-
print('odfv', self.entities)
136135
self.mode = mode.lower()
137136

138137
if self.mode not in {"python", "pandas", "substrait"}:

‎sdk/python/tests/unit/test_on_demand_python_transformation.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ def python_singleton_view(inputs: dict[str, Any]) -> dict[str, Any]:
183183
self.store.write_to_online_store(
184184
feature_view_name="driver_hourly_stats", df=driver_df
185185
)
186-
assert len(self.store.list_all_feature_views()) == 5
186+
assert len(self.store.list_all_feature_views()) == 4
187187
assert len(self.store.list_feature_views()) == 1
188-
assert len(self.store.list_on_demand_feature_views()) == 4
188+
assert len(self.store.list_on_demand_feature_views()) == 3
189189
assert len(self.store.list_stream_feature_views()) == 0
190190

191191
def test_python_pandas_parity(self):
@@ -616,6 +616,11 @@ def python_stored_writes_feature_view(
616616
assert len(self.store.list_feature_views()) == 1
617617
assert len(self.store.list_on_demand_feature_views()) == 1
618618
assert len(self.store.list_stream_feature_views()) == 0
619+
assert driver_stats_fv.entity_columns == \
620+
self.store.get_feature_view('driver_hourly_stats').entity_columns
621+
assert self.store.get_on_demand_feature_view('python_stored_writes_feature_view').entity_columns == \
622+
self.store.get_feature_view('driver_hourly_stats').entity_columns
623+
619624
def test_stored_writes(self):
620625
current_datetime = _utc_now()
621626
entity_rows_to_write = [

0 commit comments

Comments
 (0)