Update hint schemes and has_props query

materialsproject · Nov 8, 2023 · 0ec549d · 0ec549d
1 parent 847c891
commit 0ec549d
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 13 deletions.
diff --git a/emmet-api/emmet/api/routes/materials/materials/hint_scheme.py b/emmet-api/emmet/api/routes/materials/materials/hint_scheme.py
@@ -7,10 +7,43 @@ class MaterialsHintScheme(HintScheme):
  """
 
  def generate_hints(self, query):
- for param in query["criteria"]:
- if "composition_reduced" in param:
- return {"hint": {"composition_reduced.$**": 1}}
- elif "nelements" in param:
- return {"hint": {"nelements": 1}}
+ hints = {"count_hint": {"deprecated": 1, "builder_meta.license": 1}}
+ hints["agg_hint"] = hints["count_hint"]
 
- return {"hint": {}}
+ if list(query.get("criteria").keys()) != ["deprecated", "builder_meta.license"]:
+ for param in query["criteria"]:
+ if (
+ param
+ not in [
+ "deprecated",
+ "builder_meta.license",
+ ]
+ and "has_props" not in param
+ ):
+ hints["count_hint"] = {
+ "deprecated": 1,
+ "builder_meta.license": 1,
+ "formula_pretty": 1,
+ "material_id": 1,
+ param: 1,
+ }
+ hints["agg_hint"] = hints["count_hint"]
+ break
+
+ elif query.get("sort", {}):
+ for param in query["sort"]:
+ if param not in [
+ "deprecated",
+ "builder_meta.license",
+ "material_id",
+ "formula_pretty",
+ ]:
+ hints["agg_hint"] = {
+ "deprecated": 1,
+ "builder_meta.license": 1,
+ "formula_pretty": 1,
+ "material_id": 1,
+ param: 1,
+ }
+
+ return hints
diff --git a/emmet-api/emmet/api/routes/materials/summary/hint_scheme.py b/emmet-api/emmet/api/routes/materials/summary/hint_scheme.py
@@ -12,10 +12,14 @@ def generate_hints(self, query):
 
  if list(query.get("criteria").keys()) != ["deprecated", "builder_meta.license"]:
  for param in query["criteria"]:
- if param not in [
- "deprecated",
- "builder_meta.license",
- ]:
+ if (
+ param
+ not in [
+ "deprecated",
+ "builder_meta.license",
+ ]
+ and "has_props" not in param
+ ):
  hints["count_hint"] = {
  "deprecated": 1,
  "builder_meta.license": 1,

diff --git a/emmet-api/emmet/api/routes/materials/summary/query_operators.py b/emmet-api/emmet/api/routes/materials/summary/query_operators.py
@@ -34,9 +34,8 @@ def query(
  crit = {}
 
  if has_props:
- crit = {
- "has_props": {"$all": [prop.strip() for prop in has_props.split(",")]}
- }
+ for entry in [prop.strip() for prop in has_props.split(",")]:
+ crit[f"has_props.{entry}"] = True
 
  return {"criteria": crit}