using model_validator on GRLSettings. Allows null default values, then to asser them on load. Required so pydantic_settings can be loaded in tests without params

1 files changed, 5 insertions, 7 deletions

diff --git a/jb/managers/gr_api.py b/jb/managers/gr_api.py
index 494ceea..70c6a60 100644
--- a/jb/managers/gr_api.py
+++ b/jb/managers/gr_api.py
@@ -1,14 +1,12 @@
 """Client for General Research's product-user API."""
 
-import logging
 from typing import Any
 
 import requests
 
+from jb.decorators import LOG
 from jb.models.auth import User
 
-logger = logging.getLogger(__name__)
-
 
 class GRApiError(RuntimeError):
     """The General Research API could not satisfy a request."""
@@ -60,7 +58,7 @@ class GRApiManager:
                 f"General Research API request failed: {method} {url}"
             ) from exc
 
-    def _parse_user_response(self, res: dict) -> User:
+    def _parse_user_response(self, res: dict[str, Any]) -> User:
         return User.model_validate(
             {
                 "product_user_id": res["product_user_id"],
@@ -98,7 +96,7 @@ class GRApiManager:
         """This should only be called once per user upon account creation.
         A user cannot change their email address."""
         url = f"{self.base_url}/{self.product_id}/user/{user.product_user_id}/metadata/"
-        res = self._request(
+        _ = self._request(
             "PATCH",
             url,
             json={"email_address": str(user.email)},
@@ -110,7 +108,7 @@ class GRApiManager:
         if user.display_name is None:
             return user
         url = f"{self.base_url}/{self.product_id}/user/{user.product_user_id}/metadata/"
-        res = self._request(
+        _ = self._request(
             "PATCH",
             url,
             json={"display_name": user.display_name},
@@ -145,7 +143,7 @@ class GRApiManager:
             raise
         self.set_user_email(user)
         transitioned_user = self.get_user(user.product_user_id)
-        logger.warning(
+        LOG.warning(
             "Transitioned product user from AMT worker %s to %s with email %s",
             amt_worker_id,
             transitioned_user.product_user_id,