From 09880568ab9170345b868879f8289694ea3a7c5e Mon Sep 17 00:00:00 2001 From: Meni Yakove Date: Thu, 16 Jan 2025 14:19:30 +0200 Subject: [PATCH] use class_generator, not uv for generate --- class_generator/scripts/tools.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/class_generator/scripts/tools.py b/class_generator/scripts/tools.py index 1d53a4d390..b14507c106 100644 --- a/class_generator/scripts/tools.py +++ b/class_generator/scripts/tools.py @@ -83,11 +83,28 @@ def generate_resource(kinds: List[str], yes: bool) -> None: help="Generate missing end comment for all resources under `ocp_resources` directory", ) @click.option("--regenerate-generated-files", is_flag=True, help="Regenerate all generated files") -def main(list_generated_file: bool, generated_missing_end_comment: bool, yes: bool, regenerate_generated_files) -> None: +def main( + list_generated_file: bool, generated_missing_end_comment: bool, yes: bool, regenerate_generated_files: bool +) -> None: res = get_generated_files() if regenerate_generated_files: + click.echo("Regenerating files...") + failed_kinds = [] for kind in res["with_end_comment"].keys(): - os.system(f"uv run class_generator/class_generator.py -k {kind} --overwrite") + try: + click.echo(f"Regenerating {kind}...") + if not class_generator(kind=kind, called_from_cli=False, overwrite=True): + failed_kinds.append(kind) + + except Exception as exc: + click.echo(f"Failed to regenerate {kind}: {exc}", err=True) + failed_kinds.append(kind) + if failed_kinds: + click.echo(f"Failed to regenerate: {', '.join(failed_kinds)}", err=True) + else: + click.echo("All files regenerated successfully!") + # for kind in res["with_end_comment"].keys(): + # os.system(f"uv run class_generator/class_generator.py -k {kind} --overwrite") if generated_missing_end_comment: generate_resource(kinds=list(res["without_end_comment"].keys()), yes=yes)