Merge #3644

3644: Relax time stamp type assertions to allow ints in the database r=jenshnielsen a=astafan8

- [x] capture this with a test

Co-authored-by: Mikhail Astafev <astafan8@gmail.com>

Author: 2 people

docs/changes/newsfragments/3644.Underthehood

@@ -0,0 +1,2 @@
+Relax type assertions for DataSet timestamps so that if in the database they
+are written as integers, as opposed to floats, a DataSet can still be loaded

qcodes/dataset/sqlite/queries.py

@@ -866,6 +866,9 @@ def get_completed_timestamp_from_run_id(
         timestamp in seconds since the Epoch, or None
     """
     ts = select_one_where(conn, "runs", "completed_timestamp", "run_id", run_id)
+    # sometimes it happens that the timestamp is written to DB as an int
+    if isinstance(ts, int):
+        ts = float(ts)
     assert isinstance(ts, (float, type(None)))
     return ts
 
@@ -1888,6 +1891,9 @@ def get_sample_name_from_experiment_id(conn: ConnectionPlus, exp_id: int) -> str
 def get_run_timestamp_from_run_id(conn: ConnectionPlus,
                                   run_id: int) -> Optional[float]:
     time_stamp = select_one_where(conn, "runs", "run_timestamp", "run_id", run_id)
+    # sometimes it happens that the timestamp is saved as an integer in the database
+    if isinstance(time_stamp, int):
+        time_stamp = float(time_stamp)
     assert isinstance(time_stamp, (float, type(None)))
     return time_stamp
 

qcodes/tests/dataset/test_dataset_basic.py

@@ -21,9 +21,9 @@
 from qcodes.dataset.descriptions.param_spec import ParamSpecBase
 from qcodes.dataset.descriptions.rundescriber import RunDescriber
 from qcodes.dataset.guids import parse_guid
-from qcodes.dataset.sqlite.connection import path_to_dbfile
+from qcodes.dataset.sqlite.connection import path_to_dbfile, atomic
 from qcodes.dataset.sqlite.database import get_DB_location
-from qcodes.dataset.sqlite.queries import _unicode_categories
+from qcodes.dataset.sqlite.queries import _unicode_categories, _rewrite_timestamps
 from qcodes.tests.common import error_caused_by
 from qcodes.tests.dataset.helper_functions import verify_data_dict
 from qcodes.tests.dataset.test_links import generate_some_links
@@ -198,6 +198,22 @@ def test_timestamps_are_none():
     assert isinstance(ds.run_timestamp(), str)
 
 
+@pytest.mark.usefixtures('experiment')
+def test_integer_timestamps_in_database_are_supported():
+    ds = DataSet()
+
+    ds.mark_started()
+    ds.mark_completed()
+
+    with atomic(ds.conn) as conn:
+        _rewrite_timestamps(conn, ds.run_id, 42, 69)
+
+    assert isinstance(ds.run_timestamp_raw, float)
+    assert isinstance(ds.completed_timestamp_raw, float)
+    assert isinstance(ds.run_timestamp(), str)
+    assert isinstance(ds.completed_timestamp(), str)
+
+
 def test_dataset_read_only_properties(dataset):
     read_only_props = ['run_id', 'path_to_db', 'name', 'table_name', 'guid',
                        'number_of_results', 'counter', 'parameters',