This repository was archived by the owner on Oct 6, 2025. It is now read-only.
[NO MERGE] fake PR for comments - #2
Draft
devincowan wants to merge 1 commit into
Draft
Conversation
devincowan
marked this pull request as draft
June 20, 2025 17:15
devincowan
commented
Jun 20, 2025
| psycopg2 | ||
| pydantic>=2.7.0,<3.0.0 | ||
| redis | ||
| sqlmodel No newline at end of file |
Author
There was a problem hiding this comment.
Do we actually use sqlmodel?
Member
There was a problem hiding this comment.
We use sqlalchemy which is a part of sqlmodel. We could reduce this dependency to sqlalchemy instead, good catch.
devincowan
commented
Jun 22, 2025
|
|
||
| COPY ./api /app/api | ||
|
|
||
| CMD ["fastapi", "run", "api/main.py", "--port", "80", "--workers", "4"] |
Author
There was a problem hiding this comment.
@sblack-usu why 4 workers? Might we need this to be more flexible for deployment into our cluster, depending on available resources?
devincowan
commented
Jun 22, 2025
Comment on lines
-70
to
-96
| def user_has_edit_access(user_id: int, resource_id: str): | ||
| query = """SELECT DISTINCT hs_core_genericresource.short_id | ||
| FROM hs_core_genericresource | ||
| LEFT OUTER JOIN hs_access_control_userresourceprivilege | ||
| ON (hs_core_genericresource.page_ptr_id = hs_access_control_userresourceprivilege.resource_id) | ||
| LEFT OUTER JOIN hs_access_control_resourceaccess | ||
| ON (hs_core_genericresource.page_ptr_id = hs_access_control_resourceaccess.resource_id) | ||
| LEFT OUTER JOIN hs_access_control_groupresourceprivilege | ||
| ON (hs_core_genericresource.page_ptr_id = hs_access_control_groupresourceprivilege.resource_id) | ||
| LEFT OUTER JOIN auth_group | ||
| ON (hs_access_control_groupresourceprivilege.group_id = auth_group.id) | ||
| LEFT OUTER JOIN hs_access_control_usergroupprivilege | ||
| ON (auth_group.id = hs_access_control_usergroupprivilege.group_id) | ||
| LEFT OUTER JOIN hs_access_control_groupaccess | ||
| ON (auth_group.id = hs_access_control_groupaccess.group_id) | ||
| INNER JOIN pages_page | ||
| ON (hs_core_genericresource.page_ptr_id = pages_page.id) | ||
| WHERE ((hs_access_control_userresourceprivilege.privilege = 1 | ||
| AND hs_access_control_userresourceprivilege.user_id = :user_id) | ||
| OR (hs_access_control_userresourceprivilege.privilege <= 2 | ||
| AND hs_access_control_userresourceprivilege.user_id = :user_id | ||
| AND NOT hs_access_control_resourceaccess.immutable) | ||
| OR (hs_access_control_usergroupprivilege.user_id = :user_id | ||
| AND hs_access_control_groupaccess.active | ||
| AND hs_access_control_groupresourceprivilege.privilege = 2 | ||
| AND NOT hs_access_control_resourceaccess.immutable)) | ||
| AND hs_core_genericresource.short_id = :resource_id""" |
Author
There was a problem hiding this comment.
I know our User and Resource models are pretty much set in stone, and we don't really anticipate drift between these queries and our models in HydroShare...so I'm going to ignore my distaste for these raw queries. 😄
I'm sure that we chose raw SQL queries like this for performance reasons, right?
Author
|
@sblack-usu other than removing the unnecessary dependency and addressing the Q about workers, this looks pretty great! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.