Skip to content

Commit adc73df

Browse files
author
Dylan Huang
committed
fix sqlite logger tests
1 parent 95c7a29 commit adc73df

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

eval_protocol/dataset_logger/sqlite_dataset_logger_adapter.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ def __init__(self, db_path: Optional[str] = None, store: Optional[SqliteEvaluati
2222
self._store = SqliteEvaluationRowStore(self.db_path)
2323

2424
def log(self, row: "EvaluationRow") -> None:
25-
rollout_id = row.rollout_id
2625
data = row.model_dump(exclude_none=True, mode="json")
27-
self._store.upsert_row(rollout_id=rollout_id, data=data)
26+
self._store.upsert_row(data=data)
2827
try:
2928
event_bus.emit(LOG_EVENT_TYPE, EvaluationRow(**data))
3029
except Exception as e:

eval_protocol/dataset_logger/sqlite_evaluation_row_store.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ class EvaluationRow(BaseModel): # type: ignore
3636
def db_path(self) -> str:
3737
return self._db_path
3838

39-
def upsert_row(self, rollout_id: str, data: dict) -> None:
39+
def upsert_row(self, data: dict) -> None:
40+
rollout_id = data["rollout_id"]
41+
if "rollout_id" not in data:
42+
raise ValueError("rollout_id is required to upsert a row")
4043
if self._EvaluationRow.select().where(self._EvaluationRow.rollout_id == rollout_id).exists():
4144
self._EvaluationRow.update(data=data).where(self._EvaluationRow.rollout_id == rollout_id).execute()
4245
else:

tests/dataset_logger/test_sqlite_dataset_logger_adapter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ def test_update_log_and_read():
1818
messages = [Message(role="user", content="Hello")]
1919
input_metadata = InputMetadata(row_id="1")
2020
row = EvaluationRow(input_metadata=input_metadata, messages=messages)
21-
store.upsert_row(row_id="1", data=row.model_dump(exclude_none=True, mode="json"))
21+
store.upsert_row(data=row.model_dump(exclude_none=True, mode="json"))
2222

2323
row.messages.append(Message(role="assistant", content="Hello"))
2424

25-
logger = SqliteDatasetLoggerAdapter()
25+
logger = SqliteDatasetLoggerAdapter(store=store)
2626
logger.log(row)
27-
saved = logger.read(rollout_id="1")[0]
27+
saved = logger.read(row.rollout_id)[0]
2828
assert row.messages == saved.messages
2929
assert row.input_metadata == saved.input_metadata
3030

@@ -42,7 +42,7 @@ def test_create_log_and_read():
4242
row = EvaluationRow(input_metadata=input_metadata, messages=messages)
4343

4444
logger.log(row)
45-
saved = logger.read(rollout_id="1")[0]
45+
saved = logger.read(rollout_id=row.rollout_id)[0]
4646
assert row.messages == saved.messages
4747
assert row.input_metadata == saved.input_metadata
4848

0 commit comments

Comments
 (0)