Skip to content

Commit

Permalink
Refactor: Better percentage formatting (#33595)
Browse files Browse the repository at this point in the history
  • Loading branch information
eumiro committed Aug 23, 2023
1 parent 2f8caf9 commit 92474db
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 17 deletions.
3 changes: 1 addition & 2 deletions airflow/providers/common/sql/operators/sql.py
Expand Up @@ -837,14 +837,13 @@ def execute(self, context: Context):
pass_value_conv = _convert_to_float_if_possible(self.pass_value)
is_numeric_value_check = isinstance(pass_value_conv, float)

tolerance_pct_str = str(self.tol * 100) + "%" if self.tol is not None else None
error_msg = (
"Test failed.\nPass value:{pass_value_conv}\n"
"Tolerance:{tolerance_pct_str}\n"
"Query:\n{sql}\nResults:\n{records!s}"
).format(
pass_value_conv=pass_value_conv,
tolerance_pct_str=tolerance_pct_str,
tolerance_pct_str=f"{self.tol:.1%}" if self.tol is not None else None,
sql=self.sql,
records=records,
)
Expand Down
3 changes: 1 addition & 2 deletions airflow/providers/google/cloud/hooks/bigquery.py
Expand Up @@ -3182,15 +3182,14 @@ def value_check(
raise AirflowException("The query returned None")
pass_value_conv = self._convert_to_float_if_possible(pass_value)
is_numeric_value_check = isinstance(pass_value_conv, float)
tolerance_pct_str = str(tolerance * 100) + "%" if tolerance else None

error_msg = (
"Test failed.\nPass value:{pass_value_conv}\n"
"Tolerance:{tolerance_pct_str}\n"
"Query:\n{sql}\nResults:\n{records!s}"
).format(
pass_value_conv=pass_value_conv,
tolerance_pct_str=tolerance_pct_str,
tolerance_pct_str=f"{tolerance:.1%}" if tolerance else None,
sql=sql,
records=records,
)
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/utils/parallel.py
Expand Up @@ -402,15 +402,15 @@ def check_async_run_results(
completed_number = current_completed_number
get_console().print(
f"\n[info]Completed {completed_number} out of {total_number_of_results} "
f"({int(100*completed_number/total_number_of_results)}%).[/]\n"
f"({completed_number / total_number_of_results:.0%}).[/]\n"
)
print_async_summary(completed_list)
time.sleep(poll_time_seconds)
completed_list = get_completed_result_list(results)
completed_number = len(completed_list)
get_console().print(
f"\n[info]Completed {completed_number} out of {total_number_of_results} "
f"({int(100*completed_number/total_number_of_results)}%).[/]\n"
f"({completed_number / total_number_of_results:.0%}).[/]\n"
)
print_async_summary(completed_list)
errors = False
Expand Down
16 changes: 5 additions & 11 deletions dev/system_tests/update_issue_status.py
Expand Up @@ -171,7 +171,7 @@ def update_issue_status(
console.print(f"[blue]Summary of performed actions: for {issue.title}[/]")
console.print(f" Re-added file number (still there): {count_re_added}")
console.print(f" Completed file number: {count_completed}")
console.print(f" Done {count_done}/{count_all} = {(count_done * 100/ count_all):.2f}%")
console.print(f" Done {count_done}/{count_all} = {count_done / count_all:.2%}")
console.print()
total_re_added += count_re_added
total_completed += count_completed
Expand Down Expand Up @@ -199,22 +199,19 @@ def update_issue_status(
console.print(f"[green]Summary of ALL issues: for {num_issues} issues[/]")
console.print(
f" Completed and closed issues: {len(completed_closed_issues)}/{num_issues}: "
f"{len(completed_closed_issues) * 100/num_issues:.2f}%"
f"{len(completed_closed_issues) / num_issues:.2%}"
)
console.print(
f" Completed files {total_count_done}/{total_count_all} = "
f"{(total_count_done * 100/ total_count_all):.2f}%"
f"{total_count_done / total_count_all:.2%}"
)
console.print()
if not_completed_closed_issues:
console.print("[yellow] Issues that are not completed and should be opened:[/]\n")
for issue in not_completed_closed_issues:
all = per_issue_num_all[issue.id]
done = per_issue_num_done[issue.id]
console.print(
rf" * [[yellow]{issue.title}[/]]({issue.html_url}): "
f"{done}/{all} : {done * 100 / all:.2f}%"
)
console.print(f" * [[yellow]{issue.title}[/]]({issue.html_url}): {done}/{all} : {done / all:.2%}")
console.print()
if completed_open_issues:
console.print("[yellow] Issues that are completed and should be closed:[/]\n")
Expand All @@ -226,10 +223,7 @@ def update_issue_status(
for issue in not_completed_opened_issues:
all = per_issue_num_all[issue.id]
done = per_issue_num_done[issue.id]
console.print(
rf" * [[yellow]{issue.title}[/]]({issue.html_url}): "
f"{done}/{all} : {done * 100 / all:.2f}%"
)
console.print(f" * [[yellow]{issue.title}[/]]({issue.html_url}): {done}/{all} : {done / all:.2%}")
console.print()
if completed_closed_issues:
console.print("[green] Issues that are completed and are already closed:[/]\n")
Expand Down

0 comments on commit 92474db

Please sign in to comment.