diff --git a/alembic/versions/2025_10_12_2036-43077d7e08c5_eliminate_contact_info_and_agency_meta_.py b/alembic/versions/2025_10_12_2036-43077d7e08c5_eliminate_contact_info_and_agency_meta_.py new file mode 100644 index 00000000..e5a2513f --- /dev/null +++ b/alembic/versions/2025_10_12_2036-43077d7e08c5_eliminate_contact_info_and_agency_meta_.py @@ -0,0 +1,45 @@ +"""Eliminate Contact Info and Agency Meta Record Type + +Revision ID: 43077d7e08c5 +Revises: 51bde16e22f7 +Create Date: 2025-10-12 20:36:17.965218 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + +from src.util.alembic_helpers import remove_enum_value + +# revision identifiers, used by Alembic. +revision: str = '43077d7e08c5' +down_revision: Union[str, None] = '51bde16e22f7' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + op.execute( + """DELETE FROM URL_RECORD_TYPE WHERE RECORD_TYPE = 'Contact Info & Agency Meta'""" + ) + op.execute( + """DELETE FROM auto_record_type_suggestions WHERE record_type = 'Contact Info & Agency Meta'""" + ) + op.execute( + """DELETE FROM user_record_type_suggestions WHERE record_type = 'Contact Info & Agency Meta'""" + ) + + remove_enum_value( + enum_name="record_type", + value_to_remove="Contact Info & Agency Meta", + targets=[ + ("url_record_type", "record_type"), + ("auto_record_type_suggestions", "record_type"), + ("user_record_type_suggestions", "record_type") + ] + ) + + +def downgrade() -> None: + pass diff --git a/src/api/endpoints/annotate/all/post/models/request.py b/src/api/endpoints/annotate/all/post/models/request.py index c4b3fde9..8de222de 100644 --- a/src/api/endpoints/annotate/all/post/models/request.py +++ b/src/api/endpoints/annotate/all/post/models/request.py @@ -40,11 +40,3 @@ def forbid_all_else_if_not_relevant(self): raise FailedValidationException("location_ids must be empty if suggested_status is NOT RELEVANT") return self - - @model_validator(mode="after") - def deprecate_agency_meta_url_record_type(self): - if self.record_type is None: - return self - if self.record_type == RecordType.CONTACT_INFO_AND_AGENCY_META: - raise FailedValidationException("Contact Info & Agency Meta Record Type is Deprecated.") - return self diff --git a/src/core/enums.py b/src/core/enums.py index 4d11c7af..fa64a5cb 100644 --- a/src/core/enums.py +++ b/src/core/enums.py @@ -42,8 +42,6 @@ class RecordType(Enum): # Info About Agencies ANNUAL_AND_MONTHLY_REPORTS = "Annual & Monthly Reports" BUDGETS_AND_FINANCES = "Budgets & Finances" - # TODO SM422: Remove below - CONTACT_INFO_AND_AGENCY_META = "Contact Info & Agency Meta" GEOGRAPHIC = "Geographic" LIST_OF_DATA_SOURCES = "List of Data Sources" POLICIES_AND_CONTRACTS = "Policies & Contracts" diff --git a/src/core/tasks/scheduled/impl/huggingface/queries/get/mappings.py b/src/core/tasks/scheduled/impl/huggingface/queries/get/mappings.py index 0fd12b28..0621ee52 100644 --- a/src/core/tasks/scheduled/impl/huggingface/queries/get/mappings.py +++ b/src/core/tasks/scheduled/impl/huggingface/queries/get/mappings.py @@ -27,7 +27,6 @@ # Info About Agencies RecordType.ANNUAL_AND_MONTHLY_REPORTS: RecordTypeCoarse.INFO_ABOUT_AGENCIES, RecordType.BUDGETS_AND_FINANCES: RecordTypeCoarse.INFO_ABOUT_AGENCIES, - RecordType.CONTACT_INFO_AND_AGENCY_META: RecordTypeCoarse.INFO_ABOUT_AGENCIES, RecordType.GEOGRAPHIC: RecordTypeCoarse.INFO_ABOUT_AGENCIES, RecordType.LIST_OF_DATA_SOURCES: RecordTypeCoarse.INFO_ABOUT_AGENCIES, RecordType.POLICIES_AND_CONTRACTS: RecordTypeCoarse.INFO_ABOUT_AGENCIES, diff --git a/src/core/tasks/url/operators/validate/queries/get/models/response.py b/src/core/tasks/url/operators/validate/queries/get/models/response.py index 0b72610d..6913e256 100644 --- a/src/core/tasks/url/operators/validate/queries/get/models/response.py +++ b/src/core/tasks/url/operators/validate/queries/get/models/response.py @@ -66,11 +66,3 @@ def forbid_all_else_if_not_relevant(self): return self - @model_validator(mode="after") - def deprecate_agency_meta_url_record_type(self): - if self.record_type is None: - return self - if self.record_type == RecordType.CONTACT_INFO_AND_AGENCY_META: - raise FailedValidationException("Contact Info & Agency Meta Record Type is Deprecated.") - return self -