[python-experimental] reduces python version (#13481)

* Removes classmethod property combinations

* Changes python version to 3.8

* Changes python version to 3.7

* Tests fixed

* Samples updated

* Adds getAddSuffixToDuplicateOperationNickname and uses it in python-exp, samples regenerated

* test_paths regenerated

* Fixes bug

* Adds typing_extensions requirement

Author: spacether

docs/generators/python-experimental.md

@@ -10,7 +10,7 @@ title: Documentation for the python-experimental Generator
 | generator stability | EXPERIMENTAL | |
 | generator type | CLIENT | |
 | generator language | Python | |
-| generator language version | >=3.9 | |
+| generator language version | >=3.7 | |
 | generator default templating engine | handlebars | |
 | helpTxt | Generates a Python client library<br /><br />Features in this generator:<br />- type hints on endpoints and model creation<br />- model parameter names use the spec defined keys and cases<br />- robust composition (oneOf/anyOf/allOf/not) where payload data is stored in one instance only<br />- endpoint parameter names use the spec defined keys and cases<br />- inline schemas are supported at any location including composition<br />- multiple content types supported in request body and response bodies<br />- run time type checking<br />- Sending/receiving decimals as strings supported with type:string format: number -> DecimalSchema<br />- Sending/receiving uuids as strings supported with type:string format: uuid -> UUIDSchema<br />- quicker load time for python modules (a single endpoint can be imported and used without loading others)<br />- all instances of schemas dynamically inherit from all matching schemas so one can use isinstance to check if validation passed<br />- composed schemas with type constraints supported (type:object + oneOf/anyOf/allOf)<br />- schemas are not coerced/cast. For example string + date are both stored as string, and there is a date accessor<br />    - Exceptions: int/float is stored as Decimal, When receiving data from headers it will start as str and may need to be cast for example to int | |
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -328,4 +328,6 @@ public interface CodegenConfig {
     List<VendorExtension> getSupportedVendorExtensions();
 
     boolean getUseInlineModelResolver();
+
+    boolean getAddSuffixToDuplicateOperationNicknames();
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -297,6 +297,12 @@ apiTemplateFiles are for API outputs only (controllers/handlers).
     // from deeper schema defined locations
     protected boolean addSchemaImportsFromV3SpecLocations = false;
 
+    protected boolean addSuffixToDuplicateOperationNicknames = true;
+
+    public boolean getAddSuffixToDuplicateOperationNicknames() {
+        return addSuffixToDuplicateOperationNicknames;
+    }
+
     @Override
     public List<CliOption> cliOptions() {
         return cliOptions;

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

@@ -1200,16 +1200,18 @@ private OperationsMap processOperations(CodegenConfig config, String tag, List<C
         objs.setClassname(config.toApiName(tag));
         objs.setPathPrefix(config.toApiVarName(tag));
 
-        // check for operationId uniqueness
-        Set<String> opIds = new HashSet<>();
-        int counter = 0;
-        for (CodegenOperation op : ops) {
-            String opId = op.nickname;
-            if (opIds.contains(opId)) {
-                counter++;
-                op.nickname += "_" + counter;
+        // check for nickname uniqueness
+        if (config.getAddSuffixToDuplicateOperationNicknames()) {
+            Set<String> opIds = new HashSet<>();
+            int counter = 0;
+            for (CodegenOperation op : ops) {
+                String opId = op.nickname;
+                if (opIds.contains(opId)) {
+                    counter++;
+                    op.nickname += "_" + counter;
+                }
+                opIds.add(opId);
             }
-            opIds.add(opId);
         }
         objs.setOperation(ops);
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonExperimentalClientCodegen.java

@@ -20,7 +20,6 @@
 import com.github.curiousoddman.rgxgen.config.RgxGenOption;
 import com.github.curiousoddman.rgxgen.config.RgxGenProperties;
 import com.google.common.base.CaseFormat;
-import io.swagger.v3.oas.annotations.tags.Tags;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
@@ -112,6 +111,7 @@ public PythonExperimentalClientCodegen() {
         addSchemaImportsFromV3SpecLocations = true;
         sortModelPropertiesByRequiredFlag = Boolean.TRUE;
         sortParamsByRequiredFlag = Boolean.TRUE;
+        addSuffixToDuplicateOperationNicknames = false;
 
         modifyFeatureSet(features -> features
                 .includeSchemaSupportFeatures(
@@ -2638,7 +2638,7 @@ public String defaultTemplatingEngine() {
     }
 
     @Override
-    public String generatorLanguageVersion() { return ">=3.9"; };
+    public String generatorLanguageVersion() { return ">=3.7"; };
 
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {

modules/openapi-generator/src/main/resources/python-experimental/README.handlebars

@@ -18,8 +18,6 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
 ## Requirements.
 
 Python {{generatorLanguageVersion}}
-v3.9 is needed so one can combine classmethod and property decorators to define
-object schema properties as classes
 
 ## Migration from other generators like python and python-legacy
 
@@ -60,6 +58,16 @@ object schema properties as classes
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
     and additionalProperty values
+8. The location of the api classes has changed
+    - Api classes are located in your_package.apis.tags.some_api
+    - This change was made to eliminate redundant code generation
+    - Legacy generators generated the same endpoint twice if it had > 1 tag on it
+    - This generator defines an endpoint in one class, then inherits that class to generate
+      apis by tags and by paths
+    - This change reduces code and allows quicker run time if you use the path apis
+        - path apis are at your_package.apis.paths.some_path
+    - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
+    - So you will need to update your import paths to the api classes
 
 ### Why are Oapg and _oapg used in class and method names?
 Classes can have arbitrarily named properties set on them

modules/openapi-generator/src/main/resources/python-experimental/__init__test_paths.handlebars

@@ -41,7 +41,7 @@ class ApiTestMixin:
         )
 
     @staticmethod
-    def headers_for_content_type(content_type: str) -> dict[str, str]:
+    def headers_for_content_type(content_type: str) -> typing.Dict[str, str]:
         return {'content-type': content_type}
 
     @classmethod
@@ -50,7 +50,7 @@ class ApiTestMixin:
         body: typing.Union[str, bytes],
         status: int = 200,
         content_type: str = json_content_type,
-        headers: typing.Optional[dict[str, str]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         preload_content: bool = True
     ) -> urllib3.HTTPResponse:
         if headers is None:

modules/openapi-generator/src/main/resources/python-experimental/api_client.handlebars

@@ -13,6 +13,7 @@ from multiprocessing.pool import ThreadPool
 import re
 import tempfile
 import typing
+import typing_extensions
 import urllib3
 from urllib3._collections import HTTPHeaderDict
 from urllib.parse import urlparse, quote
@@ -704,7 +705,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         )
 
     @staticmethod
-    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict[str, str]:
+    def __to_headers(in_data: typing.Tuple[typing.Tuple[str, str], ...]) -> HTTPHeaderDict:
         data = tuple(t for t in in_data if t)
         headers = HTTPHeaderDict()
         if not data:
@@ -716,7 +717,7 @@ class HeaderParameter(ParameterBase, StyleSimpleSerializer):
         self,
         in_data: typing.Union[
             Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
-    ) -> HTTPHeaderDict[str, str]:
+    ) -> HTTPHeaderDict:
         if self.schema:
             cast_in_data = self.schema(in_data)
             cast_in_data = self._json_encoder.default(cast_in_data)
@@ -1270,7 +1271,7 @@ class Api:
         self.api_client = api_client
 
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -1342,9 +1343,9 @@ class Api:
         return host
 
 
-class SerializedRequestBody(typing.TypedDict, total=False):
+class SerializedRequestBody(typing_extensions.TypedDict, total=False):
     body: typing.Union[str, bytes]
-    fields: typing.Tuple[typing.Union[RequestField, tuple[str, str]], ...]
+    fields: typing.Tuple[typing.Union[RequestField, typing.Tuple[str, str]], ...]
 
 
 class RequestBody(StyleFormSerializer, JSONDetector):

modules/openapi-generator/src/main/resources/python-experimental/apis_path_to_api.handlebars

@@ -1,11 +1,11 @@
-import typing
+import typing_extensions
 
 from {{packageName}}.paths import PathValues
 {{#each pathModuleToApiClassname}}
 from {{packageName}}.apis.paths.{{@key}} import {{this}}
 {{/each}}
 
-PathToApi = typing.TypedDict(
+PathToApi = typing_extensions.TypedDict(
     'PathToApi',
     {
 {{#each pathEnumToApiClassname}}

modules/openapi-generator/src/main/resources/python-experimental/apis_tag_to_api.handlebars

@@ -1,11 +1,11 @@
-import typing
+import typing_extensions
 
 from {{packageName}}.apis.tags import TagValues
 {{#each tagModuleNameToApiClassname}}
 from {{packageName}}.apis.tags.{{@key}} import {{this}}
 {{/each}}
 
-TagToApi = typing.TypedDict(
+TagToApi = typing_extensions.TypedDict(
     'TagToApi',
     {
 {{#each tagEnumToApiClassname}}