Skip to content

Use separate cache pathes for different python/CLI versions #778

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 2 commits into from
Aug 25, 2025
Merged

Use separate cache pathes for different python/CLI versions #778

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f9688e
Use separate cache pathes for different python/CLI versions
ptpt Aug 25, 2025
9c57be3
fix
ptpt Aug 25, 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
8 changes: 8 additions & 0 deletions mapillary_tools/uploader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
types,
upload_api_v4,
utils,
VERSION,
)
from .camm import camm_builder, camm_parser
from .gpmf import gpmf_parser
Expand Down Expand Up @@ -799,8 +800,14 @@ def _maybe_create_persistent_cache_instance(
LOG.debug("Dry-run mode enabled, skipping caching upload file handles")
return None

# Different python/CLI versions use different cache (dbm) formats.
# Separate them to avoid conflicts
py_version_parts = [str(part) for part in sys.version_info[:3]]
version = f"py_{'_'.join(py_version_parts)}_{VERSION}"

cache_path_dir = (
Path(constants.UPLOAD_CACHE_DIR)
.joinpath(version)
.joinpath(api_v4.MAPILLARY_CLIENT_TOKEN.replace("|", "_"))
.joinpath(
user_items.get("MAPSettingsUserKey", user_items["user_upload_token"])
Expand All @@ -812,6 +819,7 @@ def _maybe_create_persistent_cache_instance(
# Sanitize sensitive segments for logging
sanitized_cache_path = (
Path(constants.UPLOAD_CACHE_DIR)
.joinpath(version)
.joinpath("***")
.joinpath("***")
.joinpath("cached_file_handles")
Expand Down
Loading