patch tasks for v8

Author: esoteric-ephemera

dev/generate_mcp_tools.py

@@ -59,7 +59,8 @@ def regenerate_tools(
     COORDINATION_GEOMETRIES_IUPAC,
     COORDINATION_GEOMETRIES_NAMES,
 )
-from emmet.core.electronic_structure import BSPathType, DOSProjectionType
+from emmet.core.band_theory import BSPathType
+from emmet.core.electronic_structure import DOSProjectionType
 from emmet.core.grain_boundary import GBTypeEnum
 from emmet.core.mpid import MPID
 from emmet.core.thermo import ThermoType

mp_api/client/mprester.py

@@ -7,7 +7,7 @@
 from functools import cache, lru_cache
 from typing import TYPE_CHECKING
 
-from emmet.core.electronic_structure import BSPathType
+from emmet.core.band_theory import BSPathType
 from emmet.core.mpid import MPID, AlphaID
 from emmet.core.types.enums import ThermoType
 from emmet.core.vasp.calc_types import CalcType
@@ -1231,9 +1231,11 @@ def get_charge_density_from_task_id(
         Returns:
             (Chgcar, (Chgcar, CoreTaskDoc | dict), None): Pymatgen Chgcar object, or tuple with object and CoreTaskDoc
         """
+        # TODO: change when `validate_ids` is updated to return AlphaID
+        validated_id = AlphaID(f"mp-{validate_ids([task_id])[0].split(" - ")[-1]}")
         chgcar = self.materials.tasks._query_open_data(
             bucket="materialsproject-parsed",
-            key=f"chgcars/{validate_ids([task_id])[0]}.json.gz",
+            key=f"chgcars/{validated_id.string}.json.gz",
             decoder=lambda x: load_json(x, deser=True),
         )[0][0]["data"]
 

mp_api/client/routes/materials/electronic_structure.py

@@ -4,8 +4,8 @@
 from collections import defaultdict
 from typing import TYPE_CHECKING
 
+from emmet.core.band_theory import BSPathType
 from emmet.core.electronic_structure import (
-    BSPathType,
     DOSProjectionType,
     ElectronicStructureDoc,
 )

mp_api/client/routes/materials/tasks.py

@@ -96,7 +96,11 @@ def search(
             if isinstance(task_ids, str):
                 task_ids = [task_ids]
 
-            query_params.update({"task_ids": ",".join(validate_ids(task_ids))})
+            # TODO: fix when validate_ids returns AlphaID
+            query_params["task_ids"] = ",".join(
+                str(AlphaID(task_id.split("-")[-1], padlen=8))
+                for task_id in validate_ids(task_ids)
+            )
 
         if formula:
             query_params.update({"formula": formula})

mp_api/mcp/tools.py

@@ -12,7 +12,8 @@
     COORDINATION_GEOMETRIES_IUPAC,
     COORDINATION_GEOMETRIES_NAMES,
 )
-from emmet.core.electronic_structure import BSPathType, DOSProjectionType
+from emmet.core.band_theory import BSPathType
+from emmet.core.electronic_structure import DOSProjectionType
 from emmet.core.grain_boundary import GBTypeEnum
 from emmet.core.mpid import MPID
 from emmet.core.summary import HasProps