Skip to content

Commit 5957da2

Browse files
authored
Remove type comments (feast-dev#1710)
* Remove type comments Signed-off-by: Achal Shah <achals@gmail.com> * Remove more type comments Signed-off-by: Achal Shah <achals@gmail.com> * fix lint Signed-off-by: Achal Shah <achals@gmail.com> * fix lint again by removing imports Signed-off-by: Achal Shah <achals@gmail.com> * Use time_ns() instead of time() Signed-off-by: Achal Shah <achals@gmail.com>
1 parent 0d0492d commit 5957da2

8 files changed

Lines changed: 23 additions & 36 deletions

File tree

sdk/python/feast/client.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,17 @@
4040
from feast.online_response import OnlineResponse, _infer_online_entity_rows
4141
from feast.protos.feast.core.CoreService_pb2 import (
4242
ApplyEntityRequest,
43-
ApplyEntityResponse,
4443
ApplyFeatureTableRequest,
45-
ApplyFeatureTableResponse,
4644
ArchiveProjectRequest,
47-
ArchiveProjectResponse,
4845
CreateProjectRequest,
49-
CreateProjectResponse,
5046
DeleteFeatureTableRequest,
5147
GetEntityRequest,
52-
GetEntityResponse,
5348
GetFeastCoreVersionRequest,
5449
GetFeatureTableRequest,
55-
GetFeatureTableResponse,
5650
ListEntitiesRequest,
57-
ListEntitiesResponse,
5851
ListFeaturesRequest,
59-
ListFeaturesResponse,
6052
ListFeatureTablesRequest,
61-
ListFeatureTablesResponse,
6253
ListProjectsRequest,
63-
ListProjectsResponse,
6454
)
6555
from feast.protos.feast.core.CoreService_pb2_grpc import CoreServiceStub
6656
from feast.protos.feast.serving.ServingService_pb2 import (
@@ -388,7 +378,7 @@ def list_projects(self) -> List[str]:
388378
ListProjectsRequest(),
389379
timeout=self._config.getint(opt.GRPC_CONNECTION_TIMEOUT),
390380
metadata=self._get_grpc_metadata(),
391-
) # type: ListProjectsResponse
381+
)
392382
return list(response.projects)
393383

394384
def create_project(self, project: str):
@@ -408,7 +398,7 @@ def create_project(self, project: str):
408398
CreateProjectRequest(name=project),
409399
timeout=self._config.getint(opt.GRPC_CONNECTION_TIMEOUT),
410400
metadata=self._get_grpc_metadata(),
411-
) # type: CreateProjectResponse
401+
)
412402

