import Annotated if needed (#16521)

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

@@ -1747,6 +1747,7 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
     @Override
     public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels) {
         hasModelsToImport = false;
+        boolean importAnnotated = false;
         TreeSet<String> typingImports = new TreeSet<>();
         TreeSet<String> pydanticImports = new TreeSet<>();
         TreeSet<String> datetimeImports = new TreeSet<>();
@@ -1807,6 +1808,7 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
                     param.vendorExtensions.put("x-py-typing", typing);
                 } else {
                     param.vendorExtensions.put("x-py-typing", String.format(Locale.ROOT, "Annotated[%s, %s]", typing, fieldCustomization));
+                    importAnnotated = true;
                 }
             }
 
@@ -1838,6 +1840,12 @@ public abstract class AbstractPythonCodegen extends DefaultCodegen implements Co
 
         List<Map<String, String>> newImports = new ArrayList<>();
 
+        if (importAnnotated) {
+            Map<String, String> item = new HashMap<>();
+            item.put("import", String.format(Locale.ROOT, String.format(Locale.ROOT, "from typing_extensions import Annotated")));
+            newImports.add(item);
+        }
+
         // need datetime import
         if (!datetimeImports.isEmpty()) {
             Map<String, String> item = new HashMap<>();

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

@@ -7,8 +7,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated{{#asyncio}}
+{{#asyncio}}
-from typing import overload, Optional, Union, Awaitable{{/asyncio}}
+from typing import overload, Optional, Union, Awaitable
+{{/asyncio}}
 
 {{#imports}}
 {{import}}

samples/client/echo_api/python/openapi_client/api/auth_api.py

@@ -18,7 +18,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
 
 from openapi_client.api_client import ApiClient

samples/client/echo_api/python/openapi_client/api/body_api.py

@@ -18,8 +18,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictBytes, StrictStr, conlist
 
 from typing import Any, Dict, Optional, Union

samples/client/echo_api/python/openapi_client/api/form_api.py

@@ -18,7 +18,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
 from pydantic import StrictBool, StrictInt, StrictStr
 

samples/client/echo_api/python/openapi_client/api/header_api.py

@@ -18,7 +18,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
 from pydantic import StrictBool, StrictInt, StrictStr
 

samples/client/echo_api/python/openapi_client/api/path_api.py

@@ -18,7 +18,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
 from pydantic import StrictInt, StrictStr
 

samples/client/echo_api/python/openapi_client/api/query_api.py

@@ -18,7 +18,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
 from datetime import date, datetime
 

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/another_fake_api.py

@@ -17,9 +17,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
+from typing_extensions import Annotated
 from pydantic import Field
 
 from petstore_api.models.client import Client

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/default_api.py

@@ -17,7 +17,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
 from petstore_api.models.foo_get_default_response import FooGetDefaultResponse

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py

@@ -17,9 +17,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
+from typing_extensions import Annotated
 from datetime import date, datetime
 
 from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr, conbytes, confloat, conint, conlist, constr, validator

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_classname_tags123_api.py

@@ -17,9 +17,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
+from typing_extensions import Annotated
 from pydantic import Field
 
 from petstore_api.models.client import Client

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/pet_api.py

@@ -17,9 +17,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictBytes, StrictInt, StrictStr, conlist, validator
 
 from typing import List, Optional, Union

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/store_api.py

@@ -17,9 +17,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictStr, conint
 
 from typing import Dict

samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/user_api.py

@@ -17,9 +17,9 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 from typing import overload, Optional, Union, Awaitable
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictStr, conlist
 
 from petstore_api.models.user import User

samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py

@@ -17,8 +17,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from pydantic import Field
 
 from petstore_api.models.client import Client

samples/openapi3/client/petstore/python/petstore_api/api/default_api.py

@@ -17,7 +17,6 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
 from petstore_api.models.foo_get_default_response import FooGetDefaultResponse
 

samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py

@@ -17,8 +17,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from datetime import date, datetime
 
 from pydantic import Field, StrictBool, StrictBytes, StrictFloat, StrictInt, StrictStr, conbytes, confloat, conint, conlist, constr, validator

samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags123_api.py

@@ -17,8 +17,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from pydantic import Field
 
 from petstore_api.models.client import Client

samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py

@@ -17,8 +17,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictBytes, StrictInt, StrictStr, conlist, validator
 
 from typing import List, Optional, Union

samples/openapi3/client/petstore/python/petstore_api/api/store_api.py

@@ -17,8 +17,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictStr, conint
 
 from typing import Dict

samples/openapi3/client/petstore/python/petstore_api/api/user_api.py

@@ -17,8 +17,8 @@ import io
 import warnings
 
 from pydantic import validate_arguments, ValidationError
-from typing_extensions import Annotated
 
+from typing_extensions import Annotated
 from pydantic import Field, StrictStr, conlist
 
 from petstore_api.models.user import User