fixed stuff...i think

Signed-off-by: Francisco Javier Arceo <franciscojavierarceo@users.noreply.github.com>
feast-dev · franciscojavierarceo · Mar 24, 2024 · Mar 17, 2024 · Mar 17, 2024 · Mar 18, 2024
commit bc981c7cb1f00ca29a7bfd161f35b420f0807778
@@ -147,8 +147,8 @@ def diff_registry_objects(
                 if _field.name == "user_defined_function":
                     current_spec = cast(OnDemandFeatureViewSpec, current_spec)
                     new_spec = cast(OnDemandFeatureViewSpec, new_spec)
-                    current_udf = current_spec.user_defined_function
-                    new_udf = new_spec.user_defined_function
+                    current_udf = current_spec.transformation.user_defined_function
+                    new_udf = new_spec.transformation.user_defined_function
                     for _udf_field in current_udf.DESCRIPTOR.fields:
                         if _udf_field.name == "body":
                             continue

@@ -27,6 +27,9 @@
     OnDemandFeatureViewSpec,
     OnDemandSource,
 )
+from feast.protos.feast.core.Transformation_pb2 import (
+    FeatureTransformation as FeatureTransformationProto,
+)
 from feast.type_map import (
     feast_value_type_to_pandas_type,
     python_type_to_feast_value_type,
@@ -205,16 +208,19 @@ def to_proto(self) -> OnDemandFeatureViewProto:
                 request_data_source=request_sources.to_proto()
             )
 
-        spec = OnDemandFeatureViewSpec(
-            name=self.name,
-            features=[feature.to_proto() for feature in self.features],
-            sources=sources,
+        feature_transformation = FeatureTransformationProto(
             user_defined_function=self.transformation.to_proto()
             if type(self.transformation) == OnDemandPandasTransformation
             else None,
-            on_demand_substrait_transformation=self.transformation.to_proto()  # type: ignore
+            on_demand_substrait_transformation=self.transformation.to_proto()
             if type(self.transformation) == OnDemandSubstraitTransformation
-            else None,
+            else None,  # type: ignore
+        )
+        spec = OnDemandFeatureViewSpec(
+            name=self.name,
+            features=[feature.to_proto() for feature in self.features],
+            sources=sources,
+            transformation=feature_transformation,
             description=self.description,
             tags=self.tags,
             owner=self.owner,
@@ -258,14 +264,14 @@ def from_proto(cls, on_demand_feature_view_proto: OnDemandFeatureViewProto):
             == "user_defined_function"
         ):
             transformation = OnDemandPandasTransformation.from_proto(
-                on_demand_feature_view_proto.spec.user_defined_function
+                on_demand_feature_view_proto.spec.transformation.user_defined_function
             )
         elif (
             on_demand_feature_view_proto.spec.WhichOneof("transformation")
             == "on_demand_substrait_transformation"
         ):
             transformation = OnDemandSubstraitTransformation.from_proto(
-                on_demand_feature_view_proto.spec.on_demand_substrait_transformation
+                on_demand_feature_view_proto.spec.transformation.on_demand_substrait_transformation
             )
         else:
             raise Exception("At least one transformation type needs to be provided")

@@ -3,7 +3,7 @@
 import dill
 import pandas as pd
 
-from feast.protos.feast.core.OnDemandFeatureView_pb2 import (
+from feast.protos.feast.core.Transformation_pb2 import (
     UserDefinedFunction as UserDefinedFunctionProto,
 )
 

@@ -2,7 +2,7 @@
 import pyarrow
 import pyarrow.substrait as substrait  # type: ignore # noqa
 
-from feast.protos.feast.core.OnDemandFeatureView_pb2 import (
+from feast.protos.feast.core.Transformation_pb2 import (
     OnDemandSubstraitTransformation as OnDemandSubstraitTransformationProto,
 )
 

@@ -16,15 +16,15 @@
 from feast.feature_view import FeatureView
 from feast.field import Field
 from feast.protos.feast.core.DataSource_pb2 import DataSource as DataSourceProto
-from feast.protos.feast.core.OnDemandFeatureView_pb2 import (
-    UserDefinedFunction as UserDefinedFunctionProto,
-)
 from feast.protos.feast.core.StreamFeatureView_pb2 import (
     StreamFeatureView as StreamFeatureViewProto,
 )
 from feast.protos.feast.core.StreamFeatureView_pb2 import (
     StreamFeatureViewSpec as StreamFeatureViewSpecProto,
 )
+from feast.protos.feast.core.Transformation_pb2 import (
+    UserDefinedFunction as UserDefinedFunctionProto,
+)
 
 warnings.simplefilter("once", RuntimeWarning)