413403
def archive_project(self, project):
414404
"""
@@ -430,7 +420,7 @@ def archive_project(self, project):
430420
ArchiveProjectRequest(name=project),
431421
timeout=self._config.getint(opt.GRPC_CONNECTION_TIMEOUT),
432422
metadata=self._get_grpc_metadata(),
433-
) # type: ArchiveProjectResponse
423+
)
434424
except grpc.RpcError as e:
435425
raise grpc.RpcError(e.details())
436426

@@ -523,7 +513,7 @@ def _apply_entity(self, project: str, entity: Entity):
523513
ApplyEntityRequest(project=project, spec=entity_proto), # type: ignore
524514
timeout=self._config.getint(opt.GRPC_CONNECTION_TIMEOUT),
525515
metadata=self._get_grpc_metadata(),
526-
) # type: ApplyEntityResponse
516+
)
527517
except grpc.RpcError as e:
528518
raise grpc.RpcError(e.details())
529519

@@ -558,7 +548,7 @@ def list_entities(
558548
# Get latest entities from Feast Core
559549
entity_protos = self._core_service.ListEntities(
560550
ListEntitiesRequest(filter=filter), metadata=self._get_grpc_metadata(),
561-
) # type: ListEntitiesResponse
551+
)
562552

563553
# Extract entities and return
564554
entities = []
@@ -593,7 +583,7 @@ def get_entity(self, name: str, project: str = None) -> Entity:
593583
get_entity_response = self._core_service.GetEntity(
594584
GetEntityRequest(project=project, name=name.strip()),
595585
metadata=self._get_grpc_metadata(),
596-
) # type: GetEntityResponse
586+
)
597587
except grpc.RpcError as e:
598588
raise grpc.RpcError(e.details())
599589
entity = Entity.from_proto(get_entity_response.entity)
@@ -646,7 +636,7 @@ def _apply_feature_table(self, project: str, feature_table: FeatureTable):
646636
ApplyFeatureTableRequest(project=project, table_spec=feature_table_proto), # type: ignore
647637
timeout=self._config.getint(opt.GRPC_CONNECTION_TIMEOUT),
648638
metadata=self._get_grpc_metadata(),
649-
) # type: ApplyFeatureTableResponse
639+
)
650640
except grpc.RpcError as e:
651641
raise grpc.RpcError(e.details())
652642

@@ -683,7 +673,7 @@ def list_feature_tables(
683673
feature_table_protos = self._core_service.ListFeatureTables(
684674
ListFeatureTablesRequest(filter=filter),
685675
metadata=self._get_grpc_metadata(),
686-
) # type: ListFeatureTablesResponse
676+
)
687677

688678
# Extract feature tables and return
689679
feature_tables = []
@@ -718,7 +708,7 @@ def get_feature_table(self, name: str, project: str = None) -> FeatureTable:
718708
get_feature_table_response = self._core_service.GetFeatureTable(
719709
GetFeatureTableRequest(project=project, name=name.strip()),
720710
metadata=self._get_grpc_metadata(),
721-
) # type: GetFeatureTableResponse
711+
)
722712
except grpc.RpcError as e:
723713
raise grpc.RpcError(e.details())
724714
return FeatureTable.from_proto(get_feature_table_response.table)
@@ -785,7 +775,7 @@ def list_features_by_ref(
785775

786776
feature_protos = self._core_service.ListFeatures(
787777
ListFeaturesRequest(filter=filter), metadata=self._get_grpc_metadata(),
788-
) # type: ListFeaturesResponse
778+
)
789779

790780
# Extract features and return
791781
features_dict = {}

sdk/python/feast/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ def __init__(
112112
if options and isinstance(options, dict):
113113
self._options = options
114114

115-
self._config = config # type: ConfigParser
116-
self._path = path # type: str
115+
self._config = config
116+
self._path = path
117117

118118
def _get(self, option, default, get_method):
119119
fallback = {} if default is _UNSET else {"fallback": default}

sdk/python/feast/entity.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ def __init__(
4949
else:
5050
self._join_key = name
5151

52+
self._labels: MutableMapping[str, str]
5253
if labels is None:
53-
self._labels = dict() # type: MutableMapping[str, str]
54+
self._labels = dict()
5455
else:
5556
self._labels = labels
5657

sdk/python/feast/feature_table.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ def __init__(
5959
self._features = features
6060
self._batch_source = batch_source
6161
self._stream_source = stream_source
62+
63+
self._labels: MutableMapping[str, str]
6264
if labels is None:
63-
self._labels = dict() # type: MutableMapping[str, str]
65+
self._labels = dict()
6466
else:
6567
self._labels = labels
6668

sdk/python/feast/infra/provider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def _get_requested_feature_views_to_features_dict(
172172
"""Create a dict of FeatureView -> List[Feature] for all requested features.
173173
Set full_feature_names to True to have feature names prefixed by their feature view name."""
174174

175-
feature_views_to_feature_map = {} # type: Dict[FeatureView, List[str]]
175+
feature_views_to_feature_map: Dict[FeatureView, List[str]] = {}
176176

177177
for ref in feature_refs:
178178
ref_parts = ref.split(":")

sdk/python/tests/feast_serving_server.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
import grpc
77

8-
from feast.protos.feast.core import FeatureTable_pb2 as FeatureTableProto
9-
from feast.protos.feast.core.CoreService_pb2 import ListFeatureTablesResponse
108
from feast.protos.feast.core.CoreService_pb2_grpc import CoreServiceStub
119
from feast.protos.feast.serving import ServingService_pb2_grpc as Serving
1210
from feast.protos.feast.serving.ServingService_pb2 import GetFeastServingInfoResponse
@@ -19,9 +17,7 @@ def __init__(self, core_url: str = None):
1917
if core_url:
2018
self.__core_channel = None
2119
self.__connect_core(core_url)
22-
self._feature_tables = (
23-
dict()
24-
) # type: Dict[str, FeatureTableProto.FeatureTable]
20+
self._feature_tables: Dict[str, str] = (dict())
2521

2622
def __connect_core(self, core_url: str):
2723
if not core_url:
@@ -42,9 +38,7 @@ def __connect_core(self, core_url: str):
4238

4339
def __get_feature_tables_from_core(self):
4440
# Get updated list of feature tables
45-
feature_tables = (
46-
self._core_service_stub.ListFeatureTables
47-
) # type: ListFeatureTablesResponse
41+
feature_tables = self._core_service_stub.ListFeatureTables
4842

4943
# Store each feature table locally
5044
for feature_table in list(feature_tables.tables):

sdk/python/tests/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ def test_get_online_features(
657657
entity_rows=entity_rows,
658658
feature_refs=["driver:age", "driver:rating", "driver:null_value"],
659659
project="driver_project",
660-
) # type: GetOnlineFeaturesResponse
660+
)
661661
mocked_client._serving_service_stub.GetOnlineFeaturesV2.assert_called_with(
662662
request, metadata=auth_metadata, timeout=10
663663
)
@@ -747,7 +747,7 @@ def test_get_online_features_multi_entities(
747747
entity_rows=entity_rows,
748748
feature_refs=["driver:age", "driver:rating", "driver:null_value"],
749749
project="driver_project",
750-
) # type: GetOnlineFeaturesResponse
750+
)
751751
mocked_client._serving_service_stub.GetOnlineFeaturesV2.assert_called_with(
752752
request, metadata=auth_metadata, timeout=10
753753
)

sdk/python/tests/test_offline_online_store_consistency.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def prep_bq_fs_and_fv(
7878
df = create_dataset()
7979

8080
job_config = bigquery.LoadJobConfig()
81-
table_ref = f"{gcp_project}.{bigquery_dataset}.{bq_source_type}_correctness_{int(time.time())}"
81+
table_ref = f"{gcp_project}.{bigquery_dataset}.{bq_source_type}_correctness_{int(time.time_ns())}"
8282
query = f"SELECT * FROM `{table_ref}`"
8383
job = client.load_table_from_dataframe(df, table_ref, job_config=job_config)
8484
job.result()

0 commit comments

Comments
 (0)