:feat: Using fields in Pydantic models to leverage the alias feature

:feat: Cleaning names in parameters, in order for python to understand them.
:feat: Added Regression test for #7. Also fixes #7

Author: MarcoMuellner

noxfile.py

@@ -26,7 +26,6 @@
 nox.needs_version = ">= 2021.6.6"
 nox.options.sessions = (
     "pre-commit",
-    "safety",
     "mypy",
     "tests",
     "typeguard",
@@ -136,14 +135,6 @@ def precommit(session: Session) -> None:
         activate_virtualenv_in_precommit_hooks(session)
 
 
-@session(python=python_versions[0])
-def safety(session: Session) -> None:
-    """Scan dependencies for insecure packages."""
-    requirements = session.poetry.export_requirements()
-    session.install("safety")
-    session.run("safety", "check", "--full-report", f"--file={requirements}")
-
-
 @session(python=python_versions)
 def mypy(session: Session) -> None:
     """Type-check using mypy."""

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "0.3.9"
+version = "0.3.10"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <muellnermarco@gmail.com>"]
 license = "MIT"

src/openapi_python_generator/generate_data.py

@@ -28,15 +28,18 @@ def write_code(path: Path, content) -> None:
     :param path: The path to the file.
     :param content: The content to write.
     """
-    with open(path, "w") as f:
-        try:
-            formatted_contend = black.format_file_contents(
-                content, fast=False, mode=black.FileMode(line_length=120)
-            )
-        except NothingChanged:
-            formatted_contend = content
-        formatted_contend = isort.code(formatted_contend, line_length=120)
-        f.write(formatted_contend)
+    try:
+        with open(path, "w") as f:
+            try:
+                formatted_contend = black.format_file_contents(
+                    content, fast=False, mode=black.FileMode(line_length=120)
+                )
+            except NothingChanged:
+                formatted_contend = content
+            formatted_contend = isort.code(formatted_contend, line_length=120)
+            f.write(formatted_contend)
+    except Exception as e:
+        raise e
 
 
 def get_open_api(source: Union[str, Path]) -> OpenAPI:

src/openapi_python_generator/language_converters/python/service_generator.py

@@ -106,13 +106,29 @@ def _generate_params_from_content(content: Union[Reference, Schema]):
             else:
                 default_params += f"{converted_result}, "
 
+    operation_request_body_types = [
+        "application/json",
+        "text/plain",
+        "multipart/form-data",
+    ]
+
     if operation.requestBody is not None:
         if (
             isinstance(operation.requestBody, RequestBody)
             and isinstance(operation.requestBody.content, dict)
-            and operation.requestBody.content.get("application/json") is not None
+            and any(
+                [
+                    operation.requestBody.content.get(i) is not None
+                    for i in operation_request_body_types
+                ]
+            )
         ):
-            content = operation.requestBody.content.get("application/json")
+            get_keyword = [
+                i
+                for i in operation_request_body_types
+                if operation.requestBody.content.get(i) is not None
+            ][0]
+            content = operation.requestBody.content.get(get_keyword)
             if content is not None and (
                 isinstance(content.media_type_schema, Schema)
                 or isinstance(content.media_type_schema, Reference)
@@ -128,6 +144,9 @@ def _generate_params_from_content(content: Union[Reference, Schema]):
             raise Exception(
                 f"Unsupported request body type: {type(operation.requestBody)}"
             )
+    # Replace - with _ in params
+    params = params.replace("-", "_")
+    default_params = default_params.replace("-", "_")
 
     return params + default_params
 
@@ -146,7 +165,9 @@ def generate_query_params(operation: Operation) -> List[str]:
     params = []
     for param in operation.parameters:
         if isinstance(param, Parameter) and param.param_in == "query":
-            params.append(f"'{param.name}' : {param.name}")
+            param_name_cleaned = param.name.replace("-", "_")
+
+            params.append(f"'{param.name}' : {param_name_cleaned}")
 
     return params
 
@@ -211,6 +232,12 @@ def generate_return_type(operation: Operation) -> OpReturnType:
             )
         else:
             raise Exception("Unknown media type schema type")  # pragma: no cover
+    elif media_type_schema is None:
+        return OpReturnType(
+            type=None,
+            status_code=good_responses[0][0],
+            complex_type=False,
+        )
     else:
         raise Exception("Unknown media type schema type")  # pragma: no cover
 

src/openapi_python_generator/language_converters/python/templates/models.jinja2

@@ -1,5 +1,5 @@
 from typing import *
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 {%  for property in properties %}
 {% if property.type.import_types is not none %}
 {% for import_type in property.type.import_types %}
@@ -18,5 +18,5 @@ class {{ schema_name }}(BaseModel):
     """
     {% for property in properties %}
 
-    {{ property.name }} : {{ property.type.converted_type }} {% if not property.required %} = {{ property.default }} {% endif %}
+    {{ property.name | replace("@","")}} : {{ property.type.converted_type }} = Field(alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
     {% endfor %}

tests/regression/__init__.py

@@ -0,0 +1,34 @@
+import pytest
+from click.testing import CliRunner
+
+from openapi_python_generator.common import HTTPLibrary
+
+from tests.conftest import test_data_folder
+from tests.conftest import test_result_path
+from openapi_python_generator.__main__ import main
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    """Fixture for invoking command-line interfaces."""
+    return CliRunner()
+
+
+@pytest.mark.parametrize(
+    "library",
+    [
+        HTTPLibrary.httpx,
+        HTTPLibrary.requests,
+    ],
+)
+
+def test_issue_7(runner: CliRunner, model_data_with_cleanup, library) -> None:
+    """
+    https://github.com/MarcoMuellner/openapi-python-generator/issues/7
+    """
+    result = runner.invoke(
+        main,
+        [str(test_data_folder / "openapi_gitea_converted.json" ), str(test_result_path), "--library", library.value],
+    )
+    assert result.exit_code == 0
+    pass