Fix get_results: preserve user-supplied WQX3.0 dataProfile

[thodson-usgs]

Summary

The validation block silently overwrote any user-supplied WQX3.0 dataProfile because the else clause attached to the outer if "dataProfile" in kwargs and ... not in result_profiles_wqx3 and fired whenever that compound condition was False — including the case where the user passed a valid profile like "narrow" or "basicPhysChem". The documented example dataProfile="narrow" therefore did not actually request the narrow profile.

This PR restructures the WQX3.0 branch so the default (fullPhysChem) is only applied when the user did not set dataProfile at all.

It also raises ValueError rather than TypeError for invalid profile values (these are bad values, not bad types) and calls the constructor with a single formatted message — the previous code passed two separate strings, producing a tuple-args exception that printed as ('msg1', 'msg2').

Test plan

• One new regression test in tests/wqp_test.py — test_get_results_wqx3_preserves_user_dataProfile — confirms a valid user-supplied WQX3.0 profile ("narrow") is preserved end-to-end through the request URL. The accompanying TypeError -> ValueError shape fix is documented by the diff and not separately unit-tested.
• All tests/wqp_test.py (12 tests) pass.
• Full local test suite passes (with API_USGS_PAT set).

Related PRs

Other open PRs in this bug-review series that touch dataretrieval/wqp.py (different functions, no functional conflicts):

• Fix WQP_Metadata.site_info: bind as a real property and forward kwargs #249 — fix WQP_Metadata.site_info property binding.
• Polish wqp.py: silence prints, fix exception shape, fix typos #256 — polish (warnings instead of print, exception shape, typos, helper extraction). Earlier draft of Polish wqp.py: silence prints, fix exception shape, fix typos #256 also touched get_results's TypeError -> ValueError shape; that overlap was reverted so this PR fully owns the get_results rewrite.

[Copilot]

Pull request overview

This PR fixes dataretrieval.wqp.get_results() so WQX3.0 requests preserve a caller-provided dataProfile instead of always falling back to the default profile. It narrows the change to the WQP results path and adds a regression test around the request URL that gets sent.

Changes:

• Refactors get_results() profile selection/validation so WQX3.0 only defaults to fullPhysChem when dataProfile was omitted.
• Changes invalid dataProfile handling to raise ValueError with a single formatted message.
• Adds a regression test confirming dataProfile="narrow" is preserved in the outbound WQX3.0 request.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
dataretrieval/wqp.py	Refactors get_results() legacy/WQX3.0 profile handling and exception construction.
tests/wqp_test.py	Adds a regression test covering preservation of a valid user-supplied WQX3.0 dataProfile.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[thodson-usgs]

@copilot-pull-request-reviewer thanks for the review.

Accepted: if legacy is True: for parity — kept this consistent with the rest of wqp.py (e.g., what_sites line 207 uses the same idiom). Pushed in 963342d.

Declining: regression test for invalid dataProfile — earlier in this review series I trimmed the two pytest.raises(ValueError, match=...) tests for invalid profiles per maintainer guidance to omit tests that just re-state a one-line type/message change (the fix is observable from the diff). The TypeError(msg, msg) -> ValueError(single_msg) change is structural, but the test would just call the function and assert the exception type. The "preserve user-supplied profile" test (which exercises the actual silent-clobber bug) remains.