From 75b633747ce793273b368e8c53fe485b13e16a04 Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Thu, 13 Jan 2022 14:58:39 -0800 Subject: [PATCH 1/8] random example commit Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index 3e9ddb6e30..5c60d77771 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -237,6 +237,8 @@ def extract_objects_for_apply_delete(project, registry, repo): return all_to_apply, all_to_delete, views_to_delete, views_to_keep +def apply_total_with_repo_instance(repo_contents: RepoContents, ) + @log_exceptions_and_usage def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation: bool): From d263de8404c75bea486728d1471d181010cf1f27 Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Thu, 13 Jan 2022 14:59:26 -0800 Subject: [PATCH 2/8] random example commit Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index 5c60d77771..d7b751a6e3 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -237,7 +237,8 @@ def extract_objects_for_apply_delete(project, registry, repo): return all_to_apply, all_to_delete, views_to_delete, views_to_keep -def apply_total_with_repo_instance(repo_contents: RepoContents, ) +def apply_total_with_repo_instance(repo_contents: RepoContents): + pass @log_exceptions_and_usage def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation: bool): From 7245f7fe691bab6d40d1f674bdb17c503301534e Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Thu, 13 Jan 2022 15:01:47 -0800 Subject: [PATCH 3/8] first commit Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index d7b751a6e3..37d8346be4 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -240,6 +240,7 @@ def extract_objects_for_apply_delete(project, registry, repo): def apply_total_with_repo_instance(repo_contents: RepoContents): pass + @log_exceptions_and_usage def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation: bool): From 8824452c90d1b6857017a41df1a76bb6bccc76a1 Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Thu, 13 Jan 2022 15:25:32 -0800 Subject: [PATCH 4/8] fix Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index 37d8346be4..e60b870456 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -237,7 +237,7 @@ def extract_objects_for_apply_delete(project, registry, repo): return all_to_apply, all_to_delete, views_to_delete, views_to_keep -def apply_total_with_repo_instance(repo_contents: RepoContents): +def apply_total_with_repo_instance(repo_contents: RepoContents, repo_path: Path): pass From 7c5cf67e3443ef4af923b2b7b825ddb5573a2a93 Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Fri, 14 Jan 2022 15:55:55 -0800 Subject: [PATCH 5/8] added method to apply with user-provided parsed_repo instance Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 37 +++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index e60b870456..b5874a107e 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -237,16 +237,13 @@ def extract_objects_for_apply_delete(project, registry, repo): return all_to_apply, all_to_delete, views_to_delete, views_to_keep -def apply_total_with_repo_instance(repo_contents: RepoContents, repo_path: Path): - pass - - -@log_exceptions_and_usage -def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation: bool): - - os.chdir(repo_path) - project, registry, repo, store = _prepare_registry_and_repo(repo_config, repo_path) - +def _apply_total( + project: str, + registry: Registry, + repo: RepoContents, + store: FeatureStore, + skip_source_validation: bool, +): if not skip_source_validation: data_sources = [t.batch_source for t in repo.feature_views] # Make sure the data source used by this feature view is supported by Feast @@ -266,6 +263,26 @@ def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation log_cli_output(diff, views_to_delete, views_to_keep) +@log_exceptions_and_usage +def apply_total_with_repo_instance( + repo_contents: RepoContents, + repo_config: RepoConfig, + repo_path: Path, + skip_source_validation: bool, +): + os.chdir(repo_path) + project, registry, _, store = _prepare_registry_and_repo(repo_config, repo_path) + _apply_total(project, registry, repo_contents, store, skip_source_validation) + + +@log_exceptions_and_usage +def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation: bool): + + os.chdir(repo_path) + project, registry, repo, store = _prepare_registry_and_repo(repo_config, repo_path) + _apply_total(project, registry, repo, store, skip_source_validation) + + def log_cli_output(diff, views_to_delete, views_to_keep): from colorama import Fore, Style From 5d2279f37f3bcb312850e1b08b2af227ad24431c Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Wed, 19 Jan 2022 10:43:20 -0800 Subject: [PATCH 6/8] add apply_total_with_repo_instance to be called by apply_total Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index b5874a107e..6a81e2c720 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -237,12 +237,12 @@ def extract_objects_for_apply_delete(project, registry, repo): return all_to_apply, all_to_delete, views_to_delete, views_to_keep -def _apply_total( - project: str, - registry: Registry, - repo: RepoContents, - store: FeatureStore, - skip_source_validation: bool, +def apply_total_with_repo_instance( + store: FeatureStore, + project: str, + registry: Registry, + repo: RepoContents, + skip_source_validation: bool, ): if not skip_source_validation: data_sources = [t.batch_source for t in repo.feature_views] @@ -263,24 +263,12 @@ def _apply_total( log_cli_output(diff, views_to_delete, views_to_keep) -@log_exceptions_and_usage -def apply_total_with_repo_instance( - repo_contents: RepoContents, - repo_config: RepoConfig, - repo_path: Path, - skip_source_validation: bool, -): - os.chdir(repo_path) - project, registry, _, store = _prepare_registry_and_repo(repo_config, repo_path) - _apply_total(project, registry, repo_contents, store, skip_source_validation) - - @log_exceptions_and_usage def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation: bool): os.chdir(repo_path) project, registry, repo, store = _prepare_registry_and_repo(repo_config, repo_path) - _apply_total(project, registry, repo, store, skip_source_validation) + apply_total_with_repo_instance(repo, registry, repo, store, skip_source_validation) def log_cli_output(diff, views_to_delete, views_to_keep): From d2aee4a644dc3bddeae492b56cb51bf3d006b816 Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Wed, 19 Jan 2022 11:03:05 -0800 Subject: [PATCH 7/8] fix styling and arg order Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index 6a81e2c720..c893dd2d70 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -238,11 +238,11 @@ def extract_objects_for_apply_delete(project, registry, repo): def apply_total_with_repo_instance( - store: FeatureStore, - project: str, - registry: Registry, - repo: RepoContents, - skip_source_validation: bool, + store: FeatureStore, + project: str, + registry: Registry, + repo: RepoContents, + skip_source_validation: bool, ): if not skip_source_validation: data_sources = [t.batch_source for t in repo.feature_views] @@ -268,7 +268,7 @@ def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation os.chdir(repo_path) project, registry, repo, store = _prepare_registry_and_repo(repo_config, repo_path) - apply_total_with_repo_instance(repo, registry, repo, store, skip_source_validation) + apply_total_with_repo_instance(store, project, registry, repo, skip_source_validation) def log_cli_output(diff, views_to_delete, views_to_keep): From 59d3986380233565eb345ebf113a9f20fd213aeb Mon Sep 17 00:00:00 2001 From: Yun Nan Liu Date: Thu, 20 Jan 2022 09:10:05 -0800 Subject: [PATCH 8/8] fix lint issues Signed-off-by: Yun Nan Liu --- sdk/python/feast/repo_operations.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/python/feast/repo_operations.py b/sdk/python/feast/repo_operations.py index c893dd2d70..0638ca589a 100644 --- a/sdk/python/feast/repo_operations.py +++ b/sdk/python/feast/repo_operations.py @@ -268,7 +268,9 @@ def apply_total(repo_config: RepoConfig, repo_path: Path, skip_source_validation os.chdir(repo_path) project, registry, repo, store = _prepare_registry_and_repo(repo_config, repo_path) - apply_total_with_repo_instance(store, project, registry, repo, skip_source_validation) + apply_total_with_repo_instance( + store, project, registry, repo, skip_source_validation + ) def log_cli_output(diff, views_to_delete, views_to_keep):