Skip to content

fix: handle request timeouts nicely in authentication #773

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

Merged
ptpt merged 1 commit into from
Aug 19, 2025
Merged

fix: handle request timeouts nicely in authentication #773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions mapillary_tools/authenticate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,20 +127,28 @@ def fetch_user_items(

assert profile_name is not None, "profile_name should be set"

user_items = _verify_user_auth(_validate_profile(user_items))

LOG.info(
f'Uploading to profile "{profile_name}": {user_items.get("MAPSettingsUsername")} (ID: {user_items.get("MAPSettingsUserKey")})'
)
try:
LOG.info(f'Verifying profile "{profile_name}"...')
user_items = _verify_user_auth(_validate_profile(user_items))

if organization_key is not None:
with api_v4.create_user_session(user_items["user_upload_token"]) as session:
resp = api_v4.fetch_organization(session, organization_key)
data = api_v4.jsonify_response(resp)
LOG.info(
f"Uploading to organization: {data.get('name')} (ID: {data.get('id')})"
f'Uploading to profile "{profile_name}": {user_items.get("MAPSettingsUsername")} (ID: {user_items.get("MAPSettingsUserKey")})'
)
user_items["MAPOrganizationKey"] = data.get("id")

if organization_key is not None:
with api_v4.create_user_session(user_items["user_upload_token"]) as session:
resp = api_v4.fetch_organization(session, organization_key)
data = api_v4.jsonify_response(resp)
LOG.info(
f"Uploading to organization: {data.get('name')} (ID: {data.get('id')})"
)
user_items["MAPOrganizationKey"] = data.get("id")

except requests.Timeout as ex:
raise exceptions.MapillaryUploadTimeoutError(str(ex)) from ex

except requests.ConnectionError as ex:
raise exceptions.MapillaryUploadConnectionError(str(ex)) from ex

return user_items

Expand Down
Loading