Skip to content

Fix CAMS message error handler #1905

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
merged 14 commits into from
Dec 12, 2023
Merged

Fix CAMS message error handler #1905

Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a02bb78
Fix CAMS message error handler - Issue#1799
Nov 6, 2023
1da05c0
Fix CAMS message error handler - Issue#1799
Nov 6, 2023
05f9e93
Merge branch 'main' of github.com:GillesFischerV/pvlib-python into main
Nov 6, 2023
81bfc8f
fix Python Flake8 Linter error
Nov 7, 2023
e6a49cd
Fix associated UT and add contribution in WhatsNews
Nov 9, 2023
3bc9d33
Merge branch 'main' into main
Nov 13, 2023
9c11d8f
Fix line code length in test_sodapro.py
Nov 13, 2023
c544a49
Fix typo in contributor ghuser
AdamRJensen Nov 21, 2023
892dd0e
Update geographical coverage description
AdamRJensen Nov 21, 2023
dd0a572
correction in maximum longitude available for CAMS Radiation
Nov 22, 2023
80c4fa4
revert of last change
Nov 22, 2023
64972a1
Merge branch 'main' into main
AdamRJensen Dec 12, 2023
f130248
Add doc string changes from adriesse
AdamRJensen Dec 12, 2023
fcf8845
Flake8 correction
AdamRJensen Dec 12, 2023
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
13 changes: 8 additions & 5 deletions pvlib/iotools/sodapro.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,15 @@ def get_cams(latitude, longitude, start, end, email, identifier='mcclear',
res = requests.get(base_url + '?DataInputs=' + data_inputs, params=params,
timeout=timeout)

# Invalid requests returns an XML error message and the HTTP staus code 200
# as if the request was successful. Therefore, errors cannot be handled
# automatic (e.g. res.raise_for_status()) and errors are handled manually
if res.headers['Content-Type'] == 'application/xml':
# Response from CAMS follows the status and reason format of PyWPS4
# If an error occurs on our side, we will return error 400 - bad request
# Additional information is available in the response text so
# we add it here
# to the error displayed to facilitate users effort to fix their request
if not res.ok:
errors = res.text.split('ows:ExceptionText')[1][1:-2]
raise requests.HTTPError(errors, response=res)
res.reason = "%s: <%s>" % (res.reason, errors)
res.raise_for_status()
# Successful requests returns a csv data file
elif res.headers['Content-Type'] == 'application/csv':
fbuf = io.StringIO(res.content.decode('utf-8'))
Expand Down