Remove all sort parameters (#902)

* Remove all sort parameters * Linting
materialsproject · Nov 21, 2023 · 6322d74 · 6322d74
1 parent a1f4d16
commit 6322d74
Show file tree

Hide file tree

Showing 34 changed files with 21 additions and 71 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,