ethyca-fides 2.69.3b2__py2.py3-none-any.whl → 2.70.0__py2.py3-none-any.whl

fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-10T00:45:33-0300",
+ "date": "2025-09-15T16:34:19-0400",
  "dirty": false,
  "error": null,
- "full-revisionid": "ccf1fe94f6dce2367b4d70f4aa14f0d0f4fa7812",
- "version": "2.69.3b2"
+ "full-revisionid": "58ac65560c00900b5cf88212c1f690d49885d184",
+ "version": "2.70.0"
 }
 '''  # END VERSION_JSON
 

fides/api/alembic/migrations/versions/4d8c0fcc5771_adding_default_system_groups.py

@@ -0,0 +1,78 @@
+"""adding default system groups
+
+Revision ID: 4d8c0fcc5771
+Revises: 5fa78b1f324d
+Create Date: 2025-09-10 05:40:19.064377
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "4d8c0fcc5771"
+down_revision = "5fa78b1f324d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Insert default system groups into taxonomy_element table
+    op.execute(
+        """
+        INSERT INTO taxonomy_element (id, created_at, updated_at, taxonomy_type, fides_key, name, description, parent_key, active, tags, organization_fides_key)
+        VALUES
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'analytics_business_intelligence', 'Analytics & Business intelligence', 'System group for analytics and business intelligence systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'customer_management', 'Customer management', 'System group for customer management systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'internal_operations', 'Internal operations', 'System group for internal operations systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'legal_compliance', 'Legal & Compliance', 'System group for legal and compliance systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'marketing', 'Marketing', 'System group for marketing systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'payments_billing', 'Payments & Billing', 'System group for payments and billing systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'product_service_delivery', 'Product & Service delivery', 'System group for product and service delivery systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'research_development', 'Research & Development', 'System group for research and development systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'sales_revenue_operations', 'Sales & Revenue operations', 'System group for sales and revenue operations systems', NULL, true, NULL, 'default_organization'),
+          ('tax_' || gen_random_uuid(), now(), now(), 'system_group', 'security_fraud', 'Security & Fraud', 'System group for security and fraud systems', NULL, true, NULL, 'default_organization')
+        """
+    )
+
+    # Insert default system groups into system_group table with white labels
+    op.execute(
+        """
+        INSERT INTO system_group (id, created_at, updated_at, fides_key, label_color, data_steward_username, data_uses)
+        VALUES
+          ('sys_' || gen_random_uuid(), now(), now(), 'analytics_business_intelligence', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'customer_management', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'internal_operations', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'legal_compliance', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'marketing', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'payments_billing', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'product_service_delivery', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'research_development', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'sales_revenue_operations', 'taxonomy_white', NULL, '{}'),
+          ('sys_' || gen_random_uuid(), now(), now(), 'security_fraud', 'taxonomy_white', NULL, '{}')
+        """
+    )
+
+
+def downgrade():
+    # Remove default system groups from both tables
+    op.execute(
+        """
+        DELETE FROM system_group
+        WHERE fides_key IN (
+          'analytics_business_intelligence', 'customer_management', 'internal_operations',
+          'legal_compliance', 'marketing', 'payments_billing', 'product_service_delivery',
+          'research_development', 'sales_revenue_operations', 'security_fraud'
+        )
+        """
+    )
+
+    op.execute(
+        """
+        DELETE FROM taxonomy_element
+        WHERE fides_key IN (
+          'analytics_business_intelligence', 'customer_management', 'internal_operations',
+          'legal_compliance', 'marketing', 'payments_billing', 'product_service_delivery',
+          'research_development', 'sales_revenue_operations', 'security_fraud'
+        ) AND taxonomy_type = 'system_group'
+        """
+    )

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

@@ -269,27 +269,30 @@ def privacy_request_csv_download(
     f = io.StringIO()
     csv_file = csv.writer(f)
 
+    privacy_request_ids: List[str] = [r.id for r in privacy_request_query]
+    denial_audit_log_query: Query = db.query(AuditLog).filter(
+        AuditLog.action == AuditLogAction.denied,
+        AuditLog.privacy_request_id.in_(privacy_request_ids),
+    )
+    denial_audit_logs: Dict[str, str] = {
+        r.privacy_request_id: r.message for r in denial_audit_log_query
+    }
+
+    identity_columns, custom_field_columns = get_variable_columns(privacy_request_query)
+
     csv_file.writerow(
         [
             "Status",
             "Request Type",
-            "Subject Identity",
-            "Custom Privacy Request Fields",
             "Time Received",
             "Reviewed By",
             "Request ID",
             "Time Approved/Denied",
             "Denial Reason",
         ]
+        + identity_columns
+        + with_prefix("Custom Field", list(custom_field_columns.values()))
     )
-    privacy_request_ids: List[str] = [r.id for r in privacy_request_query]
-    denial_audit_log_query: Query = db.query(AuditLog).filter(
-        AuditLog.action == AuditLogAction.denied,
-        AuditLog.privacy_request_id.in_(privacy_request_ids),
-    )
-    denial_audit_logs: Dict[str, str] = {
-        r.privacy_request_id: r.message for r in denial_audit_log_query
-    }
 
     for pr in privacy_request_query:
         denial_reason = (
@@ -298,19 +301,22 @@ def privacy_request_csv_download(
             else None
         )
 
-        csv_file.writerow(
-            [
-                pr.status.value if pr.status else None,
-                pr.policy.rules[0].action_type if len(pr.policy.rules) > 0 else None,
-                pr.get_persisted_identity().model_dump(mode="json"),
-                pr.get_persisted_custom_privacy_request_fields(),
-                pr.created_at,
-                pr.reviewed_by,
-                pr.id,
-                pr.reviewed_at,
-                denial_reason,
-            ]
-        )
+        static_cells = [
+            pr.status.value if pr.status else None,
+            pr.policy.rules[0].action_type if len(pr.policy.rules) > 0 else None,
+            pr.created_at,
+            pr.reviewed_by,
+            pr.id,
+            pr.reviewed_at,
+            denial_reason,
+        ]
+
+        identity_cells = extract_identity_cells(identity_columns, pr)
+        custom_field_cells = extract_custom_field_cells(custom_field_columns, pr)
+
+        row = static_cells + identity_cells + custom_field_cells
+
+        csv_file.writerow(row)
 
     f.seek(0)
     response = StreamingResponse(f, media_type="text/csv")
@@ -320,6 +326,64 @@ def privacy_request_csv_download(
     return response
 
 
+def get_variable_columns(
+    privacy_request_query: Query,
+) -> tuple[List[str], Dict[str, str]]:
+    identity_columns: Set[str] = set()
+    custom_field_columns: Dict[str, str] = {}
+
+    for pr in privacy_request_query:
+        identity_columns.update(
+            extract_identity_column_names(pr.get_persisted_identity().model_dump())
+        )
+        custom_field_columns.update(
+            extract_custom_field_column_names(
+                pr.get_persisted_custom_privacy_request_fields()
+            )
+        )
+
+    return list(identity_columns), custom_field_columns
+
+
+def extract_identity_column_names(identities: dict[str, Any]) -> Set[str]:
+    """Extract column names from identity data that have non-empty values."""
+    return {key for key, value in identities.items() if value}
+
+
+def extract_custom_field_column_names(custom_fields: dict[str, Any]) -> Dict[str, str]:
+    """Extract column names and labels from custom field data that have non-empty values."""
+    return {
+        key: value["label"]
+        for key, value in custom_fields.items()
+        if value.get("value")
+    }
+
+
+def with_prefix(prefix: str, items: List[str]) -> List[str]:
+    return [f"{prefix} {item}" for item in items]
+
+
+def extract_custom_field_cells(
+    custom_field_columns: Dict[str, str], pr: PrivacyRequest
+) -> List[str]:
+    custom_fields = pr.get_persisted_custom_privacy_request_fields()
+    return [
+        custom_fields.get(custom_field_column, {}).get("value")
+        for custom_field_column in custom_field_columns
+    ]
+
+
+def extract_identity_cells(
+    identity_columns: List[str], pr: PrivacyRequest
+) -> List[str]:
+    identity = pr.get_persisted_identity()
+    identity_dict = identity.model_dump()
+    return [
+        identity_dict.get(identity_column)  # type: ignore
+        for identity_column in identity_columns
+    ]
+
+
 def execution_and_audit_logs_by_dataset_name(
     self: PrivacyRequest,
 ) -> DefaultDict[str, List[Union["AuditLog", "ExecutionLog"]]]:

fides/api/schemas/privacy_center_config.py

@@ -1,7 +1,14 @@
 from abc import ABC
-from typing import Any, Dict, List, Literal, Optional, Union
+from typing import Annotated, Any, Dict, List, Literal, Optional, Union
 
-from pydantic import ConfigDict, Field, field_validator, model_validator
+from pydantic import (
+    ConfigDict,
+    Discriminator,
+    Field,
+    Tag,
+    field_validator,
+    model_validator,
+)
 
 from fides.api.models.location_regulation_selections import PrivacyNoticeRegion
 from fides.api.schemas.base_class import FidesSchema
@@ -86,9 +93,26 @@ class LocationCustomPrivacyRequestField(BaseCustomPrivacyRequestField):
         return values
 
 
-# Create a simple union type - Pydantic will use the field_type to determine which model to use
-CustomPrivacyRequestFieldUnion = Union[
-    LocationCustomPrivacyRequestField, CustomPrivacyRequestField
+# Create a discriminated union type using the field_type to properly distinguish between types
+def get_field_type_discriminator(v: Any) -> str:
+    """Discriminator function for CustomPrivacyRequestFieldUnion"""
+    if isinstance(v, dict):
+        field_type = v.get("field_type")
+    else:
+        # For model instances, get field_type attribute
+        field_type = getattr(v, "field_type", None)
+
+    if field_type == "location":
+        return "location"
+    return "custom"
+
+
+CustomPrivacyRequestFieldUnion = Annotated[
+    Union[
+        Annotated[LocationCustomPrivacyRequestField, Tag("location")],
+        Annotated[CustomPrivacyRequestField, Tag("custom")],
+    ],
+    Discriminator(get_field_type_discriminator),
 ]
 
 

fides/api/util/cache.py

@@ -220,7 +220,7 @@ def get_cache() -> FidesopsRedis:
 
     if not connected:
         raise common_exceptions.RedisConnectionError(
-            "Unable to establish Redis connection. Fidesops is unable to accept PrivacyRequsts."
+            "Unable to establish Redis connection. Fides is unable to accept PrivacyRequests."
         )
 
     return _connection

fides/ui-build/static/admin/404.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link data-next-font="" rel="preconnect" href="/" crossorigin="anonymous"/><link rel="preload" href="/_next/static/css/018c12b58ee7f861.css" as="style"/><link rel="stylesheet" href="/_next/static/css/018c12b58ee7f861.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-42372ed130431b0a.js"></script><script src="/_next/static/chunks/webpack-55e1c55932df2413.js" defer=""></script><script src="/_next/static/chunks/framework-c92fc3344e6fd165.js" defer=""></script><script src="/_next/static/chunks/main-090643377c8254e6.js" defer=""></script><script src="/_next/static/chunks/pages/_app-c780470042750062.js" defer=""></script><script src="/_next/static/chunks/pages/404-e4a1f93a7ce944f0.js" defer=""></script><script src="/_next/static/86A8z6OnbTuDYww0DJkX0/_buildManifest.js" defer=""></script><script src="/_next/static/86A8z6OnbTuDYww0DJkX0/_ssgManifest.js" defer=""></script><style>.data-ant-cssinjs-cache-path{content:"";}</style></head><body><div id="__next"><div style="height:100%;display:flex"></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/404","query":{},"buildId":"86A8z6OnbTuDYww0DJkX0","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link data-next-font="" rel="preconnect" href="/" crossorigin="anonymous"/><link rel="preload" href="/_next/static/css/018c12b58ee7f861.css" as="style"/><link rel="stylesheet" href="/_next/static/css/018c12b58ee7f861.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-42372ed130431b0a.js"></script><script src="/_next/static/chunks/webpack-2766492c5dbceb0a.js" defer=""></script><script src="/_next/static/chunks/framework-c92fc3344e6fd165.js" defer=""></script><script src="/_next/static/chunks/main-090643377c8254e6.js" defer=""></script><script src="/_next/static/chunks/pages/_app-302177edeb0dc4f5.js" defer=""></script><script src="/_next/static/chunks/pages/404-2eb8aed4939f1142.js" defer=""></script><script src="/_next/static/v72X5v2wmNmYdDpd8p1YY/_buildManifest.js" defer=""></script><script src="/_next/static/v72X5v2wmNmYdDpd8p1YY/_ssgManifest.js" defer=""></script><style>.data-ant-cssinjs-cache-path{content:"";}</style></head><body><div id="__next"><div style="height:100%;display:flex"></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/404","query":{},"buildId":"v72X5v2wmNmYdDpd8p1YY","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>