diff --git a/alert_system/etl/base/config.py b/alert_system/etl/base/config.py index 8f3d90bef..124a3a986 100644 --- a/alert_system/etl/base/config.py +++ b/alert_system/etl/base/config.py @@ -11,4 +11,3 @@ class ExtractionConfig(TypedDict): filter_impact: Dict | None people_exposed_threshold: int - forecasted_data: bool diff --git a/alert_system/etl/base/extraction.py b/alert_system/etl/base/extraction.py index 663b6f84c..fa916ee95 100644 --- a/alert_system/etl/base/extraction.py +++ b/alert_system/etl/base/extraction.py @@ -40,7 +40,6 @@ class BaseExtractionClass(ABC): filter_event: Optional[Dict] = None filter_hazard: Optional[Dict] = None filter_impact: Optional[Dict] = None - forecasted_data: bool | None = False config: ExtractionConfig @@ -143,7 +142,6 @@ def _extract_impact_items(self, stac_obj: ExtractionItem, run_id: str) -> List[E build_stac_search( collections=self.impact_collection_type, guid=stac_obj.guid, - forecasted_data=self.forecasted_data, ), ) except Exception as e: @@ -317,7 +315,6 @@ def find_related_guids(self, load_obj: LoadItem) -> set[str]: additional_filters=additional_filters, start_datetime=f"{start_datetime.isoformat()}", end_datetime=f"{end_datetime.isoformat()}", - forecasted_data=self.extractor.forecasted_data, ), ) diff --git a/alert_system/etl/gdacs_cyclone/config.py b/alert_system/etl/gdacs_cyclone/config.py index 259e771b0..968f04c4a 100644 --- a/alert_system/etl/gdacs_cyclone/config.py +++ b/alert_system/etl/gdacs_cyclone/config.py @@ -9,5 +9,4 @@ "filter_hazard": None, "filter_impact": None, "people_exposed_threshold": 500, - "forecasted_data": False, } diff --git a/alert_system/etl/gdacs_flood/config.py b/alert_system/etl/gdacs_flood/config.py index 4f19b0c90..d55b64c89 100644 --- a/alert_system/etl/gdacs_flood/config.py +++ b/alert_system/etl/gdacs_flood/config.py @@ -9,5 +9,4 @@ "filter_hazard": None, "filter_impact": None, "people_exposed_threshold": 500, - "forecasted_data": False, } diff --git a/alert_system/etl/usgs_earthquake/config.py b/alert_system/etl/usgs_earthquake/config.py index 6995cd818..5edac2358 100644 --- a/alert_system/etl/usgs_earthquake/config.py +++ b/alert_system/etl/usgs_earthquake/config.py @@ -8,5 +8,4 @@ "filter_hazard": None, "filter_impact": None, "people_exposed_threshold": 500, - "forecasted_data": True, } diff --git a/alert_system/helpers.py b/alert_system/helpers.py index 8aae0bba8..8f1b7d7cf 100644 --- a/alert_system/helpers.py +++ b/alert_system/helpers.py @@ -25,10 +25,6 @@ def build_guid_filter(guid: str) -> str: return f"monty:guid = '{guid}'" -def build_forecasted_filter(forecasted: bool): - return f"forecasted = {forecasted}" - - def build_datetime_filter(start_date: str, end_date: str) -> str: return f"datetime >= '{start_date}' AND datetime < '{end_date}'" @@ -40,12 +36,9 @@ def build_stac_search( start_datetime: str | None = None, end_datetime: str | None = None, extra_params: dict | None = None, - forecasted_data: bool | None = False, ) -> dict: filters = additional_filters.copy() if additional_filters else [] - if forecasted_data: - filters.append(build_forecasted_filter(forecasted_data)) if guid: filters.append(build_guid_filter(guid)) if start_datetime and end_datetime: