added error message assertion for feature name collisions, and other …

…nitpick changes Signed-off-by: Mwad22 <51929507+Mwad22@users.noreply.github.com>
feast-dev · feast-ci-bot · Jul 8, 2021 · Jun 12, 2021 · Jun 16, 2021 · Jun 16, 2021
commit 8724e0b09419cbd15d875c28a4cedc6dd283368e
@@ -89,7 +89,7 @@ def __init__(self, offline_store_name: str, data_source_name: str):
 
 
 class FeatureNameCollisionError(Exception):
-    def __init__(self, feature_refs_collisions: List[str], full_feature_names):
+    def __init__(self, feature_refs_collisions: List[str], full_feature_names: bool):
         if full_feature_names:
             collisions = [ref.replace(":", "__") for ref in feature_refs_collisions]
             error_message = (

@@ -122,7 +122,11 @@ def get_historical_features(
 
         # Build a query context containing all information required to template the BigQuery SQL query
         query_context = get_feature_view_query_context(
-            feature_refs, feature_views, registry, project, full_feature_names
+            feature_refs,
+            feature_views,
+            registry,
+            project,
+            full_feature_names=full_feature_names,
         )
 
         # TODO: Infer min_timestamp and max_timestamp from entity_df

@@ -595,11 +595,11 @@ def test_historical_features_from_bigquery_sources(
         )
 
 
-@pytest.mark.integration
 def test_feature_name_collision_on_historical_retrieval():
 
     # _validate_feature_refs is the function that checks for colliding feature names
-    with pytest.raises(FeatureNameCollisionError):
+    # check when feature names collide and 'full_feature_names=False'
+    with pytest.raises(FeatureNameCollisionError) as error:
         _validate_feature_refs(
             feature_refs=[
                 "driver_stats:conv_rate",
@@ -611,3 +611,33 @@ def test_feature_name_collision_on_historical_retrieval():
             ],
             full_feature_names=False,
         )
+
+    expected_error_message = (
+        "Duplicate features named avg_daily_trips found.\n"
+        "To resolve this collision, either use the full feature name by setting "
+        "'full_feature_names=True', or ensure that the features in question have different names."
+    )
+
+    assert str(error.value) == expected_error_message
+
+    # check when feature names collide and 'full_feature_names=True'
+    with pytest.raises(FeatureNameCollisionError) as error:
+        _validate_feature_refs(
+            feature_refs=[
+                "driver_stats:conv_rate",
+                "driver_stats:avg_daily_trips",
+                "driver_stats:avg_daily_trips",
+                "customer_profile:current_balance",
+                "customer_profile:avg_passenger_count",
+                "customer_profile:lifetime_trip_count",
+                "customer_profile:avg_daily_trips",
+            ],
+            full_feature_names=True,
+        )
+
+    expected_error_message = (
+        "Duplicate features named driver_stats__avg_daily_trips found.\n"
+        "To resolve this collision, please ensure that the features in question "
+        "have different names."
+    )
+    assert str(error.value) == expected_error_message