Search endpoint query op updates

src/mp_api/routes/electrodes/query_operators.py

@@ -152,7 +152,7 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append((key, False))
+                indexes.append((key, False))
         indexes.append(("max_delta_volume", False))
         return indexes
 
@@ -205,7 +205,7 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append((key, False))
+                indexes.append((key, False))
         return indexes
 
 
@@ -265,5 +265,5 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append((key, False))
+                indexes.append((key, False))
         return indexes

src/mp_api/routes/magnetism/query_operators.py

@@ -98,5 +98,5 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append(("magnetism." + key, False))
+                indexes.append(("magnetism." + key, False))
         return indexes

src/mp_api/routes/molecules/query_operators.py

@@ -103,7 +103,7 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append((key, False))
+                indexes.append((key, False))
         return indexes
 
 

src/mp_api/routes/search/query_operators.py

@@ -43,91 +43,6 @@ def query(
         return {"criteria": crit}
 
 
-class ThermoEnergySearchQuery(QueryOperator):
-    """
-    Method to generate a query for ranges of thermo energy data in search docs
-    """
-
-    def query(
-        self,
-        energy_max: Optional[float] = Query(
-            None, description="Maximum value for the total energy in eV.",
-        ),
-        energy_min: Optional[float] = Query(
-            None, description="Minimum value for the total energy in eV.",
-        ),
-        energy_per_atom_max: Optional[float] = Query(
-            None, description="Maximum value for the total energy in eV/atom.",
-        ),
-        energy_per_atom_min: Optional[float] = Query(
-            None, description="Minimum value for the total energy in eV/atom.",
-        ),
-        formation_energy_per_atom_max: Optional[float] = Query(
-            None, description="Maximum value for the formation energy in eV/atom.",
-        ),
-        formation_energy_per_atom_min: Optional[float] = Query(
-            None, description="Minimum value for the formation energy in eV/atom.",
-        ),
-        e_above_hull_max: Optional[float] = Query(
-            None, description="Maximum value for the energy above the hull in eV/atom.",
-        ),
-        e_above_hull_min: Optional[float] = Query(
-            None, description="Minimum value for the energy above the hull in eV/atom.",
-        ),
-        eq_reaction_max: Optional[float] = Query(
-            None,
-            description="Maximum value for the equilibrium reaction energy in eV/atom.",
-        ),
-        eq_reaction_min: Optional[float] = Query(
-            None,
-            description="Minimum value for the equilibrium reaction energy in eV/atom.",
-        ),
-        corrected_energy_max: Optional[float] = Query(
-            None, description="Maximum value for the corrected total energy in eV.",
-        ),
-        corrected_energy_min: Optional[float] = Query(
-            None, description="Minimum value for the corrected total energy in eV.",
-        ),
-    ) -> STORE_PARAMS:
-
-        crit = defaultdict(dict)  # type: dict
-
-        d = {
-            "energy": [energy_min, energy_max],
-            "energy_per_atom": [energy_per_atom_min, energy_per_atom_max],
-            "formation_energy_per_atom": [
-                formation_energy_per_atom_min,
-                formation_energy_per_atom_max,
-            ],
-            "e_above_hull": [e_above_hull_min, e_above_hull_max],
-            "eq_reaction_e": [eq_reaction_min, eq_reaction_max],
-            "explanation.corrected_energy": [
-                corrected_energy_min,
-                corrected_energy_max,
-            ],
-        }
-
-        for entry in d:
-            if d[entry][0] is not None:
-                crit[entry]["$gte"] = d[entry][0]
-
-            if d[entry][1] is not None:
-                crit[entry]["$lte"] = d[entry][1]
-
-        return {"criteria": crit}
-
-    def ensure_indexes(self):
-        keys = [
-            "energy",
-            "energy_per_atom",
-            "formation_energy_per_atom",
-            "e_above_hull",
-            "eq_reaction_e",
-            "explanation.corrected_energy",
-        ]
-        return [(key, False) for key in keys]
-
-
 class SearchIsStableQuery(QueryOperator):
     """
     Method to generate a query on whether a material is stable
@@ -253,7 +168,7 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append((key, False))
+                indexes.append((key, False))
         indexes.append(("universal_anisotropy", False))
         indexes.append(("homogeneous_poisson", False))
         return indexes

src/mp_api/routes/search/resources.py

@@ -18,7 +18,6 @@
 from mp_api.routes.search.models import SearchDoc, SearchStats
 from mp_api.routes.search.query_operators import (
     HasPropsQuery,
-    ThermoEnergySearchQuery,
     SearchIsStableQuery,
     SearchElasticityQuery,
     SearchMagneticQuery,
@@ -27,6 +26,7 @@
 )
 from mp_api.routes.surface_properties.query_operators import SurfaceMinMaxQuery
 from mp_api.routes.electronic_structure.query_operators import ESSummaryDataQuery
+from mp_api.routes.thermo.query_operators import ThermoEnergyQuery
 
 
 def search_resource(search_store):
@@ -133,7 +133,7 @@ async def generate_stats(
             ElementsQuery(),
             MinMaxQuery(),
             SymmetryQuery(),
-            ThermoEnergySearchQuery(),
+            ThermoEnergyQuery(),
             SearchIsStableQuery(),
             SearchIsTheoreticalQuery(),
             ESSummaryDataQuery(),

src/mp_api/routes/thermo/query_operators.py

@@ -147,5 +147,5 @@ def ensure_indexes(self):
         for key in keys:
             if "_min" in key:
                 key = key.replace("_min", "")
-            indexes.append((key, False))
+                indexes.append((key, False))
         return indexes