omniopt2 8710__tar.gz → 8721__tar.gz

{omniopt2-8710 → omniopt2-8721}/.omniopt.py

@@ -32,6 +32,8 @@ import psutil
 FORCE_EXIT: bool = False
 
 last_msg_progressbar = ""
+last_msg_raw = None
+last_lock = threading.Lock()
 
 def force_exit(signal_number: Any, frame: Any) -> Any:
     global FORCE_EXIT
@@ -2839,15 +2841,20 @@ def print_debug_get_next_trials(got: int, requested: int, _line: int) -> None:
     log_message_to_file(LOGFILE_DEBUG_GET_NEXT_TRIALS, msg, 0, "")
 
 def print_debug_progressbar(msg: str) -> None:
-    global last_msg_progressbar
+    global last_msg_progressbar, last_msg_raw
 
-    if msg != last_msg_progressbar:
-        time_str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        msg = f"{time_str} ({worker_generator_uuid}): {msg}"
+    try:
+        with last_lock:
+            if msg != last_msg_raw:
+                time_str = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                full_msg = f"{time_str} ({worker_generator_uuid}): {msg}"
 
-        _debug_progressbar(msg)
+                _debug_progressbar(full_msg)
 
-        last_msg_progressbar = msg
+                last_msg_raw = msg
+                last_msg_progressbar = full_msg
+    except Exception as e:
+        print(f"Error in print_debug_progressbar: {e}", flush=True)
 
 def get_process_info(pid: Any) -> str:
     try:
@@ -5766,7 +5773,7 @@ def get_generate_and_test_random_function_str() -> str:
     )
 
     return f"""
-def generate_and_test_random_parameters(n):
+def generate_and_test_random_parameters(n: int) -> None:
     for _ in range(n):
         print("======================================")
         parameters, trial_index = ax_client.get_next_trial()
@@ -7309,15 +7316,41 @@ def mark_trial_as_failed(trial_index: int, _trial: Any) -> None:
 
     return None
 
-def check_valid_result(result: Union[None, list, int, float, tuple]) -> bool:
+def check_valid_result(result: Union[None, dict]) -> bool:
     possible_val_not_found_values = [
         VAL_IF_NOTHING_FOUND,
         -VAL_IF_NOTHING_FOUND,
         -99999999999999997168788049560464200849936328366177157906432,
         99999999999999997168788049560464200849936328366177157906432
     ]
-    values_to_check = result if isinstance(result, list) else [result]
-    return result is not None and all(r not in possible_val_not_found_values for r in values_to_check)
+
+    def flatten_values(obj: Any) -> Any:
+        values = []
+        try:
+            if isinstance(obj, dict):
+                for v in obj.values():
+                    values.extend(flatten_values(v))
+            elif isinstance(obj, (list, tuple, set)):
+                for v in obj:
+                    values.extend(flatten_values(v))
+            else:
+                values.append(obj)
+        except Exception as e:
+            print(f"Error while flattening values: {e}")
+        return values
+
+    if result is None:
+        return False
+
+    try:
+        all_values = flatten_values(result)
+        for val in all_values:
+            if val in possible_val_not_found_values:
+                return False
+        return True
+    except Exception as e:
+        print(f"Error while checking result validity: {e}")
+        return False
 
 def update_ax_client_trial(trial_idx: int, result: Union[list, dict]) -> None:
     if not ax_client:
@@ -7358,13 +7391,52 @@ def _finish_job_core_helper_complete_trial(trial_index: int, raw_result: dict) -
 
     return None
 
-def _finish_job_core_helper_mark_success(_trial: ax.core.trial.Trial, result: Union[float, int, tuple]) -> None:
+def format_result_for_display(result: dict) -> str:
+    def safe_float(v: Any) -> str:
+        try:
+            if v is None:
+                return "None"
+            if isinstance(v, (int, float)):
+                if math.isnan(v):
+                    return "NaN"
+                if math.isinf(v):
+                    return "∞" if v > 0 else "-∞"
+                return f"{v:.6f}"
+            return str(v)
+        except Exception as e:
+            return f"<error: {e}>"
+
+    try:
+        if not isinstance(result, dict):
+            return safe_float(result)
+
+        parts = []
+        for key, val in result.items():
+            try:
+                if isinstance(val, (list, tuple)) and len(val) == 2:
+                    main, sem = val
+                    main_str = safe_float(main)
+                    if sem is not None:
+                        sem_str = safe_float(sem)
+                        parts.append(f"{key}: {main_str} (SEM: {sem_str})")
+                    else:
+                        parts.append(f"{key}: {main_str}")
+                else:
+                    parts.append(f"{key}: {safe_float(val)}")
+            except Exception as e:
+                parts.append(f"{key}: <error: {e}>")
+
+        return ", ".join(parts)
+    except Exception as e:
+        return f"<error formatting result: {e}>"
+
+def _finish_job_core_helper_mark_success(_trial: ax.core.trial.Trial, result: dict) -> None:
     print_debug(f"Marking trial {_trial} as completed")
     _trial.mark_completed(unsafe=True)
 
     succeeded_jobs(1)
 
-    progressbar_description(f"new result: {result}")
+    progressbar_description(f"new result: {format_result_for_display(result)}")
     update_progress_bar(1)
 
     save_results_csv()
@@ -7396,9 +7468,6 @@ def finish_job_core(job: Any, trial_index: int, this_jobs_finished: int) -> int:
     result = job.result()
     print_debug(f"finish_job_core: trial-index: {trial_index}, job.result(): {result}, state: {state_from_job(job)}")
 
-    raw_result = result
-    result_keys = list(result.keys())
-    result = result[result_keys[0]]
     this_jobs_finished += 1
 
     if ax_client:
@@ -7408,7 +7477,7 @@ def finish_job_core(job: Any, trial_index: int, this_jobs_finished: int) -> int:
             return 0
 
         if check_valid_result(result):
-            _finish_job_core_helper_complete_trial(trial_index, raw_result)
+            _finish_job_core_helper_complete_trial(trial_index, result)
 
             try:
                 _finish_job_core_helper_mark_success(_trial, result)

{omniopt2-8710 → omniopt2-8721}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 8710
+Version: 8721
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-8710 → omniopt2-8721}/omniopt

@@ -374,7 +374,7 @@
 	function myexit {
 		CODE=$1
 
-		end_all_bg_processes
+		end_all_bg_processes 2>/dev/null
 
 		if [[ $follow -eq 1 ]]; then
 			if [[ -z $CODE ]] || ! [[ $CODE =~ $int_re ]]; then

{omniopt2-8710 → omniopt2-8721}/omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 8710
+Version: 8721
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-8710 → omniopt2-8721}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {email = "norman.koch@tu-dresden.de"},
   {name = "Norman Koch"}
 ]
-version = "8710"
+version = "8721"
 
 readme = "README.md"
 dynamic = ["dependencies"]