-
Notifications
You must be signed in to change notification settings - Fork 2
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
feat: dont use group name as primary key #1507
feat: dont use group name as primary key #1507
Conversation
652aa35
to
e0a1e1f
Compare
e0a1e1f
to
13ca5c9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
backend/src/test/kotlin/org/loculus/backend/controller/EndpointTestExtension.kt
Outdated
Show resolved
Hide resolved
backend/src/test/kotlin/org/loculus/backend/controller/submission/GetSequencesEndpointTest.kt
Outdated
Show resolved
Hide resolved
backend/src/test/kotlin/org/loculus/backend/controller/submission/ReviseEndpointTest.kt
Show resolved
Hide resolved
13ca5c9
to
2933576
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://1157-dont-use-group-name.loculus.org/dummy-organism/my_sequences/insdc_ingest_group?
I am getting an error message here:
I didn't check whether this was already the case in the past or introduced by this PR, but now I see the group twice in the dropdown menu (on the same page as above):
Thanks, good catch. Seing the same group twice might be a result of the fact that the group actually exists twice? How is this group created? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ingest group creation logic needs to be adjusted to prevent repeated creation of the same insdc_ingest_group
multiple times
Relevant code is here:
https://github.com/loculus-project/loculus/blob/2933576b5eeebdf431325a2863f44333addecee8/ingest/scripts/submit_to_loculus.py#L49-L79
I tried fixed the website (I found a couple more forgotten adaption). @corneliusroemer I tried to adapt the script. Can you please check whether that might be correct? My Python isn't that good and I don't know how to test whether it works. |
We could make it less prominent, but I added it because it's the relevant id now. |
https://1157-dont-use-group-name.loculus.org/ebola-zaire/my_sequences/1? is empty, which is a sign that the ingest script is not working? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've made it work with the ingest pipeline now, thanks for getting started with it @fengelniederhammer - there was a small bug but it's my bad as I have not documented how to test the ingest pipeline at all, other than in CI.
@chaoran-chen it works now:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Group id doesn't seem to make it to lapis:
https://1157-dont-use-group-name.loculus.org/seq/LOC_0001HFK.1
Chaoran's point also is still valid, that my sequences doesn't show anything despite sequences being there:
https://1157-dont-use-group-name.loculus.org/ebola-zaire/my_sequences/1?
6807e86
to
2fe000f
Compare
I rebased on the latest main. The group id does make it to LAPIS: https://1157-dont-use-group-name.loculus.org/seq/LOC_000007L.1 Also the ingest seems to work: https://1157-dont-use-group-name.loculus.org/ebola-zaire/search? |
backend/src/test/kotlin/org/loculus/backend/controller/submission/SubmitEndpointTest.kt
Show resolved
Hide resolved
backend/src/main/kotlin/org/loculus/backend/controller/SubmissionControllerDescriptions.kt
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great! All issues appear fixed
0a93ecd
to
f33138f
Compare
I've improved search ui config: #1541, can be merged into this PR |
resolves #1157
Please review and merge #1500 and #1505 first.
preview URL: https://1157-dont-use-group-name.loculus.org/
Summary
URLs use the group id now in the backend and on the website (e.g.
/group/123
).Screenshot
PR Checklist
[ ] All necessary documentation has been adapted.