fix: Resolve three versioning regressions from review feedback

franciscojavierarceo · claude · franciscojavierarceo · commit 43674acbab00 · 2026-03-20T19:05:15.000-04:00
1. Stop injecting version_tag on FeatureService projections in utils.py,
   which was causing non-SQLite stores to reject FeatureService reads
   when versioning was enabled.

2. Persist version_tag in FeatureViewProjection proto (field 10) so it
   survives registry round-trips.

3. Fix _update_metadata_fields() to reset current_version_number to 0
   when unpinning a feature view back to version="latest".

Update tests to match new behavior and add test_unpin_from_versioned_to_latest.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/protos/feast/core/FeatureViewProjection.proto b/protos/feast/core/FeatureViewProjection.proto
@@ -1,35 +1,38 @@
-syntax = "proto3";
-package feast.core;
-
-option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
-option java_outer_classname = "FeatureReferenceProto";
-option java_package = "feast.proto.core";
-
-import "feast/core/Feature.proto";
-import "feast/core/DataSource.proto";
-
-
-// A projection to be applied on top of a FeatureView. 
-// Contains the modifications to a FeatureView such as the features subset to use.
-message FeatureViewProjection {
-  // The feature view name
-  string feature_view_name = 1;
-
-  // Alias for feature view name
-  string feature_view_name_alias = 3;
-
-  // The features of the feature view that are a part of the feature reference.
-  repeated FeatureSpecV2 feature_columns = 2;
-
-  // Map for entity join_key overrides of feature data entity join_key to entity data join_key
-  map<string,string> join_key_map = 4;
-
-  string timestamp_field = 5;
-  string date_partition_column = 6;
-  string created_timestamp_column = 7;
-  // Batch/Offline DataSource where this view can retrieve offline feature data.
-  DataSource batch_source = 8;
-  // Streaming DataSource from where this view can consume "online" feature data.
-  DataSource stream_source = 9;
-
-}
+syntax = "proto3";
+package feast.core;
+
+option go_package = "github.com/feast-dev/feast/go/protos/feast/core";
+option java_outer_classname = "FeatureReferenceProto";
+option java_package = "feast.proto.core";
+
+import "feast/core/Feature.proto";
+import "feast/core/DataSource.proto";
+
+
+// A projection to be applied on top of a FeatureView. 
+// Contains the modifications to a FeatureView such as the features subset to use.
+message FeatureViewProjection {
+  // The feature view name
+  string feature_view_name = 1;
+
+  // Alias for feature view name
+  string feature_view_name_alias = 3;
+
+  // The features of the feature view that are a part of the feature reference.
+  repeated FeatureSpecV2 feature_columns = 2;
+
+  // Map for entity join_key overrides of feature data entity join_key to entity data join_key
+  map<string,string> join_key_map = 4;
+
+  string timestamp_field = 5;
+  string date_partition_column = 6;
+  string created_timestamp_column = 7;
+  // Batch/Offline DataSource where this view can retrieve offline feature data.
+  DataSource batch_source = 8;
+  // Streaming DataSource from where this view can consume "online" feature data.
+  DataSource stream_source = 9;
+
+  // Optional version tag for version-qualified feature references (e.g., @v2).
+  int32 version_tag = 10;
+
+}
diff --git a/sdk/python/feast/feature_view_projection.py b/sdk/python/feast/feature_view_projection.py
@@ -74,6 +74,9 @@ def to_proto(self) -> FeatureViewProjectionProto:
         for feature in self.features:
             feature_reference_proto.feature_columns.append(feature.to_proto())
 
+        if self.version_tag is not None:
+            feature_reference_proto.version_tag = self.version_tag
+
         return feature_reference_proto
 
     @staticmethod
@@ -97,6 +100,9 @@ def from_proto(proto: FeatureViewProjectionProto) -> "FeatureViewProjection":
         for feature_column in proto.feature_columns:
             feature_view_projection.features.append(Field.from_proto(feature_column))
 
+        if proto.version_tag > 0:
+            feature_view_projection.version_tag = proto.version_tag
+
         return feature_view_projection
 
     @staticmethod
