omniopt2 7100__py3-none-any.whl → 7101__py3-none-any.whl

.omniopt.py

@@ -6342,45 +6342,60 @@ def get_alt_path_for_orchestrator(stdout_path: str) -> Optional[str]:
     return alt_path
 
 @beartype
-def check_orchestrator(stdout_path: str, trial_index: int) -> Optional[list]:
-    behavs: list = []
+def check_orchestrator(stdout_path: str, trial_index: int) -> Optional[List[str]]:
+    if not orchestrator or "errors" not in orchestrator:
+        return []
 
-    if orchestrator and "errors" in orchestrator:
-        try:
-            stdout = Path(stdout_path).read_text("UTF-8")
-        except FileNotFoundError:
-            alt_path = get_alt_path_for_orchestrator(stdout_path)
+    stdout = _check_orchestrator_read_stdout_with_fallback(stdout_path, trial_index)
+    if stdout is None:
+        return None
 
-            if alt_path and alt_path is not None and Path(alt_path).exists():
-                stdout_path = alt_path
-                try:
-                    stdout = Path(stdout_path).read_text("UTF-8")
-                except FileNotFoundError:
-                    stdout = None
-            else:
-                stdout = None
+    return _check_orchestrator_find_behaviors(stdout, orchestrator["errors"])
 
-            if stdout is None:
-                orchestrate_todo_copy = ORCHESTRATE_TODO
-                if stdout_path not in orchestrate_todo_copy.keys():
-                    ORCHESTRATE_TODO[stdout_path] = trial_index
-                    print_red(f"File not found: {stdout_path}, will try again later")
-                else:
-                    print_red(f"File not found: {stdout_path}, not trying again")
+
+@beartype
+def _check_orchestrator_read_stdout_with_fallback(stdout_path: str, trial_index: int) -> Optional[str]:
+    try:
+        return Path(stdout_path).read_text("UTF-8")
+    except FileNotFoundError:
+        alt_path = get_alt_path_for_orchestrator(stdout_path)
+
+        if alt_path and Path(alt_path).exists():
+            try:
+                return Path(alt_path).read_text("UTF-8")
+            except FileNotFoundError:
                 return None
 
-        for oc in orchestrator["errors"]:
-            name = oc["name"]
-            match_strings = oc["match_strings"]
-            behavior = oc["behavior"]
+        _check_orchestrator_register_missing_file(stdout_path, trial_index)
+        return None
+
+
+@beartype
+def _check_orchestrator_register_missing_file(stdout_path: str, trial_index: int) -> None:
+    if stdout_path not in ORCHESTRATE_TODO:
+        ORCHESTRATE_TODO[stdout_path] = trial_index
+        print_red(f"File not found: {stdout_path}, will try again later")
+    else:
+        print_red(f"File not found: {stdout_path}, not trying again")
+
+
+@beartype
+def _check_orchestrator_find_behaviors(stdout: str, errors: List[Dict[str, Any]]) -> List[str]:
+    behaviors: List[str] = []
+    stdout_lower = stdout.lower()
+
+    for error in errors:
+        name = error.get("name", "")
+        match_strings = error.get("match_strings", [])
+        behavior = error.get("behavior", "")
 
-            for match_string in match_strings:
-                if match_string.lower() in stdout.lower():
-                    if behavior not in behavs:
-                        print_debug(f"Appending behavior {behavior}, orchestrator-error-name: {name}")
-                        behavs.append(behavior)
+        for match_string in match_strings:
+            if match_string.lower() in stdout_lower:
+                if behavior not in behaviors:
+                    print_debug(f"Appending behavior {behavior}, orchestrator-error-name: {name}")
+                    behaviors.append(behavior)
 
-    return behavs
+    return behaviors
 
 @beartype
 def orchestrate_job(job: Job, trial_index: int) -> None:

{omniopt2-7100.data → omniopt2-7101.data}/data/bin/.omniopt.py

@@ -6342,45 +6342,60 @@ def get_alt_path_for_orchestrator(stdout_path: str) -> Optional[str]:
     return alt_path
 
 @beartype
-def check_orchestrator(stdout_path: str, trial_index: int) -> Optional[list]:
-    behavs: list = []
+def check_orchestrator(stdout_path: str, trial_index: int) -> Optional[List[str]]:
+    if not orchestrator or "errors" not in orchestrator:
+        return []
 
