Merge pull request #1026 from akrherz/241211

Omnibus

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
     hooks:
       - id: eslint
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.2"
+    rev: "v0.8.3"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

README.md

@@ -10,36 +10,5 @@ Limited integration testing is done on Github Actions: [![Build Status](https://
 [![DeepSource](https://app.deepsource.com/gh/akrherz/iem.svg/?label=active+issues&show_trend=true&token=WvZunVBligt7HgkO2JGg5uMe)](https://app.deepsource.com/gh/akrherz/iem/)
 [![codecov](https://codecov.io/gh/akrherz/iem/graph/badge.svg?token=zKXnLZdxIk)](https://codecov.io/gh/akrherz/iem)
 
-Database schema is in [akrherz/iem-database](https://github.com/akrherz/iem-database).
-
-## Where are processes running
-
-The processing load for the IEM is spread over a number of virtual machines.
-This is an attempt to document what is running where.  The backup shown may not
-be automated, but another system that could be up and running the service in
-limited time.
-
-Process | Primary | Backup | Monitor
-------- | ------- | ------ | -------
-GOES R/S | iem8-dc | iem19 | None
-hrrr | iem8-dc | None | None
-iembot  | iem11-dc | None  | nagios
-iemdb1 | metvm33-dc | iemvm4 | nagios check
-iemdb2 | metvm4-dc | iemvm5 | nagios check
-iemdb3 | metvm2-dc | iemvm0 | nagios check
-iem-archive | metvm6-dc | iemvm6 | nagios
-iem-web-services | iem27-dc | iem11-dc | nagios check
-letsencrpyt | iem8-dc | None | nagios SSL check
-LDM | iem11 | None | None
-LoggerNet | iem8-dc | None | nagios check
-memcached | metvm0-dc | iem8-dc | nagios check
-NEXRAD Mosaics | iem8-dc | iem16 | nagios checks archive
-NWWS-OI Ingest | iem12 | None | None
-openfire | iem11-dc | None | None
-rabbitmq | iem9-dc | iem8-dc | nagios check
-samba | iem16 | None | cron scripts check data availability
-RIDGE | iem9-dc | None    | inbound file queue, check latency 7 radars
-webalizer | iem8-dc | None | None
-webcam haproxy | iem19 | iem12 | nagios
-Webcam Current | iem19 | None | cron script monitors for offline webcams
-Webcam Lapses | iem19 | None | None
+See [@akrherz Github Profile](https://github.com/akrherz) for an overview of
+repositories found here and how the fit together.

htdocs/docs/nexrad_mosaic/index.phtml

@@ -2,6 +2,7 @@
 require_once "../../../config/settings.inc.php";
 require_once "../../../include/myview.php";
 $t = new MyView();
+$t->iem_resource = "MOSAIC";
 $t->title = "About NEXRAD Mosaics";
 $d = date("Y/m/d");
 $t->content = <<<EOF

htdocs/schoolnet/index.php

@@ -9,9 +9,9 @@
 <h3>SchoolNet</h3>
 
 <p>Over the years, the IEM partnered with 
-<a href="http://www.kcci.com/">KCCI-TV</a> (Des Moines, IA),
-<a href="http://www.keloland.com">KELO-TV</a> (Sioux Falls, SD), 
-and <a href="http://www.kimt.com">KIMT-TV</a> (Mason City, IA) to collect data
+<a href="https://www.kcci.com/">KCCI-TV</a> (Des Moines, IA),
+<a href="https://www.keloland.com">KELO-TV</a> (Sioux Falls, SD), 
+and <a href="https://www.kimt.com">KIMT-TV</a> (Mason City, IA) to collect data
 from their respective school-based weather stations.  Sadly, the observation
 equipment fell into disrepair and the various networks were wound down or
 replaced with proprietary solutions.

htdocs/smos/index.php

@@ -81,11 +81,11 @@
 </div><div class="col-md-6">
 <div id="map"></div>
 
-            </div></div>
+</div></div>
 
 <input type="submit" value="Get Data!" />
 
-    </form>
+</form>
 
 <p><h4>Recent Analysis Plots at 00 UTC</h4>
 <i>Click image for archived imagery</i>

htdocs/smos/smosmap.js

@@ -1,7 +1,5 @@
 /* global $, ol */
-let controls;
-let vectors;
-let feature;
+let feature = null;
 window.app = {};
 const app = window.app;
 let theMap = null;
@@ -58,7 +56,7 @@ ol_ext_inherits(app.Drag, ol.interaction.Pointer);
 app.Drag.prototype.handleDownEvent = function (evt) {
 
     const feature_ = theMap.forEachFeatureAtPixel(evt.pixel,
-        function (feat) {
+        (feat) => {
             return feat;
         });
 
@@ -78,7 +76,7 @@ app.Drag.prototype.handleDragEvent = function (evt) {
     const map = evt.map;
 
     map.forEachFeatureAtPixel(evt.pixel,
-        function (feat) {
+        (feat) => {
             return feat;
         });
 
@@ -100,12 +98,12 @@ app.Drag.prototype.handleMoveEvent = function (evt) {
     if (this.cursor_) {
         const map = evt.map;
         const feature_ = map.forEachFeatureAtPixel(evt.pixel,
-            function (feat) {
+            (feat) => {
                 return feat;
             });
         const element = evt.map.getTargetElement();
         if (feature_) {
-            if (element.style.cursor != this.cursor_) {
+            if (element.style.cursor !== this.cursor_) {
                 this.previousCursor_ = element.style.cursor;
                 element.style.cursor = this.cursor_;
             }
@@ -121,7 +119,7 @@ app.Drag.prototype.handleMoveEvent = function (evt) {
  * @param {ol.MapBrowserEvent} evt Map browser event.
  * @return {boolean} `false` to stop the drag sequence.
  */
-app.Drag.prototype.handleUpEvent = function (evt) {
+app.Drag.prototype.handleUpEvent = function (_evt) {
     const ar = ol.proj.transform(this.coordinate_, 'EPSG:3857', 'EPSG:4326');
     $('#lon').val(ar[0].toFixed(4));
     $('#lat').val(ar[1].toFixed(4));

pylib/iemweb/autoplot/scripts/p16.py

@@ -122,28 +122,28 @@ def get_highcharts(ctx: dict) -> str:
         series: [
         {{
             name: '{bins[1]} - {bins[2]}',
-            data: {str(list(table[:, 0]))},
+            data: {list(table[:, 0])},
             pointInterval: 22.5,
             _colorIndex: 0
         }},
         {{name: '{bins[2]} - {bins[3]}',
-        data: {str(list(table[:, 1]))},
+        data: {list(table[:, 1])},
             pointInterval: 22.5,
         _colorIndex: 1}},
         {{name: '{bins[3]} - {bins[4]}',
-        data: {str(list(table[:, 2]))},
+        data: {list(table[:, 2])},
             pointInterval: 22.5,
         _colorIndex: 2}},
         {{name: '{bins[4]} - {bins[5]}',
-        data: {str(list(table[:, 3]))},
+        data: {list(table[:, 3])},
             pointInterval: 22.5,
         _colorIndex: 3}},
         {{name: '{bins[5]} - {bins[6]}',
-        data: {str(list(table[:, 4]))},
+        data: {list(table[:, 4])},
             pointInterval: 22.5,
         _colorIndex: 4}},
         {{name: '{bins[6]} +',
-        data: {str(list(table[:, 5]))},
+        data: {list(table[:, 5])},
             pointInterval: 22.5,
         _colorIndex: 5}}
         ],

pylib/iemweb/autoplot/scripts/p18.py

@@ -89,7 +89,7 @@ def get_highcharts(ctx: dict) -> dict:
     j["tooltip"] = {
         "crosshairs": True,
         "shared": True,
-        "valueSuffix": " %s" % (UNITS[ctx["var"]],),
+        "valueSuffix": f" {UNITS[ctx['var']]}",
     }
     j["legend"] = {}
     j["time"] = {"useUTC": False}
@@ -103,6 +103,7 @@ def get_highcharts(ctx: dict) -> dict:
                 zip(
                     ctx["df"].ticks.values.tolist(),
                     ctx["df"].datum.values.tolist(),
+                    strict=True,
                 )
             ),
             "zIndex": 2,

pylib/iemweb/autoplot/scripts/p3.py

@@ -167,25 +167,25 @@ def get_highcharts(ctx: dict) -> str:
         tooltip: {{
             valueDecimals: 2
         }},
-        data: {str(ctx["data"].tolist())},
+        data: {ctx["data"].tolist()},
         threshold: null
         }}, {{
         tooltip: {{valueDecimals: 2}},
         name: '30 Year Trailing Avg',
-    pointStart: {str(ctx["df"].index.min() + (3 if ctx["decadal"] else 30))},
+    pointStart: {ctx["df"].index.min() + (3 if ctx["decadal"] else 30)},
         pointInterval: {ptinterval},
             width: 2,
-        data: {str(ctx["tavg"][(3 if ctx["decadal"] else 30) :])}
+        data: {ctx["tavg"][(3 if ctx["decadal"] else 30) :]}
         }},{{
             tooltip: {{
                 valueDecimals: 2
             }},
             name: 'Average',
             width: 2,
             pointPadding: 0.1,
-            pointStart: {str(ctx["df"].index.min())},
+            pointStart: {ctx["df"].index.min()},
             pointInterval: {ptinterval},
-            data: {str([ctx["avgv"]] * len(ctx["df"].index))}
+            data: {[ctx["avgv"]] * len(ctx["df"].index)}
         }}]
 }});
     """

pylib/iemweb/autoplot/scripts/p50.py

@@ -213,8 +213,8 @@ def plotter(fdict):
     ax.set_yticks(range(-1, len(uniquehail)))
     ax.set_xlim(-0.5, len(uniquewind) + 0.5)
     ax.set_ylim(-1.5, len(uniquehail) - 0.5)
-    ax.set_xticklabels(uniquewind + ["Total"], fontsize=14)
-    ax.set_yticklabels(["Total"] + uniquehail, fontsize=14)
+    ax.set_xticklabels([*uniquewind, "Total"], fontsize=14)
+    ax.set_yticklabels(["Total", *uniquehail], fontsize=14)
     ax.xaxis.tick_top()
     ax.set_xlabel("Wind Speed [mph]", fontsize=14)
     ax.set_ylabel("Hail Size [inch]", fontsize=14)

pylib/iemweb/autoplot/scripts/p60.py

@@ -205,7 +205,7 @@ def get_highcharts(ctx: dict) -> str:
     containername = ctx["_e"]
 
     return f"""
-    var units = {repr(ctx['units'])};
+    var units = "{ctx['units']}";
     function getPointCategoryName(point, dimension) {{
         var series = point.series,
         isY = dimension === 'y',
@@ -226,11 +226,11 @@ def get_highcharts(ctx: dict) -> str:
             min: 0,
             max: 23,
             title: {{
-                text: {repr(ctx['ylabel'])}
+                text: "{ctx['ylabel']}"
             }}
         }},
         title: {{
-            text: {repr(title)}
+            text: "{title}"
         }},
         accessibility: {{
             point: {{

pylib/iemweb/autoplot/scripts100/p102.py

@@ -116,7 +116,7 @@ def plotter(fdict):
         "Local Storm Report Sources Ranks"
     )
     if ltype:
-        label = f"For LSR Types: {repr(ltype)}"
+        label = f"For LSR Types: {ltype}"
         if len(label) > 90:
             label = f"{label[:90]}..."
         title += f"\n{label}"

pylib/iemweb/autoplot/scripts100/p119.py

@@ -247,7 +247,7 @@ def plotter(fdict):
             celltext[j][i] = row["dates"].strftime("%b %d")
             cellcolors[j][i] = colors[row["dates"].month - 1]
 
-    ax2 = fig.add_axes([0.75, 0.1, 0.2, 0.75])
+    ax2 = fig.add_axes((0.75, 0.1, 0.2, 0.75))
     # remove all the splines, but show the ylabel
     ax2.spines["top"].set_visible(False)
     ax2.spines["bottom"].set_visible(False)
@@ -259,7 +259,7 @@ def plotter(fdict):
         celltext,
         cellColours=cellcolors,
         colLabels=[f"{t}" + r"$^\circ$F" for t in thresholds],
-        rowLabels=["Min"] + list(range(10, 100, 10)) + ["Max"],
+        rowLabels=["Min", *list(range(10, 100, 10)), "Max"],
         loc="center",
     )
     # add some vertical padding to text in the table and keep the borders

pylib/iemweb/autoplot/scripts100/p151.py

@@ -209,13 +209,15 @@ def get_data(ctx):
     p2eyear = ctx["p2eyear"]
     p2years = p2eyear - p2syear + 1
 
+    datumsql = "year"
     if month != "custom":
         mlimiter = "and month = ANY(:months)" if month != "all" else ""
         months = month2months(month)
     else:
         mlimiter = "and sday >= :sday and sday <= :eday"
         if sday > eday:
             mlimiter = "and (sday >= :sday or sday <= :eday)"
+            datumsql = "case when sday >= :sday then year + 1 else year end"
         months = None
     table = "alldata"
     if sector == "state":
@@ -255,15 +257,15 @@ def get_data(ctx):
             text(
                 f"""
         WITH period1 as (
-            SELECT station, year,
+            SELECT station, {datumsql} as datum,
             {sqlopts[ctx['var']]} as {ctx['var']}
             from {table} WHERE year >= :syear1 and year <= :eyear1
-            {mlimiter} GROUP by station, year),
+            {mlimiter} GROUP by station, datum),
         period2 as (
-            SELECT station, year,
+            SELECT station, {datumsql} as datum,
             {sqlopts[ctx['var']]} as {ctx['var']}
             from {table} WHERE year >= :syear2 and year <= :eyear2
-            {mlimiter} GROUP by station, year),
+            {mlimiter} GROUP by station, datum),
         p1agg as (
             SELECT station,
             avg({ctx['var']}) as {ctx['var']}, count(*) as count

pylib/iemweb/current/live.py

@@ -84,7 +84,7 @@ def workflow(cid):
         return res
     try:
         res = fetch(cid)
-    except Exception:  # noqa
+    except Exception:
         return None
     if res is not None:
         # Set for 15 seconds

pylib/iemweb/projects/iembot/mastodon/index.py

@@ -6,8 +6,9 @@
 import mastodon
 import requests
 from paste.request import get_cookie_dict
+from pyiem.database import get_dbconnc
 from pyiem.templates.iem import TEMPLATE
-from pyiem.util import get_dbconnc, get_properties
+from pyiem.util import get_properties
 from pyiem.webutil import iemapp
 
 PRIVKEY = get_properties().get("mod_wsgi.privkey", "")
@@ -124,7 +125,7 @@ def build_subui(mapp, fdict):
     """Show the subscriptions."""
     me = mapp.me()
     res = f"""
-    <p>Hi <a href="{me['url']}">@{str(me['username'])}</a>
+    <p>Hi <a href="{me['url']}">@{me['username']}</a>
     <img src="{me['avatar']}" style="width:20px;">!
     This page configures your IEMBot channel subscriptions.</p>
     """