[WB-6865] ensure captive key input even if user presses enter

tests/test_cli.py

@@ -981,3 +981,22 @@ def test_sync_wandb_run_and_tensorboard(runner, live_mock_server):
             "WARNING Found .wandb file, not streaming tensorboard metrics"
             in result.output
         )
+
+
+def test_cli_login_reprompts_when_no_key_specified(
+    mocker, runner, empty_netrc, local_netrc
+):
+    with runner.isolated_filesystem():
+        mocker.patch("wandb.wandb_lib.apikey.getpass.getpass", input)
+        # this first gives login an empty API key, which should cause
+        # it to reprompt.  this is what we are testing.  we then give
+        # it a valid API key (the dummy API key with a different final
+        # letter to check that our monkeypatch input is working as
+        # expected) to terminate the prompt finally we grep for the
+        # Error: No API key specified to assert that the reprompt
+        # happened
+        result = runner.invoke(cli.login, input=f"\n{DUMMY_API_KEY[:-1]}q\n")
+        debug_result(result, "login")
+        with open("netrc", "r") as f:
+            print(f.read())
+        assert "ERROR No API key specified." in result.output

wandb/sdk/lib/apikey.py

@@ -94,7 +94,10 @@ def prompt_api_key(  # noqa: C901
             choices, input_timeout=settings.login_timeout, jupyter=jupyter
         )
 
-    api_ask = "%s: Paste an API key from your profile and hit enter: " % log_string
+    api_ask = (
+        "%s: Paste an API key from your profile and hit enter, or press ctrl+c to quit: "
+        % log_string
+    )
     if result == LOGIN_CHOICE_ANON:
         key = api.create_anonymous_api_key()
 
@@ -126,6 +129,8 @@ def prompt_api_key(  # noqa: C901
     elif result == LOGIN_CHOICE_NOTTY:
         # TODO: Needs refactor as this needs to be handled by caller
         return False
+    elif result == LOGIN_CHOICE_DRYRUN:
+        return None
     else:
         # Jupyter environments don't have a tty, but we can still try logging in using
         # the browser callback if one is supplied.
@@ -200,7 +205,7 @@ def write_netrc(host, entity, key):
 
 def write_key(settings, key, api=None, anonymous=False):
     if not key:
-        return
+        raise ValueError("No API key specified.")
 
     # TODO(jhr): api shouldn't be optional or it shouldnt be passed, clean up callers
     api = api or InternalApi()

wandb/sdk/wandb_login.py

@@ -177,26 +177,27 @@ def update_session(
     def _prompt_api_key(self) -> Tuple[Optional[str], ApiKeyStatus]:
 
         api = Api(self._settings)
-        try:
-            key = apikey.prompt_api_key(
-                self._settings,
-                api=api,
-                no_offline=self._settings.force if self._settings else None,
-                no_create=self._settings.force if self._settings else None,
-            )
-        except ValueError as e:
-            # invalid key provided, try again
-            wandb.termerror(e.args[0])
-            return self._prompt_api_key()
-
-        except TimeoutError:
-            wandb.termlog("W&B disabled due to login timeout.")
-            return None, ApiKeyStatus.DISABLED
-        if key is False:
-            return None, ApiKeyStatus.NOTTY
-        if not key:
-            return None, ApiKeyStatus.OFFLINE
-        return key, ApiKeyStatus.VALID
+        while True:
+            try:
+                key = apikey.prompt_api_key(
+                    self._settings,
+                    api=api,
+                    no_offline=self._settings.force if self._settings else None,
+                    no_create=self._settings.force if self._settings else None,
+                )
+            except ValueError as e:
+                # invalid key provided, try again
+                wandb.termerror(e.args[0])
+                continue
+            except TimeoutError:
+                wandb.termlog("W&B disabled due to login timeout.")
+                return None, ApiKeyStatus.DISABLED
+            if key is False:
+                return None, ApiKeyStatus.NOTTY
+            if not key:
+                return None, ApiKeyStatus.OFFLINE
+            else:
+                return key, ApiKeyStatus.VALID
 
     def prompt_api_key(self):
         key, status = self._prompt_api_key()