Add auto-format to generation

Closes #12

Author: dbanty

openapi_python_client/__init__.py

@@ -3,6 +3,7 @@
 
 import json
 import shutil
+import subprocess
 from importlib.metadata import version
 from pathlib import Path
 from typing import Any, Dict, Optional
@@ -68,6 +69,7 @@ def build(self) -> None:
         self._build_metadata()
         self._build_models()
         self._build_api()
+        self._reformat()
 
     def update(self) -> None:
         """ Update an existing project """
@@ -79,6 +81,11 @@ def update(self) -> None:
         self._create_package()
         self._build_models()
         self._build_api()
+        self._reformat()
+
+    def _reformat(self) -> None:
+        subprocess.run("isort --recursive --apply", cwd=self.project_dir, shell=True)
+        subprocess.run("black .", cwd=self.project_dir, shell=True)
 
     def _create_package(self) -> None:
         self.package_dir.mkdir()

poetry.lock

@@ -22,17 +22,17 @@ typer = "^0.1.0"
 colorama = {version = "^0.4.3", markers = "sys_platform == 'win32'"}
 shellingham = "^1.3.2"
 httpx = "^0.12.1"
+black = "^19.10b0"
+isort = "^4.3.21"
 
 [tool.poetry.scripts]
 openapi-python-client = "openapi_python_client.cli:app"
 
 [tool.poetry.dev-dependencies]
 pytest = "*"
 pytest-mock = "*"
-black = {version = ">=19.10b", allow-prereleases = true}
 mypy = "^0.761"
 taskipy = "^1.1.3"
-isort = "^4.3.21"
 safety = "^1.8.5"
 pytest-cov = "^2.8.1"
 fastapi = "^0.52.0"

pyproject.toml

@@ -135,6 +135,7 @@ def test_build(self, mocker):
         project._build_models = mocker.MagicMock()
         project._build_api = mocker.MagicMock()
         project._create_package = mocker.MagicMock()
+        project._reformat = mocker.MagicMock()
 
         project.build()
 
@@ -143,6 +144,7 @@ def test_build(self, mocker):
         project._build_metadata.assert_called_once()
         project._build_models.assert_called_once()
         project._build_api.assert_called_once()
+        project._reformat.assert_called_once()
 
     def test_update(self, mocker):
         from openapi_python_client import _Project, shutil
@@ -154,13 +156,15 @@ def test_update(self, mocker):
         project._build_models = mocker.MagicMock()
         project._build_api = mocker.MagicMock()
         project._create_package = mocker.MagicMock()
+        project._reformat = mocker.MagicMock()
 
         project.update()
 
         rmtree.assert_called_once_with(project.package_dir)
         project._create_package.assert_called_once()
         project._build_models.assert_called_once()
         project._build_api.assert_called_once()
+        project._reformat.assert_called_once()
 
     def test_update_missing_dir(self, mocker):
         from openapi_python_client import _Project
@@ -229,11 +233,9 @@ def test__build_metadata(self, mocker):
 
         project._build_metadata()
 