-    if orchestrator and "errors" in orchestrator:
-        try:
-            stdout = Path(stdout_path).read_text("UTF-8")
-        except FileNotFoundError:
-            alt_path = get_alt_path_for_orchestrator(stdout_path)
+    stdout = _check_orchestrator_read_stdout_with_fallback(stdout_path, trial_index)
+    if stdout is None:
+        return None
 
-            if alt_path and alt_path is not None and Path(alt_path).exists():
-                stdout_path = alt_path
-                try:
-                    stdout = Path(stdout_path).read_text("UTF-8")
-                except FileNotFoundError:
-                    stdout = None
-            else:
-                stdout = None
+    return _check_orchestrator_find_behaviors(stdout, orchestrator["errors"])
 
-            if stdout is None:
-                orchestrate_todo_copy = ORCHESTRATE_TODO
-                if stdout_path not in orchestrate_todo_copy.keys():
-                    ORCHESTRATE_TODO[stdout_path] = trial_index
-                    print_red(f"File not found: {stdout_path}, will try again later")
-                else:
-                    print_red(f"File not found: {stdout_path}, not trying again")
+
+@beartype
+def _check_orchestrator_read_stdout_with_fallback(stdout_path: str, trial_index: int) -> Optional[str]:
+    try:
+        return Path(stdout_path).read_text("UTF-8")
+    except FileNotFoundError:
+        alt_path = get_alt_path_for_orchestrator(stdout_path)
+
+        if alt_path and Path(alt_path).exists():
+            try:
+                return Path(alt_path).read_text("UTF-8")
+            except FileNotFoundError:
                 return None
 
-        for oc in orchestrator["errors"]:
-            name = oc["name"]
-            match_strings = oc["match_strings"]
-            behavior = oc["behavior"]
+        _check_orchestrator_register_missing_file(stdout_path, trial_index)
+        return None
+
+
+@beartype
+def _check_orchestrator_register_missing_file(stdout_path: str, trial_index: int) -> None:
+    if stdout_path not in ORCHESTRATE_TODO:
+        ORCHESTRATE_TODO[stdout_path] = trial_index
+        print_red(f"File not found: {stdout_path}, will try again later")
+    else:
+        print_red(f"File not found: {stdout_path}, not trying again")
+
+
+@beartype
+def _check_orchestrator_find_behaviors(stdout: str, errors: List[Dict[str, Any]]) -> List[str]:
+    behaviors: List[str] = []
+    stdout_lower = stdout.lower()
+
+    for error in errors:
+        name = error.get("name", "")
+        match_strings = error.get("match_strings", [])
+        behavior = error.get("behavior", "")
 
-            for match_string in match_strings:
-                if match_string.lower() in stdout.lower():
-                    if behavior not in behavs:
-                        print_debug(f"Appending behavior {behavior}, orchestrator-error-name: {name}")
-                        behavs.append(behavior)
+        for match_string in match_strings:
+            if match_string.lower() in stdout_lower:
+                if behavior not in behaviors:
+                    print_debug(f"Appending behavior {behavior}, orchestrator-error-name: {name}")
+                    behaviors.append(behavior)
 
-    return behavs
+    return behaviors
 
 @beartype
 def orchestrate_job(job: Job, trial_index: int) -> None:

{omniopt2-7100.dist-info → omniopt2-7101.dist-info}/METADATA

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

@@ -3,7 +3,7 @@
 .general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
 .gitignore,sha256=OMaFWOR6wxjAlI85rF3euQcjQFFAl1F34abZkltKnaU,3714
 .helpers.py,sha256=srrRn0QBzG8JpNbHAYG2k1rQY6JYrUrNdTj-tDMJSyg,30526
-.omniopt.py,sha256=V9Z5LGIlTMKu0JpIq-TcORk6h5JQKxeuX9JBQ8K1H4k,375764
+.omniopt.py,sha256=l68qHOFvLcFaLUpzGLTzlC9deUOj7-nfQCkgmCjigA0,376112
 .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=7g5I7YdoWcA6_GDwWwq0xPf23qiVc_VDrm9ySLH7SH0,14051
