Moved link formatting

Author: Vebop

notebooks_tsqr/NightLog.ipynb

@@ -17,11 +17,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "1",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Parameters.\n",
@@ -52,11 +48,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "2",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# IMPORT everything\n",
@@ -84,19 +76,15 @@
     "from lsst.ts.logging_and_reporting.all_reports import AllReports\n",
     "import lsst.ts.logging_and_reporting.utils as ut\n",
     "import lsst.ts.logging_and_reporting.time_logs as tl\n",
-    "from lsst.ts.logging_and_reporting.reports import md, mdlist, mdpathlink\n",
+    "from lsst.ts.logging_and_reporting.reports import md, mdlist, mdpathlink, mdlink\n",
     "from lsst.ts.logging_and_reporting.reports import html_draft, html_beta"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "id": "3",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Set default env to \"usdf\" and try before PUSH to repo.\n",
@@ -110,11 +98,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "4",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Validate parameters, return usable ones\n",
@@ -143,11 +127,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "5",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Read records from (almost) all sources\n",
@@ -168,11 +148,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "6",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "instrum_str = \", \".join(list(allsrc.exp_src.instruments.keys()))\n",
@@ -220,11 +196,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "9",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "display(allsrc.alm_src.dataframe)\n",
@@ -330,9 +302,7 @@
   {
    "cell_type": "markdown",
    "id": "18",
-   "metadata": {
-    "jp-MarkdownHeadingCollapsed": true
-   },
+   "metadata": {},
    "source": [
     "## Links to related resources <font style=\"background-color:green; color:white; font-size:20px\">BETA</font>\n",
     "These tools were created outside of the TSSW Logging and Reporting group.  For more information about any of these, please see the respective tool owner."
@@ -354,16 +324,21 @@
     "nightsum_link_url = f\"{server}/times-square/github/lsst/schedview_notebooks/nightly/scheduler-nightsum?day_obs={min_date.date()}&visit_origin=lsstcomcam\"\n",
     "nightsum_link_string = f\"link to nightsum for day_obs = {min_date.date()}\"\n",
     "\n",
+    "scriptqueue_url = f\"https://usdf-rsp-dev.slac.stanford.edu/times-square/github/lsst/schedview_notebooks/nightly/EvaluateScriptQueue?day_obs_min={min_date.date()}&day_obs_max={max_date.date()}&time_order=newest+first&show_salIndex=all&ts_hide_code=1\"\n",
+    "\n",
     "md(\n",
     "    f\"\"\"\n",
     "#### DDV part of RubinTV\n",
-    "  {ut.link_new_tab(DDV, 'RubinTV Visualization')}\n",
+    "  {mdlink(DDV, 'RubinTV Visualization')}\n",
     "\n",
     "#### Chronograf links\n",
-    "{ut.link_new_tab(f'{server}/chronograf','Chronograph main page on {server}')}\n",
+    "{mdlink(f'{server}/chronograf','Chronograph main page on {server}')}\n",
     "\n",
     "#### Scheduler Analysis Nightly Summary\n",
-    "{ut.link_new_tab(nightsum_link_url, nightsum_link_string)}\n",
+    "{mdlink(nightsum_link_url, nightsum_link_string)}\n",
+    "\n",
+    "### Integrated Narrative Log + EFD\n",
+    "{mdlink(scriptqueue_url, f'ScriptQueue Miner for {min_date.date()}')}\n",
     "\n",
     "\"\"\"\n",
     ")"
@@ -383,11 +358,7 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "21",
-   "metadata": {
-    "jupyter": {
-     "source_hidden": true
-    }
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "# Exposure Tally (v2)\n",
@@ -477,7 +448,7 @@
     "if allsrc.urls:\n",
     "    text = \"\"\n",
     "    for url in allsrc.urls:\n",
-    "        text += f\"- {ut.link_new_tab(mdpathlink(url))}\\n\"\n",
+    "        text += f\"- {mdpathlink(url)}\\n\"\n",
     "    md(text)"
    ]
   },
@@ -497,14 +468,12 @@
     "    for day, url_list in tickets.items():\n",
     "        mdstr += f\"\\n - {day}\"\n",
     "        for ticket_url in url_list:\n",
-    "            mdstr += (\n",
-    "                f'\\n    - {ut.link_new_tab(ticket_url, ticket_url.replace(front,\"\"))}'\n",
-    "            )\n",
+    "            mdstr += f'\\n    - {mdlink(ticket_url, ticket_url.replace(front,\"\"))}'\n",
     "    md(mdstr)\n",
     "else:\n",
     "    endpoint_url = allsrc.nig_src.status[\"reports\"][\"endpoint_url\"]\n",
     "    md(\n",
-    "        f\"No tickets found using: {ut.link_new_tab(endpoint_url,'API Data')} in `confluence_url`.\"\n",
+    "        f\"No tickets found using: {mdlink(endpoint_url,'API Data')} in `confluence_url`.\"\n",
     "    )"
    ]
   },

python/lsst/ts/logging_and_reporting/reports.py

@@ -67,12 +67,21 @@ def html_draft(text):
     return msg
 
 
+def mdlink(url, string=None):
+    """Wrap link in html to open link in new tab, must be used in an md()"""
+    string = url if string is None else string
+    html = f'<a href="{url}" target="_blank" rel="noreferrer noopener">{string}</a>'
+    return html
+
+
 def mdpathlink(url, remove="/browse/"):
-    return f"[{urlparse(url).path.replace(remove, '')}]({url})"
+    string = urlparse(url).path.replace(remove, "")
+    return mdlink(string)
 
 
 def mdfragmentlink(url, remove="!/"):
-    return f"[{urlparse(url).fragment.replace(remove, '')}]({url})"
+    string = urlparse(url).fragment.replace(remove, "")
+    return mdlink(string)
 
 
 def display_error(text, fgcolor="black", bgcolor="red", size="1em"):

python/lsst/ts/logging_and_reporting/utils.py

@@ -196,13 +196,6 @@ def hhmmss(decimal_hours):
     return f"{hours:d}:{minutes:02d}:{seconds:02d}"
 
 
-def link_new_tab(url, string=None):
-    """Wrap links in html to open all links in new tab, must be used in md()"""
-    string = url if string is None else string
-    html = f'<a href="{url}" target="_blank" rel="noreferrer noopener">{string}</a>'
-    return html
-
-
 def tic():
     """Start timer."""
     tic.start = time.perf_counter()