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

.omniopt.py

@@ -5562,54 +5562,99 @@ def parse_csv(csv_path: str) -> Tuple[List, List]:
 
     return arm_params_list, results_list
 
+
 @beartype
-def get_generation_node_for_index(this_csv_file_path: str, arm_params_list: list, results_list: list, index: int) -> str:
+def get_generation_node_for_index(
+    this_csv_file_path: str,
+    arm_params_list: List[Dict[str, Any]],
+    results_list: List[Dict[str, Any]],
+    index: int
+) -> str:
     try:
-        if index < 0 or index >= len(arm_params_list) or index >= len(results_list):
+        if not _get_generation_node_for_index_index_valid(index, arm_params_list, results_list):
             return "MANUAL"
 
         target_arm_params = arm_params_list[index]
         target_result = results_list[index]
 
-        target_combined = {}
-        target_combined.update(target_arm_params)
-        target_combined.update(target_result)
-
-        with open(this_csv_file_path, mode='r', newline='', encoding='utf-8') as csvfile:
-            reader = csv.DictReader(csvfile)
-            if reader.fieldnames is None or "generation_node" not in reader.fieldnames:
-                return "MANUAL"
+        target_combined = _get_generation_node_for_index_combine_dicts(target_arm_params, target_result)
 
-            for row in reader:
-                all_match = True
-                for key, val in target_combined.items():
-                    row_val = row.get(key)
-                    if row_val is None:
-                        all_match = False
-                        break
-
-                    if isinstance(val, (int, float)):
-                        try:
-                            row_val_num = float(row_val)
-                            val_num = float(val)
-                            if abs(row_val_num - val_num) > 1e-8:
-                                all_match = False
-                                break
-                        except ValueError:
-                            all_match = False
-                            break
-                    else:
-                        if str(val) != row_val:
-                            all_match = False
-                            break
-
-                if all_match:
-                    return row["generation_node"]
+        generation_node = _get_generation_node_for_index_find_generation_node(this_csv_file_path, target_combined)
+        return generation_node
     except Exception as e:
         print(f"Error while get_generation_node_for_index: {e}")
+        return "MANUAL"
+
+
+@beartype
+def _get_generation_node_for_index_index_valid(
+    index: int,
+    arm_params_list: List[Dict[str, Any]],
+    results_list: List[Dict[str, Any]]
+) -> bool:
+    return 0 <= index < len(arm_params_list) and index < len(results_list)
+
+
+@beartype
+def _get_generation_node_for_index_combine_dicts(
+    dict1: Dict[str, Any],
+    dict2: Dict[str, Any]
+) -> Dict[str, Any]:
+    combined = {}
+    combined.update(dict1)
+    combined.update(dict2)
+    return combined
+
+
+@beartype
+def _get_generation_node_for_index_find_generation_node(
+    csv_file_path: str,
+    target_combined: Dict[str, Any]
+) -> str:
+    with open(csv_file_path, mode='r', newline='', encoding='utf-8') as csvfile:
+        reader = csv.DictReader(csvfile)
+        if reader.fieldnames is None or "generation_node" not in reader.fieldnames:
+            return "MANUAL"
+
+        for row in reader:
+            if _get_generation_node_for_index_row_matches(row, target_combined):
+                return row["generation_node"]
 
     return "MANUAL"
 
+
+@beartype
+def _get_generation_node_for_index_row_matches(
+    row: Dict[str, str],
+    target_combined: Dict[str, Any]
+) -> bool:
+    for key, val in target_combined.items():
+        row_val = row.get(key)
+        if row_val is None:
+            return False
+
+        if isinstance(val, (int, float)):
+            if not _get_generation_node_for_index_floats_match(val, row_val):
+                return False
+        else:
+            if str(val) != row_val:
+                return False
+
+    return True
+
+
+@beartype
+def _get_generation_node_for_index_floats_match(
+    val: float,
+    row_val_str: str,
+    tolerance: float = 1e-8
+) -> bool:
+    try:
+        row_val_num = float(row_val_str)
+    except ValueError:
+        return False
+    return abs(row_val_num - val) <= tolerance
+
 @beartype
 def insert_jobs_from_csv(this_csv_file_path: str, experiment_parameters: Optional[Union[List[Any], dict]]) -> None:
     if not os.path.exists(this_csv_file_path):

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

