From a2d6c969d37ef60630350dc5eb13cf310b1de1a7 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 6 Apr 2022 10:36:05 -0700 Subject: [PATCH 1/4] Fix Signed-off-by: Kevin Zhang --- examples/java-demo/feature_repo/driver_repo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/java-demo/feature_repo/driver_repo.py b/examples/java-demo/feature_repo/driver_repo.py index 7eb98d2c21..e07139fbe3 100644 --- a/examples/java-demo/feature_repo/driver_repo.py +++ b/examples/java-demo/feature_repo/driver_repo.py @@ -1,6 +1,6 @@ import pandas as pd from feast import Entity, Feature, FeatureView, FileSource, ValueType -from feast.data_source import RequestSource +from feast.data_source import RequestDataSource from feast.on_demand_feature_view import on_demand_feature_view from feast.request_feature_view import RequestFeatureView from google.protobuf.duration_pb2 import Duration @@ -28,7 +28,7 @@ # Define a request data source which encodes features / information only # available at request time (e.g. part of the user initiated HTTP request) -input_request = RequestSource( +input_request = RequestDataSource( name="vals_to_add", schema={"val_to_add": ValueType.INT64, "val_to_add_2": ValueType.INT64}, ) @@ -55,7 +55,7 @@ def transformed_conv_rate(inputs: pd.DataFrame) -> pd.DataFrame: # Define request feature view driver_age_request_fv = RequestFeatureView( name="driver_age", - request_source=RequestSource( + request_data_source=RequestDataSource( name="driver_age", schema={"driver_age": ValueType.INT64,} ), ) From 8bb0cd63973f4e4ebee3f87ea8207f60e2dc8fc3 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 6 Apr 2022 10:46:18 -0700 Subject: [PATCH 2/4] Fix? Signed-off-by: Kevin Zhang --- examples/java-demo/feature_repo/driver_repo.py | 6 +++--- .../test/resources/docker-compose/feast10/definitions.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/java-demo/feature_repo/driver_repo.py b/examples/java-demo/feature_repo/driver_repo.py index e07139fbe3..cf00c74091 100644 --- a/examples/java-demo/feature_repo/driver_repo.py +++ b/examples/java-demo/feature_repo/driver_repo.py @@ -1,6 +1,6 @@ import pandas as pd from feast import Entity, Feature, FeatureView, FileSource, ValueType -from feast.data_source import RequestDataSource +from feast.data_source import RequestSource from feast.on_demand_feature_view import on_demand_feature_view from feast.request_feature_view import RequestFeatureView from google.protobuf.duration_pb2 import Duration @@ -28,7 +28,7 @@ # Define a request data source which encodes features / information only # available at request time (e.g. part of the user initiated HTTP request) -input_request = RequestDataSource( +input_request = RequestSource( name="vals_to_add", schema={"val_to_add": ValueType.INT64, "val_to_add_2": ValueType.INT64}, ) @@ -55,7 +55,7 @@ def transformed_conv_rate(inputs: pd.DataFrame) -> pd.DataFrame: # Define request feature view driver_age_request_fv = RequestFeatureView( name="driver_age", - request_data_source=RequestDataSource( + request_data_source=RequestSource( name="driver_age", schema={"driver_age": ValueType.INT64,} ), ) diff --git a/java/serving/src/test/resources/docker-compose/feast10/definitions.py b/java/serving/src/test/resources/docker-compose/feast10/definitions.py index 0b00704348..18fa0346b8 100644 --- a/java/serving/src/test/resources/docker-compose/feast10/definitions.py +++ b/java/serving/src/test/resources/docker-compose/feast10/definitions.py @@ -7,7 +7,7 @@ from feast.feature_view import FeatureView from feast.entity import Entity from feast.feature_service import FeatureService -from feast.on_demand_feature_view import RequestDataSource, on_demand_feature_view +from feast.data_source import RequestSource, on_demand_feature_view from feast import FileSource @@ -40,7 +40,7 @@ ) -input_request = RequestDataSource( +input_request = RequestSource( name="vals_to_add", schema={ "val_to_add": ValueType.INT64, From 536c3c6d0578a1648a400cdeaa51150d303f69d1 Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 6 Apr 2022 11:08:46 -0700 Subject: [PATCH 3/4] Update sources Signed-off-by: Kevin Zhang --- .../src/test/resources/docker-compose/feast10/definitions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/serving/src/test/resources/docker-compose/feast10/definitions.py b/java/serving/src/test/resources/docker-compose/feast10/definitions.py index 18fa0346b8..c98dec8b70 100644 --- a/java/serving/src/test/resources/docker-compose/feast10/definitions.py +++ b/java/serving/src/test/resources/docker-compose/feast10/definitions.py @@ -14,7 +14,7 @@ file_path = "driver_stats.parquet" driver_hourly_stats = FileSource( path=file_path, - event_timestamp_column="event_timestamp", + timestamp_field="event_timestamp", created_timestamp_column="created", ) @@ -68,7 +68,7 @@ def transformed_conv_rate(features_df: pd.DataFrame) -> pd.DataFrame: generated_data_source = FileSource( path="benchmark_data.parquet", - event_timestamp_column="event_timestamp", + timestamp_field="event_timestamp", ) entity = Entity( From 4677173d76232c5fa649dd7b8b83a1f4f4a7a62a Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 6 Apr 2022 11:18:51 -0700 Subject: [PATCH 4/4] Fix Signed-off-by: Kevin Zhang --- .../src/test/resources/docker-compose/feast10/definitions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/serving/src/test/resources/docker-compose/feast10/definitions.py b/java/serving/src/test/resources/docker-compose/feast10/definitions.py index c98dec8b70..c48acffe17 100644 --- a/java/serving/src/test/resources/docker-compose/feast10/definitions.py +++ b/java/serving/src/test/resources/docker-compose/feast10/definitions.py @@ -7,7 +7,8 @@ from feast.feature_view import FeatureView from feast.entity import Entity from feast.feature_service import FeatureService -from feast.data_source import RequestSource, on_demand_feature_view +from feast.data_source import RequestSource +from feast.on_demand_feature_view import on_demand_feature_view from feast import FileSource