ethyca-fides 2.71.0rc4__py2.py3-none-any.whl → 2.71.1b1__py2.py3-none-any.whl

fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-29T11:59:41-0300",
+ "date": "2025-10-01T18:54:14+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "031b1c59b7eacf0e8fdbe63fc9d8464619010f74",
- "version": "2.71.0rc4"
+ "full-revisionid": "ed0d3226e0f8af1ecab0ac2d2dabff1ee209680d",
+ "version": "2.71.1b1"
 }
 '''  # END VERSION_JSON
 

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

@@ -0,0 +1,79 @@
+"""adds new experience configs for vendor asset disclosure
+
+Revision ID: 3efe14d4469a
+Revises: f108fa05c579
+Create Date: 2025-09-09 11:19:24.060587
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "3efe14d4469a"
+down_revision = "f108fa05c579"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "experienceconfigtemplate",
+        sa.Column(
+            "asset_disclosure_include_types",
+            postgresql.ARRAY(sa.String()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "experienceconfigtemplate",
+        sa.Column(
+            "allow_vendor_asset_disclosure",
+            sa.Boolean(),
+            server_default="f",
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        "privacyexperienceconfig",
+        sa.Column(
+            "asset_disclosure_include_types",
+            postgresql.ARRAY(sa.String()),
+            nullable=True,
+        ),
+    )
+    op.add_column(
+        "privacyexperienceconfig",
+        sa.Column(
+            "allow_vendor_asset_disclosure",
+            sa.Boolean(),
+            server_default="f",
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        "privacyexperienceconfighistory",
+        sa.Column("allow_vendor_asset_disclosure", sa.Boolean(), nullable=True),
+    )
+    op.add_column(
+        "privacyexperienceconfighistory",
+        sa.Column(
+            "asset_disclosure_include_types",
+            postgresql.ARRAY(sa.String()),
+            nullable=True,
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("privacyexperienceconfighistory", "asset_disclosure_include_types")
+    op.drop_column("privacyexperienceconfighistory", "allow_vendor_asset_disclosure")
+    op.drop_column("privacyexperienceconfig", "allow_vendor_asset_disclosure")
+    op.drop_column("privacyexperienceconfig", "asset_disclosure_include_types")
+    op.drop_column("experienceconfigtemplate", "allow_vendor_asset_disclosure")
+    op.drop_column("experienceconfigtemplate", "asset_disclosure_include_types")
+    # ### end Alembic commands ###

fides/api/alembic/migrations/versions/918aefc950c9_create_digest_conditional_dependencies.py

@@ -0,0 +1,125 @@
+"""create digest conditional dependencies
+
+Revision ID: 918aefc950c9
+Revises: e2cda8d6abc3
+Create Date: 2025-09-18 21:04:23.620675
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "918aefc950c9"
+down_revision = "e2cda8d6abc3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+
+    op.create_table(
+        "digest_condition",
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=True,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=True,
+        ),
+        sa.Column("id", sa.String(length=255), nullable=False),
+        sa.Column("digest_config_id", sa.String(length=255), nullable=False),
+        sa.Column("parent_id", sa.String(length=255), nullable=True),
+        sa.Column("digest_condition_type", sa.String(), nullable=False),
+        sa.Column("condition_type", sa.String(), nullable=False),
+        sa.Column("field_address", sa.String(length=255), nullable=True),
+        sa.Column("operator", sa.String(), nullable=True),
+        sa.Column("value", postgresql.JSONB(astext_type=sa.Text()), nullable=True),
+        sa.Column("logical_operator", sa.String(), nullable=True),
+        sa.Column("sort_order", sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["digest_config_id"], ["digest_config.id"], ondelete="CASCADE"
+        ),
+        sa.ForeignKeyConstraint(
+            ["parent_id"], ["digest_condition.id"], ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+    op.create_index(
+        "ix_digest_condition_condition_type",
+        "digest_condition",
+        ["condition_type"],
+        unique=False,
+    )
+    op.create_index(
+        "ix_digest_condition_digest_condition_type",
+        "digest_condition",
+        ["digest_condition_type"],
+        unique=False,
+    )
+    op.create_index(
+        "ix_digest_condition_digest_config_id",
+        "digest_condition",
+        ["digest_config_id"],
+        unique=False,
+    )
+    op.create_index(
+        "ix_digest_condition_parent_id",
+        "digest_condition",
+        ["parent_id"],
+        unique=False,
+    )
+    op.create_index(
+        "ix_digest_condition_sort_order",
+        "digest_condition",
+        ["sort_order"],
+        unique=False,
+    )
+
+    # Unique constraint to ensure only one root condition per digest_condition_type per digest_config
+    op.create_index(
+        "ix_digest_condition_unique_root_per_type",
+        "digest_condition",
+        ["digest_config_id", "digest_condition_type"],
+        unique=True,
+        postgresql_where=sa.text("parent_id IS NULL"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+
+    op.drop_index(
+        "ix_digest_condition_unique_root_per_type",
+        table_name="digest_condition",
+    )
+    op.drop_index(
+        "ix_digest_condition_sort_order",
+        table_name="digest_condition",
+    )
+    op.drop_index(
+        "ix_digest_condition_parent_id",
+        table_name="digest_condition",
+    )
+    op.drop_index(
+        "ix_digest_condition_digest_config_id",
+        table_name="digest_condition",
+    )
+    op.drop_index(
+        "ix_digest_condition_digest_condition_type",
+        table_name="digest_condition",
+    )
+    op.drop_index(
+        "ix_digest_condition_condition_type",
+        table_name="digest_condition",
+    )
+
+    op.drop_table("digest_condition")
+    # ### end Alembic commands ###

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

@@ -0,0 +1,64 @@
+"""Update user_assigned_data_uses so it's nullable and defaults to none
+
+Revision ID: 9caf76161e55
+Revises: 918aefc950c9
+Create Date: 2025-09-29 14:14:37.837616
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "9caf76161e55"
+down_revision = "918aefc950c9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "stagedresource",
+        "user_assigned_data_uses",
+        existing_type=postgresql.ARRAY(sa.VARCHAR()),
+        nullable=True,
+        server_default=None,
+        default=None,
+        existing_server_default=sa.text("'{}'::character varying[]"),
+    )
+
+    # Update web monitor resources with empty array to null
+    op.execute(
+        """
+        UPDATE stagedresource
+        SET user_assigned_data_uses = NULL
+        WHERE
+          resource_type IN ('Cookie', 'Browser request', 'Image', 'iFrame', 'Javascript tag')
+          AND user_assigned_data_uses = '{}'
+        """
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute(
+        """
+        UPDATE stagedresource
+        SET user_assigned_data_uses = '{}'
+        WHERE user_assigned_data_uses IS NULL
+        """
+    )
+
+    op.alter_column(
+        "stagedresource",
+        "user_assigned_data_uses",
+        existing_type=postgresql.ARRAY(sa.VARCHAR()),
+        nullable=False,
+        server_default=sa.text("'{}'::character varying[]"),
+        existing_server_default=None,
+        default=dict,
+    )
+    # ### end Alembic commands ###

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

@@ -0,0 +1,28 @@
+"""adds optional duration field to assets
+
+Revision ID: f108fa05c579
+Revises: 9caf76161e55
+Create Date: 2025-08-22 12:47:31.374493
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "f108fa05c579"
+down_revision = "9caf76161e55"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("asset", sa.Column("duration", sa.String(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("asset", "duration")
+    # ### end Alembic commands ###

fides/api/api/v1/endpoints/generic_overrides.py

@@ -54,6 +54,7 @@ from fides.common.api.v1.urn_registry import DATASETS_CLEAN, V1_URL_PREFIX
 from fides.service.dataset.dataset_service import (
     DatasetNotFoundException,
     DatasetService,
+    LinkedDatasetException,
 )
 from fides.service.taxonomy.taxonomy_service import TaxonomyService
 
@@ -126,7 +127,7 @@ async def update_dataset(
     except DatasetNotFoundException as e:
         raise HTTPException(
             status_code=HTTP_404_NOT_FOUND,
-            detail={"message": str(e)},
+            detail=str(e),
         )
 
 
@@ -248,7 +249,7 @@ async def get_dataset(
     except DatasetNotFoundException as e:
         raise HTTPException(
             status_code=HTTP_404_NOT_FOUND,
-            detail={"message": str(e)},
+            detail=str(e),
         )
 
 
@@ -275,7 +276,12 @@ async def delete_dataset(
     except DatasetNotFoundException as e:
         raise HTTPException(
             status_code=HTTP_404_NOT_FOUND,
-            detail={"message": str(e)},
+            detail=str(e),
+        )
+    except LinkedDatasetException as e:
+        raise HTTPException(
+            status_code=HTTP_400_BAD_REQUEST,
+            detail=str(e),
         )
 
 

fides/api/db/base.py

@@ -23,7 +23,7 @@ from fides.api.models.detection_discovery.monitor_task import (
     MonitorTaskExecutionLog,
 )
 from fides.api.models.detection_discovery.web_monitor import WebMonitorGroupJob
-from fides.api.models.digest import DigestConfig
+from fides.api.models.digest import DigestCondition, DigestConfig
 from fides.api.models.event_audit import EventAudit
 from fides.api.models.experience_notices import ExperienceNotices
 from fides.api.models.fides_cloud import FidesCloud

fides/api/models/asset.py

@@ -17,7 +17,7 @@ from sqlalchemy import (
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.ext.mutable import MutableDict
-from sqlalchemy.orm import relationship
+from sqlalchemy.orm import relationship, selectinload
 
 from fides.api.db.base_class import Base
 from fides.api.db.util import EnumColumn
@@ -47,6 +47,7 @@ class Asset(Base):
     name = Column(String, index=True, nullable=False)
     asset_type = Column(String, index=True, nullable=False)
     domain = Column(String, index=True)
+    duration = Column(String, nullable=True)
     parent = Column(ARRAY(String), server_default="{}", nullable=False)
     parent_domain = Column(String)
     locations = Column(ARRAY(String), server_default="{}", nullable=False)
@@ -190,5 +191,17 @@ class Asset(Base):
                 .where(System.fides_key == system_fides_key)
             )
 
+        # Explicitly eager load the `system` relationship to make this query's
+        # performance predictable and prevent N+1 issues.
+        query = query.options(selectinload(cls.system))  # type: ignore[attr-defined]
         result = await async_session.execute(query)
         return result.scalars().all()
+
+    # Expose related System attributes for API serialization convenience
+    @property
+    def system_name(self) -> Optional[str]:
+        return self.system.name if self.system else None
+
+    @property
+    def system_fides_key(self) -> Optional[str]:
+        return self.system.fides_key if self.system else None