datatrail-cli 0.10.0__tar.gz → 0.10.1__tar.gz

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.10.1](https://github.com/CHIMEFRB/datatrail-cli/compare/v0.10.0...v0.10.1) (2026-03-02)
+
+
+### Bug Fixes
+
+* **cli:** canfar status checks ([7f9df34](https://github.com/CHIMEFRB/datatrail-cli/commit/7f9df349ceeebb1caa7c1c2582cd3d1c54e8ec09))
+
 ## [0.10.0](https://github.com/CHIMEFRB/datatrail-cli/compare/v0.9.3...v0.10.0) (2026-02-20)
 
 

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datatrail-cli
-Version: 0.10.0
+Version: 0.10.1
 Summary: CHIME/FRB Datatrail CLI
 Author: CHIME FRB Project Office
 Author-email: Tarik Zegmott <tarik.zegmott@mcgill.ca>
@@ -18,7 +18,7 @@ Requires-Dist: mergedeep>=1.3.4
 Requires-Dist: pyaml>=21.10.1
 Requires-Dist: requests>=2.29.0
 Requires-Dist: rich>=13.3.5
-Requires-Dist: tenacity>=9.0.0
+Requires-Dist: tenacity>=8.0.0
 Description-Content-Type: text/markdown
 
 <div align="center">

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/dtcli/ps.py

@@ -12,7 +12,7 @@ from rich.table import Table
 from dtcli.ls import list
 from dtcli.src import functions
 from dtcli.utilities import cadcclient
-from dtcli.utilities.utilities import set_log_level, validate_scope
+from dtcli.utilities.utilities import check_canfar_status, set_log_level, validate_scope
 
 logger = logging.getLogger("ps")
 
@@ -68,15 +68,7 @@ def ps(
         return None
 
     # Check Canfar status.
-    minoc_up, luskan_up = cadcclient.status()
-    if not minoc_up:
-        error_console.print(
-            "Either Minoc is down or certificate is invalid.", style="bold yellow"
-        )
-    elif not luskan_up:
-        error_console.print(
-            "Either Luskan is down or certificate is invalid.", style="bold yellow"
-        )
+    check_canfar_status(error_console)
 
     try:
         files, policies = functions.ps(scope, dataset, verbose, quiet)

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/dtcli/pull.py

@@ -11,7 +11,7 @@ from rich.prompt import Confirm
 from dtcli.config import procure
 from dtcli.src.functions import find_missing_dataset_files, get_files
 from dtcli.utilities import cadcclient
-from dtcli.utilities.utilities import set_log_level, validate_scope
+from dtcli.utilities.utilities import check_canfar_status, set_log_level, validate_scope
 
 logger = logging.getLogger("pull")
 
@@ -110,15 +110,10 @@ def pull(  # noqa: C901
         return None
 
     # Check Canfar status.
-    minoc_up, luskan_up = cadcclient.status()
+    minoc_up, luskan_up = check_canfar_status(error_console)
+
     if not minoc_up:
-        error_console.print(
-            "Either Minoc is down or certificate is invalid.", style="bold yellow"
-        )
-    elif not luskan_up:
-        error_console.print(
-            "Either Luskan is down or certificate is invalid.", style="bold yellow"
-        )
+        return None
 
     # Find files missing from localhost.
     console.print(f"\nSearching for files for {dataset} {scope}...\n")

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/dtcli/scout.py

@@ -13,7 +13,7 @@ from rich.table import Table
 from dtcli.config import procure
 from dtcli.ls import list as ls
 from dtcli.utilities import cadcclient
-from dtcli.utilities.utilities import set_log_level, validate_scope
+from dtcli.utilities.utilities import check_canfar_status, set_log_level, validate_scope
 
 logger = logging.getLogger("scout")
 
@@ -79,15 +79,7 @@ def scout(  # noqa: C901
         return {"error": "No config. Create one with `datatrail config init`."}
 
     # Check Canfar status.
-    minoc_up, luskan_up = cadcclient.status()
-    if not minoc_up:
-        error_console.print(
-            "Either Minoc is down or certificate is invalid.", style="bold yellow"
-        )
-    elif not luskan_up:
-        error_console.print(
-            "Either Luskan is down or certificate is invalid.", style="bold yellow"
-        )
+    check_canfar_status(error_console)
 
     # Scout dataset.
     endpoint = (

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/dtcli/utilities/cadcclient.py

@@ -422,8 +422,8 @@ def status(
             else:
                 raise TypeError
         except HTTPError as error:
-            logger.error(error)
-            logger.error(f"{url.split('/')[3]} is down.")
+            logger.warning(error)
+            logger.warning(f"{url.split('/')[3]} is down.")
         except TypeError:
             logger.error("Canfar certificate is not valid.")
     return minoc_status, luskan_status

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/dtcli/utilities/utilities.py

@@ -2,10 +2,13 @@
 
 import json
 import logging
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Tuple, Union
 
 import requests
 from requests.models import Response
+from rich.console import Console
+
+from dtcli.utilities import cadcclient
 
 try:
     from packaging.version import parse
@@ -133,3 +136,26 @@ def cli_is_latest_release() -> bool:
         return current_version == get_latest_released_version()
     except (ConnectionError, PackageNotFoundError):
         return True
+
+
+def check_canfar_status(console: Console) -> Tuple[bool, bool]:
+    """Checks the status of Luskan and Minoc.
+
+    Args:
+        console: Console to print status messages to.
+
+    Returns:
+        Tuple[bool, bool]: Status of Minoc and Luskan, respectively.
+    """
+    # Check Canfar status.
+    minoc_up, luskan_up = cadcclient.status()
+    if not minoc_up:
+        console.print(":warning: Minoc is down!", style="bold yellow")
+    if not luskan_up:
+        console.print(":warning: Luskan is down!", style="bold yellow")
+    if not minoc_up or not luskan_up:
+        console.print(
+            "See https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/en/status/ for service availability.",  # noqa: E501
+            style="bold yellow",
+        )
+    return minoc_up, luskan_up

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/poetry.lock

@@ -262,7 +262,7 @@ description = "Foreign Function Interface for Python calling C code."
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
-markers = "python_version >= \"3.9\" and platform_python_implementation != \"PyPy\""
+markers = "python_full_version >= \"3.9.0\" and platform_python_implementation != \"PyPy\""
 files = [
     {file = "cffi-2.0.0-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:0cf2d91ecc3fcc0625c2c530fe004f82c110405f101548512cce44322fa8ac44"},
     {file = "cffi-2.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f73b96c41e3b2adedc34a7356e64c8eb96e03a3782b535e043a986276ce12a49"},
@@ -970,8 +970,8 @@ files = [
 
 [package.dependencies]
 cffi = [
-    {version = ">=1.14", markers = "python_full_version == \"3.8.*\" and platform_python_implementation != \"PyPy\""},
     {version = ">=2.0.0", markers = "python_full_version >= \"3.9.0\" and platform_python_implementation != \"PyPy\""},
+    {version = ">=1.14", markers = "python_full_version == \"3.8.*\" and platform_python_implementation != \"PyPy\""},
 ]
 typing-extensions = {version = ">=4.13.2", markers = "python_full_version < \"3.11.0\""}
 
@@ -1050,7 +1050,7 @@ description = "Backport of PEP 654 (exception groups)"
 optional = false
 python-versions = ">=3.7"
 groups = ["dev"]
-markers = "python_version < \"3.11\""
+markers = "python_version <= \"3.10\""
 files = [
     {file = "exceptiongroup-1.3.1-py3-none-any.whl", hash = "sha256:a7a39a3bd276781e98394987d3a5701d0c4edffb633bb7a5144577f82c773598"},
     {file = "exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219"},
@@ -2392,7 +2392,7 @@ description = "C parser in Python"
 optional = false
 python-versions = ">=3.8"
 groups = ["main"]
-markers = "platform_python_implementation != \"PyPy\" and python_version < \"3.10\" and (python_full_version == \"3.8.*\" or implementation_name != \"PyPy\")"
+markers = "platform_python_implementation != \"PyPy\" and (python_full_version == \"3.8.*\" or implementation_name != \"PyPy\") and python_version < \"3.10\""
 files = [
     {file = "pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934"},
     {file = "pycparser-2.23.tar.gz", hash = "sha256:78816d4f24add8f10a06d6f05b4d424ad9e96cfebf68a4ddc99c65c0720d00c2"},
@@ -3050,7 +3050,7 @@ files = [
     {file = "typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"},
     {file = "typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466"},
 ]
-markers = {main = "python_version >= \"3.9\" and (platform_python_implementation != \"PyPy\" or python_version >= \"3.10\") and python_version < \"3.13\"", dev = "python_version >= \"3.9\" and platform_python_implementation != \"PyPy\" or python_version >= \"3.10\"", docs = "python_full_version >= \"3.9.0\" and platform_python_implementation != \"PyPy\" and python_version < \"3.10\""}
+markers = {main = "python_version >= \"3.9\" and (python_version >= \"3.10\" or platform_python_implementation != \"PyPy\") and python_version < \"3.13\"", dev = "python_version >= \"3.9\" and platform_python_implementation != \"PyPy\" or python_version >= \"3.10\"", docs = "python_full_version >= \"3.9.0\" and platform_python_implementation != \"PyPy\" and python_version < \"3.10\""}
 
 [[package]]
 name = "urllib3"
@@ -3105,8 +3105,8 @@ files = [
 [package.dependencies]
 distlib = ">=0.3.7,<1"
 filelock = [
-    {version = ">=3.16.1,<=3.19.1", markers = "python_version < \"3.10\""},
     {version = ">=3.24.2,<4", markers = "python_version >= \"3.10\""},
+    {version = ">=3.16.1,<=3.19.1", markers = "python_version < \"3.10\""},
 ]
 platformdirs = ">=3.9.1,<5"
 typing-extensions = {version = ">=4.13.2", markers = "python_version < \"3.11\""}
@@ -3253,4 +3253,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.8.1,!=3.9.0,!=3.9.1,<4.0"
-content-hash = "0e3d6eead81d1d533bb7cfa298fd2a0d28303ea1e0e06bd6b0ac1ed90308ecf1"
+content-hash = "12fdbdc9d8e0a115ee7beab667d6543ba733bde3c10fe169eaf9321a8d7801cb"

{datatrail_cli-0.10.0 → datatrail_cli-0.10.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datatrail-cli"
-version = "0.10.0"
+version = "0.10.1"
 description = "CHIME/FRB Datatrail CLI"
 authors = [
   { name = "CHIME FRB Project Office" },
@@ -21,7 +21,7 @@ dependencies = [
   "dill>=0.3.6",
   "lxml>=4.9.2",
   "click-aliasing>=1.0.0",
-  "tenacity>=9.0.0",
+  "tenacity>=8.0.0",
 ]
 
 [project.scripts]