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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwms-cli
-Version: 0.7.0
+Version: 0.7.2
 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

{cwms_cli-0.7.0 → cwms_cli-0.7.2}/cwmscli/commands/blob.py

@@ -11,10 +11,12 @@ from typing import Optional, Sequence, Tuple, Union
 
 from cwmscli.utils import (
     colors,
+    format_local_download_error,
     get_api_key,
     has_invalid_chars,
     init_cwms_session,
     log_scoped_read_hint,
+    validate_default_download_dest,
 )
 from cwmscli.utils.click_help import DOCS_BASE_URL
 from cwmscli.utils.deps import requires
@@ -109,6 +111,14 @@ def _save_blob_content(
     return dest
 
 
+def _default_download_dest(blob_id: str) -> str:
+    return validate_default_download_dest(
+        blob_id,
+        resource_name="Blob",
+        docs_url=BLOB_DOCS_URL,
+    )
+
+
 def _blob_media_type(cwms_module, office: str, blob_id: str) -> Optional[str]:
     try:
         result = cwms_module.get_blobs(office_id=office, blob_id_like=blob_id)
@@ -602,7 +612,7 @@ def download_cmd(
 
     try:
         blob_content = cwms.get_blob(office_id=office, blob_id=bid)
-        target = dest or bid
+        target = dest or _default_download_dest(bid)
         _save_blob_content(
             blob_content,
             dest=target,
@@ -621,14 +631,15 @@ def download_cmd(
         )
         sys.exit(1)
     except Exception as e:
-        logging.error(f"Failed to download: {e}")
-        log_scoped_read_hint(
-            credential_kind=credential_kind,
-            anonymous=anonymous,
-            office=office,
-            action="download",
-            resource="blob content",
-        )
+        logging.error(format_local_download_error(e, BLOB_DOCS_URL))
+        if not isinstance(e, (OSError, ValueError)):
+            log_scoped_read_hint(
+                credential_kind=credential_kind,
+                anonymous=anonymous,
+                office=office,
+                action="download",
+                resource="blob content",
+            )
         sys.exit(1)
 
 

{cwms_cli-0.7.0 → cwms_cli-0.7.2}/cwmscli/commands/clob.py

@@ -9,7 +9,13 @@ import pandas as pd
 import requests
 from cwms import api as cwms_api
 
-from cwmscli.utils import get_api_key, has_invalid_chars, log_scoped_read_hint
+from cwmscli.utils import (
+    format_local_download_error,
+    get_api_key,
+    has_invalid_chars,
+    log_scoped_read_hint,
+    validate_default_download_dest,
+)
 
 
 def _join_api_url(api_root: str, path: str) -> str:
@@ -29,6 +35,10 @@ def _write_clob_content(content: str, dest: str) -> str:
     return dest
 
 
+def _default_download_dest(clob_id: str) -> str:
+    return validate_default_download_dest(clob_id, resource_name="Clob")
+
+
 def _clob_endpoint_id(clob_id: str) -> tuple[str, Optional[str]]:
     normalized = clob_id.upper()
     if has_invalid_chars(normalized):
@@ -198,7 +208,7 @@ def download_cmd(
                 content = str(payload)
         else:
             content = _get_special_clob_text(office=office, clob_id=query_id)
-        target = dest or bid
+        target = dest or _default_download_dest(bid)
         _write_clob_content(content, target)
         logging.info(f"Downloaded clob to: {target}")
     except requests.HTTPError as e:
@@ -213,14 +223,7 @@ def download_cmd(
         )
         sys.exit(1)
     except Exception as e:
-        logging.error(f"Failed to download: {e}")
-        log_scoped_read_hint(
-            api_key=resolved_api_key,
-            anonymous=anonymous,
-            office=office,
-            action="download",
-            resource="clob content",
-        )
+        logging.error(format_local_download_error(e, ""))
         sys.exit(1)
 
 

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

@@ -388,17 +388,23 @@ def _contextual_parse(
     current_send_code = "ZZZ"
     current_shef_loc: Optional[str] = None
     location_map: dict[str, str] = {}  # cwms_location_name -> shef_id
+    version_send_codes: dict[str, str] = {}  # cwms_version -> send_code
 
     for raw in text.splitlines():
         s = raw.strip()
         if not s or s.startswith("#"):
             continue
 
-        # TS * = SEND_CODE
-        m = re.match(r"^TS\s+\*\s*=\s*(\S+)\s*$", s, re.IGNORECASE)
+        # TS * = SEND_CODE  or  TS VersionName = SEND_CODE
+        m = re.match(r"^TS\s+(\S+)\s*=\s*(\S+)\s*$", s, re.IGNORECASE)
         if m:
-            current_send_code = m.group(1)
-            log.debug("Send code → %s", current_send_code)
+            ts_key, ts_val = m.group(1), m.group(2)
+            if ts_key == "*":
+                current_send_code = ts_val
+                log.debug("Send code → %s", ts_val)
+            else:
+                version_send_codes[ts_key] = ts_val
+                log.debug("Version send code: %s → %s", ts_key, ts_val)
             continue
 
         # PE pattern = CODE[;units=UNIT]  (positional — update mappings in place)
@@ -458,6 +464,7 @@ def _contextual_parse(
         cwms_location = cwms_parts[0]
         cwms_parameter = cwms_parts[1]
         cwms_duration = cwms_parts[4]
+        cwms_version = cwms_parts[5]
 
         # Resolve SHEF location
         #   1. Exact match in location_map
@@ -491,10 +498,12 @@ def _contextual_parse(
                     shef_loc = mapped_value
         if not shef_loc:
             shef_loc = current_shef_loc
-
         if not shef_loc:
-            log.warning("No SHEF location found for TSID: %s — skipping.", tsid_str)
-            continue
+            shef_loc = cwms_location
+            log.debug(
+                "No LOCATION mapping for %s — using CWMS location as SHEF ID",
+                cwms_location,
+            )
 
         # Resolve PE code (first matching rule wins)
         pe_code = _resolve_pe_code(cwms_parameter, pe_mappings)
@@ -511,12 +520,13 @@ def _contextual_parse(
         if not units and pe_code in pe_units:
             units = pe_units[pe_code]
 
+        send_code = version_send_codes.get(cwms_version, current_send_code)
         entry = {
             "tsid": tsid_str,
             "shef_loc": shef_loc,
             "pe_code": pe_code,
             "duration": str(duration_value),
-            "send_code": current_send_code,
+            "send_code": send_code,
         }
         if units:
             entry["units"] = units

{cwms_cli-0.7.0 → cwms_cli-0.7.2}/cwmscli/utils/__init__.py

@@ -1,4 +1,5 @@
 import logging as py_logging
+import re
 import time
 from pathlib import Path
 from typing import Optional, Union
@@ -235,6 +236,66 @@ def log_scoped_read_hint(
     )
 
 
+def format_local_download_error(error: Exception, docs_url: str) -> str:
+    if isinstance(error, (OSError, ValueError)):
+        message = (
+            f"{colors.c('Failed to download:', 'red', bright=True)} {error}. "
+            f"If this is a local destination/path issue, pass "
+            f"{colors.c('--dest', 'cyan', bright=True)} explicitly."
+        )
+        if docs_url:
+            message = (
+                f"{message} {colors.c('Docs:', 'blue', bright=True)} "
+                f"{colors.c(docs_url, 'blue', bright=True)}"
+            )
+        return message
+    return f"{colors.c('Failed to download:', 'red', bright=True)} {error}"
+
+
+def validate_default_download_dest(
+    raw_id: str,
+    *,
+    resource_name: str,
+    docs_url: str = "",
+) -> str:
+    if raw_id is None:
+        raise ValueError(
+            f"{resource_name} ID must include a non-root destination name. "
+            f"Pass --dest explicitly if needed."
+        )
+
+    if raw_id.startswith("//") or raw_id.startswith("\\\\"):
+        raise ValueError(
+            f"{resource_name} ID must resolve to a relative local path. "
+            f"Pass --dest explicitly if needed."
+        )
+
+    target = raw_id.lstrip("/\\")
+    if not target:
+        message = (
+            f"{resource_name} ID must include a non-root destination name. "
+            f"Pass --dest explicitly if needed."
+        )
+        if docs_url:
+            message = f"{message} Docs: {docs_url}"
+        raise ValueError(message)
+
+    if re.match(r"^[A-Za-z]:", target):
+        raise ValueError(
+            f"{resource_name} ID must resolve to a relative local path. "
+            f"Pass --dest explicitly if needed."
+        )
+
+    parts = re.split(r"[\\/]", target)
+    if any(part in {"", ".", ".."} for part in parts):
+        raise ValueError(
+            f"{resource_name} ID must resolve to a relative local path. "
+            f"Pass --dest explicitly if needed."
+        )
+
+    return target
+
+
 def common_api_options(f):
     f = log_level_option(f)
     f = office_option(f)

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

@@ -2,7 +2,7 @@
 name = "cwms-cli"
 repository = "https://github.com/HydrologicEngineeringCenter/cwms-cli"
 
-version = "0.7.0"
+version = "0.7.2"
 
 
 packages = [