Merge pull request #1184 from akrherz/website_telem

Improve website_telemetry write

Author: akrherz

.pre-commit-config.yaml

@@ -2,13 +2,13 @@ ci:
   autoupdate_schedule: quarterly
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.15.6"
+    rev: "v0.15.7"
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: 'v2.19.0'
+    rev: 'v2.20.0'
     hooks:
       - id: pyproject-fmt

src/pyiem/plot/geoplot.py

@@ -289,13 +289,13 @@ def draw_usdm(self, valid=None, filled=True, hatched=False, **kwargs):
         """
         colors = ["#ffff00", "#fcd37f", "#ffaa00", "#e60000", "#730000"]
         hatches = ["+", "/", "\\", "-", "x"]
-        if valid is None:
-            valid = ""
-        elif isinstance(valid, (datetime.date, datetime.datetime)):
+        params = {}
+        if isinstance(valid, (datetime.date, datetime.datetime)):
             valid = valid.strftime("%Y-%m-%d")
-        url = f"http://mesonet.agron.iastate.edu/geojson/usdm.py?date={valid}"
+            params["date"] = valid
+        url = "http://mesonet.agron.iastate.edu/geojson/usdm.py"
         try:
-            resp = httpx.get(url, timeout=30)
+            resp = httpx.get(url, params=params, timeout=30)
             resp.raise_for_status()
             df = gpd.GeoDataFrame().from_features(resp.json())
         except Exception as exp:

src/pyiem/webutil.py

@@ -191,7 +191,7 @@ def write_telemetry(data: TELEMETRY) -> bool:
     """Write telemetry to the database."""
     # Yes, this blocks, but if this database is not working, we are in trouble
     try:
-        with get_sqlalchemy_conn("mesosite") as conn:
+        with get_sqlalchemy_conn("mesosite", rw=True) as conn:
             conn.execute(
                 sql_helper(
                     """
@@ -205,6 +205,9 @@ def write_telemetry(data: TELEMETRY) -> bool:
             )
             conn.commit()
         return True
+    except NewDatabaseConnectionFailure:
+        # swallow this
+        return False
     except Exception as exp:
         LOG.exception(exp)
     return False

tests/plot/test_geoplot.py

@@ -49,12 +49,9 @@ def test_overlay_nexrad_failure():
 def test_exercise_usdm():
     """Test the various checks in the usdm method."""
     mp = MapPlot()
-    with pytest.warns(UserWarning) as _:
-        mp.draw_usdm()
     mp.draw_usdm(utc())
     with pytest.warns(UserWarning) as _:
-        assert mp.draw_usdm("qqq") is None
-    assert mp.draw_usdm(utc(1980, 1, 1)) is None
+        assert mp.draw_usdm(utc(1980, 1, 1)) is None
 
 
 def test_close():