Fix reading of json file

Author: subinasr

monty-stac-extension

@@ -238,10 +238,10 @@ def __init__(self, data_source: DesinventarDataSource) -> None:
         super().__init__("desinventar")
         self.data_source = data_source
         self.events_collection_id = "desinventar-events"
-        self.events_collection_url = "../../monty-stac-extension/examples/desinventar-events/desinventar-events.json"  # noqa: E501
+        self.events_collection_url = "./monty-stac-extension/examples/desinventar-events/desinventar-events.json"  # noqa: E501
 
         self.impacts_collection_id = "desinventar-impacts"
-        self.impacts_collection_url = "../../monty-stac-extension/examples/desinventar-impacts/desinventar-impacts.json"  # noqa: E501
+        self.impacts_collection_url = "./monty-stac-extension/examples/desinventar-impacts/desinventar-impacts.json"  # noqa: E501
 
     def create_datetimes(self, row: DataRow) -> datetime | None:
         start_year = strtoi(row["year"], None)

pystac_monty/sources/desinventar.py

@@ -5,7 +5,6 @@
 
 import pandas as pd
 import pytz
-import requests
 from pystac import Collection, Item, Link
 from shapely.geometry import Point, mapping
 
@@ -52,13 +51,13 @@ class EMDATTransformer:
     """
 
     emdat_events_collection_id = "emdat-events"
-    emdat_events_collection_url = ("../../monty-stac-extension/examples/emdat-events/emdat-events.json")
+    emdat_events_collection_url = ("./monty-stac-extension/examples/emdat-events/emdat-events.json")
 
     emdat_hazards_collection_id = "emdat-hazards"
-    emdat_hazards_collection_url = ("../../monty-stac-extension/examples/emdat-hazards/emdat-hazards.json")
+    emdat_hazards_collection_url = ("./monty-stac-extension/examples/emdat-hazards/emdat-hazards.json")
 
     emdat_impacts_collection_id = "emdat-impacts"
-    emdat_impacts_collection_url = ("../../monty-stac-extension/examples/emdat-impacts/emdat-impacts.json")
+    emdat_impacts_collection_url = ("./monty-stac-extension/examples/emdat-impacts/emdat-impacts.json")
 
     hazard_profiles = MontyHazardProfiles()
 
@@ -296,21 +295,21 @@ def _get_row_by_disno(self, disno: str) -> Optional[pd.Series]:
 
     def get_event_collection(self) -> Collection:
         """Get event collection"""
-        response = open(self.emdat_events_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.emdat_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def get_hazard_collection(self) -> Collection:
         """Get hazard collection"""
-        response = open(self.emdat_hazards_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.emdat_hazards_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def get_impact_collection(self) -> Collection:
         """Get impact collection"""
-        response = open(self.emdat_impacts_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.emdat_impacts_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def _create_title_from_row(self, row: pd.Series) -> str | None:
         """Create a descriptive title from row data when Event Name is missing"""

pystac_monty/sources/emdat.py

@@ -6,7 +6,6 @@
 from typing import Any, List
 
 import pytz
-import requests
 from markdownify import markdownify as md
 from pystac import Asset, Collection, Item, Link
 from shapely import simplify, to_geojson
@@ -60,13 +59,13 @@ class GDACSTransformer:
     """
 
     gdacs_events_collection_id = "gdacs-events"
-    gdacs_events_collection_url = ("../../monty-stac-extension/examples/gdacs-events/gdacs-events.json")
+    gdacs_events_collection_url = ("./monty-stac-extension/examples/gdacs-events/gdacs-events.json")
 
     gdacs_hazards_collection_id = "gdacs-hazards"
-    gdacs_hazards_collection_url = ("../../monty-stac-extension/examples/gdacs-hazards/gdacs-hazards.json")
+    gdacs_hazards_collection_url = ("./monty-stac-extension/examples/gdacs-hazards/gdacs-hazards.json")
 
     gdacs_impacts_collection_id = "gdacs-impacts"
-    gdacs_impacts_collection_url = ("../../monty-stac-extension/examples/gdacs-impacts/gdacs-impacts.json")
+    gdacs_impacts_collection_url = ("./monty-stac-extension/examples/gdacs-impacts/gdacs-impacts.json")
 
     data: list[GDACSDataSource] = []
     hazard_profiles = MontyHazardProfiles()
@@ -92,19 +91,19 @@ def make_items(self) -> list[Item]:
         return items
 
     def get_event_collection(self) -> Collection:
