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.

Sign up for GitHub

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

Use user_id as token set indicator for settings #6595

Merged
merged 9 commits into from
Feb 4, 2025
Merged

Use user_id as token set indicator for settings #6595

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c411ff0
use user_id as indicator instead of token
malhotra5 Feb 3, 2025
092446e
use token or user_id as indicator
malhotra5 Feb 3, 2025
f8736df
Merge branch 'main' into refactor/use-user-id
malhotra5 Feb 3, 2025
e214150
Apply suggestions from code review
malhotra5 Feb 3, 2025
e3a5414
add typing to token
malhotra5 Feb 3, 2025
e6ffeb7
Merge branch 'refactor/use-user-id' of https://github.com/All-Hands-A…
malhotra5 Feb 3, 2025
644433d
check user_id first
malhotra5 Feb 3, 2025
20b5213
Update openhands/server/routes/settings.py
malhotra5 Feb 3, 2025
16ce8e7
Update openhands/server/routes/settings.py
malhotra5 Feb 3, 2025
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
5 changes: 3 additions & 2 deletions openhands/server/routes/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@app.get('/settings')
async def load_settings(request: Request) -> GETSettingsModel | None:
try:
user_id = get_user_id(request)
settings_store = await SettingsStoreImpl.get_instance(
config, get_user_id(request)
malhotra5 marked this conversation as resolved.
Show resolved Hide resolved
)
Expand All @@ -23,10 +24,10 @@ async def load_settings(request: Request) -> GETSettingsModel | None:
content={'error': 'Settings not found'},
)

github_token = request.state.github_token
token_is_set = bool(request.state.github_token) or bool(user_id)
settings_with_token_data = GETSettingsModel(
**settings.model_dump(),
github_token_is_set=bool(github_token),
github_token_is_set=token_is_set,
)
settings_with_token_data.llm_api_key = settings.llm_api_key

Expand Down
Loading