PyPI - omniopt2 - Versions diffs - 7345__py3-none-any.whl → 7348__py3-none-any.whl - Mend

omniopt2 7345py3-none-any.whl → 7348py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (36) hide show

.omniopt.py CHANGED Viewed

@@ -3692,10 +3692,8 @@ def _write_job_infos_csv_result_to_strlist(result: Optional[Union[Dict[str, Opti
         for rkey in result:
             result_values.append(str(rkey))
     elif isinstance(result, dict):
-        result_keys = list(result.keys())
-        for rkey in result_keys:
-            rval = str(result[str(rkey)])
-            result_values.append(rval)
+        for _rkey, rval in result.items():  # type: str, Optional[float]
+            result_values.append(str(rval))
     elif result is not None:  # int or float
         result_values.append(str(result))

.tpe.py CHANGED Viewed

@@ -6,6 +6,12 @@ from typing import Optional
 try:
     import optuna
     from optuna.trial import create_trial
+    from optuna.distributions import (
+        BaseDistribution,
+        IntUniformDistribution,
+        FloatDistribution,        # Optuna ≥3.6
+    )
 except ModuleNotFoundError:
     print("Optuna not found. Cannot continue.")
     sys.exit(1)
@@ -121,8 +127,8 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
     final_value = result_dict[result_key]
-    trial_params = {}
-    trial_distributions = {}
+    trial_params: dict[str, object] = {}
+    trial_distributions: dict[str, BaseDistribution] = {}   # 👈 explicit & correct
     for name, p in parameters.items():
         value = param_dict[name]
@@ -131,26 +137,27 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
             trial_params[name] = value
             continue
+        dist: BaseDistribution
         if p["parameter_type"] == "RANGE":
             if p["type"] == "INT":
-                dist = optuna.distributions.IntUniformDistribution(p["range"][0], p["range"][1])
+                dist = IntUniformDistribution(p["range"][0], p["range"][1])
             elif p["type"] == "FLOAT":
-                dist = optuna.distributions.UniformDistribution(p["range"][0], p["range"][1])
+                # pick the right class for your Optuna version
+                dist = FloatDistribution(p["range"][0], p["range"][1])
             else:
                 continue
         elif p["parameter_type"] == "CHOICE":
             dist = optuna.distributions.CategoricalDistribution(p["values"])
         else:
             continue
         trial_params[name] = value
-        trial_distributions[name] = dist
+        trial_distributions[name] = dist      # keys are str, values are BaseDistribution
     study.add_trial(
         create_trial(
             params=trial_params,
-            distributions=trial_distributions,
+            distributions=trial_distributions,  # ✅ mypy is happy now
             value=final_value
         )
     )

{omniopt2-7345.data → omniopt2-7348.data}/data/bin/.omniopt.py RENAMED Viewed

@@ -3692,10 +3692,8 @@ def _write_job_infos_csv_result_to_strlist(result: Optional[Union[Dict[str, Opti
         for rkey in result:
             result_values.append(str(rkey))
     elif isinstance(result, dict):
-        result_keys = list(result.keys())
-        for rkey in result_keys:
-            rval = str(result[str(rkey)])
-            result_values.append(rval)
+        for _rkey, rval in result.items():  # type: str, Optional[float]
+            result_values.append(str(rval))
     elif result is not None:  # int or float
         result_values.append(str(result))

{omniopt2-7345.data → omniopt2-7348.data}/data/bin/.tpe.py RENAMED Viewed

@@ -6,6 +6,12 @@ from typing import Optional
 try:
     import optuna
     from optuna.trial import create_trial
+    from optuna.distributions import (
+        BaseDistribution,
+        IntUniformDistribution,
+        FloatDistribution,        # Optuna ≥3.6
+    )
 except ModuleNotFoundError:
     print("Optuna not found. Cannot continue.")
     sys.exit(1)
@@ -121,8 +127,8 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
     final_value = result_dict[result_key]
-    trial_params = {}
-    trial_distributions = {}
+    trial_params: dict[str, object] = {}
+    trial_distributions: dict[str, BaseDistribution] = {}   # 👈 explicit & correct
     for name, p in parameters.items():
         value = param_dict[name]
@@ -131,26 +137,27 @@ def add_existing_trial_to_study(study: optuna.study.study.Study, trial_entry: li
             trial_params[name] = value
             continue
+        dist: BaseDistribution
         if p["parameter_type"] == "RANGE":
             if p["type"] == "INT":
-                dist = optuna.distributions.IntUniformDistribution(p["range"][0], p["range"][1])
+                dist = IntUniformDistribution(p["range"][0], p["range"][1])
             elif p["type"] == "FLOAT":
-                dist = optuna.distributions.UniformDistribution(p["range"][0], p["range"][1])
+                # pick the right class for your Optuna version
+                dist = FloatDistribution(p["range"][0], p["range"][1])
             else:
                 continue
         elif p["parameter_type"] == "CHOICE":
             dist = optuna.distributions.CategoricalDistribution(p["values"])
         else:
             continue
         trial_params[name] = value
-        trial_distributions[name] = dist
+        trial_distributions[name] = dist      # keys are str, values are BaseDistribution
     study.add_trial(
         create_trial(
             params=trial_params,
-            distributions=trial_distributions,
+            distributions=trial_distributions,  # ✅ mypy is happy now
             value=final_value
         )
     )

{omniopt2-7345.dist-info → omniopt2-7348.dist-info}/METADATA RENAMED Viewed

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

@@ -3,7 +3,7 @@
 .general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
 .gitignore,sha256=OMaFWOR6wxjAlI85rF3euQcjQFFAl1F34abZkltKnaU,3714
 .helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-.omniopt.py,sha256=djK2lVN3k8_Di-aKx-sYcOrV6EhXtFnf4K7BBwLVZKw,408183
+.omniopt.py,sha256=hbfs7JSenuXpgrZWK1GMXs_PZm_Di6GAAVhOiYgrT-Y,408144
 .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
@@ -16,7 +16,7 @@
 .omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
 .random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
 .shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
-.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
+.tpe.py,sha256=sAG3Xf1mAyCmEIMwnNAXrVCdKgx-uTIYRd-piEisJkU,6817
 LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 MANIFEST.in,sha256=L3QBXyL1TtyWxbAPsfjZdCfpeBrRuI5MSgdnvwdQ22Q,24
 README.md,sha256=ImtT_VuWENewZKkJySRL_qpbHbs0pr6Xgs_n9HURg90,3332
@@ -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=LhQ76Qz9YlHiov-BGkwVIkeqRq3elWAwGT2-BzU83SI,397
+pyproject.toml,sha256=oVwLCDqJiJIPYmfKstwNxO5FUDa7fAKxz_tqqjfz2a8,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-7345.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
-omniopt2-7345.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7345.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-omniopt2-7345.data/data/bin/.omniopt.py,sha256=djK2lVN3k8_Di-aKx-sYcOrV6EhXtFnf4K7BBwLVZKw,408183
-omniopt2-7345.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7345.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7345.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7345.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7345.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7345.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7345.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7345.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7345.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7345.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7345.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7345.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
-omniopt2-7345.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
-omniopt2-7345.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7345.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7345.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
-omniopt2-7345.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7345.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7345.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7345.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-omniopt2-7345.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
-omniopt2-7345.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7345.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
-omniopt2-7345.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=mWnmXmu7uWOQu-7AGtjlPqQYpqiUvyZ2OtXQgGG-V-I,5902
+omniopt2-7348.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
+omniopt2-7348.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7348.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
+omniopt2-7348.data/data/bin/.omniopt.py,sha256=hbfs7JSenuXpgrZWK1GMXs_PZm_Di6GAAVhOiYgrT-Y,408144
+omniopt2-7348.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7348.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7348.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7348.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7348.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7348.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7348.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7348.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7348.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7348.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7348.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7348.data/data/bin/.shellscript_functions,sha256=anHc5T0Lm_BzTZTzEIp7cIICu5zdXj1FKL3LnODmHeE,13610
+omniopt2-7348.data/data/bin/.tpe.py,sha256=sAG3Xf1mAyCmEIMwnNAXrVCdKgx-uTIYRd-piEisJkU,6817
+omniopt2-7348.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7348.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7348.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
+omniopt2-7348.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7348.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7348.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7348.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
+omniopt2-7348.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
+omniopt2-7348.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7348.data/data/bin/test_requirements.txt,sha256=hHblJ3DNG2Va76G-dV7ugDhKCc6ZmkpgiUVC-g1exsQ,494
+omniopt2-7348.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=x2quSMqePFdCBmZ3hm6EzicmNdImGrX1UM_Q-hK-Xmk,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-7345.dist-info/METADATA,sha256=mWnmXmu7uWOQu-7AGtjlPqQYpqiUvyZ2OtXQgGG-V-I,5902
-omniopt2-7345.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7345.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7345.dist-info/RECORD,,
+omniopt2-7348.dist-info/METADATA,sha256=x2quSMqePFdCBmZ3hm6EzicmNdImGrX1UM_Q-hK-Xmk,5902
+omniopt2-7348.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7348.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7348.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO CHANGED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7345
+Version: 7348
 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 CHANGED Viewed

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