Merge pull request #12 from xpublish-experiments/json-response

Update Json Response
xpublish-experiments · Apr 30, 2024 · 6dfeec3 · 6dfeec3
2 parents 9731e0f + 290f872
commit 6dfeec3
Show file tree

Hide file tree

Showing 10 changed files with 1,679 additions and 136 deletions.
diff --git a/dev_environment.yml b/dev_environment.yml
@@ -13,8 +13,8 @@ dependencies:
   - dask
 
   # For catalog access
-  - intake
-  - intake-xarray
+  - intake=0.7.0
+  - intake-xarray=0.7.0
   - pystac
 
   # For API access and data formats

diff --git a/src/catalog_to_xpublish/routers/stac_router.py b/src/catalog_to_xpublish/routers/stac_router.py
@@ -66,9 +66,7 @@ def get_catalog_as_yaml(self) -> PlainTextResponse:
     def get_catalog_as_json(self) -> JSONResponse:
         """Returns the catalog as JSON."""
         return JSONResponse(
-            content=json.dumps(
-                self.catalog_endpoint_obj.catalog_obj.to_dict(),
-            ),
+            content=self.catalog_endpoint_obj.catalog_obj.to_dict(),
             media_type='application/json',
             status_code=200,
         )

diff --git a/test_catalogs/intake_zarr_catalog_osn.yaml b/test_catalogs/intake_zarr_catalog_osn.yaml
@@ -2,48 +2,36 @@ sources:
 
   nwis-streamflow-usgs-gages-osn:
     driver: zarr
-    description: "subset of NWIS streamflow - OSN pod storage, 275 MB, 40 years of daily data, CONUS extent point data, 1 real variable (streamflow)"
+    description: "Streamflow from NWIS, extracted and rechunked into time series (NWM2.1 time period)"
     args:
-      urlpath: 's3://rsignellbucket2/hytest/nwm/nwis_chanobs.zarr'
+      urlpath: 's3://hytest/tutorials/evaluation/nwm/nwis_chanobs.zarr'
       consolidated: true
       storage_options:
         anon: true
         requester_pays: false
         client_kwargs:
-          endpoint_url: https://renc.osn.xsede.org
-
-  red-river-subset-osn:
-    driver: zarr
-    description: "Sample subset - OSN pod storage, 470M, Very High-Resolution Dynamic Downscaling of Regional Climate for Use in Long-term Hydrologic Planning along the Red River Valley System"
-    args:
-      urlpath: 's3://rsignellbucket2/nhgf/sample_data/red_river_2020.zarr'
-      consolidated: true
-      storage_options:
-        anon: true
-        requester_pays: false
-        client_kwargs:
-          endpoint_url: https://renc.osn.xsede.org
+          endpoint_url: https://usgs.osn.mghpcc.org
 
   alaska-et-2020-subset-osn:
     driver: zarr
     description: "Sample subset - OSN pod storage, 863M, Gridded 20km Daily Reference Evapotranspiration for the State of Alaska from 1979 to 2017/CCSM4 historical simulation"
     args:
-      urlpath: 's3://rsignellbucket2/nhgf/sample_data/ccsm4.zarr'
+      urlpath: 's3://mdmf/gdp/alaska_et_2020_ccsm4_historical_simulation.zarr'
       consolidated: true
       storage_options:
         anon: true
         requester_pays: false
         client_kwargs:
-          endpoint_url: https://renc.osn.xsede.org
+          endpoint_url: https://usgs.osn.mghpcc.org
 
   prism-v2-osn:
     driver: zarr
     description: "USGS THREDDS Holdings/Parameter-elevation Regressions on Independent Slopes Model Monthly Climate Data for the Continental United States"
     args:
-      urlpath: 's3://rsignellbucket2/nhgf/sample_data/prism_v2.zarr'
+      urlpath: 's3://mdmf/gdp/PRISM_v2.zarr'
       consolidated: true
       storage_options:
         anon: true
         requester_pays: false
         client_kwargs:
-          endpoint_url: https://renc.osn.xsede.org
+          endpoint_url: https://usgs.osn.mghpcc.org
diff --git a/test_catalogs/intake_zarr_catalog_s3.yaml b/test_catalogs/intake_zarr_catalog_s3.yaml
@@ -4,25 +4,16 @@ sources:
     driver: zarr
     description: "Sample subset - s3 storage, 863M, Gridded 20km Daily Reference Evapotranspiration for the State of Alaska from 1979 to 2017/CCSM4 historical simulation"
     args:
-      urlpath: 's3://nhgf-development/workspace/testing/sample-zarr/ccsm4.zarr'
+      urlpath: 's3://nhgf-development/workspace/DataConversion/alaska_et_2020_ccsm4_historical_simulation.zarr'
       consolidated: true
       storage_options:
         requester_pays: true
 
-  red-river-subset-s3:
-    driver: zarr
-    description: "Sample subset - s3 storage, 470M, Very High-Resolution Dynamic Downscaling of Regional Climate for Use in Long-term Hydrologic Planning along the Red River Valley System"
-    args:
-      urlpath: 's3://nhgf-development/workspace/testing/sample-zarr/red_river_2020.zarr'
-      consolidated: true
-      storage_options:
-        requester_pays: true
-
-  conus404-hourly-s3:
+  conus404-daily-s3:
     driver: zarr
     description: "CONUS404 - s3 storage, 70 TB, 40 years of hourly data, CONUS extent with 4 km gridded spatial resolution, 157 variables"
     args:
-      urlpath: 's3://nhgf-development/conus404/conus404_hourly_202209.zarr'
+      urlpath: 's3://nhgf-development/conus404/conus404_daily_202210.zarr'
       consolidated: true
       storage_options:
         requester_pays: true