Merge pull request #9 from DARPA-ASKEM/error-fix

better error handling for node failure

api/search/providers/esgf.py

@@ -311,11 +311,12 @@ def run_esgf_query(
 
  full_url = f"{default_settings.esgf_url}/search?{encoded_string}"
  r = requests.get(full_url)
- response = r.json()
  if r.status_code != 200:
+ error = str(r.content)
  raise ConnectionError(
- f"Failed to search against ESGF node: {full_url} {r.status_code} {response}"
+ f"Failed to search against ESGF node: {full_url}: error from node upstream is: {r.status_code} {error}"
  )
+ response = r.json()
 
  # parallel over datasets, but delay fetching url until needed
  return dask.compute(

api/server.py

@@ -32,7 +32,10 @@ async def job_status(job_id: str, redis=Depends(get_redis)):
 
 @app.get("/search/esgf")
 async def esgf_search(query: str = "", page: int = 1, refresh_cache=False):
- datasets = esgf.search(query, page, refresh_cache)
+ try:
+ datasets = esgf.search(query, page, refresh_cache)
+ except Exception as e:
+ return {"error": f"failed to fetch datasets: {e}"}
  return {"results": datasets}