-        response = open(self.gdacs_events_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.gdacs_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def get_hazard_collection(self) -> Collection:
-        response = open(self.gdacs_hazards_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.gdacs_hazards_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def get_impact_collection(self) -> Collection:
-        response = open(self.gdacs_impacts_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.gdacs_impacts_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def check_and_get_event_data(self) -> GDACSDataSource:
         # first check that the event data is present in the data

pystac_monty/sources/gdacs.py

@@ -3,7 +3,6 @@
 from typing import Any, List
 
 import pytz
-import requests
 from pystac import Collection, Item
 
 from pystac_monty.extension import (
@@ -36,13 +35,13 @@ class GFDTransformer:
     """Transform the source data into the STAC items"""
 
     gfd_events_collection_id = "gfd-events"
-    gfd_events_collection_url = "../../monty-stac-extension/examples/gfd-events/gfd-events.json"  # noqa
+    gfd_events_collection_url = "./monty-stac-extension/examples/gfd-events/gfd-events.json"  # noqa
 
     gfd_hazards_collection_id = "gfd-hazards"
-    gfd_hazards_collection_url = "../../monty-stac-extension/examples/gfd-hazards/gfd-hazards.json"  # noqa
+    gfd_hazards_collection_url = "./monty-stac-extension/examples/gfd-hazards/gfd-hazards.json"  # noqa
 
     gfd_impacts_collection_id = "gfd-impacts"
-    gfd_impacts_collection_url = "../../monty-stac-extension/examples/gfd-impacts/gfd-impacts.json"  # noqa
+    gfd_impacts_collection_url = "./monty-stac-extension/examples/gfd-impacts/gfd-impacts.json"  # noqa
     hazard_profiles = MontyHazardProfiles()
 
     def __init__(self, data: GFDDataSource):
@@ -63,23 +62,23 @@ def make_items(self) -> List[Item]:
 
         return items
 
-    def get_event_collection(self, timeout: int = 30) -> Collection:
+    def get_event_collection(self) -> Collection:
         """Get Event collection"""
-        response = open(self.gfd_events_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.gfd_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
-    def get_hazard_collection(self, timeout: int = 30) -> Collection:
+    def get_hazard_collection(self) -> Collection:
         """Get Hazard collection"""
-        response = open(self.gfd_hazards_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.gfd_hazards_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
-    def get_impact_collection(self, timeout: int = 30) -> Collection:
+    def get_impact_collection(self) -> Collection:
         """Get Impact collection"""
-        response = open(self.gfd_impacts_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.gfd_impacts_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def _get_bounding_box(self, polygon: list):
         """Get the bounding box from the polygon"""

pystac_monty/sources/gfd.py

@@ -4,7 +4,6 @@
 from typing import Any, Dict, List
 
 import pytz
-import requests
 from pystac import Asset, Collection, Item, Link
 
 from pystac_monty.extension import (
@@ -34,10 +33,10 @@ class GIDDTransformer:
     """Transforms GIDD event data into STAC Items"""
 
     gidd_events_collection_id = "gidd-events"
-    gidd_events_collection_url = ("../../monty-stac-extension/examples/idmc-events/idmc-events.json")
+    gidd_events_collection_url = ("./monty-stac-extension/examples/idmc-gidd-events/idmc-gidd-events.json")
     # TODO: Make these events collection id consistent
     gidd_hazards_collection_id = "idmc-gidd-impacts"
-    gidd_hazards_collection_url = ("../../monty-stac-extension/examples/idmc-gidd-impacts/idmc-gidd-impacts.json")
+    gidd_hazards_collection_url = ("./monty-stac-extension/examples/idmc-gidd-impacts/idmc-gidd-impacts.json")
     hazard_profiles = MontyHazardProfiles()
 
     def __init__(self, data: GIDDDataSource) -> None:
@@ -65,20 +64,23 @@ def make_items(self) -> List[Item]:
 
         return items
 
-    def get_event_collection(self, timeout: int = 30) -> Collection:
+    def get_event_collection(self) -> Collection:
         """Get the event collection"""
-        response = open(self.gidd_events_collection_url)
+        with open(self.gidd_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+
         if response.status_code == 200:
-            collection_dict = json.loads(response.text)
+            collection_dict = json.loads(response)
             return Collection.from_dict(collection_dict)
         return Collection.from_dict({})
 
-    def get_impact_collection(self, timeout: int = 30) -> Collection:
+    def get_impact_collection(self) -> Collection:
         """Get the hazard collection"""
-        response = open(self.gidd_hazards_collection_url)
+        with open(self.gidd_hazards_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+
         if response.status_code == 200:
-            collection_dict = json.loads(response.text)
-            return Collection.from_dict(collection_dict)
+            return Collection.from_dict(response)
         return Collection.from_dict({})
 
     def make_source_event_items(self) -> List[Item]:

pystac_monty/sources/gidd.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import Any, List
 
-import requests
 from pystac import Asset, Collection, Item, Link
 from shapely.geometry import Point, mapping
 
@@ -28,9 +27,9 @@ class GlideTransformer:
 
     hazard_profiles = MontyHazardProfiles()
 
-    glide_events_collection_url = ("../../monty-stac-extension/examples/glide-events/glide-events.json")
+    glide_events_collection_url = ("./monty-stac-extension/examples/glide-events/glide-events.json")
 
-    glide_hazard_collection_url = ("../../monty-stac-extension/examples/glide-hazards/glide-hazards.json")
+    glide_hazard_collection_url = ("./monty-stac-extension/examples/glide-hazards/glide-hazards.json")
 
     def __init__(self, data: GlideDataSource) -> None:
         self.data = data
@@ -176,17 +175,17 @@ def make_date(self, event_date: dict) -> datetime:
         date = datetime.fromisoformat(formatted_date.replace("Z", "+00:00"))
         return date
 
-    def get_event_collection(self, timeout: int = 30) -> Collection:
+    def get_event_collection(self) -> Collection:
         """Get event collection"""
-        response = open(self.glide_events_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.glide_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
-    def get_hazard_collection(self, timeout: int = 30) -> Collection:
+    def get_hazard_collection(self) -> Collection:
         """Get hazard collection"""
-        response = open(self.glide_hazard_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.glide_hazard_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+        return Collection.from_dict(response)
 
     def check_and_get_glide_events(self) -> list[Any]:
         """Validate the source fields"""

pystac_monty/sources/glide.py

@@ -5,7 +5,6 @@
 from typing import Any, Dict, List
 
 import pytz
-import requests
 from markdownify import markdownify as md
 from pystac import Asset, Collection, Item, Link
 from shapely.geometry import Point, mapping
@@ -46,10 +45,9 @@ class IDUTransformer:
     """Transform the source data into the STAC items"""
 
     idu_events_collection_id = "idu-events"
-    idu_events_collection_url = "../../monty-stac-extension/examples/idmc-events/idmc-events.json"  # noqa
+    idu_events_collection_url = "./monty-stac-extension/examples/idmc-idu-events/idmc-idu-events.json"  # noqa
     idu_impacts_collection_id = "idu-impacts"
-    # TODO: Update idu collection url after the PR is merged in monty-stac-extension
-    idu_impacts_collection_url = "https://raw.githubusercontent.com/IFRCGo/monty-stac-extension/refs/heads/feature/update-idu-documentation/examples/idu-impacts/idu-impacts.json"  # noqa
+    idu_impacts_collection_url = "./monty-stac-extension/examples/idmc-idu-impacts/idmc-idu-impacts.json"  # noqa
 
     hazard_profiles = MontyHazardProfiles()
 
@@ -68,21 +66,20 @@ def make_items(self) -> List[Item]:
 
         return items
 
-    def get_event_collection(self, timeout: int = 30) -> Collection:
+    def get_event_collection(self) -> Collection:
         """Get the event collection"""
-        response = open(self.idu_events_collection_url)
+        with open(self.idu_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
         if response.status_code == 200:
-            collection_dict = json.loads(response.text)
-            return Collection.from_dict(collection_dict)
+            return Collection.from_dict(response)
         return Collection.from_dict({})
 
-    def get_impact_collection(self, timeout: int = 30) -> Collection:
+    def get_impact_collection(self) -> Collection:
         """Get the impact collection"""
-        # TODO: Update this when the collection url is updated
-        response = requests.get(self.idu_events_collection_url, timeout=timeout)
+        with open(self.idu_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
         if response.status_code == 200:
-            collection_dict = json.loads(response.text)
-            return Collection.from_dict(collection_dict)
+            return Collection.from_dict(response)
         return Collection.from_dict({})
 
     def make_source_event_items(self) -> List[Item]:

pystac_monty/sources/idu.py

@@ -33,10 +33,9 @@ def get_data(self) -> dict:
 
 class IFRCEventTransformer:
     ifrcevent_events_collection_id = "ifrcevent-events"
-    # TODO: Update collection url after IFRC DREF PR is merged
-    ifrcevent_events_collection_url = "https://raw.githubusercontent.com/IFRCGo/monty-stac-extension/refs/heads/feature/collection-ifrc-event/examples/ifrcevent-events/ifrcevent_events.json"  # noqa: E501
+    ifrcevent_events_collection_url = "./monty-stac-extension/examples/ifrcevent-events/ifrcevent_events.json"  # noqa: E501
     ifrcevent_impacts_collection_id = "ifrcevent-impacts"
-    ifrcevent_impacts_collection_url = "https://raw.githubusercontent.com/IFRCGo/monty-stac-extension/refs/heads/feature/collection-ifrc-event/examples/ifrcevent-impacts/ifrcevent_impacts.json"  # noqa: E501
+    ifrcevent_impacts_collection_url = "./monty-stac-extension/examples/ifrcevent-impacts/ifrcevent_impacts.json"  # noqa: E501
 
     hazard_profiles = MontyHazardProfiles()
 
@@ -48,17 +47,17 @@ def __init__(self, data: IFRCEventDataSource, geocoder: MontyGeoCoder):
 
     def get_event_collection(self) -> Collection:
         """Get event collection"""
-    # TODO: Update request after collection url is updated
-        response = requests.get(self.ifrcevent_events_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.ifrcevent_events_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+
+        return Collection.from_dict(response)
 
     def get_impact_collection(self) -> Collection:
         """Get event collection"""
-    # TODO: Update request after collection url is updated
-        response = requests.get(self.ifrcevent_impacts_collection_url)
-        collection_dict = json.loads(response.text)
-        return Collection.from_dict(collection_dict)
+        with open(self.ifrcevent_impacts_collection_url, "r", encoding="utf-8") as f:
+            response = json.load(f)
+
+        return Collection.from_dict(response)
 
     def make_items(self) -> List[Item]:
         """Create items"""