From 8f0947c7d91f7969808002ad17892f868f3ded1c Mon Sep 17 00:00:00 2001 From: Ryan Beauchamp Date: Wed, 14 Dec 2022 10:28:11 -0500 Subject: [PATCH 1/4] fix: Wrap pyspark import in try except for snowflake offline store Signed-off-by: Ryan Beauchamp --- README.md | 2 +- sdk/python/feast/infra/offline_stores/snowflake.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1152aa060e..1b48f19f8f 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ pip install feast ### 2. Create a feature repository ```commandline feast init my_feature_repo -cd my_feature_repo/feature_repo +cd my_feature_repo ``` ### 3. Register your feature definitions and set up your feature store diff --git a/sdk/python/feast/infra/offline_stores/snowflake.py b/sdk/python/feast/infra/offline_stores/snowflake.py index 330c2ffae5..00cf40746f 100644 --- a/sdk/python/feast/infra/offline_stores/snowflake.py +++ b/sdk/python/feast/infra/offline_stores/snowflake.py @@ -23,7 +23,7 @@ import pyarrow from pydantic import Field, StrictStr from pydantic.typing import Literal -from pyspark.sql import DataFrame, SparkSession + from pytz import utc from feast import OnDemandFeatureView @@ -64,6 +64,13 @@ raise FeastExtrasDependencyImportError("snowflake", str(e)) +try: + from pyspark.sql import DataFrame, SparkSession +except ImportError: + from feast.errors import FeastExtrasDependencyImportError + + raise FeastExtrasDependencyImportError("spark", str(e)) + warnings.filterwarnings("ignore", category=DeprecationWarning) From 43d6a87a879d990ac1a507b865d6c971868cbde7 Mon Sep 17 00:00:00 2001 From: Ryan Beauchamp Date: Wed, 14 Dec 2022 12:16:14 -0500 Subject: [PATCH 2/4] fix: Capture exception Signed-off-by: Ryan Beauchamp --- sdk/python/feast/infra/offline_stores/snowflake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/feast/infra/offline_stores/snowflake.py b/sdk/python/feast/infra/offline_stores/snowflake.py index 00cf40746f..ba2c1dcada 100644 --- a/sdk/python/feast/infra/offline_stores/snowflake.py +++ b/sdk/python/feast/infra/offline_stores/snowflake.py @@ -66,7 +66,7 @@ try: from pyspark.sql import DataFrame, SparkSession -except ImportError: +except ImportError as e: from feast.errors import FeastExtrasDependencyImportError raise FeastExtrasDependencyImportError("spark", str(e)) From 9ed5e5426a3a9450e6163584802d990a5e5cd579 Mon Sep 17 00:00:00 2001 From: Ryan Beauchamp Date: Wed, 14 Dec 2022 12:51:13 -0500 Subject: [PATCH 3/4] fix: update jinja template Signed-off-by: Ryan Beauchamp --- README.md | 2 +- infra/templates/README.md.jinja2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b48f19f8f..1152aa060e 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ pip install feast ### 2. Create a feature repository ```commandline feast init my_feature_repo -cd my_feature_repo +cd my_feature_repo/feature_repo ``` ### 3. Register your feature definitions and set up your feature store diff --git a/infra/templates/README.md.jinja2 b/infra/templates/README.md.jinja2 index e5213ae9f1..47779d4eb7 100644 --- a/infra/templates/README.md.jinja2 +++ b/infra/templates/README.md.jinja2 @@ -42,7 +42,7 @@ pip install feast ### 2. Create a feature repository ```commandline feast init my_feature_repo -cd my_feature_repo +cd my_feature_repo/feature_repo ``` ### 3. Register your feature definitions and set up your feature store From 5a63e4863aa190da64bbc6a08781992bf40a5456 Mon Sep 17 00:00:00 2001 From: Danny Chiao Date: Wed, 14 Dec 2022 14:49:50 -0500 Subject: [PATCH 4/4] lint Signed-off-by: Danny Chiao --- sdk/python/feast/infra/offline_stores/snowflake.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/python/feast/infra/offline_stores/snowflake.py b/sdk/python/feast/infra/offline_stores/snowflake.py index ba2c1dcada..83aebe7ef9 100644 --- a/sdk/python/feast/infra/offline_stores/snowflake.py +++ b/sdk/python/feast/infra/offline_stores/snowflake.py @@ -23,7 +23,6 @@ import pyarrow from pydantic import Field, StrictStr from pydantic.typing import Literal - from pytz import utc from feast import OnDemandFeatureView