Skip to content

extract metadata from redirect headers to avoid redundant WB req #6

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

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
+7 −2
Draft

extract metadata from redirect headers to avoid redundant WB req #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1203c87
extract metadata from redirect headers to avoid redundant WB req
tishin-endou Jun 9, 2025
b46c9af
Update provider.py
tishin-endou Oct 12, 2025
13ce6a3
Merge branch 'RCOSDP:develop' into feature/FileViewUxRefine
tishin-endou Oct 17, 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
9 changes: 7 additions & 2 deletions mfr/providers/osf/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def __init__(self, request, url, action=None):
super().__init__(request, url, action)
self.download_url = None
self.headers = {}
self._cached_metadata = None

# capture request authorization
self.cookies = dict(self.request.cookies)
Expand All @@ -60,7 +61,10 @@ async def metadata(self):
"""
download_url = await self._fetch_download_url()
logger.debug('download_url::{}'.format(download_url))
if '/file?' in download_url:
if self._cached_metadata:
metadata = self._cached_metadata
self.metrics.add('metadata.wb_api', 'cached_from_head')
elif '/file?' in download_url:
# URL is for WaterButler v0 API
# TODO Remove this when API v0 is officially deprecated
self.metrics.add('metadata.wb_api', 'v0')
Expand Down Expand Up @@ -171,7 +175,7 @@ async def _fetch_download_url(self):
self.metrics.add('download_url.orig_type', 'osf')
# make request to osf, don't follow, store waterbutler download url
request = await self._make_request(
'GET',
'HEAD',
self.url,
allow_redirects=False,
headers={
Expand All @@ -189,6 +193,7 @@ async def _fetch_download_url(self):
code=request.status,
)
self.download_url = request.headers['location']
self._cached_metadata = {'data': json.loads(request.headers['x-file-metadata'])}

self.metrics.add('download_url.derived_url', str(self.download_url))

Expand Down