Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2366e85
State of feast
kevjumba Feb 25, 2022
20e82ea
Clean up changes
kevjumba Feb 26, 2022
55e7915
Fix random incorrect changes
kevjumba Feb 26, 2022
43794f7
Fix lint
kevjumba Feb 26, 2022
343ed00
Fix build errors
kevjumba Feb 26, 2022
55c458d
Fix lint
kevjumba Feb 26, 2022
b8ace43
Add spark offline store components to test against current integratio…
kevjumba Mar 1, 2022
d13119f
Fix lint
kevjumba Mar 1, 2022
4b56f55
Rename to pass checks
kevjumba Mar 1, 2022
6e278c4
Fix issues
kevjumba Mar 1, 2022
4bc67d8
Fix type checking issues
kevjumba Mar 1, 2022
c934edc
Fix lint
kevjumba Mar 1, 2022
e01d023
Clean up print statements for first review
kevjumba Mar 1, 2022
01ac14a
Fix lint
kevjumba Mar 1, 2022
26c8a01
Fix flake 8 lint tests
kevjumba Mar 1, 2022
6f8ce3c
Add warnings for alpha version release
kevjumba Mar 2, 2022
551eea1
Format
kevjumba Mar 2, 2022
1e7c2b4
Address review
kevjumba Mar 2, 2022
8e3e9a4
Address review
kevjumba Mar 2, 2022
cc1651e
Fix lint
kevjumba Mar 2, 2022
acf1c28
Add file store functionality
kevjumba Mar 2, 2022
65b113a
lint
kevjumba Mar 2, 2022
7adb8d2
Add example feature repo
kevjumba Mar 2, 2022
648f935
Update data source creator
kevjumba Mar 2, 2022
7b84ac1
Make cli work for feast init with spark
kevjumba Mar 2, 2022
b066a6f
Update the docs
kevjumba Mar 2, 2022
e0099ae
Clean up code
kevjumba Mar 2, 2022
86e74c0
Clean up more code
kevjumba Mar 2, 2022
6fe5b9e
Uncomment repo configs
kevjumba Mar 2, 2022
92c4f87
Fix setup.py
kevjumba Mar 2, 2022
18a2892
Update dependencies
kevjumba Mar 2, 2022
c644388
Fix ci dependencies
kevjumba Mar 3, 2022
9333130
Screwed up rebase
kevjumba Mar 3, 2022
6272f05
Screwed up rebase
kevjumba Mar 3, 2022
cf6bae1
Screwed up rebase
kevjumba Mar 3, 2022
0569b6d
Realign with master
kevjumba Mar 3, 2022
b02e51e
Fix accidental changes
kevjumba Mar 3, 2022
a161fad
Make type map change cleaner
kevjumba Mar 3, 2022
f7c618a
Address review comments
kevjumba Mar 3, 2022
c81fe31
Fix tests accidentally broken
kevjumba Mar 3, 2022
d790a1c
Add comments
kevjumba Mar 3, 2022
1408b8f
Reformat
kevjumba Mar 3, 2022
bf071b3
Fix logger
kevjumba Mar 3, 2022
62a92ac
Remove unused imports
kevjumba Mar 3, 2022
3ec6d22
Fix imports
kevjumba Mar 3, 2022
62ff185
Fix CI dependencies
adchia Mar 3, 2022
0dbc4e7
Prefix destinations with project name
kevjumba Mar 3, 2022
40cb4f8
Update comment
kevjumba Mar 3, 2022
4f5359a
Fix 3.8
kevjumba Mar 3, 2022
513d5bc
temporary fix
kevjumba Mar 3, 2022
8805884
rollback
kevjumba Mar 4, 2022
3ac3b71
update
kevjumba Mar 4, 2022
cfbaef5
Update ci?
kevjumba Mar 4, 2022
6abea5f
Move third party to contrib
kevjumba Mar 4, 2022
05aaeb8
Fix imports
kevjumba Mar 4, 2022
29a60d7
Remove third_party refactor
kevjumba Mar 4, 2022
b43417e
Revert ci requirements and update comment in type map
kevjumba Mar 4, 2022
1acc088
Revert 3.8-requirements
kevjumba Mar 4, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add example feature repo
Signed-off-by: Kevin Zhang <kzhang@tecton.ai>
  • Loading branch information
