ethyca-fides 2.63.1b1__tar.gz → 2.63.1b4__tar.gz

{ethyca_fides-2.63.1b1/src/ethyca_fides.egg-info → ethyca_fides-2.63.1b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethyca_fides
-Version: 2.63.1b1
+Version: 2.63.1b4
 Summary: Open-source ecosystem for data privacy as code.
 Home-page: https://github.com/ethyca/fides
 Author: Ethyca, Inc.

{ethyca_fides-2.63.1b1 → ethyca_fides-2.63.1b4/src/ethyca_fides.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ethyca_fides
-Version: 2.63.1b1
+Version: 2.63.1b4
 Summary: Open-source ecosystem for data privacy as code.
 Home-page: https://github.com/ethyca/fides
 Author: Ethyca, Inc.

{ethyca_fides-2.63.1b1 → ethyca_fides-2.63.1b4}/src/ethyca_fides.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ src/fides/api/alembic/migrations/versions/2736c942faa2_property_specific_messagi
 src/fides/api/alembic/migrations/versions/27fe9da9d0f9_privacy_request_stopped.py
 src/fides/api/alembic/migrations/versions/28108b17a99c_add_notifications_for_failed_dsr_.py
 src/fides/api/alembic/migrations/versions/29a7d707163a_adds_first_name_and_last_name_to_user_.py
+src/fides/api/alembic/migrations/versions/29e56fa1fdb3_add_monitor_tasks.py
 src/fides/api/alembic/migrations/versions/2af81f2b1a6f_add_system_vendor_id.py
 src/fides/api/alembic/migrations/versions/2be84e68df32_add_cookie_table.py
 src/fides/api/alembic/migrations/versions/2e9aba76c322_add_privacy_center_config.py
@@ -136,6 +137,7 @@ src/fides/api/alembic/migrations/versions/5b03859e51b5_update_custom_field_resou
 src/fides/api/alembic/migrations/versions/5b4b9c2d1c93_add_system_foreign_key_to_connection_.py
 src/fides/api/alembic/migrations/versions/5d62bab40b71_add_application_config_table.py
 src/fides/api/alembic/migrations/versions/5dafbc1818ae_add_rds_postgres_to_connector_type.py
+src/fides/api/alembic/migrations/versions/5efcdf18438e_add_manual_task_tables.py
 src/fides/api/alembic/migrations/versions/5f96f13be8ec_property_specific_messaging_migration_.py
 src/fides/api/alembic/migrations/versions/5fe01e730171_add_external_id_to_privacy_preference.py
 src/fides/api/alembic/migrations/versions/61a922702f4c_add_consent_request_relationship.py
@@ -396,7 +398,6 @@ src/fides/api/models/custom_connector_template.py
 src/fides/api/models/custom_report.py
 src/fides/api/models/datasetconfig.py
 src/fides/api/models/db_cache.py
-src/fides/api/models/detection_discovery.py
 src/fides/api/models/experience_notices.py
 src/fides/api/models/fides_cloud.py
 src/fides/api/models/fides_user.py
@@ -424,6 +425,15 @@ src/fides/api/models/system_history.py
 src/fides/api/models/system_manager.py
 src/fides/api/models/tcf_publisher_restrictions.py
 src/fides/api/models/tcf_purpose_overrides.py
+src/fides/api/models/worker_task.py
+src/fides/api/models/detection_discovery/__init__.py
+src/fides/api/models/detection_discovery/core.py
+src/fides/api/models/detection_discovery/monitor_task.py
+src/fides/api/models/field_types/__init__.py
+src/fides/api/models/field_types/encrypted_large_data.py
+src/fides/api/models/manual_tasks/__init__.py
+src/fides/api/models/manual_tasks/manual_task.py
+src/fides/api/models/manual_tasks/manual_task_log.py
 src/fides/api/models/privacy_request/__init__.py
 src/fides/api/models/privacy_request/consent.py
 src/fides/api/models/privacy_request/execution_log.py
@@ -450,6 +460,7 @@ src/fides/api/schemas/dataset.py
 src/fides/api/schemas/drp_privacy_request.py
 src/fides/api/schemas/encryption_request.py
 src/fides/api/schemas/external_https.py
+src/fides/api/schemas/external_storage.py
 src/fides/api/schemas/filter_params.py
 src/fides/api/schemas/identity_verification.py
 src/fides/api/schemas/language.py
@@ -511,6 +522,9 @@ src/fides/api/schemas/connection_configuration/enums/system_type.py
 src/fides/api/schemas/connection_configuration/enums/test_status.py
 src/fides/api/schemas/limiter/__init__.py
 src/fides/api/schemas/limiter/rate_limit_config.py
+src/fides/api/schemas/manual_tasks/__init__.py
+src/fides/api/schemas/manual_tasks/manual_task_schemas.py
+src/fides/api/schemas/manual_tasks/manual_task_status.py
 src/fides/api/schemas/masking/__init__.py
 src/fides/api/schemas/masking/masking_api.py
 src/fides/api/schemas/masking/masking_configuration.py
@@ -535,6 +549,7 @@ src/fides/api/schemas/storage/storage_secrets_docs_only.py
 src/fides/api/schemas/third_party/__init__.py
 src/fides/api/service/__init__.py
 src/fides/api/service/deps.py
+src/fides/api/service/external_data_storage.py
 src/fides/api/service/outbound_urn_registry.py
 src/fides/api/service/strategy.py
 src/fides/api/service/authentication/__init__.py
@@ -684,6 +699,7 @@ src/fides/api/util/constants.py
 src/fides/api/util/cors_middleware_utils.py
 src/fides/api/util/custom_json_encoder.py
 src/fides/api/util/data_category.py
+src/fides/api/util/data_size.py
 src/fides/api/util/decrypted_identity_automaton.py
 src/fides/api/util/endpoint_utils.py
 src/fides/api/util/enums.py
@@ -707,6 +723,7 @@ src/fides/api/util/url_util.py
 src/fides/api/util/wrappers.py
 src/fides/api/util/encryption/__init__.py
 src/fides/api/util/encryption/aes_gcm_encryption_scheme.py
+src/fides/api/util/encryption/aes_gcm_encryption_util.py
 src/fides/api/util/encryption/hmac_encryption_scheme.py
 src/fides/api/util/encryption/secrets_util.py
 src/fides/api/worker/__init__.py
@@ -800,6 +817,8 @@ src/fides/service/dataset/validation_steps/masking_strategy.py
 src/fides/service/dataset/validation_steps/namespace_meta.py
 src/fides/service/dataset/validation_steps/saas.py
 src/fides/service/dataset/validation_steps/traversal.py
+src/fides/service/manual_tasks/__init__.py
+src/fides/service/manual_tasks/manual_task_service.py
 src/fides/service/messaging/__init__.py
 src/fides/service/messaging/aws_ses_service.py
 src/fides/service/messaging/messaging_service.py
@@ -827,8 +846,8 @@ src/fides/ui-build/static/admin/properties.html
 src/fides/ui-build/static/admin/systems.html
 src/fides/ui-build/static/admin/taxonomy.html
 src/fides/ui-build/static/admin/user-management.html
-src/fides/ui-build/static/admin/_next/static/74KgkHM2cEVIXGgJPlTZ3/_buildManifest.js
-src/fides/ui-build/static/admin/_next/static/74KgkHM2cEVIXGgJPlTZ3/_ssgManifest.js
+src/fides/ui-build/static/admin/_next/static/X2nvWLg2_-vsCTkhSWpzw/_buildManifest.js
+src/fides/ui-build/static/admin/_next/static/X2nvWLg2_-vsCTkhSWpzw/_ssgManifest.js
 src/fides/ui-build/static/admin/_next/static/chunks/1099-667e84655846e78c.js
 src/fides/ui-build/static/admin/_next/static/chunks/1100-0b01f500b1eaf60d.js
 src/fides/ui-build/static/admin/_next/static/chunks/1817-951f58ddd5d46081.js
@@ -911,7 +930,7 @@ src/fides/ui-build/static/admin/_next/static/chunks/pages/index-773182b5e35d0045
 src/fides/ui-build/static/admin/_next/static/chunks/pages/integrations-781808bca01f8048.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/login-0cb0eb44bf2dd24c.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/messaging-7dc295b3ed3d2224.js
-src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests-20cdb2c8a03deae1.js
+src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests-0e557d79e1e43c2b.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/properties-9a88220d03e7e02f.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/systems-cac52e6c3abf6a15.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/taxonomy-60d5930b6855679b.js
@@ -961,8 +980,8 @@ src/fides/ui-build/static/admin/_next/static/chunks/pages/poc/form-experiments/F
 src/fides/ui-build/static/admin/_next/static/chunks/pages/poc/form-experiments/FormikSpreadField-af097d661f6abcf4.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests/[id]-64236fd0141414fd.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests/configure-b6c876dceb16ad1b.js
-src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests/configure/messaging-8cab04871908cfeb.js
-src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests/configure/storage-150d40428245ee0c.js
+src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests/configure/messaging-c583a61302f02add.js
+src/fides/ui-build/static/admin/_next/static/chunks/pages/privacy-requests/configure/storage-20d20a8d1736f7c4.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/properties/[id]-54bcc875592d1fb9.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/properties/add-property-644dc669b508a79a.js
 src/fides/ui-build/static/admin/_next/static/chunks/pages/reporting/datamap-70dc1081df37ea69.js

{ethyca_fides-2.63.1b1 → ethyca_fides-2.63.1b4}/src/fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-09T15:18:50-0400",
+ "date": "2025-06-12T12:24:12-0300",
  "dirty": true,
  "error": null,
- "full-revisionid": "015433003992aa2bacc15f1730dc22591866809b",
- "version": "2.63.1b1"
+ "full-revisionid": "422a6e8587552cbfbfa72a70dfdface43f281d59",
+ "version": "2.63.1b4"
 }
 '''  # END VERSION_JSON
 

ethyca_fides-2.63.1b4/src/fides/api/alembic/migrations/versions/29e56fa1fdb3_add_monitor_tasks.py

@@ -0,0 +1,147 @@
+"""add_monitor_tasks
+
+Revision ID: 29e56fa1fdb3
+Revises: 5efcdf18438e
+Create Date: 2025-06-11 14:40:08.384571
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "29e56fa1fdb3"
+down_revision = "5efcdf18438e"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table(
+        "monitortask",
+        sa.Column("id", sa.String(length=255), nullable=False),
+        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("action_type", sa.String(), nullable=False),
+        sa.Column(
+            "status",
+            sa.Enum(
+                "in_processing",
+                "pending",
+                "complete",
+                "error",
+                "paused",
+                "retrying",
+                "skipped",
+                name="executionlogstatus",
+                native_enum=False,
+            ),
+            nullable=False,
+        ),
+        sa.Column("celery_id", sa.String(length=255), nullable=False),
+        sa.Column(
+            "task_arguments", postgresql.JSONB(astext_type=sa.Text()), nullable=True
+        ),
+        sa.Column("message", sa.String(), nullable=True),
+        sa.Column("monitor_config_id", sa.String(), nullable=False),
+        sa.Column("staged_resource_urns", sa.ARRAY(sa.String()), nullable=True),
+        sa.Column("child_resource_urns", sa.ARRAY(sa.String()), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["monitor_config_id"], ["monitorconfig.id"], ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint("celery_id"),
+    )
+    op.create_index(
+        op.f("ix_monitortask_action_type"), "monitortask", ["action_type"], unique=False
+    )
+    op.create_index(op.f("ix_monitortask_id"), "monitortask", ["id"], unique=False)
+    op.create_index(
+        op.f("ix_monitortask_monitor_config_id"),
+        "monitortask",
+        ["monitor_config_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_monitortask_status"), "monitortask", ["status"], unique=False
+    )
+    op.create_table(
+        "monitortaskexecutionlog",
+        sa.Column("id", sa.String(length=255), nullable=False),
+        sa.Column(
+            "status",
+            postgresql.ENUM(name="executionlogstatus", create_type=False),
+            nullable=False,
+        ),
+        sa.Column("message", sa.String(), nullable=True),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("clock_timestamp()"),
+            nullable=True,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("clock_timestamp()"),
+            nullable=True,
+        ),
+        sa.Column("celery_id", sa.String(length=255), nullable=False),
+        sa.Column("monitor_task_id", sa.String(), nullable=False),
+        sa.Column(
+            "run_type", sa.Enum("MANUAL", "SYSTEM", name="taskruntype"), nullable=False
+        ),
+        sa.ForeignKeyConstraint(
+            ["monitor_task_id"], ["monitortask.id"], ondelete="CASCADE"
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index(
+        op.f("ix_monitortaskexecutionlog_id"),
+        "monitortaskexecutionlog",
+        ["id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_monitortaskexecutionlog_monitor_task_id"),
+        "monitortaskexecutionlog",
+        ["monitor_task_id"],
+        unique=False,
+    )
+    op.create_index(
+        op.f("ix_monitortaskexecutionlog_status"),
+        "monitortaskexecutionlog",
+        ["status"],
+        unique=False,
+    )
+
+
+def downgrade():
+    op.drop_index(
+        op.f("ix_monitortaskexecutionlog_status"), table_name="monitortaskexecutionlog"
+    )
+    op.drop_index(
+        op.f("ix_monitortaskexecutionlog_monitor_task_id"),
+        table_name="monitortaskexecutionlog",
+    )
+    op.drop_index(
+        op.f("ix_monitortaskexecutionlog_id"), table_name="monitortaskexecutionlog"
+    )
+    op.drop_table("monitortaskexecutionlog")
+    op.drop_index(op.f("ix_monitortask_status"), table_name="monitortask")
+    op.drop_index(op.f("ix_monitortask_monitor_config_id"), table_name="monitortask")
+    op.drop_index(op.f("ix_monitortask_id"), table_name="monitortask")
+    op.drop_index(op.f("ix_monitortask_action_type"), table_name="monitortask")
+    op.drop_table("monitortask")
+    op.execute("DROP TYPE IF EXISTS taskruntype")

ethyca_fides-2.63.1b4/src/fides/api/alembic/migrations/versions/5efcdf18438e_add_manual_task_tables.py

@@ -0,0 +1,160 @@
+"""add manual task tables
+
+Revision ID: 5efcdf18438e
+Revises: c586a56c25e7
+Create Date: 2025-06-04 17:24:00.300170
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.sql import func
+
+# revision identifiers, used by Alembic.
+revision = "5efcdf18438e"
+down_revision = "c586a56c25e7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "manual_task",
+        sa.Column("id", sa.String(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=func.now(),
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=func.now(),
+        ),
+        sa.Column(
+            "task_type", sa.String(), nullable=False, server_default="privacy_request"
+        ),
+        sa.Column("parent_entity_id", sa.String(), nullable=False),
+        sa.Column("parent_entity_type", sa.String(), nullable=False),
+        sa.Column("due_date", sa.DateTime(timezone=True), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint(
+            "parent_entity_id",
+            "parent_entity_type",
+            name="uq_manual_task_parent_entity",
+        ),
+    )
+
+    op.create_table(
+        "manual_task_reference",
+        sa.Column("id", sa.String(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=func.now(),
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=func.now(),
+        ),
+        sa.Column("task_id", sa.String(), nullable=False),
+        sa.Column("reference_id", sa.String(), nullable=False),
+        sa.Column("reference_type", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["task_id"],
+            ["manual_task.id"],
+            ondelete="CASCADE",
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+    op.create_table(
+        "manual_task_log",
+        sa.Column("id", sa.String(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=func.now(),
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            nullable=False,
+            server_default=func.now(),
+        ),
+        sa.Column("task_id", sa.String(), nullable=False),
+        sa.Column("config_id", sa.String(), nullable=True),
+        sa.Column("instance_id", sa.String(), nullable=True),
+        sa.Column("status", sa.String(), nullable=False),
+        sa.Column("message", sa.String(), nullable=True),
+        sa.Column("details", postgresql.JSONB(astext_type=sa.Text()), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["task_id"],
+            ["manual_task.id"],
+            ondelete="CASCADE",
+        ),
+        sa.PrimaryKeyConstraint("id"),
+    )
+
+    # Create indexes for manual_task
+    op.create_index("ix_manual_task_task_type", "manual_task", ["task_type"])
+    op.create_index(
+        "ix_manual_task_parent_entity",
+        "manual_task",
+        ["parent_entity_type", "parent_entity_id"],
+    )
+    op.create_index("ix_manual_task_due_date", "manual_task", ["due_date"])
+
+    # Create indexes for manual_task_reference
+    op.create_index(
+        "ix_manual_task_reference_task_id", "manual_task_reference", ["task_id"]
+    )
+    op.create_index(
+        "ix_manual_task_reference_reference",
+        "manual_task_reference",
+        ["reference_id", "reference_type"],
+    )
+
+    # Create indexes for manual_task_log
+    op.create_index("ix_manual_task_log_task_id", "manual_task_log", ["task_id"])
+    op.create_index("ix_manual_task_log_config_id", "manual_task_log", ["config_id"])
+    op.create_index(
+        "ix_manual_task_log_instance_id", "manual_task_log", ["instance_id"]
+    )
+    op.create_index("ix_manual_task_log_status", "manual_task_log", ["status"])
+    op.create_index("ix_manual_task_log_created_at", "manual_task_log", ["created_at"])
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    # Drop indexes first
+    op.drop_index("ix_manual_task_log_created_at", table_name="manual_task_log")
+    op.drop_index("ix_manual_task_log_status", table_name="manual_task_log")
+    op.drop_index("ix_manual_task_log_instance_id", table_name="manual_task_log")
+    op.drop_index("ix_manual_task_log_config_id", table_name="manual_task_log")
+    op.drop_index("ix_manual_task_log_task_id", table_name="manual_task_log")
+    op.drop_index(
+        "ix_manual_task_reference_reference", table_name="manual_task_reference"
+    )
+    op.drop_index(
+        "ix_manual_task_reference_task_id", table_name="manual_task_reference"
+    )
+    op.drop_index("ix_manual_task_due_date", table_name="manual_task")
+    op.drop_index("ix_manual_task_parent_entity", table_name="manual_task")
+    op.drop_index("ix_manual_task_task_type", table_name="manual_task")
+
+    # Then drop tables
+    op.drop_table("manual_task_log")
+    op.drop_table("manual_task_reference")
+    op.drop_table("manual_task")
+    # ### end Alembic commands ###

{ethyca_fides-2.63.1b1 → ethyca_fides-2.63.1b4}/src/fides/api/api/v1/endpoints/privacy_request_endpoints.py

@@ -75,6 +75,7 @@ from fides.api.models.privacy_request import (
     ProvidedIdentity,
     RequestTask,
 )
+from fides.api.models.worker_task import ExecutionLogStatus
 from fides.api.oauth.utils import (
     verify_callback_oauth_policy_pre_webhook,
     verify_callback_oauth_pre_approval_webhook,
@@ -91,7 +92,6 @@ from fides.api.schemas.privacy_request import (
     CheckpointActionRequired,
     DenyPrivacyRequests,
     ExecutionLogDetailResponse,
-    ExecutionLogStatus,
     FilteredPrivacyRequestResults,
     LogEntry,
     ManualWebhookData,
@@ -1940,16 +1940,16 @@ def request_task_async_callback(
     ]:
         raise HTTPException(
             status_code=HTTP_400_BAD_REQUEST,
-            detail=f"Callback failed. Cannot queue {request_task.action_type.value} task '{request_task.id}' with privacy request status '{privacy_request.status.value}'",
+            detail=f"Callback failed. Cannot queue {request_task.action_type} task '{request_task.id}' with privacy request status '{privacy_request.status.value}'",
         )
     if request_task.status != ExecutionLogStatus.awaiting_processing:
         raise HTTPException(
             status_code=HTTP_400_BAD_REQUEST,
-            detail=f"Callback failed. Cannot queue {request_task.action_type.value} task '{request_task.id}' with request task status '{request_task.status.value}'",
+            detail=f"Callback failed. Cannot queue {request_task.action_type} task '{request_task.id}' with request task status '{request_task.status.value}'",
         )
     logger.info(
         "Callback received for {} task {} {}",
-        request_task.action_type.value,
+        request_task.action_type,
         request_task.collection_address,
         request_task.id,
     )

{ethyca_fides-2.63.1b1 → ethyca_fides-2.63.1b4}/src/fides/api/db/base.py

@@ -16,7 +16,11 @@ from fides.api.models.custom_connector_template import CustomConnectorTemplate
 from fides.api.models.custom_report import CustomReport
 from fides.api.models.datasetconfig import DatasetConfig
 from fides.api.models.db_cache import DBCache
-from fides.api.models.detection_discovery import MonitorConfig, StagedResource
+from fides.api.models.detection_discovery.core import MonitorConfig, StagedResource
+from fides.api.models.detection_discovery.monitor_task import (
+    MonitorTask,
+    MonitorTaskExecutionLog,
+)
 from fides.api.models.experience_notices import ExperienceNotices
 from fides.api.models.fides_cloud import FidesCloud
 from fides.api.models.fides_user import FidesUser
@@ -27,6 +31,8 @@ from fides.api.models.fides_user_respondent_email_verification import (
 )
 from fides.api.models.identity_salt import IdentitySalt
 from fides.api.models.location_regulation_selections import LocationRegulationSelections
+from fides.api.models.manual_tasks.manual_task import ManualTask, ManualTaskReference
+from fides.api.models.manual_tasks.manual_task_log import ManualTaskLog
 from fides.api.models.manual_webhook import AccessManualWebhook
 from fides.api.models.messaging import MessagingConfig
 from fides.api.models.messaging_template import MessagingTemplate

{ethyca_fides-2.63.1b1 → ethyca_fides-2.63.1b4}/src/fides/api/models/connectionconfig.py

@@ -23,7 +23,7 @@ from fides.api.schemas.saas.saas_config import SaaSConfig
 from fides.config import CONFIG
 
 if TYPE_CHECKING:
-    from fides.api.models.detection_discovery import MonitorConfig
+    from fides.api.models.detection_discovery.core import MonitorConfig
     from fides.api.schemas.connection_configuration.enums.system_type import SystemType
 
 

ethyca_fides-2.63.1b4/src/fides/api/models/detection_discovery/__init__.py

@@ -0,0 +1,35 @@
+from .core import (
+    DiffStatus,
+    MonitorConfig,
+    MonitorExecution,
+    MonitorFrequency,
+    SharedMonitorConfig,
+    StagedResource,
+    StagedResourceAncestor,
+    fetch_staged_resources_by_type_query,
+)
+from .monitor_task import (
+    MonitorTask,
+    MonitorTaskExecutionLog,
+    MonitorTaskType,
+    TaskRunType,
+    create_monitor_task_with_execution_log,
+    update_monitor_task_with_execution_log,
+)
+
+__all__ = [
+    "DiffStatus",
+    "MonitorConfig",
+    "MonitorExecution",
+    "MonitorFrequency",
+    "SharedMonitorConfig",
+    "StagedResource",
+    "StagedResourceAncestor",
+    "fetch_staged_resources_by_type_query",
+    "MonitorTask",
+    "MonitorTaskExecutionLog",
+    "MonitorTaskType",
+    "TaskRunType",
+    "create_monitor_task_with_execution_log",
+    "update_monitor_task_with_execution_log",
+]