Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion alert_system/etl/base/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ class ExtractionConfig(TypedDict):
filter_impact: Dict | None

people_exposed_threshold: int
forecasted_data: bool
3 changes: 0 additions & 3 deletions alert_system/etl/base/extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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,
),
)

Expand Down
1 change: 0 additions & 1 deletion alert_system/etl/gdacs_cyclone/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@
"filter_hazard": None,
"filter_impact": None,
"people_exposed_threshold": 500,
"forecasted_data": False,
}
1 change: 0 additions & 1 deletion alert_system/etl/gdacs_flood/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@
"filter_hazard": None,
"filter_impact": None,
"people_exposed_threshold": 500,
"forecasted_data": False,
}
1 change: 0 additions & 1 deletion alert_system/etl/usgs_earthquake/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
"filter_hazard": None,
"filter_impact": None,
"people_exposed_threshold": 500,
"forecasted_data": True,
}
7 changes: 0 additions & 7 deletions alert_system/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}'"

Expand All @@ -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:
Expand Down
Loading