Skip to content

chore: Deprecate value type #2611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feast-ci-bot merged 17 commits into from
May 4, 2022
Merged

chore: Deprecate value type #2611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
59987e1
Switch `entities` from List[str] to List[Entity]
felixwang9817 Apr 25, 2022
1632d9d
Remove `value_type` from SDK
felixwang9817 Apr 26, 2022
4897511
Remove `value_type` from tests
felixwang9817 Apr 26, 2022
428508c
Deprecate `value_type` parameter for Entity
felixwang9817 May 2, 2022
523e021
Add fields for entities to avoid type inference after removing `value…
felixwang9817 Apr 26, 2022
7dda0b4
Fix Go
felixwang9817 May 2, 2022
ac068ec
Fix type inference
felixwang9817 May 3, 2022
d0200ff
Another fix
felixwang9817 May 3, 2022
121480d
Another fix
felixwang9817 May 3, 2022
1f6c700
Rename Entities to EntityNames in go
felixwang9817 May 3, 2022
b0f7ac6
Rename lookup
felixwang9817 May 3, 2022
c83cd08
Rename Feature to Field
felixwang9817 May 3, 2022
acb401f
Clean up inference
felixwang9817 May 3, 2022
b32ac5c
Refactor
felixwang9817 May 3, 2022
e1a4c41
Use old `value_type` attribute if it still exists
felixwang9817 May 3, 2022
8593910
Refactor
felixwang9817 May 3, 2022
50f03b9
Add TODO
felixwang9817 May 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor 
Signed-off-by: Felix Wang <wangfelix98@gmail.com>
  • Loading branch information
@felixwang9817
felixwang9817 committed May 4, 2022
commit 8593910e8ab592d6eb9e483f19cb1885fbc887b9
7 changes: 5 additions & 2 deletions sdk/python/feast/feature_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ def _list_feature_views(
):
if hide_dummy_entity and fv.entities[0] == DUMMY_ENTITY_NAME:
fv.entities = []
fv.entity_columns = []
feature_views.append(fv)
return feature_views

Expand Down Expand Up @@ -1555,8 +1556,10 @@ def _get_entity_maps(
entity.join_key, entity.join_key
)
entity_name_to_join_key_map[entity_name] = join_key
for entity_field in feature_view.entity_columns:
entity_type_map[entity_field.name] = entity_field.dtype.to_value_type()
for entity_column in feature_view.entity_columns:
entity_type_map[
entity_column.name
] = entity_column.dtype.to_value_type()

return (
entity_name_to_join_key_map,
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/feast/inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def update_feature_views_with_inferred_features_and_entities(
not in [entity_column.name for entity_column in fv.entity_columns]
and entity.value_type != ValueType.UNKNOWN
):
entity_column.append(
fv.entity_columns.append(
Field(
name=entity.join_key, dtype=from_value_type(entity.value_type),
)
Expand Down
5 changes: 2 additions & 3 deletions sdk/python/feast/infra/offline_stores/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,9 @@ def evaluate_historical_retrieval():
# Build a list of entity columns to join on (from the right table)
join_keys = []

for entity_name in feature_view.entities:
entity = registry.get_entity(entity_name, project)
for entity_column in feature_view.entity_columns:
join_key = feature_view.projection.join_key_map.get(
entity.join_key, entity.join_key
entity_column.name, entity_column.name
)
join_keys.append(join_key)

Expand Down
15 changes: 7 additions & 8 deletions sdk/python/feast/infra/offline_stores/offline_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,9 @@ def get_expected_join_keys(
) -> Set[str]:
join_keys = set()
for feature_view in feature_views:
for entity_name in feature_view.entities:
entity = registry.get_entity(entity_name, project)
for entity_column in feature_view.entity_columns:
join_key = feature_view.projection.join_key_map.get(
entity.join_key, entity.join_key
entity_column.name, entity_column.name
)
join_keys.add(join_key)
return join_keys
Expand Down Expand Up @@ -113,14 +112,14 @@ def get_feature_view_query_context(

query_context = []
for feature_view, features in feature_views_to_feature_map.items():
join_keys, entity_selections = [], []
for entity_name in feature_view.entities:
entity = registry.get_entity(entity_name, project)
join_keys: List[str] = []
entity_selections: List[str] = []
for entity_column in feature_view.entity_columns:
join_key = feature_view.projection.join_key_map.get(
entity.join_key, entity.join_key
entity_column.name, entity_column.name
)
join_keys.append(join_key)
entity_selections.append(f"{entity.join_key} AS {join_key}")
entity_selections.append(f"{entity_column.name} AS {join_key}")

if isinstance(feature_view.ttl, timedelta):
ttl_seconds = int(feature_view.ttl.total_seconds())
Expand Down