ethyca-fides 2.61.1rc0__py2.py3-none-any.whl → 2.61.2b0__py2.py3-none-any.whl

{ethyca_fides-2.61.1rc0.dist-info → ethyca_fides-2.61.2b0.dist-info}/METADATA

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

{ethyca_fides-2.61.1rc0.dist-info → ethyca_fides-2.61.2b0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ethyca_fides-2.61.1rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ethyca_fides-2.61.2b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 fides/__init__.py,sha256=tE3qqipY9eynYXYpQeksYGHP5NfeXyq-L9mBtpFIxl8,139
-fides/_version.py,sha256=foiCUaWKvohm6lqptuIz9gbE-Y_bLAkgg5A04naRnJI,501
+fides/_version.py,sha256=fPGzqLTSRxMCV457JHqSDp1JILBYkLVGT-eBdSHmRkc,500
 fides/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/analytics.py,sha256=vgwja9DB7gPsQSE3KQi0F3r6yWmnW66wBRC9FpawfRI,1910
@@ -327,7 +327,7 @@ fides/api/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/db/base.py,sha256=w6L0NXF6ZwjmD_ueDoHi-oVUljsBP19QPDbqy-_x47c,3023
 fides/api/db/base_class.py,sha256=XrzpwZ3rUKSVt_7j8PCTv6BjGhQzXnOJpcshPZfA4pg,12571
 fides/api/db/crud.py,sha256=1h9AXOyTPlZFrrpy7mQLN2FDGr48NkuJtnAKxMzVGhg,14013
-fides/api/db/ctl_session.py,sha256=Q6x737gm-WCiShhCyHyAFSd6Z2GAtAWw6hR-Y_gO_Jw,1710
+fides/api/db/ctl_session.py,sha256=mFqwOFrcwPFw1EzTktryyzCHZQqk0NnXGEa8HNz_Ohc,2255
 fides/api/db/database.py,sha256=brTWChQ6bLcHEIs6RBytw17ePCOp0iJOTvbAoWXTgWI,5116
 fides/api/db/samples.py,sha256=JzUGBkE8XAtsf4aPwueMM04xHi0h_jd5dwbpowK2dOw,6337
 fides/api/db/seed.py,sha256=ubh146_MTTGrHgiUee2sSpG9QCib7uHrd4AWxwvegbs,22006
@@ -363,11 +363,11 @@ fides/api/migrations/hash_migration_tracker.py,sha256=d7-7gCSTAhx5mmvrLsAM8QunKn
 fides/api/models/__init__.py,sha256=2bRCL2hY-a2APbUK2NnXCM6R-HukTZzd4AMiUQjY3Po,1987
 fides/api/models/application_config.py,sha256=BTRtVWFUHuos5ixoJxKKSdqxMRyPvGtVi05sv9xq4D4,8813
 fides/api/models/asset.py,sha256=7uxQvaOE2bcuc1hq8SKqOb7bZt_Qk1HFt7Sknqwp8Sg,6035
-fides/api/models/attachment.py,sha256=B0jcGEkwQUuI38BQoWDHZHqzSI8R7mRhu9yOFIFiGZ0,9882
+fides/api/models/attachment.py,sha256=8YP5726B0iDXlfoWfVfgdcCjdzgPxLfPxzhVcCT3YVw,10336
 fides/api/models/audit_log.py,sha256=o8Qm57PaA3pNTqDRXbr-7bLorzmZUCaywNAe90St4uk,948
 fides/api/models/authentication_request.py,sha256=aZuO38BiZWGriSVGleVnPP9vVhRSD1jjb1bEul5Ge48,1230
 fides/api/models/client.py,sha256=Qv21ftOeJrm8Ty3vbOhRhUjQqOxKMWNWZPOMrg0Xqfc,6073
-fides/api/models/comment.py,sha256=z-UyCGy4-AUySXKzhk5p1GJrx2KnO-zqJUxxO6By-qI,4711
+fides/api/models/comment.py,sha256=PZ1d5dzdfwqFVSiRTaC-vE7PD6C-vpRF89n897MLpHg,4785
 fides/api/models/connectionconfig.py,sha256=wHR46W0McZR84OxNOS8laZp_e6rgudrqr5PSzUIXMJY,14594
 fides/api/models/consent_automation.py,sha256=iHGOlz_DSfrAJpI09p7TnZZEFQI4Ga3QvuyGYuQtr_E,5574
 fides/api/models/custom_asset.py,sha256=uDb4WyO0cQiIg1nR6SProY_dzZrUgLrdVS4rhPKuvPc,546
@@ -383,7 +383,7 @@ fides/api/models/fides_user_invite.py,sha256=vfRCB1T3Pmv4U0E6YNNy_ZqsJKGLBEOKEv2
 fides/api/models/fides_user_permissions.py,sha256=M0UD8JY8j-8tVplxEnAO0aJG-PpqwzcWJ0fd_z8jRtw,961
 fides/api/models/identity_salt.py,sha256=f1CSwECiRhRpMX2B5WwwJZp6QRO7amqjzkm5QIf7Sjc,1285
 fides/api/models/location_regulation_selections.py,sha256=EuY6uMeBnGnnFsCJZwox7Dv-BHrAQSJ0Zg1zuouucKY,14577
-fides/api/models/manual_webhook.py,sha256=NsCbzm_aFpHZellSX7BMV0eWctF6D0p5w9JyTRiYLHA,7711
+fides/api/models/manual_webhook.py,sha256=Pg4-YGlTSmzqiPc684J5J63ZAU7Fm1rXTdPkwX-Bbls,7731
 fides/api/models/messaging.py,sha256=gH7jtStiPM08CQC_I0Aaci28_D_fxHt23qgAQnibfkk,7225
 fides/api/models/messaging_template.py,sha256=TTUiTFyThlg8_lRVleBJ4Q4VZyjGk3PKyJ12gDkBm60,5084
 fides/api/models/openid_provider.py,sha256=lVASvT1vZd0mXDadPaPXmamx0DprWKH3QI-YtMTOQLg,1545
@@ -627,10 +627,10 @@ fides/api/service/saas_request/override_implementations/__init__.py,sha256=Hvr-M
 fides/api/service/saas_request/override_implementations/interruptible_request.py,sha256=QYRgQ2H9pOI8nIisU2cbI18IiHYCCXruUq61gGIZjMM,1027
 fides/api/service/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/service/storage/gcs.py,sha256=KUAMqOUth79TWhMZMwVx9wzktOpvvL0CnT5jS1dTgLI,1201
-fides/api/service/storage/s3.py,sha256=o9OmxEsIxGGEoK7A2Wd1Hm99TjinrVkz-e9cdWJE5VY,7230
+fides/api/service/storage/s3.py,sha256=e5O7nfFqefY4MiKCbPOGRTa7n1mEaTiDdcFlYPwpaZk,6019
 fides/api/service/storage/storage_authenticator_service.py,sha256=T7fJdJH8TQPIyIJ94vM4TaGlnDuLshhR-qNlM-2ybj0,2318
 fides/api/service/storage/storage_uploader_service.py,sha256=57xX8z42kET26jfdE6EnyInVeONehUmQu1Fey3WLshM,4500
-fides/api/service/storage/util.py,sha256=oxCkp-Kt8gHr6Ynh0i_Jirbx21vKEI5gHBaiyp6O_V8,328
+fides/api/service/storage/util.py,sha256=GyKAKw8fpAqHn2DrKl0Mpy8Al-mKdchEgPGCg2y9WDs,1553
 fides/api/service/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/task/consolidate_query_matches.py,sha256=8q24tSDYShnoLD7Z8X7vRpYVK9lhvrWZyYl8hLCJqEk,1472
@@ -644,7 +644,7 @@ fides/api/task/graph_task.py,sha256=2_7Lr4KLY1FpOkibAGR25P-z-ghDGWZZudfeUeIrAw4,
 fides/api/task/refine_target_path.py,sha256=3pJ0m3T_ez3bl1cQj2-gnSHCt7LN7Y9yNmhozIRHmzo,7657
 fides/api/task/task_resources.py,sha256=2nJdxhEn3S9gVhpsQKeYPNG-XE2JFbc8C0IAmIK43C4,8972
 fides/api/tasks/__init__.py,sha256=S9bnmrJ96rs7Cl6qELF1Xh0osqrob6Hc1kDMOcliljU,4636
-fides/api/tasks/storage.py,sha256=pyZNv7vsrequT40E_lCiXwfuceQbBE8Kalj8vNfdMbg,7603
+fides/api/tasks/storage.py,sha256=VmNCdQFX7vC9PBZ2nKMOj333_CrzANUg4aPxBJ0Ts-8,7634
 fides/api/tasks/scheduled/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/api/tasks/scheduled/scheduler.py,sha256=9YCmyfSWYL0eWQNy8o2MhGcJDWl8mjfz6I09ztSQ2sM,198
 fides/api/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -713,7 +713,7 @@ fides/config/config_proxy.py,sha256=_d-hAG81oKEWxUeYJySpreObpK1QEub6GPH1afb5IBI,
 fides/config/consent_settings.py,sha256=dY2oCSPXEyme4X0NahKiCJAnLgdqqZSHitCo6vUczCA,1287
 fides/config/create.py,sha256=TQ0mZsY8W3lVGnXqUhi91OP3y9MkMROXfiQYT6rnty4,9394
 fides/config/credentials_settings.py,sha256=pKn4I3S2QsjNis4UWbt_yasfu_J0FWFuScAWswG_qkU,3788
-fides/config/database_settings.py,sha256=7lgGp1kPC-lXLC0RbcIJ17iL48pDcS9iqvTj8UVf1eI,12437
+fides/config/database_settings.py,sha256=2fd1_fj2jEzNmoCgcIw2NjfiPdqtvB5K-BkhUnAHxcg,13402
 fides/config/execution_settings.py,sha256=MmWalXMZPAo8FBOyd2FIgBr4AbKVDNnWcJClMM8ThBI,3180
 fides/config/fides_settings.py,sha256=QHnuvJ-8F2Xbe99RR8Z4zSI12EOMd9xjnw7bvAdXuIA,1505
 fides/config/helpers.py,sha256=3gzWqckLXGgHr69sm2JqCRbAKlA3RB4nrLsp6fhvZ0M,4527
@@ -783,29 +783,27 @@ fides/service/privacy_request/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 fides/service/privacy_request/privacy_request_service.py,sha256=n751XgEPW4PN7HnodgZCzV6cQ9Jt_5h5Who6TFr7BSo,26854
 fides/service/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fides/service/user/user_service.py,sha256=sUsvP_pULLG6oMQlNNF4ZrQJwAtZcaF5h8IqZgGRZg4,5369
-fides/ui-build/static/admin/404.html,sha256=I8u6ergzazHQaqCyDqzphf4aXTxDndMabPckUe37uyI,1466
-fides/ui-build/static/admin/add-systems.html,sha256=tPJ4LZ57R5NEt3kgiv9Mauyh7Knshe_gxPltrxR4cFo,1642
-fides/ui-build/static/admin/ant-poc.html,sha256=nAq28LsQQr_nqzM_3eA7Ca1acL1rjzOZU_1bVMy5vDc,1474
-fides/ui-build/static/admin/consent.html,sha256=qfD5vhc8f7iJXkH6_A8V61INd9GwelnKrUZ2y2nFApQ,1474
-fides/ui-build/static/admin/data-catalog.html,sha256=-lMFc2W-l2vMeyC4H5GDQRjXbCbvRUOhB_yuowofZIc,2116
-fides/ui-build/static/admin/datamap.html,sha256=KezuZB4aGdSkGMhp6R1mXT-kjMu1cgQlUutPiI83ylw,2023
-fides/ui-build/static/admin/dataset.html,sha256=tls_idlyZgN3vHCLFbwuXUorEl3g20PtVKJMEdG9n2A,1868
-fides/ui-build/static/admin/datastore-connection.html,sha256=ayBjemyUaDh0sMoji7IKUYUiywNSjwOlvWKw02yQMu8,1660
+fides/ui-build/static/admin/404.html,sha256=_NqA6KMCYdrCXbGBdFfr-LWhQIPShyHZ3uZI-hU2T1g,1466
+fides/ui-build/static/admin/add-systems.html,sha256=nZyR-mClxubK_z8j3Wobtj_dGiT-JNGg0V3mjhzcUhY,1642
+fides/ui-build/static/admin/ant-poc.html,sha256=ToU8Ue2iZIykGBw2P7BLRglu27W3z5I2QsyOqksmfM0,1474
+fides/ui-build/static/admin/consent.html,sha256=U_h4-0BQt5Wem_N6lVhCLpE53ZwKDbVQDDpg2wbKg2A,1474
+fides/ui-build/static/admin/data-catalog.html,sha256=rZaVQJXlvUEywzRcBL-4ea7ljvEq4yDmjTqpQMqPIcQ,2116
+fides/ui-build/static/admin/datamap.html,sha256=eT5NT0rVjiW70NeQg7C4A03oMqlY8SLcPpPpQZqjj6k,2023
+fides/ui-build/static/admin/dataset.html,sha256=t_dS2_kbE4U0dUPndCBP4x2UXvrCxbaQNY-X8hOiNXw,1868
+fides/ui-build/static/admin/datastore-connection.html,sha256=e3IdnrzIFtChiUMgrgOatujCQx_VujyeqAk81VlaOP4,1660
 fides/ui-build/static/admin/favicon.ico,sha256=xxtarycoqCOznVZCG0z5Wej6EfYvMYwyz6EUwaVwhEw,4286
-fides/ui-build/static/admin/index.html,sha256=BeuBDRnit7O1jmE5WmVBIim990gqkzNgh9cgwsc0Ifs,1625
-fides/ui-build/static/admin/integrations.html,sha256=nTF0e-9I8ttQk61AyxzPp70egdEiEJkH5VQqvdyKFqI,1874
-fides/ui-build/static/admin/login.html,sha256=phemiAx7ufzWxerWrd18bYLUTlDxgmxVnoZmOZsXSF0,1470
+fides/ui-build/static/admin/index.html,sha256=Ir824BcW6M_Uez-BpPC39paF_rGm9CAa6Q8kLZCXO1g,1625
+fides/ui-build/static/admin/integrations.html,sha256=lV-0GCqeOg1tL6YsenvSO7FlDPEaJAE7e2YcyBvmlg4,1874
+fides/ui-build/static/admin/login.html,sha256=rFQ3Ky36NhW08YGlSrMR_zx-1hQqcpXKeG4sjoSMi2Y,1470
 fides/ui-build/static/admin/logo-icon.svg,sha256=LTpApcJnb73kye_gPF3KG8qNe6S3HJJKeebdl6aJ8fI,147
 fides/ui-build/static/admin/logo-white.svg,sha256=u12SVA-WPW0GAhJ1wXM4oi2aqKXKmteo6yEvGDgz5jM,2101
 fides/ui-build/static/admin/logo.svg,sha256=bCostWyEaAVHBbKwGhzAAGJ0ZNgxBGgzhwKsAXS47bg,2100
-fides/ui-build/static/admin/messaging.html,sha256=1ky-hZJe4DFFQgoXQAwM-FjV2jawrRG5NRNvnmdsSdM,1950
-fides/ui-build/static/admin/privacy-requests.html,sha256=jiQ40RjON7o84toXYK4cXQzI9m13FYzXbsGZhTTC_yI,1808
-fides/ui-build/static/admin/properties.html,sha256=CpieDIgkS0jANgYwoqcXTrYnZNZ-5uXGLOgNcK1NMso,1794
-fides/ui-build/static/admin/systems.html,sha256=ozj8_7rGC4Ppan2PO8fozMiVHF1NK0N5lLlEgCXmEh4,1712
-fides/ui-build/static/admin/taxonomy.html,sha256=tp_nHgXPl1BqQGhgGNOK8pWZJFIttNWgDlLx7By61HQ,2185
-fides/ui-build/static/admin/user-management.html,sha256=rMY-bhWdP-0yP1LjefZOOSiTErh48MRJyYbPrbUvBGQ,1568
-fides/ui-build/static/admin/_next/static/NA2bEZVn-Ar18ghSxJlZX/_buildManifest.js,sha256=NpsrDQjtMPwLSaLQbi0G3CbQKkYZ2xRLy_40IXvJwM8,12469
-fides/ui-build/static/admin/_next/static/NA2bEZVn-Ar18ghSxJlZX/_ssgManifest.js,sha256=-D2RVaEwulH2ck-9Y_5QwX6x5lnaSkDOhosw4jeAt-M,101
+fides/ui-build/static/admin/messaging.html,sha256=ayVSSE5UfEXMJaBS1uIhlHO_qBwqMeD-_o7npNzSn1g,1950
+fides/ui-build/static/admin/privacy-requests.html,sha256=WIS-4B6jaFRJKBFPZUUvORmD42pWnTWesF59cjvT86Q,1808
+fides/ui-build/static/admin/properties.html,sha256=aDGXb8S_k-GsP_eXkUpBSuCmDEWeTqyu1SQcUmZ-sH0,1794
+fides/ui-build/static/admin/systems.html,sha256=kkH7T4Q6gABWUyPUqHHBSNYBcZnVaNP6UVqMOglLhVk,1712
+fides/ui-build/static/admin/taxonomy.html,sha256=88J9k-OV4VwZubuy9udt4g1eq6cP_snrQnEdDqYa8IQ,2185
+fides/ui-build/static/admin/user-management.html,sha256=ZHol3poC8RnfsNWc1yLK62r0r3Nz3ae7qT16SeAQNnI,1568
 fides/ui-build/static/admin/_next/static/chunks/1099-93ef46816fd9552d.js,sha256=tHDEIbwy6fw6quHbfkG2Tl34Se5jPaLhWZrEH223pXo,5687
 fides/ui-build/static/admin/_next/static/chunks/1100-2cf394cd4471259e.js,sha256=KHGAV6ZCUhs3mtAM-0B2Y9lpNF2giN9c4q89ELRKHRw,11039
 fides/ui-build/static/admin/_next/static/chunks/1327-12e2ae9047975ed8.js,sha256=F3coJjG_OcWph2H2edV2VnU9K2UopiTgk5MqlkjwsgA,8043
@@ -872,7 +870,7 @@ fides/ui-build/static/admin/_next/static/chunks/main-app-59156a9331ac7bce.js,sha
 fides/ui-build/static/admin/_next/static/chunks/polyfills-42372ed130431b0a.js,sha256=CXPB1kyIrcjjyVBBDLWLKI9yEY1ZZbeASUON648vloM,112594
 fides/ui-build/static/admin/_next/static/chunks/webpack-ebb8d3b45b871241.js,sha256=xs-zUMeHG1i1P8Q-z2WrwMNybTMJPkSC-YE5XCr-7Fo,4047
 fides/ui-build/static/admin/_next/static/chunks/pages/404-599d88e7bb11c133.js,sha256=XHXfppPNfPt5qS61Uu59Vvs3di-bUeZRqADINV7u7Hk,1459
-fides/ui-build/static/admin/_next/static/chunks/pages/_app-4cc32364b7746959.js,sha256=Zmpe3rpbdVwmNIwL4DmJsZP8QwgvfNS_IX3wMd3ps8E,3979101
+fides/ui-build/static/admin/_next/static/chunks/pages/_app-42f79c9059024f91.js,sha256=Zmpe3rpbdVwmNIwL4DmJsZP8QwgvfNS_IX3wMd3ps8E,3979101
 fides/ui-build/static/admin/_next/static/chunks/pages/_error-bede3a8288930dcf.js,sha256=rxhLqELBfGD0nm4gM2w43siC06FJgXtETSBEjmAOSOo,253
 fides/ui-build/static/admin/_next/static/chunks/pages/add-systems-00ea995200d1c172.js,sha256=zAtyr9On8hMUN58o9VIro07Xi7YF4k07kY_n60yM8eI,34227
 fides/ui-build/static/admin/_next/static/chunks/pages/ant-poc-3a07457432d08020.js,sha256=VLSObgr0_2RP3btjzIFLxX8_hkDSKoWNgOCcflsBcCA,11674
@@ -992,37 +990,39 @@ fides/ui-build/static/admin/_next/static/media/inter-vietnamese-500-normal.7b524
 fides/ui-build/static/admin/_next/static/media/inter-vietnamese-600-normal.eb82de1d.woff2,sha256=ZKjcMjaLlHAKJJyTcujqJwFDooKWcq8qQSuKZVfXZRA,3876
 fides/ui-build/static/admin/_next/static/media/inter-vietnamese-700-normal.00e401a9.woff2,sha256=92gZYPHyPg3OZ_u0f78u6ZZNdc53OvVkqhoTelycCqw,3888
 fides/ui-build/static/admin/_next/static/media/logo-white.c9bf4196.svg,sha256=u12SVA-WPW0GAhJ1wXM4oi2aqKXKmteo6yEvGDgz5jM,2101
-fides/ui-build/static/admin/add-systems/manual.html,sha256=9EpoBXIEqwbToSIcScgYFta09RlUoJl3pEfkPMpmc3o,2595
-fides/ui-build/static/admin/add-systems/multiple.html,sha256=yyqVqAzn8hGcFo-BEQzf0vW1-tYjVWbDUYt109Y58eM,1971
-fides/ui-build/static/admin/consent/configure.html,sha256=fcy9u_Ntw_Buh5WdoF2098K4wwHqmA9oQ55N2FZYxIk,1887
-fides/ui-build/static/admin/consent/privacy-experience.html,sha256=sALQl7JIVryCoyf6ar8wQbbY0HGKEhsZ-WW4LBv2BUM,1906
-fides/ui-build/static/admin/consent/privacy-notices.html,sha256=MbFrvRKSO5go0OhJEFmYI3aXKn5OfA4a6aXzjwj7JmY,1822
-fides/ui-build/static/admin/consent/properties.html,sha256=oaVp_4kIzMUcMgDsZBhr29ZQZO5jRm0Hm0S1Wz-FC7w,1810
-fides/ui-build/static/admin/consent/reporting.html,sha256=KcjQgYT_1JmjGmGBcrBEiR8FPjKZ-ko78xHGJ5Wu6yw,1810
-fides/ui-build/static/admin/consent/configure/add-vendors.html,sha256=y7RzXYxzWJDqQbMgeioGEh1ZL_mG9RWTr0jQ6oBPwew,1989
-fides/ui-build/static/admin/consent/privacy-experience/[id].html,sha256=4MMnfdifyiVvCoWWmJ_fWqG9EBEHqct-5mth7EvEiM8,2070
-fides/ui-build/static/admin/consent/privacy-experience/new.html,sha256=8kSZCGiw3o6ny-TUaKoNFFkSkP3FO7rPne5UjI6lO3Y,2064
-fides/ui-build/static/admin/consent/privacy-notices/[id].html,sha256=0CXbGBmV0g2QVFDGY5saND18VW4x3AubmOrnkJnAvqs,2064
-fides/ui-build/static/admin/consent/privacy-notices/new.html,sha256=2LPwWIlrfCP5lUR8EA4fomsgGKUf6zSWD86Ft6qQHqY,2058
-fides/ui-build/static/admin/data-catalog/[systemId]/projects.html,sha256=IcK4H3UufvzcIUZn9itnszSbFL7Vv7c7uYz0la776s4,2238
-fides/ui-build/static/admin/data-catalog/[systemId]/resources.html,sha256=itwVe_7opui5xclEwvPSJEEHxbokXcP7b31wwnKwi_4,1846
-fides/ui-build/static/admin/data-catalog/[systemId]/projects/[projectUrn].html,sha256=ikqoGROlMqJhZGZup60i2uysn4tySpJfIcP6s-xfW_I,1874
-fides/ui-build/static/admin/data-catalog/[systemId]/projects/[projectUrn]/[resourceUrn].html,sha256=QZcEpglnCXPg-cTKID5Y1mZlVEmrGZFVuDt2ewcHsyw,2456
-fides/ui-build/static/admin/data-catalog/[systemId]/resources/[resourceUrn].html,sha256=q6fxvCNJXfxjr8XPpUjBoW-7wXQ8cox4wtocrrH65bo,2428
-fides/ui-build/static/admin/data-discovery/action-center.html,sha256=HTrlnWayoFGekCVU9FgNz1RBlNUJfOLmElYJMb3k-8g,1754
-fides/ui-build/static/admin/data-discovery/activity.html,sha256=l0WIZTqfEoNW3do4qCZia1ZeRcIR3vUeHKzpOacTkqw,1744
-fides/ui-build/static/admin/data-discovery/detection.html,sha256=t85ZI22Cj__qwNB5N341OEN8-o6k0LATfLcbjV73clY,1980
-fides/ui-build/static/admin/data-discovery/discovery.html,sha256=SpjmM2YGxw9gtGjl9-EpRMqpMuOhiglXgLpo1ISdlwI,2452
-fides/ui-build/static/admin/data-discovery/action-center/[monitorId].html,sha256=LqXWLeIPQz1DWgOMQVLmCTWXrLOGlb4z64RghCfU4xQ,2254
-fides/ui-build/static/admin/data-discovery/action-center/[monitorId]/[systemId].html,sha256=zKoKLQGByYH3Cd3f1GXRrB7nqTmhx-Z_uvkol1_4ci0,2358
-fides/ui-build/static/admin/data-discovery/detection/[resourceUrn].html,sha256=hSGmnNFl1OulPS95ZKLyPG3O0DBGz1pXXmjGtjJVxA4,2012
-fides/ui-build/static/admin/data-discovery/discovery/[resourceUrn].html,sha256=hCA7q8Cr_RzEWX_aVPhaCXpNTnv2Dgean0ChLahPMi4,2484
-fides/ui-build/static/admin/dataset/[datasetId].html,sha256=D54AHQH9s5affTBheLrvgCuZkwxb4J03Yq19fhXE3Mo,1896
-fides/ui-build/static/admin/dataset/new.html,sha256=XTiprI7nWy2ElHtn0TMrbH1Wj1x56QzPj7WE1NbgqgY,1638
-fides/ui-build/static/admin/dataset/[datasetId]/[collectionName].html,sha256=tu6MKeWl4iaHx3I6SYTzLr0YgzN0rTpYN-P6NRLp6RE,2328
-fides/ui-build/static/admin/dataset/[datasetId]/[collectionName]/[...subfieldNames].html,sha256=B8nHMwokkniD0ZB6KpgnANrB1ljjqLkzVDDGGAGkQXo,2370
-fides/ui-build/static/admin/datastore-connection/[id].html,sha256=i4S7xoHdyQiv7F3l-9JHkgZwq1jRNOFbCuQioiu_DKA,1748
-fides/ui-build/static/admin/datastore-connection/new.html,sha256=sDIIihWuw3Fut5d-XXUd6m3uxejlyjLGfRD5fRBsDHc,1820
+fides/ui-build/static/admin/_next/static/rwLY4ixXGGI2s2NAgGOZ7/_buildManifest.js,sha256=NpsrDQjtMPwLSaLQbi0G3CbQKkYZ2xRLy_40IXvJwM8,12469
+fides/ui-build/static/admin/_next/static/rwLY4ixXGGI2s2NAgGOZ7/_ssgManifest.js,sha256=-D2RVaEwulH2ck-9Y_5QwX6x5lnaSkDOhosw4jeAt-M,101
+fides/ui-build/static/admin/add-systems/manual.html,sha256=pLDhxl_wDysWcP6zbcgatI99Rx13u-6dNAjuIrF2Yhs,2595
+fides/ui-build/static/admin/add-systems/multiple.html,sha256=sAsMDRAEFWty6Z4HbXlr0oAiNvWEHTw4WBzpViwarKU,1971
+fides/ui-build/static/admin/consent/configure.html,sha256=yu8CM5hliUxXES46ewMTlxWz8ZzKeBlTt19bqN9orQc,1887
+fides/ui-build/static/admin/consent/privacy-experience.html,sha256=UlsE4lfhYKgKY85vx3TAXiqlcVexPSnJUlRuDFdo4_o,1906
+fides/ui-build/static/admin/consent/privacy-notices.html,sha256=5sUY39kXWWzyL9Hq2THal5Y8Q1NnqRvLzVHHR4NimM8,1822
+fides/ui-build/static/admin/consent/properties.html,sha256=cWhMzlt9SmVfHqgBVoGjh1SyEZ6xy8tgnCeaNCLdTh0,1810
+fides/ui-build/static/admin/consent/reporting.html,sha256=5ynrqOcGyuSzw2VetFsP2I-eXiQM-XEQR2leYyCZU8w,1810
+fides/ui-build/static/admin/consent/configure/add-vendors.html,sha256=MZMTJV5OJ3ungeJsooLiFCHGSbaiVimkAwxFC3XrpqI,1989
+fides/ui-build/static/admin/consent/privacy-experience/[id].html,sha256=Wi__VUl1TfOMDEWOy6cNW9mVr7vX1UuKQp9nntFo7Ro,2070
+fides/ui-build/static/admin/consent/privacy-experience/new.html,sha256=qVwgdiNm-XFTMo94VntisJJE30jYRncRRhwc1DvNHrk,2064
+fides/ui-build/static/admin/consent/privacy-notices/[id].html,sha256=6kWBiAMMmYAokInqCv6SdtW01HckhghEerTeQkWLPrI,2064
+fides/ui-build/static/admin/consent/privacy-notices/new.html,sha256=sW-8wJ7CS-0QXclglUzfQKPpbOdoa0doNM3KrwXsYHQ,2058
+fides/ui-build/static/admin/data-catalog/[systemId]/projects.html,sha256=uRsWJedkwD6w35pjXlew1YO2X8jkoqVAbBwV7hBtKsg,2238
+fides/ui-build/static/admin/data-catalog/[systemId]/resources.html,sha256=TiG4V1r9_ZzVCVMtZTcgiPE8QMUdWYOsBU0Pw5LD8o0,1846
+fides/ui-build/static/admin/data-catalog/[systemId]/projects/[projectUrn].html,sha256=u5fD_7fqw3jD0WoT-986PYgrnw231nOkkeDws4bYGW8,1874
+fides/ui-build/static/admin/data-catalog/[systemId]/projects/[projectUrn]/[resourceUrn].html,sha256=hdS76PAYblyizuVZkiY-2kyLXK4_TSqyLluTpJBTs4w,2456
+fides/ui-build/static/admin/data-catalog/[systemId]/resources/[resourceUrn].html,sha256=80JPMjdIXC-sgj3qiDbTjW2Kj4bje6C3Yiz0N0kqFfM,2428
+fides/ui-build/static/admin/data-discovery/action-center.html,sha256=IENEfRwXWQgvp0ttGiFU7zHlYr-lg3Gju-T23TgHqLY,1754
+fides/ui-build/static/admin/data-discovery/activity.html,sha256=lm5AGPpwEsy9RyIBxuehFOl7C3hRjv__VhPllhENmMI,1744
+fides/ui-build/static/admin/data-discovery/detection.html,sha256=UMfdKwF5GwPxgzn9bclH_merSQi2ZbkRtzEdw1BTVIM,1980
+fides/ui-build/static/admin/data-discovery/discovery.html,sha256=2V8UhbHbhcl67tuNZjvrfEr0BtffMGI_f_Y9cmW3dPs,2452
+fides/ui-build/static/admin/data-discovery/action-center/[monitorId].html,sha256=j7ClZ2qrvdLsqvHBeyMYeAOWfGHifzA37ci0FDHKG3A,2254
+fides/ui-build/static/admin/data-discovery/action-center/[monitorId]/[systemId].html,sha256=Y0AbfgoXQ3yQbEHdCHt7LdkJo1QgGXC7evKgdlOK9t4,2358
+fides/ui-build/static/admin/data-discovery/detection/[resourceUrn].html,sha256=ylVBQzApYPnf_Lp-fs4vfiLQEHIkhivVt_F8kCrjhkk,2012
+fides/ui-build/static/admin/data-discovery/discovery/[resourceUrn].html,sha256=ba326dxFUcbKlS_1He5-Lrj0IfsHSPsjHDlgUYWWmjM,2484
+fides/ui-build/static/admin/dataset/[datasetId].html,sha256=EqYHL4rimC67PGX5PQeV6MJ_EZJeKoQCUAFaePzqk0s,1896
+fides/ui-build/static/admin/dataset/new.html,sha256=TpHqf7zy2f8pJgzdcSiWVBsrC6VV2JiswCmzw8wUu_E,1638
+fides/ui-build/static/admin/dataset/[datasetId]/[collectionName].html,sha256=9uqy26VsvQUQTrcWFvmlzniL64ArICwDEVabghMWU4w,2328
+fides/ui-build/static/admin/dataset/[datasetId]/[collectionName]/[...subfieldNames].html,sha256=WX33Vm71NUw63GzgZDmS1c1oDO4jJ6NiHUojbFk6Sw0,2370
+fides/ui-build/static/admin/datastore-connection/[id].html,sha256=Xc5hQaeh6C2--cK081sg8TifSTrL076kPV2vOuN0mXQ,1748
+fides/ui-build/static/admin/datastore-connection/new.html,sha256=ts5qrcKYtXiyM8x2r7XJxRaIg5hne9RQXSIvL3s_FUw,1820
 fides/ui-build/static/admin/images/DatabaseIcon.svg,sha256=gwl8_3APg_6J4ZwWgovOjxgk5AEPyvq3-qGjkF7R4og,8198
 fides/ui-build/static/admin/images/SelectedDatabaseIcon.svg,sha256=L6YBuL-LiKzBXyt9gHZhtqpo2QopXdC7-oEvEWbvSNE,8198
 fides/ui-build/static/admin/images/config_splash.svg,sha256=IH56T1jrG1y4FIKQZXMaePYESYZGot_4jkTaFvmwHl0,176040
@@ -1052,38 +1052,38 @@ fides/ui-build/static/admin/images/oauth-login/custom.svg,sha256=SW1i3Mez8XVMVGR
 fides/ui-build/static/admin/images/oauth-login/github.svg,sha256=eg3RHjc4MKUaVl3p_tSphXB8Z8zTkPmuSUahUjA-pnY,963
 fides/ui-build/static/admin/images/oauth-login/google.svg,sha256=oRdvveXEbNFZ4_xD6u-DxqNIPJh12o3XU2tITX6ghQU,988
 fides/ui-build/static/admin/images/oauth-login/okta.svg,sha256=ymR7Rqk7syL52284jlure_i06-nVKwZbJwB6JXfdNwo,8076
-fides/ui-build/static/admin/integrations/[id].html,sha256=dftAmKvP5FMq5z-8qgVe2Vs0cTuxclT_5RoZZ2C3hmY,2208
+fides/ui-build/static/admin/integrations/[id].html,sha256=NZFNYlPdpqaZoPiGIAz5_zF2P6hlwP41x0p6Beh9Jpc,2208
 fides/ui-build/static/admin/lib/fides-ext-gpp.js,sha256=RQtUWRrBVG0meoFxClNCyooLpelctEMSa6cEeNhjSKk,204337
 fides/ui-build/static/admin/lib/fides-headless.js,sha256=YO6Oi-OIeB4Ty6CzXqZjGN7gfLNFfHEeoII7Dd-RpMM,73923
 fides/ui-build/static/admin/lib/fides-preview.js,sha256=HdOkfpsIh4GPMWQSSoRJpoeLeyzB1IE7tbjsfwkBvOI,531038
 fides/ui-build/static/admin/lib/fides-tcf.js,sha256=KGOFAOovpBhUS8ti_6HaKmNMGotdLeqUKBCOuxQ0MTA,366117
 fides/ui-build/static/admin/lib/fides.js,sha256=aUhdgv1mVTWQEiXN7fy9fC74CPrEJg-T-CWN9CoZYKc,150133
-fides/ui-build/static/admin/login/[provider].html,sha256=ox6Ang3LYC3EC9Sr8XhPAtkflgtP5VnMP-OOyPYsHtI,1496
-fides/ui-build/static/admin/messaging/[id].html,sha256=0jlGQE1flTjyeco2-qSKYrQI0-MFuQw66mPy-PmcESI,1646
-fides/ui-build/static/admin/messaging/add-template.html,sha256=UzP0XiXAjCeGVG2N_ch2gvCQ4hyhBL1q3w2FBLTZxFE,1658
-fides/ui-build/static/admin/privacy-requests/[id].html,sha256=A-6LoSm2jN7GqMDpZuxHke6dqFFWJjGiq9b_xvB6-nQ,1978
-fides/ui-build/static/admin/privacy-requests/configure.html,sha256=gLHSRSNLXa7rn9YxC24dheNz7X7csF3pjr0sH828iA8,1512
-fides/ui-build/static/admin/privacy-requests/configure/messaging.html,sha256=hxVRc_c0be9Gfku9C7f4sG-Wj0OF2orPorfuZAnx-Hs,1532
-fides/ui-build/static/admin/privacy-requests/configure/storage.html,sha256=vwVxQZOkRBB6AaxJJPQCcCz7CbEtdUu5v598QyTtXfY,1528
-fides/ui-build/static/admin/properties/[id].html,sha256=tf6hd5R6MwMyqZSAPU3JxWD-CzJ8Qmu-iGhDxIZi6aA,1648
-fides/ui-build/static/admin/properties/add-property.html,sha256=TMf6ZP1aMIdBsuCsbSCkkiHDh5jea2t-4dYtBrbSXnM,1660
-fides/ui-build/static/admin/reporting/datamap.html,sha256=Z8X6WmPgPThMTxYW-Tt0yUG68B4lF2LLjndUV9UtADI,2278
-fides/ui-build/static/admin/settings/about.html,sha256=lTg5xcPHdZoUTW5fMdBJtsXsW-eHbDj-_RMO9Rcd7XE,1488
-fides/ui-build/static/admin/settings/consent.html,sha256=MnrYTfyrE2e2icezpu33VGmXVLLH3eA34-TpRGISMF0,1492
-fides/ui-build/static/admin/settings/custom-fields.html,sha256=M1Z8IrNVc7vjz5woXz0ZsPi4bal1h_1-afylMAbMM9o,1820
-fides/ui-build/static/admin/settings/domain-records.html,sha256=y5Qhv1fDF3Its7wFnLi0t4IrXbQuKWqnCHtGe7wMupY,1744
-fides/ui-build/static/admin/settings/domains.html,sha256=B0mL3cXZZP_lf98rE0YVhFxcEQX16CKnFJvWOv03YSY,1492
-fides/ui-build/static/admin/settings/email-templates.html,sha256=h3HbN-L9EWtgxK8pcTbAtPWSdP3JNO3ICWiMyw3m33o,1508
-fides/ui-build/static/admin/settings/locations.html,sha256=F3B2r3gvElmhGT30bGDfdp4BORs1973lTkkPU5A_n40,1816
-fides/ui-build/static/admin/settings/organization.html,sha256=UvbuTnMJ7Md2C14pnAFY_vMIolwjDlClfrVMghAkbk0,1502
-fides/ui-build/static/admin/settings/regulations.html,sha256=Z7RbU7XmB9b-mMTpTYvwrnqZL0Vm9Gia1JpkVv-Kiys,1820
-fides/ui-build/static/admin/settings/consent/[configuration_id]/[purpose_id].html,sha256=eqymeN6Fen4imFJ2U7gKFZlx6H0BXEMtgDLWiQ3B8ZA,1802
-fides/ui-build/static/admin/systems/configure/[id].html,sha256=Udc3oOjJqxLE5UVnywOPm7g5RrMZI95oFwQa3bbcoa8,2607
-fides/ui-build/static/admin/systems/configure/[id]/test-datasets.html,sha256=FdAktkYdMrkPJc1EdDly4rqJtWfFPM18q7nyEbB0vZg,1692
-fides/ui-build/static/admin/user-management/new.html,sha256=5TFy2L3dczsQxykk5nhngjhe4nyTPADGKcB6ssy3C4w,1654
-fides/ui-build/static/admin/user-management/profile/[id].html,sha256=0CVNJQCApT6x4MBIX4TKvsOUF5ItxnLIYULTdWhgAIk,1676
-ethyca_fides-2.61.1rc0.dist-info/METADATA,sha256=2CKD3vZUxflVw2f3yw2Z3AxyoRVDQdqxqifFrvU6ubE,11637
-ethyca_fides-2.61.1rc0.dist-info/WHEEL,sha256=joeZ_q2kZqPjVkNy_YbjGrynLS6bxmBj74YkvIORXVI,109
-ethyca_fides-2.61.1rc0.dist-info/entry_points.txt,sha256=edi4zfmx5sMDogB5GR5gdtOIwP3L1O--rmWb-QunSLE,40
-ethyca_fides-2.61.1rc0.dist-info/top_level.txt,sha256=vHQkcSYYOh4ECEGL1JSGUAxFWpwO05QGPV0M2aPxqNQ,6
-ethyca_fides-2.61.1rc0.dist-info/RECORD,,
+fides/ui-build/static/admin/login/[provider].html,sha256=puWm6enAQenT3gGTn0FtZz6pAmHFg2ySyPDSAiis6qM,1496
+fides/ui-build/static/admin/messaging/[id].html,sha256=9_Dbsnq9-uHy7uddVnF7JMbz_j_gOV1jKWD5TREoi_4,1646
+fides/ui-build/static/admin/messaging/add-template.html,sha256=eaGKKDNLqxw5_zXU-Sl0HBZw5Ayxi5fqHLdRJyoXvc8,1658
+fides/ui-build/static/admin/privacy-requests/[id].html,sha256=DtKpvYn3TZ2AE4yymmoJ1ffbGxYbV89h_0t_ORmh6xs,1978
+fides/ui-build/static/admin/privacy-requests/configure.html,sha256=YMqtUx7893wsNhB0qxAYLluTal-ZxY2g12J2IoNx3o0,1512
+fides/ui-build/static/admin/privacy-requests/configure/messaging.html,sha256=4DJlFidJ0cr-u3UmmwdaKyYgF3aEFpjgJ987HduXteA,1532
+fides/ui-build/static/admin/privacy-requests/configure/storage.html,sha256=Kwpg83u7QQNcWF3HjiDP_wKvbAJk_-OK1VZJirVDBvM,1528
+fides/ui-build/static/admin/properties/[id].html,sha256=0oZVa1yl4hQ4WGZjcEozF_t1hm3ssZCY9kNxcA1LHY0,1648
+fides/ui-build/static/admin/properties/add-property.html,sha256=i9rrsmV0uqPxVs2Hd5hkJ8q55GDLSRSsY6YVtTsuYgU,1660
+fides/ui-build/static/admin/reporting/datamap.html,sha256=1fIQukfV1EFBiPdHdUEc7ktPcg8iB1cU3SNGhXMvKYI,2278
+fides/ui-build/static/admin/settings/about.html,sha256=Gm-K3_V3zRraQyI3ertuaMwXj4-_7FfWOS1IWurql10,1488
+fides/ui-build/static/admin/settings/consent.html,sha256=hoWfbbZUkL6nw3COjikHrGvPh1LIt-vAOpfy6U7wt28,1492
+fides/ui-build/static/admin/settings/custom-fields.html,sha256=JL6ZB0ffz7JLFWYxQat2Jrt1fiU0HXZ7hokwlNke7-o,1820
+fides/ui-build/static/admin/settings/domain-records.html,sha256=DYS8kS7evsuTT0OHPLq2CsUP45Dm1qWlI4LLnloYMxc,1744
+fides/ui-build/static/admin/settings/domains.html,sha256=7nldylf3tY3-OjhWFwaIu4ksLtCjtl4H9RBS3_Wbvdw,1492
+fides/ui-build/static/admin/settings/email-templates.html,sha256=YksFPjU7eN-1qc-vPhlePdAlsGxdekYVTv5_Qguy290,1508
+fides/ui-build/static/admin/settings/locations.html,sha256=ILhjCxNk4W32mA5lMWEmCdjYSAw-NnYbLKKi0clffck,1816
+fides/ui-build/static/admin/settings/organization.html,sha256=u8nKfxZELKhQho1IeXUJ4a2OKIMeckyFq70vYAwZrTU,1502
+fides/ui-build/static/admin/settings/regulations.html,sha256=HZvkgfPNLFgsrV0y_f2GX4lni_4J7pRL9cOQo65V0oE,1820
+fides/ui-build/static/admin/settings/consent/[configuration_id]/[purpose_id].html,sha256=clQAQLqPGhQLknkjdUtgov5yrz0teAsn9odpwHZNoHA,1802
+fides/ui-build/static/admin/systems/configure/[id].html,sha256=_FuBzX6hb99e2Nox5WHNBJSl2XSyp619Q-wzQFPhuCA,2607
+fides/ui-build/static/admin/systems/configure/[id]/test-datasets.html,sha256=iprJ2ZMWkviGjlyZSg5EMZyFNqzQ9HGEuNUxd9iuMTE,1692
+fides/ui-build/static/admin/user-management/new.html,sha256=lxgKCoaUFZik4FLF9tH3NwOO9sAbSr-RP7O-ix0Bgww,1654
+fides/ui-build/static/admin/user-management/profile/[id].html,sha256=x9QxtL3mCd1ICN8xO--DG70lkclUge9bXStzDBchZl4,1676
+ethyca_fides-2.61.2b0.dist-info/METADATA,sha256=zLOzavk-MIPsM0RxZ3a_bVo7H8mZmywXYWqRexH8vag,11636
+ethyca_fides-2.61.2b0.dist-info/WHEEL,sha256=joeZ_q2kZqPjVkNy_YbjGrynLS6bxmBj74YkvIORXVI,109
+ethyca_fides-2.61.2b0.dist-info/entry_points.txt,sha256=edi4zfmx5sMDogB5GR5gdtOIwP3L1O--rmWb-QunSLE,40
+ethyca_fides-2.61.2b0.dist-info/top_level.txt,sha256=vHQkcSYYOh4ECEGL1JSGUAxFWpwO05QGPV0M2aPxqNQ,6
+ethyca_fides-2.61.2b0.dist-info/RECORD,,

fides/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-05-13T14:30:19+0200",
+ "date": "2025-05-13T14:39:19+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "b38cb862cc9ca4d41647994ba0d5e3e701f9f665",
- "version": "2.61.1rc0"
+ "full-revisionid": "4a647d69a706a02115f90708d19cff2c4a0aa625",
+ "version": "2.61.2b0"
 }
 '''  # END VERSION_JSON
 

fides/api/db/ctl_session.py

@@ -1,5 +1,5 @@
 import ssl
-from typing import AsyncGenerator
+from typing import Any, AsyncGenerator, Dict
 
 from sqlalchemy import create_engine
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
@@ -11,12 +11,21 @@ from fides.config import CONFIG
 
 # Associated with a workaround in fides.core.config.database_settings
 # ref: https://github.com/sqlalchemy/sqlalchemy/discussions/5975
-connect_args = {}
+connect_args: Dict[str, Any] = {}
 if CONFIG.database.params.get("sslrootcert"):
     ssl_ctx = ssl.create_default_context(cafile=CONFIG.database.params["sslrootcert"])
     ssl_ctx.verify_mode = ssl.CERT_REQUIRED
     connect_args["ssl"] = ssl_ctx
 
+if CONFIG.database.api_async_engine_keepalives_idle:
+    connect_args["keepalives_idle"] = CONFIG.database.api_async_engine_keepalives_idle
+if CONFIG.database.api_async_engine_keepalives_interval:
+    connect_args["keepalives_interval"] = (
+        CONFIG.database.api_async_engine_keepalives_interval
+    )
+if CONFIG.database.api_async_engine_keepalives_count:
+    connect_args["keepalives_count"] = CONFIG.database.api_async_engine_keepalives_count
+
 # Parameters are hidden for security
 async_engine = create_async_engine(
     CONFIG.database.async_database_uri,
@@ -26,6 +35,7 @@ async_engine = create_async_engine(
     logging_name="AsyncEngine",
     json_serializer=custom_json_serializer,
     json_deserializer=custom_json_deserializer,
+    pool_pre_ping=CONFIG.database.api_async_engine_pool_pre_ping,
 )
 async_session = sessionmaker(async_engine, class_=AsyncSession, expire_on_commit=False)
 

fides/api/models/attachment.py

@@ -1,7 +1,6 @@
 import os
 from enum import Enum as EnumType
-from io import BytesIO
-from typing import IO, TYPE_CHECKING, Any, Optional, Tuple, Union
+from typing import IO, TYPE_CHECKING, Any, Tuple
 
 from fideslang.validation import AnyHttpUrlString
 from loguru import logger as log
@@ -12,22 +11,19 @@ from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import Session, relationship
 
 from fides.api.db.base_class import Base
-from fides.api.models.fides_user import FidesUser  # pylint: disable=unused-import
-from fides.api.models.storage import StorageConfig  # pylint: disable=unused-import
 from fides.api.schemas.storage.storage import StorageDetails, StorageType
 from fides.api.service.storage.s3 import (
     generic_delete_from_s3,
     generic_retrieve_from_s3,
     generic_upload_to_s3,
 )
-from fides.api.service.storage.util import (
-    LOCAL_FIDES_UPLOAD_DIRECTORY,
-    get_local_filename,
-)
+from fides.api.service.storage.util import get_local_filename
 
 if TYPE_CHECKING:
     from fides.api.models.comment import Comment
+    from fides.api.models.fides_user import FidesUser
     from fides.api.models.privacy_request import PrivacyRequest
+    from fides.api.models.storage import StorageConfig
 
 
 class AttachmentType(str, EnumType):
@@ -44,7 +40,8 @@ class AttachmentReferenceType(str, EnumType):
     Enum for attachment reference types. Indicates where attachment is referenced.
     """
 
-    manual_step = "manual_step"
+    access_manual_webhook = "access_manual_webhook"
+    erasure_manual_webhook = "erasure_manual_webhook"
     privacy_request = "privacy_request"
     comment = "comment"
 
@@ -126,7 +123,7 @@ class Attachment(Base):
             generic_upload_to_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.id,
+                file_key=f"{self.id}/{self.file_name}",
                 document=attachment,
                 auth_method=auth_method,
             )
@@ -134,7 +131,7 @@ class Attachment(Base):
             return
 
         if self.config.type == StorageType.local:
-            filename = get_local_filename(self.id)
+            filename = get_local_filename(f"{self.id}/{self.file_name}")
 
             # Validate that attachment is a file-like object
             if not hasattr(attachment, "read"):
@@ -146,6 +143,9 @@ class Attachment(Base):
             except Exception as e:
                 raise ValueError(f"Failed to reset file pointer for attachment: {e}")
 
+            # Create directory if it doesn't exist
+            os.makedirs(os.path.dirname(filename), exist_ok=True)
+
             # Write the file in chunks to avoid loading the entire content into memory
             with open(filename, "wb") as file:
                 for chunk in iter(
@@ -162,22 +162,32 @@ class Attachment(Base):
 
     def retrieve_attachment(
         self,
-    ) -> Optional[Tuple[BytesIO, Union[AnyHttpUrlString, str]]]:
-        """Returns the attachment from S3 in bytes form."""
+    ) -> Tuple[int, AnyHttpUrlString]:
+        """
+        Retrieves a the size of the attachment and the presigned URL to retrieve it.
+        - For s3:
+          - the size is retrieved from the s3 object metadata
+          - the presigned URL is retrieved from the s3 client
+        - For local:
+          - the size is retrieved from the file size
+          - the URL is the local file path
+        """
         if self.config.type == StorageType.s3:
             bucket_name = f"{self.config.details[StorageDetails.BUCKET.value]}"
             auth_method = self.config.details[StorageDetails.AUTH_METHOD.value]
-            return generic_retrieve_from_s3(
+            size, url = generic_retrieve_from_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.id,
+                file_key=f"{self.id}/{self.file_name}",
                 auth_method=auth_method,
             )
+            return size, url
 
         if self.config.type == StorageType.local:
-            filename = f"{LOCAL_FIDES_UPLOAD_DIRECTORY}/{self.id}"
+            filename = get_local_filename(f"{self.id}/{self.file_name}")
             with open(filename, "rb") as file:
-                return file.read(), filename
+                size = len(file.read())
+                return size, filename
 
         raise ValueError(f"Unsupported storage type: {self.config.type}")
 
@@ -189,13 +199,13 @@ class Attachment(Base):
             generic_delete_from_s3(
                 storage_secrets=self.config.secrets,
                 bucket_name=bucket_name,
-                file_key=self.id,
+                file_key=f"{self.id}/{self.file_name}",
                 auth_method=auth_method,
             )
             return
 
         if self.config.type == StorageType.local:
-            filename = f"{LOCAL_FIDES_UPLOAD_DIRECTORY}/{self.id}"
+            filename = get_local_filename(f"{self.id}/{self.file_name}")
             os.remove(filename)
             return
 
@@ -210,9 +220,7 @@ class Attachment(Base):
         attachment_file: IO[bytes],
         check_name: bool = False,
     ) -> "Attachment":
-        """Creates a new attachment record in the database and uploads the attachment to S3."""
-        if attachment_file is None:
-            raise ValueError("Attachment is required")
+        """Creates a new attachment record in the database and uploads the attachment via the upload method."""
         attachment_model = super().create(db=db, data=data, check_name=check_name)
 
         try:
@@ -237,8 +245,10 @@ class Attachment(Base):
     def delete(self, db: Session) -> None:
         """Deletes an attachment record from the database and deletes the attachment from S3."""
         self.delete_attachment_from_storage()
-        for attachment_reference in self.references:
-            attachment_reference.delete(db)
+
+        # Delete all references to the attachment
+        for reference in self.references:
+            reference.delete(db)
         super().delete(db=db)
 
     @staticmethod

fides/api/models/comment.py

@@ -33,7 +33,8 @@ class CommentReferenceType(str, EnumType):
     Enum for comment reference types. Indicates where the comment is referenced.
     """
 
-    manual_step = "manual_step"
+    access_manual_webhook = "access_manual_webhook"
+    erasure_manual_webhook = "erasure_manual_webhook"
     privacy_request = "privacy_request"
 
 

fides/api/models/manual_webhook.py

@@ -37,7 +37,7 @@ class AccessManualWebhook(Base):
         "Attachment",
         secondary="attachment_reference",
         primaryjoin="and_(AccessManualWebhook.id == AttachmentReference.reference_id, "
-        "AttachmentReference.reference_type == 'manual_step')",
+        "AttachmentReference.reference_type == 'access_manual_webhook')",
         secondaryjoin="Attachment.id == AttachmentReference.attachment_id",
         order_by="Attachment.created_at",
         viewonly=True,
@@ -48,7 +48,7 @@ class AccessManualWebhook(Base):
         "Comment",
         secondary="comment_reference",
         primaryjoin="and_(AccessManualWebhook.id == CommentReference.reference_id, "
-        "CommentReference.reference_type == 'manual_step')",
+        "CommentReference.reference_type == 'access_manual_webhook')",
         secondaryjoin="Comment.id == CommentReference.comment_id",
         order_by="Comment.created_at",
         viewonly=True,