Skip to content

Commit bbcd01f

Browse files
authored
[dashboard] apply isort to dashboard dir (ray-project#46483)
sorting mostly imports Signed-off-by: Lonnie Liu <[email protected]>
1 parent 33ee732 commit bbcd01f

File tree

80 files changed

+450
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+450
-488
lines changed

.isort.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ filter_files=True
1919
# python/ray/setup-dev.py
2020
# For the rest we will gradually remove them from the blacklist as we
2121
# reformat the code to follow the style guide.
22-
skip_glob=doc/*,python/ray/__init__.py,python/ray/setup-dev.py,python/build/*,python/ray/cloudpickle/*,python/ray/thirdparty_files/*,python/ray/_private/thirdparty/*,python/ray/_private/runtime_env/agent/thirdparty_files/*,python/ray/dag/*.py,ci/*,python/ray/_private/*,dashboard/*,python/ray/includes/*,python/ray/internal/*,python/ray/ray_operator/*,python/ray/scripts/*,python/ray/serve/generated/serve_pb2.py,python/ray/streaming/*,python/ray/tests/*,python/ray/tests/*,python/ray/util/*,python/ray/workers/*,python/ray/workflow/*,rllib/*,release/*,
22+
skip_glob=doc/*,python/ray/__init__.py,python/ray/setup-dev.py,python/build/*,python/ray/cloudpickle/*,python/ray/thirdparty_files/*,python/ray/_private/thirdparty/*,python/ray/_private/runtime_env/agent/thirdparty_files/*,python/ray/dag/*.py,ci/*,python/ray/_private/*,python/ray/includes/*,python/ray/internal/*,python/ray/ray_operator/*,python/ray/scripts/*,python/ray/serve/generated/serve_pb2.py,python/ray/streaming/*,python/ray/tests/*,python/ray/tests/*,python/ray/util/*,python/ray/workers/*,python/ray/workflow/*,rllib/*,release/*,
2323

2424
known_local_folder=ray
2525
known_afterray=psutil,setproctitle

dashboard/agent.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,19 @@
55
import logging.handlers
66
import os
77
import pathlib
8-
import sys
98
import signal
9+
import sys
1010

1111
import ray
1212
import ray._private.ray_constants as ray_constants
1313
import ray._private.services
1414
import ray._private.utils
1515
import ray.dashboard.consts as dashboard_consts
1616
import ray.dashboard.utils as dashboard_utils
17-
from ray._private.process_watcher import create_check_raylet_task
1817
from ray._private.gcs_utils import GcsAioClient
19-
from ray._private.ray_logging import (
20-
setup_component_logger,
21-
configure_log_file,
22-
)
18+
from ray._private.process_watcher import create_check_raylet_task
2319
from ray._private.ray_constants import AGENT_GRPC_MAX_MESSAGE_LENGTH
20+
from ray._private.ray_logging import configure_log_file, setup_component_logger
2421

2522
logger = logging.getLogger(__name__)
2623

dashboard/consts.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os
2-
from ray._private.ray_constants import env_integer, env_bool
2+
3+
from ray._private.ray_constants import env_bool, env_integer
34

45
DASHBOARD_LOG_FILENAME = "dashboard.log"
56
DASHBOARD_AGENT_PORT_PREFIX = "DASHBOARD_AGENT_PORT_PREFIX:"

dashboard/dashboard.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import argparse
22
import logging
33
import logging.handlers
4+
import os
45
import platform
5-
import traceback
66
import signal
7-
import os
87
import sys
8+
import traceback
9+
from typing import Optional, Set
910

1011
import ray._private.ray_constants as ray_constants
1112
import ray._private.services
@@ -14,7 +15,6 @@
1415
import ray.dashboard.head as dashboard_head
1516
import ray.dashboard.utils as dashboard_utils
1617
from ray._private.ray_logging import setup_component_logger
17-
from typing import Optional, Set
1818

1919
# Logger for this module. It should be configured at the entry point
2020
# into the program using Ray. Ray provides a default configuration at

dashboard/dashboard_metrics.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from typing import Optional
2+
23
from ray.dashboard.consts import COMPONENT_METRICS_TAG_KEYS
34

45

@@ -17,7 +18,7 @@ def inc(self, *args, **kwargs):
1718

1819
try:
1920

20-
from prometheus_client import CollectorRegistry, Counter, Histogram, Gauge
21+
from prometheus_client import CollectorRegistry, Counter, Gauge, Histogram
2122

2223
# The metrics in this class should be kept in sync with
2324
# python/ray/tests/test_metrics_agent.py

dashboard/datacenter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import asyncio
22
import logging
3-
import ray.dashboard.consts as dashboard_consts
43

4+
import ray.dashboard.consts as dashboard_consts
55
from ray.dashboard.utils import (
66
Dict,
77
MutableNotificationDict,

dashboard/head.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
import asyncio
22
import logging
33
import os
4-
from pathlib import Path
54
import threading
65
from concurrent.futures import Future
6+
from pathlib import Path
77
from queue import Queue
8+
from typing import Optional, Set
89

910
import ray.dashboard.consts as dashboard_consts
1011
import ray.dashboard.utils as dashboard_utils
1112
import ray.experimental.internal_kv as internal_kv
12-
from ray._private.usage.usage_lib import TagKey, record_extra_usage_tag
1313
from ray._private import ray_constants
14-
from ray.dashboard.utils import DashboardHeadModule
14+
from ray._private.usage.usage_lib import TagKey, record_extra_usage_tag
1515
from ray._raylet import GcsClient, check_health
16-
from ray.dashboard.datacenter import DataOrganizer
17-
from ray.dashboard.utils import async_loop_forever
1816
from ray.dashboard.consts import DASHBOARD_METRIC_PORT
1917
from ray.dashboard.dashboard_metrics import DashboardPrometheusMetrics
20-
21-
from typing import Optional, Set
18+
from ray.dashboard.datacenter import DataOrganizer
19+
from ray.dashboard.utils import DashboardHeadModule, async_loop_forever
2220

2321
try:
2422
import prometheus_client

dashboard/http_server_agent.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import logging
2-
from ray._private.utils import get_or_create_event_loop
32

43
from packaging.version import Version
54

65
import ray.dashboard.optional_utils as dashboard_optional_utils
7-
6+
from ray._private.utils import get_or_create_event_loop
87
from ray.dashboard.optional_deps import aiohttp, aiohttp_cors, hdrs
98

109
logger = logging.getLogger(__name__)

dashboard/modules/actor/actor_head.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,15 @@
22
import logging
33
import os
44
import time
5-
65
from collections import deque
76

87
import aiohttp.web
98

109
import ray.dashboard.optional_utils as dashboard_optional_utils
1110
import ray.dashboard.utils as dashboard_utils
1211
from ray._private.gcs_pubsub import GcsAioActorSubscriber
13-
from ray.core.generated import (
14-
gcs_service_pb2,
15-
gcs_service_pb2_grpc,
16-
)
17-
from ray.dashboard.datacenter import DataSource, DataOrganizer
12+
from ray.core.generated import gcs_service_pb2, gcs_service_pb2_grpc
13+
from ray.dashboard.datacenter import DataOrganizer, DataSource
1814
from ray.dashboard.modules.actor import actor_consts
1915

2016
logger = logging.getLogger(__name__)

dashboard/modules/dashboard_sdk.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
import dataclasses
22
import importlib
3-
import logging
43
import json
4+
import logging
55
import os
6-
import yaml
7-
from pathlib import Path
6+
import ssl
87
import tempfile
8+
from pathlib import Path
99
from typing import Any, Dict, List, Optional, Union
10-
import packaging.version
11-
import ray
12-
import ssl
13-
14-
try:
15-
import requests
16-
except ImportError:
17-
requests = None
1810

11+
import packaging.version
12+
import yaml
1913

14+
import ray
2015
from ray._private.runtime_env.packaging import (
2116
create_package,
2217
get_uri_for_directory,
2318
get_uri_for_package,
2419
)
2520
from ray._private.runtime_env.py_modules import upload_py_modules_if_needed
2621
from ray._private.runtime_env.working_dir import upload_working_dir_if_needed
27-
from ray.dashboard.modules.job.common import uri_to_http_components
28-
29-
from ray.util.annotations import DeveloperAPI, PublicAPI
3022
from ray._private.utils import split_address
3123
from ray.autoscaler._private.cli_logger import cli_logger
24+
from ray.dashboard.modules.job.common import uri_to_http_components
25+
from ray.util.annotations import DeveloperAPI, PublicAPI
26+
27+
try:
28+
import requests
29+
except ImportError:
30+
requests = None
31+
3232

3333
logger = logging.getLogger(__name__)
3434
logger.setLevel(logging.INFO)

0 commit comments

Comments
 (0)