- Added isort for import handling

Author: MarcoMuellner

.pre-commit-config.yaml

@@ -17,3 +17,8 @@ repos:
       entry: poetry run flake8
       language: system
       types: [ python ]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+        name: isort (python)

noxfile.py

@@ -8,6 +8,7 @@
 
 import nox
 
+
 try:
     from nox_poetry import Session
     from nox_poetry import session

src/openapi_python_generator/__init__.py

@@ -1,8 +1,10 @@
 """Python client from an OPENAPI 3.0 specification in seconds."""
 try:
-    from importlib.metadata import version, PackageNotFoundError  # type: ignore
+    from importlib.metadata import PackageNotFoundError  # type: ignore
+    from importlib.metadata import version
 except ImportError:  # pragma: no cover
-    from importlib_metadata import version, PackageNotFoundError  # type: ignore
+    from importlib_metadata import PackageNotFoundError  # type: ignore
+    from importlib_metadata import version
 
 
 try:

src/openapi_python_generator/common.py

@@ -1,5 +1,6 @@
 from enum import Enum
-from typing import Dict, Optional
+from typing import Dict
+from typing import Optional
 
 from openapi_python_generator.models import LibraryConfig
 

src/openapi_python_generator/generate_data.py

@@ -1,17 +1,21 @@
 from pathlib import Path
-from typing import Optional, Union
+from typing import Optional
+from typing import Union
 
 import black
 import click
 import httpx
-from httpx import ConnectError, ConnectTimeout
 import orjson
+from httpx import ConnectError
+from httpx import ConnectTimeout
+from openapi_schema_pydantic import OpenAPI
 from pydantic import ValidationError
 
-from openapi_schema_pydantic import OpenAPI
-from .common import HTTPLibrary, library_config_dict
+from .common import HTTPLibrary
+from .common import library_config_dict
 from .language_converters.python.generator import generator
-from .language_converters.python.jinja_config import JINJA_ENV, SERVICE_TEMPLATE
+from .language_converters.python.jinja_config import JINJA_ENV
+from .language_converters.python.jinja_config import SERVICE_TEMPLATE
 from .models import ConversionResult
 
 

src/openapi_python_generator/language_converters/python/api_config_generator.py

@@ -3,9 +3,9 @@
 from openapi_schema_pydantic import OpenAPI
 
 from openapi_python_generator.language_converters.python.jinja_config import (
-    JINJA_ENV,
     API_CONFIG_TEMPLATE,
 )
+from openapi_python_generator.language_converters.python.jinja_config import JINJA_ENV
 from openapi_python_generator.models import APIConfig
 
 

src/openapi_python_generator/language_converters/python/generator.py

@@ -11,7 +11,8 @@
 from openapi_python_generator.language_converters.python.service_generator import (
     generate_services,
 )
-from openapi_python_generator.models import ConversionResult, LibraryConfig
+from openapi_python_generator.models import ConversionResult
+from openapi_python_generator.models import LibraryConfig
 
 
 def generator(

src/openapi_python_generator/language_converters/python/jinja_config.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 
-from jinja2 import Environment, FileSystemLoader
+from jinja2 import Environment
+from jinja2 import FileSystemLoader
+
 
 ENUM_TEMPLATE = "enum.jinja2"
 MODELS_TEMPLATE = "models.jinja2"

src/openapi_python_generator/language_converters/python/model_generator.py

@@ -1,14 +1,21 @@
-from typing import List, Optional
+from typing import List
+from typing import Optional
 
 import click
-from openapi_schema_pydantic import Components, Reference, Schema
+from openapi_schema_pydantic import Components
+from openapi_schema_pydantic import Reference
+from openapi_schema_pydantic import Schema
 
 from openapi_python_generator.language_converters.python.jinja_config import (
-    JINJA_ENV,
-    MODELS_TEMPLATE,
     ENUM_TEMPLATE,
 )
-from openapi_python_generator.models import Model, Property, TypeConversion
+from openapi_python_generator.language_converters.python.jinja_config import JINJA_ENV
+from openapi_python_generator.language_converters.python.jinja_config import (
+    MODELS_TEMPLATE,
+)
+from openapi_python_generator.models import Model
+from openapi_python_generator.models import Property
+from openapi_python_generator.models import TypeConversion
 
 
 def type_converter(schema: Schema, required: bool = False) -> TypeConversion:

src/openapi_python_generator/language_converters/python/service_generator.py

@@ -1,26 +1,26 @@
-from typing import Dict, List, Tuple, Union
+from typing import Dict
+from typing import List
+from typing import Tuple
+from typing import Union
 
 import click
-from openapi_schema_pydantic import (
-    PathItem,
-    Operation,
-    Response,
-    MediaType,
-    Reference,
-    Schema,
-)
+from openapi_schema_pydantic import MediaType
+from openapi_schema_pydantic import Operation
+from openapi_schema_pydantic import PathItem
+from openapi_schema_pydantic import Reference
+from openapi_schema_pydantic import Response
+from openapi_schema_pydantic import Schema
 
 from openapi_python_generator.language_converters.python.jinja_config import JINJA_ENV
 from openapi_python_generator.language_converters.python.model_generator import (
     type_converter,
 )
-from openapi_python_generator.models import (
-    Service,
-    ServiceOperation,
-    OpReturnType,
-    TypeConversion,
-    LibraryConfig,
-)
+from openapi_python_generator.models import LibraryConfig
+from openapi_python_generator.models import OpReturnType
+from openapi_python_generator.models import Service
+from openapi_python_generator.models import ServiceOperation
+from openapi_python_generator.models import TypeConversion
+
 
 HTTP_OPERATIONS = ["get", "post", "put", "delete", "options", "head", "patch", "trace"]