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

openllm-python/src/openllm/bundle/__init__.py

@@ -7,15 +7,26 @@ import os
 import typing as t
 
 from openllm_core.utils import LazyModule
+
 _import_structure: dict[str, list[str]] = {
     '_package': ['create_bento', 'build_editable', 'construct_python_options', 'construct_docker_options'],
     'oci': ['CONTAINER_NAMES', 'get_base_container_tag', 'build_container', 'get_base_container_name', 'supported_registries', 'RefResolver']
 }
 
 if t.TYPE_CHECKING:
-  from . import _package as _package, oci as oci
-  from ._package import build_editable as build_editable, construct_docker_options as construct_docker_options, construct_python_options as construct_python_options, create_bento as create_bento
-  from .oci import CONTAINER_NAMES as CONTAINER_NAMES, RefResolver as RefResolver, build_container as build_container, get_base_container_name as get_base_container_name, get_base_container_tag as get_base_container_tag, supported_registries as supported_registries
+  from . import _package as _package
+  from . import oci as oci
+  from ._package import build_editable as build_editable
+  from ._package import construct_docker_options as construct_docker_options
+  from ._package import construct_python_options as construct_python_options
+  from ._package import create_bento as create_bento
+  from .oci import CONTAINER_NAMES as CONTAINER_NAMES
+  from .oci import RefResolver as RefResolver
+  from .oci import build_container as build_container
+  from .oci import get_base_container_name as get_base_container_name
+  from .oci import get_base_container_tag as get_base_container_tag
+  from .oci import supported_registries as supported_registries
+
 __lazy = LazyModule(__name__, os.path.abspath('__file__'), _import_structure)
 __all__ = __lazy.__all__
 __dir__ = __lazy.__dir__

openllm-python/src/openllm/bundle/_package.py

@@ -6,27 +6,39 @@ import logging
 import os
 import string
 import typing as t
+
 from pathlib import Path
 
 import fs
 import fs.copy
 import fs.errors
 import orjson
-from simple_di import Provide, inject
+
+from simple_di import Provide
+from simple_di import inject
 
 import bentoml
 import openllm_core
-from bentoml._internal.bento.build_config import BentoBuildConfig, DockerOptions, ModelSpec, PythonOptions
+
+from bentoml._internal.bento.build_config import BentoBuildConfig
+from bentoml._internal.bento.build_config import DockerOptions
+from bentoml._internal.bento.build_config import ModelSpec
+from bentoml._internal.bento.build_config import PythonOptions
 from bentoml._internal.configuration.containers import BentoMLContainer
 
 from . import oci
+
 if t.TYPE_CHECKING:
   from fs.base import FS
 
   import openllm
+
   from bentoml._internal.bento import BentoStore
   from bentoml._internal.models.model import ModelStore
-  from openllm_core._typing_compat import LiteralContainerRegistry, LiteralContainerVersionStrategy, LiteralString
+  from openllm_core._typing_compat import LiteralContainerRegistry
+  from openllm_core._typing_compat import LiteralContainerVersionStrategy
+  from openllm_core._typing_compat import LiteralString
+
 logger = logging.getLogger(__name__)
 
 OPENLLM_DEV_BUILD = 'OPENLLM_DEV_BUILD'

openllm-python/src/openllm/bundle/oci/__init__.py

@@ -9,7 +9,10 @@ import pathlib
 import shutil
 import subprocess
 import typing as t
-from datetime import datetime, timedelta, timezone
+
+from datetime import datetime
+from datetime import timedelta
+from datetime import timezone
 
 import attr
 import orjson
@@ -17,11 +20,17 @@ import orjson
 import bentoml
 import openllm
 import openllm_core
+
 from openllm_core.utils.lazy import VersionInfo
+
 if t.TYPE_CHECKING:
   from ghapi import all
 
-  from openllm_core._typing_compat import LiteralContainerRegistry, LiteralContainerVersionStrategy, LiteralString, RefTuple
+  from openllm_core._typing_compat import LiteralContainerRegistry
+  from openllm_core._typing_compat import LiteralContainerVersionStrategy
+  from openllm_core._typing_compat import LiteralString
+  from openllm_core._typing_compat import RefTuple
+
 all = openllm_core.utils.LazyLoader('all', globals(), 'ghapi.all')  # noqa: F811
 
 logger = logging.getLogger(__name__)