omniopt2 7283__py3-none-any.whl → 7294__py3-none-any.whl

.omniopt.py

@@ -18,6 +18,7 @@ import statistics
 import tempfile
 import threading
 
+initialized_storage: bool = False
 prepared_setting_to_custom: bool = False
 whole_start_time: float = time.time()
 last_progress_bar_desc: str = ""
@@ -1049,6 +1050,9 @@ try:
     with console.status("[bold green]Importing save_experiment..."):
         from ax.storage.json_store.save import save_experiment
 
+    with console.status("[bold green]Importing save_experiment_to_db..."):
+        from ax.storage.sqa_store.save import save_experiment as save_experiment_to_db
+
     with console.status("[bold green]Importing TrialStatus..."):
         from ax.core.base_trial import TrialStatus
 
@@ -1106,6 +1110,9 @@ except ImportError as e:
 with console.status("[bold green]Importing ax logger...") as status:
     from ax.utils.common.logger import disable_loggers
 
+with console.status("[bold green]Importing SQL-Storage-Stuff...") as status:
+    from ax.storage.sqa_store.db import init_engine_and_session_factory, get_engine, create_all_tables
+
     disable_loggers(names=["ax.modelbridge.base"], level=logging.CRITICAL)
 
 NVIDIA_SMI_LOGS_BASE = None
@@ -1810,6 +1817,16 @@ def compute_md5_hash(filepath: str) -> Optional[str]:
         print_red(f"Error computing MD5 for {filepath}: {e}")
         return None
 
+@beartype
+def init_storage(db_url: str):
+    global initialized_storage
+
+    if not initialized_storage:
+        initialized_storage = True
+        init_engine_and_session_factory(url=db_url)
+        engine = get_engine()
+        create_all_tables(engine)
+
 @beartype
 def save_results_csv() -> Optional[str]:
     pd_csv: str = f'{get_current_run_folder()}/{PD_CSV_FILENAME}'
@@ -1834,10 +1851,15 @@ 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)
     except SignalUSR as e:
         raise SignalUSR(str(e)) from e
     except SignalCONT as e:

{omniopt2-7283.data → omniopt2-7294.data}/data/bin/.omniopt.py

@@ -18,6 +18,7 @@ import statistics
 import tempfile
 import threading
 
+initialized_storage: bool = False
 prepared_setting_to_custom: bool = False
 whole_start_time: float = time.time()
 last_progress_bar_desc: str = ""
@@ -1049,6 +1050,9 @@ try:
     with console.status("[bold green]Importing save_experiment..."):
         from ax.storage.json_store.save import save_experiment
 
+    with console.status("[bold green]Importing save_experiment_to_db..."):
+        from ax.storage.sqa_store.save import save_experiment as save_experiment_to_db
+
     with console.status("[bold green]Importing TrialStatus..."):
         from ax.core.base_trial import TrialStatus
 
@@ -1106,6 +1110,9 @@ except ImportError as e:
 with console.status("[bold green]Importing ax logger...") as status:
     from ax.utils.common.logger import disable_loggers
 
+with console.status("[bold green]Importing SQL-Storage-Stuff...") as status:
+    from ax.storage.sqa_store.db import init_engine_and_session_factory, get_engine, create_all_tables
+
     disable_loggers(names=["ax.modelbridge.base"], level=logging.CRITICAL)
 
 NVIDIA_SMI_LOGS_BASE = None
@@ -1810,6 +1817,16 @@ def compute_md5_hash(filepath: str) -> Optional[str]:
         print_red(f"Error computing MD5 for {filepath}: {e}")
         return None
 
+@beartype
+def init_storage(db_url: str):
+    global initialized_storage
+
+    if not initialized_storage:
+        initialized_storage = True
+        init_engine_and_session_factory(url=db_url)
+        engine = get_engine()
+        create_all_tables(engine)
+
 @beartype
 def save_results_csv() -> Optional[str]:
     pd_csv: str = f'{get_current_run_folder()}/{PD_CSV_FILENAME}'
@@ -1834,10 +1851,15 @@ 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)
     except SignalUSR as e:
         raise SignalUSR(str(e)) from e
     except SignalCONT as e:

{omniopt2-7283.data → omniopt2-7294.data}/data/bin/requirements.txt

@@ -1,4 +1,4 @@
-sqlalchemy<2.0
+sqlalchemy
 setuptools
 wheel
 multidict

{omniopt2-7283.dist-info → omniopt2-7294.dist-info}/METADATA

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

