WIP: Remove monitor #10565

jonathan-eq · 2025-04-04T12:07:56Z

Issue
Resolves #my_issue

Approach
Short description of the approach

(Screenshot of new behavior in GUI if applicable)

PR title captures the intent of the changes, and is fitting for release notes.
Added appropriate release note label
Commit history is consistent and clean, in line with the contribution guidelines.
Make sure unit tests pass locally after every commit (git rebase -i main --exec 'just rapid-tests')

When applicable

When there are user facing changes: Updated documentation
New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
Large PR: Prepare changes in small commits for more convenient review
Bug fix: Add regression test for the bug
Bug fix: Add backport label to latest release (format: 'backport release-branch-name')

codspeed-hq · 2025-04-07T07:08:19Z

CodSpeed Performance Report

Merging #10565 will not alter performance

_{Comparing jonathan-eq:remove-monitor (a010046) with main (562e369)}

Summary

✅ 25 untouched benchmarks

Copilot

Copilot reviewed 10 out of 10 changed files in this pull request and generated 8 comments.

Copilot · 2025-04-09T07:51:30Z

src/ert/run_models/base_run_model.py

            await evaluator_task
            return []

        logger.debug("observed that model was finished, waiting tasks completion...")
        # The model has finished, we indicate this by sending a DONE
        logger.debug("tasks complete")

-        if not self._end_queue.empty():
+        if self._cancelled:
+            print("YEGA!")


Remove the debug print 'print("YEGA!")' and replace it with an appropriate logger.debug call.

Suggested change

print("YEGA!")

logger.debug("YEGA!")

Copilot · 2025-04-09T07:51:30Z

src/ert/run_models/base_run_model.py

            try:
                await evaluator_task
            except Exception as e:
+                print(f"1: {e!s}")


Remove the debug print 'print(f"1: {e!s}")' and use the logging framework (e.g. logger.error) to log exceptions.

Suggested change

print(f"1: {e!s}")

logger.error(f"1: {e!s}")

Copilot · 2025-04-09T07:51:30Z

src/ert/run_models/base_run_model.py

                raise Exception(
                    "Exception occured during user initiatied termination of experiment"
                ) from e
+            print("RAISING USER_CANCELLED")


Remove the debug print 'print("RAISING USER_CANCELLED")' and replace it with a proper logging call.

Suggested change

print("RAISING USER_CANCELLED")

logger.debug("RAISING USER_CANCELLED")

Copilot · 2025-04-09T07:51:31Z

src/ert/run_models/base_run_model.py

            raise UserCancelled("Experiment cancelled by user in post evaluation")
-
+        else:
+            print("HELL NAH!")


Remove the debug print 'print("HELL NAH!")' and use the logging framework for consistency.

Suggested change

print("HELL NAH!")

logger.debug("HELL NAH!")

Copilot · 2025-04-09T07:51:31Z

src/ert/ensemble_evaluator/evaluator.py

+
+    async def handle_client_event(self, event: EEEvent) -> None:
+        if type(event) is EEUserCancel:
+            print("EE GOT CANCEL EVENT")


Replace the debug print 'print("EE GOT CANCEL EVENT")' with an appropriate logger.debug call to maintain consistent logging practices.

Suggested change

print("EE GOT CANCEL EVENT")

logger.debug("EE GOT CANCEL EVENT")

Copilot · 2025-04-09T07:51:31Z

src/ert/ensemble_evaluator/evaluator.py

+            self._monitoring_result.set_result(False)
+            # self._clients_empty.set()
+        elif type(event) is EEUserDone:
+            print("EE GOT USER DONE EVENT")


Replace the debug print 'print("EE GOT USER DONE EVENT")' with a logger.debug call for consistent logging.

Suggested change

print("EE GOT USER DONE EVENT")

logger.debug("EE GOT USER DONE EVENT")

Copilot · 2025-04-09T07:51:32Z

src/ert/ensemble_evaluator/evaluator.py

                    raise task_exception
                elif task.get_name() == "server_task":
+                    print("EXITED MONITOR AN DHANDLE TASKS")


Remove or replace the debug print 'print("EXITED MONITOR AN DHANDLE TASKS")' with an appropriate logger.debug statement.

Suggested change

print("EXITED MONITOR AN DHANDLE TASKS")

logger.debug("EXITED MONITOR AN DHANDLE TASKS")

Copilot · 2025-04-09T07:51:32Z

src/ert/ensemble_evaluator/evaluator.py

                    return
                elif task.get_name() in {
                    "ensemble_task",
                    "listener_task",
                    "ensemble_cancellation_task",
                }:
                    timeout = self.CLOSE_SERVER_TIMEOUT
+                    self._monitoring_result.set_result(False)
+                    print("WAS HERE")


Remove or replace the debug print 'print("WAS HERE")' with a proper logging call to ensure consistency.

Suggested change

print("WAS HERE")

logger.info("WAS HERE")

jonathan-eq added 5 commits April 3, 2025 15:19

init removal of ee monitor

74bca17

Working version

ef99e35

Remove monitor_queue from BRM

32f00fe

Fix cancellation not working

9e50301

Start fixing tests

9b39d25

jonathan-eq added the release-notes:improvement Automatically categorise as improvement in release notes label Apr 4, 2025

jonathan-eq self-assigned this Apr 4, 2025

jonathan-eq added this to SCOUT Apr 4, 2025

jonathan-eq moved this to In Progress in SCOUT Apr 4, 2025

jonathan-eq force-pushed the remove-monitor branch from 63091df to 6bc0bdf Compare April 4, 2025 12:13

checkpoint

3a01e25

jonathan-eq force-pushed the remove-monitor branch 2 times, most recently from 81c6998 to bcf9998 Compare April 7, 2025 06:46

checkpoint

205514f

jonathan-eq force-pushed the remove-monitor branch from a010046 to 205514f Compare April 9, 2025 05:51

jonathan-eq requested a review from Copilot April 9, 2025 07:47

Copilot AI reviewed Apr 9, 2025

View reviewed changes

jonathan-eq moved this from In Progress to Todo in SCOUT Apr 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Remove monitor #10565

WIP: Remove monitor #10565

jonathan-eq commented Apr 4, 2025 •

edited

Loading

codspeed-hq bot commented Apr 7, 2025 •

edited

Loading

Copilot AI left a comment

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

Copilot AI Apr 9, 2025

	print("RAISING USER_CANCELLED")
	logger.debug("RAISING USER_CANCELLED")

	print("EE GOT CANCEL EVENT")
	logger.debug("EE GOT CANCEL EVENT")

	print("EE GOT USER DONE EVENT")
	logger.debug("EE GOT USER DONE EVENT")

	print("EXITED MONITOR AN DHANDLE TASKS")
	logger.debug("EXITED MONITOR AN DHANDLE TASKS")

WIP: Remove monitor #10565

Are you sure you want to change the base?

WIP: Remove monitor #10565

Conversation

jonathan-eq commented Apr 4, 2025 • edited Loading

When applicable

codspeed-hq bot commented Apr 7, 2025 • edited Loading

CodSpeed Performance Report

Merging #10565 will not alter performance

Summary

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

jonathan-eq commented Apr 4, 2025 •

edited

Loading

codspeed-hq bot commented Apr 7, 2025 •

edited

Loading