.string to __str__

Author: esoteric-ephemera

mp_api/client/core/utils.py

@@ -11,7 +11,7 @@
 from mp_api.client.core.settings import MAPIClientSettings
 
 if TYPE_CHECKING:
-    pass
+    from typing import Any
 
 
 def _compare_emmet_ver(
@@ -40,7 +40,9 @@ def _compare_emmet_ver(
     )(parse_version(ref_version))
 
 
-def load_json(json_like: str | bytes, deser: bool = False, encoding: str = "utf-8"):
+def load_json(
+    json_like: str | bytes, deser: bool = False, encoding: str = "utf-8"
+) -> Any:
     """Utility to load json in consistent manner."""
     data = orjson.loads(
         json_like if isinstance(json_like, bytes) else json_like.encode(encoding)
@@ -69,4 +71,4 @@ def validate_ids(id_list: list[str]) -> list[str]:
     # TODO: after the transition to AlphaID in the document models,
     # The following line should be changed to
     # return [validate_identifier(idx,serialize=True) for idx in id_list]
-    return [validate_identifier(idx).string for idx in id_list]
+    return [str(validate_identifier(idx)) for idx in id_list]

tests/core/test_utils.py

@@ -3,16 +3,14 @@
 from packaging.version import parse as parse_version
 import pytest
 
-from emmet.core.mpid import MPID, AlphaID
-
 
 def test_emmet_core_version_checks(monkeypatch: pytest.MonkeyPatch):
     ref_ver = (1, 2, "3rc5")
     ref_ver_str = ".".join(str(x) for x in ref_ver)
 
-    import emmet.core
+    import mp_api.client.core.utils
 
-    monkeypatch.setattr(emmet.core, "__version__", ref_ver_str)
+    monkeypatch.setattr(mp_api.client.core.utils, "_EMMET_CORE_VER", ref_ver_str)
     from mp_api.client.core.utils import _compare_emmet_ver
 
     assert _compare_emmet_ver(ref_ver_str, "==")
@@ -27,6 +25,8 @@ def test_emmet_core_version_checks(monkeypatch: pytest.MonkeyPatch):
 
 
 def test_id_validation():
+    from emmet.core.mpid import MPID, AlphaID
+
     from mp_api.client.core.utils import validate_ids
     from mp_api.client.core.settings import MAPIClientSettings