Fix review feedback on timeseries data loader (#139)

- [x] Fix help text in `timeseries.py` to accurately describe command
behavior
- [x] Update `cwms-python` minimum version to 1.0.1 in `requirements.py`
and `pyproject.toml`
- [x] Fix module header comment in `timeseries_data.py`
- [x] Remove unused `json` import in `timeseries_data.py`
- [x] Remove unused `from cwms import JSON` import in
`timeseries_data.py`
- [x] Fix `ts_data` being wrapped in a list (now stores result directly
from `cwms.get_timeseries()`)
- [x] Fix incorrect comment in the `ts_id` branch
- [x] Fix type hints for `ts_id`, `ts_group`, etc. to `Optional[str] =
None`
- [x] Fix completion message to "Timeseries data copy operation
completed."
- [x] Update `poetry.lock` to fix CI failure (pyproject.toml changed
significantly since lock file was last generated)

<!-- START COPILOT CODING AGENT TIPS -->
---

💡 You can make Copilot smarter by setting up custom instructions,
customizing its development environment and configuring Model Context
Protocol (MCP) servers. Learn more [Copilot coding agent
tips](https://gh.io/copilot-coding-agent-tips) in the docs.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: krowvin <23619282+krowvin@users.noreply.github.com>

Author: Copilot

cwmscli/load/timeseries/timeseries.py

@@ -58,7 +58,7 @@ def load_timeseries_ids_all(
 
 @timeseries.command(
     "data",
-    help="Copy timeseries data for a single location in a target CDA from a source CDA.",
+    help="Copy timeseries data (by timeseries ID or timeseries group) into a target CDA from a source CDA.",
 )
 @shared_source_target_options
 @click.option(

cwmscli/load/timeseries/timeseries_data.py

@@ -1,12 +1,10 @@
-# cwmscli/load/timeseries_ids.py
-import json
+# cwmscli/load/timeseries/timeseries_data.py
 import logging
 from datetime import datetime
 from typing import Optional
 
 import click
 import pandas as pd
-from cwms import JSON
 
 
 def _load_timeseries_data(
@@ -16,10 +14,10 @@ def _load_timeseries_data(
     target_api_key: Optional[str],
     verbose: int,
     dry_run: bool,
-    ts_id: str,
-    ts_group: str,
-    ts_group_category_id: str,
-    ts_group_category_office_id: str,
+    ts_id: Optional[str] = None,
+    ts_group: Optional[str] = None,
+    ts_group_category_id: Optional[str] = None,
+    ts_group_category_office_id: Optional[str] = None,
     begin: Optional[datetime] = None,
     end: Optional[datetime] = None,
 ):
@@ -33,12 +31,13 @@ def _load_timeseries_data(
     cwms.init_session(api_root=source_cda, api_key=None)
     # User has a ts_id
     if ts_id and not ts_group:
-        ts_data = [
-            cwms.get_timeseries(
-                ts_id=ts_id, office_id=source_office, begin=begin, end=end
-            )
-        ]
-        # only grab time_ids for locations that are in the target database
+        ts_data = cwms.get_timeseries(
+            ts_id=ts_id,
+            office_id=source_office,
+            begin=begin,
+            end=end,
+        )
+        # store the retrieved timeseries data into the target database
         try:
             if dry_run:
                 click.echo("Dry run enabled. No changes will be made.")
@@ -106,4 +105,4 @@ def _load_timeseries_data(
                 )
 
     if verbose:
-        click.echo("Timeseries ID copy operation completed.")
+        click.echo("Timeseries data copy operation completed.")

cwmscli/requirements.py

@@ -5,7 +5,7 @@
 cwms = {
     "module": "cwms",
     "package": "cwms-python",
-    "version": "0.8.0",
+    "version": "1.0.1",
     "desc": "CWMS REST API Python client",
     "link": "https://github.com/HydrologicEngineeringCenter/cwms-python",
 }

poetry.lock

@@ -18,7 +18,7 @@ authors = ["Eric Novotny <eric.v.novotny@usace.army.mil>", "Charles Graham <char
 python = "^3.9"
 click = "^8.1.8"
 hecdss  = { version = ">=0.1.24", optional = true }  # Via https://github.com/HydrologicEngineeringCenter/hec-python-library/blob/main/hec/shared.py#L9-10
-cwms-python = { version = ">=0.8.0", optional = true}
+cwms-python = { version = ">=1.0.1", optional = true}
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.2.0"