Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Support param timeout when persisting #3593

Merged
merged 2 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions sdk/python/feast/infra/offline_stores/bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,8 @@ def to_sql(self) -> str:
def to_bigquery(
self,
job_config: Optional[bigquery.QueryJobConfig] = None,
timeout: int = 1800,
retry_cadence: int = 10,
timeout: Optional[int] = 1800,
retry_cadence: Optional[int] = 10,
) -> str:
"""
Synchronously executes the underlying query and exports the result to a BigQuery table. The
Expand Down Expand Up @@ -530,11 +530,17 @@ def _execute_query(
block_until_done(client=self.client, bq_job=bq_job, timeout=timeout or 1800)
return bq_job

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetBigQueryStorage)

self.to_bigquery(
bigquery.QueryJobConfig(destination=storage.bigquery_options.table)
bigquery.QueryJobConfig(destination=storage.bigquery_options.table),
timeout=timeout,
)

@property
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,12 @@ def _to_arrow_internal(self, timeout: Optional[int] = None) -> pa.Table:
def metadata(self) -> Optional[RetrievalMetadata]:
return self._metadata

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetAthenaStorage)
self.to_athena(table_name=storage.athena_options.table)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,12 @@ def _to_arrow_internal(self, timeout: Optional[int] = None) -> pyarrow.Table:

## Implements persist in Feast 0.18 - This persists to filestorage
## ToDo: Persist to Azure Storage
def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetFileStorage)

filesystem, path = FileSource.create_filesystem_and_path(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,12 @@ def _to_arrow_internal(self, timeout: Optional[int] = None) -> pa.Table:
def metadata(self) -> Optional[RetrievalMetadata]:
return self._metadata

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetPostgreSQLStorage)

df_to_postgres_table(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,12 @@ def _to_arrow_internal(self, timeout: Optional[int] = None) -> pyarrow.Table:
"""Return dataset as pyarrow Table synchronously"""
return pyarrow.Table.from_pandas(self._to_df_internal(timeout=timeout))

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
"""
Run the retrieval and persist the results in the same offline store used for read.
Please note the persisting is done only within the scope of the spark session.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ def to_trino(
self._client.execute_query(query_text=query)
return destination_table

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
"""
Run the retrieval and persist the results in the same offline store used for read.
"""
Expand Down
7 changes: 6 additions & 1 deletion sdk/python/feast/infra/offline_stores/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ def _to_arrow_internal(self, timeout: Optional[int] = None):
df = self.evaluation_function().compute()
return pyarrow.Table.from_pandas(df)

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetFileStorage)

# Check if the specified location already exists.
Expand Down
7 changes: 6 additions & 1 deletion sdk/python/feast/infra/offline_stores/offline_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,12 @@ def on_demand_feature_views(self) -> List[OnDemandFeatureView]:
pass

@abstractmethod
def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: bool = False,
timeout: Optional[int] = None,
):
"""
Synchronously executes the underlying query and persists the result in the same offline store
at the specified destination.
Expand Down
7 changes: 6 additions & 1 deletion sdk/python/feast/infra/offline_stores/redshift.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,12 @@ def to_redshift(self, table_name: str) -> None:
query,
)

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetRedshiftStorage)
self.to_redshift(table_name=storage.redshift_options.table)

Expand Down
7 changes: 6 additions & 1 deletion sdk/python/feast/infra/offline_stores/snowflake.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,12 @@ def to_spark_df(self, spark_session: "SparkSession") -> "DataFrame":
else:
raise InvalidSparkSessionException(spark_session)

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: Optional[bool] = False,
timeout: Optional[int] = None,
):
assert isinstance(storage, SavedDatasetSnowflakeStorage)
self.to_snowflake(table_name=storage.snowflake_options.table)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ def on_demand_feature_views(self) -> List[OnDemandFeatureView]:
"""Returns a list containing all the on demand feature views to be handled."""
pass

def persist(self, storage: SavedDatasetStorage, allow_overwrite: bool = False):
def persist(
self,
storage: SavedDatasetStorage,
allow_overwrite: bool = False,
timeout: Optional[int] = None,
):
"""
Synchronously executes the underlying query and persists the result in the same offline store
at the specified destination.
Expand Down