Skip to content

Commit b076c99

Browse files
NejcSNejcS
committed
prevent console messages from polluting post exec output
1 parent 2d1e380 commit b076c99

5 files changed

Lines changed: 67 additions & 89 deletions

File tree

‎render_machine/actions/fix_conformance_test.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ def execute(self, render_context: RenderContext, previous_action_payload: Any |
3131
render_context.conformance_tests_running_context.current_testing_frid
3232
)
3333

34-
if render_context.conformance_tests_running_context.current_testing_frid == render_context.frid_context.frid:
35-
console_message = f"Fixing conformance test for functionality {render_context.conformance_tests_running_context.current_testing_frid} in module {render_context.conformance_tests_running_context.current_testing_module_name}."
36-
else:
37-
console_message = f"While implementing functionality {render_context.frid_context.frid}, conformance tests for functionality {render_context.conformance_tests_running_context.current_testing_frid} in module {render_context.conformance_tests_running_context.current_testing_module_name} broke. Fixing them..."
38-
3934
existing_files, existing_files_content = ImplementationCodeHelpers.fetch_existing_files(
4035
render_context.build_folder
4136
)
@@ -78,7 +73,6 @@ def execute(self, render_context: RenderContext, previous_action_payload: Any |
7873
style=console.INPUT_STYLE,
7974
)
8075

81-
with console.status(console_message):
8276
[conformance_tests_fixed, response_files] = render_context.codeplain_api.fix_conformance_tests_issue(
8377
render_context.frid_context.frid,
8478
render_context.conformance_tests_running_context.current_testing_frid,

‎render_machine/actions/fix_unit_tests.py‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,16 @@ def execute(self, render_context: RenderContext, previous_action_payload: Any |
3333
render_context, existing_files_content, "Files sent as input to unit tests fixing:"
3434
)
3535

36-
with console.status(
37-
f"[{console.INFO_STYLE}]Fixing unit tests issue for functionality {render_context.frid_context.frid}...\n"
38-
):
39-
response_files = render_context.codeplain_api.fix_unittests_issue(
40-
render_context.frid_context.frid,
41-
render_context.plain_source_tree,
42-
render_context.frid_context.linked_resources,
43-
existing_files_content,
44-
render_context.module_name,
45-
render_context.get_required_modules_functionalities(),
46-
previous_unittests_issue,
47-
run_state=render_context.run_state,
48-
)
36+
response_files = render_context.codeplain_api.fix_unittests_issue(
37+
render_context.frid_context.frid,
38+
render_context.plain_source_tree,
39+
render_context.frid_context.linked_resources,
40+
existing_files_content,
41+
render_context.module_name,
42+
render_context.get_required_modules_functionalities(),
43+
previous_unittests_issue,
44+
run_state=render_context.run_state,
45+
)
4946

5047
_, changed_files = file_utils.update_build_folder_with_rendered_files(
5148
render_context.build_folder, existing_files, response_files

‎render_machine/actions/refactor_code.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
2626
existing_files_content,
2727
style=console.INPUT_STYLE,
2828
)
29-
with console.status(
30-
f"[{console.INFO_STYLE}]Refactoring the generated code for functionality {render_context.frid_context.frid}..."
31-
):
32-
response_files = render_context.codeplain_api.refactor_source_files_if_needed(
33-
frid=render_context.frid_context.frid,
34-
files_to_check=render_context.frid_context.changed_files,
35-
existing_files_content=existing_files_content,
36-
run_state=render_context.run_state,
37-
)
29+
30+
response_files = render_context.codeplain_api.refactor_source_files_if_needed(
31+
frid=render_context.frid_context.frid,
32+
files_to_check=render_context.frid_context.changed_files,
33+
existing_files_content=existing_files_content,
34+
run_state=render_context.run_state,
35+
)
3836

3937
if len(response_files) == 0:
4038
if render_context.verbose:

‎render_machine/actions/render_conformance_tests.py‎

Lines changed: 41 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,18 @@ def _render_conformance_tests(self, render_context: RenderContext):
3333
)
3434

3535
if not render_context.conformance_tests_running_context.current_conformance_tests_exist():
36-
with console.status(
37-
f"[{console.INFO_STYLE}]Generating folder name for conformance tests for functionality {render_context.conformance_tests_running_context.current_testing_frid}...\n"
38-
):
39-
fr_subfolder_name = render_context.codeplain_api.generate_folder_name_from_functional_requirement(
40-
frid=render_context.conformance_tests_running_context.current_testing_frid,
41-
functional_requirement=render_context.conformance_tests_running_context.current_testing_frid_specifications[
42-
plain_spec.FUNCTIONAL_REQUIREMENTS
43-
][
44-
-1
45-
],
46-
existing_folder_names=render_context.conformance_tests.fetch_existing_conformance_test_folder_names(
47-
render_context.conformance_tests_running_context.current_testing_module_name
48-
),
49-
run_state=render_context.run_state,
50-
)
36+
fr_subfolder_name = render_context.codeplain_api.generate_folder_name_from_functional_requirement(
37+
frid=render_context.conformance_tests_running_context.current_testing_frid,
38+
functional_requirement=render_context.conformance_tests_running_context.current_testing_frid_specifications[
39+
plain_spec.FUNCTIONAL_REQUIREMENTS
40+
][
41+
-1
42+
],
43+
existing_folder_names=render_context.conformance_tests.fetch_existing_conformance_test_folder_names(
44+
render_context.conformance_tests_running_context.current_testing_module_name
45+
),
46+
run_state=render_context.run_state,
47+
)
5148

