Add assist route with stt/tts endpoints

neon_hana/app/__init__.py

@@ -28,6 +28,7 @@
 
 from neon_hana.app.dependencies import client_manager, jwt_bearer, mq_connector
 from neon_hana.app.routers.api_proxy import proxy_route
+from neon_hana.app.routers.assist import assist_route
 from neon_hana.app.routers.llm import llm_route
 from neon_hana.app.routers.mq_backend import mq_route
 from neon_hana.app.routers.auth import auth_route
@@ -40,6 +41,7 @@ def create_app(config: dict):
     version = __version__
     app = FastAPI(title=title, summary=summary, version=version)
     app.include_router(auth_route)
+    app.include_router(assist_route)
     app.include_router(proxy_route)
     app.include_router(mq_route)
     app.include_router(llm_route)

neon_hana/app/__main__.py

@@ -25,6 +25,10 @@
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import uvicorn
+from os import environ
+
+environ.setdefault("OVOS_CONFIG_BASE_FOLDER", "neon")
+environ.setdefault("OVOS_CONFIG_FILENAME", "diana.yaml")
 
 from ovos_config.config import Configuration
 

neon_hana/app/routers/assist.py

@@ -0,0 +1,44 @@
+# NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
+# All trademark and other rights reserved by their respective owners
+# Copyright 2008-2021 Neongecko.com Inc.
+# BSD-3
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+# 3. Neither the name of the copyright holder nor the names of its
+#    contributors may be used to endorse or promote products derived from this
+#    software without specific prior written permission.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS;  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from fastapi import APIRouter, Depends
+from neon_hana.schema.assist_requests import *
+from neon_hana.app.dependencies import jwt_bearer, mq_connector
+
+
+assist_route = APIRouter(prefix="/neon", tags=["assist"],
+                         dependencies=[Depends(jwt_bearer)])
+
+
+@assist_route.post("/get_stt")
+async def get_stt(audio_in: STTRequest) -> STTResponse:
+    return mq_connector.get_stt(**dict(audio_in))
+
+
+@assist_route.post("/get_tts")
+async def get_tts(request: TTSRequest) -> TTSResponse:
+    return mq_connector.get_tts(**dict(request))
+

neon_hana/mq_service_api.py

@@ -25,11 +25,12 @@
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import json
+
+from tempfile import mkdtemp
+from time import time
 from typing import Optional, Dict, Any, List
 from uuid import uuid4
-
 from fastapi import HTTPException
-
 from neon_mq_connector.utils.client_utils import send_mq_request
 
 
@@ -43,6 +44,7 @@ class MQServiceManager:
     def __init__(self, config: dict):
         self.mq_default_timeout = config.get('mq_default_timeout', 10)
         self.mq_cliend_id = config.get('mq_client_id') or str(uuid4())
+        self.audio_tmp_path = mkdtemp("hana_audio")
 
     def _validate_api_proxy_response(self, response: dict):
         if response['status_code'] == 200:
@@ -120,25 +122,32 @@ def get_coupons(self):
         except TimeoutError as e:
             raise APIError(status_code=500, detail=repr(e))
 
-    def get_stt(self, b64_audio: str, lang: str, timeout: int = 20):
+    def get_stt(self, encoded_audio: str, lang_code: str):
         request_data = {"msg_type": "neon.get_stt",
-                                    "data": {"audio_data": b64_audio,
+                                    "data": {"audio_data": encoded_audio,
                                              "utterances": [""],  # TODO: Compat
-                                             "lang": lang},
-                                    "context": {"source": "hana"}}
+                                             "lang": lang_code},
+                                    "context": {"source": "hana",
+                                                "ident": f"{self.mq_cliend_id}"
+                                                         f"{time()}"}}
         response = send_mq_request("/neon_chat_api", request_data,
-                                   "neon_chat_api_request", timeout=timeout)
-        return response
+                                   "neon_chat_api_request",
+                                   timeout=self.mq_default_timeout)
+        return response['data']
 
-    def get_tts(self, string: str, lang: str, gender: str, timeout: int = 20):
+    def get_tts(self, to_speak: str, lang_code: str, gender: str):
         request_data = {"msg_type": "neon.get_tts",
-                                    "data": {"text": string,
+                                    "data": {"text": to_speak,
                                              "utterance": "",  # TODO: Compat
                                              "speaker": {"name": "Neon",
                                                          "gender": gender,
-                                                         "lang": lang},
-                                             "lang": lang},
-                                    "context": {"source": "hana"}}
+                                                         "lang": lang_code},
+                                             "lang": lang_code},
+                                    "context": {"source": "hana",
+                                                "ident": f"{self.mq_cliend_id}"
+                                                         f"{time()}"}}
         response = send_mq_request("/neon_chat_api", request_data,
-                                   "neon_chat_api_request", timeout=timeout)
-        return response
+                                   "neon_chat_api_request",
+                                   timeout=self.mq_default_timeout)
+        audio = response['data'][lang_code]['audio'][gender]
+        return {"encoded_audio": audio}