fix: Resolve review comments for feature_store

Signed-off-by: RutujaPathade <73137503+RutujaPathade@users.noreply.github.com>
feast-dev · ntkathole · May 23, 2026 · May 13, 2026 · May 8, 2026 · May 15, 2026
commit cb33b6df04e2693133eee90bb05d3905fd3e4bb9
diff --git a/sdk/python/feast/diff/registry_diff.py b/sdk/python/feast/diff/registry_diff.py
@@ -404,15 +404,8 @@ def apply_diff_to_registry(
                 FeastObjectType.ON_DEMAND_FEATURE_VIEW,
                 FeastObjectType.STREAM_FEATURE_VIEW,
             ]:
-                new_fv = cast(BaseFeatureView, feast_object_diff.new_feast_object)
-                # Preserve lifecycle state from the existing registry object so
-                # that ``feast apply`` does not reset e.g. AVAILABLE_ONLINE back
-                # to STATE_UNSPECIFIED.
-                existing_fv = feast_object_diff.current_feast_object
-                if existing_fv is not None and hasattr(existing_fv, "state"):
-                    new_fv.state = existing_fv.state  # type: ignore[attr-defined]
                 registry.apply_feature_view(
-                    new_fv,
+                    cast(BaseFeatureView, feast_object_diff.new_feast_object),
                     project,
                     commit=False,
                     no_promote=no_promote,

@@ -1205,33 +1205,12 @@ def apply(
             services_to_update,
         )
 
-        # Preserve lifecycle state from the registry so that apply does
-        # not reset e.g. AVAILABLE_ONLINE back to STATE_UNSPECIFIED.
-        # Must run before any commit=False operations to avoid registry
-        # cache refreshes that would discard uncommitted changes.
-        existing_states: dict[str, FeatureViewState] = {}
-        for view in itertools.chain(views_to_update, odfvs_to_update, sfvs_to_update):
-            if (
-                hasattr(view, "state")
-                and view.state == FeatureViewState.STATE_UNSPECIFIED
-            ):
-                try:
-                    existing = self.registry.get_any_feature_view(
-                        view.name, self.project
-                    )
-                    if hasattr(existing, "state"):
-                        existing_states[view.name] = existing.state
-                except FeastObjectNotFoundException:
-                    pass
-
         # Add all objects to the registry and update the provider's infrastructure.
         for project in projects_to_update:
             self.registry.apply_project(project, commit=False)
         for ds in data_sources_to_update:
             self.registry.apply_data_source(ds, project=self.project, commit=False)
         for view in itertools.chain(views_to_update, odfvs_to_update, sfvs_to_update):
-            if view.name in existing_states:
-                view.state = existing_states[view.name]  # type: ignore[attr-defined]
             self.registry.apply_feature_view(
                 view, project=self.project, commit=False, no_promote=no_promote
             )
@@ -1856,8 +1835,19 @@ def tqdm_builder(length):
                 end_date = utils.make_tzaware(end_date) or _utc_now()
 
                 # Transition state to MATERIALIZING before starting.
+                # Only enforce when the state machine is active (not STATE_UNSPECIFIED).
                 previous_state = getattr(feature_view, "state", None)
-                if hasattr(feature_view, "state"):
+                if (
+                    hasattr(feature_view, "state")
+                    and feature_view.state != FeatureViewState.STATE_UNSPECIFIED
+                ):
+                    if not feature_view.state.can_transition_to(
+                        FeatureViewState.MATERIALIZING
+                    ):
+                        raise ValueError(
+                            f"FeatureView {feature_view.name} cannot transition "
+                            f"from {feature_view.state.name} to MATERIALIZING."
+                        )
                     feature_view.state = FeatureViewState.MATERIALIZING
                     self.registry.apply_feature_view(
                         feature_view, self.project, commit=True
@@ -1878,7 +1868,11 @@ def tqdm_builder(length):
                 except Exception:
                     fv_success = False
                     # Roll back state to previous value on failure.
-                    if hasattr(feature_view, "state") and previous_state is not None:
+                    if (
+                        hasattr(feature_view, "state")
+                        and previous_state is not None
+                        and previous_state != FeatureViewState.STATE_UNSPECIFIED
+                    ):
                         feature_view.state = previous_state
                         self.registry.apply_feature_view(
                             feature_view, self.project, commit=True
@@ -1998,8 +1992,19 @@ def tqdm_builder(length):
                 end_date = utils.make_tzaware(end_date)
 
                 # Transition state to MATERIALIZING before starting.
+                # Only enforce when the state machine is active (not STATE_UNSPECIFIED).
                 previous_state = getattr(feature_view, "state", None)
-                if hasattr(feature_view, "state"):
+                if (
+                    hasattr(feature_view, "state")
+                    and feature_view.state != FeatureViewState.STATE_UNSPECIFIED
+                ):
+                    if not feature_view.state.can_transition_to(
+                        FeatureViewState.MATERIALIZING
+                    ):
+                        raise ValueError(
+                            f"FeatureView {feature_view.name} cannot transition "
+                            f"from {feature_view.state.name} to MATERIALIZING."
+                        )
                     feature_view.state = FeatureViewState.MATERIALIZING
                     self.registry.apply_feature_view(
                         feature_view, self.project, commit=True
@@ -2021,7 +2026,11 @@ def tqdm_builder(length):
                 except Exception:
                     fv_success = False
                     # Roll back state to previous value on failure.
-                    if hasattr(feature_view, "state") and previous_state is not None:
+                    if (
+                        hasattr(feature_view, "state")
+                        and previous_state is not None
+                        and previous_state != FeatureViewState.STATE_UNSPECIFIED
+                    ):
                         feature_view.state = previous_state
                         self.registry.apply_feature_view(
                             feature_view, self.project, commit=True

@@ -584,10 +584,14 @@ def _update_metadata_fields(
         if hasattr(existing_proto.spec, "disabled") and hasattr(updated_fv, "enabled"):
             existing_proto.spec.disabled = not getattr(updated_fv, "enabled")
 
-        # Lifecycle state
+        # Lifecycle state — skip STATE_UNSPECIFIED so that ``feast apply``
+        # does not accidentally reset an AVAILABLE_ONLINE view.
         if hasattr(existing_proto.meta, "state") and hasattr(updated_fv, "state"):
             state_val = getattr(updated_fv, "state")
-            if isinstance(state_val, FeatureViewState):
+            if (
+                isinstance(state_val, FeatureViewState)
+                and state_val != FeatureViewState.STATE_UNSPECIFIED
+            ):
                 existing_proto.meta.state = state_val.to_proto()
 
         # OnDemandFeatureView configuration