-pyproject.toml,sha256=2oXx6uWGTu0liLjKyQY4V_NUNdEyyGEgSypvIf8XV-w,397
+pyproject.toml,sha256=t5GOpDxzliwvQClJYArBJTdV8vtU_S2dg28lIoS9Ye4,397
 requirements.txt,sha256=QsRYgd43IXr8rN9m0CxufI9mEneBrDeKh4s8E_W2xwI,287
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=dnCbKmKalrVzNZ_-iQWf1xCxcnDsdGuhbDAr9XlGm-U,477
-omniopt2-7100.data/data/bin/.colorfunctions.sh,sha256=CDlgjwrsrHR_E6c-Qak5wZlotArXm-nf9sVvXePzGZA,1083
-omniopt2-7100.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7100.data/data/bin/.helpers.py,sha256=srrRn0QBzG8JpNbHAYG2k1rQY6JYrUrNdTj-tDMJSyg,30526
-omniopt2-7100.data/data/bin/.omniopt.py,sha256=V9Z5LGIlTMKu0JpIq-TcORk6h5JQKxeuX9JBQ8K1H4k,375764
-omniopt2-7100.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7100.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7100.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7100.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7100.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7100.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7100.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7100.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7100.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7100.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7100.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7100.data/data/bin/.shellscript_functions,sha256=C2VT3Eafz9OtCzjWOMXSeZCUGVMRm8y3eGDL43Ay0qM,14656
-omniopt2-7100.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
-omniopt2-7100.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7100.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7100.data/data/bin/omniopt,sha256=Xe8NP6NRoX4j2IPGRTY80eYfo5fYM-fJfj9_aVP-aR8,47963
-omniopt2-7100.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7100.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7100.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7100.data/data/bin/omniopt_share,sha256=7g5I7YdoWcA6_GDwWwq0xPf23qiVc_VDrm9ySLH7SH0,14051
-omniopt2-7100.data/data/bin/requirements.txt,sha256=QsRYgd43IXr8rN9m0CxufI9mEneBrDeKh4s8E_W2xwI,287
-omniopt2-7100.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7100.data/data/bin/test_requirements.txt,sha256=dnCbKmKalrVzNZ_-iQWf1xCxcnDsdGuhbDAr9XlGm-U,477
-omniopt2-7100.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=q-aLLfispK5zLyI_wGFXZuOwjNLHmTivv44a-jbW3vw,5814
+omniopt2-7101.data/data/bin/.colorfunctions.sh,sha256=CDlgjwrsrHR_E6c-Qak5wZlotArXm-nf9sVvXePzGZA,1083
+omniopt2-7101.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7101.data/data/bin/.helpers.py,sha256=srrRn0QBzG8JpNbHAYG2k1rQY6JYrUrNdTj-tDMJSyg,30526
+omniopt2-7101.data/data/bin/.omniopt.py,sha256=l68qHOFvLcFaLUpzGLTzlC9deUOj7-nfQCkgmCjigA0,376112
+omniopt2-7101.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7101.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7101.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7101.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7101.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7101.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7101.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7101.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7101.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7101.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7101.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7101.data/data/bin/.shellscript_functions,sha256=C2VT3Eafz9OtCzjWOMXSeZCUGVMRm8y3eGDL43Ay0qM,14656
+omniopt2-7101.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
+omniopt2-7101.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7101.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7101.data/data/bin/omniopt,sha256=Xe8NP6NRoX4j2IPGRTY80eYfo5fYM-fJfj9_aVP-aR8,47963
+omniopt2-7101.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7101.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7101.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7101.data/data/bin/omniopt_share,sha256=7g5I7YdoWcA6_GDwWwq0xPf23qiVc_VDrm9ySLH7SH0,14051
+omniopt2-7101.data/data/bin/requirements.txt,sha256=QsRYgd43IXr8rN9m0CxufI9mEneBrDeKh4s8E_W2xwI,287
+omniopt2-7101.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7101.data/data/bin/test_requirements.txt,sha256=dnCbKmKalrVzNZ_-iQWf1xCxcnDsdGuhbDAr9XlGm-U,477
+omniopt2-7101.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=xvWADOO9gZkE1IEr3HHTaHXmgMxKBuMVr09i8yRMD64,5814
 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=cZgCKMii2eXHaYbDhCwiLjxtFK6PW0aqFoJZ7xebsqM,764
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7100.dist-info/METADATA,sha256=q-aLLfispK5zLyI_wGFXZuOwjNLHmTivv44a-jbW3vw,5814
-omniopt2-7100.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7100.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7100.dist-info/RECORD,,
+omniopt2-7101.dist-info/METADATA,sha256=xvWADOO9gZkE1IEr3HHTaHXmgMxKBuMVr09i8yRMD64,5814
+omniopt2-7101.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7101.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7101.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7100
+Version: 7101
 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 = "7100"
+version = "7101"
 
 readme = "README.md"
 dynamic = ["dependencies"]