apply import merging for fbcode (10 of 11)

Summary:
Applies new import merging and sorting from µsort v1.0.

When merging imports, µsort will make a best-effort to move associated
comments to match merged elements, but there are known limitations due to
the diynamic nature of Python and developer tooling. These changes should
not produce any dangerous runtime changes, but may require touch-ups to
satisfy linters and other tooling.

Note that µsort uses case-insensitive, lexicographical sorting, which
results in a different ordering compared to isort. This provides a more
consistent sorting order, matching the case-insensitive order used when
sorting import statements by module name, and ensures that "frog", "FROG",
and "Frog" always sort next to each other.

For details on µsort's sorting and merging semantics, see the user guide:
https://usort.readthedocs.io/en/stable/guide.html#sorting

Reviewed By: lisroach

Differential Revision: D36402249

fbshipit-source-id: 93618434ae891f091dde1e067c67a3c19445653b

Author: amyreese

docs/versions_html.py

@@ -25,7 +25,7 @@
 from string import Template
 from typing import List, Optional
 
-from packaging.version import Version, InvalidVersion
+from packaging.version import InvalidVersion, Version
 
 VERSIONS_HTML_TEMPLATE = Template(
     """

scripts/component_integration_tests.py

@@ -14,7 +14,7 @@
 
 import example_app_defs as examples_app_defs_providers
 import torchx.components.integration_tests.component_provider as component_provider
-from integ_test_utils import BuildInfo, MissingEnvError, build_images, push_images
+from integ_test_utils import build_images, BuildInfo, MissingEnvError, push_images
 from torchx.cli.colors import BLUE, ENDC, GRAY
 from torchx.components.integration_tests.integ_tests import IntegComponentTest
 from torchx.schedulers import get_scheduler_factories

scripts/kfpint.py

@@ -45,20 +45,20 @@
 import tempfile
 import time
 from contextlib import contextmanager
-from typing import Optional, Iterator, Any, TypeVar, Callable
+from typing import Any, Callable, Iterator, Optional, TypeVar
 
 import kfp
 
 # pyre-ignore-all-errors[21] # Cannot find module utils
 # pyre-ignore-all-errors[11]
 from integ_test_utils import (
-    MissingEnvError,
+    build_images,
+    BuildInfo,
     getenv_asserts,
+    MissingEnvError,
+    push_images,
     run,
     run_in_bg,
-    BuildInfo,
-    build_images,
-    push_images,
 )
 from pyre_extensions import none_throws
 from urllib3.exceptions import MaxRetryError

scripts/kube_dist_trainer.py

@@ -12,11 +12,11 @@
 import argparse
 import os
 
-from integ_test_utils import BuildInfo, MissingEnvError, build_images, push_images
+from integ_test_utils import build_images, BuildInfo, MissingEnvError, push_images
 from pyre_extensions import none_throws
 from torchx.examples.apps.lightning_classy_vision.component import trainer_dist
 from torchx.runner import get_runner
-from torchx.specs import AppState, Resource, named_resources
+from torchx.specs import AppState, named_resources, Resource
 
 
 # pyre-ignore-all-errors[21] # Cannot find module utils

torchx/__init__.py

@@ -6,6 +6,6 @@
 # LICENSE file in the root directory of this source tree.
 
 from .version import (  # noqa F401; noqa F401
-    TORCHX_IMAGE as IMAGE,
     __version__ as __version__,
+    TORCHX_IMAGE as IMAGE,
 )

torchx/cli/cmd_log.py

@@ -12,15 +12,15 @@
 import threading
 import time
 from queue import Queue
-from typing import Optional, List, Tuple, TextIO
+from typing import List, Optional, TextIO, Tuple
 
 from pyre_extensions import none_throws
 from torchx import specs
 from torchx.cli.cmd_base import SubCommand
-from torchx.cli.colors import GREEN, ENDC
-from torchx.runner import Runner, get_runner
+from torchx.cli.colors import ENDC, GREEN
+from torchx.runner import get_runner, Runner
 from torchx.schedulers.api import Stream
-from torchx.specs.api import make_app_handle, is_started
+from torchx.specs.api import is_started, make_app_handle
 
 logger: logging.Logger = logging.getLogger(__name__)
 

torchx/cli/cmd_run.py

@@ -19,13 +19,13 @@
 from torchx.cli.argparse_util import CONFIG_DIRS, torchxconfig_run
 from torchx.cli.cmd_base import SubCommand
 from torchx.cli.cmd_log import get_logs
-from torchx.runner import Runner, config, get_runner
+from torchx.runner import config, get_runner, Runner
 from torchx.runner.config import load_sections
 from torchx.schedulers import get_default_scheduler_name, get_scheduler_factories
 from torchx.specs.finder import (
+    _Component,
     ComponentNotFoundException,
     ComponentValidationException,
-    _Component,
     get_builtin_source,
     get_components,
 )

torchx/cli/cmd_runopts.py

@@ -9,7 +9,7 @@
 import logging
 
 from torchx.cli.cmd_base import SubCommand
-from torchx.cli.colors import GREEN, ENDC
+from torchx.cli.colors import ENDC, GREEN
 from torchx.runner.api import get_runner
 
 logger: logging.Logger = logging.getLogger(__name__)

torchx/cli/main.py

@@ -17,7 +17,7 @@
 from torchx.cli.cmd_run import CmdBuiltins, CmdRun
 from torchx.cli.cmd_runopts import CmdRunopts
 from torchx.cli.cmd_status import CmdStatus
-from torchx.cli.colors import ENDC, GRAY, BLUE
+from torchx.cli.colors import BLUE, ENDC, GRAY
 from torchx.util.entrypoints import load_group
 
 

torchx/cli/test/cmd_log_test.py

@@ -12,10 +12,10 @@
 from typing import Iterator, Optional
 from unittest.mock import MagicMock, patch
 
-from torchx.cli.cmd_log import ENDC, GREEN, get_logs, validate
+from torchx.cli.cmd_log import ENDC, get_logs, GREEN, validate
 from torchx.runner.api import Runner
 from torchx.schedulers.api import Stream
-from torchx.specs import AppDef, Role, parse_app_handle, AppStatus, AppState, AppHandle
+from torchx.specs import AppDef, AppHandle, AppState, AppStatus, parse_app_handle, Role
 
 
 class SentinelError(Exception):

torchx/cli/test/cmd_run_test.py

@@ -17,7 +17,7 @@
 from typing import Generator
 from unittest.mock import MagicMock, patch
 
-from torchx.cli.cmd_run import CmdBuiltins, CmdRun, _parse_component_name_and_args
+from torchx.cli.cmd_run import _parse_component_name_and_args, CmdBuiltins, CmdRun
 from torchx.schedulers.local_scheduler import SignalException
 
 

torchx/cli/test/main_test.py

@@ -9,10 +9,10 @@
 import os
 import unittest
 from pathlib import Path
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock, patch
 
 from torchx.cli.cmd_base import SubCommand
-from torchx.cli.main import main, get_sub_cmds
+from torchx.cli.main import get_sub_cmds, main
 
 
 _root: Path = Path(__file__).parent

torchx/components/integration_tests/integ_tests.py

@@ -10,7 +10,7 @@
 from dataclasses import asdict
 from json import dumps
 from types import ModuleType
-from typing import Callable, Dict, List, Type, cast
+from typing import Callable, cast, Dict, List, Type
 
 from pyre_extensions import none_throws
 from torchx.cli.cmd_log import get_logs

torchx/examples/apps/lightning_classy_vision/component.py

@@ -38,7 +38,7 @@
 
 import torchx
 import torchx.specs as specs
-from torchx.specs import Resource, macros, named_resources
+from torchx.specs import macros, named_resources, Resource
 
 
 # %%

torchx/examples/apps/lightning_classy_vision/data.py

@@ -14,7 +14,7 @@
 
 import os.path
 import tarfile
-from typing import Optional, Callable
+from typing import Callable, Optional
 
 import fsspec
 import numpy

torchx/examples/apps/lightning_classy_vision/interpret.py

@@ -33,17 +33,16 @@
 sys.path.append(".")
 
 from torchx.examples.apps.lightning_classy_vision.data import (
-    TinyImageNetDataModule,
-    download_data,
     create_random_data,
+    download_data,
+    TinyImageNetDataModule,
 )
 from torchx.examples.apps.lightning_classy_vision.model import TinyImageNetModel
 
 # FIXME: captum must be imported after torch otherwise it causes python to crash
 if True:
     import numpy as np
-    from captum.attr import IntegratedGradients
-    from captum.attr import visualization as viz
+    from captum.attr import IntegratedGradients, visualization as viz
 
 
 def parse_args(argv: List[str]) -> argparse.Namespace:

torchx/examples/apps/lightning_classy_vision/model.py

@@ -14,15 +14,15 @@
 
 import os.path
 import subprocess
-from typing import Tuple, Optional, List
+from typing import List, Optional, Tuple
 
 import fsspec
 import pytorch_lightning as pl
 import torch
 import torch.jit
 from torch.nn import functional as F
 from torchmetrics import Accuracy
-from torchvision.models.resnet import ResNet, BasicBlock
+from torchvision.models.resnet import BasicBlock, ResNet
 
 
 class TinyImageNetModel(pl.LightningModule):

torchx/examples/apps/lightning_classy_vision/test/model_test.py

@@ -7,9 +7,7 @@
 import unittest
 
 import torch
-from torchx.examples.apps.lightning_classy_vision.model import (
-    TinyImageNetModel,
-)
+from torchx.examples.apps.lightning_classy_vision.model import TinyImageNetModel
 
 
 class ModelTest(unittest.TestCase):

torchx/examples/apps/lightning_classy_vision/train.py

@@ -28,13 +28,13 @@
 from pytorch_lightning.callbacks import ModelCheckpoint
 from pytorch_lightning.loggers import TensorBoardLogger
 from torchx.examples.apps.lightning_classy_vision.data import (
-    TinyImageNetDataModule,
     create_random_data,
     download_data,
+    TinyImageNetDataModule,
 )
 from torchx.examples.apps.lightning_classy_vision.model import (
-    TinyImageNetModel,
     export_inference_model,
+    TinyImageNetModel,
 )
 from torchx.examples.apps.lightning_classy_vision.profiler import SimpleLoggingProfiler
 

torchx/pipelines/kfp/test/adapter_test.py

@@ -8,7 +8,7 @@
 import os.path
 import tempfile
 import unittest
-from typing import List, Callable
+from typing import Callable, List
 
 import torchx
 import yaml

torchx/runner/__init__.py

@@ -5,4 +5,4 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-from torchx.runner.api import Runner, get_runner  # noqa: F401 F403
+from torchx.runner.api import get_runner, Runner  # noqa: F401 F403

torchx/runner/config.py

@@ -140,7 +140,7 @@ def my_component(a: int) -> specs.AppDef:
 from pathlib import Path
 from typing import Dict, Iterable, List, Optional, TextIO
 
-from torchx.schedulers import Scheduler, get_schedulers
+from torchx.schedulers import get_schedulers, Scheduler
 from torchx.specs import CfgVal, get_type_name
 from torchx.specs.api import runopt
 

torchx/runner/events/api.py

@@ -9,7 +9,7 @@
 from dataclasses import asdict, dataclass
 from datetime import datetime
 from enum import Enum
-from typing import Optional, Union, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
     from torch import monitor

torchx/runner/events/test/lib_test.py

@@ -9,14 +9,14 @@
 import logging
 import unittest
 from typing import List
-from unittest.mock import patch, MagicMock
+from unittest.mock import MagicMock, patch
 
 from torchx.runner.events import (
     _get_or_create_logger,
-    SourceType,
-    TorchxEvent,
     log_event,
     record,
+    SourceType,
+    TorchxEvent,
 )
 
 try:

torchx/runner/test/api_test.py

@@ -14,7 +14,7 @@
 from unittest.mock import MagicMock, patch
 
 from pyre_extensions import none_throws
-from torchx.runner import Runner, get_runner
+from torchx.runner import get_runner, Runner
 from torchx.schedulers.api import DescribeAppResponse, Scheduler
 from torchx.schedulers.local_scheduler import (
     LocalDirectoryImageProvider,

torchx/runner/test/config_test.py

@@ -19,11 +19,11 @@
     apply,
     dump,
     get_config,
+    get_configs,
     load,
     load_sections,
-    get_configs,
 )
-from torchx.schedulers import Scheduler, get_schedulers
+from torchx.schedulers import get_schedulers, Scheduler
 from torchx.schedulers.api import DescribeAppResponse, Stream
 from torchx.specs import AppDef, AppDryRunInfo, CfgVal, runopts
 

torchx/schedulers/api.py

@@ -13,12 +13,12 @@
 from typing import Iterable, List, Mapping, Optional
 
 from torchx.specs import (
-    NONE,
-    NULL_RESOURCE,
     AppDef,
     AppDryRunInfo,
     AppState,
     CfgVal,
+    NONE,
+    NULL_RESOURCE,
     Role,
     RoleStatus,
     runopts,

torchx/schedulers/aws_batch_scheduler.py

@@ -39,38 +39,38 @@
 from dataclasses import dataclass
 from datetime import datetime
 from typing import (
+    Any,
+    Callable,
     Dict,
     Iterable,
     Mapping,
     Optional,
-    Any,
-    TYPE_CHECKING,
     Tuple,
+    TYPE_CHECKING,
     TypeVar,
-    Callable,
 )
 
 import torchx
 import yaml
 from torchx.schedulers.api import (
     AppDryRunInfo,
     DescribeAppResponse,
+    filter_regex,
     Scheduler,
     Stream,
-    filter_regex,
 )
 from torchx.schedulers.devices import get_device_mounts
 from torchx.schedulers.ids import make_unique
 from torchx.specs.api import (
     AppDef,
     AppState,
-    Role,
+    BindMount,
+    CfgVal,
+    DeviceMount,
     macros,
+    Role,
     runopts,
-    CfgVal,
-    BindMount,
     VolumeMount,
-    DeviceMount,
 )
 from torchx.workspace.docker_workspace import DockerWorkspace
 

torchx/schedulers/devices.py

@@ -5,7 +5,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 import warnings
-from typing import Mapping, Callable, List, Dict
+from typing import Callable, Dict, List, Mapping
 
 from torchx.specs.api import DeviceMount