fix: Add project filter to apply_data_source and delete_data_source

mailtoboggavarapu-coder · mailtoboggavarapu-coder · commit 5b34cbb133b7 · 2026-04-22T15:36:43.000Z
Fixes two methods in the shared registry that were matching data sources by name only, without filtering by project. In multi-project registries where different projects share the same data source name (e.g. the default "vals_to_add"), this caused: - apply_data_source: cross-project overwriting of data sources - delete_data_source: deleting data sources from the wrong project Changes: - apply_data_source: adds and existing_data_source_proto.project == project check (mirrors the pattern used in apply_entity, apply_feature_service, apply_feature_view) - delete_data_source: uses the same project-scoped filter for consistency - Fix Unicode mojibake in registry.py comments (em dashes and right arrows were stored as double-encoded Latin-1 bytes) - apply ruff format - collapse single-line timestamp assignment Fixes #6206 Signed-off-by: Venkateswarlu Boggavarapu <mailtoboggavarapu@gmail.com>
diff --git a/sdk/python/feast/infra/registry/registry.py b/sdk/python/feast/infra/registry/registry.py
@@ -394,16 +394,17 @@ def apply_data_source(
         registry = self._prepare_registry_for_changes(project)
 
         for idx, existing_data_source_proto in enumerate(registry.data_sources):
-            if existing_data_source_proto.name == data_source.name:
+            if (
+                existing_data_source_proto.name == data_source.name
+                and existing_data_source_proto.project == project
+            ):
                 existing_data_source = DataSource.from_proto(existing_data_source_proto)
                 # Check if the data source has actually changed
                 if existing_data_source == data_source:
                     return
                 else:
                     # Preserve created_timestamp from existing data source
-                    data_source.created_timestamp = (
-                        existing_data_source.created_timestamp
-                    )
+                    data_source.created_timestamp = existing_data_source.created_timestamp
                     del registry.data_sources[idx]
                     break
 
@@ -423,7 +424,10 @@ def delete_data_source(self, name: str, project: str, commit: bool = True):
         for idx, data_source_proto in enumerate(
             self.cached_registry_proto.data_sources
         ):
-            if data_source_proto.name == name:
+            if (
+                data_source_proto.name == name
+                and data_source_proto.project == project
+            ):
                 del self.cached_registry_proto.data_sources[idx]
                 if commit:
                     self.commit()
@@ -688,13 +692,13 @@ def apply_feature_view(
 
         if not is_latest:
             # Explicit version: check if it exists (pin/revert) or not (forward declaration).
-            # Note: The file registry is last-write-wins for true concurrent races —
+            # Note: The file registry is last-write-wins for true concurrent races â
             # this is a pre-existing limitation for all file registry operations.
             # For multi-client environments, use the SQL registry.
             record = self._get_version_record(feature_view.name, project, pin_version)
 
             if record is not None:
-                # Version exists → pin/revert to that snapshot
+                # Version exists â pin/revert to that snapshot
                 # Check that the user hasn't also modified the definition.
                 # Compare user's FV (with version="latest") against active FV.
                 self._prepare_registry_for_changes(project)
@@ -735,7 +739,7 @@ def apply_feature_view(
                 # Apply the restored FV using the standard path below
                 feature_view = restored_fv
             else:
-                # Version doesn't exist → forward declaration: create it
+                # Version doesn't exist â forward declaration: create it
                 feature_view.current_version_number = pin_version
                 feature_view_proto = feature_view.to_proto()
                 feature_view_proto.spec.project = project
