chore(internal): reformat imports (#944)

pyproject.toml

@@ -48,16 +48,16 @@ openai = "openai.cli:main"
 [tool.rye]
 managed = true
 dev-dependencies = [
-    # version pins are in requirements-dev.lock
-    "pyright",
-    "mypy",
-    "black",
-    "respx",
-    "pytest",
-    "pytest-asyncio",
-    "ruff",
-    "time-machine",
-    "nox",
+    "pyright==1.1.332",
+    "mypy==1.7.1",
+    "black==23.3.0",
+    "respx==0.20.2",
+    "pytest==7.1.1",
+    "pytest-asyncio==0.21.1",
+    "ruff==0.0.282",
+    "isort==5.10.1",
+    "time-machine==2.9.0",
+    "nox==2023.4.22",
     "dirty-equals>=0.6.0",
     "azure-identity >=1.14.1",
     "types-tqdm > 4"
@@ -68,10 +68,12 @@ format = { chain = [
   "format:black",
   "format:docs",
   "format:ruff",
+  "format:isort",
 ]}
 "format:black" = "black ."
 "format:docs" = "python bin/blacken-docs.py README.md api.md"
 "format:ruff" = "ruff --fix ."
+"format:isort" = "isort ."
 
 "check:ruff" = "ruff ."
 
@@ -126,13 +128,16 @@ reportImplicitOverride = true
 reportImportCycles = false
 reportPrivateUsage = false
 
+[tool.isort]
+profile = "black"
+length_sort = true
+extra_standard_library = ["typing_extensions"]
+
 [tool.ruff]
 line-length = 120
-output-format = "grouped"
+format = "grouped"
 target-version = "py37"
 select = [
-  # isort
-  "I",
   # remove unused imports
   "F401",
   # bare except statements
@@ -150,12 +155,6 @@ unfixable = [
 ]
 ignore-init-module-imports = true
 
-[tool.ruff.lint.isort]
-length-sort = true
-length-sort-straight = true
-combine-as-imports = true
-extra-standard-library = ["typing_extensions"]
-known-first-party = ["openai", "tests"]
 
 [tool.ruff.per-file-ignores]
 "bin/**.py" = ["T201", "T203"]

requirements-dev.lock

@@ -11,15 +11,11 @@ annotated-types==0.6.0
 anyio==4.1.0
 argcomplete==3.1.2
 attrs==23.1.0
-azure-core==1.29.5
 azure-identity==1.15.0
 black==23.3.0
 certifi==2023.7.22
-cffi==1.16.0
-charset-normalizer==3.3.2
 click==8.1.7
 colorlog==6.7.0
-cryptography==41.0.7
 dirty-equals==0.6.0
 distlib==0.3.7
 distro==1.8.0
@@ -30,43 +26,32 @@ httpcore==1.0.2
 httpx==0.25.2
 idna==3.4
 iniconfig==2.0.0
-msal==1.26.0
-msal-extensions==1.0.0
+isort==5.10.1
 mypy==1.7.1
 mypy-extensions==1.0.0
 nodeenv==1.8.0
 nox==2023.4.22
-numpy==1.26.2
 packaging==23.2
-pandas==2.1.3
-pandas-stubs==2.1.1.230928
 pathspec==0.11.2
 platformdirs==3.11.0
 pluggy==1.3.0
-portalocker==2.8.2
 py==1.11.0
-pycparser==2.21
 pydantic==2.4.2
 pydantic-core==2.10.1
-pyjwt==2.8.0
 pyright==1.1.332
 pytest==7.1.1
 pytest-asyncio==0.21.1
 python-dateutil==2.8.2
 pytz==2023.3.post1
-requests==2.31.0
 respx==0.20.2
-ruff==0.1.7
+ruff==0.0.282
 six==1.16.0
 sniffio==1.3.0
 time-machine==2.9.0
 tomli==2.0.1
 tqdm==4.66.1
-types-pytz==2023.3.1.1
 types-tqdm==4.66.0.2
 typing-extensions==4.8.0
-tzdata==2023.3
-urllib3==2.1.0
 virtualenv==20.24.5
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==68.2.2

src/openai/__init__.py

@@ -8,7 +8,17 @@
 from . import types
 from ._types import NoneType, Transport, ProxiesTypes
 from ._utils import file_from_path
-from ._client import Client, OpenAI, Stream, Timeout, Transport, AsyncClient, AsyncOpenAI, AsyncStream, RequestOptions
+from ._client import (
+    Client,
+    OpenAI,
+    Stream,
+    Timeout,
+    Transport,
+    AsyncClient,
+    AsyncOpenAI,
+    AsyncStream,
+    RequestOptions,
+)
 from ._version import __title__, __version__
 from ._exceptions import (
     APIError,
@@ -62,7 +72,8 @@
 
 from .lib import azure as _azure
 from .version import VERSION as VERSION
-from .lib.azure import AzureOpenAI as AzureOpenAI, AsyncAzureOpenAI as AsyncAzureOpenAI
+from .lib.azure import AzureOpenAI as AzureOpenAI
+from .lib.azure import AsyncAzureOpenAI as AsyncAzureOpenAI
 from .lib._old_api import *
 
 _setup_logging()
@@ -319,17 +330,15 @@ def _reset_client() -> None:  # type: ignore[reportUnusedFunction]
     _client = None
 
 
-from ._module_client import (
-    beta as beta,
-    chat as chat,
-    audio as audio,
-    edits as edits,
-    files as files,
-    images as images,
-    models as models,
-    embeddings as embeddings,
-    fine_tunes as fine_tunes,
-    completions as completions,
-    fine_tuning as fine_tuning,
-    moderations as moderations,
-)
+from ._module_client import beta as beta
+from ._module_client import chat as chat
+from ._module_client import audio as audio
+from ._module_client import edits as edits
+from ._module_client import files as files
+from ._module_client import images as images
+from ._module_client import models as models
+from ._module_client import embeddings as embeddings
+from ._module_client import fine_tunes as fine_tunes
+from ._module_client import completions as completions
+from ._module_client import fine_tuning as fine_tuning
+from ._module_client import moderations as moderations

src/openai/_client.py

@@ -20,19 +20,12 @@
     ProxiesTypes,
     RequestOptions,
 )
-from ._utils import (
-    is_given,
-    is_mapping,
-    get_async_library,
-)
+from ._utils import is_given, is_mapping, get_async_library
 from ._version import __version__
-from ._streaming import Stream as Stream, AsyncStream as AsyncStream
+from ._streaming import Stream as Stream
+from ._streaming import AsyncStream as AsyncStream
 from ._exceptions import OpenAIError, APIStatusError
-from ._base_client import (
-    DEFAULT_MAX_RETRIES,
-    SyncAPIClient,
-    AsyncAPIClient,
-)
+from ._base_client import DEFAULT_MAX_RETRIES, SyncAPIClient, AsyncAPIClient
 
 __all__ = [
     "Timeout",

src/openai/_compat.py

@@ -43,23 +43,21 @@ def is_typeddict(type_: type[Any]) -> bool:  # noqa: ARG001
 
 else:
     if PYDANTIC_V2:
-        from pydantic.v1.typing import (
-            get_args as get_args,
-            is_union as is_union,
-            get_origin as get_origin,
-            is_typeddict as is_typeddict,
-            is_literal_type as is_literal_type,
-        )
-        from pydantic.v1.datetime_parse import parse_date as parse_date, parse_datetime as parse_datetime
+        from pydantic.v1.typing import get_args as get_args
+        from pydantic.v1.typing import is_union as is_union
+        from pydantic.v1.typing import get_origin as get_origin
+        from pydantic.v1.typing import is_typeddict as is_typeddict
+        from pydantic.v1.typing import is_literal_type as is_literal_type
+        from pydantic.v1.datetime_parse import parse_date as parse_date
+        from pydantic.v1.datetime_parse import parse_datetime as parse_datetime
     else:
-        from pydantic.typing import (
-            get_args as get_args,
-            is_union as is_union,
-            get_origin as get_origin,
-            is_typeddict as is_typeddict,
-            is_literal_type as is_literal_type,
-        )
-        from pydantic.datetime_parse import parse_date as parse_date, parse_datetime as parse_datetime
+        from pydantic.typing import get_args as get_args
+        from pydantic.typing import is_union as is_union
+        from pydantic.typing import get_origin as get_origin
+        from pydantic.typing import is_typeddict as is_typeddict
+        from pydantic.typing import is_literal_type as is_literal_type
+        from pydantic.datetime_parse import parse_date as parse_date
+        from pydantic.datetime_parse import parse_datetime as parse_datetime
 
 
 # refactored config

src/openai/_extras/__init__.py

@@ -1,2 +1,3 @@
-from .numpy_proxy import numpy as numpy, has_numpy as has_numpy
+from .numpy_proxy import numpy as numpy
+from .numpy_proxy import has_numpy as has_numpy
 from .pandas_proxy import pandas as pandas

src/openai/_models.py

@@ -30,11 +30,17 @@
     AnyMapping,
     HttpxRequestFiles,
 )
-from ._utils import is_list, is_given, is_mapping, parse_date, parse_datetime, strip_not_given
+from ._utils import (
+    is_list,
+    is_given,
+    is_mapping,
+    parse_date,
+    parse_datetime,
+    strip_not_given,
+)
+from ._compat import PYDANTIC_V2, ConfigDict
+from ._compat import GenericModel as BaseGenericModel
 from ._compat import (
-    PYDANTIC_V2,
-    ConfigDict,
-    GenericModel as BaseGenericModel,
     get_args,
     is_union,
     parse_obj,

src/openai/_types.py

@@ -19,7 +19,14 @@
     Sequence,
     AsyncIterator,
 )
-from typing_extensions import Literal, Protocol, TypeAlias, TypedDict, override, runtime_checkable
+from typing_extensions import (
+    Literal,
+    Protocol,
+    TypeAlias,
+    TypedDict,
+    override,
+    runtime_checkable,
+)
 
 import pydantic
 from httpx import URL, Proxy, Timeout, Response, BaseTransport, AsyncBaseTransport

src/openai/_utils/__init__.py

@@ -1,41 +1,37 @@
 from ._proxy import LazyProxy as LazyProxy
-from ._utils import (
-    flatten as flatten,
-    is_dict as is_dict,
-    is_list as is_list,
-    is_given as is_given,
-    is_tuple as is_tuple,
-    is_mapping as is_mapping,
-    is_tuple_t as is_tuple_t,
-    parse_date as parse_date,
-    is_sequence as is_sequence,
-    coerce_float as coerce_float,
-    is_list_type as is_list_type,
-    is_mapping_t as is_mapping_t,
-    removeprefix as removeprefix,
-    removesuffix as removesuffix,
-    extract_files as extract_files,
-    is_sequence_t as is_sequence_t,
-    is_union_type as is_union_type,
-    required_args as required_args,
-    coerce_boolean as coerce_boolean,
-    coerce_integer as coerce_integer,
-    file_from_path as file_from_path,
-    parse_datetime as parse_datetime,
-    strip_not_given as strip_not_given,
-    deepcopy_minimal as deepcopy_minimal,
-    extract_type_arg as extract_type_arg,
-    is_required_type as is_required_type,
-    get_async_library as get_async_library,
-    is_annotated_type as is_annotated_type,
-    maybe_coerce_float as maybe_coerce_float,
-    get_required_header as get_required_header,
-    maybe_coerce_boolean as maybe_coerce_boolean,
-    maybe_coerce_integer as maybe_coerce_integer,
-    strip_annotated_type as strip_annotated_type,
-)
-from ._transform import (
-    PropertyInfo as PropertyInfo,
-    transform as transform,
-    maybe_transform as maybe_transform,
-)
+from ._utils import flatten as flatten
+from ._utils import is_dict as is_dict
+from ._utils import is_list as is_list
+from ._utils import is_given as is_given
+from ._utils import is_tuple as is_tuple
+from ._utils import is_mapping as is_mapping
+from ._utils import is_tuple_t as is_tuple_t
+from ._utils import parse_date as parse_date
+from ._utils import is_sequence as is_sequence
+from ._utils import coerce_float as coerce_float
+from ._utils import is_list_type as is_list_type
+from ._utils import is_mapping_t as is_mapping_t
+from ._utils import removeprefix as removeprefix
+from ._utils import removesuffix as removesuffix
+from ._utils import extract_files as extract_files
+from ._utils import is_sequence_t as is_sequence_t
+from ._utils import is_union_type as is_union_type
+from ._utils import required_args as required_args
+from ._utils import coerce_boolean as coerce_boolean
+from ._utils import coerce_integer as coerce_integer
+from ._utils import file_from_path as file_from_path
+from ._utils import parse_datetime as parse_datetime
+from ._utils import strip_not_given as strip_not_given
+from ._utils import deepcopy_minimal as deepcopy_minimal
+from ._utils import extract_type_arg as extract_type_arg
+from ._utils import is_required_type as is_required_type
+from ._utils import get_async_library as get_async_library
+from ._utils import is_annotated_type as is_annotated_type
+from ._utils import maybe_coerce_float as maybe_coerce_float
+from ._utils import get_required_header as get_required_header
+from ._utils import maybe_coerce_boolean as maybe_coerce_boolean
+from ._utils import maybe_coerce_integer as maybe_coerce_integer
+from ._utils import strip_annotated_type as strip_annotated_type
+from ._transform import PropertyInfo as PropertyInfo
+from ._transform import transform as transform
+from ._transform import maybe_transform as maybe_transform

src/openai/_utils/_utils.py

@@ -21,7 +21,9 @@
 import sniffio
 
 from .._types import Headers, NotGiven, FileTypes, NotGivenOr, HeadersLike
-from .._compat import is_union as _is_union, parse_date as parse_date, parse_datetime as parse_datetime
+from .._compat import is_union as _is_union
+from .._compat import parse_date as parse_date
+from .._compat import parse_datetime as parse_datetime
 
 _T = TypeVar("_T")
 _TupleT = TypeVar("_TupleT", bound=Tuple[object, ...])