mpcontribs-client 5.6.0__tar.gz → 5.6.2__tar.gz

{mpcontribs-client-5.6.0/mpcontribs_client.egg-info → mpcontribs-client-5.6.2}/PKG-INFO

@@ -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.0 → mpcontribs-client-5.6.2}/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 → mpcontribs-client-5.6.2/mpcontribs_client.egg-info}/PKG-INFO

@@ -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.0 → mpcontribs-client-5.6.2}/mpcontribs_client.egg-info/requires.txt

@@ -15,6 +15,7 @@ swagger-spec-validator
 tqdm
 ujson
 semantic-version
+cachetools
 
 [dev]
 flake8

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/deployment.txt

@@ -18,6 +18,8 @@ bravado==11.0.3
     # via mpcontribs-client (MPContribs/mpcontribs-client/setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (MPContribs/mpcontribs-client/setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/ubuntu-latest_py3.10.txt

@@ -18,6 +18,8 @@ bravado==11.0.3
     # via mpcontribs-client (setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2
@@ -50,7 +52,7 @@ idna==3.6
     # via
     #   jsonschema
     #   requests
-ipython==8.18.0
+ipython==8.18.1
     # via mpcontribs-client (setup.py)
 isoduration==20.11.0
     # via jsonschema
@@ -215,7 +217,7 @@ tqdm==4.66.1
     # via
     #   mpcontribs-client (setup.py)
     #   pymatgen
-traitlets==5.13.0
+traitlets==5.14.0
     # via
     #   ipython
     #   matplotlib-inline

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/ubuntu-latest_py3.10_extras.txt

@@ -18,6 +18,8 @@ bravado==11.0.3
     # via mpcontribs-client (setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2
@@ -62,7 +64,7 @@ idna==3.6
     #   requests
 iniconfig==2.0.0
     # via pytest
-ipython==8.18.0
+ipython==8.18.1
     # via mpcontribs-client (setup.py)
 isoduration==20.11.0
     # via jsonschema
@@ -258,7 +260,7 @@ tqdm==4.66.1
     # via
     #   mpcontribs-client (setup.py)
     #   pymatgen
-traitlets==5.13.0
+traitlets==5.14.0
     # via
     #   ipython
     #   matplotlib-inline

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/ubuntu-latest_py3.8.txt

@@ -20,6 +20,8 @@ bravado==11.0.3
     # via mpcontribs-client (setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2
@@ -244,7 +246,7 @@ tqdm==4.66.1
     # via
     #   mpcontribs-client (setup.py)
     #   pymatgen
-traitlets==5.13.0
+traitlets==5.14.0
     # via
     #   ipython
     #   matplotlib-inline

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/ubuntu-latest_py3.8_extras.txt

@@ -20,6 +20,8 @@ bravado==11.0.3
     # via mpcontribs-client (setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2
@@ -287,7 +289,7 @@ tqdm==4.66.1
     # via
     #   mpcontribs-client (setup.py)
     #   pymatgen
-traitlets==5.13.0
+traitlets==5.14.0
     # via
     #   ipython
     #   matplotlib-inline

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/ubuntu-latest_py3.9.txt

@@ -18,6 +18,8 @@ bravado==11.0.3
     # via mpcontribs-client (setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2
@@ -52,7 +54,7 @@ idna==3.6
     #   requests
 importlib-resources==6.1.1
     # via matplotlib
-ipython==8.18.0
+ipython==8.18.1
     # via mpcontribs-client (setup.py)
 isoduration==20.11.0
     # via jsonschema
@@ -217,7 +219,7 @@ tqdm==4.66.1
     # via
     #   mpcontribs-client (setup.py)
     #   pymatgen
-traitlets==5.13.0
+traitlets==5.14.0
     # via
     #   ipython
     #   matplotlib-inline

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/requirements/ubuntu-latest_py3.9_extras.txt

@@ -18,6 +18,8 @@ bravado==11.0.3
     # via mpcontribs-client (setup.py)
 bravado-core==6.1.0
     # via bravado
+cachetools==5.3.2
+    # via mpcontribs-client (setup.py)
 certifi==2023.11.17
     # via requests
 charset-normalizer==3.3.2
@@ -64,7 +66,7 @@ importlib-resources==6.1.1
     # via matplotlib
 iniconfig==2.0.0
     # via pytest
-ipython==8.18.0
+ipython==8.18.1
     # via mpcontribs-client (setup.py)
 isoduration==20.11.0
     # via jsonschema
@@ -260,7 +262,7 @@ tqdm==4.66.1
     # via
     #   mpcontribs-client (setup.py)
     #   pymatgen
-traitlets==5.13.0
+traitlets==5.14.0
     # via
     #   ipython
     #   matplotlib-inline

{mpcontribs-client-5.6.0 → mpcontribs-client-5.6.2}/setup.py

@@ -38,6 +38,7 @@ setup(
         "tqdm",
         "ujson",
         "semantic-version",
+        "cachetools",
     ],
     extras_require={
         "dev": [