Merge pull request #15 from nsidc/ardwa-6

ARDWA-6

Author: scott-lewis-nsidc

pyproject.toml

@@ -39,29 +39,30 @@ aross-stations-db = "aross_stations_db.cli:cli"
 
 [project.optional-dependencies]
 test = [
+  "mypy >=1.10",
+  "pandas-stubs",
   "pytest >=6",
   "pytest-cov >=3",
-  "mypy >=1.10",
   "types-tqdm",
 ]
 dev = [
-  "pytest >=6",
-  "pytest-cov >=3",
   "nox",
   "pre-commit",
+  "pytest >=6",
+  "pytest-cov >=3",
 ]
 docs = [
-  "sphinx>=7.0",
+  "furo>=2023.08.17",
   "myst_parser>=0.13",
-  "sphinx_copybutton",
+  "sphinx>=7.0",
   "sphinx_autodoc_typehints",
-  "furo>=2023.08.17",
+  "sphinx_copybutton",
 ]
 ui = [
   "jupyterlab",
   "leafmap",
-  "pandas",
   "matplotlib",
+  "pandas",
 ]
 
 [project.urls]

src/aross_stations_db/api/__init__.py

@@ -17,6 +17,7 @@
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
+    expose_headers=["content-disposition"]
 )
 
 

src/aross_stations_db/api/v1/stations.py

@@ -1,22 +1,27 @@
 import datetime as dt
+import io
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends, Query, Form
+from fastapi.responses import StreamingResponse
 from geoalchemy2 import WKTElement
+import pandas as pd
 from sqlalchemy.orm import Session
 
 from aross_stations_db.api.dependencies import get_db_session
 from aross_stations_db.api.v1.output import (
     StationsGeoJson,
     stations_query_results_to_geojson,
 )
-from aross_stations_db.db.query import stations_query
+from aross_stations_db.db.query import (
+    stations_query,
+    station_data_query
+)
 
 router = APIRouter()
 
-
 @router.get("/")
-def get(
+async def get(
     db: Annotated[Session, Depends(get_db_session)],
     *,
     start: Annotated[dt.datetime, Query(description="ISO-format timestamp")],
@@ -27,3 +32,44 @@ def get(
     query = stations_query(db=db, start=start, end=end, polygon=polygon)
 
     return stations_query_results_to_geojson(query.all())
+
+
+def station_data(
+    db: Session,
+    start: dt.datetime | None,
+    end: dt.datetime | None,
+    stations: list[str]
+) -> StreamingResponse:
+    now = dt.datetime.now().strftime("%Y%m%d%H%M%S")
+    fileRoot = 'stationdata'
+
+    query = station_data_query(db=db, start=start, end=end, stations=stations)
+    df = pd.read_sql(query.statement, query.session.connection())
+
+    stream = io.StringIO()
+    df.to_csv(stream, index=False)
+    response = StreamingResponse(iter([stream.getvalue()]), media_type='text/csv')
+    response.headers['Content-Disposition'] = f"attachment; filename={fileRoot}_{now}.csv"
+    return response
+
+
+@router.get("/data")
+async def station_data_get(
+    db: Annotated[Session, Depends(get_db_session)],
+    *,
+    start: Annotated[dt.datetime, Query(description="ISO-format timestamp")] | None = None,
+    end: Annotated[dt.datetime, Query(description="ISO-format timestamp")] | None = None,
+    stations: Annotated[list[str], Query(description="Station ID(s)")]
+) -> StreamingResponse:
+    return station_data(db, start, end, stations)
+
+
+@router.post("/data")
+async def station_data_post(
+    db: Annotated[Session, Depends(get_db_session)],
+    *,
+    start: Annotated[dt.datetime, Form(description="ISO-format timestamp")] | None  = None,
+    end: Annotated[dt.datetime, Form(description="ISO-format timestamp")] | None  = None,
+    stations: Annotated[list[str], Form(description="Station ID(s)")]
+) -> StreamingResponse:
+    return station_data(db, start, end, stations)

src/aross_stations_db/db/query.py

@@ -39,6 +39,33 @@ def stations_query(
     return query.group_by(Station.id)
 
 
+def station_data_query(
+    db: Session,
+    *,
+    start: dt.datetime | None,
+    end: dt.datetime | None,
+    stations: list[str] = [],
+) -> RowReturningQuery[tuple[str, dt.datetime, dt.datetime, bool | None, int, int, int, int]]:
+    print(type(stations))
+    query = db.query(
+        Event.station_id,
+        Event.time_start,
+        Event.time_end,
+        Event.snow_on_ground,
+        Event.rain_hours,
+        Event.freezing_rain_hours,
+        Event.solid_precipitation_hours,
+        Event.unknown_precipitation_hours
+    ).filter(Event.station_id.in_(stations))
+
+    if start is not None:
+        query = query.filter(Event.time_start >= start)
+    if end is not None:
+        query = query.filter(Event.time_end < end)
+
+    return query.order_by(Event.station_id)
+
+
 def timeseries_query(
     db: Session,
     *,