From 6322d7418a0d6c01d63d506f3698eadbc58721e4 Mon Sep 17 00:00:00 2001
From: Jason Munro <jmunro@lbl.gov>
Date: Tue, 21 Nov 2023 11:58:32 -0800
Subject: [PATCH] Remove all sort parameters (#902)

* Remove all sort parameters

* Linting
---
 emmet-api/emmet/api/routes/legacy/jcesr/resources.py         | 3 +--
 emmet-api/emmet/api/routes/materials/absorption/resources.py | 2 --
 emmet-api/emmet/api/routes/materials/alloys/resources.py     | 3 +--
 emmet-api/emmet/api/routes/materials/bonds/resources.py      | 3 +--
 emmet-api/emmet/api/routes/materials/chemenv/resources.py    | 2 --
 .../api/routes/materials/conversion_electrodes/resources.py  | 3 +--
 emmet-api/emmet/api/routes/materials/dielectric/resources.py | 3 +--
 emmet-api/emmet/api/routes/materials/elasticity/resources.py | 3 +--
 .../api/routes/materials/electronic_structure/resources.py   | 5 +----
 emmet-api/emmet/api/routes/materials/eos/resources.py        | 3 +--
 .../emmet/api/routes/materials/grain_boundary/resources.py   | 2 --
 .../api/routes/materials/insertion_electrodes/resources.py   | 3 +--
 emmet-api/emmet/api/routes/materials/magnetism/resources.py  | 3 +--
 emmet-api/emmet/api/routes/materials/materials/resources.py  | 3 ---
 .../emmet/api/routes/materials/oxidation_states/resources.py | 2 --
 emmet-api/emmet/api/routes/materials/piezo/resources.py      | 3 +--
 emmet-api/emmet/api/routes/materials/substrates/resources.py | 2 --
 emmet-api/emmet/api/routes/materials/summary/resources.py    | 2 --
 .../api/routes/materials/surface_properties/resources.py     | 3 +--
 emmet-api/emmet/api/routes/materials/tasks/resources.py      | 3 +--
 emmet-api/emmet/api/routes/materials/thermo/resources.py     | 2 --
 emmet-api/emmet/api/routes/materials/xas/resources.py        | 3 +--
 .../emmet/api/routes/molecules/association/resources.py      | 2 --
 emmet-api/emmet/api/routes/molecules/bonds/resources.py      | 3 +--
 .../emmet/api/routes/molecules/metal_binding/resources.py    | 3 +--
 emmet-api/emmet/api/routes/molecules/molecules/resources.py  | 2 --
 emmet-api/emmet/api/routes/molecules/orbitals/resources.py   | 3 +--
 .../emmet/api/routes/molecules/partial_charges/resources.py  | 3 +--
 .../emmet/api/routes/molecules/partial_spins/resources.py    | 3 +--
 emmet-api/emmet/api/routes/molecules/redox/resources.py      | 2 --
 emmet-api/emmet/api/routes/molecules/summary/resources.py    | 2 --
 emmet-api/emmet/api/routes/molecules/tasks/resources.py      | 3 +--
 emmet-api/emmet/api/routes/molecules/thermo/resources.py     | 2 --
 emmet-api/emmet/api/routes/molecules/vibrations/resources.py | 3 +--
 34 files changed, 21 insertions(+), 71 deletions(-)

diff --git a/emmet-api/emmet/api/routes/legacy/jcesr/resources.py b/emmet-api/emmet/api/routes/legacy/jcesr/resources.py
index f4ff97e116..0830b6ce64 100644
--- a/emmet-api/emmet/api/routes/legacy/jcesr/resources.py
+++ b/emmet-api/emmet/api/routes/legacy/jcesr/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules_jcesr import MoleculesDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.legacy.jcesr.query_operators import (
     MoleculeBaseQuery,
     MoleculeElementsQuery,
@@ -21,7 +21,6 @@ def jcesr_resource(molecules_store):
             MoleculeElementsQuery(),
             MoleculeFormulaQuery(),
             MultipleTaskIDsQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(MoleculesDoc, default_fields=["task_id"]),
         ],
diff --git a/emmet-api/emmet/api/routes/materials/absorption/resources.py b/emmet-api/emmet/api/routes/materials/absorption/resources.py
index 4ca11e27ac..fc7cb5d742 100644
--- a/emmet-api/emmet/api/routes/materials/absorption/resources.py
+++ b/emmet-api/emmet/api/routes/materials/absorption/resources.py
@@ -1,6 +1,5 @@
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
     NumericQuery,
 )
