Merge remote-tracking branch 'origin/main' into release

Author: JasonKChow

aepsych/database/tables.py

@@ -591,6 +591,20 @@ def update(db: Any, engine: Engine) -> None:
                             outcome_name="outcome_" + str(j),
                             outcome_value=float(outcome_value),
                         )
+        else:  # Raws are already in, so we just need to update it
+            for master_table in db.get_master_records():
+                unique_id = master_table.unique_id
+                raws = db.get_raw_for(unique_id)
+                tells = [
+                    message
+                    for message in db.get_replay_for(unique_id)
+                    if message.message_type == "tell"
+                ]
+
+                if len(raws) == len(tells):
+                    for raw, tell in zip(raws, tells):
+                        if tell.extra_info is not None and len(tell.extra_info) > 0:
+                            raw.extra_data = tell.extra_info
                 else:
                     db.record_outcome(
                         raw_table=db_raw_record,

aepsych/version.py

@@ -5,4 +5,4 @@
 # This source code is licensed under the license found in the
 # LICENSE file in the root directory of this source tree.
 
-__version__ = "0.7.0"
+__version__ = "0.7.0+dev"

tests/test_databases/extra_info.db

@@ -252,6 +252,48 @@ def test_update_db_with_raw_data_tables(self):
 
         test_database.delete_db()
 
+    def test_update_db_with_raw_extra_data(self):
+        current_path = Path(os.path.abspath(__file__)).parent
+        db_path = current_path
+        db_path = db_path.joinpath("test_databases/extra_info.db")
+
+        # copy the db to a new file
+        dst_db_path = Path(self._dbname)
+        shutil.copy(str(db_path), str(dst_db_path))
+        self.assertTrue(dst_db_path.is_file())
+
+        # sleep to ensure db is ready
+        time.sleep(0.1)
+
+        # open the new db
+        test_database = db.Database(db_path=dst_db_path.as_posix(), update=False)
+
+        replay_tells = [
+            row for row in test_database.get_replay_for(1) if row.message_type == "tell"
+        ]
+
+        # Make sure that update is required
+        self.assertTrue(test_database.is_update_required())
+
+        # Update the database
+        test_database.perform_updates()
+
+        # The trial numbers line up with tells
+        none_rows = 0
+        for row in test_database.get_raw_for(1):
+            if row.extra_data is None:
+                none_rows += 1
+            else:
+                self.assertTrue(row.unique_id == row.extra_data["trial_number"])
+                self.assertTrue(row.extra_data["extra"] == "info")
+
+        # Exactly one row should be none
+        self.assertTrue(none_rows == 1)
+
+        self.assertFalse(test_database.is_update_required())
+
+        test_database.delete_db()
+
     def test_update_configs(self):
         config_str = """
         [common]