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

CR edits to table-update-tracker #2767

Merged
merged 39 commits into from
Sep 11, 2024

Conversation

corneliusroemer
Copy link
Contributor

No description provided.

anna-parker and others added 30 commits September 10, 2024 22:04
… was successfully sent to LAPIS - then echo $last_modified
@corneliusroemer corneliusroemer added the preview Triggers a deployment to argocd label Sep 11, 2024
@corneliusroemer corneliusroemer changed the title Table update tracker anya CR edits to table-update-tracker Sep 11, 2024
@corneliusroemer corneliusroemer marked this pull request as ready for review September 11, 2024 22:35
@corneliusroemer corneliusroemer merged commit c28cd7c into table-update-tracker Sep 11, 2024
13 checks passed
@corneliusroemer corneliusroemer deleted the table-update-tracker-anya branch September 11, 2024 22:35
corneliusroemer added a commit that referenced this pull request Sep 12, 2024
* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

* Use etag instead of modified-since for spec compliance

* ktlin fix

* Move logic into model

* Fix etag formatting

* Fix etag yet again

---------

Co-authored-by: Anna (Anya) Parker <[email protected]>
corneliusroemer added a commit that referenced this pull request Sep 19, 2024
co-authored with @anna-parker and Claude Sonnet

try

now it might work?

Remove views

fixup

