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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datatrail-cli
-Version: 0.7.0
+Version: 0.7.2
 Summary: CHIME/FRB Datatrail CLI
 License: MIT
 Author: CHIME FRB Project Office

{datatrail_cli-0.7.0 → datatrail_cli-0.7.2}/dtcli/ps.py

@@ -66,6 +66,18 @@ def ps(
     except Exception as e:
         error_console.print(e)
         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"
+        )
+
     try:
         files, policies = functions.ps(scope, dataset, verbose, quiet)
         if isinstance(files, str) or isinstance(policies, str):

{datatrail_cli-0.7.0 → datatrail_cli-0.7.2}/dtcli/pull.py

@@ -10,7 +10,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.cadcclient import size
+from dtcli.utilities import cadcclient
 from dtcli.utilities.utilities import set_log_level, validate_scope
 
 logger = logging.getLogger("pull")
@@ -42,7 +42,7 @@ error_console = Console(stderr=True, style="bold red")
 @click.option("-q", "--quiet", is_flag=True, help="Set log level to ERROR.")
 @click.option("--force", "-f", is_flag=True, help="Do not prompt for confirmation.")
 @click.pass_context
-def pull(
+def pull(  # noqa: C901
     ctx: click.Context,
     scope: str,
     dataset: str,
@@ -97,6 +97,17 @@ def pull(
         error_console.print(e)
         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"
+        )
+
     # Find files missing from localhost.
     console.print(f"\nSearching for files for {dataset} {scope}...\n")
     files = find_missing_dataset_files(scope, dataset, directory, verbose)
@@ -107,11 +118,10 @@ def pull(
         console.print("No files found at minoc.", style="bold red")
         return None
     files_paths = [f.replace("cadc:CHIMEFRB", "") for f in files["missing"]]
-    to_download_size = 0.0
-    if len(files_paths) > 0:
+    if len(files_paths) > 0 and luskan_up:
         common_path = path.commonpath(["/" + f for f in files_paths])
         try:
-            to_download_size = size(common_path)
+            to_download_size = cadcclient.size(common_path)
         except SSLError:
             error_console.print(
                 """
@@ -120,6 +130,10 @@ Create one using 'cadc-get-cert -u <USERNAME>'.
 """
             )
             return None
+    elif not luskan_up:
+        to_download_size = -1
+    else:
+        to_download_size = 0
     console.print(
         f" - {len(files['existing'])} files found at {site}.",
         style="green",
@@ -128,10 +142,16 @@ Create one using 'cadc-get-cert -u <USERNAME>'.
         f" - {len(files['missing'])} files can be downloaded from minoc.",
         style="yellow",
     )
-    console.print(
-        f"     - Size to download: {to_download_size:.2f} GB.\n",
-        style="yellow",
-    )
+    if luskan_up:
+        console.print(
+            f"     - Size to download: {to_download_size:.2f} GB.\n",
+            style="yellow",
+        )
+    else:
+        console.print(
+            "     - Size to download: [red]Unable to query Luskan[/red].",
+            style="yellow",
+        )
 
     # Confirm download.
     if force:

{datatrail_cli-0.7.0 → datatrail_cli-0.7.2}/dtcli/scout.py

@@ -22,15 +22,15 @@ error_console = Console(stderr=True, style="bold red")
 
 
 @click.command(name="scout", help="Scout a dataset.")
-@click.argument("dataset", required=True, type=click.STRING, nargs=1)
 @click.argument("scopes", required=False, type=click.STRING, nargs=-1)
+@click.argument("dataset", required=True, type=click.STRING, nargs=1)
 @click.option("-v", "--verbose", count=True, help="Verbosity: v=INFO, vv=DEBUG.")
 @click.option("-q", "--quiet", is_flag=True, help="Set log level to ERROR.")
 @click.pass_context
 def scout(  # noqa: C901
     ctx: click.Context,
-    dataset: str,
     scopes: List[str],
+    dataset: str,
     verbose: int,
     quiet: bool,
 ):
@@ -38,8 +38,8 @@ def scout(  # noqa: C901
 
     Args:
         ctx (click.Context): Click context.
-        dataset (str): Name of dataset.
         scopes (List[str]): Scopes of dataset.
+        dataset (str): Name of dataset.
         verbose (int): Verbosity: v=INFO, vv=DUBUG.
         quiet (bool): Set log level to ERROR.
 
@@ -49,8 +49,8 @@ def scout(  # noqa: C901
     # Set logging level.
     set_log_level(logger, verbose, quiet)
     logger.debug("`scout` called with:")
-    logger.debug(f"dataset: {dataset} [{type(dataset)}]")
     logger.debug(f"scopes: {scopes} [{type(scopes)}]")
+    logger.debug(f"dataset: {dataset} [{type(dataset)}]")
     logger.debug(f"verbose: {verbose} [{type(verbose)}]")
     logger.debug(f"quiet: {quiet} [{type(quiet)}]")
 
@@ -78,6 +78,17 @@ 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"
+        )
+
     # Scout dataset.
     endpoint = (
         f"/query/dataset/scout?name={dataset}"
@@ -113,6 +124,10 @@ def scout(  # noqa: C901
             error_console.print("Query failed.")
             error_console.print(error)
             return None
+        except Exception as error:
+            error_console.print("Query failed.")
+            error_console.print(error)
+            return None
         data[scope]["observed"]["minoc"] = count
 
         keys_missing_in_observed = list(

{datatrail_cli-0.7.0 → datatrail_cli-0.7.2}/dtcli/utilities/cadcclient.py

@@ -9,9 +9,11 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import cadcutils
 import dill
+import requests
 from cadcdata import StorageInventoryClient
 from cadctap import CadcTapClient
 from cadcutils import net
+from requests.exceptions import HTTPError
 from rich.traceback import install
 
 from dtcli.config import procure
@@ -364,3 +366,42 @@ def query(
     content = buffer.getvalue()
     sys.stdout = sys.__stdout__
     return [line.split(",") for line in content.split("\n")]
+
+
+def status(
+    certfile: Optional[str] = None,
+) -> Tuple[bool, bool]:
+    """Check the status of Minoc.
+
+    Args:
+        certfile: Canfar certificate file.
+
+    Returns:
+        bool: True if Minoc is up, False otherwise.
+    """
+    urls: List[str] = [
+        "https://ws-uv.canfar.net/minoc/capabilities",
+        "https://ws-uv.canfar.net/luskan/capabilities",
+    ]
+    if not certfile:
+        certfile = procure(key="vospace_certfile")
+    minoc_status = False
+    luskan_status = False
+    for index, url in enumerate(urls):
+        response = requests.get(url, cert=certfile, allow_redirects=True)
+        try:
+            response.raise_for_status()
+            authorised = response.headers.get("x-vo-authenticated")
+            if isinstance(authorised, str):
+                if index == 0:
+                    minoc_status = True
+                else:
+                    luskan_status = True
+            else:
+                raise TypeError
+        except HTTPError as error:
+            logger.error(error)
+            logger.error(f"{url.split('/')[3]} is down.")
+        except TypeError:
+            logger.error("Canfar certificate is not valid.")
+    return minoc_status, luskan_status

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datatrail-cli"
-version = "0.7.0"
+version = "0.7.2"
 description = "CHIME/FRB Datatrail CLI"
 authors = ["CHIME FRB Project Office"]
 license = "MIT"