omniopt2 7298__tar.gz → 7309__tar.gz

{omniopt2-7298 → omniopt2-7309}/.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 → omniopt2-7309}/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-7298 → omniopt2-7309}/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-7298 → omniopt2-7309}/omniopt2.egg-info/requires.txt

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

{omniopt2-7298 → omniopt2-7309}/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"]

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

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