omniopt2 8456__py3-none-any.whl → 8461__py3-none-any.whl

.omniopt.py

@@ -333,7 +333,7 @@ def show_func_name_wrapper(func: F) -> F:
 
         return result
 
-    return wrapper  # type: ignore
+    return wrapper # type: ignore
 
 def log_time_and_memory_wrapper(func: F) -> F:
     @functools.wraps(func)
@@ -360,7 +360,7 @@ def log_time_and_memory_wrapper(func: F) -> F:
 
         return result
 
-    return wrapper  # type: ignore
+    return wrapper # type: ignore
 
 def _record_stats(func_name: str, elapsed: float, mem_diff: float, mem_after: float, mem_peak: float) -> None:
     global _total_time
@@ -3306,7 +3306,7 @@ def parse_experiment_parameters() -> None:
     # Remove duplicates by 'name' key preserving order
     params = list({p['name']: p for p in params}.values())
 
-    experiment_parameters = params
+    experiment_parameters = params # type: ignore[assignment]
 
 def check_factorial_range() -> None:
     if args.model and args.model == "FACTORIAL":
@@ -3597,11 +3597,11 @@ def _add_to_csv_rewrite_file(file_path: str, rows: List[list], existing_heading:
         writer = csv.writer(tmp_file)
         writer.writerow(all_headings)
         for row in rows[1:]:
-            tmp_file.writerow([
+            tmp_file.writerow([ # type: ignore[attr-defined]
                 row[existing_heading.index(h)] if h in existing_heading else ""
                 for h in all_headings
             ])
-        tmp_file.writerow([
+        tmp_file.writerow([ # type: ignore[attr-defined]
             formatted_data[new_heading.index(h)] if h in new_heading else ""
             for h in all_headings
         ])
@@ -6572,9 +6572,12 @@ def try_insert_job(csv_path: str, arm_params: Dict, result: Any, i: int, arm_par
         if err_msgs is None:
             print_red("try_insert_job: err_msgs was None")
         else:
-            if err_msg not in err_msgs:
-                print_red(err_msg)
-                err_msgs.append(err_msg)
+            if isinstance(err_msgs, list):
+                if err_msg not in err_msgs:
+                    print_red(err_msg)
+                    err_msgs.append(err_msg)
+            elif isinstance(err_msgs, str):
+                err_msgs += f"\n{err_msg}"
 
     return cnt
 
@@ -8468,16 +8471,21 @@ def get_model_from_name(name: str) -> Any:
             return gen
     raise ValueError(f"Unknown or unsupported model: {name}")
 
-def get_name_from_model(model: Any) -> Optional[str]:
+def get_name_from_model(model: Any) -> str:
     if not isinstance(SUPPORTED_MODELS, (list, set, tuple)):
-        return None
+        raise RuntimeError("get_model_from_name: SUPPORTED_MODELS was not a list, set or tuple. Cannot continue")
 
     model_str = model.value if hasattr(model, "value") else str(model)
 
     model_str_lower = model_str.lower()
     model_map = {m.lower(): m for m in SUPPORTED_MODELS}
 
-    return model_map.get(model_str_lower, None)
+    ret = model_map.get(model_str_lower, None)
+
+    if ret is None:
+        raise RuntimeError("get_name_from_model: failed to get Model")
+
+    return ret
 
 def parse_generation_strategy_string(gen_strat_str: str) -> tuple[list[dict[str, int]], int]:
     gen_strat_list = []

{omniopt2-8456.data → omniopt2-8461.data}/data/bin/.omniopt.py

@@ -333,7 +333,7 @@ def show_func_name_wrapper(func: F) -> F:
 
         return result
 
-    return wrapper  # type: ignore
+    return wrapper # type: ignore
 
 def log_time_and_memory_wrapper(func: F) -> F:
     @functools.wraps(func)
@@ -360,7 +360,7 @@ def log_time_and_memory_wrapper(func: F) -> F:
 
         return result
 
-    return wrapper  # type: ignore
+    return wrapper # type: ignore
 
 def _record_stats(func_name: str, elapsed: float, mem_diff: float, mem_after: float, mem_peak: float) -> None:
     global _total_time
@@ -3306,7 +3306,7 @@ def parse_experiment_parameters() -> None:
     # Remove duplicates by 'name' key preserving order
     params = list({p['name']: p for p in params}.values())
 
-    experiment_parameters = params
+    experiment_parameters = params # type: ignore[assignment]
 
 def check_factorial_range() -> None:
     if args.model and args.model == "FACTORIAL":
@@ -3597,11 +3597,11 @@ def _add_to_csv_rewrite_file(file_path: str, rows: List[list], existing_heading:
         writer = csv.writer(tmp_file)
         writer.writerow(all_headings)
         for row in rows[1:]:
-            tmp_file.writerow([
+            tmp_file.writerow([ # type: ignore[attr-defined]
                 row[existing_heading.index(h)] if h in existing_heading else ""
                 for h in all_headings
             ])
-        tmp_file.writerow([
+        tmp_file.writerow([ # type: ignore[attr-defined]
             formatted_data[new_heading.index(h)] if h in new_heading else ""
             for h in all_headings
         ])
@@ -6572,9 +6572,12 @@ def try_insert_job(csv_path: str, arm_params: Dict, result: Any, i: int, arm_par
         if err_msgs is None:
             print_red("try_insert_job: err_msgs was None")
         else:
-            if err_msg not in err_msgs:
-                print_red(err_msg)
-                err_msgs.append(err_msg)
+            if isinstance(err_msgs, list):
+                if err_msg not in err_msgs:
+                    print_red(err_msg)
+                    err_msgs.append(err_msg)
+            elif isinstance(err_msgs, str):
+                err_msgs += f"\n{err_msg}"
 
     return cnt
 
@@ -8468,16 +8471,21 @@ def get_model_from_name(name: str) -> Any:
             return gen
     raise ValueError(f"Unknown or unsupported model: {name}")
 
-def get_name_from_model(model: Any) -> Optional[str]:
+def get_name_from_model(model: Any) -> str:
     if not isinstance(SUPPORTED_MODELS, (list, set, tuple)):
-        return None
+        raise RuntimeError("get_model_from_name: SUPPORTED_MODELS was not a list, set or tuple. Cannot continue")
 
     model_str = model.value if hasattr(model, "value") else str(model)
 
     model_str_lower = model_str.lower()
     model_map = {m.lower(): m for m in SUPPORTED_MODELS}
 
-    return model_map.get(model_str_lower, None)
+    ret = model_map.get(model_str_lower, None)
+
+    if ret is None:
+        raise RuntimeError("get_name_from_model: failed to get Model")
+
+    return ret
 
 def parse_generation_strategy_string(gen_strat_str: str) -> tuple[list[dict[str, int]], int]:
     gen_strat_list = []

{omniopt2-8456.dist-info → omniopt2-8461.dist-info}/METADATA

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

@@ -3,7 +3,7 @@
 .general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
 .gitignore,sha256=GmSD6dE4AqN4_fhQUdAzydst60s3w3ePYxetTr3Et7c,3776
 .helpers.py,sha256=posn69_5fnlCqU-jRTFaED0LoeC2uuQe6r9NuqvfHm0,31456
-.omniopt.py,sha256=SK2neteGiZazi1KG6pX9Luilt1yHB1_e2RWraW1bgAI,439629
+.omniopt.py,sha256=05ndT1n-sNRDycP_s1jrHjPazbYpD-J4TCM59C_H3tk,440045
 .omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
 .omniopt_plot_general.py,sha256=3iy-bPef8I5rTB3KRz-TuleMdgKDmVZ6c8LuNQhNwu0,6810
 .omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
@@ -26,46 +26,46 @@ omniopt_docker,sha256=XyEGZ71l-tUlAYUluVF39fGO3NLDRa8UyrwxmAsXWNI,3542
 omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
 omniopt_plot,sha256=ze6Dz2k0w5jyUnfatAA7dk59nzQjKC_G36tDvJGWsfA,13696
 omniopt_share,sha256=2KZcTjN_7vcxNjb4sLLiWgUc38pl2-6-Qwmgq6_nTb0,13856
-pyproject.toml,sha256=5JMFhMSCKlQqB0i9dP-lqoIjpmIIDUhdeBWDzHpBnnc,397
+pyproject.toml,sha256=iiQnlE--3bIVOvXyrYVtn0ATi3aoeBx8GRQVH6wxXZk,397
 requirements.txt,sha256=0ViG5vdrDP--nr7mbZbV0ayJc6a5APNlTiMqGEZB6qE,292
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=jpyZzAwbWR_qnoRqWvpBB5MUjIX9jVwynX2D-B-r8aA,487
 .tests/pylint.rc,sha256=ZGtZjVgJtK_6tdwgscJneS-LUeDASjSVVz6veCkp9rw,22631
-omniopt2-8456.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
-omniopt2-8456.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-8456.data/data/bin/.helpers.py,sha256=posn69_5fnlCqU-jRTFaED0LoeC2uuQe6r9NuqvfHm0,31456
-omniopt2-8456.data/data/bin/.omniopt.py,sha256=SK2neteGiZazi1KG6pX9Luilt1yHB1_e2RWraW1bgAI,439629
-omniopt2-8456.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-8456.data/data/bin/.omniopt_plot_general.py,sha256=3iy-bPef8I5rTB3KRz-TuleMdgKDmVZ6c8LuNQhNwu0,6810
-omniopt2-8456.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-8456.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-8456.data/data/bin/.omniopt_plot_scatter.py,sha256=b0_CIqgyi6PztaUVJRL9X9XBTaOonh-yDH2hRxMGkH0,8403
-omniopt2-8456.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-8456.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=UKjw40c1eumgEcf0xqB-_SakX5PB6HD3u4VwBxbsgQo,10279
-omniopt2-8456.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=WUyl2uI59wsC1eSX_5uJHOrqcF-s5cUDIEu8u3IFMLU,6462
-omniopt2-8456.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=Xlo_dYTQNnxPhYakmgMM58CCcW9gUoXZ3gLap9RScTY,4578
-omniopt2-8456.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-8456.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-8456.data/data/bin/.shellscript_functions,sha256=9Yo5j3BBLDNVPwe2uNjHbVCbj3H1v1gC5Ju8KvPXfC4,13624
-omniopt2-8456.data/data/bin/.tpe.py,sha256=93yjviAtxPRYUCpSIShW_H3QQ5JPNcnXNjF0g8zc7Wc,6766
-omniopt2-8456.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-8456.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-8456.data/data/bin/omniopt,sha256=PCBtM71SYgl-ZweB8XHhb2LQ5Mu7zXa-LfrERU0-RQQ,51404
-omniopt2-8456.data/data/bin/omniopt_docker,sha256=XyEGZ71l-tUlAYUluVF39fGO3NLDRa8UyrwxmAsXWNI,3542
-omniopt2-8456.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-8456.data/data/bin/omniopt_plot,sha256=ze6Dz2k0w5jyUnfatAA7dk59nzQjKC_G36tDvJGWsfA,13696
-omniopt2-8456.data/data/bin/omniopt_share,sha256=2KZcTjN_7vcxNjb4sLLiWgUc38pl2-6-Qwmgq6_nTb0,13856
-omniopt2-8456.data/data/bin/pylint.rc,sha256=ZGtZjVgJtK_6tdwgscJneS-LUeDASjSVVz6veCkp9rw,22631
-omniopt2-8456.data/data/bin/requirements.txt,sha256=0ViG5vdrDP--nr7mbZbV0ayJc6a5APNlTiMqGEZB6qE,292
-omniopt2-8456.data/data/bin/setup.py,sha256=zg7k4jeHXEdaGWGeB1mPC14fFj-hqz1vNimnU0JcMyk,4632
-omniopt2-8456.data/data/bin/test_requirements.txt,sha256=jpyZzAwbWR_qnoRqWvpBB5MUjIX9jVwynX2D-B-r8aA,487
-omniopt2-8456.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=0Cdo4UqF_XLTcDRYSfP-s9A-r9jQfolyRLxlqJhiDro,5718
+omniopt2-8461.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
+omniopt2-8461.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-8461.data/data/bin/.helpers.py,sha256=posn69_5fnlCqU-jRTFaED0LoeC2uuQe6r9NuqvfHm0,31456
+omniopt2-8461.data/data/bin/.omniopt.py,sha256=05ndT1n-sNRDycP_s1jrHjPazbYpD-J4TCM59C_H3tk,440045
+omniopt2-8461.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-8461.data/data/bin/.omniopt_plot_general.py,sha256=3iy-bPef8I5rTB3KRz-TuleMdgKDmVZ6c8LuNQhNwu0,6810
+omniopt2-8461.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-8461.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-8461.data/data/bin/.omniopt_plot_scatter.py,sha256=b0_CIqgyi6PztaUVJRL9X9XBTaOonh-yDH2hRxMGkH0,8403
+omniopt2-8461.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-8461.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=UKjw40c1eumgEcf0xqB-_SakX5PB6HD3u4VwBxbsgQo,10279
+omniopt2-8461.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=WUyl2uI59wsC1eSX_5uJHOrqcF-s5cUDIEu8u3IFMLU,6462
+omniopt2-8461.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=Xlo_dYTQNnxPhYakmgMM58CCcW9gUoXZ3gLap9RScTY,4578
+omniopt2-8461.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-8461.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-8461.data/data/bin/.shellscript_functions,sha256=9Yo5j3BBLDNVPwe2uNjHbVCbj3H1v1gC5Ju8KvPXfC4,13624
+omniopt2-8461.data/data/bin/.tpe.py,sha256=93yjviAtxPRYUCpSIShW_H3QQ5JPNcnXNjF0g8zc7Wc,6766
+omniopt2-8461.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-8461.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-8461.data/data/bin/omniopt,sha256=PCBtM71SYgl-ZweB8XHhb2LQ5Mu7zXa-LfrERU0-RQQ,51404
+omniopt2-8461.data/data/bin/omniopt_docker,sha256=XyEGZ71l-tUlAYUluVF39fGO3NLDRa8UyrwxmAsXWNI,3542
+omniopt2-8461.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-8461.data/data/bin/omniopt_plot,sha256=ze6Dz2k0w5jyUnfatAA7dk59nzQjKC_G36tDvJGWsfA,13696
+omniopt2-8461.data/data/bin/omniopt_share,sha256=2KZcTjN_7vcxNjb4sLLiWgUc38pl2-6-Qwmgq6_nTb0,13856
+omniopt2-8461.data/data/bin/pylint.rc,sha256=ZGtZjVgJtK_6tdwgscJneS-LUeDASjSVVz6veCkp9rw,22631
+omniopt2-8461.data/data/bin/requirements.txt,sha256=0ViG5vdrDP--nr7mbZbV0ayJc6a5APNlTiMqGEZB6qE,292
+omniopt2-8461.data/data/bin/setup.py,sha256=zg7k4jeHXEdaGWGeB1mPC14fFj-hqz1vNimnU0JcMyk,4632
+omniopt2-8461.data/data/bin/test_requirements.txt,sha256=jpyZzAwbWR_qnoRqWvpBB5MUjIX9jVwynX2D-B-r8aA,487
+omniopt2-8461.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=ozDtmKpt5kf2bVWT4X7z3SWayoSIPg4f_Jf0KnxOP4U,5718
 omniopt2.egg-info/SOURCES.txt,sha256=2mSVIhM8Ncyl5_s8ZFBlb6qjRDbTCQmV9FwVVjp5ROE,795
 omniopt2.egg-info/dependency_links.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 omniopt2.egg-info/requires.txt,sha256=_n-6wV9UtTagGm4wbRDW7FjKoCB0Y4jkb5VbARh6pMU,779
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-8456.dist-info/METADATA,sha256=0Cdo4UqF_XLTcDRYSfP-s9A-r9jQfolyRLxlqJhiDro,5718
-omniopt2-8456.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-8456.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-8456.dist-info/RECORD,,
+omniopt2-8461.dist-info/METADATA,sha256=ozDtmKpt5kf2bVWT4X7z3SWayoSIPg4f_Jf0KnxOP4U,5718
+omniopt2-8461.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-8461.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-8461.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO

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