ethyca-fides 2.65.1b1__py2.py3-none-any.whl → 2.65.1b2__py2.py3-none-any.whl

fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-09T11:43:42-0600",
+ "date": "2025-07-10T11:18:51-0300",
  "dirty": false,
  "error": null,
- "full-revisionid": "9579495c14ebf76d7decc8e13069a89db5b4e721",
- "version": "2.65.1b1"
+ "full-revisionid": "a74b823bafe8947c6859f0ace17b7b9f4973ff4b",
+ "version": "2.65.1b2"
 }
 '''  # END VERSION_JSON
 

fides/api/alembic/migrations/versions/3b0f4905378c_change_asset_with_consent_to_asset_.py

@@ -0,0 +1,47 @@
+"""Change Asset.with_consent to Asset.consent_status
+
+Revision ID: 3b0f4905378c
+Revises: 641f6bcd424f
+Create Date: 2025-07-01 15:17:32.542511
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "3b0f4905378c"
+down_revision = "641f6bcd424f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute(
+        "create type consentstatus as enum ('with_consent', 'without_consent', 'exempt', 'unknown')"
+    )
+    op.add_column(
+        "asset",
+        sa.Column(
+            "consent_status",
+            sa.Enum(
+                name="consentstatus",
+            ),
+            server_default="unknown",
+            nullable=False,
+        ),
+    )
+    op.drop_column("asset", "with_consent")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "asset",
+        sa.Column("with_consent", sa.BOOLEAN(), autoincrement=False, nullable=False),
+    )
+    op.drop_column("asset", "consent_status")
+    op.execute("drop type if exists consentstatus")
+    # ### end Alembic commands ###

fides/api/alembic/migrations/versions/9e3dab26f75f_add_test_website_to_connectiontype.py

@@ -0,0 +1,51 @@
+"""Add test_website to ConnectionType
+
+Revision ID: 9e3dab26f75f
+Revises: d45dec7e541d
+Create Date: 2025-07-02 14:11:53.403439
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "9e3dab26f75f"
+down_revision = "d45dec7e541d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Add test_website to ConnectionType enum
+    op.execute("alter type connectiontype rename to connectiontype_old")
+    op.execute(
+        "create type connectiontype as enum('attentive_email', 'bigquery', 'datahub', 'dynamodb', 'fides', 'generic_consent_email', 'generic_erasure_email', 'dynamic_erasure_email', 'google_cloud_sql_mysql', 'google_cloud_sql_postgres', 'https', 'manual', 'manual_webhook', 'manual_task', 'mariadb', 'mongodb', 'mssql', 'mysql', 'okta', 'postgres', 'rds_mysql', 'rds_postgres', 'redshift', 's3', 'saas', 'scylla', 'snowflake', 'sovrn', 'test_website', 'timescale', 'website')"
+    )
+    op.execute(
+        (
+            "alter table connectionconfig alter column connection_type type connectiontype using "
+            "connection_type::text::connectiontype"
+        )
+    )
+    op.execute("drop type connectiontype_old")
+
+
+def downgrade():
+    # First remove the ConnectionConfigs with connection_type = 'test_website'
+    op.execute("delete from connectionconfig where connection_type in ('test_website')")
+    # Then remove 'test_website' from ConnectionType enum by renaming old enum
+    op.execute("alter type connectiontype rename to connectiontype_old")
+    # Create a new enum without 'test_website'
+    op.execute(
+        "create type connectiontype as enum('attentive_email', 'bigquery', 'datahub', 'dynamodb', 'fides', 'generic_consent_email', 'generic_erasure_email', 'dynamic_erasure_email', 'google_cloud_sql_mysql', 'google_cloud_sql_postgres', 'https', 'manual', 'manual_webhook', 'manual_task', 'mariadb', 'mongodb', 'mssql', 'mysql', 'okta', 'postgres', 'rds_mysql', 'rds_postgres', 'redshift', 's3', 'saas', 'scylla', 'snowflake', 'sovrn', 'timescale', 'website')"
+    )
+    # Alter the connectionconfig table to use the new enum
+    op.execute(
+        (
+            "alter table connectionconfig alter column connection_type type connectiontype using "
+            "connection_type::text::connectiontype"
+        )
+    )
+    # Drop the old enum
+    op.execute("drop type connectiontype_old")

fides/api/alembic/migrations/versions/d45dec7e541d_add_consent_indexes_to_stagedresource.py

@@ -0,0 +1,64 @@
+"""Add consent indexes to stagedresource
+
+Revision ID: d45dec7e541d
+Revises: 3b0f4905378c
+Create Date: 2025-07-01 19:50:25.009417
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from loguru import logger
+
+# revision identifiers, used by Alembic.
+revision = "d45dec7e541d"
+down_revision = "3b0f4905378c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    connection = op.get_bind()
+
+    # Check stagedresource table size to decide if we should create indexes immediately
+    stagedresource_count = connection.execute(
+        sa.text("SELECT COUNT(*) FROM stagedresource")
+    ).scalar()
+
+    if stagedresource_count < 1000000:
+        # Create indexes normally for smaller tables
+        op.create_index(
+            "ix_stagedresource_monitor_config_resource_type_consent",
+            "stagedresource",
+            [
+                "monitor_config_id",
+                "resource_type",
+                sa.text("(meta->>'consent_aggregated')"),
+            ],
+            unique=False,
+        )
+        op.create_index(
+            "ix_stagedresource_system_vendor_consent",
+            "stagedresource",
+            ["system_id", "vendor_id", sa.text("(meta->>'consent_aggregated')")],
+            unique=False,
+        )
+    else:
+        logger.warning(
+            "The stagedresource table has more than 1 million rows, "
+            "skipping index creation. Indexes will be created during application startup "
+            "via post_upgrade_index_creation.py"
+        )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Drop indexes if they exist (they may not exist if they were deferred)
+    op.execute("DROP INDEX IF EXISTS ix_stagedresource_system_vendor_consent")
+    op.execute(
+        "DROP INDEX IF EXISTS ix_stagedresource_monitor_config_resource_type_consent"
+    )
+
+    # ### end Alembic commands ###

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

@@ -19,7 +19,7 @@ from typing import (
 )
 
 import sqlalchemy
-from fastapi import Body, Depends, HTTPException, Security
+from fastapi import BackgroundTasks, Body, Depends, HTTPException, Security
 from fastapi.encoders import jsonable_encoder
 from fastapi.params import Query as FastAPIQuery
 from fastapi_pagination import Page, Params
@@ -82,6 +82,7 @@ from fides.api.oauth.utils import (
     verify_oauth_client,
     verify_request_task_callback,
 )
+from fides.api.schemas.api import ResponseWithMessage
 from fides.api.schemas.dataset import CollectionAddressResponse, DryRunDatasetResponse
 from fides.api.schemas.external_https import PrivacyRequestResumeFormat
 from fides.api.schemas.policy import ActionType
@@ -110,6 +111,7 @@ from fides.api.schemas.privacy_request import (
 )
 from fides.api.service.deps import get_messaging_service, get_privacy_request_service
 from fides.api.service.messaging.message_dispatch_service import EMAIL_JOIN_STRING
+from fides.api.service.privacy_request.email_batch_service import send_email_batch
 from fides.api.task.execute_request_tasks import log_task_queued, queue_request_task
 from fides.api.task.filter_results import filter_data_categories
 from fides.api.task.graph_task import EMPTY_REQUEST, EMPTY_REQUEST_TASK, collect_queries
@@ -125,6 +127,7 @@ from fides.common.api.scope_registry import (
     PRIVACY_REQUEST_CALLBACK_RESUME,
     PRIVACY_REQUEST_CREATE,
     PRIVACY_REQUEST_DELETE,
+    PRIVACY_REQUEST_EMAIL_INTEGRATIONS_SEND,
     PRIVACY_REQUEST_NOTIFICATIONS_CREATE_OR_UPDATE,
     PRIVACY_REQUEST_NOTIFICATIONS_READ,
     PRIVACY_REQUEST_READ,
@@ -138,6 +141,7 @@ from fides.common.api.v1.urn_registry import (
     PRIVACY_REQUEST_ACCESS_RESULTS,
     PRIVACY_REQUEST_APPROVE,
     PRIVACY_REQUEST_AUTHENTICATED,
+    PRIVACY_REQUEST_BATCH_EMAIL_SEND,
     PRIVACY_REQUEST_BULK_RETRY,
     PRIVACY_REQUEST_BULK_SOFT_DELETE,
     PRIVACY_REQUEST_DENY,
@@ -2277,3 +2281,22 @@ def get_test_privacy_request_logs(
     # Get logs from Redis
     cache = get_cache()
     return cache.get_decoded_list(f"log_{privacy_request_id}") or []
+
+
+@router.post(
+    PRIVACY_REQUEST_BATCH_EMAIL_SEND,
+    dependencies=[
+        Security(verify_oauth_client, scopes=[PRIVACY_REQUEST_EMAIL_INTEGRATIONS_SEND])
+    ],
+    status_code=HTTP_200_OK,
+    response_model=ResponseWithMessage,
+)
+def send_batch_email_integrations(
+    background_tasks: BackgroundTasks,
+) -> ResponseWithMessage:
+    """Send batch email integrations for a privacy request."""
+    background_tasks.add_task(send_email_batch)
+
+    return ResponseWithMessage(
+        message="Email batch job started. This may take a few minutes to complete."
+    )

fides/api/migrations/post_upgrade_index_creation.py

@@ -142,6 +142,18 @@ TABLE_OBJECT_MAP: Dict[str, List[Dict[str, str]]] = {
             "type": "index",
         },
     ],
+    "stagedresource": [
+        {
+            "name": "ix_stagedresource_monitor_config_resource_type_consent",
+            "statement": "CREATE INDEX CONCURRENTLY ix_stagedresource_monitor_config_resource_type_consent ON stagedresource (monitor_config_id, resource_type, (meta->>'consent_aggregated'))",
+            "type": "index",
+        },
+        {
+            "name": "ix_stagedresource_system_vendor_consent",
+            "statement": "CREATE INDEX CONCURRENTLY ix_stagedresource_system_vendor_consent ON stagedresource (system_id, vendor_id, (meta->>'consent_aggregated'))",
+            "type": "index",
+        },
+    ],
 }
 
 

fides/api/models/asset.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
+from enum import Enum
 from typing import Any, Dict, Optional, Type
 
 from sqlalchemy import (
     ARRAY,
-    BOOLEAN,
     Column,
     ForeignKey,
     Index,
@@ -20,9 +20,21 @@ from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy.orm import relationship
 
 from fides.api.db.base_class import Base
+from fides.api.db.util import EnumColumn
 from fides.api.models.sql_models import System  # type: ignore[attr-defined]
 
 
+class ConsentStatus(str, Enum):
+    """
+    Consent status of the asset
+    """
+
+    with_consent = "with_consent"
+    without_consent = "without_consent"
+    exempt = "exempt"
+    unknown = "unknown"
+
+
 class Asset(Base):
     """
     Web assets associated with a system
@@ -35,7 +47,12 @@ class Asset(Base):
     parent = Column(ARRAY(String), server_default="{}", nullable=False)
     parent_domain = Column(String)
     locations = Column(ARRAY(String), server_default="{}", nullable=False)
-    with_consent = Column(BOOLEAN, default=False, nullable=False)
+    consent_status = Column(
+        EnumColumn(ConsentStatus, native_enum=True),
+        default=ConsentStatus.unknown,
+        server_default="unknown",
+        nullable=False,
+    )
     data_uses = Column(ARRAY(String), server_default="{}", nullable=False)
     description = Column(String, nullable=True)
     page = Column(ARRAY(String), server_default="{}", nullable=False)

fides/api/models/connectionconfig.py

@@ -70,6 +70,8 @@ class ConnectionType(enum.Enum):
     sovrn = "sovrn"
     timescale = "timescale"
     website = "website"
+    # Test connection types, used for testing purposes only
+    test_website = "test_website"  # used for ConfigurableTesteWebsiteMonitor
 
     @property
     def human_readable(self) -> str:
@@ -107,6 +109,7 @@ class ConnectionType(enum.Enum):
             ConnectionType.sovrn.value: "Sovrn",
             ConnectionType.timescale.value: "TimescaleDB",
             ConnectionType.website.value: "Website",
+            ConnectionType.test_website.value: "Test Website Connector -- not for production use",
         }
         try:
             return readable_mapping[self.value]
@@ -152,6 +155,7 @@ class ConnectionType(enum.Enum):
             ConnectionType.sovrn.value: SystemType.email,
             ConnectionType.timescale.value: SystemType.database,
             ConnectionType.website.value: SystemType.website,
+            ConnectionType.test_website.value: SystemType.website,
         }
 
         try:

fides/api/models/detection_discovery/core.py

@@ -530,6 +530,23 @@ class StagedResource(Base):
         default=dict,
     )
 
+    __table_args__ = (
+        # Used for querying monitor aggregates
+        Index(
+            "ix_stagedresource_monitor_config_resource_type_consent",
+            "monitor_config_id",
+            "resource_type",
+            text("(meta->>'consent_aggregated')"),
+        ),
+        # Used for querying system aggregates
+        Index(
+            "ix_stagedresource_system_vendor_consent",
+            "system_id",
+            "vendor_id",
+            text("(meta->>'consent_aggregated')"),
+        ),
+    )
+
     @classmethod
     def get_urn(cls, db: Session, urn: str) -> Optional[StagedResource]:
         """Utility to retrieve the staged resource with the given URN"""

fides/api/oauth/roles.py

@@ -27,6 +27,7 @@ from fides.common.api.scope_registry import (
     PRIVACY_NOTICE_READ,
     PRIVACY_REQUEST_CALLBACK_RESUME,
     PRIVACY_REQUEST_DELETE,
+    PRIVACY_REQUEST_EMAIL_INTEGRATIONS_SEND,
     PRIVACY_REQUEST_MANUAL_STEPS_RESPOND,
     PRIVACY_REQUEST_MANUAL_STEPS_REVIEW,
     PRIVACY_REQUEST_NOTIFICATIONS_CREATE_OR_UPDATE,
@@ -138,6 +139,7 @@ not_contributor_scopes = [
     MESSAGING_CREATE_OR_UPDATE,
     MESSAGING_DELETE,
     PRIVACY_REQUEST_NOTIFICATIONS_CREATE_OR_UPDATE,
+    PRIVACY_REQUEST_EMAIL_INTEGRATIONS_SEND,
     USER_PERMISSION_ASSIGN_OWNERS,
 ]
 

fides/api/schemas/api.py

@@ -24,6 +24,12 @@ class BulkResponse(BaseModel):
             )
 
 
+class ResponseWithMessage(BaseModel):
+    """Generic schema for responses with a message"""
+
+    message: str
+
+
 class BulkUpdateFailed(BaseModel):
     """Schema for use when Bulk Create/Update fails."""
 

fides/api/schemas/connection_configuration/__init__.py

@@ -191,6 +191,7 @@ secrets_schemas: Dict[str, Any] = {
     ConnectionType.sovrn.value: SovrnSchema,
     ConnectionType.timescale.value: TimescaleSchema,
     ConnectionType.website.value: WebsiteSchema,
+    ConnectionType.test_website.value: WebsiteSchema,
 }
 
 

fides/api/service/connectors/__init__.py

@@ -113,6 +113,7 @@ supported_connectors: Dict[str, Any] = {
     ConnectionType.sovrn.value: SovrnConnector,
     ConnectionType.timescale.value: TimescaleConnector,
     ConnectionType.website.value: WebsiteConnector,
+    ConnectionType.test_website.value: WebsiteConnector,
 }
 
 

fides/api/service/connectors/base_email_connector.py

@@ -38,7 +38,7 @@ class BaseEmailConnector(Generic[DB_CONNECTOR_TYPE], ABC):
         """
 
     @abstractmethod
-    def batch_email_send(self, privacy_requests: Query) -> None:
+    def batch_email_send(self, privacy_requests: Query, batch_id: str) -> None:
         """
         Aggregates the identities provided by multiple privacy requests and sends them in a single batch email.
         """

fides/api/service/connectors/base_erasure_email_connector.py

@@ -1,6 +1,6 @@
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Query, Session
 
 from fides.api.models.connectionconfig import ConnectionConfig, ConnectionType
 from fides.api.models.policy import Rule
@@ -16,6 +16,7 @@ from fides.api.schemas.messaging.messaging import (
     MessagingActionType,
 )
 from fides.api.schemas.policy import ActionType
+from fides.api.schemas.privacy_request import PrivacyRequestStatus
 from fides.api.schemas.redis_cache import Identity
 from fides.api.service.connectors.base_email_connector import (
     BaseEmailConnector,
@@ -81,6 +82,42 @@ class BaseErasureEmailConnector(BaseEmailConnector):
             },
         )
 
+    def error_privacy_request(
+        self,
+        db: Session,
+        privacy_request: PrivacyRequest,
+        failure_reason: Optional[str],
+    ) -> None:
+        """
+        Creates an ExecutionLog with status error for the privacy request, using the failure_reason
+        as the message, and sets the privacy request status to error.
+        """
+        ExecutionLog.create(
+            db=db,
+            data={
+                "connection_key": self.configuration.key,
+                "dataset_name": self.configuration.name_or_key,
+                "collection_name": self.configuration.name_or_key,
+                "privacy_request_id": privacy_request.id,
+                "action_type": ActionType.erasure,
+                "status": ExecutionLogStatus.error,
+                "message": failure_reason
+                or "An error occurred when trying to send the erasure email",
+            },
+        )
+        privacy_request.status = PrivacyRequestStatus.error
+        privacy_request.save(db)
+
+    def error_all_privacy_requests(
+        self, db: Session, privacy_requests: Query, failure_reason: str
+    ) -> None:
+        """
+        Creates an ExecutionLog with status error for each privacy request in the batch, and sets the
+        privacy request status to error.
+        """
+        for privacy_request in privacy_requests:
+            self.error_privacy_request(db, privacy_request, failure_reason)
+
 
 def get_identity_types_for_connector(
     email_secrets: BaseEmailSchema,

fides/api/service/connectors/consent_email_connector.py

@@ -212,7 +212,7 @@ class GenericConsentEmailConnector(BaseEmailConnector):
             db, privacy_request, self.configuration
         )
 
-    def batch_email_send(self, privacy_requests: Query) -> None:
+    def batch_email_send(self, privacy_requests: Query, batch_id: str) -> None:
         db = Session.object_session(self.configuration)
 
         skipped_privacy_requests: List[str] = []

fides/api/service/connectors/dynamic_erasure_email_connector.py

@@ -22,7 +22,6 @@ from fides.api.schemas.connection_configuration.connection_secrets_dynamic_erasu
     DynamicErasureEmailSchema,
 )
 from fides.api.schemas.policy import ActionType
-from fides.api.schemas.privacy_request import PrivacyRequestStatus
 from fides.api.service.connectors.base_connector import BaseConnector
 from fides.api.service.connectors.base_erasure_email_connector import (
     BaseErasureEmailConnector,
@@ -67,9 +66,11 @@ class DynamicErasureEmailConnector(BaseErasureEmailConnector):
     def get_config(self, configuration: ConnectionConfig) -> DynamicErasureEmailSchema:
         return DynamicErasureEmailSchema(**configuration.secrets or {})
 
-    def batch_email_send(self, privacy_requests: Query) -> None:
+    def batch_email_send(self, privacy_requests: Query, batch_id: str) -> None:
         logger.debug(
-            "Starting batch_email_send for connector: {} ...", self.configuration.key
+            "Starting batch erasure email {} for connector: {} ...",
+            batch_id,
+            self.configuration.key,
         )
 
         db: Session = Session.object_session(self.configuration)
@@ -133,14 +134,16 @@ class DynamicErasureEmailConnector(BaseErasureEmailConnector):
 
         if not batched_identities:
             logger.info(
-                "Skipping erasure email send for connector: '{}'. "
+                "Skipping erasure email send for connector '{}' and batch '{}'. "
                 "No corresponding user identities or email addresses found for pending privacy requests.",
                 self.configuration.key,
+                batch_id,
             )
             return
 
         logger.info(
-            "Sending batched erasure email for connector {}...",
+            "Sending batch erasure email {} for connector {}...",
+            batch_id,
             self.configuration.key,
         )
 
@@ -155,15 +158,14 @@ class DynamicErasureEmailConnector(BaseErasureEmailConnector):
                     test_mode=False,
                 )
             except MessageDispatchException as exc:
-                logger.error(
-                    "Dynamic erasure email for connector {} failed with exception {}",
-                    self.configuration.key,
-                    exc,
-                )
+                message = f"Dynamic batch erasure email {batch_id} for connector {self.configuration.key} failed with exception {exc}"
+                logger.error(message)
                 self.error_all_privacy_requests(
                     db,
-                    privacy_requests,
-                    f"Dynamic erasure email for connector failed with MessageDispatchException. Error: {exc}",
+                    privacy_requests.filter(
+                        PrivacyRequest.id.notin_(skipped_privacy_requests)
+                    ),
+                    message,
                 )
                 raise exc
 
@@ -470,42 +472,6 @@ class DynamicErasureEmailConnector(BaseErasureEmailConnector):
 
         return email, vendor
 
-    def error_all_privacy_requests(
-        self, db: Session, privacy_requests: Query, failure_reason: str
-    ) -> None:
-        """
-        Creates an ExecutionLog with status error for each privacy request in the batch, and sets the
-        privacy request status to error.
-        """
-        for privacy_request in privacy_requests:
-            self.error_privacy_request(db, privacy_request, failure_reason)
-
-    def error_privacy_request(
-        self,
-        db: Session,
-        privacy_request: PrivacyRequest,
-        failure_reason: Optional[str],
-    ) -> None:
-        """
-        Creates an ExecutionLog with status error for the privacy request, using the failure_reason
-        as the message, and sets the privacy request status to error.
-        """
-        ExecutionLog.create(
-            db=db,
-            data={
-                "connection_key": self.configuration.key,
-                "dataset_name": self.configuration.name_or_key,
-                "collection_name": self.configuration.name_or_key,
-                "privacy_request_id": privacy_request.id,
-                "action_type": ActionType.erasure,
-                "status": ExecutionLogStatus.error,
-                "message": failure_reason
-                or "An error occurred when trying to send the erasure email",
-            },
-        )
-        privacy_request.status = PrivacyRequestStatus.error
-        privacy_request.save(db)
-
     def test_connection(self) -> Optional[ConnectionTestStatus]:
         """
         Sends an email to the "test_email" configured, just to establish that the email workflow is working.

fides/api/service/connectors/erasure_email_connector.py

@@ -9,7 +9,7 @@ from fides.api.models.connectionconfig import (
     ConnectionTestStatus,
     ConnectionType,
 )
-from fides.api.models.privacy_request import ExecutionLog
+from fides.api.models.privacy_request import ExecutionLog, PrivacyRequest
 from fides.api.models.worker_task import ExecutionLogStatus
 from fides.api.schemas.connection_configuration import EmailSchema
 from fides.api.schemas.policy import ActionType
@@ -67,7 +67,7 @@ class GenericErasureEmailConnector(BaseErasureEmailConnector):
             return ConnectionTestStatus.failed
         return ConnectionTestStatus.succeeded
 
-    def batch_email_send(self, privacy_requests: Query) -> None:
+    def batch_email_send(self, privacy_requests: Query, batch_id: str) -> None:
         skipped_privacy_requests: List[str] = []
         batched_identities: List[str] = []
         db = Session.object_session(self.configuration)
@@ -85,14 +85,16 @@ class GenericErasureEmailConnector(BaseErasureEmailConnector):
 
         if not batched_identities:
             logger.info(
-                "Skipping erasure email send for connector: '{}'. "
+                "Skipping erasure email send for connector '{}' and batch '{}'. "
                 "No corresponding user identities found for pending privacy requests.",
                 self.configuration.key,
+                batch_id,
             )
             return
 
         logger.info(
-            "Sending batched erasure email for connector {}...",
+            "Sending batch erasure email {} for connector {}...",
+            batch_id,
             self.configuration.key,
         )
 
@@ -105,10 +107,14 @@ class GenericErasureEmailConnector(BaseErasureEmailConnector):
                 test_mode=False,
             )
         except MessageDispatchException as exc:
-            logger.info(
-                "Erasure email for connector {} failed with exception {}",
-                self.configuration.key,
-                exc,
+            message = f"Batch erasure email {batch_id} for connector {self.configuration.key} failed with exception {exc}"
+            logger.error(message)
+            self.error_all_privacy_requests(
+                db,
+                privacy_requests.filter(
+                    PrivacyRequest.id.notin_(skipped_privacy_requests)
+                ),
+                message,
             )
             raise