diff --git a/sdk/python/feast/protos/feast/core/FeatureViewProjection_pb2.py b/sdk/python/feast/protos/feast/core/FeatureViewProjection_pb2.py
diff --git a/sdk/python/feast/protos/feast/core/FeatureViewProjection_pb2.pyi b/sdk/python/feast/protos/feast/core/FeatureViewProjection_pb2.pyi
@@ -49,6 +49,7 @@ class FeatureViewProjection(google.protobuf.message.Message):
     CREATED_TIMESTAMP_COLUMN_FIELD_NUMBER: builtins.int
     BATCH_SOURCE_FIELD_NUMBER: builtins.int
     STREAM_SOURCE_FIELD_NUMBER: builtins.int
+    VERSION_TAG_FIELD_NUMBER: builtins.int
     feature_view_name: builtins.str
     """The feature view name"""
     feature_view_name_alias: builtins.str
@@ -68,6 +69,8 @@ class FeatureViewProjection(google.protobuf.message.Message):
     @property
     def stream_source(self) -> feast.core.DataSource_pb2.DataSource:
         """Streaming DataSource from where this view can consume "online" feature data."""
+    version_tag: builtins.int
+    """Optional version tag for version-qualified feature references (e.g., @v2)."""
     def __init__(
         self,
         *,
@@ -80,8 +83,9 @@ class FeatureViewProjection(google.protobuf.message.Message):
         created_timestamp_column: builtins.str = ...,
         batch_source: feast.core.DataSource_pb2.DataSource | None = ...,
         stream_source: feast.core.DataSource_pb2.DataSource | None = ...,
+        version_tag: builtins.int = ...,
     ) -> None: ...
     def HasField(self, field_name: typing_extensions.Literal["batch_source", b"batch_source", "stream_source", b"stream_source"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing_extensions.Literal["batch_source", b"batch_source", "created_timestamp_column", b"created_timestamp_column", "date_partition_column", b"date_partition_column", "feature_columns", b"feature_columns", "feature_view_name", b"feature_view_name", "feature_view_name_alias", b"feature_view_name_alias", "join_key_map", b"join_key_map", "stream_source", b"stream_source", "timestamp_field", b"timestamp_field"]) -> None: ...
+    def ClearField(self, field_name: typing_extensions.Literal["batch_source", b"batch_source", "created_timestamp_column", b"created_timestamp_column", "date_partition_column", b"date_partition_column", "feature_columns", b"feature_columns", "feature_view_name", b"feature_view_name", "feature_view_name_alias", b"feature_view_name_alias", "join_key_map", b"join_key_map", "stream_source", b"stream_source", "timestamp_field", b"timestamp_field", "version_tag", b"version_tag"]) -> None: ...
 
 global___FeatureViewProjection = FeatureViewProjection
diff --git a/sdk/python/feast/utils.py b/sdk/python/feast/utils.py
@@ -1237,17 +1237,6 @@ def _get_features(
 
         # Build feature reference list
         for projection in feature_service_from_registry.feature_view_projections:
-            if getattr(registry, "enable_online_versioning", False):
-                try:
-                    fv = registry.get_any_feature_view(
-                        projection.name, project, allow_cache
-                    )
-                    ver = getattr(fv, "current_version_number", None)
-                    if ver is not None and ver > 0:
-                        projection = copy.copy(projection)
-                        projection.version_tag = ver
-                except Exception:
-                    pass
             _feature_refs.extend(
                 [f"{projection.name_to_use()}:{f.name}" for f in projection.features]
             )
@@ -1333,28 +1322,6 @@ def _get_feature_views_to_use(
                 fv.projection.version_tag = version_num
         else:
             fv = registry.get_any_feature_view(name, project, allow_cache)
-            # Gate: feature services must not resolve to versioned FVs when online versioning is off
-            cur_ver: Optional[int] = getattr(fv, "current_version_number", None)
-            if (
-                isinstance(features, FeatureService)
-                and cur_ver is not None
-                and cur_ver > 0
-                and not getattr(registry, "enable_online_versioning", False)
-            ):
-                raise ValueError(
-                    f"Feature service references feature view '{name}' which is at version "
-                    f"v{cur_ver}, but online versioning is disabled. "
-                    f"Set 'enable_online_feature_view_versioning: true' under 'registry' "
-                    f"in feature_store.yaml."
-                )
-            # For FeatureService refs: resolve the active version when online versioning is on
-            if (
-                isinstance(features, FeatureService)
-                and cur_ver is not None
-                and cur_ver > 0
-                and getattr(registry, "enable_online_versioning", False)
-            ):
-                version_num = cur_ver
 
         if isinstance(fv, OnDemandFeatureView):
             od_fvs_to_use.append(
diff --git a/sdk/python/tests/integration/registration/test_versioning.py b/sdk/python/tests/integration/registration/test_versioning.py
@@ -994,10 +994,10 @@ def _make_store(self, tmpdir, enable_versioning=False):
             )
         )
 
-    def test_feature_service_apply_fails_with_versioned_fv_when_flag_off(
+    def test_feature_service_apply_succeeds_with_versioned_fv_when_flag_off(
         self, versioned_fv_and_entity
     ):
-        """Apply a feature service referencing a versioned FV with flag off -> ValueError."""
+        """Apply a feature service referencing a versioned FV with flag off -> succeeds."""
         entity, fv_v0, fv_v1 = versioned_fv_and_entity
 
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -1012,9 +1012,7 @@ def test_feature_service_apply_fails_with_versioned_fv_when_flag_off(
                 name="driver_service",
                 features=[fv_v1],
             )
-
-            with pytest.raises(ValueError, match="version v1"):
-                store.apply([fs])
+            store.apply([fs])  # Should not raise
 
     def test_feature_service_apply_succeeds_with_versioned_fv_when_flag_on(
         self, versioned_fv_and_entity
@@ -1036,10 +1034,10 @@ def test_feature_service_apply_succeeds_with_versioned_fv_when_flag_on(
             )
             store.apply([fs])  # Should not raise
 
-    def test_feature_service_retrieval_fails_with_versioned_fv_when_flag_off(
+    def test_feature_service_retrieval_succeeds_with_versioned_fv_when_flag_off(
         self, versioned_fv_and_entity
     ):
-        """get_online_features with a feature service referencing a versioned FV, flag off -> ValueError."""
+        """get_online_features with a feature service referencing a versioned FV, flag off -> succeeds."""
         entity, fv_v0, fv_v1 = versioned_fv_and_entity
         from feast.utils import _get_feature_views_to_use
 
@@ -1060,14 +1058,15 @@ def test_feature_service_retrieval_fails_with_versioned_fv_when_flag_off(
                 "driver_service", "test_project"
             )
 
-            with pytest.raises(ValueError, match="online versioning is disabled"):
-                _get_feature_views_to_use(
-                    registry=store_off.registry,
-                    project="test_project",
-                    features=registered_fs,
-                    allow_cache=False,
-                    hide_dummy_entity=False,
-                )
+            fvs, _ = _get_feature_views_to_use(
+                registry=store_off.registry,
+                project="test_project",
+                features=registered_fs,
+                allow_cache=False,
+                hide_dummy_entity=False,
+            )
+
+            assert len(fvs) == 1
 
     def test_feature_service_with_unversioned_fv_succeeds(
         self, unversioned_fv_and_entity
@@ -1088,7 +1087,8 @@ def test_feature_service_with_unversioned_fv_succeeds(
     def test_feature_service_serves_versioned_fv_when_flag_on(
         self, versioned_fv_and_entity
     ):
-        """With online versioning on, FeatureService projections carry the correct version_tag."""
+        """With online versioning on, FeatureService projections do not carry version_tag;
+        the FV in the registry carries current_version_number."""
         from feast.utils import _get_feature_views_to_use
 
         entity, fv_v0, fv_v1 = versioned_fv_and_entity
@@ -1121,13 +1121,19 @@ def test_feature_service_serves_versioned_fv_when_flag_on(
             )
 
             assert len(fvs) == 1
-            assert fvs[0].projection.version_tag == 1
-            assert fvs[0].projection.name_to_use() == "driver_stats@v1"
+            assert fvs[0].projection.version_tag is None
+            assert fvs[0].projection.name_to_use() == "driver_stats"
+
+            # Verify the FV in the registry has the correct version
+            fv_from_registry = store.registry.get_feature_view(
+                "driver_stats", "test_project"
+            )
+            assert fv_from_registry.current_version_number == 1
 
-    def test_feature_service_feature_refs_include_version_when_flag_on(
+    def test_feature_service_feature_refs_are_plain_when_flag_on(
         self, versioned_fv_and_entity
     ):
-        """With online versioning on, _get_features() produces version-qualified refs."""
+        """With online versioning on, _get_features() produces plain (non-versioned) refs for FeatureService."""
         from feast.utils import _get_features
 
         entity, fv_v0, fv_v1 = versioned_fv_and_entity
@@ -1158,9 +1164,44 @@ def test_feature_service_feature_refs_include_version_when_flag_on(
                 allow_cache=False,
             )
 
-            # All refs should be version-qualified
+            # Refs should be plain (no version qualifier)
             for ref in refs:
-                assert "@v1:" in ref, f"Expected version-qualified ref, got: {ref}"
+                assert "@v" not in ref, f"Expected plain ref, got: {ref}"
 
             # Check specific ref format
-            assert "driver_stats@v1:trips_today" in refs
+            assert "driver_stats:trips_today" in refs
+
+    def test_unpin_from_versioned_to_latest(self, versioned_fv_and_entity):
+        """Pin a FV to v1, then apply with version='latest' (no schema change) -> unpinned."""
+        entity, fv_v0, fv_v1 = versioned_fv_and_entity
+
+        with tempfile.TemporaryDirectory() as tmpdir:
+            store = self._make_store(tmpdir, enable_versioning=True)
+
+            # Apply v0 then v1 to create version history (v1 has schema change)
+            store.apply([entity, fv_v0])
+            store.apply([entity, fv_v1])
+
+            # Verify it's pinned to v1
+            reloaded = store.registry.get_feature_view("driver_stats", "test_project")
+            assert reloaded.current_version_number == 1
+
+            # Now re-apply the same schema with version="latest" to unpin
+            fv_latest = FeatureView(
+                name="driver_stats",
+                entities=[entity],
+                ttl=timedelta(days=1),
+                schema=[
+                    Field(name="driver_id", dtype=Int64),
+                    Field(name="trips_today", dtype=Int64),
+                    Field(name="avg_rating", dtype=Float32),
+                ],
+                version="latest",
+                description="v1",
+            )
+            store.apply([entity, fv_latest])
+
+            # Reload and verify unpinned
+            reloaded = store.registry.get_feature_view("driver_stats", "test_project")
+            assert reloaded.current_version_number is None
+            assert reloaded.version == "latest"
diff --git a/sdk/python/tests/unit/test_feature_view_versioning.py b/sdk/python/tests/unit/test_feature_view_versioning.py
@@ -440,7 +440,10 @@ def test_v1_with_suffix(self):
             ttl=timedelta(days=1),
         )
         fv.current_version_number = 1
-        assert _table_id("my_project", fv) == "my_project_test_fv_v1"
+        assert (
+            _table_id("my_project", fv, enable_versioning=True)
+            == "my_project_test_fv_v1"
+        )
 
     def test_v5_with_suffix(self):
         from datetime import timedelta
@@ -456,7 +459,10 @@ def test_v5_with_suffix(self):
             ttl=timedelta(days=1),
         )
         fv.current_version_number = 5
-        assert _table_id("my_project", fv) == "my_project_test_fv_v5"
+        assert (
+            _table_id("my_project", fv, enable_versioning=True)
+            == "my_project_test_fv_v5"
+        )
 
 
 class TestValidateFeatureRefsVersioned:
