Patch symmetry query (#1442)

* fix single symm query

* fix license for thermo, chemenv, and oxi states

* mypy as always

Author: esoteric-ephemera

emmet-api/emmet/api/core/global_header.py

@@ -1,35 +1,56 @@
-from emmet.api.resource.core import HeaderProcessor
 from fastapi import Response, Request
+from typing import Any
+
+from emmet.api.resource.core import HeaderProcessor
 from emmet.api.utils import STORE_PARAMS
 from emmet.api.routes.materials.materials.query_operators import LicenseQuery
 
 
+def _get_header_key(headers, key: str, default: Any = None) -> Any:
+    """Get a case-insensitive key from a set of request headers."""
+    try:
+        return next(v for k, v in headers.items() if k.lower() == key.lower())
+    except StopIteration:
+        return default
+
+
 class GlobalHeaderProcessor(HeaderProcessor):
-    def process_header(self, response: Response, request: Request):
-        groups = request.headers.get("X-Authenticated-Groups", None)
-        if groups is not None and "api_all_nolimit" in [
+
+    def process_header(self, response: Response, request: Request) -> None:
+        if (
+            groups := _get_header_key(request.headers, "x-authenticated-groups")
+        ) is not None and "api_all_nolimit" in [
             group.strip() for group in groups.split(",")
         ]:
             response.headers["X-Bypass-Rate-Limit"] = "ALL"
 
         # forward Consumer Id header in response
-        consumer_id = request.headers.get("X-Consumer-Id", "-")
+        consumer_id = _get_header_key(request.headers, "x-consumer-id", default="-")
         response.headers["X-Consumer-Id"] = consumer_id
 
-        if "Content-Type" not in response.headers:
+        if _get_header_key(response.headers, "Content-Type") is None:
             response.headers["Content-Type"] = "application/json"
 
     def configure_query_on_request(
         self, request: Request, query_operator: LicenseQuery
     ) -> STORE_PARAMS:
-        groups = request.headers.get(
-            "x-consumer-groups", request.headers.get("x-authenticated-groups", "")
-        )
-        if not groups:
-            return query_operator.query(license="BY-C")
 
-        grps = set(group.strip() for group in groups.split(","))
-        if grps & {"TERMS:ACCEPT-NC", "admin"}:
-            return query_operator.query(license="All")
+        if not (
+            groups := _get_header_key(
+                request.headers,
+                "x-consumer-groups",
+                default=_get_header_key(
+                    request.headers, "x-authenticated-groups", default=""
+                ),
+            )
+        ):
+            return query_operator.query(license="BY-C")
 
-        return query_operator.query(license="BY-C")
+        return query_operator.query(
+            license=(
+                "All"
+                if {group.strip() for group in groups.split(",")}
+                & {"TERMS:ACCEPT-NC", "admin"}
+                else "BY-C"
+            )
+        )

emmet-api/emmet/api/routes/materials/chemenv/resources.py

@@ -10,6 +10,7 @@
 from emmet.api.routes.materials.materials.query_operators import (
     MultiMaterialIDQuery,
     ElementsQuery,
+    LicenseQuery,
 )
 from emmet.api.routes.materials.chemenv.query_operators import ChemEnvQuery
 from emmet.core.chemenv import ChemEnvDoc
@@ -31,6 +32,7 @@ def chemenv_resource(chemenv_store):
             ),
         ],
         header_processor=GlobalHeaderProcessor(),
+        query_to_configure_on_request=LicenseQuery(),
         tags=["Materials Chemical Environment"],
         sub_path="/chemenv/",
         disable_validation=True,

emmet-api/emmet/api/routes/materials/materials/query_operators.py

@@ -253,6 +253,7 @@ def query(
 
             if (
                 len(spacegroup_numbers) == 1
+                and crystal_systems
                 and get_crystal_system_from_international_number(spacegroup_numbers[0])
                 not in crystal_systems
             ) or (

emmet-api/emmet/api/routes/materials/oxidation_states/resources.py

@@ -35,6 +35,7 @@ def oxi_states_resource(oxi_states_store):
             LicenseQuery(),
         ],
         header_processor=GlobalHeaderProcessor(),
+        query_to_configure_on_request=LicenseQuery(),
         tags=["Materials Oxidation States"],
         sub_path="/oxidation_states/",
         disable_validation=True,

emmet-api/emmet/api/routes/materials/thermo/resources.py

@@ -40,6 +40,7 @@ def thermo_resource(thermo_store):
             LicenseQuery(),
         ],
         header_processor=GlobalHeaderProcessor(),
+        query_to_configure_on_request=LicenseQuery(),
         tags=["Materials Thermo"],
         sub_path="/thermo/",
         disable_validation=True,

emmet-api/tests/materials/materials/test_query_operators.py

@@ -111,6 +111,14 @@ def test_deprecation_query():
 def test_symmetry_query():
     op = SymmetryQuery()
 
+    assert op.query(crystal_system="Trigonal") == {
+        "criteria": {"symmetry.crystal_system": "Trigonal"}
+    }
+    assert op.query(spacegroup_symbol="P6_3/mmc") == {
+        "criteria": {"symmetry.number": 194}
+    }
+    assert op.query(spacegroup_number=194) == {"criteria": {"symmetry.number": 194}}
+
     for aux_query in [
         {"spacegroup_number": 221},
         {"spacegroup_symbol": "Pm-3m"},