Fixed _s2_get_with_retrying multiple values issue

[jamesbraza]

If you passed a custom timeout to S2's _s2_get_with_retrying, you would hit:

TypeError: paperqa.utils._get_with_retrying() got multiple values for keyword argument 'timeout'

This PR fixes that, and allows passing zero timeout or empty headers

[Copilot]

Pull Request Overview

This PR fixes a TypeError in the _s2_get_with_retrying function where passing a custom timeout parameter would cause a "multiple values for keyword argument" error. The fix changes how keyword arguments are extracted from get_kwargs to prevent conflicts.

• Changed get_kwargs.get() to get_kwargs.pop() for both headers and timeout parameters
• Ensures keyword arguments are properly consumed and not passed twice to the underlying function

[cursor]

Bug: Regression: Falsy Values No Longer Trigger Defaults

The change from get_kwargs.get(key) or default to get_kwargs.pop(key, default) for headers and timeout parameters introduces a regression. Previously, falsy values (e.g., None, {}, "") would trigger a fallback to default values. Now, these falsy values are passed directly, breaking existing behavior and potentially causing HTTP request failures or unexpected behavior in _get_with_retrying. The original fallback for falsy values must be restored.

paperqa/clients/semantic_scholar.py#L124-L129

paper-qa/paperqa/clients/semantic_scholar.py

Lines 124 to 129 in 54a5a54

	url=url,
	headers=get_kwargs.pop("headers", semantic_scholar_headers()),
	timeout=(
	get_kwargs.pop(
	"timeout", aiohttp.ClientTimeout(SEMANTIC_SCHOLAR_API_REQUEST_TIMEOUT)
	)

Fix in Cursor • Fix in Web

---

Comment bugbot run to trigger another review on this PR
Was this report helpful? Give feedback by reacting with 👍 or 👎