Change to a conditional update for useNewerProcessingPipelineIfPossible, add last_updated_db as a view. (#2741)

Co-authored-by: Anna (Anya) Parker <[email protected]>

Still return current newest version

Return version from correct place

Don't issue delete statement unless there's something to delete

fix ktlint

Adjust useNewerProcessingPipelineIfPossible to only update table when there are changes

Table update tracker anya (#2764)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

---------

Co-authored-by: Cornelius Roemer <[email protected]>

CR edits to table-update-tracker (#2767)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

* Use etag instead of modified-since for spec compliance

* ktlin fix

* Move logic into model

* Fix etag formatting

* Fix etag yet again

---------

Co-authored-by: Anna (Anya) Parker <[email protected]>

refactor(backend): streamline control flow

refactor(backend): extract function

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Enable etag for /extract-unprocessed-data

Use etag in prepro to skip preprocessing

match case refactor

Try fix

fix logic

fix! i'm stupid

Force refresh every hour

Add response code annotations

Update preprocessing/nextclade/src/loculus_preprocessing/prepro.py

Co-authored-by: Anna (Anya) Parker <[email protected]>

Add etag to dummy preprocessing

# Conflicts:
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionControllerDescriptions.kt
#	backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/UpdateTrackerTable.kt
#	backend/src/main/resources/db/migration/V1.2__add_table_update_tracker.sql
#	backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt
#	kubernetes/loculus/silo_import_job.sh
corneliusroemer added a commit that referenced this pull request Sep 20, 2024
co-authored with @anna-parker and Claude Sonnet

try

now it might work?

Remove views

fixup

Change to a conditional update for useNewerProcessingPipelineIfPossible, add last_updated_db as a view. (#2741)

Co-authored-by: Anna (Anya) Parker <[email protected]>

Still return current newest version

Return version from correct place

Don't issue delete statement unless there's something to delete

fix ktlint

Adjust useNewerProcessingPipelineIfPossible to only update table when there are changes

Table update tracker anya (#2764)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

---------

Co-authored-by: Cornelius Roemer <[email protected]>

CR edits to table-update-tracker (#2767)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

* Use etag instead of modified-since for spec compliance

* ktlin fix

* Move logic into model

* Fix etag formatting

* Fix etag yet again

---------

Co-authored-by: Anna (Anya) Parker <[email protected]>

refactor(backend): streamline control flow

refactor(backend): extract function

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Enable etag for /extract-unprocessed-data

Use etag in prepro to skip preprocessing

match case refactor

Try fix

fix logic

fix! i'm stupid

Force refresh every hour

Add response code annotations

Update preprocessing/nextclade/src/loculus_preprocessing/prepro.py

Co-authored-by: Anna (Anya) Parker <[email protected]>

Add etag to dummy preprocessing

# Conflicts:
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionControllerDescriptions.kt
#	backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/UpdateTrackerTable.kt
#	backend/src/main/resources/db/migration/V1.2__add_table_update_tracker.sql
#	backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt
#	kubernetes/loculus/silo_import_job.sh
corneliusroemer added a commit that referenced this pull request Sep 23, 2024
co-authored with @anna-parker and Claude Sonnet

try

now it might work?

Remove views

fixup

Change to a conditional update for useNewerProcessingPipelineIfPossible, add last_updated_db as a view. (#2741)

Co-authored-by: Anna (Anya) Parker <[email protected]>

Still return current newest version

Return version from correct place

Don't issue delete statement unless there's something to delete

fix ktlint

Adjust useNewerProcessingPipelineIfPossible to only update table when there are changes

Table update tracker anya (#2764)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

---------

Co-authored-by: Cornelius Roemer <[email protected]>

CR edits to table-update-tracker (#2767)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

* Use etag instead of modified-since for spec compliance

* ktlin fix

* Move logic into model

* Fix etag formatting

* Fix etag yet again

---------

Co-authored-by: Anna (Anya) Parker <[email protected]>

refactor(backend): streamline control flow

refactor(backend): extract function

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Enable etag for /extract-unprocessed-data

Use etag in prepro to skip preprocessing

match case refactor

Try fix

fix logic

fix! i'm stupid

Force refresh every hour

Add response code annotations

Update preprocessing/nextclade/src/loculus_preprocessing/prepro.py

Co-authored-by: Anna (Anya) Parker <[email protected]>

Add etag to dummy preprocessing

# Conflicts:
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionControllerDescriptions.kt
#	backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/UpdateTrackerTable.kt
#	backend/src/main/resources/db/migration/V1.2__add_table_update_tracker.sql
#	backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt
#	kubernetes/loculus/silo_import_job.sh
corneliusroemer added a commit that referenced this pull request Sep 24, 2024
co-authored with @anna-parker and Claude Sonnet

try

now it might work?

Remove views

fixup

Change to a conditional update for useNewerProcessingPipelineIfPossible, add last_updated_db as a view. (#2741)

Co-authored-by: Anna (Anya) Parker <[email protected]>

Still return current newest version

Return version from correct place

Don't issue delete statement unless there's something to delete

fix ktlint

Adjust useNewerProcessingPipelineIfPossible to only update table when there are changes

Table update tracker anya (#2764)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

---------

Co-authored-by: Cornelius Roemer <[email protected]>

CR edits to table-update-tracker (#2767)

* Add option to get-released-data to check last update time.

* make name better

* Make or short-circuiting

* Only work with table_update_tracker - return lastTime in LAST_MODIFIED header

* Remove unused functions

* add back missing imports - somehow format removed this???

* Update bash scripts

* Attempt to fix bash

* 2nd little fix

* echo value of last_modified not name

* Do not update SILO if loculus responds with 304.

* Always echo $lastSnapshot unless new data existed in loculus AND this was successfully sent to LAPIS - then echo $last_modified

* save last snapshot to file

* Update with loculus data anyways if longer than 1hour since last update

* fix

* Improve silo import scripts etc

* add back BACKEND_BASE_URL

* Log headers

* Regularize

* Better logs

* Try to fix error

* return 0 and never null in header

* Fix read non-existent file bug

* Better wrapper logging

* fix delete after update snapshot

* Make grep case insensitive

* add back removed exit 0

* Improvement to logging

* Add test

* Add full process to test

* Update documentation

* Use etag instead of modified-since for spec compliance

* ktlin fix

* Move logic into model

* Fix etag formatting

* Fix etag yet again

---------

Co-authored-by: Anna (Anya) Parker <[email protected]>

refactor(backend): streamline control flow

refactor(backend): extract function

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Update backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt

Co-authored-by: Fabian Engelniederhammer <[email protected]>

Enable etag for /extract-unprocessed-data

Use etag in prepro to skip preprocessing

match case refactor

Try fix

fix logic

fix! i'm stupid

Force refresh every hour

Add response code annotations

Update preprocessing/nextclade/src/loculus_preprocessing/prepro.py

Co-authored-by: Anna (Anya) Parker <[email protected]>

Add etag to dummy preprocessing

# Conflicts:
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt
#	backend/src/main/kotlin/org/loculus/backend/controller/SubmissionControllerDescriptions.kt
#	backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
#	backend/src/main/kotlin/org/loculus/backend/service/submission/UpdateTrackerTable.kt
#	backend/src/main/resources/db/migration/V1.2__add_table_update_tracker.sql
#	backend/src/test/kotlin/org/loculus/backend/controller/submission/GetReleasedDataEndpointTest.kt
#	kubernetes/loculus/silo_import_job.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
preview Triggers a deployment to argocd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants