[dashboard] Rename "new_dashboard" -> "dashboard" (ray-project#18214)

.buildkite/pipeline.macos.yml

@@ -65,7 +65,7 @@ steps:
  - *prelude_commands
  - TORCH_VERSION=1.6 ./ci/travis/install-dependencies.sh
  - bazel test --config=ci --test_env=CI $(./scripts/bazel_export_options) --build_tests_only --test_tag_filters=-flaky,-flaky-mac --
- //:all python/ray/serve/... python/ray/new_dashboard/... -rllib/... -core_worker_test
+ //:all python/ray/serve/... python/ray/dashboard/... -rllib/... -core_worker_test
  - *epilogue_commands
 
 - label: ":mac: :apple: Worker"

.buildkite/pipeline.yml

@@ -181,7 +181,7 @@
  - cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/travis/upload_build_info.sh; fi }; trap cleanup EXIT
  - TORCH_VERSION=1.6 ./ci/travis/install-dependencies.sh
  - ./dashboard/tests/run_ui_tests.sh
- - bazel test --config=ci $(./scripts/bazel_export_options) python/ray/new_dashboard/...
+ - bazel test --config=ci $(./scripts/bazel_export_options) python/ray/dashboard/...
  - bazel test --config=ci $(./scripts/bazel_export_options) python/ray/serve/...
 
 - label: ":python: Minimal install"

BUILD.bazel

