Skip to content
Prev Previous commit
Next Next commit
Fix
Signed-off-by: Kevin Zhang <kzhang@tecton.ai>
  • Loading branch information
kevjumba committed Apr 22, 2022
commit 4b9dd34c2a889622e19bb52fb01d1795ce0b464a
4 changes: 2 additions & 2 deletions docs/tutorials/validating-historical-features.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pyarrow.parquet.write_table(entities_2019_table, "entities.parquet")
import pyarrow.parquet
import pandas as pd

from feast import FeatureView, Entity, FeatureStore, Field
from feast import FeatureView, Entity, FeatureStore, Field, BatchFeatureView
from feast.types import Float64, Int64
from feast.value_type import ValueType
from feast.data_format import ParquetFormat
Expand All @@ -134,7 +134,7 @@ taxi_entity = Entity(name='taxi', join_keys=['taxi_id'])


```python
trips_stats_fv = BaseFeatureView(
trips_stats_fv = BatchFeatureView(
name='trip_stats',
entities=['taxi'],
features=[
Expand Down
4 changes: 2 additions & 2 deletions examples/java-demo/feature_repo/driver_repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
from google.protobuf.duration_pb2 import Duration
from feast.field import Field

from feast import Entity, Feature, BaseFeatureView, FileSource, ValueType
from feast import Entity, Feature, BatchFeatureView, FileSource, ValueType

driver_hourly_stats = FileSource(
path="data/driver_stats_with_string.parquet",
timestamp_field="event_timestamp",
created_timestamp_column="created",
)
driver = Entity(name="driver_id", value_type=ValueType.INT64, description="driver id",)
driver_hourly_stats_view = BaseFeatureView(
driver_hourly_stats_view = BatchFeatureView(
name="driver_hourly_stats",
entities=["driver_id"],
ttl=Duration(seconds=86400000),
Expand Down
31 changes: 6 additions & 25 deletions sdk/python/feast/on_demand_feature_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def __init__( # noqa: C901
name: Optional[str] = None,
features: Optional[List[Feature]] = None,
sources: Optional[
List[Union[BatchFeatureView, StreamFeatureView, RequestSource]]
List[Union[BatchFeatureView, StreamFeatureView, RequestSource, FeatureViewProjection]]
] = None,
udf: Optional[MethodType] = None,
inputs: Optional[
Expand Down Expand Up @@ -139,11 +139,7 @@ def __init__( # noqa: C901
for _, source in inputs.items():
if isinstance(source, FeatureView):
_sources.append(feature_view_to_batch_feature_view(source))
elif isinstance(source, FeatureViewProjection):
_sources.append(
BatchFeatureView(name=source.name, schema=source.features,)
)
elif isinstance(source, RequestSource):
elif isinstance(source, RequestSource) or isinstance(source, FeatureViewProjection):
_sources.append(source)
else:
raise ValueError(
Expand Down Expand Up @@ -186,11 +182,7 @@ def __init__( # noqa: C901
for _, source in _inputs.items():
if isinstance(source, FeatureView):
_sources.append(feature_view_to_batch_feature_view(source))
elif isinstance(source, FeatureViewProjection):
_sources.append(
BatchFeatureView(name=source.name, schema=source.features,)
)
elif isinstance(source, RequestSource):
elif isinstance(source, RequestSource) or isinstance(source, FeatureViewProjection):
_sources.append(source)
else:
raise ValueError(
Expand Down Expand Up @@ -501,7 +493,7 @@ def on_demand_feature_view(
*args,
features: Optional[List[Feature]] = None,
sources: Optional[
List[Union[BatchFeatureView, StreamFeatureView, RequestSource]]
List[Union[BatchFeatureView, StreamFeatureView, RequestSource, FeatureViewProjection]]
] = None,
inputs: Optional[Dict[str, Union[FeatureView, RequestSource]]] = None,
schema: Optional[List[Field]] = None,
Expand Down Expand Up @@ -557,11 +549,7 @@ def on_demand_feature_view(
for _, source in inputs.items():
if isinstance(source, FeatureView):
_sources.append(feature_view_to_batch_feature_view(source))
elif isinstance(source, FeatureViewProjection):
_sources.append(
BatchFeatureView(name=source.name, schema=source.features,)
)
elif isinstance(source, RequestSource):
elif isinstance(source, RequestSource) or isinstance(source, FeatureViewProjection):
_sources.append(source)
else:
raise ValueError(
Expand Down Expand Up @@ -601,14 +589,7 @@ def on_demand_feature_view(
for _, source in _inputs.items():
if isinstance(source, FeatureView):
_sources.append(feature_view_to_batch_feature_view(source))
elif isinstance(source, FeatureViewProjection):
_sources.append(
BatchFeatureView(
name=source.name, # type: ignore
schema=source.features, # type: ignore
)
)
elif isinstance(source, RequestSource):
elif isinstance(source, RequestSource) or isinstance(source, FeatureViewProjection):
_sources.append(source)
else:
raise ValueError(
Expand Down