Updated

Signed-off-by: Francisco Javier Arceo <franciscojavierarceo@users.noreply.github.com>
feast-dev · franciscojavierarceo · Mar 25, 2024 · Mar 17, 2024 · Mar 17, 2024 · Mar 18, 2024
commit dd2a5ca5fc6d35308586fa2ead112be5e4f2fa8c
@@ -50,8 +50,8 @@ message OnDemandFeatureViewSpec {
     map<string, OnDemandSource> sources = 4;
 
     oneof transformation {
-        UserDefinedFunction user_defined_function = 5;
-        OnDemandSubstraitTransformation on_demand_substrait_transformation = 9;
+        UserDefinedFunction user_defined_function = 5 [deprecated = true];
+        OnDemandSubstraitTransformation on_demand_substrait_transformation = 9 [deprecated = true];
     }
     // Oneof with {user_defined_function, on_demand_substrait_transformation}
     FeatureTransformationV2 feature_transformation = 10;

diff --git a/protos/feast/core/StreamFeatureView.proto b/protos/feast/core/StreamFeatureView.proto
@@ -81,7 +81,6 @@ message StreamFeatureViewSpec {
     UserDefinedFunction user_defined_function = 13 [deprecated = true];
 
 
-
     // Mode of execution
     string mode = 14;
 

@@ -145,32 +145,23 @@ def diff_registry_objects(
             if _field.name in FIELDS_TO_IGNORE:
                 continue
             elif getattr(current_spec, _field.name) != getattr(new_spec, _field.name):
-                if _field.name == "transformation":
+                # TODO: Delete "transformation" after we've safely deprecated it from the proto
+                if _field.name in ["transformation", "feature_transformation"]:
+                    warnings.warn(
+                        "transformation will be deprecated in the future please use feature_transformation instead.",
+                        DeprecationWarning,
+                    )
                     current_spec = cast(OnDemandFeatureViewSpec, current_spec)
                     new_spec = cast(OnDemandFeatureViewSpec, new_spec)
-                    current_udf = (
+                    # Check if the old proto is populated and use that if it is
+                    deprecated_udf = current_spec.user_defined_function
+                    feature_transformation_udf = (
                         current_spec.feature_transformation.user_defined_function
                     )
-                    new_udf = new_spec.feature_transformation.user_defined_function
-                    for _udf_field in current_udf.DESCRIPTOR.fields:
-                        if _udf_field.name == "body":
-                            continue
-                        if getattr(current_udf, _udf_field.name) != getattr(
-                            new_udf, _udf_field.name
-                        ):
-                            transition = TransitionType.UPDATE
-                            property_diffs.append(
-                                PropertyDiff(
-                                    _field.name + "." + _udf_field.name,
-                                    getattr(current_udf, _udf_field.name),
-                                    getattr(new_udf, _udf_field.name),
-                                )
-                            )
-                elif _field.name == "feature_transformation":
-                    current_spec = cast(OnDemandFeatureViewSpec, current_spec)
-                    new_spec = cast(OnDemandFeatureViewSpec, new_spec)
                     current_udf = (
-                        current_spec.feature_transformation.user_defined_function
+                        deprecated_udf
+                        if deprecated_udf.body_text != ""
+                        else feature_transformation_udf
                     )
                     new_udf = new_spec.feature_transformation.user_defined_function
                     for _udf_field in current_udf.DESCRIPTOR.fields:

@@ -663,6 +663,13 @@ def to_dict(self, project: str) -> Dict[str, List[Any]]:
             key=lambda on_demand_feature_view: on_demand_feature_view.name,
         ):
             odfv_dict = self._message_to_sorted_dict(on_demand_feature_view.to_proto())
+            # We are logging a warning because the registry object may be read from a proto that is not updated
+            # i.e., we have to submit dual writes but in order to ensure the read behavior succeeds we have to load
+            # both objects to compare any changes in the registry
+            warnings.warn(
+                "We will be deprecating the usage of spec.userDefinedFunction in a future release please upgrade cautiously.",
+                DeprecationWarning,
+            )
             odfv_dict["spec"]["featureTransformation"]["userDefinedFunction"][
                 "body"
             ] = on_demand_feature_view.feature_transformation.udf_string

@@ -133,65 +133,3 @@ def test_hash():
         on_demand_feature_view_5.feature_transformation
         == on_demand_feature_view_5.transformation
     )
-
-
-@pytest.mark.filterwarnings("ignore:udf and udf_string parameters are deprecated")
-def test_from_proto_backwards_compatable_udf():
-    file_source = FileSource(name="my-file-source", path="test.parquet")
-    feature_view = FeatureView(
-        name="my-feature-view",
-        entities=[],
-        schema=[
-            Field(name="feature1", dtype=Float32),
-            Field(name="feature2", dtype=Float32),
-        ],
-        source=file_source,
-    )
-    sources = [feature_view]
-    on_demand_feature_view = OnDemandFeatureView(
-        name="my-on-demand-feature-view",
-        sources=sources,
-        schema=[
-            Field(name="output1", dtype=Float32),
-            Field(name="output2", dtype=Float32),
-        ],
-        transformation=OnDemandPandasTransformation(
-            udf=udf1, udf_string="udf1 source code"
-        ),
-    )
-
-    # We need a proto with the "udf1 source code" in the user_defined_function.body_text
-    # and to populate it in feature_transformation
-    proto = on_demand_feature_view.to_proto()
-    assert (
-        on_demand_feature_view.transformation.udf_string
-        == proto.spec.feature_transformation.user_defined_function.body_text
-    )
-    # Because of the current set of code this is just confirming it is empty
-    assert proto.spec.user_defined_function.body_text == ""
-    assert proto.spec.user_defined_function.body == b""
-    assert proto.spec.user_defined_function.name == ""
-
-    # Assuming we pull it from the registry we set it to the feature_transformation proto values
-    proto.spec.user_defined_function.name = (
-        proto.spec.feature_transformation.user_defined_function.name
-    )
-    proto.spec.user_defined_function.body = (
-        proto.spec.feature_transformation.user_defined_function.body
-    )
-    proto.spec.user_defined_function.body_text = (
-        proto.spec.feature_transformation.user_defined_function.body_text
-    )
-
-    # And now we're going to null the feature_transformation proto object before reserializing the entire proto
-    # proto.spec.user_defined_function.body_text = on_demand_feature_view.transformation.udf_string
-    proto.spec.feature_transformation.user_defined_function.name = ""
-    proto.spec.feature_transformation.user_defined_function.body = b""
-    proto.spec.feature_transformation.user_defined_function.body_text = ""
-
-    # And now we expect the to get the same object back under feature_transformation
-    reserialized_proto = OnDemandFeatureView.from_proto(proto)
-    assert (
-        reserialized_proto.feature_transformation.udf_string
-        == on_demand_feature_view.feature_transformation.udf_string
-    )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,7 +81,6 @@ message StreamFeatureViewSpec {
		UserDefinedFunction user_defined_function = 13 [deprecated = true];



		// Mode of execution
		string mode = 14;

Expand Down