@@ -2171,7 +2171,7 @@ filegroup(
  "python/ray/core/generated/__init__.py",
  "python/ray/core/generated/ray/__init__.py",
  "python/ray/core/generated/ray/protocol/__init__.py",
- "python/ray/new_dashboard/**/*.py",
+ "python/ray/dashboard/**/*.py",
  "python/ray/experimental/*.py",
  "python/ray/util/*.py",
  "python/ray/internal/*.py",

ci/travis/ci.sh

@@ -240,7 +240,7 @@ build_dashboard_front_end() {
  { echo "WARNING: Skipping dashboard due to NPM incompatibilities with Windows"; } 2> /dev/null
  else
  (
- cd ray/new_dashboard/client
+ cd ray/dashboard/client
 
  # skip nvm activation on buildkite linux instances.
  if [ -z "${BUILDKITE-}" ] || [[ "${OSTYPE}" != linux* ]]; then
@@ -403,7 +403,7 @@ lint_bazel() {
 
 lint_web() {
  (
- cd "${WORKSPACE_DIR}"/python/ray/new_dashboard/client
+ cd "${WORKSPACE_DIR}"/python/ray/dashboard/client
  set +x # suppress set -x since it'll get very noisy here
 
  if [ -z "${BUILDKITE-}" ]; then

dashboard/agent.py

@@ -13,8 +13,8 @@
 from grpc.experimental import aio as aiogrpc
 
 import ray
-import ray.new_dashboard.consts as dashboard_consts
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.consts as dashboard_consts
+import ray.dashboard.utils as dashboard_utils
 import ray.ray_constants as ray_constants
 import ray._private.services
 import ray._private.utils
@@ -26,7 +26,7 @@
 # All third-party dependencies that are not included in the minimal Ray
 # installation must be included in this file. This allows us to determine if
 # the agent has the necessary dependencies to be started.
-from ray.new_dashboard.optional_deps import aiohttp, aiohttp_cors, hdrs
+from ray.dashboard.optional_deps import aiohttp, aiohttp_cors, hdrs
 
 # Import psutil after ray so the packaged version is used.
 import psutil

dashboard/dashboard.py

@@ -9,9 +9,9 @@
 import platform
 import traceback
 
-import ray.new_dashboard.consts as dashboard_consts
-import ray.new_dashboard.head as dashboard_head
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.consts as dashboard_consts
+import ray.dashboard.head as dashboard_head
+import ray.dashboard.utils as dashboard_utils
 import ray.ray_constants as ray_constants
 import ray._private.services
 import ray._private.utils
@@ -21,7 +21,7 @@
 # All third-party dependencies that are not included in the minimal Ray
 # installation must be included in this file. This allows us to determine if
 # the agent has the necessary dependencies to be started.
-from ray.new_dashboard.optional_deps import aiohttp
+from ray.dashboard.optional_deps import aiohttp
 
 # Logger for this module. It should be configured at the entry point
 # into the program using Ray. Ray provides a default configuration at

dashboard/datacenter.py

@@ -1,10 +1,10 @@
 import logging
-import ray.new_dashboard.consts as dashboard_consts
-import ray.new_dashboard.memory_utils as memory_utils
+import ray.dashboard.consts as dashboard_consts
+import ray.dashboard.memory_utils as memory_utils
 # TODO(fyrestone): Not import from dashboard module.
-from ray.new_dashboard.modules.actor.actor_utils import \
+from ray.dashboard.modules.actor.actor_utils import \
  actor_classname_from_task_spec
-from ray.new_dashboard.utils import Dict, Signal, async_loop_forever
+from ray.dashboard.utils import Dict, Signal, async_loop_forever
 
 logger = logging.getLogger(__name__)
 

dashboard/head.py

@@ -9,19 +9,19 @@
 from grpc.experimental import aio as aiogrpc
 
 import ray._private.services
-import ray.new_dashboard.consts as dashboard_consts
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.consts as dashboard_consts
+import ray.dashboard.utils as dashboard_utils
 from ray import ray_constants
 from ray.core.generated import gcs_service_pb2
 from ray.core.generated import gcs_service_pb2_grpc
-from ray.new_dashboard.datacenter import DataOrganizer
-from ray.new_dashboard.utils import async_loop_forever
+from ray.dashboard.datacenter import DataOrganizer
+from ray.dashboard.utils import async_loop_forever
 from ray._raylet import connect_to_gcs
 
 # All third-party dependencies that are not included in the minimal Ray
 # installation must be included in this file. This allows us to determine if
 # the agent has the necessary dependencies to be started.
-from ray.new_dashboard.optional_deps import aiohttp, hdrs
+from ray.dashboard.optional_deps import aiohttp, hdrs
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable

dashboard/memory_utils.py

@@ -350,7 +350,7 @@ def memory_summary(state,
  line_wrap=True,
  unit="B",
  num_entries=None) -> str:
- from ray.new_dashboard.modules.node.node_head\
+ from ray.dashboard.modules.node.node_head\
  import node_stats_to_dict
 
  # Get terminal size

dashboard/modules/actor/actor_head.py

@@ -2,22 +2,22 @@
 import logging
 import aiohttp.web
 import ray._private.utils
-from ray.new_dashboard.modules.actor import actor_utils
+from ray.dashboard.modules.actor import actor_utils
 from aioredis.pubsub import Receiver
 from grpc.experimental import aio as aiogrpc
 
 import ray._private.gcs_utils as gcs_utils
-import ray.new_dashboard.utils as dashboard_utils
-from ray.new_dashboard.utils import rest_response
-from ray.new_dashboard.modules.actor import actor_consts
-from ray.new_dashboard.modules.actor.actor_utils import \
+import ray.dashboard.utils as dashboard_utils
+from ray.dashboard.utils import rest_response
+from ray.dashboard.modules.actor import actor_consts
+from ray.dashboard.modules.actor.actor_utils import \
  actor_classname_from_task_spec
 from ray.core.generated import node_manager_pb2_grpc
 from ray.core.generated import gcs_service_pb2
 from ray.core.generated import gcs_service_pb2_grpc
 from ray.core.generated import core_worker_pb2
 from ray.core.generated import core_worker_pb2_grpc
-from ray.new_dashboard.datacenter import DataSource, DataOrganizer
+from ray.dashboard.datacenter import DataSource, DataOrganizer
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable

dashboard/modules/actor/tests/test_actor.py

@@ -7,11 +7,11 @@
 import ray
 import pytest
 import redis
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.utils as dashboard_utils
 import ray.ray_constants as ray_constants
 import ray._private.gcs_utils as gcs_utils
-from ray.new_dashboard.tests.conftest import * # noqa
-from ray.new_dashboard.modules.actor import actor_consts
+from ray.dashboard.tests.conftest import * # noqa
+from ray.dashboard.modules.actor import actor_consts
 from ray._private.test_utils import (
  format_web_url,
  wait_until_server_available,

dashboard/modules/event/event_agent.py

@@ -4,12 +4,12 @@
 from typing import Union
 from grpc.experimental import aio as aiogrpc
 
-import ray.new_dashboard.utils as dashboard_utils
-import ray.new_dashboard.consts as dashboard_consts
+import ray.dashboard.utils as dashboard_utils
+import ray.dashboard.consts as dashboard_consts
 from ray.ray_constants import env_bool
-from ray.new_dashboard.utils import async_loop_forever, create_task
-from ray.new_dashboard.modules.event import event_consts
-from ray.new_dashboard.modules.event.event_utils import monitor_events
+from ray.dashboard.utils import async_loop_forever, create_task
+from ray.dashboard.modules.event import event_consts
+from ray.dashboard.modules.event.event_utils import monitor_events
 from ray.core.generated import event_pb2
 from ray.core.generated import event_pb2_grpc
 

dashboard/modules/event/event_head.py

@@ -6,16 +6,16 @@
 
 import aiohttp.web
 
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.utils as dashboard_utils
 from ray.ray_constants import env_bool
-from ray.new_dashboard.modules.event import event_consts
-from ray.new_dashboard.modules.event.event_utils import (
+from ray.dashboard.modules.event import event_consts
+from ray.dashboard.modules.event.event_utils import (
  parse_event_strings,
  monitor_events,
 )
 from ray.core.generated import event_pb2
 from ray.core.generated import event_pb2_grpc
-from ray.new_dashboard.datacenter import DataSource
+from ray.dashboard.datacenter import DataSource
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable

dashboard/modules/event/event_utils.py

@@ -8,8 +8,8 @@
 import collections
 import logging.handlers
 
-from ray.new_dashboard.modules.event import event_consts
-from ray.new_dashboard.utils import async_loop_forever, create_task
+from ray.dashboard.modules.event import event_consts
+from ray.dashboard.utils import async_loop_forever, create_task
 
 logger = logging.getLogger(__name__)
 

dashboard/modules/event/tests/test_event.py

@@ -14,15 +14,15 @@
 
 import ray
 from ray._private.utils import binary_to_hex
-from ray.new_dashboard.tests.conftest import * # noqa
-from ray.new_dashboard.modules.event import event_consts
+from ray.dashboard.tests.conftest import * # noqa
+from ray.dashboard.modules.event import event_consts
 from ray.core.generated import event_pb2
 from ray._private.test_utils import (
  format_web_url,
  wait_until_server_available,
  wait_for_condition,
 )
-from ray.new_dashboard.modules.event.event_utils import (
+from ray.dashboard.modules.event.event_utils import (
  monitor_events, )
 
 logger = logging.getLogger(__name__)

dashboard/modules/job/job_agent.py

@@ -13,10 +13,10 @@
 
 import attr
 from attr.validators import instance_of
-import ray.new_dashboard.utils as dashboard_utils
-from ray.new_dashboard.utils import create_task
-from ray.new_dashboard.modules.job import job_consts
-from ray.new_dashboard.modules.job.job_description import JobDescription
+import ray.dashboard.utils as dashboard_utils
+from ray.dashboard.utils import create_task
+from ray.dashboard.modules.job import job_consts
+from ray.dashboard.modules.job.job_description import JobDescription
 from ray.core.generated import job_agent_pb2
 from ray.core.generated import job_agent_pb2_grpc
 from ray.core.generated import agent_manager_pb2

dashboard/modules/job/job_head.py

@@ -7,15 +7,15 @@
 from grpc.experimental import aio as aiogrpc
 
 import ray._private.gcs_utils as gcs_utils
-import ray.new_dashboard.utils as dashboard_utils
-from ray.new_dashboard.modules.job import job_consts
-from ray.new_dashboard.modules.job.job_description import JobDescription
+import ray.dashboard.utils as dashboard_utils
+from ray.dashboard.modules.job import job_consts
+from ray.dashboard.modules.job.job_description import JobDescription
 from ray.core.generated import agent_manager_pb2
 from ray.core.generated import gcs_service_pb2
 from ray.core.generated import gcs_service_pb2_grpc
 from ray.core.generated import job_agent_pb2
 from ray.core.generated import job_agent_pb2_grpc
-from ray.new_dashboard.datacenter import (
+from ray.dashboard.datacenter import (
  DataSource,
  GlobalSignals,
 )

dashboard/modules/job/tests/test_job.py

@@ -11,8 +11,8 @@
 
 import ray
 from ray._private.utils import hex_to_binary
-from ray.new_dashboard.tests.conftest import * # noqa
-from ray.new_dashboard.modules.job import job_consts
+from ray.dashboard.tests.conftest import * # noqa
+from ray.dashboard.modules.job import job_consts
 from ray._private.test_utils import (
  format_web_url,
  wait_until_server_available,

dashboard/modules/log/log_agent.py

@@ -1,7 +1,7 @@
 import logging
 
-import ray.new_dashboard.modules.log.log_utils as log_utils
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.modules.log.log_utils as log_utils
+import ray.dashboard.utils as dashboard_utils
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable

dashboard/modules/log/log_head.py

@@ -1,9 +1,9 @@
 import logging
 
 import aiohttp.web
-import ray.new_dashboard.modules.log.log_utils as log_utils
-import ray.new_dashboard.utils as dashboard_utils
-from ray.new_dashboard.datacenter import DataSource, GlobalSignals
+import ray.dashboard.modules.log.log_utils as log_utils
+import ray.dashboard.utils as dashboard_utils
+from ray.dashboard.datacenter import DataSource, GlobalSignals
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable

dashboard/modules/log/log_utils.py

@@ -1,5 +1,5 @@
 import mimetypes
-import ray.new_dashboard.modules.log.log_consts as log_consts
+import ray.dashboard.modules.log.log_consts as log_consts
 
 
 def register_mimetypes():

dashboard/modules/log/tests/test_log.py

@@ -6,7 +6,7 @@
 import html.parser
 import urllib.parse
 
-from ray.new_dashboard.tests.conftest import * # noqa
+from ray.dashboard.tests.conftest import * # noqa
 import pytest
 import ray
 from ray._private.test_utils import (

dashboard/modules/node/node_head.py

@@ -8,16 +8,16 @@
 
 import ray._private.utils
 import ray._private.gcs_utils as gcs_utils
-from ray.new_dashboard.modules.node import node_consts
-import ray.new_dashboard.utils as dashboard_utils
-import ray.new_dashboard.consts as dashboard_consts
-from ray.new_dashboard.utils import async_loop_forever
-from ray.new_dashboard.memory_utils import GroupByType, SortingType
+from ray.dashboard.modules.node import node_consts
+import ray.dashboard.utils as dashboard_utils
+import ray.dashboard.consts as dashboard_consts
+from ray.dashboard.utils import async_loop_forever
+from ray.dashboard.memory_utils import GroupByType, SortingType
 from ray.core.generated import node_manager_pb2
 from ray.core.generated import node_manager_pb2_grpc
 from ray.core.generated import gcs_service_pb2
 from ray.core.generated import gcs_service_pb2_grpc
-from ray.new_dashboard.datacenter import DataSource, DataOrganizer
+from ray.dashboard.datacenter import DataSource, DataOrganizer
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable

dashboard/modules/node/tests/test_node.py

@@ -10,7 +10,7 @@
 import threading
 from datetime import datetime, timedelta
 from ray.cluster_utils import Cluster
-from ray.new_dashboard.tests.conftest import * # noqa
+from ray.dashboard.tests.conftest import * # noqa
 from ray._private.test_utils import (
  format_web_url, wait_until_server_available, wait_for_condition,
  wait_until_succeeded_without_exception)

dashboard/modules/reporter/reporter_agent.py

@@ -12,9 +12,9 @@
 import aioredis
 
 import ray
-import ray.new_dashboard.modules.reporter.reporter_consts as reporter_consts
-from ray.new_dashboard import k8s_utils
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.modules.reporter.reporter_consts as reporter_consts
+from ray.dashboard import k8s_utils
+import ray.dashboard.utils as dashboard_utils
 import ray._private.services
 import ray._private.utils
 from ray.core.generated import reporter_pb2

dashboard/modules/reporter/reporter_head.py

@@ -7,16 +7,16 @@
 from grpc.experimental import aio as aiogrpc
 
 import ray
-import ray.new_dashboard.modules.reporter.reporter_consts as reporter_consts
-import ray.new_dashboard.utils as dashboard_utils
+import ray.dashboard.modules.reporter.reporter_consts as reporter_consts
+import ray.dashboard.utils as dashboard_utils
 import ray._private.services
 import ray._private.utils
 from ray.autoscaler._private.util import (DEBUG_AUTOSCALING_STATUS,
  DEBUG_AUTOSCALING_STATUS_LEGACY,
  DEBUG_AUTOSCALING_ERROR)
 from ray.core.generated import reporter_pb2
 from ray.core.generated import reporter_pb2_grpc
-from ray.new_dashboard.datacenter import DataSource
+from ray.dashboard.datacenter import DataSource
 
 logger = logging.getLogger(__name__)
 routes = dashboard_utils.ClassMethodRouteTable