Skip to content

feat: merge session's environment settings before sending request #102

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
gounux merged 3 commits into from
Mar 30, 2026
+13 −3
Merged

feat: merge session's environment settings before sending request #102

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7658456
feat: merge session's environment settings before sending request
gounux Mar 19, 2026
e38ea28
fix: format and check code with pre-commit hooks
gounux Mar 19, 2026
ddabbfc
fix: use named parameters during merging func call
gounux Mar 29, 2026
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
16 changes: 13 additions & 3 deletions qfieldcloud_sdk/sdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1937,16 +1937,26 @@ def _request(
request = QfcRequest(**request_params)

session_params = {
"stream": stream,
"verify": self.verify_ssl,
# redirects from POST requests automagically turn into GET requests, so better forbid redirects
"allow_redirects": allow_redirects,
}

if os.environ.get("ENVIRONMENT") == "test":
return request.mock_response()
else:
response = self.session.send(request.prepare(), **session_params)
prepared_request = self.session.prepare_request(request)

# Merge environment settings into session
settings = self.session.merge_environment_settings(
url=prepared_request.url,
proxies={},
stream=stream,
verify=self.verify_ssl,
cert=None,
)
settings = settings | session_params # type: ignore

response = self.session.send(request.prepare(), **settings)

try:
response.raise_for_status()
Expand Down
Loading