loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

import Annotated if needed (#16521)

Browse Source
This commit is contained in:
William Cheng 2023-09-07 14:36:45 +08:00 committed by GitHub
parent fbff32c5d7
commit dee536f7f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<>();

5
modules/openapi-generator/src/main/resources/python/api.mustache vendored
View File

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

1
samples/client/echo_api/python/openapi_client/api/auth_api.py
View File

@ -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

2
samples/client/echo_api/python/openapi_client/api/body_api.py
View File

@ -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

1
samples/client/echo_api/python/openapi_client/api/form_api.py
View File

@ -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

1
samples/client/echo_api/python/openapi_client/api/header_api.py
View File

@ -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

1
samples/client/echo_api/python/openapi_client/api/path_api.py
View File

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

1
samples/client/echo_api/python/openapi_client/api/query_api.py
View File

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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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

2
samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
View File

@ -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

1
samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
View File

@ -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

2
samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
View File

@ -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

2
samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags123_api.py
View File

@ -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

2
samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
View File

@ -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

2
samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
View File

@ -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

2
samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
View File

@ -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