cwms-cli 0.8.0__tar.gz → 0.9.0__tar.gz

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwms-cli
-Version: 0.8.0
+Version: 0.9.0
 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
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Provides-Extra: dss
 Requires-Dist: click (>=8.1.8,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
@@ -89,8 +90,10 @@ devcontainer exec --workspace-folder . poetry run pytest -q
 
 The container installs project dependencies with Poetry and uses
 `/home/vscode/.venv`, so it does not reuse a host operating system's `.venv`.
-Poetry itself is kept in a separate `/opt/poetry` environment. Use the container
-for changes involving time zones, paths, native libraries, or other
-operating-system-dependent behavior. Standard Python 3.9 and Python 3.12
-installations remain covered by the existing CI matrix.
+Poetry itself is kept in a separate `/opt/poetry` environment. The workspace
+root is also added to `PYTHONPATH`, so the checked-out source and local test
+modules are available throughout a Codespace without copying them into the
+image. Use the container for changes involving time zones, paths, native
+libraries, or other operating-system-dependent behavior. Standard Python 3.9
+and Python 3.12 installations remain covered by the existing CI matrix.
 

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/README.md

@@ -60,7 +60,9 @@ devcontainer exec --workspace-folder . poetry run pytest -q
 
 The container installs project dependencies with Poetry and uses
 `/home/vscode/.venv`, so it does not reuse a host operating system's `.venv`.
-Poetry itself is kept in a separate `/opt/poetry` environment. Use the container
-for changes involving time zones, paths, native libraries, or other
-operating-system-dependent behavior. Standard Python 3.9 and Python 3.12
-installations remain covered by the existing CI matrix.
+Poetry itself is kept in a separate `/opt/poetry` environment. The workspace
+root is also added to `PYTHONPATH`, so the checked-out source and local test
+modules are available throughout a Codespace without copying them into the
+image. Use the container for changes involving time zones, paths, native
+libraries, or other operating-system-dependent behavior. Standard Python 3.9
+and Python 3.12 installations remain covered by the existing CI matrix.

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/__main__.py

@@ -64,6 +64,15 @@ from cwmscli.utils.version_cli import show_version_and_exit
     default=False,
     help="Suppress routine output; warnings and errors still print.",
 )
