Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX] argilla server: Prevent update dataset.updated_at when updating dataset.last_activity_at column #5656

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions argilla-server/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ These are the section headers that we use:

## [Unreleased]()

### Fixed

- Fixed error updating dataset.updated_at when updating dataset.last_activity_at. ([#]())

## [2.4.0](https://github.com/argilla-io/argilla/compare/v2.3.1...v2.4.0)

### Added

- Added new `metadata` attribute for endpoints getting, creating and updating Datasets so now it is possible to store metadata associated to a dataset. ([#5586](https://github.com/argilla-io/argilla/pull/5586))
Expand Down
7 changes: 6 additions & 1 deletion argilla-server/src/argilla_server/contexts/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,12 @@

async def _touch_dataset_last_activity_at(db: AsyncSession, dataset: Dataset) -> None:
await db.execute(
sqlalchemy.update(Dataset).where(Dataset.id == dataset.id).values(last_activity_at=datetime.utcnow())
sqlalchemy.update(Dataset)
.where(Dataset.id == dataset.id)
.values(
last_activity_at=datetime.utcnow(),
updated_at=Dataset.__table__.c.updated_at,
)
)


Expand Down
2 changes: 2 additions & 0 deletions argilla-server/tests/unit/api/handlers/v1/test_responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ async def test_update_response(
"updated_at": datetime.fromisoformat(resp_body["updated_at"]).isoformat(),
}

await db.refresh(dataset)
assert dataset.last_activity_at > dataset_previous_last_activity_at
assert dataset.updated_at == dataset_previous_updated_at

Expand Down Expand Up @@ -421,6 +422,7 @@ async def test_delete_response(
assert resp.status_code == 200
assert (await db.execute(select(func.count(Response.id)))).scalar() == 0

await db.refresh(dataset)
assert dataset.last_activity_at > dataset_previous_last_activity_at
assert dataset.updated_at == dataset_previous_updated_at

Expand Down
1 change: 1 addition & 0 deletions argilla/pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading