Search and XAS to emmet core models

src/mp_api/routes/materials/query_operators.py

@@ -2,7 +2,7 @@
 from fastapi import Query
 from mp_api.core.query_operator import STORE_PARAMS, QueryOperator
 from mp_api.routes.materials.utils import formula_to_criteria
-from mp_api.routes.materials.models.core import CrystalSystem
+from emmet.core.symmetry import CrystalSystem
 from pymatgen.core.periodic_table import Element
 from collections import defaultdict
 

src/mp_api/routes/materials/resources.py

@@ -1,6 +1,5 @@
 from fastapi import HTTPException
 from mp_api.core.resource import GetResource
-from mp_api.routes.materials.models.core import Structure
 
 from emmet.core.material import MaterialsDoc
 
@@ -21,7 +20,7 @@
 )
 
 from pymatgen.analysis.structure_matcher import StructureMatcher, ElementComparator
-from pymatgen.core import Structure as PS
+from pymatgen.core import Structure
 from pymatgen.core import Composition
 from pymongo import MongoClient  # type: ignore
 from itertools import permutations
@@ -101,7 +100,7 @@ async def find_structure(
             """
 
             try:
-                s = PS.from_dict(structure.dict())
+                s = Structure.from_dict(structure.dict())
             except Exception:
                 raise HTTPException(
                     status_code=404,
@@ -128,7 +127,7 @@ async def find_structure(
                 criteria=crit, properties=["structure", "task_id"]
             ):
 
-                s2 = PS.from_dict(r["structure"])
+                s2 = Structure.from_dict(r["structure"])
                 matched = m.fit(s, s2)
 
                 if matched:

src/mp_api/routes/phonon/models.py

@@ -3,8 +3,7 @@
 from monty.json import MontyDecoder
 
 from pydantic import BaseModel, Field, validator
-
-from mp_api.routes.materials.models.core import Structure
+from pymatgen.core import Structure
 from pymatgen.phonon.bandstructure import PhononBandStructureSymmLine