Version bump to try to fix a Wyoming issue.

Author: QuinnDamerell

.vscode/launch.json

@@ -6,9 +6,10 @@
     "configurations": [
         {
             "name": "Linux Host",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "homeway_linuxhost",
+            "python": "~/.homeway-env/bin/python",
             "cwd": "${fileWorkspaceFolder}/homeway",
             "justMyCode": false,
             "args": [
@@ -19,13 +20,14 @@
                 "eyJWZXJzaW9uRmlsZURpciI6Ii9ob21lL3BpL2hvbWV3YXkvaG9tZXdheSIsICJBZGRvbkRhdGFSb290RGlyIjoiL2hvbWUvcGkvLmhvbWV3YXktYWRkb24iLCAiTG9nc0RpciI6Ii9ob21lL3BpLy5ob21ld2F5LWFkZG9uL2xvZ3MiLCAiU3RvcmFnZURpciI6Ii9ob21lL3BpLy5ob21ld2F5LWFkZG9uL2RhdGEiLCAiSXNSdW5uaW5nSW5IYUFkZG9uRW52IjpmYWxzZSB9",
                 //
                 // We can optionally pass a dev config json object, which has dev specific overwrites we can make.
-                "{\"LocalHomewayServerAddress\":  \"10.0.0.15\"  , \"LogLevel\":\"DEBUG\"}"
+                "{\"LocalHomewayServerAddress\":  \"\"  , \"LogLevel\":\"DEBUG\"}"
             ]
         },
         {
             "name": "Installer Module",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
+            "python": "~/.homeway-env/bin/python",
             "module": "homeway_installer",
             "justMyCode": false,
             "args": [
@@ -37,9 +39,10 @@
         },
         {
             "name": "Linux Host - WSL",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "homeway_linuxhost",
+            "python": "~/.homeway-env/bin/python",
             "cwd": "${fileWorkspaceFolder}/homeway",
             "justMyCode": false,
             "args": [

homeway/config.yaml

@@ -53,4 +53,4 @@ image: ghcr.io/homewayio/homeway/{arch}
 # Note when this version number changes, we must make a release to start a docker container build immediately, since HA will start looking for the new version.
 # Basically: Make the final commit -> test and check lint actions (if a docker change, push to docker-test to ensure it builds) -> bump the version number -> create GitHub release.
 # UPDATE THE CHANGE LOG!
-version: 2.2.6
+version: 2.2.7

homeway/homeway_linuxhost/sage/sagehandler.py

@@ -2,7 +2,8 @@
 import json
 import logging
 import threading
-import requests
+import asyncio
+import aiohttp
 
 from wyoming.asr import Transcript, Transcribe
 from wyoming.tts import Synthesize
@@ -236,40 +237,40 @@ async def _HandleDescribe(self) -> bool:
 
             # Since this is important, we have some retry logic.
             attempt = 0
-            while True:
-                attempt += 1
-
-                # Attempt getting a valid response.
-                serviceInfo:Info = None
-                try:
-                    self.Logger.debug(f"Sage - Starting Info Service Request - {url}")
-                    # Attempt to get and parse the info object.
-                    response = requests.get(url, timeout=10)
-                    if response.status_code == 200:
-                        serviceInfo = self._BuildInfoEvent(response.json())
-                        if serviceInfo is None:
-                            raise Exception("Failed to build info event.")
-                    else:
-                        self.Logger.warning(f"Sage - Failed to get models from service. Attempt: {attempt} - {response.status_code}")
-                except Exception as e:
-                    self.Logger.warning(f"Sage - Failed to get models from service. Attempt: {attempt} - {e}")
-
-                # If we got service info, try to write it to the client.
-                if serviceInfo is not None:
-                    self.Logger.debug("Sage - Service request successful, sending to Wyoming protocol.")
+            async with aiohttp.ClientSession() as session:
+                while True:
+                    attempt += 1
+                    serviceInfo:Info  = None
                     try:
-                        await self._CacheAndWriteInfoEvent(serviceInfo)
-                        # Success
-                        return True
+                        self.Logger.debug(f"Sage - Starting Info Service Request - {url}")
+                        # Perform the async GET request with a timeout of 10 seconds.
+                        async with session.get(url, timeout=10) as response:
+                            if response.status == 200:
+                                data = await response.json()
+                                serviceInfo = self._BuildInfoEvent(data)
+                                if serviceInfo is None:
+                                    raise Exception("Failed to build info event.")
+                            else:
+                                self.Logger.warning(f"Sage - Failed to get models from service. Attempt: {attempt} - {response.status}")
                     except Exception as e:
-                        self.Logger.warning(f"Sage - Failed to send info to wyoming protocol. Attempt: {attempt} - {e}")
-
-                # If we fail, try a few times. Throw when we hit the limit.
-                if attempt > 3:
-                    raise Exception("Failed to get models from service after 3 attempts.")
-
-                # Sleep before trying again.
-                time.sleep(5)
+                        self.Logger.warning(f"Sage - Failed to get models from service. Attempt: {attempt} - {e}")
+
+                    # If we got valid serviceInfo, try to process it.
+                    if serviceInfo is not None:
+                        self.Logger.debug("Sage - Service request successful, sending to Wyoming protocol.")
+                        try:
+                            await self._CacheAndWriteInfoEvent(serviceInfo)
+                            # Success, exit the function.
+                            return True
+                        except Exception as e:
+                            self.Logger.warning(f"Sage - Failed to send info to wyoming protocol. Attempt: {attempt} - {e}")
+
+                    # After 3 attempts, raise an exception.
+                    if attempt > 3:
+                        raise Exception("Failed to get models from service after 3 attempts.")
+
+                    # Wait 5 seconds before retrying.
+                    await asyncio.sleep(5)
 
         except Exception as e:
             Sentry.Exception("Sage - Failed get info from service.", e)

homeway/requirements.txt

@@ -26,6 +26,7 @@ octoflatbuffers==24.3.27
 # Keep these as current as possible.
 requests>=2.32.3
 urllib3>=2.2.0
+aiohttp>=3.10.0
 certifi>=2025.1.31
 rsa>=4.9
 dnspython>=2.6.0