* Fixes [REQUEST] Email-based auto-linking for OIDC Fixes #921 * Add ClusterMap integration for regions and cities with fit-to-bounds functionality * Update COUNTRY_REGION_JSON_VERSION to v3.0 and modify state ID generation to use ISO2 code * fix: handle email verification required case during signup Updated the signup action to return a specific message when the backend responds with a 401 status, indicating that the signup succeeded but email verification is required. This allows the frontend to display the appropriate message using an i18n key. * feat: add Advanced Configuration documentation with optional environment variables * Fixes #511 * fix: update appVersion to v0.11.0-main-121425 and enhance socialProviders handling in settings page * feat: implement social signup controls and update documentation for new environment variables * fix: update LocationCard props and enhance restore data functionality - Changed the user prop to null in LocationCard component on the dashboard page. - Added isRestoring state to manage loading state during data restoration in settings. - Updated the restore button to show a loading spinner when a restore operation is in progress. * fix: update appVersion to v0.12.0-pre-dev-121625 * feat: implement itinerary planning feature with CollectionItineraryPlanner component and related updates * feat: add overnight lodging indicator and functionality to CollectionItineraryPlanner * feat: add compact display option to LocationCard and enhance lodging filtering in CollectionItineraryPlanner * feat(itinerary): add itinerary management features and link modal - Introduced ItineraryViewSet for managing itinerary items with create and reorder functionalities. - Added itinerary linking capabilities in CollectionModal and CollectionItineraryPlanner components. - Implemented new ItineraryLinkModal for linking existing items to specific dates. - Enhanced the frontend with new modals for creating locations, lodging, transportation, notes, and checklists. - Updated the backend to handle itinerary item creation and reordering with appropriate permissions. - Improved data handling for unscheduled items and their association with the itinerary. - Added new dependencies to the frontend for enhanced functionality. * feat(itinerary): implement auto-generate functionality for itinerary items based on dated records * feat(collection): enhance collection sharing logic and improve data handling on invite acceptance * fix: update appVersion to correct pre-dev version * feat(wikipedia): implement image selection from Wikipedia with enhanced results display * Refactor code structure for improved readability and maintainability * feat: add CollectionRecommendationView component for displaying location recommendations - Implemented CollectionRecommendationView.svelte to handle location recommendations based on user input and selected categories. - Added Recommendation and RecommendationResponse types to types.ts for better type safety and structure. - Updated collections/[id]/+page.svelte to include a new view for recommendations, allowing users to switch between different views seamlessly. * fix: update appVersion and improve button accessibility in collection views * feat: add canModify prop to collection components for user permission handling * feat: add itinerary removal functionality to various cards and update UI components - Implemented `removeFromItinerary` function in `LodgingCard`, `NoteCard`, and `TransportationCard` to allow users to remove items from their itinerary. - Replaced the trash icon with a calendar remove icon in `LocationCard`, `LodgingCard`, `NoteCard`, and `TransportationCard` for better visual representation. - Updated the dropdown menus in `LodgingCard`, `NoteCard`, and `TransportationCard` to include the new remove from itinerary option. - Enhanced `CollectionItineraryPlanner` to pass itinerary items to the respective cards. - Removed `PointSelectionModal.svelte` as it is no longer needed. - Refactored `LocationMedia.svelte` to integrate `ImageManagement` component and clean up unused code related to image handling. * feat: enhance itinerary management with deduplication and initial visit date handling * feat: add FullMap component for enhanced map functionality with clustering support - Introduced FullMap.svelte to handle map rendering, clustering, and marker management. - Updated map page to utilize FullMap component, replacing direct MapLibre usage. - Implemented clustering options and marker properties handling in FullMap. - Added utility functions for resolving theme colors and managing marker states. - Enhanced user experience with hover popups and improved loading states for location details. - Updated app version to v0.12.0-pre-dev-122225. * feat: enhance map interaction for touch devices with custom popup handling * feat: add progress tracker for folder views to display visited and planned locations * feat: add map center and zoom state management with URL synchronization * feat: add status and days until start fields to collections with filtering options * Component folder structure changes * feat: add LodgingMedia and LodgingModal components for managing lodging details and media attachments feat: implement LocationSearchMap component for interactive location searching and mapping functionality * fix: update contentType in ImageManagement component to 'lodging' for correct media handling * feat: enhance lodging management with date validation and update messages * feat: implement lodging detail page with server-side loading and image modal functionality - Added a new server-side load function to fetch lodging details by ID. - Created a new Svelte component for the lodging detail page, including image carousel and map integration. - Implemented a modal for displaying images with navigation. - Enhanced URL handling in the locations page to only read parameters. * feat: add Transportation modal component and related routes - Implemented TransportationModal component for creating and editing transportation entries. - Added server-side loading for transportation details in the new route [id]/+page.server.ts. - Created a new Svelte page for displaying transportation details with image and attachment handling. - Integrated modal for editing transportation in the transportation details page. - Updated lodging routes to include a modal for editing lodging entries. - Removed unused delete action from lodging server-side logic. * feat: add start_code and end_code fields to Transportation model and update related components * feat: implement date validation for itinerary items and add day picker modal for scheduling * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Make sure reverse geocoding uses correct key for cities (#938) * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Refactor code structure for improved readability and maintainability * Enhance collection management with modal updates and item handling * feat: integrate CollectionMap component in collections page and update map titles in lodging and transportation pages - Replaced inline map implementation with CollectionMap component in collections/[id]/+page.svelte for better modularity. - Updated the map title in lodging/[id]/+page.svelte to reflect lodging context. - Updated the map title in transportations/[id]/+page.svelte to reflect transportation context. - Added functionality to collect and render GeoJSON data from transportation attachments in transportations/[id]/+page.svelte. * chore: update copyright year to 2026 in various files * feat: enhance backup export functionality with itinerary items and export IDs * fix: improve dropdown close behavior by handling multiple event types * fix: remove unnecessary cache decorator from globespin function * feat: add initial visit date support in ChecklistModal and NoteModal, with UI suggestions for prefilled dates * feat: add details view for checklist and note cards with edit functionality * feat: add travel duration and GPX distance calculation to Transportation model and UI * feat: add primary image support to Collection model, serializers, and UI components * Refactor calendar components and enhance event detail handling - Replaced direct calendar implementation with a reusable CalendarComponent in the calendar route. - Introduced EventDetailsModal for displaying event details, improving modularity and readability. - Added functionality to fetch event details asynchronously when an event is clicked. - Implemented ICS calendar download functionality with loading state management. - Enhanced collections page to support calendar view, integrating event handling and timezone management. - Improved lodging and transportation pages to display local time for stays and trips, including timezone badges. - Cleaned up unused code and comments for better maintainability. * feat: enhance hero image handling in collection view by prioritizing primary image * chore: update .env.example to include account email verification configuration * feat: enhance LodgingCard and TransportationCard components with expandable details and improved layout * feat: add price and currency fields to locations, lodging, and transportation components - Introduced price and price_currency fields in LocationModal, LodgingDetails, LodgingModal, TransportationDetails, and TransportationModal components. - Implemented MoneyInput and CurrencyDropdown components for handling monetary values and currency selection. - Updated data structures and types to accommodate new price and currency fields across various models. - Enhanced cost summary calculations in collections and routes to display total costs by currency. - Added user preference for default currency in settings, affecting new item forms. - Updated UI to display price information in relevant components, ensuring consistent formatting and user experience. * feat: add Development Timeline link to overview and create timeline documentation * feat: enhance map functionality with search and zoom features - Updated availableViews in collection page to include map view based on lodging and transportation locations. - Added search functionality to the map page, allowing users to filter pins by name and category. - Implemented auto-zoom feature to adjust the map view based on filtered search results. - Introduced a search bar with a clear button for better user experience. * feat: enhance ISO code extraction and region matching logic in extractIsoCode function * feat: enhance extractIsoCode function with normalization for locality matching * feat: update extractIsoCode function to include additional ISO3166 levels for improved region matching * feat: enhance extractIsoCode function to handle cases without city information and update CollectionMap to bind user data * feat: add cron job for syncing visited regions and cities, enhance Docker and supervisord configurations * feat: add CollectionItineraryDay model and related functionality for itinerary day metadata management * feat: implement cleanup of out-of-range itinerary items and notify users of potential impacts on itinerary when dates change * Refactor collection page for improved localization and code clarity - Removed unused imports and consolidated cost category labels to be reactive. - Updated cost summary function to accept localized labels. - Enhanced localization for various UI elements, including buttons, headings, and statistics. - Improved user feedback messages for better clarity and consistency. - Ensured all relevant text is translatable using the i18n library. * feat: add collaborator serialization and display in collections - Implemented `_build_profile_pic_url` and `_serialize_collaborator` functions for user profile picture URLs and serialization. - Updated `CollectionSerializer` and `UltraSlimCollectionSerializer` to include collaborators in the serialized output. - Enhanced `CollectionViewSet` to prefetch shared_with users for optimized queries. - Modified frontend components to display collaborators in collection details, including profile pictures and initials. - Added new localization strings for collaborators. - Refactored map and location components to improve usability and functionality. - Updated app version to reflect new changes. * feat: add dynamic lodging icons based on type in CollectionMap component * feat: add CollectionStats component for detailed trip statistics - Implemented CollectionStats.svelte to display various statistics related to the collection, including distances, activities, and locations visited. - Enhanced CollectionMap.svelte to filter activities based on date range using new getActivityDate function. - Updated LocationSearchMap.svelte to handle airport mode for start and end locations. - Modified types.ts to include is_global property in CollectionItineraryItem for trip-wide items. - Updated +page.svelte to integrate the new stats view and manage view state accordingly. * feat: enhance itinerary management by removing old items on date change for notes and checklists; normalize date handling in CollectionMap * feat: add functionality to change day and move items to trip-wide itinerary - Implemented changeDay function in ChecklistCard, LocationCard, LodgingCard, NoteCard, and TransportationCard components to allow users to change the scheduled day of items. - Added a button to move items to the global (trip-wide) itinerary in the aforementioned components, with appropriate dispatch events. - Enhanced CollectionItineraryPlanner to handle moving items to the global itinerary and added UI elements for unscheduled items. - Updated ItineraryDayPickModal to support the deletion of source visits when moving locations. - Added new translations for "Change Day" and "Move Trip Wide" in the English locale. * fix: specify full path for python3 in cron job and add shell and path variables * fix: update appVersion to v0.12.0-pre-dev-010726 * feat: enhance CollectionItineraryPlanner and CollectionStats with dynamic links and transport type normalization * Add Dev Container + WSL install docs and link in install guide (#944) (#951) * feat: enhance internationalization support in CollectionMap and CollectionStats components - Added translation support for various labels and messages in CollectionMap.svelte and CollectionStats.svelte using svelte-i18n. - Updated English and Chinese locale files to include new translation keys for improved user experience. - Simplified the rendering of recommendation views in the collections page. * Refactor itinerary management and UI components - Updated ItineraryViewSet to handle visit updates and creations more efficiently, preserving visit IDs when moving between days. - Enhanced ChecklistCard, LodgingCard, TransportationCard, and NoteCard to include a new "Change Day" option in the actions menu. - Improved user experience in CollectionItineraryPlanner by tracking specific itinerary items being moved and ensuring only the relevant entries are deleted. - Added new location sharing options in LodgingCard and TransportationCard for Apple Maps, Google Maps, and OpenStreetMap. - Updated translations in en.json for consistency and clarity. - Minor UI adjustments for better accessibility and usability across various components. * feat: implement action menus and close event handling in card components * feat: refactor Dockerfile and supervisord configuration to remove cron and add periodic sync script * feat: enhance LocationSearchMap and TransportationDetails components with initialization handling and airport mode logic * feat: add airport and location search mode labels to localization file * feat: enhance periodic sync logging and improve airport mode handling in LocationSearchMap * feat: enhance unscheduled items display with improved card interactions and accessibility * Add dev compose for hot reload and update WSL dev container docs (#958) * feat: enhance localization for itinerary linking and transportation components * Localization: update localization files with new keys and values * fix: improve error messages for Overpass API responses * chore: update dependencies in frontend package.json and pnpm-lock.yaml - Updated @sveltejs/adapter-node from ^5.2.12 to ^5.4.0 - Updated @sveltejs/adapter-vercel from ^5.7.0 to ^6.3.0 - Updated tailwindcss from ^3.4.17 to ^3.4.19 - Updated typescript from ^5.8.3 to ^5.9.3 - Updated vite from ^5.4.19 to ^5.4.21 * chore: update dependencies in pnpm-lock.yaml to latest versions * Refactor code structure for improved readability and maintainability * Refactor code structure for improved readability and maintainability * fix: update package dependencies to resolve compatibility issues * Add "worldtravel" translations to multiple locale files - Added "worldtravel" key with translations for Spanish, French, Hungarian, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Slovak, Swedish, Turkish, Ukrainian, and Chinese. - Updated the navigation section in each locale file to include the new "worldtravel" entry. * Add new screenshots and update email verification message in locale file * feat: Implement data restoration functionality with file import - Added a new action `restoreData` in `+page.server.ts` to handle file uploads for restoring collections. - Enhanced the UI in `+page.svelte` to include an import button and a modal for import progress. - Integrated file input handling to trigger form submission upon file selection. - Removed unused GSAP animations from the login, profile, and signup pages for cleaner code. * feat: Add modals for creating locations and lodging from recommendations, enhance image import functionality * fix: Adjust styles to prevent horizontal scroll and enhance floating action button visibility * feat: Enhance error handling and messaging for Google Maps and OpenStreetMap geocoding functions * fix: Enhance error messaging for Google Maps access forbidden response * feat: Add User-Agent header to Google Maps API requests and refine error messaging for access forbidden response * fix: Update User-Agent header in Google Maps API requests for improved compatibility * fix: Disable proxy settings in Google Maps API request to prevent connection issues * fix: Update Trivy security scan configuration and add .trivyignore for known false positives * fix: Refactor update method to handle is_public cascading for related items * feat: Integrate django-invitations for user invitation management and update settings * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add "Invite a User" guide and update navigation links * docs: Update "Invite a User" guide to include email configuration tip * feat: Update email invitation template for improved styling and clarity * fix: Remove trailing backslash from installation note in Unraid documentation * feat: Add export/import messages and user email verification prompts in multiple languages * Squashed commit of the following: commit a993a15b93ebb7521ae2e5cc31596b98b29fcd6c Author: Alex <div@alexe.at> Date: Mon Jan 12 20:44:47 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit fdc455d9424fbb0f6b72179d9eb1340411700773 Author: Ettore Atalan <atalanttore@googlemail.com> Date: Sat Jan 10 23:24:23 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit 5942129c55e89dd999a13d4df9c40e6e3189355c Author: Orhun <orhunavcu@gmail.com> Date: Sun Jan 11 13:05:31 2026 +0100 Translated using Weblate (Turkish) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 8712e43d8ba4a7e7fe163fb454d6577187f9a375 Author: Henrique Fonseca Veloso <henriquefv@tutamail.com> Date: Fri Jan 9 22:53:11 2026 +0100 Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pt_BR/ commit 18ee56653470413afe8d71ecd2b5028f6e4cf118 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:57 2026 +0100 Translated using Weblate (Dutch) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nl/ commit 57783c544e583c035c8b57b5c10ca320f25f399e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:14 2026 +0100 Translated using Weblate (Arabic) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ar/ commit fb09edfd85bc85234b1c1ba7dd499f2915093fff Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:26 2026 +0100 Translated using Weblate (Spanish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit 554a207d8e454a1f7ae826e2a40d389b94be5512 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:21 2026 +0100 Translated using Weblate (German) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit b70b9db27fb8607beefeb288185601c8f5eae28d Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:02 2026 +0100 Translated using Weblate (Norwegian Bokmål) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/ commit 3b467caa9007c553e4ae7de97f53b6e462161ea3 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:07 2026 +0100 Translated using Weblate (Polish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pl/ commit 30fbbfba3572c8f78ec7c7e1a231e363aca1ef10 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:17 2026 +0100 Translated using Weblate (Russian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ru/ commit 8cecb492cfcac0a1f93ee8919f7b41d978d331ee Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:42 2026 +0100 Translated using Weblate (Italian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/it/ commit f0d3d41029c89bfa83d5891ee7af70241f27b7be Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:38 2026 +0100 Translated using Weblate (Hungarian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/hu/ commit 102e0f1912d010d38755a1713abb2a7f7564aafb Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:21 2026 +0100 Translated using Weblate (Slovak) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/ commit 428b8f18cf6195a96b55109e0221413d82415a2f Author: Максим Горпиніч <gorpinicmaksim0@gmail.com> Date: Sat Jan 10 08:55:28 2026 +0100 Translated using Weblate (Ukrainian) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/uk/ commit 1a71aaf279ecab26c0c1fede05025732e6dcfa5e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:27 2026 +0100 Translated using Weblate (Swedish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/ commit 36ec3701f3a1a904e7c42ac4ffbe6a050dc6d1ed Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:43 2026 +0100 Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/zh_Hans/ commit 65d8b74b340c877cad2028b7142c783a1b568d49 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:48 2026 +0100 Translated using Weblate (Japanese) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ja/ commit 4d11d1d31022583657e93aee70301a8ffcde1340 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:52 2026 +0100 Translated using Weblate (Korean) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ko/ commit bd1135bcb965ad73cf493771b15081cc97cf513a Author: Orhun <orhunavcu@gmail.com> Date: Fri Jan 9 22:53:33 2026 +0100 Translated using Weblate (Turkish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 2c3d814119f4cf2dabd20933699f5b991f20f3e6 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:32 2026 +0100 Translated using Weblate (French) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/fr/ * Refactor code structure and remove redundant code blocks for improved readability and maintainability * fix: Correct appVersion to match the latest pre-release version * fix: Add missing vulnerability reference for jaraco.context in .trivyignore --------- Co-authored-by: Lars Lehmann <33843261+larsl-net@users.noreply.github.com> Co-authored-by: Lars Lehmann <lars@lmail.eu> Co-authored-by: Nick Petrushin <n.a.petrushin@gmail.com>
373 lines
13 KiB
Python
373 lines
13 KiB
Python
import logging
|
|
import re
|
|
import urllib.parse
|
|
from difflib import SequenceMatcher
|
|
|
|
import requests
|
|
from django.conf import settings
|
|
from rest_framework import viewsets
|
|
from rest_framework.decorators import action
|
|
from rest_framework.permissions import IsAuthenticated
|
|
from rest_framework.response import Response
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
class GenerateDescription(viewsets.ViewSet):
|
|
permission_classes = [IsAuthenticated]
|
|
|
|
# User-Agent header required by Wikipedia API, Accept-Language patched in per request
|
|
BASE_HEADERS = {
|
|
'User-Agent': f'AdventureLog/{getattr(settings, "ADVENTURELOG_RELEASE_VERSION", "unknown")}'
|
|
}
|
|
DEFAULT_LANGUAGE = "en"
|
|
LANGUAGE_PATTERN = re.compile(r"^[a-z0-9-]{2,12}$", re.IGNORECASE)
|
|
MAX_CANDIDATES = 10 # Increased to find better matches
|
|
|
|
# Accepted image formats (no SVG)
|
|
ACCEPTED_IMAGE_FORMATS = {'.jpg', '.jpeg', '.png', '.webp', '.gif'}
|
|
MIN_DESCRIPTION_LENGTH = 50 # Minimum characters for a valid description
|
|
|
|
@action(detail=False, methods=['get'])
|
|
def desc(self, request):
|
|
name = self.request.query_params.get('name', '')
|
|
if not name:
|
|
return Response({"error": "Name parameter is required"}, status=400)
|
|
|
|
name = urllib.parse.unquote(name).strip()
|
|
if not name:
|
|
return Response({"error": "Name parameter is required"}, status=400)
|
|
|
|
lang = self.get_language(request)
|
|
|
|
try:
|
|
candidates = self.get_candidate_pages(name, lang)
|
|
|
|
for candidate in candidates:
|
|
page_data = self.fetch_page(
|
|
lang=lang,
|
|
candidate=candidate,
|
|
props='extracts|categories',
|
|
extra_params={'exintro': 1, 'explaintext': 1}
|
|
)
|
|
if not page_data or page_data.get('missing'):
|
|
continue
|
|
|
|
# Check if this is a disambiguation page
|
|
if self.is_disambiguation_page(page_data):
|
|
continue
|
|
|
|
extract = (page_data.get('extract') or '').strip()
|
|
|
|
# Filter out pages with very short descriptions
|
|
if len(extract) < self.MIN_DESCRIPTION_LENGTH:
|
|
continue
|
|
|
|
# Filter out list/index pages
|
|
if self.is_list_or_index_page(page_data):
|
|
continue
|
|
|
|
page_data['lang'] = lang
|
|
return Response(page_data)
|
|
|
|
return Response({"error": "No description found"}, status=404)
|
|
|
|
except requests.exceptions.RequestException:
|
|
logger.exception("Failed to fetch data from Wikipedia")
|
|
return Response({"error": "Failed to fetch data from Wikipedia."}, status=500)
|
|
except ValueError:
|
|
return Response({"error": "Invalid response from Wikipedia API"}, status=500)
|
|
|
|
@action(detail=False, methods=['get'])
|
|
def img(self, request):
|
|
name = self.request.query_params.get('name', '')
|
|
if not name:
|
|
return Response({"error": "Name parameter is required"}, status=400)
|
|
|
|
name = urllib.parse.unquote(name).strip()
|
|
if not name:
|
|
return Response({"error": "Name parameter is required"}, status=400)
|
|
|
|
lang = self.get_language(request)
|
|
|
|
try:
|
|
candidates = self.get_candidate_pages(name, lang)
|
|
found_images = []
|
|
|
|
for candidate in candidates:
|
|
# Stop after finding 5 valid images
|
|
if len(found_images) >= 8:
|
|
break
|
|
|
|
page_data = self.fetch_page(
|
|
lang=lang,
|
|
candidate=candidate,
|
|
props='pageimages|categories',
|
|
extra_params={'piprop': 'original|thumbnail', 'pithumbsize': 640}
|
|
)
|
|
if not page_data or page_data.get('missing'):
|
|
continue
|
|
|
|
# Skip disambiguation pages
|
|
if self.is_disambiguation_page(page_data):
|
|
continue
|
|
|
|
# Skip list/index pages
|
|
if self.is_list_or_index_page(page_data):
|
|
continue
|
|
|
|
# Try original image first
|
|
original_image = page_data.get('original')
|
|
if original_image and self.is_valid_image(original_image.get('source')):
|
|
found_images.append({
|
|
'source': original_image.get('source'),
|
|
'width': original_image.get('width'),
|
|
'height': original_image.get('height'),
|
|
'title': page_data.get('title'),
|
|
'type': 'original'
|
|
})
|
|
continue
|
|
|
|
# Fall back to thumbnail
|
|
thumbnail_image = page_data.get('thumbnail')
|
|
if thumbnail_image and self.is_valid_image(thumbnail_image.get('source')):
|
|
found_images.append({
|
|
'source': thumbnail_image.get('source'),
|
|
'width': thumbnail_image.get('width'),
|
|
'height': thumbnail_image.get('height'),
|
|
'title': page_data.get('title'),
|
|
'type': 'thumbnail'
|
|
})
|
|
|
|
if found_images:
|
|
return Response({"images": found_images})
|
|
|
|
return Response({"error": "No image found"}, status=404)
|
|
|
|
except requests.exceptions.RequestException:
|
|
logger.exception("Failed to fetch data from Wikipedia")
|
|
return Response({"error": "Failed to fetch data from Wikipedia."}, status=500)
|
|
except ValueError:
|
|
return Response({"error": "Invalid response from Wikipedia API"}, status=500)
|
|
|
|
def is_valid_image(self, image_url):
|
|
"""Check if image URL is valid and not an SVG"""
|
|
if not image_url:
|
|
return False
|
|
|
|
url_lower = image_url.lower()
|
|
|
|
# Reject SVG images
|
|
if '.svg' in url_lower:
|
|
return False
|
|
|
|
# Accept only specific image formats
|
|
return any(url_lower.endswith(fmt) or fmt in url_lower for fmt in self.ACCEPTED_IMAGE_FORMATS)
|
|
|
|
def is_disambiguation_page(self, page_data):
|
|
"""Check if page is a disambiguation page"""
|
|
categories = page_data.get('categories', [])
|
|
for cat in categories:
|
|
cat_title = cat.get('title', '').lower()
|
|
if 'disambiguation' in cat_title or 'disambig' in cat_title:
|
|
return True
|
|
|
|
# Check title for disambiguation indicators
|
|
title = page_data.get('title', '').lower()
|
|
if '(disambiguation)' in title:
|
|
return True
|
|
|
|
return False
|
|
|
|
def is_list_or_index_page(self, page_data):
|
|
"""Check if page is a list or index page"""
|
|
title = page_data.get('title', '').lower()
|
|
|
|
# Common patterns for list/index pages
|
|
list_patterns = [
|
|
'list of',
|
|
'index of',
|
|
'timeline of',
|
|
'glossary of',
|
|
'outline of'
|
|
]
|
|
|
|
return any(pattern in title for pattern in list_patterns)
|
|
|
|
def get_candidate_pages(self, term, lang):
|
|
"""Get and rank candidate pages from Wikipedia search"""
|
|
if not term:
|
|
return []
|
|
|
|
url = self.build_api_url(lang)
|
|
params = {
|
|
'origin': '*',
|
|
'action': 'query',
|
|
'format': 'json',
|
|
'list': 'search',
|
|
'srsearch': term,
|
|
'srlimit': self.MAX_CANDIDATES,
|
|
'srwhat': 'text',
|
|
'utf8': 1,
|
|
}
|
|
|
|
response = requests.get(url, headers=self.get_headers(lang), params=params, timeout=10)
|
|
response.raise_for_status()
|
|
|
|
try:
|
|
data = response.json()
|
|
except ValueError:
|
|
logger.warning("Invalid response while searching Wikipedia for '%s'", term)
|
|
return [{'title': term, 'pageid': None}]
|
|
|
|
search_results = data.get('query', {}).get('search', [])
|
|
if not search_results:
|
|
return [{'title': term, 'pageid': None}]
|
|
|
|
normalized = term.lower()
|
|
ranked_results = []
|
|
|
|
for result in search_results:
|
|
title = (result.get('title') or '').strip()
|
|
if not title:
|
|
continue
|
|
|
|
title_lower = title.lower()
|
|
|
|
# Calculate multiple similarity metrics
|
|
similarity = SequenceMatcher(None, normalized, title_lower).ratio()
|
|
|
|
# Boost score for exact matches
|
|
exact_match = int(title_lower == normalized)
|
|
|
|
# Boost score for titles that start with the search term
|
|
starts_with = int(title_lower.startswith(normalized))
|
|
|
|
# Penalize disambiguation pages
|
|
is_disambig = int('disambiguation' in title_lower or '(disambig' in title_lower)
|
|
|
|
# Penalize list/index pages
|
|
is_list = int(any(p in title_lower for p in ['list of', 'index of', 'timeline of']))
|
|
|
|
score = result.get('score') or 0
|
|
|
|
ranked_results.append({
|
|
'title': title,
|
|
'pageid': result.get('pageid'),
|
|
'exact': exact_match,
|
|
'starts_with': starts_with,
|
|
'similarity': similarity,
|
|
'score': score,
|
|
'is_disambig': is_disambig,
|
|
'is_list': is_list
|
|
})
|
|
|
|
if not ranked_results:
|
|
return [{'title': term, 'pageid': None}]
|
|
|
|
# Sort by: exact match > starts with > not disambiguation > not list > similarity > search score
|
|
ranked_results.sort(
|
|
key=lambda e: (
|
|
e['exact'],
|
|
e['starts_with'],
|
|
-e['is_disambig'],
|
|
-e['is_list'],
|
|
e['similarity'],
|
|
e['score']
|
|
),
|
|
reverse=True
|
|
)
|
|
|
|
candidates = []
|
|
seen_titles = set()
|
|
|
|
for entry in ranked_results:
|
|
title_key = entry['title'].lower()
|
|
if title_key in seen_titles:
|
|
continue
|
|
seen_titles.add(title_key)
|
|
candidates.append({'title': entry['title'], 'pageid': entry['pageid']})
|
|
if len(candidates) >= self.MAX_CANDIDATES:
|
|
break
|
|
|
|
# Add original term as fallback if not already included
|
|
if normalized not in seen_titles:
|
|
candidates.append({'title': term, 'pageid': None})
|
|
|
|
return candidates
|
|
|
|
def fetch_page(self, *, lang, candidate, props, extra_params=None):
|
|
"""Fetch page data from Wikipedia API"""
|
|
if not candidate or not candidate.get('title'):
|
|
return None
|
|
|
|
params = {
|
|
'origin': '*',
|
|
'action': 'query',
|
|
'format': 'json',
|
|
'prop': props,
|
|
}
|
|
|
|
page_id = candidate.get('pageid')
|
|
if page_id:
|
|
params['pageids'] = page_id
|
|
else:
|
|
params['titles'] = candidate['title']
|
|
|
|
if extra_params:
|
|
params.update(extra_params)
|
|
|
|
response = requests.get(
|
|
self.build_api_url(lang),
|
|
headers=self.get_headers(lang),
|
|
params=params,
|
|
timeout=10
|
|
)
|
|
response.raise_for_status()
|
|
|
|
try:
|
|
data = response.json()
|
|
except ValueError:
|
|
logger.warning("Invalid response while fetching Wikipedia page '%s'", candidate['title'])
|
|
return None
|
|
|
|
pages = data.get('query', {}).get('pages', {})
|
|
if not pages:
|
|
return None
|
|
|
|
if page_id is not None:
|
|
page_data = pages.get(str(page_id))
|
|
if page_data:
|
|
page_data.setdefault('title', candidate['title'])
|
|
return page_data
|
|
|
|
page_data = next(iter(pages.values()))
|
|
if page_data:
|
|
page_data.setdefault('title', candidate['title'])
|
|
return page_data
|
|
|
|
def get_language(self, request):
|
|
"""Extract and validate language parameter"""
|
|
candidate = request.query_params.get('lang')
|
|
if not candidate:
|
|
candidate = self.DEFAULT_LANGUAGE
|
|
|
|
if not candidate:
|
|
candidate = 'en'
|
|
|
|
normalized = candidate.replace('_', '-').lower()
|
|
if self.LANGUAGE_PATTERN.match(normalized):
|
|
return normalized
|
|
|
|
return 'en'
|
|
|
|
def get_headers(self, lang):
|
|
"""Build headers for Wikipedia API request"""
|
|
headers = dict(self.BASE_HEADERS)
|
|
headers['Accept-Language'] = lang
|
|
headers['Accept'] = 'application/json'
|
|
return headers
|
|
|
|
def build_api_url(self, lang):
|
|
"""Build Wikipedia API URL for given language"""
|
|
subdomain = lang.split('-', 1)[0]
|
|
return f'https://{subdomain}.wikipedia.org/w/api.php' |