chore: update login error message (#4952)

* chore: refine error messageg

* chore: fix by comments

* ci: auto fixes from pre-commit.ci

For more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Aaron Pham <[email protected]>

src/bentoml/_internal/cloud/bentocloud.py

@@ -536,7 +536,7 @@ def pull_model(model_tag: Tag):
                 with response_ctx as response:
                     if response.status_code != 200:
                         raise BentoMLException(
-                            f'Failed to download bento "{_tag}": {response.text}'
+                            f'Failed to download bento "{_tag}", status_code: {response.status_code}'
                         )
                     total_size_in_bytes = int(response.headers.get("content-length", 0))
                     block_size = 1024  # 1 Kibibyte

src/bentoml/_internal/cloud/config.py

@@ -79,7 +79,7 @@ def get_context(self, context: t.Optional[str] = None) -> CloudClientContext:
             if ctx.name == context:
                 return ctx
         raise CloudRESTApiClientError(
-            f"BentoCloud API token for {context} cloud context is required.",
+            f"No cloud context {context} found",
             error_code=HTTPStatus.UNAUTHORIZED,
         )
 

src/bentoml_cli/cloud.py

@@ -73,7 +73,7 @@ def login(endpoint: str, api_token: str) -> None:  # type: ignore (not accessed)
             encodedCallback = urllib.parse.quote(callback_server.callback_url)
             authURL = f"{baseURL}?callback={encodedCallback}"
             if Confirm.ask(
-                f"Please Enter Y or N to open [blue]{authURL}[/] in your browser..."
+                f"Please Enter Y to open [blue]{authURL}[/] in your browser..."
             ):
                 if webbrowser.open_new_tab(authURL):
                     rich.print(f"✅ Opened [blue]{authURL}[/] in your web browser.")

src/bentoml_cli/deployment.py

@@ -27,9 +27,7 @@
 def raise_deployment_config_error(err: BentoMLException, action: str) -> t.NoReturn:
     if err.error_code == HTTPStatus.UNAUTHORIZED:
         raise BentoMLException(
-            f"{err}\n* BentoCloud sign up: https://cloud.bentoml.com/\n"
-            "* Login with your API token: "
-            "https://docs.bentoml.com/en/latest/bentocloud/how-tos/manage-access-token.html"
+            f"{err}\n* BentoCloud API token is required for authorization. Run `bentoml cloud login` command to login"
         ) from None
     raise BentoMLException(
         f"Failed to {action} deployment due to invalid configuration: {err}"
@@ -609,7 +607,10 @@ def list_command(  # type: ignore
     output: t.Literal["json", "yaml", "table"],
 ) -> None:
     """List existing deployments on BentoCloud."""
-    d_list = Deployment.list(cluster=cluster, search=search)
+    try:
+        d_list = Deployment.list(cluster=cluster, search=search)
+    except BentoMLException as e:
+        raise_deployment_config_error(e, "list")
     res: list[dict[str, t.Any]] = [d.to_dict() for d in d_list]
     if output == "table":
         table = Table(box=None, expand=True)
@@ -649,7 +650,10 @@ def list_instance_types(  # type: ignore
     output: t.Literal["json", "yaml", "table"],
 ) -> None:
     """List existing instance types in cluster on BentoCloud."""
-    d_list = Deployment.list_instance_types(cluster=cluster)
+    try:
+        d_list = Deployment.list_instance_types(cluster=cluster)
+    except BentoMLException as e:
+        raise_deployment_config_error(e, "list_instance_types")
     res: list[dict[str, t.Any]] = [d.to_dict() for d in d_list]
     if output == "table":
         table = Table(box=None, expand=True)

src/bentoml_cli/secret.py

@@ -43,7 +43,10 @@ def list(
     output: t.Literal["json", "yaml", "table"],
 ):
     """List all secrets on BentoCloud."""
-    secrets = Secret.list(search=search)
+    try:
+        secrets = Secret.list(search=search)
+    except BentoMLException as e:
+        raise_secret_error(e, "list")
     if output == "table":
         table = Table(box=None, expand=True)
         table.add_column("Secret", overflow="fold")
@@ -137,10 +140,8 @@ def parse_from_file_argument_callback(
 def raise_secret_error(err: BentoMLException, action: str) -> t.NoReturn:
     if err.error_code == HTTPStatus.UNAUTHORIZED:
         raise BentoMLException(
-            f"{err}\n* BentoCloud sign up: https://cloud.bentoml.com/\n"
-            "* Login with your API token: "
-            "https://docs.bentoml.com/en/latest/bentocloud/how-tos/manage-access-token.html"
-        )
+            f"{err}\n* BentoCloud API token is required for authorization. Run `bentoml cloud login` command to login"
+        ) from None
     raise BentoMLException(f"Failed to {action} secret due to: {err}")
 
 
@@ -232,7 +233,7 @@ def create(
             key_vals=key_vals,
         )
         rich.print(f"Secret [green]{secret.name}[/] created successfully")
-    except Exception as e:
+    except BentoMLException as e:
         raise_secret_error(e, "create")
 
 
@@ -248,7 +249,7 @@ def delete(name: str):
     try:
         Secret.delete(name=name)
         rich.print(f"Secret [green]{name}[/] deleted successfully")
-    except Exception as e:
+    except BentoMLException as e:
         raise_secret_error(e, "delete")
 
 
@@ -335,5 +336,5 @@ def apply(
             key_vals=key_vals,
         )
         rich.print(f"Secret [green]{secret.name}[/] applied successfully")
-    except Exception as e:
+    except BentoMLException as e:
         raise_secret_error(e, "apply")