- Added flake settings file

- Added pre-commit settings file
- Added mypy settings file
- Fixed some code structuring

Author: MarcoMuellner

.coveragerc

@@ -1,2 +1,4 @@
 [run]
-omit = src/openapi_python_generator/language_converters/python/templates/*
+omit = src/openapi_python_generator/language_converters/python/templates/*
+[report]
+show_missing = true

.flake8

@@ -0,0 +1,8 @@
+[flake8]
+select = B,B9,BLK,C,E,F,I,W,S
+max-complexity = 15
+application-import-names = openapi_python_generator
+import-order-style = google
+ignore = E203,E501,W503
+max-line-length = 120
+per-file-ignores = tests/*:S101

.github/workflows/release.yml

@@ -3,9 +3,9 @@ name: Release
 on:
   release:
     types: [published]
-    
+
   workflow_dispatch:
-  
+
 jobs:
   release:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+-   repo: local
+    hooks:
+    -   id: black
+        name: black
+        entry: poetry run black
+        language: system
+        types: [python]
+    - id: flake8
+      name: flake8
+      entry: poetry run flake8
+      language: system
+      types: [ python ]

mypy.ini

@@ -0,0 +1,10 @@
+[mypy]
+
+[mypy-nox.*,pytest]
+ignore_missing_imports = True
+
+[mypy-openapi_schema_pydantic.*]
+ignore_missing_imports = True
+
+[mypy-autopep8.*]
+ignore_missing_imports = True

noxfile.py

@@ -21,7 +21,7 @@
     raise SystemExit(dedent(message)) from None
 
 package = "openapi_python_generator"
-python_versions = ["3.10", "3.9", "3.8", "3.7"]
+python_versions = ["3.8"]
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
     "pre-commit",
@@ -94,8 +94,8 @@ def activate_virtualenv_in_precommit_hooks(session: Session) -> None:
         text = hook.read_text()
 
         if not any(
-                Path("A") == Path("a") and bindir.lower() in text.lower() or bindir in text
-                for bindir in bindirs
+            Path("A") == Path("a") and bindir.lower() in text.lower() or bindir in text
+            for bindir in bindirs
         ):
             continue
 

src/openapi_python_generator/__main__.py

@@ -9,14 +9,14 @@
 
 
 @app.command()
-def main(file_name :str, output : str, library : Optional[HTTPLibrary]  = HTTPLibrary.httpx) -> None:
+def main(
+    file_name: str, output: str, library: Optional[HTTPLibrary] = HTTPLibrary.httpx
+) -> None:
     """
     Generate Python code from an OpenAPI 3.0 specification.
     """
     generate_data(file_name, output, library)
 
 
-
-if __name__ == "__main__": #pragma: no cover
+if __name__ == "__main__":  # pragma: no cover
     app()
-

src/openapi_python_generator/common.py

@@ -1,7 +1,9 @@
 from enum import Enum
 
+
 class HTTPLibrary(str, Enum):
     """
     Enum for the available HTTP libraries.
     """
-    httpx = 'httpx'
+
+    httpx = "httpx"

src/openapi_python_generator/generate_data.py

@@ -3,7 +3,7 @@
 
 import httpx
 from httpx import ConnectError, ConnectTimeout
-from orjson import orjson, JSONDecodeError
+import orjson
 import typer
 from pydantic import ValidationError
 import autopep8
@@ -21,34 +21,40 @@ def write_code(path: Path, content):
     :param path: The path to the file.
     :param content: The content to write.
     """
-    with open(path, 'w') as f:
+    with open(path, "w") as f:
         f.write(autopep8.fix_code(content))
 
 
-def get_open_api(path: Union[str,Path]) -> OpenAPI:
+def get_open_api(path: Union[str, Path]) -> OpenAPI:
     """
     Tries to fetch the openapi.json file from the web or load from a local file. Returns the according OpenAPI object.
     :param path:
     :return:
     """
     try:
-        if not isinstance(path,Path) and (path.startswith("http://") or path.startswith("https://")):
+        if not isinstance(path, Path) and (
+            path.startswith("http://") or path.startswith("https://")
+        ):
             return OpenAPI(**orjson.loads(httpx.get(path).text))
 
-        with open(path, 'r') as f:
+        with open(path, "r") as f:
             return OpenAPI(**orjson.loads(f.read()))
     except FileNotFoundError:
-        typer.echo(f"File {path} not found. Please make sure to pass the path to the OpenAPI 3.0 specification.")
+        typer.echo(
+            f"File {path} not found. Please make sure to pass the path to the OpenAPI 3.0 specification."
+        )
         raise
-    except (ConnectError,ConnectTimeout):
+    except (ConnectError, ConnectTimeout):
         typer.echo(f"Could not connect to {path}.")
-        raise ConnectError(f"Could not connect to {path}.")
-    except (ValidationError,JSONDecodeError):
-        typer.echo(f"File {path} is not a valid OpenAPI 3.0 specification, or there may be a problem with your JSON.")
+        raise ConnectError(f"Could not connect to {path}.") from None
+    except (ValidationError, orjson.JSONDecodeError):
+        typer.echo(
+            f"File {path} is not a valid OpenAPI 3.0 specification, or there may be a problem with your JSON."
+        )
         raise
 
 
-def write_data(data: ConversionResult, output: str):
+def write_data(data: ConversionResult, output: Union[str, Path]):
     """
     This function will firstly create the folderstrucutre of output, if it doesn't exist. Then it will create the
     models from data.models into the models sub module of the output folder. After this, the services will be created
@@ -76,26 +82,42 @@ def write_data(data: ConversionResult, output: str):
         write_code(models_path / f"{model.file_name}.py", model.content)
 
     # Create models.__init__.py file containing imports to all models.
-    write_code(models_path / "__init__.py","\n".join([f'from {file} import *' for file in files]))
+    write_code(
+        models_path / "__init__.py",
+        "\n".join([f"from {file} import *" for file in files]),
+    )
 
     files = []
 
     # Write the services.
     for service in data.services:
         files.append(service.file_name)
-        write_code(services_path / f"{service.file_name}.py", JINJA_ENV.get_template(SERVICE_TEMPLATE).render(**service.dict()))
+        write_code(
+            services_path / f"{service.file_name}.py",
+            JINJA_ENV.get_template(SERVICE_TEMPLATE).render(**service.dict()),
+        )
 
     # Create services.__init__.py file containing imports to all services.
-    write_code(services_path / "__init__.py", "\n".join([f'from {file} import *' for file in files]))
+    write_code(
+        services_path / "__init__.py",
+        "\n".join([f"from {file} import *" for file in files]),
+    )
 
     # Write the api_config.py file.
     write_code(Path(output) / "api_config.py", data.api_config.content)
 
     # Write the __init__.py file.
-    write_code(Path(output) / "__init__.py", "from models import *\nfrom services import *\nfrom api_config import *")
+    write_code(
+        Path(output) / "__init__.py",
+        "from models import *\nfrom services import *\nfrom api_config import *",
+    )
 
 
-def generate_data(file_name: str, output: str, library: Optional[HTTPLibrary] = HTTPLibrary.httpx) -> None:
+def generate_data(
+    file_name: Union[str, Path],
+    output: Union[str, Path],
+    library: Optional[HTTPLibrary] = HTTPLibrary.httpx,
+) -> None:
     """
     Generate Python code from an OpenAPI 3.0 specification.
     """

src/openapi_python_generator/language_converters/python/api_config_generator.py

@@ -1,6 +1,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,
+    API_CONFIG_TEMPLATE,
+)
 from openapi_python_generator.models import APIConfig