5249
conformance_tests_folder_name = os.path.join(
5350
render_context.conformance_tests.get_module_conformance_tests_folder(render_context.module_name),
@@ -95,25 +92,23 @@ def _render_conformance_tests(self, render_context: RenderContext):
9592
)
9693

9794
all_acceptance_tests = render_context.frid_context.specifications.get(plain_spec.ACCEPTANCE_TESTS, [])
98-
with console.status(
99-
f"[{console.INFO_STYLE}]Rendering conformance test for functionality {render_context.conformance_tests_running_context.current_testing_frid}...\n"
100-
):
101-
response_files, implementation_plan_summary = render_context.codeplain_api.render_conformance_tests(
102-
render_context.frid_context.frid,
103-
render_context.conformance_tests_running_context.current_testing_frid,
104-
render_context.plain_source_tree,
105-
render_context.frid_context.linked_resources,
106-
existing_files_content,
107-
memory_files_content,
108-
render_context.module_name,
109-
render_context.get_required_modules_functionalities(),
110-
conformance_tests_folder_name,
111-
render_context.conformance_tests_running_context.get_conformance_tests_json(
112-
render_context.conformance_tests_running_context.current_testing_module_name
113-
),
114-
all_acceptance_tests,
115-
run_state=render_context.run_state,
116-
)
95+
96+
response_files, implementation_plan_summary = render_context.codeplain_api.render_conformance_tests(
97+
render_context.frid_context.frid,
98+
render_context.conformance_tests_running_context.current_testing_frid,
99+
render_context.plain_source_tree,
100+
render_context.frid_context.linked_resources,
101+
existing_files_content,
102+
memory_files_content,
103+
render_context.module_name,
104+
render_context.get_required_modules_functionalities(),
105+
conformance_tests_folder_name,
106+
render_context.conformance_tests_running_context.get_conformance_tests_json(
107+
render_context.conformance_tests_running_context.current_testing_module_name
108+
),
109+
all_acceptance_tests,
110+
run_state=render_context.run_state,
111+
)
117112

118113
render_context.conformance_tests_running_context.current_testing_frid_high_level_implementation_plan = (
119114
implementation_plan_summary
@@ -151,21 +146,18 @@ def _render_acceptance_test(self, render_context: RenderContext):
151146
if render_context.verbose:
152147
console.info(f"Generating acceptance test:\n {acceptance_test}")
153148

154-
with console.status(
155-
f"[{console.INFO_STYLE}]Generating acceptance test for functionality {render_context.frid_context.frid}...\n"
156-
):
157-
response_files = render_context.codeplain_api.render_acceptance_tests(
158-
render_context.frid_context.frid,
159-
render_context.plain_source_tree,
160-
render_context.frid_context.linked_resources,
161-
existing_files_content,
162-
memory_files_content,
163-
conformance_tests_files_content,
164-
render_context.module_name,
165-
render_context.get_required_modules_functionalities(),
166-
acceptance_test,
167-
run_state=render_context.run_state,
168-
)
149+
response_files = render_context.codeplain_api.render_acceptance_tests(
150+
render_context.frid_context.frid,
151+
render_context.plain_source_tree,
152+
render_context.frid_context.linked_resources,
153+
existing_files_content,
154+
memory_files_content,
155+
conformance_tests_files_content,
156+
render_context.module_name,
157+
render_context.get_required_modules_functionalities(),
158+
acceptance_test,
159+
run_state=render_context.run_state,
160+
)
169161
conformance_tests_folder_name = (
170162
render_context.conformance_tests_running_context.get_current_conformance_test_folder_name()
171163
)

‎render_machine/actions/summarize_conformance_tests.py‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@ def execute(self, render_context: RenderContext, _previous_action_payload: Any |
2020
)
2121
)
2222

23-
with console.status(
24-
f"[{console.INFO_STYLE}]Summarizing finished conformance tests for functionality {render_context.frid_context.frid}...\n"
25-
):
26-
summary = render_context.codeplain_api.summarize_finished_conformance_tests(
27-
frid=render_context.frid_context.frid,
28-
plain_source_tree=render_context.plain_source_tree,
29-
linked_resources=render_context.frid_context.linked_resources,
30-
conformance_test_files_content=existing_conformance_test_files_content,
31-
module_name=render_context.module_name,
32-
required_modules=render_context.get_required_modules_functionalities(),
33-
run_state=render_context.run_state,
34-
)
23+
summary = render_context.codeplain_api.summarize_finished_conformance_tests(
24+
frid=render_context.frid_context.frid,
25+
plain_source_tree=render_context.plain_source_tree,
26+
linked_resources=render_context.frid_context.linked_resources,
27+
conformance_test_files_content=existing_conformance_test_files_content,
28+
module_name=render_context.module_name,
29+
required_modules=render_context.get_required_modules_functionalities(),
30+
run_state=render_context.run_state,
31+
)
3532

3633
render_context.conformance_tests_running_context.set_conformance_tests_summary(summary)
3734

0 commit comments

Comments
 (0)