diff --git a/metaflow/cli.py b/metaflow/cli.py index 971ac1bf6d6..d1c5c2583dc 100644 --- a/metaflow/cli.py +++ b/metaflow/cli.py @@ -58,6 +58,7 @@ def echo_dev_null(*args, **kwargs): def echo_always(line, **kwargs): + kwargs.setdefault("color", True) if kwargs.pop("wrap", False): import textwrap @@ -113,10 +114,12 @@ def logger(body="", system_msg=False, head="", bad=False, timestamp=True, nl=Tru else: dt = timestamp tstamp = dt.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3] - click.secho(tstamp + " ", fg=LOGGER_TIMESTAMP, nl=False) + click.secho(tstamp + " ", fg=LOGGER_TIMESTAMP, nl=False, color=True) if head: - click.secho(head, fg=LOGGER_COLOR, nl=False) - click.secho(body, bold=system_msg, fg=LOGGER_BAD_COLOR if bad else None, nl=nl) + click.secho(head, fg=LOGGER_COLOR, nl=False, color=True) + click.secho( + body, bold=system_msg, fg=LOGGER_BAD_COLOR if bad else None, nl=nl, color=True + ) @click.group( diff --git a/metaflow/cmd/configure_cmd.py b/metaflow/cmd/configure_cmd.py index d4ef1a5a541..1f7f1f6b377 100644 --- a/metaflow/cmd/configure_cmd.py +++ b/metaflow/cmd/configure_cmd.py @@ -813,6 +813,7 @@ def azure(ctx, profile): " or a self-managed Kubernetes cluster on Azure VMs." + " If/when your Kubernetes cluster is ready for use," " please run 'metaflow configure kubernetes'.", + color=True, ) @@ -854,6 +855,7 @@ def gcp(ctx, profile): " or a self-managed Kubernetes cluster on Google Compute Engine VMs." + " If/when your Kubernetes cluster is ready for use," " please run 'metaflow configure kubernetes'.", + color=True, ) @@ -939,7 +941,8 @@ def kubernetes(ctx, profile): if existing_env.get("METAFLOW_DEFAULT_DATASTORE") == "local": click.echo( "\nCannot run Kubernetes with local datastore. Please run" - " 'metaflow configure aws' or 'metaflow configure azure'." + " 'metaflow configure aws' or 'metaflow configure azure'.", + color=True, ) click.Abort() diff --git a/metaflow/cmd/util.py b/metaflow/cmd/util.py index ceff9869c25..51dfe0ebd86 100644 --- a/metaflow/cmd/util.py +++ b/metaflow/cmd/util.py @@ -20,4 +20,5 @@ def echo_dev_null(*args, **kwargs): def echo_always(line, **kwargs): + kwargs.setdefault("color", True) click.secho(line, **kwargs) diff --git a/metaflow/plugins/logs_cli.py b/metaflow/plugins/logs_cli.py index b5314bf40b6..a6732e68845 100644 --- a/metaflow/plugins/logs_cli.py +++ b/metaflow/plugins/logs_cli.py @@ -174,6 +174,7 @@ def show( if ds_list: def echo_unicode(line, **kwargs): + kwargs.setdefault("color", True) click.secho(line.decode("UTF-8", errors="replace"), **kwargs) # old style logs are non mflog-style logs @@ -196,7 +197,9 @@ def echo_unicode(line, **kwargs): if timestamps: ts = mflog.utc_to_local(line.utc_tstamp) tstamp = ts.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3] - click.secho(tstamp + " ", fg=LOGGER_TIMESTAMP, nl=False) + click.secho( + tstamp + " ", fg=LOGGER_TIMESTAMP, nl=False, color=True + ) echo_unicode(line.msg) maybe_old_style = False elif maybe_old_style: