omniopt2 7298__py3-none-any.whl → 7309__py3-none-any.whl

.omniopt.py

@@ -603,6 +603,7 @@ class ConfigLoader:
     config_json: Optional[str]
     config_yaml: Optional[str]
     workdir: str
+    db_url: Optional[str]
     dont_jit_compile: bool
     no_normalize_y: bool
     transforms: List[str]
@@ -693,6 +694,7 @@ class ConfigLoader:
         optional.add_argument('--max_abandoned_retrial', help='Maximum number retrials to get when a job is abandoned post-generation', default=20, type=int)
         optional.add_argument('--share_password', help='Use this as a password for share. Default is none.', default=None, type=str)
         optional.add_argument('--dryrun', help='Try to do a dry run, i.e. a run for very short running jobs to test the installation of OmniOpt2 and check if environment stuff and paths and so on works properly', action='store_true', default=False)
+        optional.add_argument('--db_url', type=str, default=None, help='Database URL (e.g., mysql+pymysql://user:pass@host/db), disables sqlite3 storage')
 
         speed.add_argument('--dont_warm_start_refitting', help='Do not keep Model weights, thus, refit for every generator (may be more accurate, but slower)', action='store_true', default=False)
         speed.add_argument('--refit_on_cv', help='Refit on Cross-Validation (helps in accuracy, but makes generating new points slower)', action='store_true', default=False)
@@ -1819,13 +1821,27 @@ def compute_md5_hash(filepath: str) -> Optional[str]:
 
 @beartype
 def init_storage(db_url: str):
+    init_engine_and_session_factory(url=db_url, force_init=True)
+    engine = get_engine()
+    create_all_tables(engine)
+
+@beartype
+def try_saving_to_db() -> None:
     global initialized_storage
 
+    db_url = f"sqlite:////{get_current_run_folder()}/database.db"
+
+    if args.db_url:
+        db_url = args.db_url
+
     if not initialized_storage:
+        init_storage(db_url)
+
         initialized_storage = True
-        init_engine_and_session_factory(url=db_url)
-        engine = get_engine()
-        create_all_tables(engine)
+
+    save_experiment_to_db(ax_client.experiment)
+    save_generation_strategy(global_gs)
+
 
 @beartype
 def save_results_csv() -> Optional[str]:
@@ -1851,16 +1867,12 @@ def save_results_csv() -> Optional[str]:
         with open(pd_json, mode='w', encoding="utf-8") as json_file:
             json.dump(json_snapshot, json_file, indent=4)
 
-        url = f"sqlite:////{get_current_run_folder()}/database.db"
-        init_storage(url)
-
         save_experiment(
             ax_client.experiment,
             f"{get_current_run_folder()}/state_files/ax_client.experiment.json"
         )
 
-        save_experiment_to_db(ax_client.experiment)
-        save_generation_strategy(global_gs)
+        try_saving_to_db()
     except SignalUSR as e:
         raise SignalUSR(str(e)) from e
     except SignalCONT as e:

{omniopt2-7298.data → omniopt2-7309.data}/data/bin/.omniopt.py

@@ -603,6 +603,7 @@ class ConfigLoader:
     config_json: Optional[str]
     config_yaml: Optional[str]
     workdir: str
+    db_url: Optional[str]
     dont_jit_compile: bool
     no_normalize_y: bool
     transforms: List[str]
@@ -693,6 +694,7 @@ class ConfigLoader:
         optional.add_argument('--max_abandoned_retrial', help='Maximum number retrials to get when a job is abandoned post-generation', default=20, type=int)
         optional.add_argument('--share_password', help='Use this as a password for share. Default is none.', default=None, type=str)
         optional.add_argument('--dryrun', help='Try to do a dry run, i.e. a run for very short running jobs to test the installation of OmniOpt2 and check if environment stuff and paths and so on works properly', action='store_true', default=False)
+        optional.add_argument('--db_url', type=str, default=None, help='Database URL (e.g., mysql+pymysql://user:pass@host/db), disables sqlite3 storage')
 
         speed.add_argument('--dont_warm_start_refitting', help='Do not keep Model weights, thus, refit for every generator (may be more accurate, but slower)', action='store_true', default=False)
         speed.add_argument('--refit_on_cv', help='Refit on Cross-Validation (helps in accuracy, but makes generating new points slower)', action='store_true', default=False)
@@ -1819,13 +1821,27 @@ def compute_md5_hash(filepath: str) -> Optional[str]:
 
 @beartype
 def init_storage(db_url: str):
+    init_engine_and_session_factory(url=db_url, force_init=True)
+    engine = get_engine()
+    create_all_tables(engine)
+
+@beartype
+def try_saving_to_db() -> None:
     global initialized_storage
 
+    db_url = f"sqlite:////{get_current_run_folder()}/database.db"
+
+    if args.db_url:
+        db_url = args.db_url
+
     if not initialized_storage:
+        init_storage(db_url)
+
         initialized_storage = True
-        init_engine_and_session_factory(url=db_url)
-        engine = get_engine()
-        create_all_tables(engine)
+
+    save_experiment_to_db(ax_client.experiment)
+    save_generation_strategy(global_gs)
+
 
 @beartype
 def save_results_csv() -> Optional[str]:
@@ -1851,16 +1867,12 @@ def save_results_csv() -> Optional[str]:
         with open(pd_json, mode='w', encoding="utf-8") as json_file:
             json.dump(json_snapshot, json_file, indent=4)
 
