Merge pull request #11 from speechpro/check_session

Добавил проверку активности сессии + аннотации типов тут и там

Author: hiisi13

speechpro/cloud/speech/common/__init__.py

@@ -1,3 +1,4 @@
+from speechpro.cloud.speech.common.rest.cloud_client.models.auth_status_dto import AuthStatusDto
 from speechpro.cloud.speech.common.rest.cloud_client import SessionApi, AuthRequestDto
 
 
@@ -9,10 +10,18 @@ def __init__(self, username, domain_id, password):
         self._session_id = None
 
 
+    def _check_session_status(self) -> bool:
+        session_api = SessionApi()
+        status: AuthStatusDto = session_api.check(self._session_id)
+        return status.is_active
+
+
     @property
     def session_id(self):
-        if not self._session_id:
+        if self._session_id and self._check_session_status():
+            return self._session_id
+        else:
             session_api = SessionApi()
             credentials = AuthRequestDto(self.username, self.domain_id, self.password)
             self._session_id = session_api.login(credentials).session_id
-        return self._session_id
+            return self._session_id

speechpro/cloud/speech/recognition/rest/__init__.py

@@ -1,4 +1,6 @@
 import base64
+import enum
+from typing import Any, Dict, Tuple
 
 from speechpro.cloud.speech.recognition.rest.cloud_client.api import RecognizeApi
 from speechpro.cloud.speech.recognition.rest.cloud_client.models import AudioFileDto, RecognitionRequestDto, AdvancedRecognitionRequestDto
@@ -12,22 +14,22 @@
 
 class ShortAudioRecognitionClient():
 
-    model_mapping = {
+    model_mapping: Dict[Tuple[enums.Language, enums.Model], str] = {
         (enums.Language.RU, enums.Model.GENERAL): 'FarField',
         (enums.Language.RU, enums.Model.PHONE_CALL): 'TelecomRus',
         (enums.Language.KZ, enums.Model.PHONE_CALL): 'TelecomKz',
         (enums.Language.EN, enums.Model.PHONE_CALL): 'TelecomEngUs',
         (enums.Language.ES, enums.Model.PHONE_CALL): 'TelecomEsp'
     }
 
-    def validate_enum_value(self, config, key, enum_type):
+    def validate_enum_value(self, config: Dict[str, Any], key: str, enum_type: enum.EnumMeta):
         try:
             return config[key] if isinstance(config[key], enum_type) else enum_type[config[key]]
         except:
             raise ValueError(f"{enum_type.__name__} is not provided or does not exist. Available models: {', '.join([m.name for m in enum_type])}")
 
 
-    def recognize(self, config, audio):
+    def recognize(self, config: Dict[str, Any], audio: bytes) -> Any:
         b64encoded_audio = base64.standard_b64encode(audio)
         audio_str = str(b64encoded_audio, 'ascii', 'ignore')
 

speechpro/cloud/speech/synthesis/rest/__init__.py

@@ -1,4 +1,5 @@
 import base64
+from typing import Union
 
 from speechpro.cloud.speech.synthesis.rest.cloud_client import Synthesize, SynthesizeRequest, SynthesizeText
 from speechpro.cloud.speech.synthesis import enums
@@ -24,7 +25,7 @@ def get_enum_value(self, value, enum_type):
         return value if isinstance(value, enum_type) else enum_type[value]
 
 
-    def synthesize(self, voice, profile, text):
+    def synthesize(self, voice: Union[enums.Voice, str], profile: Union[enums.PlaybackProfile, str], text: str):
         try:
             voice = self.get_enum_value(voice, enums.Voice)
             profile = self.get_enum_value(profile, enums.PlaybackProfile)