-        project.env.get_template.assert_has_calls([
-            mocker.call("pyproject.toml"),
-            mocker.call("README.md"),
-            mocker.call(".gitignore"),
-        ])
+        project.env.get_template.assert_has_calls(
+            [mocker.call("pyproject.toml"), mocker.call("README.md"), mocker.call(".gitignore"), ]
+        )
 
         pyproject_template.render.assert_called_once_with(
             project_name=project.project_name,
@@ -386,7 +388,23 @@ def test__build_api(self, mocker):
         errors_template.render.assert_called_once()
         api_errors.write_text.assert_called_once_with(errors_template.render())
         endpoint_template.render.assert_has_calls(
-            [mocker.call(collection=collection_1), mocker.call(collection=collection_2),]
+            [mocker.call(collection=collection_1), mocker.call(collection=collection_2), ]
         )
         collection_1_path.write_text.assert_called_once_with(endpoint_renders[collection_1])
         collection_2_path.write_text.assert_called_once_with(endpoint_renders[collection_2])
+
+
+def test__reformat(mocker):
+    from openapi_python_client import _Project, OpenAPI
+
+    sub_run = mocker.patch("subprocess.run")
+    openapi = mocker.MagicMock(autospec=OpenAPI, title="My Test API")
+    project = _Project(openapi=openapi)
+    project.project_dir = mocker.MagicMock(autospec=pathlib.Path)
+
+    project._reformat()
+
+    sub_run.assert_has_calls([
+        mocker.call("isort --recursive --apply", cwd=project.project_dir, shell=True),
+        mocker.call("black .", cwd=project.project_dir, shell=True),
+    ])

tests/test___init__.py

@@ -5,10 +5,7 @@
 from fastapi import FastAPI
 from pydantic import BaseModel
 
-app = FastAPI(
-    title="My Test API",
-    description="An API for testing openapi-python-client",
-)
+app = FastAPI(title="My Test API", description="An API for testing openapi-python-client",)
 
 
 class PingResponse(BaseModel):
@@ -20,6 +17,7 @@ async def ping():
     """ A quick check to see if the system is running """
     return {"success": True}
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     path = Path(__file__).parent / "openapi.json"
     path.write_text(json.dumps(app.openapi()))

tests/test_end_to_end/fastapi/__init__.py

@@ -1,2 +1,2 @@
 """ A client library for accessing My Test API """
-from .client import AuthenticatedClient, Client
+from .client import AuthenticatedClient, Client

tests/test_end_to_end/golden-master/my_test_api_client/__init__.py

@@ -1 +1 @@
-""" Contains all methods for accessing the API """
+""" Contains all methods for accessing the API """

tests/test_end_to_end/golden-master/my_test_api_client/api/__init__.py

@@ -4,25 +4,19 @@
 import httpx
 
 from ..client import AuthenticatedClient, Client
-from .errors import ApiResponseError
-
 from ..models.ping_response import PingResponse
+from .errors import ApiResponseError
 
 
 def ping_ping_get(
-    *,
-    client: Client,
+    *, client: Client,
 ) -> Union[
     PingResponse,
 ]:
     """ A quick check to see if the system is running  """
     url = f"{client.base_url}/ping"
 
-
-    response = httpx.get(
-        url=url,
-        headers=client.get_headers(),
-    )
+    response = httpx.get(url=url, headers=client.get_headers(),)
 
     if response.status_code == 200:
         return PingResponse.from_dict(response.json())

tests/test_end_to_end/golden-master/my_test_api_client/api/default.py

@@ -1,8 +1,9 @@
 from httpx import Response
 
+
 class ApiResponseError(Exception):
     """ An exception raised when an unknown response occurs """
 
     def __init__(self, *, response: Response):
         super().__init__()
-        self.response: Response = response
+        self.response: Response = response

tests/test_end_to_end/golden-master/my_test_api_client/api/errors.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from typing import Dict
 
+
 @dataclass
 class Client:
     """ A class for keeping track of data related to the API """
@@ -11,6 +12,7 @@ def get_headers(self) -> Dict[str, str]:
         """ Get headers to be used in all endpoints """
         return {}
 
+
 @dataclass
 class AuthenticatedClient(Client):
     """ A Client which has been authenticated for use on secured endpoints """
@@ -19,4 +21,4 @@ class AuthenticatedClient(Client):
 
     def get_headers(self) -> Dict[str, str]:
         """ Get headers to be used in authenticated endpoints """
-        return {"Authorization": f"Bearer {self.token}"}
+        return {"Authorization": f"Bearer {self.token}"}

tests/test_end_to_end/golden-master/my_test_api_client/client.py

@@ -5,10 +5,10 @@
 from typing import Dict, List, Optional, cast
 
 
-
 @dataclass
 class PingResponse:
     """  """
+
     success: bool
 
     def to_dict(self) -> Dict:
@@ -20,6 +20,4 @@ def to_dict(self) -> Dict:
     def from_dict(d: Dict) -> PingResponse:
 
         success = d["success"]
-        return PingResponse(
-            success=success,
-        )
+        return PingResponse(success=success,)

tests/test_end_to_end/golden-master/my_test_api_client/models/ping_response.py

@@ -1,10 +1,11 @@
 import os
 import shutil
-from filecmp import dircmp, cmpfiles
+from filecmp import cmpfiles, dircmp
 from pathlib import Path
 
 import pytest
 from typer.testing import CliRunner
+
 from openapi_python_client.cli import app