Update get_record

thodson-usgs · thodson-usgs · commit 82e6c8a7c7b1 · 2026-04-04T08:27:09.000-05:00
diff --git a/dataretrieval/nwis.py b/dataretrieval/nwis.py
@@ -8,6 +8,7 @@
 
 import warnings
 from io import StringIO
+from json import JSONDecodeError
 
 import pandas as pd
 import requests
@@ -483,7 +484,7 @@ def get_dv(
     response = query_waterservices("dv", format="json", ssl_check=ssl_check, **kwargs)
     try:
         df = _read_json(response.json())
-    except (ValueError, requests.exceptions.JSONDecodeError) as e:
+    except (ValueError, JSONDecodeError) as e:
         if (
             "<html>" in response.text.lower()
             or "<!doctype" in response.text.lower()
@@ -682,7 +683,7 @@ def get_iv(
 
     try:
         df = _read_json(response.json())
-    except (ValueError, requests.exceptions.JSONDecodeError) as e:
+    except (ValueError, JSONDecodeError) as e:
         if (
             "<html>" in response.text.lower()
             or "<!doctype" in response.text.lower()
@@ -949,43 +950,6 @@ def get_record(
         df, _ = get_info(sites=sites, ssl_check=ssl_check, **kwargs)
         return df
 
-    elif service == "measurements":
-        df, _ = get_discharge_measurements(
-            site_no=sites, begin_date=start, end_date=end, ssl_check=ssl_check, **kwargs
-        )
-        return df
-
-    elif service == "peaks":
-        df, _ = get_discharge_peaks(
-            site_no=sites,
-            begin_date=start,
-            end_date=end,
-            multi_index=multi_index,
-            ssl_check=ssl_check,
-            **kwargs,
-        )
-        return df
-
-    elif service == "gwlevels":
-        df, _ = get_gwlevels(
-            sites=sites,
-            startDT=start,
-            endDT=end,
-            multi_index=multi_index,
-            datetime_index=datetime_index,
-            ssl_check=ssl_check,
-            **kwargs,
-        )
-        return df
-
-    elif service == "pmcodes":
-        df, _ = get_pmcodes(ssl_check=ssl_check, **kwargs)
-        return df
-
-    elif service == "water_use":
-        df, _ = get_water_use(state=state, ssl_check=ssl_check, **kwargs)
-        return df
-
     elif service == "ratings":
         df, _ = get_ratings(site=sites, ssl_check=ssl_check, **kwargs)
         return df
@@ -1180,8 +1144,8 @@ class NWIS_Metadata(BaseMetadata):
         Site information if the query included `site_no`, `sites`, `stateCd`,
         `huc`, `countyCd` or `bBox`. `site_no` is preferred over `sites` if
         both are present.
-    variable_info: tuple[pd.DataFrame, NWIS_Metadata] | None
-        Variable information if the query included `parameterCd`.
+    variable_info: None
+        Deprecated. Accessing variable_info via NWIS_Metadata is deprecated.
 
     """
 
diff --git a/tests/nwis_test.py b/tests/nwis_test.py
@@ -310,3 +310,14 @@ def test_set_metadata_info_countyCd(self):
         md = NWIS_Metadata(response, countyCd="01001")
         # assert that site_info is implemented
         assert md.site_info
+
+    def test_variable_info_deprecated(self):
+        """Test that variable_info raises a DeprecationWarning and returns None."""
+        response = mock.MagicMock()
+        md = NWIS_Metadata(response)
+        with pytest.warns(
+            DeprecationWarning,
+            match="Accessing variable_info via NWIS_Metadata is deprecated",
+        ):
+            result = md.variable_info
+        assert result is None
