From fbb82589a9c9426382cd05074626d769ad4f0f60 Mon Sep 17 00:00:00 2001
From: sandeshit <thapasandesh56@gmail.com>
Date: Wed, 1 Jul 2026 11:41:23 +0545
Subject: [PATCH 1/2] feat(extraction): remap the url to internal cluster url.

- Remap urls to internal cluster urls.
- Remove explicit failures on empty event data.
---
 alert_system/etl/base/extraction.py |  9 ++++-----
 alert_system/helpers.py             | 22 +++++++++++++++++++++-
 main/settings.py                    |  6 ++++++
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/alert_system/etl/base/extraction.py b/alert_system/etl/base/extraction.py
index 13efd26a6..c0c910211 100644
--- a/alert_system/etl/base/extraction.py
+++ b/alert_system/etl/base/extraction.py
@@ -229,11 +229,10 @@ def _extract_event_items(self, extraction_run_id: str, is_past_event: bool = Fal
             logger.warning(f"Failed to fetch events: {e}")
             raise
 
-        first_event_item = next(event_items, None)
-        if not first_event_item:
-            msg = f"No event items found for extraction_run_id={extraction_run_id}"
-            logger.warning(msg)
-            raise ValueError(msg)
+        event_items = list(event_items)
+        if not event_items:
+            logger.warning(f"No event items found for extraction_run_id={extraction_run_id}")
+            return
 
         for event_item in event_items:
             self.process_event_item(event_item=event_item, extraction_run_id=extraction_run_id, is_past_event=is_past_event)
diff --git a/alert_system/helpers.py b/alert_system/helpers.py
index 20c646dc9..b863148bb 100644
--- a/alert_system/helpers.py
+++ b/alert_system/helpers.py
@@ -2,6 +2,26 @@
 from typing import Dict, Generator, Optional
 
 import httpx
+from django.conf import settings
+
+
+def _remap_stac_url(url: str) -> str:
+    """
+    Replace the external STAC base URL prefix with the internal cluster URL.
+
+    Requires both EOAPI_STAC_EXTERNAL_URL and EOAPI_STAC_INTERNAL_URL to be set.
+    """
+    external_base = getattr(settings, "EOAPI_STAC_EXTERNAL_URL", None)
+    internal_base = getattr(settings, "EOAPI_STAC_INTERNAL_URL", None)
+    if not external_base or not internal_base:
+        return url
+    external_base = external_base.rstrip("/")
+    internal_base = internal_base.rstrip("/")
+    if url.startswith(external_base):
+        here = internal_base + url[len(external_base) :]
+        print("the remapped url is ", here)
+        return here
+    return url
 
 
 def build_search_params(
@@ -57,7 +77,7 @@ def build_stac_search(
 
 
 def fetch_stac_data(url: str, payload: dict | None = None, timeout: int | None = 60):
-    response = httpx.get(url=url, params=payload, timeout=timeout)
+    response = httpx.get(url=_remap_stac_url(url), params=payload, timeout=timeout)
     response.raise_for_status()
     return response.json()
 
diff --git a/main/settings.py b/main/settings.py
index a500bef8c..8fdf2af06 100644
--- a/main/settings.py
+++ b/main/settings.py
@@ -151,6 +151,9 @@
     # PowerBI
     POWERBI_WORKSPACE_ID=(str, None),
     POWERBI_DATASET_IDS=(str, None),
+    # Alert system - remap external STAC related-item URLs to internal cluster URLs
+    EOAPI_STAC_EXTERNAL_URL=(str, None),  # e.g. https://montandon-eoapi.ifrc.org/stac
+    EOAPI_STAC_INTERNAL_URL=(str, None),  # e.g. http://montandon-eoapi-stac.montandon-eoapi.svc.cluster.local:8080
 )
 
 
@@ -174,6 +177,9 @@ def parse_domain(*env_keys: str) -> str:
     return domain.strip("/")
 
 
+EOAPI_STAC_EXTERNAL_URL = env("EOAPI_STAC_EXTERNAL_URL")
+EOAPI_STAC_INTERNAL_URL = env("EOAPI_STAC_INTERNAL_URL")
+
 GO_API_URL = parse_domain("API_FQDN")
 GO_WEB_URL = parse_domain("FRONTEND_URL")
 # NOTE: Used in local development to point to the frontend service from within go-api container

From 9fef0a02cb61812110b786592e17869d0cebb0e7 Mon Sep 17 00:00:00 2001
From: sandeshit <thapasandesh56@gmail.com>
Date: Wed, 8 Jul 2026 14:54:14 +0545
Subject: [PATCH 2/2] fixup! feat(extraction): remap the url to internal
 cluster url.

---
 alert_system/helpers.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/alert_system/helpers.py b/alert_system/helpers.py
index b863148bb..8eea2e900 100644
--- a/alert_system/helpers.py
+++ b/alert_system/helpers.py
@@ -18,9 +18,7 @@ def _remap_stac_url(url: str) -> str:
     external_base = external_base.rstrip("/")
     internal_base = internal_base.rstrip("/")
     if url.startswith(external_base):
-        here = internal_base + url[len(external_base) :]
-        print("the remapped url is ", here)
-        return here
+        return internal_base + url[len(external_base) :]
     return url