bugfix/generate_correct_setup_py_when_no_apis

Author: lseguin

modules/openapi-generator/src/main/resources/python/setup.mustache

@@ -13,9 +13,6 @@ from setuptools import setup, find_packages # noqa: H301
 NAME = "{{{projectName}}}"
 VERSION = "{{packageVersion}}"
 PYTHON_REQUIRES = ">= 3.8"
-{{#apiInfo}}
-{{#apis}}
-{{#-last}}
 REQUIRES = [
  "urllib3 >= 1.25.3, < 3.0.0",
  "python-dateutil >= 2.8.2",
@@ -33,25 +30,21 @@ REQUIRES = [
  "pydantic >= 2",
  "typing-extensions >= 4.7.1",
 ]
-
 setup(
- name=NAME,
- version=VERSION,
- description="{{appName}}",
- author="{{infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}",
- author_email="{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}",
- url="{{packageUrl}}",
- keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"],
- install_requires=REQUIRES,
- packages=find_packages(exclude=["test", "tests"]),
- include_package_data=True,
- {{#licenseInfo}}license="{{.}}",
- {{/licenseInfo}}long_description_content_type='text/markdown',
- long_description="""\
- {{appDescription}}
- """, # noqa: E501
- package_data={"{{{packageName}}}": ["py.typed"]},
-)
-{{/-last}}
-{{/apis}}
-{{/apiInfo}}
+name=NAME,
+version=VERSION,
+description="{{appName}}",
+author="{{infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}",
+author_email="{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}",
+url="{{packageUrl}}",
+keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"],
+install_requires=REQUIRES,
+packages=find_packages(exclude=["test", "tests"]),
+include_package_data=True,
+{{#licenseInfo}}license="{{.}}",
+{{/licenseInfo}}long_description_content_type='text/markdown',
+long_description="""\
+{{appDescription}}
+""", # noqa: E501
+package_data={"{{{packageName}}}": ["py.typed"]},
+)

modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java

@@ -28,6 +28,8 @@
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.PythonClientCodegen;
 import org.openapitools.codegen.languages.features.CXFServerFeatures;
+
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.openapitools.codegen.TestUtils.assertFileContains;
 import static org.openapitools.codegen.TestUtils.assertFileExists;
 import org.openapitools.codegen.TestUtils;
@@ -541,4 +543,27 @@ public void testEnumPropertyWithQuotes() {
  Assert.assertEquals(codegen.toEnumValue("1.0", "float"), "1.0");
  Assert.assertEquals(codegen.toEnumValue("1", "int"), "1");
  }
+
+ @Test
+ public void testHandleNoApis() throws IOException {
+ File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+ output.deleteOnExit();
+ final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/no_apis.yaml");
+ final DefaultGenerator defaultGenerator = new DefaultGenerator();
+ final ClientOptInput clientOptInput = new ClientOptInput();
+ clientOptInput.openAPI(openAPI);
+ PythonClientCodegen pythonClientCodegen = new PythonClientCodegen();
+ pythonClientCodegen.setOutputDir(output.getAbsolutePath());
+ clientOptInput.config(pythonClientCodegen);
+ defaultGenerator.opts(clientOptInput);
+
+ Map<String, File> files = defaultGenerator.generate().stream().collect(Collectors.toMap(File::getPath, Function.identity()));
+
+ File apiFile = files.get(Paths.get(output.getAbsolutePath(), "openapi_client", "api", "hello_example_api.py").toString());
+ assertNull(apiFile);
+
+ File setupFile = files.get(Paths.get(output.getAbsolutePath(), "setup.py").toString());
+ assertNotNull(setupFile);
+ assertFileContains(setupFile.toPath(), "setup(");
+ }
 }

modules/openapi-generator/src/test/resources/3_0/no_apis.yaml

@@ -0,0 +1,16 @@
+openapi: 3.0.3
+info:
+ title: Example Hello API
+ description: ''
+ version: v1
+servers:
+ - url: http://localhost
+ description: Global Endpoint
+paths: {}
+components:
+ schemas:
+ HelloResponse:
+ type: object
+ properties:
+ message:
+ type: string