{omniopt2-7283.dist-info → omniopt2-7294.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=SHcNY_AvClzlbNa-9bIzvdcEFDRPV9cm3jBoFVLf7-4,401368
+.omniopt.py,sha256=EL0KGNXi-pxvkBA5GdcEwLjFpYyHL5pPKurqHA_JB4Y,402150
 .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=b3AMyYtsFzZAj7PJbbWortz93PQJ_HYfnC2vx24YMqs,397
-requirements.txt,sha256=jqvp-P5m33fwsODnA_FFVVujUwIt9z_nhBRIxAtahcQ,302
+pyproject.toml,sha256=6etyoCT6NF5Mgc4ZbySKpy17JN96f6SjvwHjjfvFWdo,397
+requirements.txt,sha256=ix_FzDSZRV8lFebvCy6iFXBtq4A_Ft3kjNfU2Bnc8fI,298
 setup.cfg,sha256=HEc8uu6NpfxG5_AVh5SvXOpEFMNKPPPxgMIAH144vT4,38
 test_requirements.txt,sha256=qUBRLahv3rTxvKyddRhEzT-EnQyKdubu5KxyGhUHPr8,470
-omniopt2-7283.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
-omniopt2-7283.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
-omniopt2-7283.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
-omniopt2-7283.data/data/bin/.omniopt.py,sha256=SHcNY_AvClzlbNa-9bIzvdcEFDRPV9cm3jBoFVLf7-4,401368
-omniopt2-7283.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
-omniopt2-7283.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
-omniopt2-7283.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
-omniopt2-7283.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
-omniopt2-7283.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
-omniopt2-7283.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
-omniopt2-7283.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
-omniopt2-7283.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
-omniopt2-7283.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
-omniopt2-7283.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
-omniopt2-7283.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
-omniopt2-7283.data/data/bin/.shellscript_functions,sha256=55nF3dy_xOeEzkDBINnu72L3RUAWMbnQbK_4GsoJlnA,13548
-omniopt2-7283.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
-omniopt2-7283.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2-7283.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
-omniopt2-7283.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
-omniopt2-7283.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
-omniopt2-7283.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
-omniopt2-7283.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
-omniopt2-7283.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
-omniopt2-7283.data/data/bin/requirements.txt,sha256=jqvp-P5m33fwsODnA_FFVVujUwIt9z_nhBRIxAtahcQ,302
-omniopt2-7283.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
-omniopt2-7283.data/data/bin/test_requirements.txt,sha256=qUBRLahv3rTxvKyddRhEzT-EnQyKdubu5KxyGhUHPr8,470
-omniopt2-7283.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-omniopt2.egg-info/PKG-INFO,sha256=gZiJtAS0haCyvyDY9AMtN_1ZZ1TLDu7onE6_Jkjf9Xc,5822
+omniopt2-7294.data/data/bin/.colorfunctions.sh,sha256=xxc08V3Fh_0Je20fkJMRO14u9VCSvMyOiMaDfioEyCY,1098
+omniopt2-7294.data/data/bin/.general.sh,sha256=uyGMN8xNToQ0v50KoiYxm6jRmgf0orroOaodM_Nuq30,2107
+omniopt2-7294.data/data/bin/.helpers.py,sha256=6uoxzpi8zfvvQy16LpGkIC1OzvDC8TR8luAOX1iW1OM,30679
+omniopt2-7294.data/data/bin/.omniopt.py,sha256=EL0KGNXi-pxvkBA5GdcEwLjFpYyHL5pPKurqHA_JB4Y,402150
+omniopt2-7294.data/data/bin/.omniopt_plot_cpu_ram_usage.py,sha256=DbOAmdrbcZtsMnHJgHfeRngjtv6zX5J0axyua_dYezc,3932
+omniopt2-7294.data/data/bin/.omniopt_plot_general.py,sha256=ZERZJkvVOoJhi7SszmTF1Iln-_08_0Aki48u3LHUW-k,6809
+omniopt2-7294.data/data/bin/.omniopt_plot_gpu_usage.py,sha256=ojxVicwSoiyl7f3c-6lLuT2EpyPcSJKEcbp75LgDY2k,5107
+omniopt2-7294.data/data/bin/.omniopt_plot_kde.py,sha256=uRLWr72TDKvj3AqJ0O0AvkKZ1ok1O1QpXnbfQQdo0nA,6873
+omniopt2-7294.data/data/bin/.omniopt_plot_scatter.py,sha256=-amqmLR_YLCbHImLPh6gwVFv8iiVnXME544XHsRVCuw,8422
+omniopt2-7294.data/data/bin/.omniopt_plot_scatter_generation_method.py,sha256=rgKY_w1E516c9UucVaEvaKd8tCnoUq9xg-RrYSDzYEQ,4289
+omniopt2-7294.data/data/bin/.omniopt_plot_scatter_hex.py,sha256=w1L5gL6Bc_QudoSJi2lxEVvF17Apjjb3l2T-lXGnsUg,10279
+omniopt2-7294.data/data/bin/.omniopt_plot_time_and_exit_code.py,sha256=hC4RFDiJN_UImezFR6M5uVF-QKDqMDpq6R5DIg7dDDc,6463
+omniopt2-7294.data/data/bin/.omniopt_plot_trial_index_result.py,sha256=5DmqZAQO_PFmzdap-TIhSMAshRXpOHQacnHAtjwnzN4,4629
+omniopt2-7294.data/data/bin/.omniopt_plot_worker.py,sha256=VuluQq4W6KRR5RU08dxmDSFk5mbfDRkRJQFwwcLgAGw,4524
+omniopt2-7294.data/data/bin/.random_generator.py,sha256=ezBBUXpez_QaGdpCglMcJ0KZPdQP0XdX5gnLzO1xhwU,2987
+omniopt2-7294.data/data/bin/.shellscript_functions,sha256=55nF3dy_xOeEzkDBINnu72L3RUAWMbnQbK_4GsoJlnA,13548
+omniopt2-7294.data/data/bin/.tpe.py,sha256=Yd9s-ixCbWxTd3x0O1M1sok9QfM2mBEfsDwXhx50-Nc,6464
+omniopt2-7294.data/data/bin/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2-7294.data/data/bin/apt-dependencies.txt,sha256=X5tBB8ZLW9XaFtRh8B7C2pIkSoxNNawqioDr0QZAtuM,149
+omniopt2-7294.data/data/bin/omniopt,sha256=WNbAGQOvqlmDPZyT3DrFJEg1Xn-QH07cgnq8n4jdRBc,47798
+omniopt2-7294.data/data/bin/omniopt_docker,sha256=LWVUeyvmA5AKqAHiH9jBUkR5uZ6AHMnSy0eET7mK6E4,3602
+omniopt2-7294.data/data/bin/omniopt_evaluate,sha256=9oBh0_ikCuIz_aJQZrN0j39NDiIDYoSvEFmSVIoFjJE,23842
+omniopt2-7294.data/data/bin/omniopt_plot,sha256=Z8ZR10p-ZRSgMeVPO-wVCJ8lk-LQtntjZ9Bk9RifCIs,13360
+omniopt2-7294.data/data/bin/omniopt_share,sha256=PiO7Vt-dL5aC2uAZZZEYlNbyGjkyMUSeWVoiIURjr3k,13999
+omniopt2-7294.data/data/bin/requirements.txt,sha256=ix_FzDSZRV8lFebvCy6iFXBtq4A_Ft3kjNfU2Bnc8fI,298
+omniopt2-7294.data/data/bin/setup.py,sha256=g3uEqJHXhggXwgLYoxOjsXg9Z6IV1ubh-Og59AZ264Q,4648
+omniopt2-7294.data/data/bin/test_requirements.txt,sha256=qUBRLahv3rTxvKyddRhEzT-EnQyKdubu5KxyGhUHPr8,470
+omniopt2-7294.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+omniopt2.egg-info/PKG-INFO,sha256=QGZPnNllfcR3uvSLBzWwtN3BtXqKixeqAI77SNvaQkA,5818
 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=lR4dCom0VD9WtxDpAuN83qtJYZfMHl5GT8LjhUk6UJE,772
+omniopt2.egg-info/requires.txt,sha256=QtIVGRxTgt08dX3lIQqbt8UE6g-kEQJDAopyvK9xquc,768
 omniopt2.egg-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7283.dist-info/METADATA,sha256=gZiJtAS0haCyvyDY9AMtN_1ZZ1TLDu7onE6_Jkjf9Xc,5822
-omniopt2-7283.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omniopt2-7283.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-omniopt2-7283.dist-info/RECORD,,
+omniopt2-7294.dist-info/METADATA,sha256=QGZPnNllfcR3uvSLBzWwtN3BtXqKixeqAI77SNvaQkA,5818
+omniopt2-7294.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omniopt2-7294.dist-info/top_level.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+omniopt2-7294.dist-info/RECORD,,

omniopt2.egg-info/PKG-INFO

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

omniopt2.egg-info/requires.txt

@@ -1,4 +1,4 @@
-sqlalchemy<2.0
+sqlalchemy
 setuptools
 wheel
 multidict

pyproject.toml

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

requirements.txt

@@ -1,4 +1,4 @@
-sqlalchemy<2.0
+sqlalchemy
 setuptools
 wheel
 multidict