Clean up output

- Hide black/isort output
- Better file exists error
- More info on unsupported content_type

Author: dbanty

CHANGELOG.md

@@ -19,12 +19,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support for any supported property within a list (array), including other lists.
 - Support for Union types ("anyOf" in OpenAPI document)
 - Support for more basic response types (integer, number, boolean)
-- Better error messages when failing to parse an OpenAPI document
-    - Error messages will contain some useful information about why it failed instead of just a stack trace
-    - Client will still be generated if there are errors, excluding endpoints that had errors
 
 ### Changes
 - The way most imports are handled was changed which *should* lead to fewer unused imports in generated files.
+- Better error messages
+    - Most error messages will contain some useful information about why it failed instead of a stack trace
+    - Client will still be generated if there are recoverable errors, excluding endpoints that had those errors
+- Output from isort and black when generating will now be suppressed
 
 ## 0.3.0 - 2020-04-25
 ### Additions

openapi_python_client/__init__.py

@@ -105,8 +105,14 @@ def update(self) -> None:
         self._raise_errors()
 
     def _reformat(self) -> None:
-        subprocess.run("isort --recursive --apply", cwd=self.project_dir, shell=True)
-        subprocess.run("black .", cwd=self.project_dir, shell=True)
+        subprocess.run(
+            "isort --recursive --apply",
+            cwd=self.project_dir,
+            shell=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+        )
+        subprocess.run("black .", cwd=self.project_dir, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
     def _raise_errors(self) -> None:
         errors = []

openapi_python_client/cli.py

@@ -68,6 +68,9 @@ def handle_errors() -> Generator[None, None, None]:
         for err in e.parse_errors:
             _print_parser_error(err)
         raise typer.Exit(code=1)
+    except FileExistsError:
+        typer.secho("Directory already exists. Delete it or use the update command.", fg=typer.colors.RED, err=True)
+        raise typer.Exit(code=1)
 
 
 @app.command()

openapi_python_client/openapi_parser/responses.py

@@ -96,7 +96,7 @@ def response_from_dict(*, status_code: int, data: _ResponseDict) -> Response:
     elif "text/html" in content:
         content_type = "text/html"
     else:
-        raise ParseError(data)
+        raise ParseError(data, message=f"Unsupported content_type {content}")
 
     schema_data = data["content"][content_type]["schema"]
 

tests/test___init__.py

@@ -435,6 +435,7 @@ def test__build_api(self, mocker):
 
 
 def test__reformat(mocker):
+    import subprocess
     from openapi_python_client import _Project, OpenAPI
 
     sub_run = mocker.patch("subprocess.run")
@@ -446,8 +447,14 @@ def test__reformat(mocker):
 
     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),
+            mocker.call(
+                "isort --recursive --apply",
+                cwd=project.project_dir,
+                shell=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+            ),
+            mocker.call("black .", cwd=project.project_dir, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE),
         ]
     )
 

tests/test_cli.py

@@ -128,6 +128,17 @@ def test_generate_handle_multiple_parse_error(self, _create_new_client):
             "Please open an issue at https://github.com/triaxtec/openapi-python-client/issues/new/choose\n\n"
         )
 
+    def test_generate_handle_file_exists(self, _create_new_client):
+        error = FileExistsError()
+        _create_new_client.side_effect = error
+        path = "cool/path"
+        from openapi_python_client.cli import app
+
+        result = runner.invoke(app, ["generate", f"--path={path}"])
+
+        assert result.exit_code == 1
+        assert result.output == "Directory already exists. Delete it or use the update command.\n"
+
 
 @pytest.fixture
 def _update_existing_client(mocker):