Skip to content

Commit d93274f

Browse files
committed
Remove references to v0.4 protos and add fix for test from v0.4
1 parent 5601a09 commit d93274f

File tree

4 files changed

+7
-35
lines changed

4 files changed

+7
-35
lines changed

sdk/python/feast/client.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import os
1818
import time
1919
from collections import OrderedDict
20+
from math import ceil
2021
from typing import Dict, Union
2122
from typing import List
2223
from urllib.parse import urlparse
@@ -36,7 +37,6 @@
3637
GetFeatureSetResponse,
3738
)
3839
from feast.core.CoreService_pb2_grpc import CoreServiceStub
39-
from feast.core.FeatureSet_pb2 import FeatureSetStatus
4040
from feast.feature_set import FeatureSet, Entity
4141
from feast.job import Job
4242
from feast.loaders.abstract_producer import get_producer
@@ -336,11 +336,15 @@ def get_batch_features(
336336
"feature_set_name:version:feature_name".
337337
338338
entity_rows (Union[pd.DataFrame, str]):
339+
Either:
339340
Pandas dataframe containing entities and a 'datetime' column.
340341
Each entity in a feature set must be present as a column in this
341342
dataframe. The datetime column must contain timestamps in
342343
datetime64 format.
343344
345+
Or:
346+
A file path in AVRO format representing the entity rows.
347+
344348
Returns:
345349
feast.job.Job:
346350
Returns a job object that can be used to monitor retrieval
@@ -794,7 +798,7 @@ def _read_table_from_source(
794798

795799
# Write table as parquet file with a specified row_group_size
796800
tmp_table_name = f"{int(time.time())}.parquet"
797-
row_group_size = min(int(table.num_rows/max_workers), chunk_size)
801+
row_group_size = min(ceil(table.num_rows / max_workers), chunk_size)
798802
pq.write_table(table=table, where=tmp_table_name,
799803
row_group_size=row_group_size)
800804

sdk/python/feast/feature_set.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
import pandas as pd
2121
import pyarrow as pa
22-
from feast.core.FeatureSet_pb2 import FeatureSet as FeatureSetProto
23-
from feast.core.FeatureSet_pb2 import FeatureSetMeta as FeatureSetMetaProto
2422
from feast.core.FeatureSet_pb2 import FeatureSetSpec as FeatureSetSpecProto
2523
from feast.entity import Entity
2624
from feast.feature import Feature, Field

sdk/python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"googleapis-common-protos==1.*",
3333
"google-cloud-bigquery-storage==0.7.*",
3434
"grpcio==1.*",
35-
"pandas==0.*",
35+
"pandas>=0.25.0",
3636
"pandavro==1.5.*",
3737
"protobuf>=3.10",
3838
"PyYAML==5.1.*",

sdk/python/tests/test_client.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -385,36 +385,6 @@ def test_feature_set_ingest_success(self, dataframe, client, mocker):
385385
# Ingest data into Feast
386386
client.ingest("driver-feature-set", dataframe)
387387

388-
@pytest.mark.parametrize("dataframe,exception", [(dataframes.GOOD, TimeoutError)])
389-
def test_feature_set_ingest_fail_if_pending(
390-
self, dataframe, exception, client, mocker
391-
):
392-
with pytest.raises(exception):
393-
driver_fs = FeatureSet(
394-
"driver-feature-set",
395-
source=KafkaSource(brokers="kafka:9092", topic="test"),
396-
)
397-
driver_fs.add(Feature(name="feature_1", dtype=ValueType.FLOAT))
398-
driver_fs.add(Feature(name="feature_2", dtype=ValueType.STRING))
399-
driver_fs.add(Feature(name="feature_3", dtype=ValueType.INT64))
400-
driver_fs.add(Entity(name="entity_id", dtype=ValueType.INT64))
401-
402-
# Register with Feast core
403-
client.apply(driver_fs)
404-
driver_fs = driver_fs.to_proto()
405-
driver_fs.meta.status = FeatureSetStatus.STATUS_PENDING
406-
407-
mocker.patch.object(
408-
client._core_service_stub,
409-
"GetFeatureSet",
410-
return_value=GetFeatureSetResponse(feature_set=driver_fs),
411-
)
412-
413-
# Need to create a mock producer
414-
with patch("feast.client.get_producer") as mocked_queue:
415-
# Ingest data into Feast
416-
client.ingest("driver-feature-set", dataframe, timeout=1)
417-
418388
@pytest.mark.parametrize(
419389
"dataframe,exception",
420390
[

0 commit comments

Comments
 (0)