precommit / mypy

Author: esoteric-ephemera

mp_api/client/_server_utils.py

@@ -42,7 +42,7 @@ def get_request_headers() -> dict[str, Any]:
 
 
 def is_dev_env(
-    localhosts : Sequence[str] = ("localhost:", "127.0.0.1:", "0.0.0.0:")
+    localhosts: Sequence[str] = ("localhost:", "127.0.0.1:", "0.0.0.0:")
 ) -> bool:
     """Determine if current env is local/developmental or production.
 
@@ -56,9 +56,7 @@ def is_dev_env(
     return (
         True
         if not has_request_context()
-        else get_request_headers()
-        .get("Host", "")
-        .startswith(localhosts)
+        else get_request_headers().get("Host", "").startswith(localhosts)
     )
 
 

mp_api/client/core/settings.py

@@ -72,9 +72,9 @@ class MAPIClientSettings(BaseSettings):
         description="Angle tolerance for structure matching in degrees.",
     )
 
-    LOG_FILE : Path = Field(
+    LOG_FILE: Path = Field(
         Path("~/.mprester.log.yaml").expanduser(),
-        description = "Path for storing last accessed database version."
+        description="Path for storing last accessed database version.",
     )
 
     LOCAL_DATASET_CACHE: Path = Field(

mp_api/client/mprester.py

@@ -300,7 +300,7 @@ def __dir__(self):
 
     def __repr__(self) -> str:
         db_version = self.get_database_version()
-        return f"MPRester({'v' + db_version if db_version else "unknown version"})"
+        return f"MPRester({'v' + db_version if db_version else 'unknown version'})"
 
     def get_task_ids_associated_with_material_id(
         self, material_id: str, calc_types: list[CalcType] | None = None
@@ -1622,21 +1622,19 @@ def get_oxygen_evolution(
 
     def _db_version_check(self) -> None:
         """Check if the database version has drifted."""
+        import yaml  # type: ignore[import-untyped]
 
-        import yaml
         db_version = self.get_database_version()
         old_db_version = None
         if MAPI_CLIENT_SETTINGS.LOG_FILE.exists():
             old_db_version = (
-                yaml.safe_load(
-                    MAPI_CLIENT_SETTINGS.LOG_FILE.read_text()
-                ) or {}
-            ).get("MAPI_DB_VERSION",None)
+                yaml.safe_load(MAPI_CLIENT_SETTINGS.LOG_FILE.read_text()) or {}
+            ).get("MAPI_DB_VERSION", None)
 
             # Handle legacy pymatgen behavior
-            if not isinstance(old_db_version,str):
+            if not isinstance(old_db_version, str):
                 old_db_version = None
-        
+
         if old_db_version != db_version:
             MAPI_CLIENT_SETTINGS.LOG_FILE.write_text(
                 yaml.safe_dump({"MAPI_DB_VERSION": db_version})
@@ -1648,4 +1646,4 @@ def _db_version_check(self) -> None:
                     f"from v{old_db_version} to v{db_version}.",
                     category=MPRestWarning,
                     stacklevel=2,
-                ) 
+                )

mp_api/client/routes/_server.py

@@ -146,7 +146,7 @@ def create_user_settings(
         Returns:
             Dictionary with consumer_id and write status.
         """
-        return self._post_resource(
+        return self._post_resource(  # type: ignore[return-value]
             body=settings, params={"consumer_id": consumer_id}
         ).get("data")
 
@@ -216,6 +216,6 @@ def get_user_settings(
         Raises:
             MPRestError.
         """
-        return self._query_resource(
+        return self._query_resource(  # type: ignore[return-value]
             suburl=f"{consumer_id}", fields=fields, num_chunks=1, chunk_size=1
         ).get("data")

tests/client/test_mprester.py

@@ -627,19 +627,18 @@ def test_monty_decode_warning(self):
             MPRester(monty_decode=False)
 
     def test_db_warning(self, monkeypatch: pytest.MonkeyPatch):
-
         from pathlib import Path
         import yaml
         from mp_api.client.core.settings import MAPI_CLIENT_SETTINGS
 
         with NamedTemporaryFile(suffix=".yaml") as tmp_log:
-            monkeypatch.setattr(MAPI_CLIENT_SETTINGS,"LOG_FILE",Path(tmp_log.name))
+            monkeypatch.setattr(MAPI_CLIENT_SETTINGS, "LOG_FILE", Path(tmp_log.name))
 
-            with MPRester(notify_db_version = True) as mpr:
+            with MPRester(notify_db_version=True) as mpr:
                 db_version = mpr.get_database_version()
 
-            parsed_db_ver = yaml.safe_load(
-                Path(tmp_log.name).read_text()
-            ).get("MAPI_DB_VERSION") 
+            parsed_db_ver = yaml.safe_load(Path(tmp_log.name).read_text()).get(
+                "MAPI_DB_VERSION"
+            )
             assert parsed_db_ver == db_version
-            assert isinstance(parsed_db_ver,str)
+            assert isinstance(parsed_db_ver, str)