tests passes

- improved geocoder + performance tests
- fixes extension helper

Author: emmanuelmathot

pystac_monty/extension.py

@@ -124,7 +124,7 @@ class MontyImpactExposureCategory(StringEnum):
     HOUSEHOLDS = "households"
 
 
-class MontyImpactExposureCatgoryLabel(Mapping):
+class MontyImpactExposureCatgoryLabel(Mapping[MontyImpactExposureCategory, str]):
     def __init__(self) -> None:
         self._data = {
             MontyImpactExposureCategory.ALL_PEOPLE: "People (All Demographics)",
@@ -173,7 +173,7 @@ def __getitem__(self, key: MontyImpactExposureCategory) -> str:
     def __len__(self) -> int:
         return len(self._data)
 
-    def __iter__(self) -> Iterator:
+    def __iter__(self) -> Iterator[MontyImpactExposureCategory]:
         return iter(self._data)
 
 
@@ -208,7 +208,7 @@ class MontyImpactType(StringEnum):
     HIGHEST_RISK = "highest_risk"
 
 
-class MontyImpactTypeLabel(Mapping):
+class MontyImpactTypeLabel(Mapping[MontyImpactType, str]):
     def __init__(self) -> None:
         self._data = {
             MontyImpactType.UNSPECIFIED: "Unspecified",
@@ -247,7 +247,7 @@ def __getitem__(self, key: MontyImpactType) -> str:
     def __len__(self) -> int:
         return len(self._data)
 
-    def __iter__(self) -> Iterator:
+    def __iter__(self) -> Iterator[MontyImpactType]:
         return iter(self._data)
 
 
@@ -378,7 +378,7 @@ def __init__(
         type: MontyImpactType,
         value: float,
         unit: str | None = None,
-        estimate_type: MontyEstimateType = None,
+        estimate_type: MontyEstimateType | None = None,
     ) -> None:
         self.properties = {}
         self.category = category
@@ -451,11 +451,20 @@ def to_dict(self) -> dict[str, Any]:
 
     @staticmethod
     def from_dict(d: dict[str, Any]) -> ImpactDetail:
-        category: str = get_required(d.get(IMPDET_CATEGORY_PROP), "impact_detail", IMPDET_CATEGORY_PROP)
-        type: str = get_required(d.get(IMPDET_TYPE_PROP), "impact_detail", IMPDET_TYPE_PROP)
+        category_str: str = get_required(d.get(IMPDET_CATEGORY_PROP), "impact_detail", IMPDET_CATEGORY_PROP)
+        type_str: str = get_required(d.get(IMPDET_TYPE_PROP), "impact_detail", IMPDET_TYPE_PROP)
         value: float = get_required(d.get(IMPDET_VALUE_PROP), "impact_detail", IMPDET_VALUE_PROP)
+        
+        # Convert strings to enum values
+        category = MontyImpactExposureCategory(category_str)
+        impact_type = MontyImpactType(type_str)
+        
+        # Get optional properties
+        unit = d.get(IMPDET_UNIT_PROP)
+        estimate_type_str = d.get(IMPDET_ESTIMATE_TYPE_PROP)
+        estimate_type = MontyEstimateType(estimate_type_str) if estimate_type_str else None
 
-        return ImpactDetail(category, type, value)
+        return ImpactDetail(category, impact_type, value, unit, estimate_type)
 
 
 class MontyExtension(
@@ -513,8 +522,8 @@ def correlation_id(self, v: str) -> None:
         self._set_property(ITEM_CORR_ID_PROP, v)
 
     def compute_and_set_correlation_id(self, hazard_profiles: HazardProfiles = MontyHazardProfiles()) -> None:
-        # if the object is an Item, we can generate the correlation id
-        if isinstance(self.item, pystac.Item):
+        # if the object is an ItemMontyExtension, we can generate the correlation id
+        if hasattr(self, 'item') and isinstance(self.item, pystac.Item):
             self.correlation_id = self.pairing.generate_correlation_id(self.item, hazard_profiles)
         else:
             raise ValueError("Correlation ID can only be computed for Items")
@@ -547,7 +556,7 @@ def hazard_codes(self, v: list[str] | None) -> None:
     @property
     def hazard_detail(self) -> HazardDetail | None:
         """The details of the hazard."""
-        result = map_opt(self._get_property(ITEM_HAZARD_DETAIL_PROP, dict), HazardDetail)
+        result = map_opt(HazardDetail.from_dict, self._get_property(ITEM_HAZARD_DETAIL_PROP, dict))
         return result
 
     @hazard_detail.setter
@@ -557,7 +566,7 @@ def hazard_detail(self, v: HazardDetail | None) -> None:
     @property
     def impact_detail(self) -> ImpactDetail | None:
         """The details of the impact."""
-        result = map_opt(self._get_property(ITEM_IMPACT_DETAIL_PROP, dict), ImpactDetail)
+        result = map_opt(ImpactDetail.from_dict, self._get_property(ITEM_IMPACT_DETAIL_PROP, dict))
         return result
 
     @impact_detail.setter
@@ -567,7 +576,7 @@ def impact_detail(self, v: ImpactDetail | None) -> None:
     @property
     def episode_number(self) -> int:
         """The episode number."""
-        return self.properties.get(ITEM_EPISODE_NUMBER_PROP, 0)
+        return self.properties.get(ITEM_EPISODE_NUMBER_PROP, 0) or 0
 
     @episode_number.setter
     def episode_number(self, v: int) -> None:
@@ -603,7 +612,8 @@ def ext(cls, obj: T, add_if_missing: bool = False) -> MontyExtension[T]:
 
     @staticmethod
     def enable_extension() -> None:
-        pystac.extensions.ext.ItemExt.monty = property(lambda self: MontyExtension.ext(self))
+        # Add monty property to ItemExt
+        setattr(pystac.extensions.ext.ItemExt, 'monty', property(lambda self: MontyExtension.ext(self)))
 
 
 class CollectionMontyExtension(MontyExtension[pystac.Collection]):