Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix other overriding imports #703

Merged
merged 5 commits into from
Nov 19, 2024
Merged

Fix other overriding imports #703

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4254f0
Fix overriding imports
habara-k Nov 6, 2024
854107d
Add auto-generated codes
habara-k Nov 6, 2024
e2b606f
Fix other overriding imports
habara-k Nov 6, 2024
86f23e4
Merge branch 'master' into fix-other-overriding-imports
Yang-33 Nov 7, 2024
a9ff003
Merge branch 'master' into fix-other-overriding-imports
habara-k Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions generator/src/main/java/line/bot/generator/PythonNextgenCustomClientGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,6 +1246,9 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
pydanticImports.add("validator");
} else { // typical model
codegenProperties = model.vars;
if (model.getDiscriminator() != null && model.getDiscriminator().getMappedModels() != null) {
typingImports.add("Union");
}
}

//loop through properties/schemas to set up typing, pydantic
Expand Down Expand Up @@ -1323,39 +1326,37 @@ private ModelsMap postProcessModelsMap(ModelsMap objs) {
}
}

if (!model.isEnum) {
pydanticImports.add("BaseModel");
}

// add parent model to import
if (!StringUtils.isEmpty(model.parent)) {
modelImports.add(model.parent);
// Extention for discriminator
modelImports.addAll(model.imports);

String mappedTypeName = mappingName(model.name, model.parentModel.getDiscriminator());
model.vendorExtensions.putIfAbsent("x-py-type-name", mappedTypeName);
model.vendorExtensions.put("x-py-type-name", mappedTypeName);
} else if (!model.isEnum) {
pydanticImports.add("BaseModel");
}

// set enum type in extensions and update `name` in enumVars
if (model.isEnum) {
for (Map<String, Object> enumVars : (List<Map<String, Object>>) model.getAllowableValues().get("enumVars")) {
if ((Boolean) enumVars.get("isString")) {
model.vendorExtensions.putIfAbsent("x-py-enum-type", "str");
model.vendorExtensions.put("x-py-enum-type", "str");
// update `name`, e.g.
enumVars.put("name", toEnumVariableName((String) enumVars.get("value"), "str"));
} else {
model.vendorExtensions.putIfAbsent("x-py-enum-type", "int");
model.vendorExtensions.put("x-py-enum-type", "int");
enumVars.put("name", toEnumVariableName((String) enumVars.get("value"), "int"));
}
}
}

// set the extensions if the key is absent
model.getVendorExtensions().putIfAbsent("x-py-typing-imports", typingImports);
model.getVendorExtensions().putIfAbsent("x-py-pydantic-imports", pydanticImports);
model.getVendorExtensions().putIfAbsent("x-py-datetime-imports", datetimeImports);
model.getVendorExtensions().putIfAbsent("x-py-readonly", readOnlyFields);
model.getVendorExtensions().put("x-py-typing-imports", typingImports);
model.getVendorExtensions().put("x-py-pydantic-imports", pydanticImports);
model.getVendorExtensions().put("x-py-datetime-imports", datetimeImports);
model.getVendorExtensions().put("x-py-readonly", readOnlyFields);

// import models one by one
if (!modelImports.isEmpty()) {
Expand Down