-        url = f"sqlite:////{get_current_run_folder()}/database.db"
-        init_storage(url)
-
         save_experiment(
             ax_client.experiment,
             f"{get_current_run_folder()}/state_files/ax_client.experiment.json"
         )
 
-        save_experiment_to_db(ax_client.experiment)
-        save_generation_strategy(global_gs)
+        try_saving_to_db()
     except SignalUSR as e:
         raise SignalUSR(str(e)) from e
     except SignalCONT as e:

{omniopt2-7298.data → omniopt2-7309.data}/data/bin/requirements.txt

@@ -1,3 +1,4 @@
+pymysql
 sqlalchemy
 setuptools
 wheel

{omniopt2-7298.dist-info → omniopt2-7309.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7298
+Version: 7309
 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
@@ -8,6 +8,7 @@ Author-email: norman.koch@tu-dresden.de
 Platform: Linux
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pymysql
 Requires-Dist: sqlalchemy
 Requires-Dist: setuptools
 Requires-Dist: wheel

{omniopt2-7298.dist-info → omniopt2-7309.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=qOwXcTN6Xtx3ZUmaTHB1w2qS4BpyFbR-qk56qCFOVfA,402220
+.omniopt.py,sha256=AOQfnQMlQ3LyRdx5stVuf6VOE0ThRXbJn5boxuoTXjU,402523
 .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=U99mtILSSvPRn9uaS_Z2wbXeQNCkhbUOM4dVbDv7jwI,397
-requirements.txt,sha256=8JJ2KOAwqAD08tvEHr5tAqhRlVQ17IUBsuAdopvSeg8,305
+pyproject.toml,sha256=PfkXCTef1BBbUJziTUKNrjaZakFxya271RgZXjmxKa0,397
+requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=ILTJGX79O8L8460yGnXPqGMjQSylArqtA_6H1QN92mI,481
-omniopt2-7298.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
-omniopt2-7298.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7298.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-omniopt2-7298.data/data/bin/.omniopt.py,sha256=qOwXcTN6Xtx3ZUmaTHB1w2qS4BpyFbR-qk56qCFOVfA,402220
-omniopt2-7298.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7298.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7298.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7298.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7298.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7298.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7298.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7298.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7298.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7298.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7298.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7298.data/data/bin/.shellscript_functions,sha256=55nF3dy_xOeEzkDBINnu72L3RUAWMbnQbK_4GsoJlnA,13548
-omniopt2-7298.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
-omniopt2-7298.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7298.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7298.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
-omniopt2-7298.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7298.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7298.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7298.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-omniopt2-7298.data/data/bin/requirements.txt,sha256=8JJ2KOAwqAD08tvEHr5tAqhRlVQ17IUBsuAdopvSeg8,305
-omniopt2-7298.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7298.data/data/bin/test_requirements.txt,sha256=ILTJGX79O8L8460yGnXPqGMjQSylArqtA_6H1QN92mI,481
-omniopt2-7298.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=nkUH8stDb8LCiB9flcksPSn5lzlt1pkmuXBsoMcMtEw,5851
+omniopt2-7309.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
+omniopt2-7309.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7309.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
+omniopt2-7309.data/data/bin/.omniopt.py,sha256=AOQfnQMlQ3LyRdx5stVuf6VOE0ThRXbJn5boxuoTXjU,402523
+omniopt2-7309.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7309.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7309.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7309.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7309.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7309.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7309.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7309.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7309.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7309.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7309.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7309.data/data/bin/.shellscript_functions,sha256=55nF3dy_xOeEzkDBINnu72L3RUAWMbnQbK_4GsoJlnA,13548
+omniopt2-7309.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
+omniopt2-7309.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7309.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7309.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
+omniopt2-7309.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7309.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7309.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7309.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
+omniopt2-7309.data/data/bin/requirements.txt,sha256=73KRc-JrFmFO02-Uy_Py88kt6pLDHL6BK0xNWstU_lE,313
+omniopt2-7309.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7309.data/data/bin/test_requirements.txt,sha256=ILTJGX79O8L8460yGnXPqGMjQSylArqtA_6H1QN92mI,481
+omniopt2-7309.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=A-kiauNVaKCifAnM1IwbV_QYo9WtQWuuTztv559I_XM,5874
 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=EjmNYz54DtNRxwxoaJ7LiPba0olROLqR3f2GaQkYiHo,786
+omniopt2.egg-info/requires.txt,sha256=NhDugQuSqiPxSMshSiHX96Sn_577b_KAnURViMsTPo0,794
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7298.dist-info/METADATA,sha256=nkUH8stDb8LCiB9flcksPSn5lzlt1pkmuXBsoMcMtEw,5851
-omniopt2-7298.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7298.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7298.dist-info/RECORD,,
+omniopt2-7309.dist-info/METADATA,sha256=A-kiauNVaKCifAnM1IwbV_QYo9WtQWuuTztv559I_XM,5874
+omniopt2-7309.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7309.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7309.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7298
+Version: 7309
 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
@@ -8,6 +8,7 @@ Author-email: norman.koch@tu-dresden.de
 Platform: Linux
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: pymysql
 Requires-Dist: sqlalchemy
 Requires-Dist: setuptools
 Requires-Dist: wheel

omniopt2.egg-info/requires.txt

@@ -1,3 +1,4 @@
+pymysql
 sqlalchemy
 setuptools
 wheel

pyproject.toml

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

requirements.txt

@@ -1,3 +1,4 @@
+pymysql
 sqlalchemy
 setuptools
 wheel