[CI] Combine "as" imports for isort (#52742)

MortalHappiness · web-flow · commit 96a632d8bbc5 · 2025-05-02T22:46:16.000-07:00
isort cleanup
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,3 +42,6 @@ ignore = [
 
 [tool.ruff.lint.flake8-quotes]
 avoid-escape = false
+
+[tool.ruff.lint.isort]
+combine-as-imports = true
diff --git a/python/ray/serve/_private/application_state.py b/python/ray/serve/_private/application_state.py
@@ -42,15 +42,13 @@
 )
 from ray.serve.config import AutoscalingConfig
 from ray.serve.exceptions import RayServeException
-from ray.serve.generated.serve_pb2 import ApplicationStatus as ApplicationStatusProto
 from ray.serve.generated.serve_pb2 import (
+    ApplicationStatus as ApplicationStatusProto,
     ApplicationStatusInfo as ApplicationStatusInfoProto,
-)
-from ray.serve.generated.serve_pb2 import DeploymentLanguage
-from ray.serve.generated.serve_pb2 import (
+    DeploymentLanguage,
     DeploymentStatusInfoList as DeploymentStatusInfoListProto,
+    StatusOverview as StatusOverviewProto,
 )
-from ray.serve.generated.serve_pb2 import StatusOverview as StatusOverviewProto
 from ray.serve.schema import (
     APIType,
     ApplicationStatus,
diff --git a/python/ray/serve/_private/client.py b/python/ray/serve/_private/client.py
@@ -28,11 +28,12 @@
 from ray.serve._private.utils import get_random_string
 from ray.serve.config import HTTPOptions
 from ray.serve.exceptions import RayServeException
-from ray.serve.generated.serve_pb2 import DeploymentArgs, DeploymentRoute
 from ray.serve.generated.serve_pb2 import (
+    DeploymentArgs,
+    DeploymentRoute,
     DeploymentStatusInfo as DeploymentStatusInfoProto,
+    StatusOverview as StatusOverviewProto,
 )
-from ray.serve.generated.serve_pb2 import StatusOverview as StatusOverviewProto
 from ray.serve.handle import DeploymentHandle
 from ray.serve.schema import (
     ApplicationStatus,
diff --git a/python/ray/serve/_private/common.py b/python/ray/serve/_private/common.py
@@ -8,11 +8,9 @@
 import ray
 from ray.actor import ActorHandle
 from ray.serve._private.constants import SERVE_DEFAULT_APP_NAME, SERVE_NAMESPACE
-from ray.serve.generated.serve_pb2 import DeploymentStatus as DeploymentStatusProto
 from ray.serve.generated.serve_pb2 import (
+    DeploymentStatus as DeploymentStatusProto,
     DeploymentStatusInfo as DeploymentStatusInfoProto,
-)
-from ray.serve.generated.serve_pb2 import (
     DeploymentStatusTrigger as DeploymentStatusTriggerProto,
 )
 from ray.serve.grpc_util import RayServegRPCContext
diff --git a/python/ray/serve/_private/config.py b/python/ray/serve/_private/config.py
@@ -28,12 +28,14 @@
 )
 from ray.serve._private.utils import DEFAULT, DeploymentOptionUpdateType
 from ray.serve.config import AutoscalingConfig
-from ray.serve.generated.serve_pb2 import AutoscalingConfig as AutoscalingConfigProto
-from ray.serve.generated.serve_pb2 import DeploymentConfig as DeploymentConfigProto
-from ray.serve.generated.serve_pb2 import DeploymentLanguage
-from ray.serve.generated.serve_pb2 import EncodingType as EncodingTypeProto
-from ray.serve.generated.serve_pb2 import LoggingConfig as LoggingConfigProto
-from ray.serve.generated.serve_pb2 import ReplicaConfig as ReplicaConfigProto
+from ray.serve.generated.serve_pb2 import (
+    AutoscalingConfig as AutoscalingConfigProto,
+    DeploymentConfig as DeploymentConfigProto,
+    DeploymentLanguage,
+    EncodingType as EncodingTypeProto,
+    LoggingConfig as LoggingConfigProto,
+    ReplicaConfig as ReplicaConfigProto,
+)
 from ray.util.placement_group import validate_placement_group
 
 
diff --git a/python/ray/serve/_private/controller.py b/python/ray/serve/_private/controller.py
@@ -55,9 +55,9 @@
     ActorNameList,
     DeploymentArgs,
     DeploymentRoute,
+    EndpointInfo as EndpointInfoProto,
     EndpointSet,
 )
-from ray.serve.generated.serve_pb2 import EndpointInfo as EndpointInfoProto
 from ray.serve.schema import (
     ApplicationDetails,
     DeploymentDetails,
diff --git a/python/ray/serve/_private/deployment_info.py b/python/ray/serve/_private/deployment_info.py
@@ -3,8 +3,8 @@
 import ray
 from ray.serve._private.common import TargetCapacityDirection
 from ray.serve._private.config import DeploymentConfig, ReplicaConfig
-from ray.serve.generated.serve_pb2 import DeploymentInfo as DeploymentInfoProto
 from ray.serve.generated.serve_pb2 import (
+    DeploymentInfo as DeploymentInfoProto,
     TargetCapacityDirection as TargetCapacityDirectionProto,
 )
 
diff --git a/python/ray/serve/_private/long_poll.py b/python/ray/serve/_private/long_poll.py
@@ -15,12 +15,12 @@
 from ray.serve._private.constants import SERVE_LOGGER_NAME
 from ray.serve.generated.serve_pb2 import (
     DeploymentTargetInfo,
+    EndpointInfo as EndpointInfoProto,
     EndpointSet,
     LongPollRequest,
     LongPollResult,
+    UpdatedObject as UpdatedObjectProto,
 )
-from ray.serve.generated.serve_pb2 import EndpointInfo as EndpointInfoProto
-from ray.serve.generated.serve_pb2 import UpdatedObject as UpdatedObjectProto
 from ray.util import metrics
 
 logger = logging.getLogger(SERVE_LOGGER_NAME)
diff --git a/python/ray/serve/llm/__init__.py b/python/ray/serve/llm/__init__.py
@@ -2,17 +2,9 @@
 
 from ray.llm._internal.serve.configs.server_models import (
     CloudMirrorConfig as _CloudMirrorConfig,
-)
-from ray.llm._internal.serve.configs.server_models import (
     LLMConfig as _LLMConfig,
-)
-from ray.llm._internal.serve.configs.server_models import (
     LLMServingArgs as _LLMServingArgs,
-)
-from ray.llm._internal.serve.configs.server_models import (
     LoraConfig as _LoraConfig,
-)
-from ray.llm._internal.serve.configs.server_models import (
     ModelLoadingConfig as _ModelLoadingConfig,
 )
 from ray.llm._internal.serve.deployments.llm.llm_server import (
diff --git a/python/ray/serve/llm/openai_api_models.py b/python/ray/serve/llm/openai_api_models.py
@@ -1,22 +1,10 @@
 from ray.llm._internal.serve.configs.openai_api_models import (
     ChatCompletionRequest as _ChatCompletionRequest,
-)
-from ray.llm._internal.serve.configs.openai_api_models import (
     ChatCompletionResponse as _ChatCompletionResponse,
-)
-from ray.llm._internal.serve.configs.openai_api_models import (
     ChatCompletionStreamResponse as _ChatCompletionStreamResponse,
-)
-from ray.llm._internal.serve.configs.openai_api_models import (
     CompletionRequest as _CompletionRequest,
-)
-from ray.llm._internal.serve.configs.openai_api_models import (
     CompletionResponse as _CompletionResponse,
-)
-from ray.llm._internal.serve.configs.openai_api_models import (
     CompletionStreamResponse as _CompletionStreamResponse,
-)
-from ray.llm._internal.serve.configs.openai_api_models import (
     ErrorResponse as _ErrorResponse,
 )
 from ray.util.annotations import PublicAPI
diff --git a/python/ray/serve/tests/test_long_poll.py b/python/ray/serve/tests/test_long_poll.py
@@ -25,8 +25,10 @@
 )
 from ray.serve.generated.serve_pb2 import (
     DeploymentTargetInfo as DeploymentTargetInfoProto,
+    EndpointSet,
+    LongPollRequest,
+    LongPollResult,
 )
-from ray.serve.generated.serve_pb2 import EndpointSet, LongPollRequest, LongPollResult
 
 
 def test_notifier_events_cleared_without_update(serve_instance):
diff --git a/python/ray/serve/tests/unit/test_application_state.py b/python/ray/serve/tests/unit/test_application_state.py
@@ -27,8 +27,8 @@
 from ray.serve.exceptions import RayServeException
 from ray.serve.generated.serve_pb2 import (
     ApplicationStatusInfo as ApplicationStatusInfoProto,
+    StatusOverview as StatusOverviewProto,
 )
-from ray.serve.generated.serve_pb2 import StatusOverview as StatusOverviewProto
 from ray.serve.schema import (
     APIType,
     ApplicationStatus,
diff --git a/python/ray/serve/tests/unit/test_config.py b/python/ray/serve/tests/unit/test_config.py
@@ -14,9 +14,11 @@
     ProxyLocation,
     gRPCOptions,
 )
-from ray.serve.generated.serve_pb2 import AutoscalingConfig as AutoscalingConfigProto
-from ray.serve.generated.serve_pb2 import DeploymentConfig as DeploymentConfigProto
-from ray.serve.generated.serve_pb2 import DeploymentLanguage
+from ray.serve.generated.serve_pb2 import (
+    AutoscalingConfig as AutoscalingConfigProto,
+    DeploymentConfig as DeploymentConfigProto,
+    DeploymentLanguage,
+)
 from ray.serve.generated.serve_pb2_grpc import add_UserDefinedServiceServicer_to_server
 from ray.serve.schema import (
     DeploymentSchema,
diff --git a/python/ray/train/_internal/state/export.py b/python/ray/train/_internal/state/export.py
@@ -2,8 +2,6 @@
 
 from ray.core.generated.export_train_state_pb2 import (
     ExportTrainRunAttemptEventData as ProtoTrainRunAttempt,
-)
-from ray.core.generated.export_train_state_pb2 import (
     ExportTrainRunEventData as ProtoTrainRun,
 )
 from ray.train._internal.state.schema import (
diff --git a/python/ray/train/tests/test_horovod_trainer.py b/python/ray/train/tests/test_horovod_trainer.py
@@ -9,8 +9,8 @@
 
 import ray
 from ray.train import ScalingConfig
-from ray.train.examples.horovod.horovod_pytorch_example import Net
 from ray.train.examples.horovod.horovod_pytorch_example import (
+    Net,
     train_func as hvd_train_func,
 )
 from ray.train.horovod import HorovodTrainer
diff --git a/python/ray/train/tests/test_state_export.py b/python/ray/train/tests/test_state_export.py
@@ -4,8 +4,6 @@
 
 from ray.core.generated.export_train_state_pb2 import (
     ExportTrainRunAttemptEventData as ProtoTrainRunAttempt,
-)
-from ray.core.generated.export_train_state_pb2 import (
     ExportTrainRunEventData as ProtoTrainRun,
 )
 from ray.train._internal.state.export import (
diff --git a/python/ray/train/v2/_internal/state/export.py b/python/ray/train/v2/_internal/state/export.py
@@ -1,7 +1,5 @@
 from ray.core.generated.export_train_state_pb2 import (
     ExportTrainRunAttemptEventData as ProtoTrainRunAttempt,
-)
-from ray.core.generated.export_train_state_pb2 import (
     ExportTrainRunEventData as ProtoTrainRun,
 )
 from ray.train.v2._internal.state.schema import (
diff --git a/python/ray/train/v2/api/config.py b/python/ray/train/v2/api/config.py
@@ -1,9 +1,11 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, List, Optional, Union
 
-from ray.air.config import FailureConfig as FailureConfigV1
-from ray.air.config import RunConfig as RunConfigV1
-from ray.air.config import ScalingConfig as ScalingConfigV1
+from ray.air.config import (
+    FailureConfig as FailureConfigV1,
+    RunConfig as RunConfigV1,
+    ScalingConfig as ScalingConfigV1,
+)
 from ray.train.v2._internal.constants import _DEPRECATED
 from ray.train.v2._internal.migration_utils import (
     FAIL_FAST_DEPRECATION_MESSAGE,
diff --git a/python/ray/train/v2/lightning/lightning_utils.py b/python/ray/train/v2/lightning/lightning_utils.py
@@ -7,8 +7,8 @@
 from ray._private.usage.usage_lib import TagKey, record_extra_usage_tag
 from ray.train.lightning._lightning_utils import (
     RayTrainReportCallback as RayTrainReportCallbackV1,
+    import_lightning,
 )
-from ray.train.lightning._lightning_utils import import_lightning
 from ray.util import PublicAPI
 
 pl = import_lightning()
diff --git a/python/ray/train/v2/tests/test_v2_api.py b/python/ray/train/v2/tests/test_v2_api.py
@@ -86,8 +86,10 @@ def test_train_v2_import(monkeypatch, env_v2_enabled):
     # isort: on
 
     # Import from the absolute module paths as references
-    from ray.train.v2.api.config import FailureConfig as FailureConfigV2
-    from ray.train.v2.api.config import RunConfig as RunConfigV2
+    from ray.train.v2.api.config import (
+        FailureConfig as FailureConfigV2,
+        RunConfig as RunConfigV2,
+    )
     from ray.train.v2.api.result import Result as ResultV2
 
     if env_v2_enabled:

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`import ray`
`4`	`4`	`from ray.serve._private.common import TargetCapacityDirection`
`5`	`5`	`from ray.serve._private.config import DeploymentConfig, ReplicaConfig`
`6`		`-from ray.serve.generated.serve_pb2 import DeploymentInfo as DeploymentInfoProto`
`7`	`6`	`from ray.serve.generated.serve_pb2 import (`
	`7`	`+ DeploymentInfo as DeploymentInfoProto,`
`8`	`8`	`TargetCapacityDirection as TargetCapacityDirectionProto,`
`9`	`9`	`)`
`10`	`10`