@@ -5562,54 +5562,99 @@ def parse_csv(csv_path: str) -> Tuple[List, List]:
 
     return arm_params_list, results_list
 
+
 @beartype
-def get_generation_node_for_index(this_csv_file_path: str, arm_params_list: list, results_list: list, index: int) -> str:
+def get_generation_node_for_index(
+    this_csv_file_path: str,
+    arm_params_list: List[Dict[str, Any]],
+    results_list: List[Dict[str, Any]],
+    index: int
+) -> str:
     try:
-        if index < 0 or index >= len(arm_params_list) or index >= len(results_list):
+        if not _get_generation_node_for_index_index_valid(index, arm_params_list, results_list):
             return "MANUAL"
 
         target_arm_params = arm_params_list[index]
         target_result = results_list[index]
 
-        target_combined = {}
-        target_combined.update(target_arm_params)
-        target_combined.update(target_result)
-
-        with open(this_csv_file_path, mode='r', newline='', encoding='utf-8') as csvfile:
-            reader = csv.DictReader(csvfile)
-            if reader.fieldnames is None or "generation_node" not in reader.fieldnames:
-                return "MANUAL"
+        target_combined = _get_generation_node_for_index_combine_dicts(target_arm_params, target_result)
 
-            for row in reader:
-                all_match = True
-                for key, val in target_combined.items():
-                    row_val = row.get(key)
-                    if row_val is None:
-                        all_match = False
-                        break
-
-                    if isinstance(val, (int, float)):
-                        try:
-                            row_val_num = float(row_val)
-                            val_num = float(val)
-                            if abs(row_val_num - val_num) > 1e-8:
-                                all_match = False
-                                break
-                        except ValueError:
-                            all_match = False
-                            break
-                    else:
-                        if str(val) != row_val:
-                            all_match = False
-                            break
-
-                if all_match:
-                    return row["generation_node"]
+        generation_node = _get_generation_node_for_index_find_generation_node(this_csv_file_path, target_combined)
+        return generation_node
     except Exception as e:
         print(f"Error while get_generation_node_for_index: {e}")
+        return "MANUAL"
+
+
+@beartype
+def _get_generation_node_for_index_index_valid(
+    index: int,
+    arm_params_list: List[Dict[str, Any]],
+    results_list: List[Dict[str, Any]]
+) -> bool:
+    return 0 <= index < len(arm_params_list) and index < len(results_list)
+
+
+@beartype
+def _get_generation_node_for_index_combine_dicts(
+    dict1: Dict[str, Any],
+    dict2: Dict[str, Any]
+) -> Dict[str, Any]:
+    combined = {}
+    combined.update(dict1)
+    combined.update(dict2)
+    return combined
+
+
+@beartype
+def _get_generation_node_for_index_find_generation_node(
+    csv_file_path: str,
+    target_combined: Dict[str, Any]
+) -> str:
+    with open(csv_file_path, mode='r', newline='', encoding='utf-8') as csvfile:
+        reader = csv.DictReader(csvfile)
+        if reader.fieldnames is None or "generation_node" not in reader.fieldnames:
+            return "MANUAL"
+
+        for row in reader:
+            if _get_generation_node_for_index_row_matches(row, target_combined):
+                return row["generation_node"]
 
     return "MANUAL"
 
+
+@beartype
+def _get_generation_node_for_index_row_matches(
+    row: Dict[str, str],
+    target_combined: Dict[str, Any]
+) -> bool:
+    for key, val in target_combined.items():
+        row_val = row.get(key)
+        if row_val is None:
+            return False
+
+        if isinstance(val, (int, float)):
+            if not _get_generation_node_for_index_floats_match(val, row_val):
+                return False
+        else:
+            if str(val) != row_val:
+                return False
+
+    return True
+
+
+@beartype
+def _get_generation_node_for_index_floats_match(
+    val: float,
+    row_val_str: str,
+    tolerance: float = 1e-8
+) -> bool:
+    try:
+        row_val_num = float(row_val_str)
+    except ValueError:
+        return False
+    return abs(row_val_num - val) <= tolerance
+
 @beartype
 def insert_jobs_from_csv(this_csv_file_path: str, experiment_parameters: Optional[Union[List[Any], dict]]) -> None:
     if not os.path.exists(this_csv_file_path):

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

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

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