python 3.11 & code quality improvements

inkycal/custom/__init__.py

@@ -1,2 +1,3 @@
 from .functions import *
 from .inkycal_exceptions import *
+from .openweathermap_wrapper import OpenWeatherMap

inkycal/custom/functions.py

@@ -6,8 +6,10 @@ Inkycal custom-functions for ease-of-use
 Copyright by aceinnolab
 """
 import logging
+import traceback
+
 from PIL import Image, ImageDraw, ImageFont, ImageColor
-from urllib.request import urlopen
+import requests
 import os
 import time
 
@@ -98,11 +100,13 @@ def auto_fontsize(font, max_height):
       Returns:
           A PIL font object with modified height.
       """
-
-    fontsize = font.getsize('hg')[1]
-    while font.getsize('hg')[1] <= (max_height * 0.80):
+    text_bbox = font.getbbox("hg")
+    text_height = text_bbox[3] - text_bbox[1]
+    fontsize = text_height
+    while text_height <= (max_height * 0.80):
         fontsize += 1
         font = ImageFont.truetype(font.path, fontsize)
+        text_height = text_bbox[3] - text_bbox[1]
     return font
 
 
@@ -154,21 +158,34 @@ def write(image, xy, box_size, text, font=None, **kwargs):
     if autofit or (fill_width != 1.0) or (fill_height != 0.8):
         size = 8
         font = ImageFont.truetype(font.path, size)
-        text_width, text_height = font.getsize(text)[0], font.getsize('hg')[1]
+        text_bbox = font.getbbox(text)
+        text_width = text_bbox[2] - text_bbox[0]
+        text_bbox_height = font.getbbox("hg")
+        text_height = text_bbox_height[3] - text_bbox_height[1]
+
         while (text_width < int(box_width * fill_width) and
                text_height < int(box_height * fill_height)):
             size += 1
             font = ImageFont.truetype(font.path, size)
-            text_width, text_height = font.getsize(text)[0], font.getsize('hg')[1]
+            text_bbox = font.getbbox(text)
+            text_width = text_bbox[2] - text_bbox[0]
+            text_bbox_height = font.getbbox("hg")
+            text_height = text_bbox_height[3] - text_bbox_height[1]
 
-    text_width, text_height = font.getsize(text)[0], font.getsize('hg')[1]
+    text_bbox = font.getbbox(text)
+    text_width = text_bbox[2] - text_bbox[0]
+    text_bbox_height = font.getbbox("hg")
+    text_height = text_bbox_height[3] - text_bbox_height[1]
 
     # Truncate text if text is too long so it can fit inside the box
     if (text_width, text_height) > (box_width, box_height):
         logs.debug(('truncating {}'.format(text)))
         while (text_width, text_height) > (box_width, box_height):
             text = text[0:-1]
-            text_width, text_height = font.getsize(text)[0], font.getsize('hg')[1]
+            text_bbox = font.getbbox(text)
+            text_width = text_bbox[2] - text_bbox[0]
+            text_bbox_height = font.getbbox("hg")
+            text_height = text_bbox_height[3] - text_bbox_height[1]
         logs.debug(text)
 
     # Align text to desired position
@@ -215,14 +232,17 @@ def text_wrap(text, font=None, max_width=None):
       A list containing chunked strings of the full text.
     """
     lines = []
-    if font.getsize(text)[0] < max_width:
+
+    text_width = font.getlength(text)
+
+    if text_width < max_width:
         lines.append(text)
     else:
         words = text.split(' ')
         i = 0
         while i < len(words):
             line = ''
-            while i < len(words) and font.getsize(line + words[i])[0] <= max_width:
+            while i < len(words) and font.getlength(line + words[i]) <= max_width:
                 line = line + words[i] + " "
                 i += 1
             if not line:
@@ -249,9 +269,10 @@ def internet_available():
     """
 
     try:
-        urlopen('https://google.com', timeout=5)
+        requests.get('https://google.com', timeout=5)
         return True
     except:
+        print(f"Network could not be reached: {traceback.print_exc()}")
         return False
 
 

inkycal/custom/openweathermap_wrapper.py

@@ -0,0 +1,43 @@
+import logging
+from enum import Enum
+
+import requests
+import json
+
+logger = logging.getLogger(__name__)
+
+class WEATHER_OPTIONS(Enum):
+    CURRENT_WEATHER = "weather"
+
+class FORECAST_INTERVAL(Enum):
+    THREE_HOURS = "3h"
+    FIVE_DAYS = "5d"
+
+
+
+class OpenWeatherMap:
+    def __init__(self, api_key:str, city_id:int, units:str) -> None:
+        self.api_key = api_key
+        self.city_id = city_id
+        assert (units  in ["metric", "imperial"] )
+        self.units = units
+        self._api_version = "2.5"
+        self._base_url = f"https://api.openweathermap.org/data/{self._api_version}"
+
+
+    def get_current_weather(self) -> dict:
+        current_weather_url = f"{self._base_url}/weather?id={self.city_id}&appid={self.api_key}&units={self.units}"
+        response = requests.get(current_weather_url)
+        if not response.ok:
+            raise AssertionError(f"Failure getting the current weather: code {response.status_code}. Reason: {response.text}")
+        data = json.loads(response.text)
+        return data
+
+    def get_weather_forecast(self) -> dict:
+        forecast_url = f"{self._base_url}/forecast?id={self.city_id}&appid={self.api_key}&units={self.units}"
+        response = requests.get(forecast_url)
+        if not response.ok:
+            raise AssertionError(f"Failure getting the current weather: code {response.status_code}. Reason: {response.text}")
+        data = json.loads(response.text)["list"]
+        return data
+