diff --git a/bin/configs/python-fastapi.yaml b/bin/configs/python-fastapi.yaml index f2b7c97fbd1c..15eaa6a4dde4 100644 --- a/bin/configs/python-fastapi.yaml +++ b/bin/configs/python-fastapi.yaml @@ -5,3 +5,4 @@ templateDir: modules/openapi-generator/src/main/resources/python-fastapi sourceFolder: "src" additionalProperties: hideGenerationTimestamp: "true" + packageVersion: "3.4.5" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java index dc3bdc02a8da..b820960915d1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonFastAPIServerCodegen.java @@ -93,6 +93,7 @@ public PythonFastAPIServerCodegen() { additionalProperties.put("baseSuffix", BASE_CLASS_SUFFIX); additionalProperties.put(CodegenConstants.SOURCE_FOLDER, DEFAULT_SOURCE_FOLDER); additionalProperties.put(CodegenConstants.PACKAGE_NAME, DEFAULT_PACKAGE_NAME); + additionalProperties.put(CodegenConstants.PACKAGE_VERSION, DEFAULT_PACKAGE_VERSION); additionalProperties.put(CodegenConstants.FASTAPI_IMPLEMENTATION_PACKAGE, DEFAULT_IMPL_FOLDER); languageSpecificPrimitives.add("List"); @@ -152,6 +153,13 @@ public void processOpts() { if (additionalProperties.containsKey(CodegenConstants.PACKAGE_NAME)) { setPackageName((String) additionalProperties.get(CodegenConstants.PACKAGE_NAME)); + } else { + // default to appVersion in the spec + setPackageName((String) additionalProperties.get("appVersion")); + } + + if (additionalProperties.containsKey(CodegenConstants.PACKAGE_VERSION)) { + setPackageVersion((String) additionalProperties.get(CodegenConstants.PACKAGE_VERSION)); } if (additionalProperties.containsKey(CodegenConstants.SOURCE_FOLDER)) { diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache index f7a6f4437c5c..9eb2e18a44da 100644 --- a/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache +++ b/modules/openapi-generator/src/main/resources/python-fastapi/requirements.mustache @@ -29,7 +29,7 @@ Rx==1.6.1 starlette==0.49.1 typing-extensions==4.13.2 ujson==4.0.2 -urllib3==2.6.3 +urllib3==2.7.0 uvicorn==0.13.4 uvloop==0.21.0 watchgod==0.7 diff --git a/modules/openapi-generator/src/main/resources/python-fastapi/setup_cfg.mustache b/modules/openapi-generator/src/main/resources/python-fastapi/setup_cfg.mustache index b02423bb39e5..03b4dc4e3926 100644 --- a/modules/openapi-generator/src/main/resources/python-fastapi/setup_cfg.mustache +++ b/modules/openapi-generator/src/main/resources/python-fastapi/setup_cfg.mustache @@ -1,6 +1,6 @@ [metadata] name = {{packageName}} -version = {{appVersion}} +version = {{packageVersion}} description = {{appDescription}} long_description = file: README.md keywords = OpenAPI {{appName}} diff --git a/samples/server/petstore/python-fastapi/requirements.txt b/samples/server/petstore/python-fastapi/requirements.txt index f7a6f4437c5c..9eb2e18a44da 100644 --- a/samples/server/petstore/python-fastapi/requirements.txt +++ b/samples/server/petstore/python-fastapi/requirements.txt @@ -29,7 +29,7 @@ Rx==1.6.1 starlette==0.49.1 typing-extensions==4.13.2 ujson==4.0.2 -urllib3==2.6.3 +urllib3==2.7.0 uvicorn==0.13.4 uvloop==0.21.0 watchgod==0.7 diff --git a/samples/server/petstore/python-fastapi/setup.cfg b/samples/server/petstore/python-fastapi/setup.cfg index ebc8e203de84..ee047207bdea 100644 --- a/samples/server/petstore/python-fastapi/setup.cfg +++ b/samples/server/petstore/python-fastapi/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = openapi_server -version = 1.0.0 +version = 3.4.5 description = This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. long_description = file: README.md keywords = OpenAPI OpenAPI Petstore