exception tests for es

Author: esoteric-ephemera

mp_api/client/routes/materials/electronic_structure.py

@@ -265,15 +265,17 @@ def get_bandstructure_from_task_id(self, task_id: str):
         Returns:
             bandstructure (BandStructure): BandStructure or BandStructureSymmLine object
         """
-        result = self._query_open_data(
-            bucket="materialsproject-parsed",
-            key=f"bandstructures/{validate_ids([task_id])[0]}.json.gz",
-        )[0]
+        try:
+            result = self._query_open_data(
+                bucket="materialsproject-parsed",
+                key=f"bandstructures/{validate_ids([task_id])[0]}.json.gz",
+            )[0]
+        except OSError:
+            result = None
 
         if result:
             return result[0]["data"]
-        else:
-            raise MPRestError("No object found")
+        raise MPRestError("No object found")
 
     def get_bandstructure_from_material_id(
         self,
@@ -467,15 +469,17 @@ def get_dos_from_task_id(self, task_id: str) -> CompleteDos:
         Returns:
             bandstructure (CompleteDos): CompleteDos object
         """
-        result = self._query_open_data(
-            bucket="materialsproject-parsed",
-            key=f"dos/{validate_ids([task_id])[0]}.json.gz",
-        )[0]
+        try:
+            result = self._query_open_data(
+                bucket="materialsproject-parsed",
+                key=f"dos/{validate_ids([task_id])[0]}.json.gz",
+            )[0]
+        except OSError:
+            result = None
 
         if result:
             return result[0]["data"]  # type: ignore
-        else:
-            raise MPRestError("No object found")
+        raise MPRestError("No object found")
 
     def get_dos_from_material_id(self, material_id: str):
         """Get the complete density of states pymatgen object associated with a Materials Project ID.

tests/materials/test_electronic_structure.py

@@ -4,6 +4,7 @@
 import pytest
 from pymatgen.analysis.magnetism import Ordering
 
+from mp_api.client.core.client import MPRestError
 from mp_api.client.routes.materials.electronic_structure import (
     BandStructureRester,
     DosRester,
@@ -100,6 +101,12 @@ def test_bs_client():
                     is not None
                 )
 
+        with pytest.raises(MPRestError, match="No electronic structure data found."):
+            _ = bs_rester.get_bandstructure_from_material_id("mp-0")
+
+        with pytest.raises(MPRestError, match="No object found"):
+            _ = bs_rester.get_bandstructure_from_task_id("mp-0")
+
 
 dos_custom_field_tests = [
     {"magnetic_ordering": Ordering.FM},
@@ -143,3 +150,13 @@ def test_dos_client():
             assert all(
                 doc[dos_alt_name_dict.get(param, param)] is not None for param in params
             )
+
+        with pytest.raises(MPRestError, match="To query element-projected DOS"):
+            _ = dos_rester.search(projection_type="elemental")
+
+        with pytest.raises(MPRestError, match="To query orbital-projected DOS"):
+            _ = dos_rester.search(projection_type="orbital")
+
+        assert dos_rester.get_dos_from_material_id("mp-0") is None
+        with pytest.raises(MPRestError, match="No object found"):
+            _ = dos_rester.get_dos_from_task_id("mp-0")