mpcontribs-client 5.8.4__py3-none-any.whl → 5.10.0__py3-none-any.whl

mpcontribs/client/__init__.py

@@ -54,13 +54,12 @@ from urllib3.util.retry import Retry
 from filetype.types.archive import Gz
 from filetype.types.image import Jpeg, Png, Gif, Tiff
 from pint import UnitRegistry
-from pint.unit import UnitDefinition
-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
+from pymatgen.core import SETTINGS
 
 RETRIES = 3
 MAX_WORKERS = 3
@@ -103,10 +102,16 @@ ureg = UnitRegistry(
         lambda s: s.replace("%", " percent "),
     ],
 )
-ureg.define(UnitDefinition("percent", "%", (), ScaleConverter(0.01)))
-ureg.define(UnitDefinition("permille", "%%", (), ScaleConverter(0.001)))
-ureg.define(UnitDefinition("ppm", "ppm", (), ScaleConverter(1e-6)))
-ureg.define(UnitDefinition("ppb", "ppb", (), ScaleConverter(1e-9)))
+if "percent" not in ureg:
+    # percent is native in pint >= 0.21
+    ureg.define("percent = 0.01 = %")
+if "permille" not in ureg:
+    # permille is native in pint >= 0.24.2
+    ureg.define("permille = 0.001 = ‰ = %%")
+if "ppm" not in ureg:
+    # ppm is native in pint >= 0.21
+    ureg.define("ppm = 1e-6")
+ureg.define("ppb = 1e-9")
 ureg.define("atom = 1")
 ureg.define("bohr_magneton = e * hbar / (2 * m_e) = µᵇ = µ_B = mu_B")
 ureg.define("electron_mass = 9.1093837015e-31 kg = mₑ = m_e")
@@ -886,7 +891,9 @@ class Client(SwaggerClient):
             host = os.environ.get("MPCONTRIBS_API_HOST", DEFAULT_HOST)
 
         if not apikey:
-            apikey = os.environ.get("MPCONTRIBS_API_KEY")
+            apikey = os.environ.get("MPCONTRIBS_API_KEY", SETTINGS.get("PMG_MAPI_KEY"))
+            if apikey and len(apikey) != 32:
+                raise MPContribsClientError(f"Invalid API key: {apikey}")
 
         if apikey and headers:
             apikey = None

{mpcontribs_client-5.8.4.dist-info → mpcontribs_client-5.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: mpcontribs-client
-Version: 5.8.4
+Version: 5.10.0
 Summary: client library for MPContribs API
 Home-page: https://github.com/materialsproject/MPContribs/tree/master/mpcontribs-client
 Author: Patrick Huck
@@ -9,7 +9,7 @@ License: MIT
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy <2
+Requires-Dist: numpy
 Requires-Dist: boltons
 Requires-Dist: bravado
 Requires-Dist: filetype
@@ -17,7 +17,7 @@ Requires-Dist: flatten-dict
 Requires-Dist: ipython
 Requires-Dist: json2html
 Requires-Dist: pandas
-Requires-Dist: pint <0.20
+Requires-Dist: pint
 Requires-Dist: plotly
 Requires-Dist: pyIsEmail
 Requires-Dist: pymatgen
@@ -29,12 +29,22 @@ Requires-Dist: ujson
 Requires-Dist: semantic-version
 Requires-Dist: cachetools
 Provides-Extra: dev
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pytest-flake8 ; extra == 'dev'
-Requires-Dist: pytest-pycodestyle ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
-Requires-Dist: py ; extra == 'dev'
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-flake8; extra == "dev"
+Requires-Dist: pytest-pycodestyle; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: py; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ![PyPI](https://img.shields.io/pypi/v/mpcontribs-client?style=flat-square)
 ![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/pypi/mpcontribs-client?style=flat-square)

mpcontribs_client-5.10.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+mpcontribs/client/__init__.py,sha256=0orUhfmCeQN9Qt6dIWl3kWhTye81zLIg1Kvb9EOhvys,96959
+mpcontribs_client-5.10.0.dist-info/LICENSE,sha256=5tG0Niaqw2hnuyZZYkRXLSnfVrZA47COwduU_6caPLM,1074
+mpcontribs_client-5.10.0.dist-info/METADATA,sha256=29GsT_gTk4wQk_bem_5bwUHkeWsGbPyqdKapniQ_VV4,2776
+mpcontribs_client-5.10.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+mpcontribs_client-5.10.0.dist-info/top_level.txt,sha256=t8R5L_Dg9oDQMh2gyRFdZGnrzZsr7OjCBTrhTcmimC8,11
+mpcontribs_client-5.10.0.dist-info/RECORD,,

{mpcontribs_client-5.8.4.dist-info → mpcontribs_client-5.10.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mpcontribs_client-5.8.4.dist-info/RECORD

@@ -1,6 +0,0 @@
-mpcontribs/client/__init__.py,sha256=xvHBjJnbIEwA9Ubg9a_sbqp0zbG8rVCoKutiY_cA5M4,96799
-mpcontribs_client-5.8.4.dist-info/LICENSE,sha256=5tG0Niaqw2hnuyZZYkRXLSnfVrZA47COwduU_6caPLM,1074
-mpcontribs_client-5.8.4.dist-info/METADATA,sha256=L9NNJo4IpeKVPQoRnETAc0XuJgYHSA5wEzcPwhhe-gw,2572
-mpcontribs_client-5.8.4.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mpcontribs_client-5.8.4.dist-info/top_level.txt,sha256=t8R5L_Dg9oDQMh2gyRFdZGnrzZsr7OjCBTrhTcmimC8,11
-mpcontribs_client-5.8.4.dist-info/RECORD,,