mpcontribs-client 5.6.0__py3-none-any.whl → 5.6.2__py3-none-any.whl

mpcontribs/client/__init__.py

@@ -59,6 +59,8 @@ from pint.converters import ScaleConverter
 from pint.errors import DimensionalityError
 from tempfile import gettempdir
 from plotly.express._chart_types import line as line_chart
+from cachetools import cached, LRUCache
+from cachetools.keys import hashkey
 
 RETRIES = 3
 MAX_WORKERS = 3
@@ -680,7 +682,9 @@ def _load(protocol, host, headers_json, project, version):
     projects = sorted(d["name"] for d in resp["data"])
     projects_json = ujson.dumps(projects)
     # expand regex-based query parameters for `data` columns
-    return _expand_params(protocol, host, version, projects_json)
+    spec = _expand_params(protocol, host, version, projects_json, apikey=headers.get("x-api-key"))
+    spec.http_client.session.headers.update(headers)
+    return spec
 
 
 @functools.lru_cache(maxsize=1)
@@ -714,15 +718,22 @@ def _raw_specs(protocol, host, version):
     return spec_dict
 
 
-@functools.lru_cache(maxsize=100)
-def _expand_params(protocol, host, version, projects_json):
+@cached(
+    cache=LRUCache(maxsize=100),
+    key=lambda protocol, host, version, projects_json, **kwargs: hashkey(
+        protocol, host, version, projects_json
+    )
+)
+def _expand_params(protocol, host, version, projects_json, apikey=None):
     columns = {"string": [], "number": []}
     projects = ujson.loads(projects_json)
-    query = {"project__in": projects}
+    query = {"project__in": ",".join(projects)}
     query["_fields"] = ["columns"]
     url = f"{protocol}://{host}"
     http_client = RequestsClient()
     http_client.session.headers["Content-Type"] = "application/json"
+    if apikey:
+        http_client.session.headers["X-Api-Key"] = apikey
     resp = http_client.session.get(f"{url}/projects/", params=query).json()
 
     for proj in resp["data"]:

{mpcontribs_client-5.6.0.dist-info → mpcontribs_client-5.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpcontribs-client
-Version: 5.6.0
+Version: 5.6.2
 Summary: client library for MPContribs API
 Home-page: https://github.com/materialsproject/MPContribs/tree/master/mpcontribs-client
 Author: Patrick Huck
@@ -26,6 +26,7 @@ Requires-Dist: swagger-spec-validator
 Requires-Dist: tqdm
 Requires-Dist: ujson
 Requires-Dist: semantic-version
+Requires-Dist: cachetools
 Provides-Extra: dev
 Requires-Dist: flake8 ; extra == 'dev'
 Requires-Dist: pytest ; extra == 'dev'

mpcontribs_client-5.6.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+mpcontribs/client/__init__.py,sha256=MdKExIkvHsduzHVDcZBwhJa4CCqYP519AXaWgVDcFEk,92644
+mpcontribs_client-5.6.2.dist-info/LICENSE,sha256=5tG0Niaqw2hnuyZZYkRXLSnfVrZA47COwduU_6caPLM,1074
+mpcontribs_client-5.6.2.dist-info/METADATA,sha256=T_dTSbw569Xs7H7OUCwa6a2J2U91v7t2JKwpcQlUupA,2548
+mpcontribs_client-5.6.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mpcontribs_client-5.6.2.dist-info/top_level.txt,sha256=t8R5L_Dg9oDQMh2gyRFdZGnrzZsr7OjCBTrhTcmimC8,11
+mpcontribs_client-5.6.2.dist-info/RECORD,,

mpcontribs_client-5.6.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-mpcontribs/client/__init__.py,sha256=7foA5jnfIQjTnB2Yg0DCCJAg_eKtpeFHcKFD9tGGfvo,92233
-mpcontribs_client-5.6.0.dist-info/LICENSE,sha256=5tG0Niaqw2hnuyZZYkRXLSnfVrZA47COwduU_6caPLM,1074
-mpcontribs_client-5.6.0.dist-info/METADATA,sha256=6Bk3618fuYeWA8_ts5P-sxU130ZUqWTIk_lOZkWNsos,2522
-mpcontribs_client-5.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mpcontribs_client-5.6.0.dist-info/top_level.txt,sha256=t8R5L_Dg9oDQMh2gyRFdZGnrzZsr7OjCBTrhTcmimC8,11
-mpcontribs_client-5.6.0.dist-info/RECORD,,