cwms-cli 0.7.2__tar.gz → 0.7.4__tar.gz

{cwms_cli-0.7.2 → cwms_cli-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwms-cli
-Version: 0.7.2
+Version: 0.7.4
 Summary: Command line utilities for Corps Water Management Systems (CWMS) python scripts. This is a collection of shared scripts across the enterprise Water Management Enterprise System (WMES) teams.
 License: LICENSE
 License-File: LICENSE
@@ -18,7 +18,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click (>=8.1.8,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: requests (>=2.30.0,<3.0.0)
+Requires-Dist: requests (>=2.32.0,<3.0.0) ; python_version == "3.9"
+Requires-Dist: requests (>=2.33.0,<3.0.0) ; python_version >= "3.10"
 Project-URL: Repository, https://github.com/HydrologicEngineeringCenter/cwms-cli
 Description-Content-Type: text/markdown
 

{cwms_cli-0.7.2 → cwms_cli-0.7.4}/cwmscli/commands/commands_cwms.py

@@ -283,7 +283,15 @@ def shef_import_crit(filename, office, api_root, api_key, api_key_loc, dry_run):
 # ================================================================================
 @shef_group.command(
     "import_infile",
-    help="Import SHEF .in file into timeseries group for SHEF file processing",
+    help=(
+        "Import a legacy exportShef .in configuration file into a CWMS "
+        "timeseries group (default category 'SHEF Export'). Each entry "
+        "becomes a group member whose alias-id encodes the SHEF location, "
+        "PE code, send code, duration, and (optionally) units. "
+        "If the bulk save fails, each TSID is validated via "
+        "get_timeseries_identifier; missing TSIDs are logged and skipped, "
+        "and the save is retried with the surviving entries."
+    ),
 )
 @click.option(
     "-f",
@@ -484,15 +492,13 @@ def update_cli_cmd(target_version: Optional[str], pre: bool, yes: bool) -> None:
 @click.group(
     "blob",
     help="Manage CWMS Blobs (upload, download, delete, update, list)",
-    epilog=textwrap.dedent(
-        """
+    epilog=textwrap.dedent("""
     Example Usage:\n
     - Store a PDF/image as a CWMS blob with optional description\n
     - Download a blob by id to your local filesystem\n
     - Update a blob's name/description/mime-type\n
     - Bulk list blobs for an office  
-"""
-    ),
+"""),
 )
 def blob_group():
     pass
@@ -700,14 +706,12 @@ def list_cmd(**kwargs):
 @click.group(
     "clob",
     help="Manage CWMS Clobs (upload, download, delete, update, list)",
-    epilog=textwrap.dedent(
-        """
+    epilog=textwrap.dedent("""
     Example Usage:\n
     - Download a clob by id to your local filesystem\n
     - Update a clob's name/description/mime-type\n
     - Bulk list clobs for an office  
-"""
-    ),
+"""),
 )
 @requires(reqs.cwms)
 def clob_group():

{cwms_cli-0.7.2 → cwms_cli-0.7.4}/cwmscli/commands/shef/import_infile.py

@@ -588,13 +588,32 @@ def build_group_json(
 # ---------------------------------------------------------------------------
 
 
-def store_group(
+def _filter_existing_tsids(
+    entries: list[dict],
+    office_id: str,
+) -> list[dict]:
+    """Probe each TSID via cwms.get_timeseries_identifier and drop missing ones."""
+    valid: list[dict] = []
+    for e in entries:
+        try:
+            cwms.get_timeseries_identifier(ts_id=e["tsid"], office_id=office_id)
+            valid.append(e)
+        except Exception as exc:
+            log.warning(
+                "Skipping missing TSID '%s' (%s)",
+                e["tsid"],
+                type(exc).__name__,
+            )
+    return valid
+
+
+def _save(
     group_json: dict,
     group_id: str,
     office_id: str,
     fail_if_exists: bool,
 ) -> None:
-    """POST (create) or PATCH (update) the timeseries group in CWMS."""
+    """Single store/update attempt with no validation fallback."""
     try:
         cwms.store_timeseries_groups(group_json, fail_if_exists=fail_if_exists)
         log.info("SUCCESS — group stored via store_timeseries_groups.")
@@ -606,7 +625,6 @@ def store_group(
             exc,
         )
 
-    # Fallback: update, replacing all assigned timeseries
     cwms.update_timeseries_groups(
         data=group_json,
         group_id=group_id,
@@ -616,6 +634,44 @@ def store_group(
     log.info("SUCCESS — group updated via update_timeseries_groups.")
 
 
+def store_group(
+    group_json: dict,
+    group_id: str,
+    office_id: str,
+    fail_if_exists: bool,
+    entries: Optional[list[dict]] = None,
+    category_id: str = DEFAULT_CATEGORY,
+) -> None:
+    """POST (create) or PATCH (update) the timeseries group in CWMS.
+
+    On failure, validate each TSID individually, drop any that don't exist in
+    CWMS, and retry the save with the surviving entries.
+    """
+    try:
+        _save(group_json, group_id, office_id, fail_if_exists)
+        return
+    except Exception as exc:
+        if entries is None:
+            raise
+        log.warning(
+            "Group save failed (%s: %s) — validating each TSID and retrying ...",
+            type(exc).__name__,
+            exc,
+        )
+
+    valid = _filter_existing_tsids(entries, office_id)
+    if not valid:
+        log.error("No valid TSIDs remain after validation — nothing to store.")
+        return
+    if len(valid) == len(entries):
+        log.error("All TSIDs validated but save still failed; re-raising.")
+        raise
+
+    log.info("Retrying save with %d/%d valid TSIDs.", len(valid), len(entries))
+    retry_json = build_group_json(valid, group_id, office_id, category_id)
+    _save(retry_json, group_id, office_id, fail_if_exists=False)
+
+
 # ---------------------------------------------------------------------------
 # Importable function for CLI integration
 # ---------------------------------------------------------------------------
@@ -713,6 +769,8 @@ def import_shef_infile(
         group_id=group_name,
         office_id=office_id,
         fail_if_exists=fail_if_exists,
+        entries=entries,
+        category_id=category_id,
     )
 
     log.info(

{cwms_cli-0.7.2 → cwms_cli-0.7.4}/cwmscli/commands/users.py

@@ -126,7 +126,7 @@ def _existing_user_name(users: list[dict], user_name: str) -> Optional[str]:
 
 
 def _split_roles(
-    raw_roles: Optional[Union[tuple[str, ...], list[str]]] = None
+    raw_roles: Optional[Union[tuple[str, ...], list[str]]] = None,
 ) -> list[str]:
     if not raw_roles:
         return []

{cwms_cli-0.7.2 → cwms_cli-0.7.4}/cwmscli/load/timeseries/timeseries_ids.py

@@ -1,4 +1,5 @@
 # cwmscli/load/timeseries_ids.py
+import logging
 from typing import Optional
 
 import click

{cwms_cli-0.7.2 → cwms_cli-0.7.4}/pyproject.toml

@@ -2,7 +2,7 @@
 name = "cwms-cli"
 repository = "https://github.com/HydrologicEngineeringCenter/cwms-cli"
 
-version = "0.7.2"
+version = "0.7.4"
 
 
 packages = [
@@ -20,17 +20,26 @@ authors = ["Eric Novotny <eric.v.novotny@usace.army.mil>", "Charles Graham <char
 [tool.poetry.dependencies]
 python = "^3.9"
 click = "^8.1.8"
-requests = "^2.30.0"
+requests = [
+    { version = "^2.33.0", python = ">=3.10" },
+    { version = "^2.32.0", python = ">=3.9,<3.10" },
+]
 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 = ">=1.0.7", optional = true}
 colorama = "^0.4.6"
 
 [tool.poetry.group.dev.dependencies]
-black = "^24.2.0"
+black = [
+    { version = "^26.3.1", python = ">=3.10" },
+    { version = "^24.2.0", python = ">=3.9,<3.10" },
+]
 isort = "^5.13.2"
 mypy = "^1.9.0"
 pre-commit = "^3.6.2"
-pytest = "^8.3.5"
+pytest = [
+    { version = "^9.0.3", python = ">=3.10" },
+    { version = "^8.3.5", python = ">=3.9,<3.10" },
+]
 #pytest-cov = "^4.1.0"
 #pandas-stubs = "^2.2.1.240316"
 yamlfix = "^1.16.0"