Merge pull request #883 from materialsproject/bugfix/hint_scheme_changes

Update hint_scheme
materialsproject · Nov 7, 2023 · 73f10f5 · 73f10f5
2 parents 86a161e + 5d50d93
commit 73f10f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/maggma/api/resource/read_resource.py b/src/maggma/api/resource/read_resource.py
@@ -226,9 +226,8 @@ def search(**queries: Dict[str, STORE_PARAMS]) -> Union[Dict, Response]:
 
             try:
                 with query_timeout(self.timeout):
-                    count = self.store.count(  # type: ignore
-                        **{field: query[field] for field in query if field in ["criteria", "hint"]}
-                    )
+
+                    count = self.store.count(criteria = query.get("criteria"), hint = query.get("count_hint"))  # type: ignore
 
                     if isinstance(self.store, S3Store):
                         if self.query_disk_use:
@@ -241,7 +240,7 @@ def search(**queries: Dict[str, STORE_PARAMS]) -> Union[Dict, Response]:
                         data = list(
                             self.store._collection.aggregate(
                                 pipeline,
-                                **{field: query[field] for field in query if field in ["hint"]},
+                                hint = query.get("agg_hint"),
                             )
                         )
 

diff --git a/src/maggma/api/utils.py b/src/maggma/api/utils.py
@@ -26,7 +26,8 @@
         "limit",
         "request",
         "pipeline",
-        "hint",
+        "count_hint",
+        "agg_hint",
         "update",
     ],
     Any,