Adding setting to control fuzzy search

Author: galvana

src/fides/api/api/v1/endpoints/privacy_request_endpoints.py

@@ -424,29 +424,55 @@ def _filter_privacy_request_queryset(
             (started_lt, started_gt, "started"),
         ]
     )
-    if fuzzy_search_str:
-        decrypted_identities_automaton = get_decrypted_identities_automaton(db)
 
-        # Set of associated privacy request ids
-        fuzzy_search_identity_privacy_request_ids: Optional[Set[str]] = set(
-            x
-            for list in decrypted_identities_automaton.values(fuzzy_search_str)
-            for x in list
-        )
+    # Handle fuzzy search string
+    if fuzzy_search_str:
+        if CONFIG.execution.fuzzy_search_enabled:
+            decrypted_identities_automaton = get_decrypted_identities_automaton(db)
+
+            # Set of associated privacy request ids
+            fuzzy_search_identity_privacy_request_ids: Optional[Set[str]] = set(
+                x
+                for list in decrypted_identities_automaton.values(fuzzy_search_str)
+                for x in list
+            )
 
-        if not fuzzy_search_identity_privacy_request_ids:
-            query = query.filter(PrivacyRequest.id.ilike(f"{fuzzy_search_str}%"))
+            if not fuzzy_search_identity_privacy_request_ids:
+                query = query.filter(PrivacyRequest.id.ilike(f"{fuzzy_search_str}%"))
+            else:
+                query = query.filter(
+                    or_(
+                        PrivacyRequest.id.in_(
+                            fuzzy_search_identity_privacy_request_ids
+                        ),
+                        PrivacyRequest.id.ilike(f"{fuzzy_search_str}%"),
+                    )
+                )
         else:
+            # When fuzzy search is disabled, treat fuzzy_search_str as an
+            # exact match on identity or partial match on privacy request ID
+            identity_hashes = ProvidedIdentity.hash_value_for_search(fuzzy_search_str)
+            identity_set: Set[str] = {
+                identity[0]
+                for identity in ProvidedIdentity.filter(
+                    db=db,
+                    conditions=(
+                        (ProvidedIdentity.hashed_value.in_(identity_hashes))
+                        & (ProvidedIdentity.privacy_request_id.isnot(None))
+                    ),
+                ).values(column("privacy_request_id"))
+            }
+
             query = query.filter(
                 or_(
-                    PrivacyRequest.id.in_(fuzzy_search_identity_privacy_request_ids),
-                    PrivacyRequest.id.ilike(f"{fuzzy_search_str}%"),
+                    PrivacyRequest.id.in_(identity_set),
+                    PrivacyRequest.id.ilike(f"%{fuzzy_search_str}%"),
                 )
             )
 
     if identity:
         identity_hashes = ProvidedIdentity.hash_value_for_search(identity)
-        identity_set: Set[str] = {
+        identity_set: Set[str] = { # type: ignore[no-redef]
             identity[0]
             for identity in ProvidedIdentity.filter(
                 db=db,
@@ -499,7 +525,7 @@ def _filter_privacy_request_queryset(
 
     # Further restrict all PrivacyRequests by additional params
     if request_id:
-        query = query.filter(PrivacyRequest.id.ilike(f"{request_id}%"))
+        query = query.filter(PrivacyRequest.id.ilike(f"%{request_id}%"))
     if external_id:
         query = query.filter(PrivacyRequest.external_id.ilike(f"{external_id}%"))
     if status:

src/fides/api/models/privacy_request.py

@@ -560,11 +560,12 @@ def persist_identity(self, db: Session, identity: Identity) -> None:
                 )
 
         # Simultaneously add identities to automaton for fuzzy search
-        try:
-            self.add_identities_to_automaton()
-        except Exception as exc:
-            # This should never affect the ability to create privacy requests
-            logger.error(f"Could not add identities to Automaton: {Pii(str(exc))}")
+        if CONFIG.execution.fuzzy_search_enabled:
+            try:
+                self.add_identities_to_automaton()
+            except Exception as exc:
+                # This should never affect the ability to create privacy requests
+                logger.error(f"Could not add identities to Automaton: {Pii(str(exc))}")
 
     def persist_custom_privacy_request_fields(
         self,

src/fides/config/execution_settings.py

@@ -61,4 +61,8 @@ class ExecutionSettings(FidesSettings):
         default=False,
         description="Temporary flag to switch to using DSR 3.0 to process your tasks.",
     )
+    fuzzy_search_enabled: bool = Field(
+        default=True,
+        description="Whether fuzzy search is enabled for privacy request lookups.",
+    )
     model_config = SettingsConfigDict(env_prefix=ENV_PREFIX)