fix: add project filter to apply_data_source and delete_data_source

mailtoboggavarapu-coder · mailtoboggavarapu-coder · commit 945576e22d2c · 2026-04-20T17:33:58.000-04:00
Fixes #6206 The apply_data_source method was matching data sources by name only, without filtering by project. In a shared registry scenario where multiple projects have data sources with the same name, this caused cross-project overwriting. Also fix delete_data_source to use the same project-scoped filter, ensuring consistency across all registry mutation methods. Additionally fix Unicode mojibake in comments (em dashes were double-encoded as Latin-1 codepoints instead of UTF-8). 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
@@ -426,7 +426,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()
@@ -691,13 +694,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)
@@ -738,7 +741,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
