Merge remote-tracking branch 'origin/master'

polca · Oct 16, 2024 · bac32fc · bac32fc
2 parents 1a5405e + d572142
commit bac32fc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/premise/__init__.py b/premise/__init__.py
@@ -4,7 +4,7 @@
     "clear_inventory_cache",
     "get_regions_definition",
 )
-__version__ = (2, 1, 4)
+__version__ = (2, 1, 5)
 
 
 from premise.new_database import NewDatabase

diff --git a/premise/external_data_validation.py b/premise/external_data_validation.py
@@ -372,12 +372,17 @@ def find_candidates_by_key(data, key):
         return [
             item
             for item in data
-            if item["name"] == key[0] and item["reference product"] == key[1]
+            if item["name"].lower() == key[0].lower()
+            and item["reference product"].lower() == key[1].lower()
         ]
 
     def filter_candidates_by_mask(candidates, mask):
         """Exclude candidates containing the mask in their name."""
-        return [candidate for candidate in candidates if mask not in candidate["name"]]
+        return [
+            candidate
+            for candidate in candidates
+            if mask.lower() not in candidate["name"].lower()
+        ]
 
     def identify_potential_candidates(database, inventory_data, key, mask):
         """Identify and return potential candidates based on key and mask."""
@@ -550,14 +555,19 @@ def adjust_candidates_or_raise_error(
             potential_candidates = identify_potential_candidates(
                 database, inventory_data, key, mask
             )
-            candidates = adjust_candidates_or_raise_error(
-                potential_candidates,
-                scenario_data,
-                key,
-                year,
-                val,
-                inventory_data,
-            )
+
+            try:
+                candidates = adjust_candidates_or_raise_error(
+                    potential_candidates,
+                    scenario_data,
+                    key,
+                    year,
+                    val,
+                    inventory_data,
+                )
+            except ValueError as e:
+                print(key, val, potential_candidates)
+                print()
 
             if duplicate_name:
                 for candidate in candidates: