Chunker Improvement

Adjusted how packets are split, ignoring .?! which can confound things. @NomDeTom

config.template

@@ -123,8 +123,8 @@ useMetric = False
 # repeaterList lookup location (rbook / artsci)
 repeaterLookup = rbook
 
-# NOAA weather forecast days, the first two rows are today and tonight
-NOAAforecastDuration = 4
+# NOAA weather forecast days
+NOAAforecastDuration = 3
 # number of weather alerts to display
 NOAAalertCount = 2
 

modules/locationdata.py

@@ -236,36 +236,36 @@ def get_NOAAweather(lat=0, lon=0, unit=0):
         unit = 1
         
     weather_url = "https://forecast.weather.gov/MapClick.php?FcstType=text&lat=" + str(lat) + "&lon=" + str(lon)
-    if unit == 1:
-        weather_url += "&unit=1"
-    
+    weather_api = "https://api.weather.gov/points/" + str(lat) + "," + str(lon)
+    # extract the "forecast": property from the JSON response
     try:
-        weather_data = requests.get(weather_url, timeout=urlTimeoutSeconds)
+        weather_data = requests.get(weather_api, timeout=urlTimeoutSeconds)
         if not weather_data.ok:
-            logger.error("Location:Error fetching weather data from NOAA")
+            logger.warning("Location:Error fetching weather data from NOAA for location")
             return ERROR_FETCHING_DATA
     except (requests.exceptions.RequestException):
-        logger.error("Location:Error fetching weather data from NOAA")
+        logger.warning("Location:Error fetching weather data from NOAA for location")
+        return ERROR_FETCHING_DATA
+    # get the forecast URL from the JSON response
+    weather_json = weather_data.json()
+    forecast_url = weather_json['properties']['forecast']
+    try:
+        forecast_data = requests.get(forecast_url, timeout=urlTimeoutSeconds)
+        if not forecast_data.ok:
+            logger.warning("Location:Error fetching weather forecast from NOAA")
+            return ERROR_FETCHING_DATA
+    except (requests.exceptions.RequestException):
+        logger.warning("Location:Error fetching weather forecast from NOAA")
         return ERROR_FETCHING_DATA
     
-    soup = bs.BeautifulSoup(weather_data.text, 'html.parser')
-    table = soup.find('div', id="detailed-forecast-body")
+    # from periods, get the detailedForecast from number of days in NOAAforecastDuration
+    forecast_json = forecast_data.json()
+    forecast = forecast_json['properties']['periods']
+    for day in forecast[:forecastDuration]:
+        # abreviate the forecast
 
-    if table is None:
-        logger.error("Location:Bad weather data from NOAA")
-        return ERROR_FETCHING_DATA
-    else:
-        # get rows
-        rows = table.find_all('div', class_="row")
-
-    # extract data from rows
-    for row in rows:
-        # shrink the text
-        line = abbreviate_noaa(row.text)
-        # only grab a few days of weather
-        if len(weather.split("\n")) < forecastDuration:
-            weather += line + "\n"
-    # trim off last newline
+        weather += day['name'] + ": " + abbreviate_noaa(day['detailedForecast']) + "\n"
+    # remove last newline
     weather = weather[:-1]
 
     # get any alerts and return the count
@@ -330,6 +330,9 @@ def abbreviate_noaa(row):
         "degrees": "°",
         "percent": "%",
         "department": "Dept.",
+        "amounts less than a tenth of an inch possible.": "< 0.1in",
+        "temperatures": "temps.",
+        "temperature": "temp.",
     }
 
     line = row

modules/system.py

@@ -467,7 +467,7 @@ def handleSentinelIgnore(nodeInt=1, nodeID=0, aor=False):
     else:
         sentryIgnoreList.remove(str(nodeID))
         logger.info(f"System: Removed {nodeID} from sentry ignore list")
-         
+
 def messageChunker(message):
     message_list = []
     if len(message) > MESSAGE_CHUNK_SIZE:
@@ -487,9 +487,9 @@ def messageChunker(message):
                 sentence = ''
                 for char in part:
                     sentence += char
-                    if char in '.!?':
-                        sentences.append(sentence.strip())
-                        sentence = ''
+                    # if char in '.!?':
+                    #     sentences.append(sentence.strip())
+                    #     sentence = ''
                 if sentence:
                     sentences.append(sentence.strip())
 
@@ -523,8 +523,12 @@ def messageChunker(message):
         final_message_list = []
         for chunk in message_list:
             while len(chunk) > MESSAGE_CHUNK_SIZE:
-                final_message_list.append(chunk[:MESSAGE_CHUNK_SIZE])
-                chunk = chunk[MESSAGE_CHUNK_SIZE:]
+                # Find the last space within the chunk size limit
+                split_index = chunk.rfind(' ', 0, MESSAGE_CHUNK_SIZE)
+                if split_index == -1:
+                    split_index = MESSAGE_CHUNK_SIZE
+                final_message_list.append(chunk[:split_index])
+                chunk = chunk[split_index:].strip()
             if chunk:
                 final_message_list.append(chunk)