+@click.option(
+    "--non-interactive/--interactive",
+    default=None,
+    envvar="CWMS_CLI_NON_INTERACTIVE",
+    help=(
+        "Disable prompts. Automatically enabled when standard input is not a "
+        "terminal or a CI environment is detected."
+    ),
+)
 @click.pass_context
 def cli(
     ctx: click.Context,
@@ -71,6 +80,7 @@ def cli(
     no_color: bool,
     log_level: str,
     quiet: bool,
+    non_interactive: Optional[bool],
 ) -> None:
     level = getattr(logging, log_level.upper(), logging.INFO)
     level = apply_logging_policies(
@@ -83,7 +93,7 @@ def cli(
 
     # Disable colors if stdout isn't a TTY (piped/redirected)
     tty = sys.stdout.isatty()
-    color = (not no_color) and tty
+    color = (not no_color) and ("NO_COLOR" not in os.environ) and tty
     setup_logging(LoggingConfig(level=level, log_file=log_file, color=color))
 
 
@@ -126,6 +136,15 @@ def main() -> None:
             if server_stack_trace is not None:
                 click.echo(format_cda_stack_trace(server_stack_trace), err=True)
                 raise SystemExit(e.exit_code)
+        else:
+            if is_cert_verify_error(e):
+                click.echo(ssl_help_text(), err=True)
+                raise SystemExit(2)
+            friendly_error = to_user_facing_error(e)
+            if friendly_error is not None:
+                logging.debug("Suppressed traceback for CLI exception", exc_info=e)
+                friendly_error.show()
+                raise SystemExit(friendly_error.exit_code)
         e.show()
         raise SystemExit(e.exit_code)
     except Exception as e:
@@ -134,10 +153,6 @@ def main() -> None:
         debug = debug or logging.getLogger().isEnabledFor(logging.DEBUG)
 
         if is_cert_verify_error(e) and not debug:
-            # Keep this short, no stack trace.
-            logging.error(
-                "SSL certificate verification failed while connecting to the server."
-            )
             click.echo(ssl_help_text(), err=True)
             raise SystemExit(2)
 

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/blob.py

@@ -20,6 +20,10 @@ from cwmscli.utils import (
 )
 from cwmscli.utils.click_help import DOCS_BASE_URL
 from cwmscli.utils.deps import requires
+from cwmscli.utils.friendly_errors import (
+    is_actionable_service_error,
+    is_fatal_service_error,
+)
 
 # used to rebuild data URL for images
 DATA_URL_RE = re.compile(r"^data:(?P<mime>[^;]+);base64,(?P<data>.+)$", re.I | re.S)
@@ -122,7 +126,9 @@ def _default_download_dest(blob_id: str) -> str:
 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)
-    except Exception:
+    except Exception as error:
+        if is_fatal_service_error(error):
+            raise
         return None
 
     df = getattr(result, "df", result)
@@ -222,12 +228,11 @@ def store_blob(**kwargs):
         cwms.store_blobs(blob, fail_if_exists=kwargs.get("overwrite"))
         logging.info(f"Successfully stored blob with ID: {blob_id}")
         logging.info(f"View: {view_url}")
-    except requests.HTTPError as e:
-        # Include response text when available
-        detail = getattr(e.response, "text", "") or str(e)
-        logging.error(f"Failed to store blob (HTTP): {detail}")
-        sys.exit(1)
+    except requests.HTTPError:
+        raise
     except Exception as e:
+        if is_actionable_service_error(e):
+            raise
         logging.error(f"Failed to store blob: {e}")
         sys.exit(1)
 
@@ -257,11 +262,11 @@ def retrieve_blob(**kwargs):
             media_type_hint=_blob_media_type(cwms, kwargs.get("office"), blob_id),
         )
         logging.info(f"Downloaded blob to: {blob_id}")
-    except requests.HTTPError as e:
-        detail = getattr(e.response, "text", "") or str(e)
-        logging.error(f"Failed to retrieve blob (HTTP): {detail}")
-        sys.exit(1)
+    except requests.HTTPError:
+        raise
     except Exception as e:
+        if is_actionable_service_error(e):
+            raise
         logging.error(f"Failed to retrieve blob: {e}")
         sys.exit(1)
 
@@ -279,11 +284,11 @@ def delete_blob(**kwargs):
             blob_id=kwargs.get("blob_id").upper(),
         )
         logging.info(f"Successfully deleted blob with ID: {blob_id}")
-    except requests.HTTPError as e:
-        details = getattr(e.response, "text", "") or str(e)
-        logging.error(f"Failed to delete blob (HTTP): {details}")
-        sys.exit(1)
+    except requests.HTTPError:
+        raise
     except Exception as e:
+        if is_actionable_service_error(e):
+            raise
         logging.error(f"Failed to delete blob: {e}")
         sys.exit(1)
 
@@ -550,6 +555,8 @@ def upload_cmd(
             )
             logging.info(f"View: {view_url}")
         except requests.HTTPError as e:
+            if is_fatal_service_error(e):
+                raise
             failures += 1
             detail = getattr(e.response, "text", "") or str(e)
             logging.error(
@@ -560,6 +567,8 @@ def upload_cmd(
                 )
             )
         except Exception as e:
+            if is_fatal_service_error(e):
+                raise
             failures += 1
             logging.error(
                 colors.c(
@@ -619,9 +628,7 @@ def download_cmd(
             media_type_hint=_blob_media_type(cwms, office, bid),
         )
         logging.info(f"Downloaded blob to: {saved_target}")
-    except requests.HTTPError as e:
-        detail = getattr(e.response, "text", "") or str(e)
-        logging.error(f"Failed to download (HTTP): {detail}")
+    except requests.HTTPError:
         log_scoped_read_hint(
             credential_kind=credential_kind,
             anonymous=anonymous,
@@ -629,8 +636,17 @@ def download_cmd(
             action="download",
             resource="blob content",
         )
-        sys.exit(1)
+        raise
     except Exception as e:
+        if is_actionable_service_error(e):
+            log_scoped_read_hint(
+                credential_kind=credential_kind,
+                anonymous=anonymous,
+                office=office,
+                action="download",
+                resource="blob content",
+            )
+            raise
         logging.error(format_local_download_error(e, BLOB_DOCS_URL))
         # Local write/path failures are not CDA credential scope problems.
         if not isinstance(e, (OSError, ValueError)):

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/clob.py

@@ -19,6 +19,7 @@ from cwmscli.utils import (
     validate_default_download_dest,
 )
 from cwmscli.utils.click_help import DOCS_BASE_URL
+from cwmscli.utils.friendly_errors import is_actionable_service_error
 
 CLOB_DOCS_URL = f"{DOCS_BASE_URL}/cli/clob.html"
 
@@ -187,11 +188,11 @@ def upload_cmd(
             )
         else:
             logging.info(f"View: {view_url}")
-    except requests.HTTPError as e:
-        detail = getattr(e.response, "text", "") or str(e)
-        logging.error(f"Failed to upload (HTTP): {detail}")
-        sys.exit(1)
+    except requests.HTTPError:
+        raise
     except Exception as e:
+        if is_actionable_service_error(e):
+            raise
         logging.error(f"Failed to upload: {e}")
         sys.exit(1)
 
@@ -231,9 +232,7 @@ def download_cmd(
         target = dest or _default_download_dest(bid)
         _write_clob_content(content, target)
         logging.info(f"Downloaded clob to: {target}")
-    except requests.HTTPError as e:
-        detail = getattr(e.response, "text", "") or str(e)
-        logging.error(f"Failed to download (HTTP): {detail}")
+    except requests.HTTPError:
         log_scoped_read_hint(
             credential_kind=credential_kind,
             anonymous=anonymous,
@@ -241,8 +240,17 @@ def download_cmd(
             action="download",
             resource="clob content",
         )
-        sys.exit(1)
+        raise
     except Exception as e:
+        if is_actionable_service_error(e):
+            log_scoped_read_hint(
+                credential_kind=credential_kind,
+                anonymous=anonymous,
+                office=office,
+                action="download",
+                resource="clob content",
+            )
+            raise
         logging.error(format_local_download_error(e, CLOB_DOCS_URL))
         sys.exit(1)
 

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/commands_cwms.py

@@ -23,6 +23,7 @@ from cwmscli.utils import (
 )
 from cwmscli.utils.auth import DEFAULT_REDIRECT_HOST, DEFAULT_REDIRECT_PORT
 from cwmscli.utils.deps import requires
+from cwmscli.utils.interaction import is_non_interactive
 from cwmscli.utils.update import (
     build_update_package_spec,
     get_update_environment,
@@ -455,6 +456,12 @@ def update_cli_cmd(target_version: Optional[str], pre: bool, yes: bool) -> None:
         cmd.append("--pre")
 
     if not yes:
+        if is_non_interactive():
+            raise click.ClickException(
+                "The update command requires confirmation, but prompting is "
+                "disabled in non-interactive mode. Re-run with --yes to authorize "
+                "the update."
+            )
         proceed = click.confirm(
             "Proceed with updating cwms-cli in this environment via pip?",
             default=True,
@@ -527,15 +534,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
@@ -748,14 +753,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():
@@ -1010,7 +1013,7 @@ def users_roles_list_user(user_name, office, api_root, api_key, api_key_loc):
     multiple=True,
     default=None,
     callback=csv_to_list,
-    help="enter admin, readonly, readwrite, or individual role name(s) to add. Repeat the option or pass a comma/pipe-separated list.",
+    help="enter admin, readonly, readwrite, batchadmin, or individual role name(s) to add. Repeat the option or pass a comma/pipe-separated list.",
 )
 @requires(reqs.cwms)
 def users_roles_add(office, api_root, api_key, api_key_loc, user_name, roles):

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/csv2cwms/writer.py

@@ -2,6 +2,8 @@ import traceback
 
 import cwms
 
+from cwmscli.utils.friendly_errors import is_fatal_service_error
+
 
 def write_timeseries(
     file_name, ts_data, config_item, office, dry_run, config_path, logger
@@ -26,6 +28,8 @@ def write_timeseries(
                 )
                 logger.info(f"Stored {ts_object['name']} values")
         except Exception as e:
+            if is_fatal_service_error(e):
+                raise
             logger.error(
                 f"Error posting data for {file_name}: {e}\n{traceback.format_exc()}"
             )

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/env.py

@@ -16,6 +16,9 @@ from cwmscli.utils.env_store import (
     load_env,
     save_env,
 )
+from cwmscli.utils.friendly_errors import to_user_facing_error
+from cwmscli.utils.interaction import is_non_interactive
+from cwmscli.utils.ssl_errors import is_cert_verify_error, ssl_help_text
 
 SENSITIVE_KEYS = {"CDA_API_KEY"}
 
@@ -43,11 +46,16 @@ def _check_env(env_config: Dict[str, str]) -> Dict:
         resp = requests.get(url, timeout=5)
         latency_ms = int((time.monotonic() - t0) * 1000)
     except requests.RequestException as e:
+        if is_cert_verify_error(e):
+            error = ssl_help_text().strip()
+        else:
+            friendly = to_user_facing_error(e)
+            error = friendly.format_message() if friendly is not None else str(e)
         return {
             "reachable": False,
             "latency_ms": None,
             "auth": "skipped",
-            "error": str(e),
+            "error": error,
         }
 
     if resp.status_code >= 400:
@@ -69,12 +77,17 @@ def _check_env(env_config: Dict[str, str]) -> Dict:
 
     try:
         auth_resp = requests.get(url, headers={"Authorization": api_key}, timeout=5)
-    except requests.RequestException:
+    except requests.RequestException as e:
+        if is_cert_verify_error(e):
+            error = ssl_help_text().strip()
+        else:
+            friendly = to_user_facing_error(e)
+            error = friendly.format_message() if friendly is not None else str(e)
         return {
             "reachable": True,
             "latency_ms": latency_ms,
             "auth": "failed",
-            "error": None,
+            "error": error,
         }
 
     if auth_resp.status_code == 401:
@@ -82,7 +95,21 @@ def _check_env(env_config: Dict[str, str]) -> Dict:
             "reachable": True,
             "latency_ms": latency_ms,
             "auth": "failed",
-            "error": None,
+            "error": (
+                "CDA rejected the API key (HTTP 401). Update CDA_API_KEY in this "
+                "environment, then retry."
+            ),
+        }
+
+    if auth_resp.status_code == 403:
+        return {
+            "reachable": True,
+            "latency_ms": latency_ms,
+            "auth": "failed",
+            "error": (
+                "CDA recognized the credentials but denied access (HTTP 403). "
+                "Confirm the account's roles and office access."
+            ),
         }
 
     return {"reachable": True, "latency_ms": latency_ms, "auth": "ok", "error": None}
@@ -210,6 +237,8 @@ def show_cmd(check: bool):
                 auth_str = click.style("authenticated", fg="green")
             elif result["auth"] == "failed":
                 auth_str = click.style("auth failed", fg="red")
+                if result["error"]:
+                    auth_str += f" — {result['error']}"
 
             click.echo(f"    Connect:  {reach_str}")
             if auth_str:
@@ -227,6 +256,12 @@ def delete_cmd(env_name: str, yes: bool):
         cwms-cli env delete myenv
         cwms-cli env delete myenv --yes
     """
+    if not yes and is_non_interactive():
+        raise click.ClickException(
+            "Deleting an environment requires confirmation, but prompting is "
+            "disabled in non-interactive mode. Re-run with --yes to authorize "
+            "the deletion."
+        )
     if not yes and not click.confirm(f"Delete environment '{env_name}'?"):
         click.echo("Cancelled")
         return

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/shef/import_critfile.py

@@ -6,6 +6,7 @@ import cwms
 import pandas as pd
 
 from cwmscli.utils import init_cwms_session
+from cwmscli.utils.friendly_errors import is_fatal_service_error
 
 
 def import_shef_critfile(
@@ -97,6 +98,8 @@ def import_shef_critfile(
                 f'SUCCESS Stored timeseries ID {data["Timeseries ID"]} to {group_id}'
             )
         except Exception as error:
+            if is_fatal_service_error(error):
+                raise
             logging.error(
                 f'FAIL Data could not be stored to CWMS database for -->  {data["Timeseries ID"]},{data["Alias"]} error = {error}'
             )

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/shef/import_infile.py

@@ -50,6 +50,8 @@ from typing import Optional
 
 import pandas as pd
 
+from cwmscli.utils.friendly_errors import is_fatal_service_error
+
 try:
     import cwms
     import cwms.api as cwms_api
@@ -599,6 +601,8 @@ def _filter_existing_tsids(
             cwms.get_timeseries_identifier(ts_id=e["tsid"], office_id=office_id)
             valid.append(e)
         except Exception as exc:
+            if is_fatal_service_error(exc):
+                raise
             log.warning(
                 "Skipping missing TSID '%s' (%s)",
                 e["tsid"],
@@ -619,6 +623,8 @@ def _save(
         log.info("SUCCESS — group stored via store_timeseries_groups.")
         return
     except Exception as exc:
+        if is_fatal_service_error(exc):
+            raise
         log.warning(
             "store_timeseries_groups raised %s: %s — retrying with update ...",
             type(exc).__name__,
@@ -651,6 +657,8 @@ def store_group(
         _save(group_json, group_id, office_id, fail_if_exists)
         return
     except Exception as exc:
+        if is_fatal_service_error(exc):
+            raise
         if entries is None:
             raise
         log.warning(

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/commands/users.py

@@ -5,6 +5,7 @@ from typing import Optional, Union
 import click
 
 from cwmscli.utils import colors, init_cwms_session
+from cwmscli.utils.interaction import is_non_interactive
 
 
 def _format_table(headers: list[str], rows: list[list[str]]) -> str:
@@ -57,11 +58,45 @@ def _fetch_roles(cwms_module) -> list[str]:
         _handle_api_error(error, cwms_module)
 
 
+# Role shortcut expansions used by `_expand_role_shortcuts` and
+# referenced during validation so expanded roles are accepted even when the
+# CWMS role catalog returned by the API does not include all shortcut values.
+ROLE_SHORTCUTS: dict[str, list[str]] = {
+    "admin": [
+        "All Users",
+        "CWMS Users",
+        "TS ID Creator",
+        "CWMS User Admins",
+        "CWMS PD Users",
+        "Data Acquisition Mgr",
+    ],
+    "readonly": ["All Users", "CWMS Users"],
+    "readwrite": ["All Users", "CWMS Users", "TS ID Creator"],
+    "batchadmin": [
+        "All Users",
+        "CWMS Users",
+        "TS ID Creator",
+        "Data Acquisition Mgr",
+    ],
+}
+
+
 def _fetch_users(
     cwms_module, office=None, username_like=None, page_size: int = 5000
 ) -> list[dict]:
     users: list[dict] = []
 
+    # If a username_like filter was provided, ensure it is wrapped with
+    # leading and trailing wildcards so CDA receives a contains-style query.
+    if username_like:
+        _ul = str(username_like).strip()
+        if _ul:
+            if not _ul.startswith("*"):
+                _ul = "*" + _ul
+            if not _ul.endswith("*"):
+                _ul = _ul + "*"
+            username_like = _ul
+
     try:
         response = cwms_module.get_users(
             office_id=office, username_like=username_like, page_size=page_size
@@ -134,19 +169,13 @@ def _split_roles(
 
 
 def _expand_role_shortcuts(roles: list[str]) -> list[str]:
-    emap = {
-        "admin": ["All Users", "CWMS Users", "TS ID Creator", "CWMS User Admins"],
-        "readonly": ["All Users", "CWMS Users"],
-        "readwrite": ["All Users", "CWMS Users", "TS ID Creator"],
-    }
-
     expanded_roles: list[str] = []
     for role in roles:
         key = role.strip().casefold()
         if key == "all":
             expanded_roles.append(role)  # Keep "all" as is, handled elsewhere
-        elif key in emap:
-            expanded_roles.extend(emap[key])
+        elif key in ROLE_SHORTCUTS:
+            expanded_roles.extend(ROLE_SHORTCUTS[key])
         else:
             expanded_roles.append(role)
     return expanded_roles
@@ -325,6 +354,12 @@ def add_roles(
             f"{_cmd('cwms-cli users roles add')} interactively with no add-specific args."
         )
 
+    if not provided_user_name and not provided_roles and is_non_interactive():
+        raise click.ClickException(
+            "User role changes cannot prompt in non-interactive mode. Specify "
+            "both --user-name and --roles."
+        )
+
     cwms = _init_cwms(api_root, api_key, api_key_loc)
     users = _fetch_users(cwms)
     available_roles = _fetch_roles(cwms)
@@ -373,6 +408,12 @@ def delete_roles(
             f"{_cmd('cwms-cli users roles delete')} interactively with no delete-specific args."
         )
 
+    if not provided_user_name and not provided_roles and is_non_interactive():
+        raise click.ClickException(
+            "User role changes cannot prompt in non-interactive mode. Specify "
+            "both --user-name and --roles."
+        )
+
     cwms = _init_cwms(api_root, api_key, api_key_loc)
     users = _fetch_users(cwms, office)
     available_roles = _fetch_roles(cwms)

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/dss/transfer.py

@@ -7,6 +7,7 @@ from typing import Callable, Iterable, Optional, Protocol
 
 from cwmscli.dss.naming import ExportRule, ImportRule
 from cwmscli.utils import colors, init_cwms_session
+from cwmscli.utils.friendly_errors import is_fatal_service_error
 
 logger = logging.getLogger(__name__)
 
@@ -71,7 +72,9 @@ def transfer_all(
                     colors.c(str(timeseries.name), "cyan", bright=True),
                 )
             summary.transferred += 1
-        except Exception:
+        except Exception as error:
+            if is_fatal_service_error(error):
+                raise
             summary.failed += 1
             logger.exception("Failed to transfer %s", colors.err(str(identifier)))
     return summary

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/load/location/location_ids.py

@@ -8,6 +8,7 @@ import cwms
 import pandas as pd
 
 from cwmscli.utils import init_cwms_session
+from cwmscli.utils.friendly_errors import is_fatal_service_error
 from cwmscli.utils.links import CDA_REGEXP_GUIDE_URL
 
 logger = logging.getLogger(__name__)
@@ -89,6 +90,8 @@ def load_locations(
                 if verbose:
                     logger.info("%s", result)
         except Exception as e:
+            if is_fatal_service_error(e):
+                raise
             errors += 1
             click.echo(f"Error storing location {loc}: \n\t{e}", err=True)
 

{cwms_cli-0.8.0 → cwms_cli-0.9.0}/cwmscli/load/location/location_ids_bygroup.py

@@ -8,6 +8,7 @@ import cwms
 import pandas as pd
 
 from cwmscli.utils import init_cwms_session
+from cwmscli.utils.friendly_errors import is_fatal_service_error
 
 logger = logging.getLogger(__name__)
 
@@ -129,6 +130,8 @@ def copy_from_group(
             if verbose:
                 logger.info("\tStored successfully.")
         except Exception as e:
+            if is_fatal_service_error(e):
+                raise
             errors += 1
             click.echo(f"Error storing location {loc}: \n\t{e}", err=True)