Clean up Go feature server test logic

felixwang9817 · achals · commit afc33cf8a30a · 2022-03-08T12:16:34.000-08:00
Signed-off-by: Felix Wang &lt;wangfelix98@gmail.com&gt;
Signed-off-by: Achal Shah &lt;achals@gmail.com&gt;
diff --git a/sdk/python/tests/integration/feature_repos/repo_configuration.py b/sdk/python/tests/integration/feature_repos/repo_configuration.py
@@ -67,7 +67,6 @@
     IntegrationTestRepoConfig(),
     IntegrationTestRepoConfig(python_feature_server=True),
 ]
-
 if os.getenv("FEAST_IS_LOCAL_TEST", "False") != "True":
     DEFAULT_FULL_REPO_CONFIGS.extend(
         [
@@ -103,7 +102,6 @@
             ),
         ]
     )
-
 full_repo_configs_module = os.environ.get(FULL_REPO_CONFIGS_MODULE_ENV_NAME)
 if full_repo_configs_module is not None:
     try:
@@ -304,25 +302,7 @@ def construct_universal_feature_views(
         field_mapping=create_field_mapping_feature_view(data_sources.field_mapping),
     )
 
-
-def construct_universal_feature_views_without_odfv(
-    data_sources: Dict[str, DataSource],
-) -> Dict[str, FeatureView]:
-    driver_hourly_stats = create_driver_hourly_stats_feature_view(
-        data_sources["driver"]
-    )
-    return {
-        "customer": create_customer_daily_profile_feature_view(
-            data_sources["customer"]
-        ),
-        "global": create_global_stats_feature_view(data_sources["global"]),
-        "driver": driver_hourly_stats,
-        "order": create_order_feature_view(data_sources["orders"]),
-        "location": create_location_stats_feature_view(data_sources["location"]),
-        "field_mapping": create_field_mapping_feature_view(
-            data_sources["field_mapping"]
-        ),
-    }
+    return universal_feature_views
 
 
 @dataclass
diff --git a/sdk/python/tests/integration/feature_repos/universal/feature_views.py b/sdk/python/tests/integration/feature_repos/universal/feature_views.py
@@ -39,11 +39,6 @@ def global_feature_view(
     )
 
 
-# return RequestDataSource(
-#         name="conv_rate_input", schema={"val_to_add": ValueType.INT32}
-#     )
-
-
 def conv_rate_plus_100(features_df: pd.DataFrame) -> pd.DataFrame:
     df = pd.DataFrame()
     df["conv_rate_plus_100"] = features_df["conv_rate"] + 100
@@ -74,24 +69,6 @@ def conv_rate_plus_100_feature_view(
     )
 
 
-def conv_rate_plus_100_feature_view_without_odfv(
-    inputs: Dict[str, Union[RequestDataSource, FeatureView]],
-    infer_features: bool = False,
-    features: Optional[List[Feature]] = None,
-) -> OnDemandFeatureView:
-    _features = features or [
-        Feature("conv_rate_plus_100", ValueType.DOUBLE),
-        Feature("conv_rate_plus_val_to_add", ValueType.DOUBLE),
-        Feature("conv_rate_plus_100_rounded", ValueType.INT32),
-    ]
-    return OnDemandFeatureView(
-        name=conv_rate_plus_100.__name__,
-        inputs=inputs,
-        features=[] if infer_features else _features,
-        udf=conv_rate_plus_100,
-    )
-
-
 def similarity(features_df: pd.DataFrame) -> pd.DataFrame:
     if features_df.size == 0:
         # give hint to Feast about return type
diff --git a/sdk/python/tests/integration/online_store/test_universal_online.py b/sdk/python/tests/integration/online_store/test_universal_online.py
@@ -22,7 +22,6 @@
 from tests.integration.feature_repos.repo_configuration import (
     Environment,
     construct_universal_feature_views,
-    construct_universal_feature_views_without_odfv,
 )
 from tests.integration.feature_repos.universal.entities import (
     customer,
@@ -658,7 +657,7 @@ def test_online_retrieval_without_odfv(
 ):
     fs = environment.feature_store
     entities, datasets, data_sources = universal_data_sources
-    feature_views = construct_universal_feature_views_without_odfv(data_sources)
+    feature_views = construct_universal_feature_views(data_sources, with_odfv=False)
 
     feature_service_entity_mapping = FeatureService(
         name="entity_mapping",
@@ -825,7 +824,7 @@ def test_online_retrieval_without_odfv(
 @pytest.mark.integration
 @pytest.mark.universal
 @pytest.mark.noodfv
-def test_online_store_cleanup_go_server(environment, universal_data_sources):
+def test_online_store_cleanup_without_odfv(environment, universal_data_sources):
     """
     Some online store implementations (like Redis) keep features from different features views
     but with common entities together.
@@ -843,7 +842,7 @@ def test_online_store_cleanup_go_server(environment, universal_data_sources):
     """
     fs = environment.feature_store
     entities, datasets, data_sources = universal_data_sources
-    driver_stats_fv = construct_universal_feature_views_without_odfv(data_sources)[
+    driver_stats_fv = construct_universal_feature_views(data_sources, with_odfv=False)[
         "driver"
     ]
 
