omniopt2 7354__py3-none-any.whl → 7357__py3-none-any.whl

.omniopt.py

@@ -3957,32 +3957,21 @@ def _evaluate_handle_result(
     return final_result
 
 @beartype
-def pretty_process_output(stdout_path: str, stderr_path: str, exit_code: Optional[int]) -> None:
-    global console
+def is_valid_result(result: Union[int, float, Optional[Union[Dict[str, Optional[float]], List[float]]]]) -> bool:
+    return result is not None and (isinstance(result, (int, float)) or (isinstance(result, list) and all(isinstance(x, (int, float)) and x is not None for x in result)) or (isinstance(result, dict) and all(isinstance(v, (int, float)) and v is not None for v in result.values())))
 
-    console = Console(
-        force_interactive=True,
-        soft_wrap=True,
-        color_system="256",
-        force_terminal=not ci_env,
-        width=max(200, terminal_width)
-    )
-
-    def _read(p: str) -> Optional[str]:
-        try:
-            return Path(p).read_text(encoding="utf-8", errors="replace")
-        except FileNotFoundError:
-            print_debug(f"[file not found: {p}]")
-
-            return None
-
-    stdout_txt = _read(stdout_path)
-    stderr_txt = _read(stderr_path)
+@beartype
+def pretty_process_output(stdout_path: str, stderr_path: str, exit_code: Optional[int], result: Union[int, float, Optional[Union[Dict[str, Optional[float]], List[float]]]]) -> None:
+    stdout_txt = get_file_as_string(stdout_path)
+    stderr_txt = get_file_as_string(stderr_path)
 
     # -------- header -------- #
-    outcome = "SUCCESS" if (exit_code is not None and exit_code == 0) else "FAILURE"
+    is_valid = is_valid_result(result)
+
+    outcome = "SUCCESS" if is_valid else "FAILURE"
     header_style = "bold white on green" if exit_code == 0 else "bold white on red"
     console.rule(Text(f" {outcome}  (exit {exit_code}) ", style=header_style))
+    console.rule(Text(f" RESULT: {result} ", style=header_style))
 
     def is_nonempty(s: Optional[str]) -> bool:
         return bool(s and s.strip())
@@ -7040,8 +7029,9 @@ def pretty_print_job_output(job: Job) -> None:
     stdout_path = get_stderr_or_stdout_from_job(job, "stdout")
     stderr_path = get_stderr_or_stdout_from_job(job, "stderr")
     exit_code = get_exit_code_from_stderr_or_stdout_path(stderr_path, stdout_path)
+    result = get_results_with_occ(get_file_as_string(stdout_path))
 
-    pretty_process_output(stdout_path, stderr_path, exit_code)
+    pretty_process_output(stdout_path, stderr_path, exit_code, result)
 
 @beartype
 def get_stderr_or_stdout_from_job(job: Job, path_type: str) -> str:

{omniopt2-7354.data → omniopt2-7357.data}/data/bin/.omniopt.py

@@ -3957,32 +3957,21 @@ def _evaluate_handle_result(
     return final_result
 
 @beartype
-def pretty_process_output(stdout_path: str, stderr_path: str, exit_code: Optional[int]) -> None:
-    global console
+def is_valid_result(result: Union[int, float, Optional[Union[Dict[str, Optional[float]], List[float]]]]) -> bool:
+    return result is not None and (isinstance(result, (int, float)) or (isinstance(result, list) and all(isinstance(x, (int, float)) and x is not None for x in result)) or (isinstance(result, dict) and all(isinstance(v, (int, float)) and v is not None for v in result.values())))
 
-    console = Console(
-        force_interactive=True,
-        soft_wrap=True,
-        color_system="256",
-        force_terminal=not ci_env,
-        width=max(200, terminal_width)
-    )
-
-    def _read(p: str) -> Optional[str]:
-        try:
-            return Path(p).read_text(encoding="utf-8", errors="replace")
-        except FileNotFoundError:
-            print_debug(f"[file not found: {p}]")
-
-            return None
-
-    stdout_txt = _read(stdout_path)
-    stderr_txt = _read(stderr_path)
+@beartype
+def pretty_process_output(stdout_path: str, stderr_path: str, exit_code: Optional[int], result: Union[int, float, Optional[Union[Dict[str, Optional[float]], List[float]]]]) -> None:
+    stdout_txt = get_file_as_string(stdout_path)
+    stderr_txt = get_file_as_string(stderr_path)
 
     # -------- header -------- #
-    outcome = "SUCCESS" if (exit_code is not None and exit_code == 0) else "FAILURE"
+    is_valid = is_valid_result(result)
+
+    outcome = "SUCCESS" if is_valid else "FAILURE"
     header_style = "bold white on green" if exit_code == 0 else "bold white on red"
     console.rule(Text(f" {outcome}  (exit {exit_code}) ", style=header_style))
+    console.rule(Text(f" RESULT: {result} ", style=header_style))
 
     def is_nonempty(s: Optional[str]) -> bool:
         return bool(s and s.strip())
@@ -7040,8 +7029,9 @@ def pretty_print_job_output(job: Job) -> None:
     stdout_path = get_stderr_or_stdout_from_job(job, "stdout")
     stderr_path = get_stderr_or_stdout_from_job(job, "stderr")
     exit_code = get_exit_code_from_stderr_or_stdout_path(stderr_path, stdout_path)
+    result = get_results_with_occ(get_file_as_string(stdout_path))
 
-    pretty_process_output(stdout_path, stderr_path, exit_code)
+    pretty_process_output(stdout_path, stderr_path, exit_code, result)
 
 @beartype
 def get_stderr_or_stdout_from_job(job: Job, path_type: str) -> str:

{omniopt2-7354.dist-info → omniopt2-7357.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7354
+Version: 7357
 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-7354.dist-info → omniopt2-7357.dist-info}/RECORD

@@ -3,7 +3,7 @@
 .general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
 .gitignore,sha256=OMaFWOR6wxjAlI85rF3euQcjQFFAl1F34abZkltKnaU,3714
 .helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-.omniopt.py,sha256=hbfs7JSenuXpgrZWK1GMXs_PZm_Di6GAAVhOiYgrT-Y,408144
+.omniopt.py,sha256=gKUwNrbwa4ampl2T0-UxqPYxPbH5t2TmZsgQztUPhZA,408363
 .omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
 .omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
 .omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
@@ -26,44 +26,44 @@ omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
 omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
 omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
 omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-pyproject.toml,sha256=bYK1fhdqXPXFnF5qrbbsVlaHnZBKK3ZG7V_zOs_1Rss,397
+pyproject.toml,sha256=rfR2Q4hgiUBfS-a7BJFxFyZVM0ZneawRXdFlI_7uDbg,397
 requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
-omniopt2-7354.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
-omniopt2-7354.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7354.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-omniopt2-7354.data/data/bin/.omniopt.py,sha256=hbfs7JSenuXpgrZWK1GMXs_PZm_Di6GAAVhOiYgrT-Y,408144
-omniopt2-7354.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7354.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7354.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7354.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7354.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7354.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7354.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7354.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7354.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7354.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7354.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7354.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
-omniopt2-7354.data/data/bin/.tpe.py,sha256=sAG3Xf1mAyCmEIMwnNAXrVCdKgx-uTIYRd-piEisJkU,6817
-omniopt2-7354.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7354.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7354.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
-omniopt2-7354.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7354.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7354.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7354.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-omniopt2-7354.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
-omniopt2-7354.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7354.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
-omniopt2-7354.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=ngJ3iflbMXgwMgvuAHitX0Lb5NPDyxc-pY3XdPMjQsU,5902
+omniopt2-7357.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
+omniopt2-7357.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7357.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
+omniopt2-7357.data/data/bin/.omniopt.py,sha256=gKUwNrbwa4ampl2T0-UxqPYxPbH5t2TmZsgQztUPhZA,408363
+omniopt2-7357.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7357.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7357.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7357.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7357.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7357.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7357.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7357.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7357.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7357.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7357.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7357.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
+omniopt2-7357.data/data/bin/.tpe.py,sha256=sAG3Xf1mAyCmEIMwnNAXrVCdKgx-uTIYRd-piEisJkU,6817
+omniopt2-7357.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7357.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7357.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
+omniopt2-7357.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7357.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7357.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7357.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
+omniopt2-7357.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
+omniopt2-7357.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7357.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
+omniopt2-7357.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=zJ_m17hUZuChnZK4cusiDRem4FB4laO_ZK7YfmdDPoU,5902
 omniopt2.egg-info/SOURCES.txt,sha256=N-HtSaaqFRsd4XqAfeWVSp__3I-sw0d7cknJgyewRwQ,778
 omniopt2.egg-info/dependency_links.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 omniopt2.egg-info/requires.txt,sha256=zqX3ukwAugAeeTE49b6azubs1Gx8T-8D_fJEsKl_cBY,807
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7354.dist-info/METADATA,sha256=ngJ3iflbMXgwMgvuAHitX0Lb5NPDyxc-pY3XdPMjQsU,5902
-omniopt2-7354.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7354.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7354.dist-info/RECORD,,
+omniopt2-7357.dist-info/METADATA,sha256=zJ_m17hUZuChnZK4cusiDRem4FB4laO_ZK7YfmdDPoU,5902
+omniopt2-7357.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7357.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7357.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7354
+Version: 7357
 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

pyproject.toml

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