Rebasing and merging changes from other PR

franciscojavierarceo · franciscojavierarceo · commit 3cf03691cce8 · 2024-09-29T15:06:29.000-04:00
Signed-off-by: Francisco Javier Arceo &lt;farceo@redhat.com&gt;
diff --git a/sdk/python/feast/inference.py b/sdk/python/feast/inference.py
@@ -13,7 +13,6 @@
 from feast.infra.offline_stores.file_source import FileSource
 from feast.infra.offline_stores.redshift_source import RedshiftSource
 from feast.infra.offline_stores.snowflake_source import SnowflakeSource
-from feast.on_demand_feature_view import OnDemandFeatureView
 from feast.repo_config import RepoConfig
 from feast.stream_feature_view import StreamFeatureView
 from feast.on_demand_feature_view import OnDemandFeatureView
diff --git a/sdk/python/feast/utils.py b/sdk/python/feast/utils.py
@@ -322,16 +322,18 @@ def _convert_arrow_odfv_to_proto(
     }
     # Adding On Demand Features
     for feature in feature_view.features:
-        if feature.name in [c[0] for c in columns]:
+        if feature.name in [c[0] for c in columns] and feature.name not in proto_values_by_column:
             # initializing the column as null
-            proto_values_by_column[feature.name] = python_values_to_proto_values(
-                table.append_column(
-                    feature.name,
-                    pyarrow.array(
-                        [None] * table.shape[0],
+            null_column = pyarrow.array(
+                        [None] * table.num_rows,
                         type=from_feast_to_pyarrow_type(feature.dtype),
-                    ),
-                ),
+                    )
+            updated_table = pyarrow.RecordBatch.from_arrays(
+                table.columns + [null_column],
+                schema=table.schema.append(pyarrow.field(feature.name, null_column.type))
+            )
+            proto_values_by_column[feature.name] = python_values_to_proto_values(
+                updated_table.column(feature.name).to_numpy(zero_copy_only=False), feature.dtype.to_value_type(),
             )
 
     entity_keys = [
