fix: persistent styling between ruff and yapf (#279)

openllm-python/src/openllm/cli/_factory.py

@@ -9,21 +9,28 @@ import click
 import click_option_group as cog
 import inflection
 import orjson
+
 from bentoml_cli.utils import BentoMLCommandGroup
 from click import shell_completion as sc
 from click.shell_completion import CompletionItem
 
 import bentoml
 import openllm
+
 from bentoml._internal.configuration.containers import BentoMLContainer
-from openllm_core._typing_compat import Concatenate, DictStrAny, LiteralString, ParamSpec
+from openllm_core._typing_compat import Concatenate
+from openllm_core._typing_compat import DictStrAny
+from openllm_core._typing_compat import LiteralString
+from openllm_core._typing_compat import ParamSpec
 from openllm_core.utils import DEBUG
 
 from . import termui
+
 if t.TYPE_CHECKING:
   import subprocess
 
   from openllm_core._configuration import LLMConfig
+
 logger = logging.getLogger(__name__)
 
 P = ParamSpec('P')

openllm-python/src/openllm/cli/_sdk.py

@@ -7,20 +7,27 @@ import subprocess
 import sys
 import typing as t
 
-from simple_di import Provide, inject
+from simple_di import Provide
+from simple_di import inject
 
 import bentoml
 import openllm
 import openllm_core
+
 from bentoml._internal.configuration.containers import BentoMLContainer
 from openllm.exceptions import OpenLLMException
 
 from . import termui
 from ._factory import start_command_factory
+
 if t.TYPE_CHECKING:
   from bentoml._internal.bento import BentoStore
   from openllm_core._configuration import LLMConfig
-  from openllm_core._typing_compat import LiteralContainerRegistry, LiteralContainerVersionStrategy, LiteralRuntime, LiteralString
+  from openllm_core._typing_compat import LiteralContainerRegistry
+  from openllm_core._typing_compat import LiteralContainerVersionStrategy
+  from openllm_core._typing_compat import LiteralRuntime
+  from openllm_core._typing_compat import LiteralString
+
 logger = logging.getLogger(__name__)
 
 def _start(
@@ -81,7 +88,8 @@ def _start(
       framework: The framework to use for this LLM. By default, this is set to ``pt``.
       additional_args: Additional arguments to pass to ``openllm start``.
   """
-  from .entrypoint import start_command, start_grpc_command
+  from .entrypoint import start_command
+  from .entrypoint import start_grpc_command
   llm_config = openllm.AutoConfig.for_model(model_name)
   _ModelEnv = openllm_core.utils.EnvVarMixin(
       model_name,

openllm-python/src/openllm/cli/entrypoint.py

@@ -42,29 +42,80 @@ import fs.copy
 import fs.errors
 import inflection
 import orjson
-from bentoml_cli.utils import BentoMLCommandGroup, opt_callback
-from simple_di import Provide, inject
+
+from bentoml_cli.utils import BentoMLCommandGroup
+from bentoml_cli.utils import opt_callback
+from simple_di import Provide
+from simple_di import inject
 
 import bentoml
 import openllm
+
 from bentoml._internal.configuration.containers import BentoMLContainer
 from bentoml._internal.models.model import ModelStore
-from openllm import bundle, serialisation
+from openllm import bundle
+from openllm import serialisation
 from openllm.exceptions import OpenLLMException
-from openllm.models.auto import CONFIG_MAPPING, MODEL_FLAX_MAPPING_NAMES, MODEL_MAPPING_NAMES, MODEL_TF_MAPPING_NAMES, MODEL_VLLM_MAPPING_NAMES, AutoConfig, AutoLLM
+from openllm.models.auto import CONFIG_MAPPING
+from openllm.models.auto import MODEL_FLAX_MAPPING_NAMES
+from openllm.models.auto import MODEL_MAPPING_NAMES
+from openllm.models.auto import MODEL_TF_MAPPING_NAMES
+from openllm.models.auto import MODEL_VLLM_MAPPING_NAMES
+from openllm.models.auto import AutoConfig
+from openllm.models.auto import AutoLLM
 from openllm.utils import infer_auto_class
-from openllm_core._typing_compat import Concatenate, DictStrAny, LiteralRuntime, LiteralString, ParamSpec, Self
-from openllm_core.utils import DEBUG, DEBUG_ENV_VAR, OPTIONAL_DEPENDENCIES, QUIET_ENV_VAR, EnvVarMixin, LazyLoader, analytics, bentoml_cattr, compose, configure_logging, dantic, first_not_none, get_debug_mode, get_quiet_mode, is_torch_available, is_transformers_supports_agent, resolve_user_filepath, set_debug_mode, set_quiet_mode
+from openllm_core._typing_compat import Concatenate
+from openllm_core._typing_compat import DictStrAny
+from openllm_core._typing_compat import LiteralRuntime
+from openllm_core._typing_compat import LiteralString
+from openllm_core._typing_compat import ParamSpec
+from openllm_core._typing_compat import Self
+from openllm_core.utils import DEBUG
+from openllm_core.utils import DEBUG_ENV_VAR
+from openllm_core.utils import OPTIONAL_DEPENDENCIES
+from openllm_core.utils import QUIET_ENV_VAR
+from openllm_core.utils import EnvVarMixin
+from openllm_core.utils import LazyLoader
+from openllm_core.utils import analytics
+from openllm_core.utils import bentoml_cattr
+from openllm_core.utils import compose
+from openllm_core.utils import configure_logging
+from openllm_core.utils import dantic
+from openllm_core.utils import first_not_none
+from openllm_core.utils import get_debug_mode
+from openllm_core.utils import get_quiet_mode
+from openllm_core.utils import is_torch_available
+from openllm_core.utils import is_transformers_supports_agent
+from openllm_core.utils import resolve_user_filepath
+from openllm_core.utils import set_debug_mode
+from openllm_core.utils import set_quiet_mode
 
 from . import termui
-from ._factory import FC, LiteralOutput, _AnyCallable, bettertransformer_option, container_registry_option, fast_option, machine_option, model_id_option, model_name_argument, model_version_option, output_option, parse_device_callback, quantize_option, serialisation_option, start_command_factory, workers_per_resource_option
+from ._factory import FC
+from ._factory import LiteralOutput
+from ._factory import _AnyCallable
+from ._factory import bettertransformer_option
+from ._factory import container_registry_option
+from ._factory import fast_option
+from ._factory import machine_option
+from ._factory import model_id_option
+from ._factory import model_name_argument
+from ._factory import model_version_option
+from ._factory import output_option
+from ._factory import parse_device_callback
+from ._factory import quantize_option
+from ._factory import serialisation_option
+from ._factory import start_command_factory
+from ._factory import workers_per_resource_option
+
 if t.TYPE_CHECKING:
   import torch
 
   from bentoml._internal.bento import BentoStore
   from bentoml._internal.container import DefaultBuilder
   from openllm_core._schema import EmbeddingsOutput
-  from openllm_core._typing_compat import LiteralContainerRegistry, LiteralContainerVersionStrategy
+  from openllm_core._typing_compat import LiteralContainerRegistry
+  from openllm_core._typing_compat import LiteralContainerVersionStrategy
 else:
   torch = LazyLoader('torch', globals(), 'torch')
 

openllm-python/src/openllm/cli/extension/build_base_container.py

@@ -5,9 +5,14 @@ import click
 import orjson
 
 import openllm
+
 from openllm.cli import termui
-from openllm.cli._factory import container_registry_option, machine_option
-if t.TYPE_CHECKING: from openllm_core._typing_compat import LiteralContainerRegistry, LiteralContainerVersionStrategy
+from openllm.cli._factory import container_registry_option
+from openllm.cli._factory import machine_option
+
+if t.TYPE_CHECKING:
+  from openllm_core._typing_compat import LiteralContainerRegistry
+  from openllm_core._typing_compat import LiteralContainerVersionStrategy
 
 @click.command(
     'build_base_container',

openllm-python/src/openllm/cli/extension/dive_bentos.py

@@ -5,13 +5,19 @@ import typing as t
 
 import click
 import psutil
-from simple_di import Provide, inject
+
+from simple_di import Provide
+from simple_di import inject
 
 import bentoml
+
 from bentoml._internal.configuration.containers import BentoMLContainer
 from openllm.cli import termui
-from openllm.cli._factory import bento_complete_envvar, machine_option
-if t.TYPE_CHECKING: from bentoml._internal.bento import BentoStore
+from openllm.cli._factory import bento_complete_envvar
+from openllm.cli._factory import machine_option
+
+if t.TYPE_CHECKING:
+  from bentoml._internal.bento import BentoStore
 
 @click.command('dive_bentos', context_settings=termui.CONTEXT_SETTINGS)
 @click.argument('bento', type=str, shell_complete=bento_complete_envvar)

openllm-python/src/openllm/cli/extension/get_containerfile.py

@@ -2,9 +2,12 @@ from __future__ import annotations
 import typing as t
 
 import click
-from simple_di import Provide, inject
+
+from simple_di import Provide
+from simple_di import inject
 
 import bentoml
+
 from bentoml._internal.bento.bento import BentoInfo
 from bentoml._internal.bento.build_config import DockerOptions
 from bentoml._internal.configuration.containers import BentoMLContainer
@@ -12,7 +15,9 @@ from bentoml._internal.container.generate import generate_containerfile
 from openllm.cli import termui
 from openllm.cli._factory import bento_complete_envvar
 from openllm_core.utils import bentoml_cattr
-if t.TYPE_CHECKING: from bentoml._internal.bento import BentoStore
+
+if t.TYPE_CHECKING:
+  from bentoml._internal.bento import BentoStore
 
 @click.command('get_containerfile', context_settings=termui.CONTEXT_SETTINGS, help='Return Containerfile of any given Bento.')
 @click.argument('bento', type=str, shell_complete=bento_complete_envvar)

openllm-python/src/openllm/cli/extension/get_prompt.py

@@ -4,12 +4,17 @@ import typing as t
 import click
 import inflection
 import orjson
+
 from bentoml_cli.utils import opt_callback
 
 import openllm
+
 from openllm.cli import termui
-from openllm.cli._factory import machine_option, model_complete_envvar, output_option
+from openllm.cli._factory import machine_option
+from openllm.cli._factory import model_complete_envvar
+from openllm.cli._factory import output_option
 from openllm_core._prompt import process_prompt
+
 LiteralOutput = t.Literal['json', 'pretty', 'porcelain']
 
 @click.command('get_prompt', context_settings=termui.CONTEXT_SETTINGS)

openllm-python/src/openllm/cli/extension/list_bentos.py

@@ -6,9 +6,11 @@ import orjson
 
 import bentoml
 import openllm
+
 from bentoml._internal.utils import human_readable_size
 from openllm.cli import termui
-from openllm.cli._factory import LiteralOutput, output_option
+from openllm.cli._factory import LiteralOutput
+from openllm.cli._factory import output_option
 
 @click.command('list_bentos', context_settings=termui.CONTEXT_SETTINGS)
 @output_option(default_value='json')

openllm-python/src/openllm/cli/extension/list_models.py

@@ -7,10 +7,16 @@ import orjson
 
 import bentoml
 import openllm
+
 from bentoml._internal.utils import human_readable_size
 from openllm.cli import termui
-from openllm.cli._factory import LiteralOutput, model_complete_envvar, model_name_argument, output_option
-if t.TYPE_CHECKING: from openllm_core._typing_compat import DictStrAny
+from openllm.cli._factory import LiteralOutput
+from openllm.cli._factory import model_complete_envvar
+from openllm.cli._factory import model_name_argument
+from openllm.cli._factory import output_option
+
+if t.TYPE_CHECKING:
+  from openllm_core._typing_compat import DictStrAny
 
 @click.command('list_models', context_settings=termui.CONTEXT_SETTINGS)
 @model_name_argument(required=False, shell_complete=model_complete_envvar)

openllm-python/src/openllm/cli/extension/playground.py

@@ -13,12 +13,16 @@ import yaml
 
 from openllm import playground
 from openllm.cli import termui
-from openllm_core.utils import is_jupyter_available, is_jupytext_available, is_notebook_available
+from openllm_core.utils import is_jupyter_available
+from openllm_core.utils import is_jupytext_available
+from openllm_core.utils import is_notebook_available
+
 if t.TYPE_CHECKING:
   import jupytext
   import nbformat
 
   from openllm_core._typing_compat import DictStrAny
+
 logger = logging.getLogger(__name__)
 
 def load_notebook_metadata() -> DictStrAny:

openllm-python/src/openllm/cli/termui.py

@@ -6,7 +6,9 @@ import click
 import inflection
 
 import openllm
-if t.TYPE_CHECKING: from openllm_core._typing_compat import DictStrAny
+
+if t.TYPE_CHECKING:
+  from openllm_core._typing_compat import DictStrAny
 
 def echo(text: t.Any, fg: str = 'green', _with_style: bool = True, **attrs: t.Any) -> None:
   attrs['fg'] = fg if not openllm.utils.get_debug_mode() else None