@@ -29,7 +28,6 @@ def absorption_resource(absorption_store):
                     "energy_max",
                 ],
             ),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 AbsorptionDoc,
diff --git a/emmet-api/emmet/api/routes/materials/alloys/resources.py b/emmet-api/emmet/api/routes/materials/alloys/resources.py
index 2ad1633c86..41807def46 100644
--- a/emmet-api/emmet/api/routes/materials/alloys/resources.py
+++ b/emmet-api/emmet/api/routes/materials/alloys/resources.py
@@ -1,6 +1,6 @@
 from maggma.api.resource import ReadOnlyResource
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.core.alloys import AlloyPairDoc
 
@@ -18,7 +18,6 @@ def alloy_pairs_resource(alloy_pairs_store):
         query_operators=[
             MaterialIDsSearchQuery(),
             FormulaSearchQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 AlloyPairDoc,
diff --git a/emmet-api/emmet/api/routes/materials/bonds/resources.py b/emmet-api/emmet/api/routes/materials/bonds/resources.py
index 20cf963cc9..890fd22cc8 100644
--- a/emmet-api/emmet/api/routes/materials/bonds/resources.py
+++ b/emmet-api/emmet/api/routes/materials/bonds/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.bonds import BondingDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.materials.bonds.query_operators import (
     BondLengthQuery,
@@ -20,7 +20,6 @@ def bonds_resource(bonds_store):
             MultiMaterialIDQuery(),
             BondLengthQuery(),
             CoordinationEnvsQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 BondingDoc,
diff --git a/emmet-api/emmet/api/routes/materials/chemenv/resources.py b/emmet-api/emmet/api/routes/materials/chemenv/resources.py
index b50bc24b7b..bd1b9a4bb1 100644
--- a/emmet-api/emmet/api/routes/materials/chemenv/resources.py
+++ b/emmet-api/emmet/api/routes/materials/chemenv/resources.py
@@ -1,6 +1,5 @@
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
     NumericQuery,
 )
@@ -25,7 +24,6 @@ def chemenv_resource(chemenv_store):
             ChemEnvQuery(),
             ElementsQuery(),
             NumericQuery(model=ChemEnvDoc, excluded_fields=["valences"]),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ChemEnvDoc,
diff --git a/emmet-api/emmet/api/routes/materials/conversion_electrodes/resources.py b/emmet-api/emmet/api/routes/materials/conversion_electrodes/resources.py
index ccad4b093b..d81e47fb50 100644
--- a/emmet-api/emmet/api/routes/materials/conversion_electrodes/resources.py
+++ b/emmet-api/emmet/api/routes/materials/conversion_electrodes/resources.py
@@ -3,7 +3,7 @@
 from emmet.core.electrode import ConversionElectrodeDoc
 from emmet.api.core.global_header import GlobalHeaderProcessor
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.insertion_electrodes.query_operators import (
     ElectrodeFormulaQuery,
     ElectrodeElementsQuery,
@@ -28,7 +28,6 @@ def conversion_electrodes_resource(conversion_electrodes_store):
             WorkingIonQuery(),
             ElectrodeElementsQuery(),
             NumericQuery(model=ConversionElectrodeDoc),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ConversionElectrodeDoc,
diff --git a/emmet-api/emmet/api/routes/materials/dielectric/resources.py b/emmet-api/emmet/api/routes/materials/dielectric/resources.py
index 157987292b..3bd5b17797 100644
--- a/emmet-api/emmet/api/routes/materials/dielectric/resources.py
+++ b/emmet-api/emmet/api/routes/materials/dielectric/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.polar import DielectricDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.dielectric.query_operators import DielectricQuery
 from emmet.api.routes.materials.materials.query_operators import MultiMaterialIDQuery
 from emmet.api.core.global_header import GlobalHeaderProcessor
@@ -15,7 +15,6 @@ def dielectric_resource(dielectric_store):
         query_operators=[
             MultiMaterialIDQuery(),
             DielectricQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 DielectricDoc, default_fields=["material_id", "last_updated"]
diff --git a/emmet-api/emmet/api/routes/materials/elasticity/resources.py b/emmet-api/emmet/api/routes/materials/elasticity/resources.py
index e4567da042..f4a16ed63b 100644
--- a/emmet-api/emmet/api/routes/materials/elasticity/resources.py
+++ b/emmet-api/emmet/api/routes/materials/elasticity/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.elasticity import ElasticityDoc
 from emmet.api.core.global_header import GlobalHeaderProcessor
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.materials.query_operators import MultiMaterialIDQuery
 from emmet.api.routes.materials.elasticity.query_operators import (
     ElasticityChemsysQuery,
@@ -23,7 +23,6 @@ def elasticity_resource(elasticity_store):
             BulkModulusQuery(),
             ShearModulusQuery(),
             PoissonQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ElasticityDoc,
diff --git a/emmet-api/emmet/api/routes/materials/electronic_structure/resources.py b/emmet-api/emmet/api/routes/materials/electronic_structure/resources.py
index 171d371a42..6a32c6052e 100644
--- a/emmet-api/emmet/api/routes/materials/electronic_structure/resources.py
+++ b/emmet-api/emmet/api/routes/materials/electronic_structure/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.query_operator.dynamic import NumericQuery
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.electronic_structure import ElectronicStructureDoc
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.materials.materials.query_operators import (
     ElementsQuery,
@@ -36,7 +36,6 @@ def es_resource(es_store):
             ElementsQuery(),
             NumericQuery(model=ElectronicStructureDoc),
             DeprecationQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ElectronicStructureDoc, default_fields=["material_id", "last_updated"]
@@ -59,7 +58,6 @@ def bs_resource(es_store):
         query_operators=[
             BSDataQuery(),
             DeprecationQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ElectronicStructureDoc,
@@ -103,7 +101,6 @@ def dos_resource(es_store):
         query_operators=[
             DOSDataQuery(),
             DeprecationQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ElectronicStructureDoc,
diff --git a/emmet-api/emmet/api/routes/materials/eos/resources.py b/emmet-api/emmet/api/routes/materials/eos/resources.py
index 4e3395f3aa..cfc6aeb93f 100644
--- a/emmet-api/emmet/api/routes/materials/eos/resources.py
+++ b/emmet-api/emmet/api/routes/materials/eos/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.eos import EOSDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.core.global_header import GlobalHeaderProcessor
 from emmet.api.core.settings import MAPISettings
 
@@ -11,7 +11,6 @@ def eos_resource(eos_store):
         eos_store,
         EOSDoc,
         query_operators=[
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(EOSDoc, default_fields=["task_id"]),
         ],
diff --git a/emmet-api/emmet/api/routes/materials/grain_boundary/resources.py b/emmet-api/emmet/api/routes/materials/grain_boundary/resources.py
index ba97590d5a..c4d27ad3a0 100644
--- a/emmet-api/emmet/api/routes/materials/grain_boundary/resources.py
+++ b/emmet-api/emmet/api/routes/materials/grain_boundary/resources.py
@@ -7,7 +7,6 @@
 )
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
     NumericQuery,
 )
@@ -25,7 +24,6 @@ def gb_resource(gb_store):
                 model=GrainBoundaryDoc, excluded_fields=["rotation_axis", "gb_plane"]
             ),
             GBStructureQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 GrainBoundaryDoc, default_fields=["task_id", "last_updated"]
diff --git a/emmet-api/emmet/api/routes/materials/insertion_electrodes/resources.py b/emmet-api/emmet/api/routes/materials/insertion_electrodes/resources.py
index 0165872fa6..2f18790e55 100644
--- a/emmet-api/emmet/api/routes/materials/insertion_electrodes/resources.py
+++ b/emmet-api/emmet/api/routes/materials/insertion_electrodes/resources.py
@@ -3,7 +3,7 @@
 from emmet.core.electrode import InsertionElectrodeDoc
 from emmet.api.core.global_header import GlobalHeaderProcessor
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.insertion_electrodes.query_operators import (
     ElectrodeFormulaQuery,
     ElectrodeElementsQuery,
@@ -28,7 +28,6 @@ def insertion_electrodes_resource(insertion_electrodes_store):
             WorkingIonQuery(),
             ElectrodeElementsQuery(),
             NumericQuery(model=InsertionElectrodeDoc),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 InsertionElectrodeDoc,
diff --git a/emmet-api/emmet/api/routes/materials/magnetism/resources.py b/emmet-api/emmet/api/routes/materials/magnetism/resources.py
index da486f2b05..3b2ac6adce 100644
--- a/emmet-api/emmet/api/routes/materials/magnetism/resources.py
+++ b/emmet-api/emmet/api/routes/materials/magnetism/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.magnetism import MagnetismDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.magnetism.query_operators import MagneticQuery
 from emmet.api.routes.materials.materials.query_operators import MultiMaterialIDQuery
 from emmet.api.core.global_header import GlobalHeaderProcessor
@@ -15,7 +15,6 @@ def magnetism_resource(magnetism_store):
         query_operators=[
             MultiMaterialIDQuery(),
             MagneticQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MagnetismDoc, default_fields=["material_id", "last_updated"]
diff --git a/emmet-api/emmet/api/routes/materials/materials/resources.py b/emmet-api/emmet/api/routes/materials/materials/resources.py
index 0895bb51ae..6283915a76 100644
--- a/emmet-api/emmet/api/routes/materials/materials/resources.py
+++ b/emmet-api/emmet/api/routes/materials/materials/resources.py
@@ -10,7 +10,6 @@
 from maggma.api.query_operator import (
     PaginationQuery,
     SparseFieldsQuery,
-    SortQuery,
     NumericQuery,
 )
 
@@ -74,7 +73,6 @@ def blessed_tasks_resource(materials_store):
             MultiTaskIDQuery(),
             DeprecationQuery(),
             NumericQuery(model=MaterialsDoc),
-            SortQuery(),
             PaginationQuery(),
             LicenseQuery(),
         ],
@@ -109,7 +107,6 @@ def materials_resource(materials_store):
             SymmetryQuery(),
             DeprecationQuery(),
             NumericQuery(model=MaterialsDoc),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MaterialsDoc,
diff --git a/emmet-api/emmet/api/routes/materials/oxidation_states/resources.py b/emmet-api/emmet/api/routes/materials/oxidation_states/resources.py
index baa751cd02..c3eab50bc4 100644
--- a/emmet-api/emmet/api/routes/materials/oxidation_states/resources.py
+++ b/emmet-api/emmet/api/routes/materials/oxidation_states/resources.py
@@ -3,7 +3,6 @@
 
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
 )
 
@@ -29,7 +28,6 @@ def oxi_states_resource(oxi_states_store):
             FormulaQuery(),
             ChemsysQuery(),
             PossibleOxiStateQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 OxidationStateDoc, default_fields=["material_id", "last_updated"]
diff --git a/emmet-api/emmet/api/routes/materials/piezo/resources.py b/emmet-api/emmet/api/routes/materials/piezo/resources.py
index 7f9cad4765..b73e113c17 100644
--- a/emmet-api/emmet/api/routes/materials/piezo/resources.py
+++ b/emmet-api/emmet/api/routes/materials/piezo/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.polar import PiezoelectricDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.piezo.query_operators import PiezoelectricQuery
 from emmet.api.routes.materials.materials.query_operators import MultiMaterialIDQuery
 from emmet.api.core.global_header import GlobalHeaderProcessor
@@ -15,7 +15,6 @@ def piezo_resource(piezo_store):
         query_operators=[
             MultiMaterialIDQuery(),
             PiezoelectricQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 PiezoelectricDoc, default_fields=["material_id", "last_updated"]
diff --git a/emmet-api/emmet/api/routes/materials/substrates/resources.py b/emmet-api/emmet/api/routes/materials/substrates/resources.py
index b4885161e8..856cc6c47a 100644
--- a/emmet-api/emmet/api/routes/materials/substrates/resources.py
+++ b/emmet-api/emmet/api/routes/materials/substrates/resources.py
@@ -1,7 +1,6 @@
 from maggma.api.query_operator import (
     NumericQuery,
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
     StringQueryOperator,
 )
@@ -25,7 +24,6 @@ def substrates_resource(substrates_store):
             StringQueryOperator(
                 model=SubstratesDoc, excluded_fields=["film_orient", "orient"]
             ),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(SubstratesDoc, default_fields=["film_id", "sub_id"]),
         ],
diff --git a/emmet-api/emmet/api/routes/materials/summary/resources.py b/emmet-api/emmet/api/routes/materials/summary/resources.py
index 73d20c9ef0..7bb889a3d2 100644
--- a/emmet-api/emmet/api/routes/materials/summary/resources.py
+++ b/emmet-api/emmet/api/routes/materials/summary/resources.py
@@ -2,7 +2,6 @@
 
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
     NumericQuery,
 )
@@ -62,7 +61,6 @@ def summary_resource(summary_store):
             SearchHasReconstructedQuery(),
             HasPropsQuery(),
             DeprecationQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(SummaryDoc, default_fields=["material_id"]),
             LicenseQuery(),
diff --git a/emmet-api/emmet/api/routes/materials/surface_properties/resources.py b/emmet-api/emmet/api/routes/materials/surface_properties/resources.py
index c9d5f5ffd8..92f57ef6bd 100644
--- a/emmet-api/emmet/api/routes/materials/surface_properties/resources.py
+++ b/emmet-api/emmet/api/routes/materials/surface_properties/resources.py
@@ -1,4 +1,4 @@
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from maggma.api.query_operator.dynamic import NumericQuery
 from maggma.api.resource import ReadOnlyResource
 from emmet.api.core.settings import MAPISettings
@@ -17,7 +17,6 @@ def surface_props_resource(surface_prop_store):
         query_operators=[
             NumericQuery(model=SurfacePropDoc),
             ReconstructedQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(SurfacePropDoc, default_fields=["task_id"]),
         ],
diff --git a/emmet-api/emmet/api/routes/materials/tasks/resources.py b/emmet-api/emmet/api/routes/materials/tasks/resources.py
index 13fd480f9d..852d7948e2 100644
--- a/emmet-api/emmet/api/routes/materials/tasks/resources.py
+++ b/emmet-api/emmet/api/routes/materials/tasks/resources.py
@@ -1,4 +1,4 @@
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from maggma.api.resource import ReadOnlyResource
 
 from emmet.api.routes.materials.materials.query_operators import (
@@ -29,7 +29,6 @@ def task_resource(task_store):
             ChemsysQuery(),
             ElementsQuery(),
             MultipleTaskIDsQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 TaskDoc,
diff --git a/emmet-api/emmet/api/routes/materials/thermo/resources.py b/emmet-api/emmet/api/routes/materials/thermo/resources.py
index 3362c28d5a..676c71f6ca 100644
--- a/emmet-api/emmet/api/routes/materials/thermo/resources.py
+++ b/emmet-api/emmet/api/routes/materials/thermo/resources.py
@@ -5,7 +5,6 @@
 
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
 )
 from emmet.api.routes.materials.thermo.query_operators import (
@@ -50,7 +49,6 @@ def thermo_resource(thermo_store):
             ChemsysQuery(),
             IsStableQuery(),
             NumericQuery(model=ThermoDoc),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 ThermoDoc, default_fields=["thermo_id", "material_id", "last_updated"]
diff --git a/emmet-api/emmet/api/routes/materials/xas/resources.py b/emmet-api/emmet/api/routes/materials/xas/resources.py
index e40e0e21dd..49a2e75d81 100644
--- a/emmet-api/emmet/api/routes/materials/xas/resources.py
+++ b/emmet-api/emmet/api/routes/materials/xas/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.xas import XASDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from emmet.api.routes.materials.materials.query_operators import (
     ElementsQuery,
     FormulaQuery,
@@ -22,7 +22,6 @@ def xas_resource(xas_store):
             ElementsQuery(),
             XASQuery(),
             XASTaskIDQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 XASDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/association/resources.py b/emmet-api/emmet/api/routes/molecules/association/resources.py
index 5d117ea83d..3a1a59095f 100644
--- a/emmet-api/emmet/api/routes/molecules/association/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/association/resources.py
@@ -7,7 +7,6 @@
 from maggma.api.query_operator import (
     PaginationQuery,
     SparseFieldsQuery,
-    SortQuery,
     NumericQuery,
 )
 
@@ -60,7 +59,6 @@ def mol_assoc_resource(assoc_store):
             HashQuery(),
             DeprecationQuery(),
             NumericQuery(model=MoleculeDoc),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MoleculeDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/bonds/resources.py b/emmet-api/emmet/api/routes/molecules/bonds/resources.py
index 7a6f3404a0..dfd0343d7c 100644
--- a/emmet-api/emmet/api/routes/molecules/bonds/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/bonds/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules.bonds import MoleculeBondingDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.molecules.bonds.query_operators import (
     BondTypeLengthQuery,
@@ -33,7 +33,6 @@ def bonding_resource(bonds_store):
             MethodQuery(),
             MultiPropertyIDQuery(),
             BondTypeLengthQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MoleculeBondingDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/metal_binding/resources.py b/emmet-api/emmet/api/routes/molecules/metal_binding/resources.py
index f3bdd77fed..50efb6f396 100644
--- a/emmet-api/emmet/api/routes/molecules/metal_binding/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/metal_binding/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules.metal_binding import MetalBindingDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.molecules.molecules.query_operators import (
     MultiMPculeIDQuery,
@@ -31,7 +31,6 @@ def metal_binding_resource(metal_binding_store):
             MethodQuery(),
             BindingDataQuery(),
             MultiPropertyIDQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MetalBindingDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/molecules/resources.py b/emmet-api/emmet/api/routes/molecules/molecules/resources.py
index c9eb977e6f..3acedeecb1 100644
--- a/emmet-api/emmet/api/routes/molecules/molecules/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/molecules/resources.py
@@ -7,7 +7,6 @@
 from maggma.api.query_operator import (
     PaginationQuery,
     SparseFieldsQuery,
-    SortQuery,
     NumericQuery,
 )
 
@@ -60,7 +59,6 @@ def molecules_resource(molecules_store):
             HashQuery(),
             DeprecationQuery(),
             NumericQuery(model=MoleculeDoc),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MoleculeDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/orbitals/resources.py b/emmet-api/emmet/api/routes/molecules/orbitals/resources.py
index 5ed0859467..3291171928 100644
--- a/emmet-api/emmet/api/routes/molecules/orbitals/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/orbitals/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules.orbitals import OrbitalDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.molecules.orbitals.query_operators import (
     NBOPopulationQuery,
@@ -38,7 +38,6 @@ def orbitals_resource(orbital_store):
             NBOLonePairQuery(),
             NBOBondQuery(),
             NBOInteractionQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 OrbitalDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/partial_charges/resources.py b/emmet-api/emmet/api/routes/molecules/partial_charges/resources.py
index c99a5a560d..e750c31751 100644
--- a/emmet-api/emmet/api/routes/molecules/partial_charges/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/partial_charges/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules.atomic import PartialChargesDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.molecules.molecules.query_operators import (
     MultiMPculeIDQuery,
@@ -29,7 +29,6 @@ def charges_resource(charges_store):
             ChargeSpinQuery(),
             MethodQuery(),
             MultiPropertyIDQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 PartialChargesDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/partial_spins/resources.py b/emmet-api/emmet/api/routes/molecules/partial_spins/resources.py
index c5abf3f02b..a1078e0f4e 100644
--- a/emmet-api/emmet/api/routes/molecules/partial_spins/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/partial_spins/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules.atomic import PartialSpinsDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.molecules.molecules.query_operators import (
     MultiMPculeIDQuery,
@@ -29,7 +29,6 @@ def spins_resource(spins_store):
             ChargeSpinQuery(),
             MethodQuery(),
             MultiPropertyIDQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 PartialSpinsDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/redox/resources.py b/emmet-api/emmet/api/routes/molecules/redox/resources.py
index acd99f10f3..801a79e56a 100644
--- a/emmet-api/emmet/api/routes/molecules/redox/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/redox/resources.py
@@ -4,7 +4,6 @@
 from maggma.api.query_operator import (
     NumericQuery,
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
 )
 
@@ -47,7 +46,6 @@ def redox_resource(redox_store):
                     "oxidation_potentials",
                 ],
             ),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 RedoxDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/summary/resources.py b/emmet-api/emmet/api/routes/molecules/summary/resources.py
index b9e2529703..af1ae3e020 100644
--- a/emmet-api/emmet/api/routes/molecules/summary/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/summary/resources.py
@@ -2,7 +2,6 @@
 
 from maggma.api.query_operator import (
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
     NumericQuery,
 )
@@ -35,7 +34,6 @@ def summary_resource(summary_store):
             HasPropsQuery(),
             ChargeSpinQuery(),
             DeprecationQuery(),
-            SortQuery(),
             PaginationQuery(),
             NumericQuery(
                 model=MoleculeSummaryDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/tasks/resources.py b/emmet-api/emmet/api/routes/molecules/tasks/resources.py
index cd3d952661..48e794c5d9 100644
--- a/emmet-api/emmet/api/routes/molecules/tasks/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/tasks/resources.py
@@ -1,4 +1,4 @@
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 from maggma.api.resource import ReadOnlyResource
 
 from emmet.api.routes.molecules.molecules.query_operators import (
@@ -30,7 +30,6 @@ def task_resource(task_store):
             ChemsysQuery(),
             ElementsQuery(),
             MultipleTaskIDsQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 TaskDocument,
diff --git a/emmet-api/emmet/api/routes/molecules/thermo/resources.py b/emmet-api/emmet/api/routes/molecules/thermo/resources.py
index ea996e0ec4..899a100036 100644
--- a/emmet-api/emmet/api/routes/molecules/thermo/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/thermo/resources.py
@@ -4,7 +4,6 @@
 from maggma.api.query_operator import (
     NumericQuery,
     PaginationQuery,
-    SortQuery,
     SparseFieldsQuery,
 )
 
@@ -48,7 +47,6 @@ def thermo_resource(thermo_store):
                     "rt",
                 ],
             ),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 MoleculeThermoDoc,
diff --git a/emmet-api/emmet/api/routes/molecules/vibrations/resources.py b/emmet-api/emmet/api/routes/molecules/vibrations/resources.py
index 37177a9bec..f4d9e07fd9 100644
--- a/emmet-api/emmet/api/routes/molecules/vibrations/resources.py
+++ b/emmet-api/emmet/api/routes/molecules/vibrations/resources.py
@@ -1,7 +1,7 @@
 from maggma.api.resource import ReadOnlyResource
 from emmet.core.molecules.vibration import VibrationDoc
 
-from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery
+from maggma.api.query_operator import PaginationQuery, SparseFieldsQuery
 
 from emmet.api.routes.molecules.molecules.query_operators import (
     MultiMPculeIDQuery,
@@ -28,7 +28,6 @@ def vibration_resource(vibes_store):
             ElementsQuery(),
             ChargeSpinQuery(),
             MultiPropertyIDQuery(),
-            SortQuery(),
             PaginationQuery(),
             SparseFieldsQuery(
                 VibrationDoc,