Skip to content

Commit 2de2d29

Browse files
achalsachals
committed
CR updates
Signed-off-by: Achal Shah <achals@gmail.com>
1 parent d8ea76f commit 2de2d29

3 files changed

Lines changed: 11 additions & 24 deletions

File tree

‎sdk/python/feast/diff/FcoDiff.py‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
from dataclasses import dataclass
22
from enum import Enum
3-
from typing import Any, List, Set, Tuple, Union, TypeVar, Iterable
4-
from unittest.mock import Base
3+
from typing import Any, Iterable, List, Set, Tuple, TypeVar
54

65
from feast.base_feature_view import BaseFeatureView
76
from feast.entity import Entity
87
from feast.feature_service import FeatureService
98
from feast.feature_table import FeatureTable
10-
from feast.feature_view import FeatureView
11-
from feast.on_demand_feature_view import OnDemandFeatureView
129
from feast.protos.feast.core.Entity_pb2 import Entity as EntityProto
1310
from feast.protos.feast.core.FeatureView_pb2 import FeatureView as FeatureViewProto
14-
from feast.request_feature_view import RequestFeatureView
1511

1612

1713
@dataclass
@@ -48,41 +44,33 @@ def add_fco_diff(self, fco_diff: FcoDiff):
4844
self.fco_diffs.append(fco_diff)
4945

5046

51-
T = TypeVar('T', Entity, BaseFeatureView, FeatureService, FeatureTable)
47+
T = TypeVar("T", Entity, BaseFeatureView, FeatureService, FeatureTable)
5248

5349

5450
def tag_objects_for_keep_delete_add(
5551
existing_objs: Iterable[T], desired_objs: Iterable[T]
56-
) -> Tuple[Iterable[T], Iterable[T], Iterable[T]]:
52+
) -> Tuple[Set[T], Set[T], Set[T]]:
5753
existing_obj_names = {e.name for e in existing_objs}
5854
desired_obj_names = {e.name for e in desired_objs}
5955

60-
objs_to_add = {
61-
e for e in desired_objs if e.name not in existing_obj_names
62-
}
56+
objs_to_add = {e for e in desired_objs if e.name not in existing_obj_names}
6357
objs_to_keep = {e for e in desired_objs if e.name in existing_obj_names}
64-
objs_to_delete = {
65-
e for e in existing_objs if e.name not in desired_obj_names
66-
}
58+
objs_to_delete = {e for e in existing_objs if e.name not in desired_obj_names}
6759

6860
return objs_to_keep, objs_to_delete, objs_to_add
6961

7062

71-
U = TypeVar('U', EntityProto, FeatureViewProto)
63+
U = TypeVar("U", EntityProto, FeatureViewProto)
7264

7365

7466
def tag_proto_objects_for_keep_delete_add(
75-
existing_objs: Iterable[U], desired_objs: Iterable[U]
67+
existing_objs: Iterable[U], desired_objs: Iterable[U]
7668
) -> Tuple[Iterable[U], Iterable[U], Iterable[U]]:
7769
existing_obj_names = {e.spec.name for e in existing_objs}
7870
desired_obj_names = {e.spec.name for e in desired_objs}
7971

80-
objs_to_add = [
81-
e for e in desired_objs if e.spec.name not in existing_obj_names
82-
]
72+
objs_to_add = [e for e in desired_objs if e.spec.name not in existing_obj_names]
8373
objs_to_keep = [e for e in desired_objs if e.spec.name in existing_obj_names]
84-
objs_to_delete = [
85-
e for e in existing_objs if e.spec.name not in desired_obj_names
86-
]
74+
objs_to_delete = [e for e in existing_objs if e.spec.name not in desired_obj_names]
8775

8876
return objs_to_keep, objs_to_delete, objs_to_add

‎sdk/python/feast/registry.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ def diff_between(
143143
entities_to_delete,
144144
entities_to_add,
145145
) = tag_proto_objects_for_keep_delete_add(
146-
current_registry.entities,
147-
new_registry.entities,
146+
current_registry.entities, new_registry.entities,
148147
)
149148

150149
for e in entities_to_add:

‎sdk/python/feast/repo_operations.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation
161161
set(registry.list_entities(project=project)), repo.entities
162162
)
163163
# TODO(achals): This code path should be refactored to handle added & kept entities separately.
164-
entities_to_keep = entities_to_keep.union(entities_to_add)
164+
entities_to_keep = set(entities_to_keep).union(entities_to_add)
165165

166166
views = tag_objects_for_keep_delete_add(
167167
set(registry.list_feature_views(project=project)), repo.feature_views

0 commit comments

Comments
 (0)