diff --git a/distributed/dashboard/components/__init__.py b/distributed/dashboard/components/__init__.py index 7c891d96119..f0798417cd9 100644 --- a/distributed/dashboard/components/__init__.py +++ b/distributed/dashboard/components/__init__.py @@ -30,7 +30,7 @@ from distributed import profile from distributed.dashboard.utils import BOKEH_VERSION, without_property_validation -from distributed.utils import log_errors, parse_timedelta +from distributed.utils import log_errors if dask.config.get("distributed.dashboard.export-tool"): from distributed.dashboard.export_tool import ExportTool @@ -39,7 +39,7 @@ profile_interval = dask.config.get("distributed.worker.profile.interval") -profile_interval = parse_timedelta(profile_interval, default="ms") +profile_interval = dask.utils.parse_timedelta(profile_interval, default="ms") class DashboardComponent: diff --git a/distributed/dashboard/components/scheduler.py b/distributed/dashboard/components/scheduler.py index 7f197aa54d2..8a0bda4b3ef 100644 --- a/distributed/dashboard/components/scheduler.py +++ b/distributed/dashboard/components/scheduler.py @@ -43,7 +43,7 @@ import dask from dask import config -from dask.utils import format_bytes, key_split +from dask.utils import format_bytes, format_time, key_split, parse_timedelta try: import numpy as np @@ -70,7 +70,7 @@ from distributed.diagnostics.task_stream import color_of as ts_color_of from distributed.diagnostics.task_stream import colors as ts_color_lookup from distributed.metrics import time -from distributed.utils import Log, format_time, log_errors, parse_timedelta +from distributed.utils import Log, log_errors if dask.config.get("distributed.dashboard.export-tool"): from distributed.dashboard.export_tool import ExportTool diff --git a/distributed/dashboard/components/shared.py b/distributed/dashboard/components/shared.py index f50145f0dbb..360f4433aa7 100644 --- a/distributed/dashboard/components/shared.py +++ b/distributed/dashboard/components/shared.py @@ -28,7 +28,7 @@ update, without_property_validation, ) -from distributed.utils import log_errors, parse_timedelta +from distributed.utils import log_errors if dask.config.get("distributed.dashboard.export-tool"): from distributed.dashboard.export_tool import ExportTool @@ -37,7 +37,7 @@ profile_interval = dask.config.get("distributed.worker.profile.interval") -profile_interval = parse_timedelta(profile_interval, default="ms") +profile_interval = dask.utils.parse_timedelta(profile_interval, default="ms") class Processing(DashboardComponent): diff --git a/distributed/dashboard/components/worker.py b/distributed/dashboard/components/worker.py index 9266e1f2766..e664cd4cae5 100644 --- a/distributed/dashboard/components/worker.py +++ b/distributed/dashboard/components/worker.py @@ -20,7 +20,7 @@ from bokeh.themes import Theme from tlz import merge, partition_all -from dask.utils import format_bytes +from dask.utils import format_bytes, format_time from distributed.dashboard.components import add_periodic_callback from distributed.dashboard.components.shared import ( @@ -32,7 +32,7 @@ from distributed.dashboard.utils import transpose, update, without_property_validation from distributed.diagnostics.progress_stream import color_of from distributed.metrics import time -from distributed.utils import format_time, key_split, log_errors +from distributed.utils import key_split, log_errors logger = logging.getLogger(__name__) diff --git a/distributed/diagnostics/task_stream.py b/distributed/diagnostics/task_stream.py index e276c477776..fab787ae07c 100644 --- a/distributed/diagnostics/task_stream.py +++ b/distributed/diagnostics/task_stream.py @@ -2,9 +2,10 @@ from collections import deque import dask +from dask.utils import format_time, parse_timedelta from ..metrics import time -from ..utils import format_time, key_split, parse_timedelta +from ..utils import key_split from .plugin import SchedulerPlugin from .progress_stream import color_of diff --git a/distributed/http/scheduler/info.py b/distributed/http/scheduler/info.py index 588fbc1505f..44197141e9e 100644 --- a/distributed/http/scheduler/info.py +++ b/distributed/http/scheduler/info.py @@ -8,11 +8,11 @@ from tornado import escape from tornado.websocket import WebSocketHandler -from dask.utils import format_bytes +from dask.utils import format_bytes, format_time from ...diagnostics.websocket import WebsocketPlugin from ...metrics import time -from ...utils import format_time, log_errors +from ...utils import log_errors from ..utils import RequestHandler, redirect ns = {