mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2026-01-10 07:28:51 -05:00
* Implement code changes to enhance functionality and improve performance * Update nl.json Fix Dutch translations. * feat(security): add Trivy security scans for Docker images and source code * feat(security): restructure Trivy scans for improved clarity and organization * fix(dependencies): update Django version to 5.2.2 * style(workflows): standardize quotes and fix typo in frontend-test.yml * feat(workflows): add job names for clarity in backend and frontend test workflows * refactor(workflows): remove path filters from pull_request and push triggers in backend and frontend workflows * feat(workflows): add paths to push and pull_request triggers for backend and frontend workflows * refactor(workflows): simplify trigger paths for backend and frontend workflows fix(dependencies): add overrides for esbuild in frontend package.json * fix(package): add missing pnpm overrides for esbuild in package.json * fix(workflows): add missing severity parameter for Trivy filesystem scan * fix(workflows): add missing severity parameter for Docker image scans in Trivy workflow * fix(workflows): remove MEDIUM severity from Trivy scans in security workflow * added-fix-image-deletion (#681) * added-fix-image-deletion * feat(commands): add image cleanup command to find and delete unused files * fix(models): ensure associated AdventureImages are deleted and files cleaned up on Adventure deletion * fix(models): ensure associated Attachment files are deleted and their filesystem cleaned up on Adventure deletion --------- Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Sean Morley * Rename Adventures to Locations (#696) * Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency * Import and Export Functionality (#698) * feat(backup): add BackupViewSet for data export and import functionality * Fixed frontend returning corrupt binary data * feat(import): enhance import functionality with confirmation check and improved city/region/country handling * Potential fix for code scanning alert no. 29: Information exposure through an exception Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Refactor response handling to use arrayBuffer instead of bytes * Refactor image cleanup command to use LocationImage model and update import/export view to include backup and restore functionality * Update backup export versioning and improve data restore warning message * Enhance image navigation and localization support in modal components * Refactor location handling in Immich integration components for consistency * Enhance backup and restore functionality with improved localization and error handling * Improve accessibility by adding 'for' attribute to backup file input label --------- Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * refactor(serializers): rename Location to Adventure and update related fields * refactor(serializers): rename Adventure to Location and update related fields * chore(requirements): update pillow version to 11.3.0 * Add PT-BR translations (#739) * Fixed frontend returning corrupt binary data * fix(adventure): enhance collection ownership validation in AdventureSerializer (#723) * Add PT-BR translations Add translation for Brazilian Portuguese to the project; Signed-off-by: Lucas Zampieri <lzampier@redhat.com> --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> * fix: update date formatting for adventure items to include timezone * Image/attachment overhaul, activities, trails and integrations with Strava and Wanderer (#726) * refactor(models, views, serializers): rename LocationImage and Attachment to ContentImage and ContentAttachment, update related references * feat: Enhance collection sharing and location management features - Implemented unsharing functionality in CollectionViewSet, including removal of user-owned locations from collections. - Refactored ContentImageViewSet to support multiple content types and improved permission checks for image uploads. - Added user ownership checks in LocationViewSet for delete operations. - Enhanced collection management in the frontend to display both owned and shared collections separately. - Updated Immich integration to handle access control based on location visibility and user permissions. - Improved UI components to show creator information and manage collection links more effectively. - Added loading states and error handling in collection fetching logic. * feat: enhance transportation card and modal with image handling - Added CardCarousel component to TransportationCard for image display. - Implemented privacy indicator with Eye and EyeOff icons. - Introduced image upload functionality in TransportationModal, allowing users to upload multiple images. - Added image management features: remove image and set primary image. - Updated Transportation and Location types to include images as ContentImage array. - Enhanced UI for image upload and display in modal, including selected images preview and current images management. * feat: update CardCarousel component to handle images, name, and icon props across various cards * feat: add Discord link to AboutModal and update appVersion in config * feat: add LocationQuickStart and LocationVisits components for enhanced location selection and visit management - Implemented LocationQuickStart.svelte for searching and selecting locations on a map with reverse geocoding. - Created LocationVisits.svelte to manage visit dates and notes for locations, including timezone handling and validation. - Updated types to remove location property from Attachment type. - Modified locations page to integrate NewLocationModal for creating and editing locations, syncing updates with adventures. * feat: update button styles and add back and close functionality in location components * Collection invite system * feat: update CollectionSerializer to include 'shared_with' as a read-only field; update app version; add new background images and localization strings for invites * feat: add Strava integration with OAuth flow and activity management - Implemented IntegrationView for listing integrations including Immich, Google Maps, and Strava. - Created StravaIntegrationView for handling OAuth authorization and token exchange. - Added functionality to refresh Strava access tokens when needed. - Implemented endpoints to fetch user activities from Strava and extract essential information. - Added Strava logo asset and integrated it into the frontend settings page. - Updated settings page to display Strava integration status. - Enhanced location management to include trails with create, edit, and delete functionalities. - Updated types and localization files to support new features. * feat: enhance Strava integration with user-specific settings and management options; update localization strings * feat: update Strava integration settings and add Wanderer logo; enhance user experience with active section management * Add StravaActivity and Activity types to types.ts - Introduced StravaActivity type to represent detailed activity data from Strava. - Added Activity type to encapsulate user activities, including optional trail and GPX file information. - Updated Location type to include an array of activities associated with each visit. * feat: streamline location and activity management; enhance Strava import functionality and add activity handling in server actions * feat: add ActivityCard component and update LocationVisits to use it; modify Activity type to reference trail as string * feat: add geojson support to ActivitySerializer and ActivityCard; enhance location page with activity summaries and GPS tracks * feat: add trails property to recommendation object in collection page * feat: add Wanderer integration with authentication and management features * feat: implement Wanderer integration with trail management and UI components; enhance settings for reauthentication * feat: add measurement system field to CustomUser model and update related serializers, migrations, and UI components * feat: add measurement system support across ActivityCard, StravaActivityCard, NewLocationModal, LocationVisits, and related utility functions * feat: enhance Wanderer integration with trail data fetching and UI updates; add measurement system support * feat: add TrailCard component for displaying trail details with measurement system support * feat: add wanderer link support in TrailSerializer and TrailCard; update measurement system handling in location page * feat: integrate memcached for caching in Wanderer services; update Docker, settings, and supervisord configurations * feat: add activity statistics to user profile; include distance, moving time, elevation, and total activities * feat: enhance import/export functionality to include trails and activities; update UI components and localization * feat: integrate NewLocationModal across various components; update location handling and state management * Refactor Location and Visit types: Replace visits structure in Location with Visit type and add location, created_at, and updated_at fields to Visit * feat: enhance permissions and validation in activity, trail, and visit views; add unique constraint to CollectionInvite model * feat: sync visits when updating adventures in collection page * feat: add geojson support for attachments and refactor GPX handling in location page * chore: remove unused dependencies from pnpm-lock.yaml * feat: add Strava and Wanderer integration documentation and configuration options * Add support for Japanese and Arabic languages in localization * Add new localization strings for Russian, Swedish, and Chinese languages - Updated translations in ru.json, sv.json, and zh.json to include new phrases related to collections, activities, and integrations. - Added strings for leaving collections, loading collections, and quick start instructions. - Included new sections for invites and Strava integration with relevant messages. - Enhanced Google Maps integration descriptions for clarity. * Add localization support for activity-related features and update UI labels - Added new Russian, Swedish, and Chinese translations for activity statistics, achievements, and related terms. - Updated UI components to use localized strings for activity statistics, distance, moving time, and other relevant fields. - Enhanced user experience by ensuring all relevant buttons and labels are translated and accessible. * fix: update appVersion to reflect the latest development version * feat: add getActivityColor function and integrate activity color coding in map and location pages * feat: add support for showing activities and visited cities on the map * feat: update map page to display counts for visited cities and activities * fix: remove debug print statement from IsOwnerOrSharedWithFullAccess permission class * feat: add MapStyleSelector component and integrate basemap selection in map page * feat: enhance basemap functions with 3D terrain support and update XYZ style handling * feat: add management command to recalculate elevation data from GPX files and update activity view to handle elevation data extraction * feat: update MapStyleSelector component and enhance basemap options for improved user experience * feat: refactor activity model and admin to use sport_type, update serializers and components for improved activity handling * feat: update Activity model string representation to use sport_type instead of type * feat: update activity handling to use sport_type for color determination in map and location components * feat: Add attachments support to Transportation and Lodging types - Updated Transportation and Lodging types to include attachments array. - Enhanced localization files for multiple languages to include new strings related to attachments, lodging, and transportation. - Added error and success messages for attachment removal and upload information. - Included new prompts for creating and updating lodging and transportation details across various languages. * feat: Enhance activity statistics and breakdown by category in user profile * feat: Add SPORT_CATEGORIES for better organization of sports types and update StatsViewSet to use it * feat: Enhance CategoryDropdown for mobile responsiveness and add category creation functionality * feat: Update inspirational quote in adventure log * feat: Localize navigation labels in Navbar and add translation to en.json * feat: Update navigation elements to use anchor tags for better accessibility and add new fields to signup form * Translate login button text to support internationalization * feat: Refactor location visit status logic and add utility function for visited locations count * chore: Upgrade GitHub Actions and remove unused timezone import * fix: Update Docker image tags in GitHub Actions workflow for consistency * fix: Update Docker image build process to use BuildKit cache for improved performance * chore: Remove unused imports from stats_view.py for cleaner code * Increase background image opacity on login and signup pages for improved visibility * fix: Add postgresql-client to runtime dependencies in Dockerfile * fix: Update workflow files to include permissions for GitHub Actions * fix: Update esbuild version to ^0.25.9 in package.json and pnpm-lock.yaml for compatibility * chore: improve Chinese translation (#796) * fix: update adventure log quote and remove unused activity type field * fix: optimize import process by using get_or_create for visited cities and regions * fix: update README to reflect changes from adventures to locations and enhance feature descriptions * fix: update documentation to reflect changes from adventures to locations and enhance feature descriptions * Update google_maps_integration.md (#743) * Update google_maps_integration.md Explain APIs needed for AdventureLogs versions. Fixes #731 and #727 * Fix a typo google_maps_integration.md --------- Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> * fix: update appVersion to reflect the main branch version * fix: update image source for satellite map in documentation * Update frontend/src/lib/components/NewLocationModal.svelte Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add localization updates for multiple languages - Japanese (ja.json): Added new activity-related phrases and checklist terms. - Korean (ko.json): Included activity breakdown and checklist enhancements. - Dutch (nl.json): Updated activity descriptions and added checklist functionalities. - Norwegian (no.json): Enhanced activity and checklist terminology. - Polish (pl.json): Added new phrases for activities and checklist management. - Brazilian Portuguese (pt-br.json): Updated activity-related terms and checklist features. - Russian (ru.json): Included new phrases for activities and checklist management. - Swedish (sv.json): Enhanced activity descriptions and checklist functionalities. - Chinese (zh.json): Added new activity-related phrases and checklist terms. * fix: enhance image upload handling to support immich_id * Add "not_enabled" message for Strava integration in multiple languages - Updated Spanish, French, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Swedish, and Chinese locale files to include a new message indicating that Strava integration is not enabled in the current instance. --------- Signed-off-by: Lucas Zampieri <lzampier@redhat.com> Co-authored-by: Ycer0n <37674033+Ycer0n@users.noreply.github.com> Co-authored-by: taninme <5262715+taninme@users.noreply.github.com> Co-authored-by: ferdousahmed <taninme@gmail.com> Co-authored-by: Christian Zäske <blitzdose@gmail.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Lucas Zampieri <lcasmz54@gmail.com> Co-authored-by: pplulee <pplulee@live.cn> Co-authored-by: Cathelijne Hornstra <github@hornstra.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
296 lines
11 KiB
Python
296 lines
11 KiB
Python
# wanderer_services.py
|
|
import requests
|
|
from datetime import datetime
|
|
from datetime import timezone as dt_timezone
|
|
from django.utils import timezone as django_timezone
|
|
from django.core.cache import cache
|
|
from django.conf import settings
|
|
import logging
|
|
import hashlib
|
|
import json
|
|
|
|
from .models import WandererIntegration
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
class IntegrationError(Exception):
|
|
pass
|
|
|
|
# Use both possible cookie names
|
|
COOKIE_NAMES = ("pb_auth", "pb-auth")
|
|
LOGIN_PATH = "/api/v1/auth/login"
|
|
|
|
# Cache settings
|
|
TRAIL_CACHE_TIMEOUT = getattr(settings, 'WANDERER_TRAIL_CACHE_TIMEOUT', 60 * 15) # 15 minutes default
|
|
TRAIL_CACHE_PREFIX = 'wanderer_trail'
|
|
|
|
def _get_cache_key(integration_id: int, trail_id: str) -> str:
|
|
"""Generate a consistent cache key for trail data."""
|
|
return f"{TRAIL_CACHE_PREFIX}:{integration_id}:{trail_id}"
|
|
|
|
def _get_etag_cache_key(integration_id: int, trail_id: str) -> str:
|
|
"""Generate cache key for ETags."""
|
|
return f"{TRAIL_CACHE_PREFIX}_etag:{integration_id}:{trail_id}"
|
|
|
|
def login_to_wanderer(integration: WandererIntegration, password: str):
|
|
"""
|
|
Authenticate with Wanderer and return the auth cookie and expiry.
|
|
"""
|
|
url = integration.server_url.rstrip("/") + LOGIN_PATH
|
|
|
|
try:
|
|
resp = requests.post(url, json={
|
|
"username": integration.username,
|
|
"password": password
|
|
}, timeout=10)
|
|
resp.raise_for_status()
|
|
except requests.RequestException as exc:
|
|
logger.error("Error connecting to Wanderer login: %s", exc)
|
|
raise IntegrationError("Could not connect to Wanderer server.")
|
|
|
|
# Log only summary (not full token body)
|
|
logger.debug("Wanderer login status: %s, headers: %s", resp.status_code, resp.headers.get("Set-Cookie"))
|
|
|
|
# Extract auth cookie and expiry
|
|
token = None
|
|
expiry = None
|
|
for cookie in resp.cookies:
|
|
if cookie.name in COOKIE_NAMES:
|
|
token = cookie.value
|
|
if cookie.expires:
|
|
expiry = datetime.fromtimestamp(cookie.expires, tz=dt_timezone.utc)
|
|
else:
|
|
# If no expiry set, assume 24 hours from now
|
|
expiry = django_timezone.now() + django_timezone.timedelta(hours=24)
|
|
break
|
|
|
|
if not token:
|
|
logger.error("Wanderer login succeeded but no auth cookie in response.")
|
|
raise IntegrationError("Authentication succeeded, but token cookie not found.")
|
|
|
|
logger.info(f"Successfully authenticated with Wanderer. Token expires: {expiry}")
|
|
return token, expiry
|
|
|
|
def get_valid_session(integration: WandererIntegration, password_for_reauth: str = None):
|
|
"""
|
|
Get a requests session with valid authentication.
|
|
Will reuse existing token if valid, or re-authenticate if needed.
|
|
"""
|
|
now = django_timezone.now()
|
|
session = requests.Session()
|
|
|
|
if not integration:
|
|
raise IntegrationError("No Wanderer integration found.")
|
|
|
|
# Check if we have a valid token
|
|
if integration.token and integration.token_expiry and integration.token_expiry > now:
|
|
logger.debug("Using existing valid token")
|
|
session.cookies.set(COOKIE_NAMES[0], integration.token)
|
|
return session
|
|
|
|
# Token expired or missing - need to re-authenticate
|
|
if password_for_reauth is None:
|
|
raise IntegrationError("Session expired; password is required to reconnect.")
|
|
|
|
logger.info("Token expired, re-authenticating with Wanderer")
|
|
token, expiry = login_to_wanderer(integration, password_for_reauth)
|
|
|
|
# Update the integration with new token
|
|
integration.token = token
|
|
integration.token_expiry = expiry
|
|
integration.save(update_fields=["token", "token_expiry"])
|
|
|
|
# Set the cookie in the session
|
|
session.cookies.set(COOKIE_NAMES[0], token)
|
|
return session
|
|
|
|
def make_wanderer_request(integration: WandererIntegration, endpoint: str, method: str = "GET", password_for_reauth: str = None, **kwargs):
|
|
"""
|
|
Helper function to make authenticated requests to Wanderer API.
|
|
|
|
Args:
|
|
integration: WandererIntegration instance
|
|
endpoint: API endpoint (e.g., '/api/v1/list')
|
|
method: HTTP method (GET, POST, etc.)
|
|
password_for_reauth: Password to use if re-authentication is needed
|
|
**kwargs: Additional arguments to pass to requests method
|
|
|
|
Returns:
|
|
requests.Response object
|
|
"""
|
|
session = get_valid_session(integration, password_for_reauth)
|
|
url = f"{integration.server_url.rstrip('/')}{endpoint}"
|
|
|
|
try:
|
|
response = getattr(session, method.lower())(url, timeout=10, **kwargs)
|
|
response.raise_for_status()
|
|
return response
|
|
except requests.RequestException as exc:
|
|
logger.error(f"Error making {method} request to {url}: {exc}")
|
|
raise IntegrationError(f"Error communicating with Wanderer: {exc}")
|
|
|
|
def fetch_trail_by_id(integration: WandererIntegration, trail_id: str, password_for_reauth: str = None, use_cache: bool = True):
|
|
"""
|
|
Fetch a specific trail by its ID from the Wanderer API with intelligent caching.
|
|
|
|
Args:
|
|
integration: WandererIntegration instance
|
|
trail_id: ID of the trail to fetch
|
|
password_for_reauth: Password to use if re-authentication is needed
|
|
use_cache: Whether to use caching (default: True)
|
|
|
|
Returns:
|
|
dict: Trail data from the API
|
|
"""
|
|
cache_key = _get_cache_key(integration.id, trail_id)
|
|
etag_cache_key = _get_etag_cache_key(integration.id, trail_id)
|
|
|
|
# Try to get from cache first
|
|
if use_cache:
|
|
cached_data = cache.get(cache_key)
|
|
if cached_data:
|
|
logger.debug(f"Trail {trail_id} found in cache")
|
|
return cached_data
|
|
|
|
# Prepare headers for conditional requests
|
|
headers = {}
|
|
if use_cache:
|
|
cached_etag = cache.get(etag_cache_key)
|
|
if cached_etag:
|
|
headers['If-None-Match'] = cached_etag
|
|
|
|
try:
|
|
response = make_wanderer_request(
|
|
integration,
|
|
f"/api/v1/trail/{trail_id}",
|
|
password_for_reauth=password_for_reauth,
|
|
headers=headers
|
|
)
|
|
|
|
# Handle 304 Not Modified
|
|
if response.status_code == 304:
|
|
logger.debug(f"Trail {trail_id} not modified, using cached version")
|
|
cached_data = cache.get(cache_key)
|
|
if cached_data:
|
|
return cached_data
|
|
|
|
trail_data = response.json()
|
|
|
|
# Cache the result
|
|
if use_cache:
|
|
cache.set(cache_key, trail_data, TRAIL_CACHE_TIMEOUT)
|
|
|
|
# Cache ETag if present
|
|
etag = response.headers.get('ETag')
|
|
if etag:
|
|
cache.set(etag_cache_key, etag, TRAIL_CACHE_TIMEOUT)
|
|
|
|
logger.debug(f"Trail {trail_id} cached for {TRAIL_CACHE_TIMEOUT} seconds")
|
|
|
|
return trail_data
|
|
|
|
except requests.RequestException as exc:
|
|
# If we have cached data and the request fails, return cached data as fallback
|
|
if use_cache:
|
|
cached_data = cache.get(cache_key)
|
|
if cached_data:
|
|
logger.debug(f"API request failed, returning cached trail {trail_id}: {exc}")
|
|
return cached_data
|
|
raise
|
|
|
|
def fetch_multiple_trails_by_id(integration: WandererIntegration, trail_ids: list, password_for_reauth: str = None, use_cache: bool = True):
|
|
"""
|
|
Fetch multiple trails efficiently with batch caching.
|
|
|
|
Args:
|
|
integration: WandererIntegration instance
|
|
trail_ids: List of trail IDs to fetch
|
|
password_for_reauth: Password to use if re-authentication is needed
|
|
use_cache: Whether to use caching (default: True)
|
|
|
|
Returns:
|
|
dict: Dictionary mapping trail_id to trail data
|
|
"""
|
|
results = {}
|
|
uncached_ids = []
|
|
|
|
if use_cache:
|
|
# Get cache keys for all trails
|
|
cache_keys = {trail_id: _get_cache_key(integration.id, trail_id) for trail_id in trail_ids}
|
|
|
|
# Batch get from cache
|
|
cached_trails = cache.get_many(cache_keys.values())
|
|
key_to_id = {v: k for k, v in cache_keys.items()}
|
|
|
|
# Separate cached and uncached
|
|
for cache_key, trail_data in cached_trails.items():
|
|
trail_id = key_to_id[cache_key]
|
|
results[trail_id] = trail_data
|
|
|
|
uncached_ids = [tid for tid in trail_ids if tid not in results]
|
|
logger.debug(f"Found {len(results)} trails in cache, need to fetch {len(uncached_ids)}")
|
|
else:
|
|
uncached_ids = trail_ids
|
|
|
|
# Fetch uncached trails
|
|
for trail_id in uncached_ids:
|
|
try:
|
|
trail_data = fetch_trail_by_id(integration, trail_id, password_for_reauth, use_cache)
|
|
results[trail_id] = trail_data
|
|
except IntegrationError as e:
|
|
logger.error(f"Failed to fetch trail {trail_id}: {e}")
|
|
# Continue with other trails
|
|
continue
|
|
|
|
return results
|
|
|
|
def invalidate_trail_cache(integration_id: int, trail_id: str = None):
|
|
"""
|
|
Invalidate cached trail data.
|
|
|
|
Args:
|
|
integration_id: Integration ID
|
|
trail_id: Specific trail ID to invalidate, or None to clear all trails for this integration
|
|
"""
|
|
if trail_id:
|
|
# Invalidate specific trail
|
|
cache_key = _get_cache_key(integration_id, trail_id)
|
|
etag_cache_key = _get_etag_cache_key(integration_id, trail_id)
|
|
cache.delete_many([cache_key, etag_cache_key])
|
|
logger.info(f"Invalidated cache for trail {trail_id}")
|
|
else:
|
|
# This would require a more complex implementation to find all keys
|
|
# For now, we'll just log it - you might want to use cache versioning instead
|
|
logger.debug("Cache invalidation for all trails not implemented - consider using cache versioning")
|
|
|
|
def warm_trail_cache(integration: WandererIntegration, trail_ids: list, password_for_reauth: str = None):
|
|
"""
|
|
Pre-warm the cache with trail data.
|
|
|
|
Args:
|
|
integration: WandererIntegration instance
|
|
trail_ids: List of trail IDs to pre-load
|
|
password_for_reauth: Password to use if re-authentication is needed
|
|
"""
|
|
logger.info(f"Warming cache for {len(trail_ids)} trails")
|
|
fetch_multiple_trails_by_id(integration, trail_ids, password_for_reauth, use_cache=True)
|
|
|
|
# Decorator for additional caching layers
|
|
def cached_trail_method(timeout=TRAIL_CACHE_TIMEOUT):
|
|
"""
|
|
Decorator to add method-level caching to any function that takes integration and trail_id.
|
|
"""
|
|
def decorator(func):
|
|
def wrapper(integration, trail_id, *args, **kwargs):
|
|
# Create cache key based on function name and arguments
|
|
cache_key = f"{func.__name__}:{integration.id}:{trail_id}:{hashlib.md5(str(args).encode()).hexdigest()}"
|
|
|
|
cached_result = cache.get(cache_key)
|
|
if cached_result is not None:
|
|
return cached_result
|
|
|
|
result = func(integration, trail_id, *args, **kwargs)
|
|
cache.set(cache_key, result, timeout)
|
|
return result
|
|
return wrapper
|
|
return decorator |