kevjumba committed Mar 4, 2022
commit 7adb8d2ffece436c88c69b2a25a15992e2714e3e
58 changes: 45 additions & 13 deletions sdk/python/feast/infra/offline_stores/third_party/spark_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,12 @@ def from_proto(data_source: DataSourceProto) -> Any:
assert data_source.HasField("custom_options")

spark_options = SparkOptions.from_proto(data_source.custom_options)

return SparkSource(
field_mapping=dict(data_source.field_mapping),
table=spark_options.table,
query=spark_options.query,
# path=spark_options.path,
# jdbc=None,
# format=spark_options.format,
# options=spark_options.options,
path=spark_options.path,
file_format=spark_options.file_format,
event_timestamp_column=data_source.event_timestamp_column,
created_timestamp_column=data_source.created_timestamp_column,
date_partition_column=data_source.date_partition_column,
Expand Down Expand Up @@ -155,22 +152,22 @@ def source_datatype_to_feast_value_type() -> Callable[[str], ValueType]:
def get_table_column_names_and_types(
self, config: RepoConfig
) -> Iterable[Tuple[str, str]]:
from feast_spark_offline_store.spark import (
from feast.infra.offline_stores.third_party.spark import (
get_spark_session_or_start_new_with_repoconfig,
)

spark_session = get_spark_session_or_start_new_with_repoconfig(
config.offline_store
store_config=config.offline_store
)
df = spark_session.sql(f"SELECT * FROM {self.get_table_query_string()}")
try:
return (
(fields["name"], fields["type"])
for fields in spark_session.table(self.table).schema.jsonValue()[
"fields"
]
for fields in df.schema.jsonValue()["fields"]
)
except AnalysisException:
raise DataSourceNotFoundException(self.table)
raise DataSourceNotFoundException() # TODO: review error handling


def get_table_query_string(self) -> str:
"""Returns a string that can directly be used to reference this table in SQL"""
Expand All @@ -193,10 +190,13 @@ def get_table_query_string(self) -> str:

class SparkOptions:
def __init__(
self, table: Optional[str] = None, query: Optional[str] = None,
self, table: Optional[str] = None, query: Optional[str] = None, path: Optional[str] = None, file_format: Optional[str] = None
):
self._table = table
self._query = query
self._path = path
self._file_format = file_format


@property
def table(self):
Expand Down Expand Up @@ -226,6 +226,35 @@ def query(self, query):
"""
self._query = query

@property
def path(self):
"""
Returns the path
"""
return self._path

@path.setter
def path(self, path):
"""
Sets the path
"""
self._path = path

@property
def file_format(self):
"""
Returns the file_format
"""
return self._file_format

@file_format.setter
def file_format(self, file_format):
"""
Sets the file_format
"""
self._file_format = file_format


@classmethod
def from_proto(cls, spark_options_proto: DataSourceProto.CustomSourceOptions):
"""
Expand All @@ -238,7 +267,10 @@ def from_proto(cls, spark_options_proto: DataSourceProto.CustomSourceOptions):
spark_configuration = pickle.loads(spark_options_proto.configuration)

spark_options = cls(
table=spark_configuration.table, query=spark_configuration.query,
table=spark_configuration.table,
query=spark_configuration.query,
path=spark_configuration.path,
file_format=spark_configuration.file_format,
)
return spark_options

Expand Down
1 change: 1 addition & 0 deletions sdk/python/feast/repo_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"bigquery": "feast.infra.offline_stores.bigquery.BigQueryOfflineStore",
"redshift": "feast.infra.offline_stores.redshift.RedshiftOfflineStore",
"snowflake.offline": "feast.infra.offline_stores.snowflake.SnowflakeOfflineStore",
"spark": "feast.infra.offline_stores.third_party.spark.SparkOfflineStore",
}

FEATURE_SERVER_CONFIG_CLASS_FOR_TYPE = {
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/feast/templates/spark/example.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from pathlib import Path

from feast_spark_offline_store import SparkSource
from feast.infra.offline_stores.third_party.spark_source import SparkSource
from google.protobuf.duration_pb2 import Duration

from feast import Entity, Feature, FeatureView, ValueType
Expand Down
2 changes: 1 addition & 1 deletion sdk/python/feast/templates/spark/feature_store.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project: my_project
registry: data/registry.db
provider: local
offline_store:
type: feast_spark_offline_store.spark.SparkOfflineStore
type: spark
spark_conf:
spark.master: "local[*]"
spark.ui.enabled: "false"
Expand Down