Skip to content

[SDK generation pipeline] allow generate from typespec and swagger at same time #36802

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 8, 2024
Merged
Changes from all commits
Commits
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
55 changes: 21 additions & 34 deletions tools/azure-sdk-tools/packaging_tools/sdk_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,30 +273,13 @@ def main(generate_input, generate_output):
result = {}
python_tag = data.get("python_tag")
package_total = set()
spec_word = "readmeMd"
if "relatedReadmeMdFiles" in data:
readme_files = data["relatedReadmeMdFiles"]
elif "relatedReadmeMdFile" in data:
input_readme = data["relatedReadmeMdFile"]
if "specification" in spec_folder:
spec_folder = str(Path(spec_folder.split("specification")[0]))
if "specification" not in input_readme:
input_readme = str(Path("specification") / input_readme)
readme_files = [input_readme]
else:
# ["specification/confidentialledger/ConfientialLedger"]
if isinstance(data["relatedTypeSpecProjectFolder"], str):
readme_files = [data["relatedTypeSpecProjectFolder"]]
else:
readme_files = data["relatedTypeSpecProjectFolder"]
spec_word = "typespecProject"

for input_readme in readme_files:
_LOGGER.info(f"[CODEGEN]({input_readme})codegen begin")
readme_and_tsp = data.get("relatedReadmeMdFiles", []) + data.get("relatedTypeSpecProjectFolder", [])
for readme_or_tsp in readme_and_tsp:
_LOGGER.info(f"[CODEGEN]({readme_or_tsp})codegen begin")
try:
if "resource-manager" in input_readme:
relative_path_readme = str(Path(spec_folder, input_readme))
update_metadata_for_multiapi_package(spec_folder, input_readme)
if "resource-manager" in readme_or_tsp:
relative_path_readme = str(Path(spec_folder, readme_or_tsp))
update_metadata_for_multiapi_package(spec_folder, readme_or_tsp)
del_outdated_files(relative_path_readme)
config = generate(
CONFIG_FILE,
Expand All @@ -307,14 +290,14 @@ def main(generate_input, generate_output):
force_generation=True,
python_tag=python_tag,
)
elif "data-plane" in input_readme:
config = gen_dpg(input_readme, data.get("autorestConfig", ""), dpg_relative_folder(spec_folder))
elif "data-plane" in readme_or_tsp:
config = gen_dpg(readme_or_tsp, data.get("autorestConfig", ""), dpg_relative_folder(spec_folder))
else:
del_outdated_generated_files(str(Path(spec_folder, input_readme)))
config = gen_typespec(input_readme, spec_folder, data["headSha"], data["repoHttpsUrl"])
del_outdated_generated_files(str(Path(spec_folder, readme_or_tsp)))
config = gen_typespec(readme_or_tsp, spec_folder, data["headSha"], data["repoHttpsUrl"])
package_names = get_package_names(sdk_folder)
except Exception as e:
_LOGGER.error(f"fail to generate sdk for {input_readme}: {str(e)}")
_LOGGER.error(f"fail to generate sdk for {readme_or_tsp}: {str(e)}")
for hint_message in [
"======================================= Whant Can I do ========================================================================",
"If you are from service team, please first check if the failure happens only to Python automation, or for all SDK automations. ",
Expand All @@ -324,9 +307,10 @@ def main(generate_input, generate_output):
]:
_LOGGER.error(hint_message)
raise e
_LOGGER.info(f"[CODEGEN]({input_readme})codegen end. [(packages:{str(package_names)})]")
_LOGGER.info(f"[CODEGEN]({readme_or_tsp})codegen end. [(packages:{str(package_names)})]")

# folder_name: "sdk/containerservice"; package_name: "azure-mgmt-containerservice"
spec_word = "readmeMd" if "readme.md" in readme_or_tsp else "typespecProject"
for folder_name, package_name in package_names:
if package_name in package_total:
continue
Expand All @@ -337,14 +321,14 @@ def main(generate_input, generate_output):
package_entry = {}
package_entry["packageName"] = package_name
package_entry["path"] = [folder_name]
package_entry[spec_word] = [input_readme]
package_entry[spec_word] = [readme_or_tsp]
package_entry["tagIsStable"] = not judge_tag_preview(sdk_code_path)
readme_python_content = get_readme_python_content(str(Path(spec_folder) / input_readme))
readme_python_content = get_readme_python_content(str(Path(spec_folder) / readme_or_tsp))
package_entry["isMultiapi"] = is_multiapi_package(readme_python_content)
result[package_name] = package_entry
else:
result[package_name]["path"].append(folder_name)
result[package_name][spec_word].append(input_readme)
result[package_name][spec_word].append(readme_or_tsp)

# Generate some necessary file for new service
init_new_service(package_name, folder_name)
Expand All @@ -359,7 +343,7 @@ def main(generate_input, generate_output):
folder_name,
package_name,
spec_folder,
input_readme,
readme_or_tsp,
)
except Exception as e:
_LOGGER.error(f"fail to update meta: {str(e)}")
Expand All @@ -386,7 +370,10 @@ def main(generate_input, generate_output):
# remove duplicates
for value in result.values():
value["path"] = list(set(value["path"]))
value[spec_word] = list(set(value[spec_word]))
if value.get("typespecProject"):
value["typespecProject"] = list(set(value["typespecProject"]))
if value.get("readmeMd"):
value["readmeMd"] = list(set(value["readmeMd"]))

with open(generate_output, "w") as writer:
json.dump(result, writer)
Expand Down