fix fetching usgs daily dv (#530)

* fix fetching usgs daily dv

* version bump

Author: samlamont

src/teehr/fetching/usgs/usgs.py

@@ -44,7 +44,9 @@
     USGS_VARIABLE_MAPPER
 )
 
-DATETIME_STR_FMT = "%Y-%m-%dT%H:%M:00+0000"
+HOURLY_DATETIME_STR_FMT = "%Y-%m-%dT%H:%M:00+0000"
+DAILY_DATETIME_STR_FMT = "%Y-%m-%d"
+
 DAYLIGHT_SAVINGS_PAD = timedelta(hours=2)
 
 pd.options.mode.copy_on_write = True
@@ -211,11 +213,22 @@ def _fetch_usgs_streamflow(
 ) -> pd.DataFrame:
     """Fetch USGS gage data and format to TEEHR format."""
     logger.debug("Fetching USGS streamflow data from NWIS.")
-    start_dt_str = start_date.strftime(DATETIME_STR_FMT)
+
+    if service == "iv":
+        datetime_str_format = HOURLY_DATETIME_STR_FMT
+    elif service == "dv":
+        datetime_str_format = DAILY_DATETIME_STR_FMT
+    else:
+        err_msg = f"Service '{service}' is not supported. Valid options are 'iv' and 'dv'."
+        logger.error(err_msg)
+        raise ValueError(err_msg)
+
+    start_dt_str = start_date.strftime(datetime_str_format)
+
     end_dt_str = (
         end_date
         - timedelta(minutes=1)
-    ).strftime(DATETIME_STR_FMT)
+    ).strftime(datetime_str_format)
 
     # Parse out list of sites.
     parsed_sites = _parse_site_id_list(sites)

tests/fetch/test_usgs_fetching_chunkby.py

@@ -197,10 +197,44 @@ def test_chunkby_all(tmpdir):
     assert df["value_time"].max() == pd.Timestamp("2023-02-25 00:00:00")
 
 
+def test_daily_service(tmpdir):
+    """Test chunkby location id."""
+    usgs_to_parquet(
+        sites=[
+            "02449838",
+            "02450825",
+        ],
+        start_date=datetime(2023, 2, 20),
+        end_date=datetime(2023, 2, 21),
+        output_parquet_dir=Path(tmpdir),
+        chunk_by="location_id",
+        overwrite_output=True,
+        convert_to_si=False,
+        service="dv"
+    )
+    df1 = pd.read_parquet(
+        Path(
+            tmpdir,
+            "02449838.parquet"
+        )
+    )
+    df2 = pd.read_parquet(
+        Path(
+            tmpdir,
+            "02450825.parquet"
+        )
+    )
+    assert len(df1) == 1
+    assert len(df2) == 1
+    assert df1["value"].iloc[0] == 157.0  # confirmed with NWIS web
+    assert df2["value"].iloc[0] == 389.0
+
+
 if __name__ == "__main__":
     with tempfile.TemporaryDirectory(prefix="teehr-") as tempdir:
         test_chunkby_location_id(tempfile.mkdtemp(dir=tempdir))
         test_chunkby_day(tempfile.mkdtemp(dir=tempdir))
         test_chunkby_week(tempfile.mkdtemp(dir=tempdir))
         test_chunkby_month(tempfile.mkdtemp(dir=tempdir))
         test_chunkby_all(tempfile.mkdtemp(dir=tempdir))
+        test_daily_service(tempfile.mkdtemp(dir=tempdir))