wandb 0.19.4rc1__py3-none-musllinux_1_2_aarch64.whl → 0.19.6rc4__py3-none-musllinux_1_2_aarch64.whl

wandb/sdk/wandb_setup.py

@@ -177,42 +177,30 @@ class _WandbSetup:
     def _get_entity(self) -> str | None:
         if self._settings and self._settings._offline:
             return None
-        if self._server is None:
-            self._load_viewer()
-        assert self._server is not None
-        entity = self._server._viewer.get("entity")
+        entity = self.viewer.get("entity")
         return entity
 
     def _get_username(self) -> str | None:
         if self._settings and self._settings._offline:
             return None
-        if self._server is None:
-            self._load_viewer()
-        assert self._server is not None
-        return self._server._viewer.get("username")
+        return self.viewer.get("username")
 
     def _get_teams(self) -> list[str]:
         if self._settings and self._settings._offline:
             return []
-        if self._server is None:
-            self._load_viewer()
-        assert self._server is not None
-        teams = self._server._viewer.get("teams")
+        teams = self.viewer.get("teams")
         if teams:
             teams = [team["node"]["name"] for team in teams["edges"]]
         return teams or []
 
-    def _load_viewer(self) -> None:
-        if self._settings and self._settings._offline:
-            return
-        s = server.Server(settings=self._settings)
-        s.query_with_timeout()
-        self._server = s
-
-    def _load_user_settings(self) -> dict[str, Any] | None:
+    @property
+    def viewer(self) -> dict[str, Any]:
         if self._server is None:
-            self._load_viewer()
+            self._server = server.Server(settings=self._settings)
 
+        return self._server.viewer
+
+    def _load_user_settings(self) -> dict[str, Any] | None:
         # offline?
         if self._server is None:
             return None
@@ -222,7 +210,7 @@ class _WandbSetup:
         if "code_saving_enabled" in flags:
             user_settings["save_code"] = flags["code_saving_enabled"]
 
-        email = self._server._viewer.get("email", None)
+        email = self.viewer.get("email", None)
         if email:
             user_settings["email"] = email
 

wandb/util.py

@@ -854,20 +854,52 @@ def no_retry_4xx(e: Exception) -> bool:
 
 
 def parse_backend_error_messages(response: requests.Response) -> List[str]:
-    errors: List[str] = []
+    """Returns error messages stored in a backend response.
+
+    If the response is not in an expected format, an empty list is returned.
+
+    Args:
+        response: A response to an HTTP request to the W&B server.
+    """
     try:
         data = response.json()
-    except ValueError:
-        return errors
+    except requests.JSONDecodeError:
+        return []
+
+    if not isinstance(data, dict):
+        return []
 
-    if "errors" in data and isinstance(data["errors"], list):
-        for error in data["errors"]:
-            # Our tests and potentially some api endpoints return a string error?
-            if isinstance(error, str):
-                error = {"message": error}
-            if "message" in error:
-                errors.append(error["message"])
-    return errors
+    # Backend error values are returned in one of two ways:
+    # - A string containing the error message
+    # - A JSON object with a "message" field that is a string
+    def get_message(err: Any) -> Optional[str]:
+        if isinstance(error, str):
+            return error
+        elif (
+            isinstance(error, dict)
+            and (message := error.get("message"))
+            and isinstance(message, str)
+        ):
+            return message
+        else:
+            return None
+
+    # The response can contain an "error" field with a single error
+    # or an "errors" field with a list of errors.
+    if error := data.get("error"):
+        message = get_message(error)
+        return [message] if message else []
+
+    elif (errors := data.get("errors")) and isinstance(errors, list):
+        messages: List[str] = []
+        for error in errors:
+            message = get_message(error)
+            if message:
+                messages.append(message)
+        return messages
+
+    else:
+        return []
 
 
 def no_retry_auth(e: Any) -> bool:
@@ -1266,7 +1298,7 @@ def prompt_choices(
 ) -> str:
     """Allow a user to choose from a list of options."""
     for i, choice in enumerate(choices):
-        wandb.termlog(f"({i+1}) {choice}")
+        wandb.termlog(f"({i + 1}) {choice}")
 
     idx = -1
     while idx < 0 or idx > len(choices) - 1:

{wandb-0.19.4rc1.dist-info → wandb-0.19.6rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wandb
-Version: 0.19.4rc1
+Version: 0.19.6rc4
 Summary: A CLI and library for interacting with the Weights & Biases API.
 Project-URL: Source, https://github.com/wandb/wandb
 Project-URL: Bug Reports, https://github.com/wandb/wandb/issues