cloudlanguagetools 11.5.0__tar.gz → 11.6.1__tar.gz

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudlanguagetools
-Version: 11.5.0
+Version: 11.6.1
 Summary: Interface with various cloud APIs for language processing such as translation, text to speech
 Home-page: https://github.com/Language-Tools/cloud-language-tools-core
 Author: Luc

cloudlanguagetools-11.6.1/cloudlanguagetools/alibaba.py

@@ -0,0 +1,273 @@
+import json
+import requests
+import time
+import datetime
+import uuid
+import urllib
+import hmac
+import base64
+import logging
+import tempfile
+import pprint
+from typing import List
+
+import cloudlanguagetools.service
+import cloudlanguagetools.options
+import cloudlanguagetools.constants
+import cloudlanguagetools.languages
+import cloudlanguagetools.ttsvoice
+import cloudlanguagetools.constants
+import cloudlanguagetools.languages
+import cloudlanguagetools.ttsvoice
+import cloudlanguagetools.errors
+from cloudlanguagetools.options import AudioFormat
+
+logger = logging.getLogger(__name__)
+
+ALIBABA_VOICE_SPEED_DEFAULT = 0
+ALIBABA_VOICE_PITCH_DEFAULT = 0
+
+VOICE_OPTIONS = {
+    'speed': {'type': 'number_int', 'min': -500, 'max': 500, 'default': ALIBABA_VOICE_SPEED_DEFAULT},
+    'pitch': {'type': 'number_int', 'min': -500, 'max': 500, 'default': ALIBABA_VOICE_PITCH_DEFAULT},
+    'volume': {'type': 'number_int', 'min': 0, 'max': 100, 'default': 50},
+    cloudlanguagetools.options.AUDIO_FORMAT_PARAMETER: {
+        'type': cloudlanguagetools.options.ParameterType.list.name,
+        'values': ['pcm', 'wav', 'mp3'],
+        'default': 'mp3'
+    }
+}
+
+
+class AlibabaService(cloudlanguagetools.service.Service):
+    def __init__(self):
+        self.access_token = None
+        
+    def configure(self, config):
+        self.access_key_id = config['access_key_id']
+        self.access_key_secret = config['access_key_secret']
+        self.app_key = config['app_key']
+
+    def refresh_token(self):
+        logger.info("refreshing token")
+        params = {
+            "AccessKeyId": self.access_key_id,
+            "Action": "CreateToken",
+            "Version": "2019-07-17",
+            "Format": "JSON",
+            "RegionId": "ap-southeast-1",
+            "Timestamp": datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
+            "SignatureMethod": "HMAC-SHA1",
+            "SignatureVersion": "1.0",
+            "SignatureNonce": str(uuid.uuid4())
+        }
+
+        # sort by keys alphabetically
+        params = dict(sorted(params.items()))
+        # timestamp needs to be double-quoted by the end
+        params["Timestamp"] = urllib.parse.quote(params["Timestamp"], safe='')
+        
+        # urlencode with noop lambda for no quoting - we will quote later
+        params_str = urllib.parse.urlencode(params, quote_via=lambda a, b, c, d: a)
+        
+        # this is always /, as we always hit the path / on the API
+        url_encoded = urllib.parse.quote("/", safe='')
+        str_to_sign = f"GET&{url_encoded}&{urllib.parse.quote(params_str, safe='')}"
+        str_to_sign = str_to_sign.encode("utf-8")
+        
+        key = self.access_key_secret + "&"
+        key = key.encode("utf-8")
+        
+        # calculate HMAC-SHA1 digest and convert to base64
+        dig = hmac.new(key, str_to_sign, "sha1").digest()
+        dig = base64.standard_b64encode(dig).decode("utf-8")
+        
+        # signature also needs to be quoted
+        signature = urllib.parse.quote(dig, safe='')
+        params_str = f"Signature={signature}&{params_str}"
+        
+        response = requests.get(f"http://nlsmeta.ap-southeast-1.aliyuncs.com/?{params_str}")
+        
+        if response.status_code != 200:
+            logger.warning(f"Token request failed: {response.text}")
+            raise cloudlanguagetools.errors.RequestError("Token request failed", None, response.text)
+            
+        data = response.json()
+        self.access_token = data["Token"]
+        logger.info(f"Got access token: {self.access_token}")
+
+    def get_tts_audio(self, text, voice_key, options):
+        if not self.access_token or self.access_token["ExpireTime"] <= int(time.time()):
+            self.refresh_token()
+
+        speed = int(options.get('speed', ALIBABA_VOICE_SPEED_DEFAULT))
+        pitch = int(options.get('pitch', ALIBABA_VOICE_PITCH_DEFAULT))
+        voice = voice_key['name']
+
+        params = {
+            "format": "mp3",
+            "appkey": self.app_key,
+            "speech_rate": speed,
+            "pitch_rate": pitch,
+            "text": text,
+            "token": self.access_token["Id"],
+            "voice": voice
+        }
+
+        response = requests.get(
+            "https://nls-gateway-ap-southeast-1.aliyuncs.com/stream/v1/tts",
+            params=params,
+            timeout=cloudlanguagetools.constants.RequestTimeout
+        )
+
+        if response.status_code != 200:
+            data = response.json()
+            error_message = f'could not retrieve audio using Alibaba: {response.content}'
+            logger.error(error_message)
+            raise cloudlanguagetools.errors.RequestError(text, voice, error_message)
+
+        if response.headers['Content-Type'] != 'audio/mpeg':
+            logger.error(f'Unexpected response type. Response as text: {response.text}')
+            raise cloudlanguagetools.errors.RequestError(
+                text, voice,
+                f'Got bad content type in response: {response.headers["Content-Type"]}'
+            )
+        
+        # check the content length
+        if len(response.content) == 0:
+            # empty sound response
+            error_message = f'empty sound response. headers: {pprint.pformat(response.headers)}'
+            logger.error(error_message)
+            raise cloudlanguagetools.errors.RequestError(text, voice, f'empty sound result')
+
+
+        # Create a temporary file and write the audio content to it
+        output_temp_file = tempfile.NamedTemporaryFile(prefix=f'cloudlanguage_tools_{self.__class__.__name__}_audio', suffix='.mp3')
+        output_temp_file.write(response.content)
+        output_temp_file.flush()
+        return output_temp_file
+
+    def get_tts_voice_list(self):
+        # returns list of TtsVoice
+        return []
+
+    def build_tts_voice_v3(self, name: str, voice_id: str, gender: cloudlanguagetools.constants.Gender, audio_languages: List[cloudlanguagetools.languages.AudioLanguage]):
+        return cloudlanguagetools.ttsvoice.TtsVoice_v3(
+            name=name,
+            voice_key={'name': voice_id},
+            options=VOICE_OPTIONS,
+            service=cloudlanguagetools.constants.Service.Alibaba,
+            gender=gender,
+            audio_languages=audio_languages,
+            service_fee=cloudlanguagetools.constants.ServiceFee.paid
+        )
+
+    def get_tts_voice_list_v3(self) -> List[cloudlanguagetools.ttsvoice.TtsVoice_v3]:
+        result = []
+
+        # Standard voices for all scenarios
+        result.extend([
+            # Standard Chinese voices
+            self.build_tts_voice_v3('Xiaoyun (Standard)', 'Xiaoyun', 
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Xiaogang (Standard)', 'Xiaogang',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Ruoxi (Gentle)', 'Ruoxi',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Siqi (Gentle)', 'Siqi',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Sijia (Standard)', 'Sijia',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Sicheng (Standard)', 'Sicheng',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aiqi (Gentle)', 'Aiqi',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aijia (Standard)', 'Aijia',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aicheng (Standard)', 'Aicheng',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aida (Standard)', 'Aida',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3("Ning'er", 'Ninger',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Ruilin', 'Ruilin',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+
+            # Customer service voices
+            self.build_tts_voice_v3('Siyue (Gentle)', 'Siyue',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aiya (Harsh)', 'Aiya',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aixia (Amiable)', 'Aixia',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aimei (Sweet)', 'Aimei',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aiyu (Natural)', 'Aiyu',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aiyue (Gentle)', 'Aiyue',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aijing (Harsh)', 'Aijing',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Xiaomei (Sweet)', 'Xiaomei',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+
+            # Regional accent voices
+            self.build_tts_voice_v3('Aina (Zhejiang)', 'Aina',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Yina (Zhejiang)', 'Yina',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Sijing (Harsh)', 'Sijing',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+
+            # Child voices
+            self.build_tts_voice_v3('Sitong (Child)', 'Sitong',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Xiaobei (Little Girl)', 'Xiaobei',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Aitong (Child)', 'Aitong',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Aiwei (Little Girl)', 'Aiwei',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Aibao (Little Girl)', 'Aibao',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+
+            # English voices
+            self.build_tts_voice_v3('Harry (British)', 'Harry',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('Abby (American)', 'Abby',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Andy (American)', 'Andy',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Eric (British)', 'Eric',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('Emily (British)', 'Emily',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('Luna (British)', 'Luna',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('Luca (British)', 'Luca',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('Wendy (British)', 'Wendy',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('William (British)', 'William',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+            self.build_tts_voice_v3('Olivia (British)', 'Olivia',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.en_GB]),
+
+            # Special dialect voices
+            self.build_tts_voice_v3('Shanshan (Cantonese)', 'Shanshan',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_HK]),
+            self.build_tts_voice_v3('Xiaoyue (Sichuan)', 'Xiaoyue',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Lydia (Bilingual)', 'Lydia',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Aishuo (Natural)', 'Aishuo',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.zh_CN, cloudlanguagetools.languages.AudioLanguage.en_US]),
+            self.build_tts_voice_v3('Qingqing (Taiwanese)', 'Qingqing',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Cuijie (Northeastern)', 'Cuijie',
+                cloudlanguagetools.constants.Gender.Female, [cloudlanguagetools.languages.AudioLanguage.zh_CN]),
+            self.build_tts_voice_v3('Xiaoze (Hunan)', 'Xiaoze',
+                cloudlanguagetools.constants.Gender.Male, [cloudlanguagetools.languages.AudioLanguage.zh_CN])
+        ])
+        
+        return result

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools/amazon.py

@@ -5,7 +5,8 @@ import os
 import boto3
 import botocore.exceptions
 import contextlib
-
+import logging
+import pprint
 
 import cloudlanguagetools.service
 import cloudlanguagetools.constants
@@ -19,6 +20,8 @@ import cloudlanguagetools.audio_processing
 
 from cloudlanguagetools.options import AudioFormat
 
+logger = logging.getLogger(__name__)
+
 DEFAULT_VOICE_PITCH = 0
 DEFAULT_VOICE_RATE = 100
 
@@ -36,7 +39,7 @@ def get_audio_language_enum(language_code):
     return cloudlanguagetools.languages.AudioLanguage[language_enum_name]
 
 class AmazonVoice(cloudlanguagetools.ttsvoice.TtsVoice):
-    def __init__(self, voice_data):
+    def __init__(self, voice_data, engine: str):
         # print(voice_data)
         # {'Gender': 'Female', 'Id': 'Lotte', 'LanguageCode': 'nl-NL', 'LanguageName': 'Dutch', 'Name': 'Lotte', 'SupportedEngines': ['standard']}
         self.service = cloudlanguagetools.constants.Service.Amazon
@@ -45,9 +48,7 @@ class AmazonVoice(cloudlanguagetools.ttsvoice.TtsVoice):
         self.voice_id = voice_data['Id']
         self.name = voice_data['Name']
         self.audio_language = get_audio_language_enum(voice_data['LanguageCode'])
-        self.engine = 'standard'
-        if 'neural' in voice_data['SupportedEngines']:
-            self.engine = 'neural'
+        self.engine = engine
 
     def get_voice_key(self):
         return {
@@ -125,6 +126,8 @@ class AmazonService(cloudlanguagetools.service.Service):
             AudioFormat.wav: 'pcm'
         }, options, AudioFormat.mp3)
 
+        logger.info(f'generating audio with voice {voice_key}')
+
         # wav, we need to convert as described here:
         # https://aws.amazon.com/blogs/machine-learning/integrating-amazon-polly-with-legacy-ivr-systems-by-converting-output-to-wav-format/
 
@@ -141,13 +144,13 @@ class AmazonService(cloudlanguagetools.service.Service):
             # pitch not supported on neural voices
             prosody_tags = f'rate="{rate_str}"'
 
-
         ssml_str = f"""<speak>
     <prosody {prosody_tags} >
         {text}
     </prosody>
 </speak>"""
 
+
         try:
             if audio_format == cloudlanguagetools.options.AudioFormat.wav:
                 response = self.polly_client.synthesize_speech(Text=ssml_str, 
@@ -157,8 +160,14 @@ class AmazonService(cloudlanguagetools.service.Service):
                     Engine=voice_key['engine'],
                     SampleRate="16000")
             else:
-                response = self.polly_client.synthesize_speech(Text=ssml_str, TextType="ssml", OutputFormat=response_format_parameter, VoiceId=voice_key['voice_id'], Engine=voice_key['engine'])
+                if voice_key['engine'] in ['generative', 'long-form']:
+                    logger.info(f'voice: {voice_key}, generating text format: {text}')
+                    response = self.polly_client.synthesize_speech(Text=text, TextType="text", OutputFormat=response_format_parameter, VoiceId=voice_key['voice_id'], Engine=voice_key['engine'])
+                else:
+                    logger.info(f'voice: {voice_key}, generating ssml format: {ssml_str}')
+                    response = self.polly_client.synthesize_speech(Text=ssml_str, TextType="ssml", OutputFormat=response_format_parameter, VoiceId=voice_key['voice_id'], Engine=voice_key['engine'])
         except (botocore.exceptions.BotoCoreError, botocore.exceptions.ClientError) as error:
+            logger.error(f'Amazon Polly exception: {type(error)}')
             raise cloudlanguagetools.errors.RequestError(str(error))
 
         if "AudioStream" in response:
@@ -187,7 +196,9 @@ class AmazonService(cloudlanguagetools.service.Service):
         response = self.polly_client.describe_voices()
         # print(response['Voices'])
         for voice in response['Voices']:
-            result.append(AmazonVoice(voice))
+            logger.debug(f'voice: {pprint.pformat(voice)}')
+            for engine in voice['SupportedEngines']:
+                result.append(AmazonVoice(voice, engine))
         return result
 
 

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools/constants.py

@@ -82,6 +82,7 @@ class Service(StrEnum):
     Wenlin =    'Wenlin'
     LibreTranslate = 'LibreTranslate'
     ElevenLabs = 'ElevenLabs'
+    Alibaba = 'Alibaba'
     TestServiceA = 'TestServiceA'
     TestServiceB = 'TestServiceB'
 
@@ -95,4 +96,4 @@ class DictionaryLookupType(enum.Enum):
     Definitions = enum.auto()
     PartOfSpeech = enum.auto()
     MeasureWord = enum.auto()
-    PartOfSpeechDefinitions = enum.auto()
+    PartOfSpeechDefinitions = enum.auto()

cloudlanguagetools-11.6.1/cloudlanguagetools/errors.py

@@ -0,0 +1,26 @@
+
+# these exceptions can be retried
+class TransientError(Exception):
+    pass
+
+# no need to retry, something is wrong which won't be fixed on retry
+class PermanentError(Exception):
+    pass
+
+class InputError(PermanentError):
+    pass
+
+class ApiKeyNotFoundError(PermanentError):
+    pass
+
+class RequestError(TransientError):
+    pass
+
+class TimeoutError(TransientError):
+    pass
+
+class NotFoundError(PermanentError):
+    pass
+
+class OverQuotaError(PermanentError):
+    pass

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools/forvo.py

@@ -60,7 +60,7 @@ class ForvoService(cloudlanguagetools.service.Service):
         
         # on 2024/07, forvo started throwing some errors with SSL verification, suspect an incorrect
         # setup on their side but they are taking too long to fix it.
-        self.verify_ssl = False
+        self.verify_ssl = True
 
     def configure(self, config):
         self.key = config['key']

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools/google.py

@@ -3,6 +3,7 @@ import tempfile
 import html
 import base64
 import logging
+import pprint
 import google.cloud.texttospeech
 import google.cloud.translate_v2
 import google.api_core.exceptions
@@ -37,6 +38,7 @@ GENDER_MAP = {
 class GoogleVoice(cloudlanguagetools.ttsvoice.TtsVoice):
     def __init__(self, voice_data):
         logger.debug(f'processing voice {voice_data}')
+        logger.debug(pprint.pformat(voice_data))
         self.service = cloudlanguagetools.constants.Service.Google
         self.service_fee = cloudlanguagetools.constants.ServiceFee.paid
         self.name = voice_data.name
@@ -154,8 +156,6 @@ class GoogleService(cloudlanguagetools.service.Service):
         try:
             client = self.get_client()
 
-            ssml_text = '<speak>' + text + '</speak>'
-            input_text = google.cloud.texttospeech.SynthesisInput(ssml=ssml_text)
 
             # Note: the voice can also be specified by name.
             # Names of voices can be retrieved with client.list_voices().
@@ -171,8 +171,21 @@ class GoogleService(cloudlanguagetools.service.Service):
                 pitch=options.get('pitch', 0.0)
             )
 
+
+            # prepare speech request
+            ssml_text = '<speak>' + text + '</speak>'
+            input_text = google.cloud.texttospeech.SynthesisInput(ssml=ssml_text)
+
+            # some voices don't support SSML and it's weirdly not documented
+            non_ssml_voices = ['Chirp', 'Journey']
+            non_ssml_voice_found = any(s in text for s in voice_key['name'])
+            if non_ssml_voice_found:
+                logger.info(f'with voice {voice_key}, use non-ssml input')
+                input_text = google.cloud.texttospeech.SynthesisInput(text=text)
+
+            speech_request = {"input": input_text, "voice": voice, "audio_config": audio_config}
             response = client.synthesize_speech(
-                request={"input": input_text, "voice": voice, "audio_config": audio_config}
+                request=speech_request
             )
 
             # The response's audio_content is binary.

cloudlanguagetools-11.6.1/cloudlanguagetools/keys.py

@@ -0,0 +1 @@
+KEYS='gAAAAABnrQvMFfc-BMsxOuIQoYBOy1DUx6trTwT-GWVije9JGGDmwhFHPGpxLGLH1V-CyDelTiHazv7IFK1mffZn6Zqk_Pd7QWPVd1PvOCxRuQdjRfI-FcEw_ORxbs2JMMc5LVkad7OMNgH-eEDJTQ8GNLD2PpoOpK1MVUv7_m612S-Hg3DeO44fZ4QYTGhsl12sSTTVRZCbK8Uy2URwc4uaeSRPRhlKJeZ1Ed3jMRI0slDZLYwUVmerdyWxDtZaDJS2n8AZ5Dd6QC4cswBigNtuCgmtZ4lG_2j6mN8Gc5jVsXFosCmewzgcrZ4E1BHYg3q7LZXzh1YydM_SmHHt95akzfIFVbuxSOila0jbiGuxDK0RKqj3O-ut1N0ZZBtxYlE_6VrBgCVHNllcjMxbDfpmTi0f6OzpYItquyDhV93xoGlOltRNh5_NvbIhd-L9NoqGvEEI7am5-_sHpGPlSHUAfCymgjc0e2ScvsT_kAdPkQfq3aUfN-ic-LwW7Zm0Yft_gpgNQr88l6O33sd3XLDKHhFFne_Hj45rEZxYscUzqjersnnFGAVLQ9M8LwVIXKEV3GiNsIJRnDW8E70LjE-oIj7AjI8hhoN49aCsS9E8Rc3y1LecwppZ0DWuunaKRHfC-o5z-EpFuDiJg-G3cTw0TvNFSAJrpMuZTo34JyXjccyIl9_-Ie86h0DRlO6dbW5wdpFcj4YTcSklhFQ9rPBMXaTR72l1W2Eq6YckeMu437HswlBggIY1jzjlXDMAhTbIUzOwSjFh-2ydANqtdueMwUce9LHnc6gIWap1gaPIWe1iRbrOyTpziFXNkTEmFwaVVhFitWxf7V0yP26QeedFVscv2F9STeq5haLtVUPDKYwjkjQVnzcSVRV3IQpPVTeqfn60QYisZHD7kZt3NX3i-Tk9lAR5PGYqmO6FLPeGQFLrG6lauuYkas2qQaP89XX0f__9geXw59T7Mip3Pipm8Cq_YUcqeqqItos2HsUW8VKxPZeeBAjqspUgywzJ7NbPBb7qVs-zAQZ_S75DGoPOIcZ4YhKXKAecZEv8A4dbCCeoJ3e8yJexKFkz10DTd6qDLYs1ncHFystCgm2bEAH9RamktCBGjEyGUpMSTv7l6WSe7kQZ9xUyutp9v2qsMGubvuDWPQy22HIpyw59M72M7uUDNh3tNYtriTliztHl3ZnSPazQOIkXBEPiHdSHaVaGuQXgN_0aUHMy3YTpNNHz3OMk2rhdzOD-CRBNKuMk6AT7f1TsOKzUwnfsiUv05VmQ9dZTbZRUCUl98oarNRLV3XDgbcwo6iCD5pXeCf0WkVbxJg6t9vvg7LP0vdalLgUO3tdYOaIXG1e8M6onk4wK5F3gJhFxjewqEf8PrFpNALxZegXymq-x9qGlmFYnXtbecSzcPryzNUIZ5S0DEBlCVSeg2b1n60WMLNpzyhoUs-pWgRl4UaHs9Y69Z-QbmhnMYYMfM9X99FxN0Bcfm0EU3TlBcdZIF3NQ_r3c3RNPdSRrbHayI9_J8ScPthBqSYvo0grstUJckELTr3TVhMccJtAcq7nS5zRRdJRmoQD93u_GntR2EjCxHVBOuxxd6HdPT0xOQReguJsEpyCta5RhJ9qytmL4eN8TirkXSDe27rKSQnWKNfE7vVpqs6Wz7cR_FH3lnUjkDQFhlqV29pojoWHqNwTf1ZX5lZJIaPwIbLW3JyxmYpFF1Gl3yOVEwXRaHWJrCtoFTcI6qUpnTf1d04ZPG160AtlITd4Zq6LwBB9nX3GdqNBDIz9hDSb4F7F5lEh4H7vfcfhtOzKzCyx2vcNi6ZClu23GyeO1CU39FkF2apC7XIs3GguId2e7z5mprkLcyoJMrfCdtJ65GmXVVMDKEePoDY3KtUXNMvsjEZhIjaRuYe_njHGQ6iGpdT-pq7U_AGYaWq0yur86wWcIPM593-9xEgdQEF1zlMJP-NGmvygWLJn2WFnnzBmMWEUL6hCoNYxfdk8x56cE9Le9FH3LFcnvQJxtOIE8xEfx_cf72qpMbuqTx92vMOt1sq0hPH3szbj1ZRGyoZ1xyJxhvrVJykqcJdef1jkRQs0-fRB4rUBh9YmshbaZh-DhJE_W7dRxSt0IgYR8avtrUb13i-somxs0MTaHevdRuX-jHgWoT97Tx4yS4dIkJuJnQzw54M1z-X5vckUTa7zbXXwSNZOLJQhTc7ttekRmW_qDtKRZzmGIl3xPRFIyaKXUW8k5W9igc5y8pr63ED8fJ5YcV__s7gv_3UbT2hWdKr4xX1dlktRnHJTYX9-hVgmmEh9NIWE-w2_sxL4oIBKbC-U5D9P0UdYxw02fe0XMaYxZKHIBzmyYFXdBAFZb1VbLhGZEv6V3vV1JIRo8uxzA-XK0xC8HOkAuKYGj9XEB-1SRMZAfZi1EGRiPwz23aXelargPrwbxMNKb0hPV0Vu4mYJy-E7Aq3BsV4dVA75vbXh1K-XpXfNwwsOohIUsdkLHqCn0t2qYe0oEMqMrHtP47H3I9FnS6ucDA_v2Cj47vSet8np5iIHM1npyYwlsxTHWYZ-ShWzg0f2CZ9HZft0Rv0voo4SS966bzfG8oKiB7-QgV79oI98pVM3lIBbL5Xy--cAaPfIg4Rs2eIy0e48IbYGffiCie12FSV18Wtz6MPDpCYOag4xRsJQAxHc-ixq-QfFXEe1lsA_1YkbL13xF2OtvEauZXUr3GuZNCwJA3uHGwME4A_HqJDXn9HKg7bvxE2S7klYRQD0Hp8tTGX2ACmPbmD_VB-0c3h8Bh5nehClOh2aC54xgaCGj9U6ZP39skE5kd8kYFHRH751Hg6IKl3ZI1GhWopmHGl1rN84t20R8tjlTX_b8r5M-xrgAEDD05Qo3CMBZSSSlGWbyOHXdJLJAu6wbbhmmdMYPnHEZLmRGuJerP9iO5BdrwABvMi0nmvbMakiiLlA2MAo9mF-UoAzGGcvJXlJrMaOTbuOz2z-pgDQRgRaZlurf7kcc8fkHrOu1OkEOdZUsbPsJHux-JX36J4qq6DZzFWF30fCIgEIHK2m24O-qz9yD7QCo7aU8lO0T-M2gX7BmRAl76_IcZHod2McFVBXC5GVJoxXNiBdfi6JGeDY3sI2vkheKVSYecmRziHingUfXNDO8exX9z-heXlh7cRbeFX3XYTWrh_Koz-fQaKjpPHncB9_ox6_230UKupnyLfPNgnBbjJFI6vbSHjkJD5S8o7q1gvcysj_qvznGIxbd5gCeaZG-zAqHxSCLcQPQShmuADE_OXyM9ZkFBod4QF8EN1m-WCUEzhii4dVqWwGZQAuA-MTVlVBxvZM2k8xoFhFkD45uWu6V2mln14hvxfSuYUZkeDAhHEVZfe8Le-8oaCT2IU8rJhzF8I-gEagcDRZANr4CfsRKHiWrp8blm_UJgFDEzhR7aUJjALDUHqynNcP9re2OAv5X2R6s3nVG-gJ4eu0EW1HnX9tJtxH5E8ehSbx0mGQzZuP5fYcJ3RRYIxk_i4PDCx7QRaawv9oi7E-UEcTDDLp2TUkytBNOlUJcNs3kqfmjqQV-GA5c50apyMcHwAvMCXbMAshLDMc8sH0VHDMejZHspBRyvnZXLAhdQ0CVa9Lde_BRv5hPxslqfHiUCSm6x9BcCbXqER0MRfm65TMK3so28pGtIMl8QhzFaIBHUN0SkxX1tM3DzIhNmXEp0BLF-gHRyUCGjLaUPCUtV8efwqQcv8hB3Vm1almBIIGX2co0KO79qaWfZHAhXH2SEecYLPns2wb4jMouCcJB91mpzUz-vod54Ks1C-wR4M7uKQF0q9_luWuOjDcfwVELNTdiEyuroum347H_S0b0-mksmjCEVzjrpfyrajVCIgaUOx6RbrW6dxbfR15nSssrdY-I8XbeHCccu1f5qdq1t8vx7lzrOXMrML9T04iNFF132tkG5y_SVnN0ZXpvrEAxd0IuMAEFvIujovs6IAoy37xBX-vAOP_KV74MscDxJiAroiRCab7d3YI5j8vStdgEEurFGQ-3DLRbggW5O3kM1FJygHF0givqqvo1S4br9uG1drgl9U2JuKPsB2s8QpGIUUi9g1VJ3k8AIg5sBeAlM5SEtrXsXoWMhd-JywBSZmpBpdRDPdazxANwC968B1ol2IApTBVnmFuXHtEKyhqM8mlpAq6jkyG0LZ41wgrHNtrGcjY9DCxP9JpmToGitZLxvyVP1A9uPhK5d6raIGJUNCcQvcNc5HUFkNxrSTMmFQ5VbHh-GqiTF8gDboPpr9jBTSNECYUk9N_jEZIrL1x4rbYyDZKLAws_7QBkln6h20X8VLd1l1HvgSaWC-nhpvvRsOjLblTM1HRy7h9ZZV7zeBGw5IKYH5ZdXqx46kgazJcoE6Ap-IZpmhZEj9gP_VA-SxFkec1gMH3awk68igpKVGaHgtWyLDBW62o4QwCkbN3PX7kKNxHSAkD0AtS6Uu6B6pcqGwdSidr1SPkQukygWIXdrLlWyjbnnKxax0BVbYfuBIYuZd0I-WQx4eZbTXRBMbgmlljMu_AlzfMsLy9fQhEUpr_J6ujJmCPbkGBC6FEzMNGmnDMZ5tk3D_QiWPPNJXAN-_WkriJOTXxvnPDtOX4qn_nnFBV6W7g4q_PV4Q_gle3H_yGsw8GkrSSW5AB6jZV774yLfANxWiEXtD_gpaBHm3rCl1LiXrWraA5f8iE4W-ZFqFslXzd9f72mTyBjbiTwHftLJppr_SbWZ04N4IIiOZbE7bxlAuq0INlOVpu8EoJcEgSSF0SuZrunW8s2qUSuNivnUeZoq2fMsfH4sZZ9OSO1xJQRRUjPPKS_97eK3_V-OxSwVcag2qD2RXWvPaAKJGVuJifOfskD_OtFcX6O1Jts0NfqB6hwFrNhs9wtulpsk90-zAF4LckzhDSEIjGEn5tozAVLvqkZpv8l-dc8X0Yb_T4ieWabHor3G778-ATP4B1xcCa4grJjSYLNhAljVKB5O_Wmc2PBYLu3BZYvZdnuyjge7YeuRHowOXlhGDUcO42ZzxFhD2sesIU2oXUKFg8Xj4Wiq1bHtd7PiRJ2M6KLfma8JXpfoKwqOFxnpM5ojlFwlKFbCBy4vRMwLeq6vw_iBfNK8xtgk4Aw6EE7XRYBCO98No4FTNixyRLfCqq9LAWI_Z1C0FvOMTkagdTmrhCafWvxKZPBqv7klfTS3biHzyqBhEWzVQBeMQYOC88QaXZ0iPPs1-pKW8ttpkj38WuhpCrDGR21KxeibHk6vlT9ajBysbkH_blDfUgAEHucIAdn-WkWzN_K18kSpLtoMaptqEF39DAlqmA80ox1-TQDaRc6cyPqzKuPVpFF2ly7mEa2yI5ifAIMmu-Ohi7XmXM57XZHXCz1GZSlxkN48hwU5Say8qUqV05djwmRgLaXYhcVdEbBv9Xjob31RpOEXQTRHQyZtz7C5VjfFcxYdrigsUrc6xH8pbNoDZiPMuDU8XWGcctCdBH2tzhmbRnayOGwkyt8q4xPMWbl3XtgHNLb_8OLfwSNQs-8cXHhaj_e2dDvRtLJqcM8WUJVSriW6Ra_q9OVdz2v4-utgJ0agcMEmuF6EogvlTF9vLVmBrPqrkboTaa35wnYR0mGFcnxnZ076DK7MxCIhSXxwYWMxsCvc_2FytMWQQpyqh9Pb7PputSHB5VIgVxWGAVPfNk_uGBoguRiDh7bYEevktSyGAyXWvUi7vc5terqztSFa4XCtrvonnHVxnNFEYX3LoqCnnZA3qDIRdcej-uJRGq3jdZlNVsml7Xhw9K4ABqEULHThFGdf3cDuewYt00ZTKxeTDbG5xcRW7D3f7PqgQZk2vj3jIdZZgROQmjHzNPdqMBsg8U_IapLkU63ZftxqldhgMza3jHayaAvFxLuEBX1YnZcBnXbVv2WEZGayhC1NaO6wQq4gT71mRF7ROq-1dKfEbRDmc26EehW20d6Lh0XPIxMquMwJZG-xD_hy40xmxlg9f-WvJU13OMVNkk-LC4GwBTLvOQ3aD0Kc0wgX0clZ08gxDIaFWZz33Qed5On__Ip7BQEsFqBkuEvSm-N_7_rPtyhIJj8QInn-9CTPLCHOSAjCUz01lheM5NBZcudmHhplVRJnl3Qj0_2aRGu6UjZJ-jX3tC-Par1GIZ3eK218iYKo5BOW23B1MIhbXkxLbraLO_0dUkSI_1qeq2OOfeQ0fAZ3Nbw5_UD6QHLDZOaB-8n5zAFxUZQ5WuwQBTnDoy7iMjUpBksmP02A72yR1Ia-DTxlA_7IwXa2q4gSH4feyEcejO3tYdDFs38UBP6Xlv9pJZDQ65lCAd0bp3yiVyuQtkcdvS0Xn5Xp-Nc43Z4Xl36FlVmll4zV6DEk69ome75QrMe1gIOQfo796-RrywrEho-KfOXSeSj9UG8OC8fXE4uR2KnVOa7yuVw_4gEM9aUheHFW9_6zJPb03__Ca5tSKJq6OEndhyWHWcjwIo7f2fTI7t_sMUQfXgnfXZYm7iHh4etwhoqUS94VOwyAV4VmDuhU7EsSIglPVvm'

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools/service.py

@@ -24,6 +24,8 @@ class Service():
         try:
             kwargs['timeout'] = cloudlanguagetools.constants.RequestTimeout
             response = self.post_request(url, **kwargs)
+            if response.status_code >= 400:
+                logger.error(f'{self.get_service_name()} audio request failed with status code {response.status_code}: {response.content}')
             response.raise_for_status()
             output_temp_file = tempfile.NamedTemporaryFile(prefix='clt_audio_')
             output_temp_filename = output_temp_file.name            

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools/servicemanager.py

@@ -28,6 +28,7 @@ import cloudlanguagetools.spacy
 import cloudlanguagetools.wenlin
 import cloudlanguagetools.libretranslate
 import cloudlanguagetools.openai
+import cloudlanguagetools.alibaba
 import cloudlanguagetools.encryption
 import cloudlanguagetools.translationlanguage
 
@@ -63,6 +64,7 @@ class ServiceManager():
             self.services[cloudlanguagetools.constants.Service.MandarinCantonese] = cloudlanguagetools.mandarincantonese.MandarinCantoneseService()            
             self.services[cloudlanguagetools.constants.Service.Wenlin] = cloudlanguagetools.wenlin.WenlinService()
             self.services[cloudlanguagetools.constants.Service.OpenAI] = cloudlanguagetools.openai.OpenAIService()
+            self.services[cloudlanguagetools.constants.Service.Alibaba] = cloudlanguagetools.alibaba.AlibabaService()
 
     def configure_default(self):
         # use the stored keys to configure services

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudlanguagetools
-Version: 11.5.0
+Version: 11.6.1
 Summary: Interface with various cloud APIs for language processing such as translation, text to speech
 Home-page: https://github.com/Language-Tools/cloud-language-tools-core
 Author: Luc

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/cloudlanguagetools.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ LICENSE
 README.rst
 setup.py
 cloudlanguagetools/__init__.py
+cloudlanguagetools/alibaba.py
 cloudlanguagetools/amazon.py
 cloudlanguagetools/argostranslate.py
 cloudlanguagetools/audio_processing.py

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/setup.py

@@ -6,7 +6,7 @@ from setuptools.command.install import install
 # twine upload dist/*
 
 setup(name='cloudlanguagetools',
-      version='11.5.0',
+      version='11.6.1',
       description='Interface with various cloud APIs for language processing such as translation, text to speech',
       long_description=open('README.rst', encoding='utf-8').read(),
       url='https://github.com/Language-Tools/cloud-language-tools-core',

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/tests/test_audio.py

@@ -12,6 +12,8 @@ import json
 import time
 import pprint
 import functools
+import tempfile
+import backoff
 
 import audio_utils
 
@@ -22,6 +24,7 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')
 import cloudlanguagetools
 import cloudlanguagetools.servicemanager
 import cloudlanguagetools.options
+import cloudlanguagetools.errors
 from cloudlanguagetools.languages import Language
 from cloudlanguagetools.languages import AudioLanguage
 from cloudlanguagetools.constants import Service
@@ -34,7 +37,7 @@ def get_manager():
 
     return manager
 
-
+BACKOFF_MAX_TIME=30
 
 def skip_unreliable_clt_test():
     def decorator(func):
@@ -47,6 +50,18 @@ def skip_unreliable_clt_test():
     return decorator
 
 
+@backoff.on_exception(backoff.expo,
+                      requests.exceptions.RequestException,
+                      max_time=BACKOFF_MAX_TIME)
+def get_tts_voice_list_json_with_retry(manager):
+    return manager.get_tts_voice_list_json()
+
+@backoff.on_exception(backoff.expo,
+                      requests.exceptions.RequestException, 
+                      max_time=BACKOFF_MAX_TIME)
+def get_tts_voice_list_v3_with_retry(manager):
+    return manager.get_tts_voice_list_v3()
+
 class TestAudio(unittest.TestCase):
 
     ENGLISH_INPUT_TEXT = 'This is the best restaurant in town.'
@@ -59,17 +74,8 @@ class TestAudio(unittest.TestCase):
     def setUpClass(cls):
         cls.manager = get_manager()
         cls.language_list = cls.manager.get_language_list()
-        num_tries = 3
-        success = False
-        while success == False and num_tries >= 0:
-            num_tries -= 1
-            try:
-                cls.voice_list = cls.manager.get_tts_voice_list_json()
-                cls.voice_list_v3 = cls.manager.get_tts_voice_list_v3()
-                success = True
-            except requests.exceptions.ReadTimeout as e:
-                logging.exception(f'could not get voice list, timeout')
-                time.sleep(1)
+        cls.voice_list = get_tts_voice_list_json_with_retry(cls.manager)
+        cls.voice_list_v3 = get_tts_voice_list_v3_with_retry(cls.manager)
         
         import http.client as http_client                            
         http_client.HTTPConnection.debuglevel = 1
@@ -89,7 +95,8 @@ class TestAudio(unittest.TestCase):
 
     def get_voice_by_service_and_name(self, service: Service, voice_name) -> cloudlanguagetools.ttsvoice.TtsVoice_v3:
         subset = [x for x in self.voice_list_v3 if voice_name in x.name and x.service == service]
-        self.assertEqual(len(subset), 1)
+        num_voices = len(subset)
+        self.assertEqual(num_voices, 1, msg=f'found {num_voices} voices for {service} and {voice_name}, expected 1')
         return subset[0]
 
     def get_voice_by_lambda(self, service: Service, filter_func, assert_unique=True):
@@ -107,23 +114,16 @@ class TestAudio(unittest.TestCase):
         voice_service = voice.service.name
         return self.verify_voice_internal(voice_key, voice_service, text, recognition_language)
 
-    def verify_voice_internal(self, voice_key, voice_service, text, recognition_language):
+    @backoff.on_exception(backoff.expo,
+                        cloudlanguagetools.errors.TransientError,
+                        max_time=BACKOFF_MAX_TIME)
+    def get_tts_audio_with_retry(self, text, voice_service, voice_key):
+        audio_temp_file = self.manager.get_tts_audio(text, voice_service, voice_key, {})
+        return audio_temp_file
 
-        max_tries = 3
-        num_tries = max_tries
-        get_tts_audio_success = False
-
-        while get_tts_audio_success != True and num_tries >= 0:
-            num_tries -= 1
-            try:
-                logging.info(f"attempting to retrieve audio from {voice_service}, attempts: {num_tries}")
-                audio_temp_file = self.manager.get_tts_audio(text, voice_service, voice_key, {})
-                get_tts_audio_success = True
-            except cloudlanguagetools.errors.TimeoutError as exception:
-                time.sleep(1) # allow retry
+    def verify_voice_internal(self, voice_key, voice_service, text, recognition_language):
 
-        if num_tries < 0:
-            raise Exception(f"could not retrieve audio from {voice_service} after {max_tries} tries")
+        audio_temp_file = self.get_tts_audio_with_retry(text, voice_service, voice_key)
 
         # check file format
         is_mp3 = audio_utils.is_mp3_format(audio_temp_file.name)
@@ -135,11 +135,39 @@ class TestAudio(unittest.TestCase):
             print(f.read())
 
         self.assertTrue(is_mp3)
-        audio_text = audio_utils.speech_to_text(self.manager, audio_temp_file, recognition_language)
-        assert_text = f"service {voice_service} voice_key: {voice_key}"
-        self.assertEqual(audio_utils.sanitize_recognized_text(text), audio_utils.sanitize_recognized_text(audio_text), msg=assert_text)
+
+        audio_format = cloudlanguagetools.options.AudioFormat.mp3
+
+        self.recognize_and_verify_text(audio_temp_file, text, recognition_language, audio_format)
+
+
+    def recognize_and_verify_text(self, 
+                audio_temp_file: tempfile.NamedTemporaryFile, 
+                expected_text: str,
+                recognition_language: str,
+                audio_format: cloudlanguagetools.options.AudioFormat):
+        # recognize text
+        # ==============
+        sanitized_expected_text = audio_utils.sanitize_recognized_text(expected_text)
+        # first, try openwhisper
+        logger.info(f'attempting to recognize text using OpenAI. expected text: {sanitized_expected_text}')
+        audio_text_openai = audio_utils.speech_to_text_openai(self.manager, audio_temp_file, audio_format)
+        sanitized_openai_text = audio_utils.sanitize_recognized_text(audio_text_openai)
+        if sanitized_expected_text == sanitized_openai_text:
+            # openai text matches
+            logger.info(f'found a match on OpenAI with {sanitized_openai_text}=={sanitized_expected_text}')
+            return
+        else:
+            logger.warning(f'failed to recognize text using OpenAI. expected text: {sanitized_expected_text} got: {sanitized_openai_text}')
+
+        # second, try azure
+        logger.info(f'attempting to recognize text using Azure. expected text: {sanitized_expected_text}')
+        audio_text = audio_utils.speech_to_text_azure_wav(self.manager, audio_temp_file, recognition_language, audio_format)
+        sanitized_azure_text = audio_utils.sanitize_recognized_text(audio_text)
+        self.assertEqual(sanitized_expected_text, sanitized_azure_text)
 
     def verify_service_audio_language(self, text, service, audio_language, recognition_language):
+        """Legacy version using voice_list"""
         # logging.info(f'verify_service_audio: service: {service} audio_language: {audio_language}')
         voices = self.get_voice_list_service_audio_language(service, audio_language)
         self.assertGreaterEqual(len(voices), 1, f'at least one voice for service {service}, language {audio_language}')
@@ -184,8 +212,9 @@ class TestAudio(unittest.TestCase):
         # pprint.pprint(mandarin_azure_voices)
 
         xiaochen = [x for x in mandarin_azure_voices if 'Xiaochen' in x.name]
-        self.assertEqual(len(xiaochen), 3, str(xiaochen)) # there is a regular and a multilingual
-        # and also a DragonHD
+        logger.debug(f'xiaochen voices: {pprint.pformat(xiaochen)}')
+        self.assertIn(len(xiaochen), [3, 4], str(xiaochen)) # there is a regular and a multilingual
+        # and also a DragonHD, and DragonHD V1
 
         xiaochen_single_language = [x for x in xiaochen if len(x.audio_languages) == 1][0]
         self.assertEquals(xiaochen_single_language.audio_languages, [AudioLanguage.zh_CN])
@@ -263,7 +292,8 @@ class TestAudio(unittest.TestCase):
         mandarin_azure_voices = [x for x in azure_voices if AudioLanguage.zh_CN in x.audio_languages]
 
         xiaochen = [x for x in mandarin_azure_voices if 'Xiaochen' in x.name]
-        self.assertEqual(len(xiaochen), 3) # there is a regular and a multilingual, and dragonhd
+        self.assertIn(len(xiaochen), [3, 4]) # there is a regular and a multilingual, and dragonhd, 
+        # and dragonhd latest
 
         xiaochen_single_language = [x for x in xiaochen if len(x.audio_languages) == 1][0]
         xiaochen_multilingual = [x for x in xiaochen if len(x.audio_languages) > 1][0]
@@ -317,6 +347,16 @@ class TestAudio(unittest.TestCase):
         source_text = '老人家'
         self.verify_service_audio_language(source_text, Service.CereProc, AudioLanguage.zh_CN, 'zh-CN')
 
+    def test_mandarin_alibaba(self):
+        # pytest test_audio.py -k test_mandarin_alibaba
+        source_text = '老人家'
+        self.verify_service_audio_language_v3(source_text, Service.Alibaba, AudioLanguage.zh_CN, 'zh-CN')
+
+    def test_english_alibaba(self):
+        # pytest test_audio.py -k test_english_alibaba
+        source_text = 'I am not interested.'
+        self.verify_service_audio_language_v3(source_text, Service.Alibaba, AudioLanguage.en_GB, 'en-GB')
+
     @skip_unreliable_clt_test()
     def test_mandarin_vocalware(self):
         # pytest test_audio.py -k test_mandarin_vocalware
@@ -393,8 +433,17 @@ class TestAudio(unittest.TestCase):
 
     def test_ssml_english_amazon(self):
         # pytest test_audio.py -k test_ssml_english_amazon
+
+        us_standard_neural_voices = [x for x in self.voice_list_v3 if 
+                  x.service == Service.Amazon and
+                  x.voice_key['engine'] in ['standard', 'neural'] and 
+            AudioLanguage.en_US in x.audio_languages]
+
+        # choose random voice from standard_neural_voices
+        standard_neural_voice = random.choice(us_standard_neural_voices)
         source_text = 'hello <break time="200ms"/>world'
-        self.verify_service_audio_language(source_text, Service.Amazon, AudioLanguage.en_US, 'en-US')
+        self.verify_voice_v3(standard_neural_voice, source_text, 'en-US')
+
 
     def test_ssml_english_watson(self):
         # pytest test_audio.py -k test_ssml_english_watson
@@ -487,8 +536,9 @@ class TestAudio(unittest.TestCase):
         options = {'rate': 0.8, 'pitch': -10}
 
         audio_temp_file = self.manager.get_tts_audio(source_text, service, voice_key, options)
-        audio_text = audio_utils.speech_to_text(self.manager, audio_temp_file, 'fr-FR')
-        self.assertEqual(audio_utils.sanitize_recognized_text(source_text), audio_utils.sanitize_recognized_text(audio_text))
+
+        self.recognize_and_verify_text(
+            audio_temp_file, source_text, 'fr-FR', cloudlanguagetools.options.AudioFormat.mp3)
 
     def test_azure_format_ogg(self):
         service = 'Azure'
@@ -507,6 +557,18 @@ class TestAudio(unittest.TestCase):
         audio_text = audio_utils.speech_to_text(self.manager, audio_temp_file, 'fr-FR', audio_format=cloudlanguagetools.options.AudioFormat.ogg_opus)
         self.assertEqual(audio_utils.sanitize_recognized_text(source_text), audio_utils.sanitize_recognized_text(audio_text))        
 
+    def verify_service_audio_language_v3(self, text, service, audio_language, recognition_language):
+        """Version using voice_list_v3"""
+        voices = [x for x in self.voice_list_v3 if x.service == service and audio_language in x.audio_languages]
+        self.assertGreaterEqual(len(voices), 1, f'at least one voice for service {service}, language {audio_language}')
+
+        # pick 3 random voices
+        max_voices = 3
+        if len(voices) > max_voices:
+            voices = random.sample(voices, max_voices)
+        for voice in voices:
+            self.verify_voice_v3(voice, text, recognition_language)
+
     def verify_wav_voice(self, voice: cloudlanguagetools.ttsvoice.TtsVoice_v3, text: str, recognition_language: str):
         # assert that the wav format is in the list of supported formats
         self.assertTrue(cloudlanguagetools.options.AudioFormat.wav.name in 
@@ -514,8 +576,12 @@ class TestAudio(unittest.TestCase):
         options = {cloudlanguagetools.options.AUDIO_FORMAT_PARAMETER: cloudlanguagetools.options.AudioFormat.wav.name}
         audio_temp_file = self.manager.get_tts_audio(text, voice.service, voice.voice_key, options)
         audio_utils.assert_is_wav_format(self, audio_temp_file.name)
-        audio_text = audio_utils.speech_to_text(self.manager, audio_temp_file, recognition_language, audio_format=cloudlanguagetools.options.AudioFormat.wav)
-        self.assertEqual(audio_utils.sanitize_recognized_text(text), audio_utils.sanitize_recognized_text(audio_text))
+
+        self.recognize_and_verify_text(
+            audio_temp_file, 
+            text, 
+            recognition_language, 
+            cloudlanguagetools.options.AudioFormat.wav)
 
     def test_azure_format_wav(self):
         fr_voice = self.get_voice_by_service_and_name(Service.Azure, 'Denise')
@@ -525,6 +591,11 @@ class TestAudio(unittest.TestCase):
         fr_voice = self.get_voice_by_service_and_name(Service.Amazon, 'Mathieu')
         self.verify_wav_voice(fr_voice, self.FRENCH_INPUT_TEXT, 'fr-FR')
 
+    def test_amazon_generative(self):
+        amy_generative_voice = self.get_voice_by_lambda(Service.Amazon, 
+            lambda x: x.voice_key['engine'] == 'generative' and 'Amy' in x.name)
+        self.verify_voice_v3(amy_generative_voice, self.ENGLISH_INPUT_TEXT, 'en-GB')
+
     def test_elevenlabs_format_wav(self):
         fr_voice = self.get_voice_by_lambda(Service.ElevenLabs, 
             lambda x: 'Charlotte' in x.name and x.voice_key['model_id'] == 'eleven_multilingual_v2')
@@ -551,7 +622,8 @@ class TestAudio(unittest.TestCase):
         self.verify_wav_voice(en_voice, self.ENGLISH_INPUT_TEXT, 'en-US')
 
 
-    def test_google_voice_journey(self):
+    @pytest.mark.skip(reason="journey voice seems to be gone")
+    def test_google_voice_journey_old(self):
         service = 'Google'
         source_text = self.ENGLISH_INPUT_TEXT
 

{cloudlanguagetools-11.5.0 → cloudlanguagetools-11.6.1}/tests/test_translation.py

@@ -7,6 +7,7 @@ import json
 import pprint
 import time
 import requests
+import backoff
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
@@ -22,25 +23,21 @@ def get_manager():
     return manager
 
 class TestTranslation(unittest.TestCase):
-    def setUp(self):
-        max_retries = 3
-        retry_delay = 5  # seconds
-
-        for attempt in range(max_retries):
-            try:
-                self.manager = get_manager()
-                self.language_list = self.manager.get_language_list()
-                self.translation_language_list = self.manager.get_translation_language_list_json()
-                self.transliteration_language_list = self.manager.get_transliteration_language_list_json()
-                self.tokenization_options = self.manager.get_tokenization_options_json()
-                break  # If successful, break out of the retry loop
-            except requests.exceptions.RequestException as e:
-                if attempt < max_retries - 1:  # If not the last attempt
-                    logging.warning(f"Request failed. Retrying in {retry_delay} seconds... (Attempt {attempt + 1}/{max_retries})")
-                    time.sleep(retry_delay)
-                else:
-                    logging.error(f"Max retries reached. Unable to set up the test environment.")
-                    raise  # Re-raise the last exception if all retries failed
+    
+    @classmethod
+    @backoff.on_exception(backoff.expo,
+                        requests.exceptions.RequestException,
+                        max_time=60)
+    def get_all_language_data(cls):
+        cls.language_list = cls.manager.get_language_list()
+        cls.translation_language_list = cls.manager.get_translation_language_list_json()
+        cls.transliteration_language_list = cls.manager.get_transliteration_language_list_json()
+        cls.tokenization_options = cls.manager.get_tokenization_options_json()
+
+    @classmethod
+    def setUpClass(cls):
+        cls.manager = get_manager()
+        cls.get_all_language_data()
 
     def test_language_list(self):
         self.assertTrue(len(self.language_list) > 0)
@@ -119,7 +116,11 @@ class TestTranslation(unittest.TestCase):
         'delivery people'])
         self.translate_text(Service.Google, '中国有很多外国人', Language.zh_cn, Language.en, 'There are many foreigners in China')
         self.translate_text(Service.Azure, '成本很低', Language.zh_cn, Language.fr, 'Le coût est faible')
-        self.translate_text(Service.Google, '换登机牌', Language.zh_cn, Language.fr, ["Changer la carte d'embarquement", "changer de carte d'embarquement", "changer la carte d'embarquement"])
+        self.translate_text(Service.Google, '换登机牌', Language.zh_cn, Language.fr, 
+            ["Changer la carte d'embarquement", 
+             "changer de carte d'embarquement", 
+             "changer la carte d'embarquement",
+             "échanger la carte d'embarquement"])
         self.translate_text(Service.Amazon, '换登机牌', Language.zh_cn, Language.fr, 
             ["utilisez votre carte d'embarquement", # seems wrong, but amazon returns this occasionally
              "modifier la carte d'embar", # seems wrong, but amazon returns this occasionally
@@ -197,6 +198,7 @@ class TestTranslation(unittest.TestCase):
         self.assertTrue('Watson' in result)
 
         possible_french_translations = [
+            'Très faible coût',
             'Le coût est faible',
             'Le coût est très faible',
             'à bas prix', 

cloudlanguagetools-11.5.0/cloudlanguagetools/errors.py

@@ -1,15 +0,0 @@
-
-class ApiKeyNotFoundError(ValueError):
-    pass
-
-class RequestError(ValueError):
-    pass
-
-class TimeoutError(ValueError):
-    pass
-
-class NotFoundError(ValueError):
-    pass
-
-class OverQuotaError(Exception):
-    pass

cloudlanguagetools-11.5.0/cloudlanguagetools/keys.py

@@ -1 +0,0 @@
-KEYS='gAAAAABnCcYzERlg56peIVaJoWPgT7m06v9-gZ-xuDco6PWxZEu-BRxgHR9UaqN3g8HzKcfVSS-j1rBf-x0SHZlFQwcRlIQIY1S9mE3Wm8I6_xCGkFfqeuLkc8c9ScDIFnMt5MtLevVchJWklkl86HH6qoUZyzmzpQm5ihwdShaCwqryQZ95UDzuFis0rPDLX63gvmdWvXSiYRjXb4hO53ajE380bmjjp9E9mbH01Y6aKAz1hBpGWjEmepnajkkopM3uw-mCz0ABq9Ysdhs0yd9UklwvbOgUgdKL1BC_st0xt2piEShHtu0lQL5LOB1ZXBYHzFhk8wLlpftvDhYcFXapoZYBlg6d3tTKoOonPumN78CSIjQdxvTcG6mcA0p1VlAurcN4-YgtbDvtObsN5clpmDXXPupwMwf7Wddmut4sGGvMJXEba4EP5G6R_3Se8F6GRfawOgLVBAJ-SSpdKszJBu9w-BPIOzXkZ0D_ddQwC1CKURM4Kpjv0phHbqulykHgHe1l8mDr8ycC87647jowIz55An2ZttpRo9mdJztPGeuEjoz5RvQHJQvjmhAT7vajWnXv7sB2y50qUnWTF5ip1rde3GfDgmNzrOd7jSe8dxonAtFziKBCiCqc3pFfh7YgeHzWCR7lJcF7wIZvGJ-goLFiUT9uayXXVAVbPFku6et1DnUpDU48nyrO7lUvmwqRprTM706UWbbdZk8dBn7n91KzzjR4AbQhQ3hl6QuvA4WoJYdpzAaUN_4LUiWHNFWtd3uBLjHqTBLOHUlAETkkPkssm48pBqqALSJBWOrNSBIcLhAQI-JcJoer_fgH4KG4pDaeKgmGF7X26xi4rE48GsYwd7Tf2kRMQrHfyLefYDocMTCqH2I7NHs4i66LDvj_Zn9nmkSyuAbO1o-cnWvGmmrEymA39Jn1oiEG-f4gTv7kTkURSZu-FtBie9dKXTWG-EHy8qr7acFitEyuLnBfUpA75OWCEJG7wB4D5DfNti3zagUTq_DSjTBmTGSLRIlS0TVBEiyQ9Vjfpy4QaCd5AFXSXSI-sUzH_wIbY5kDysM8OJ_8rD1MeTDuXRJWLMJmokcOkjR8AXpVPxWCBvDmFnYhwjyA1AkvqpIUCw0H2W59ZQFG-k_AmKJXc3ZGMwEQQuE-fSlZr9jbwAGNTWJPvOVvZWil_yoT8Rb6P_KuA5px6CtfIERCEf-lpag_j6Rn9dGXAFtPrY1kCFCL6pFG9pgi8pHzSHpIkzCfYN1sGytUz6iiWeEV_ua9OCOyoTmuwHJBmMzD2SNMXaNmH3tcniIalbG817u0RUTgsgc79FlMnJV8fgub5kxw4Kedh9S8J6P4P2Z7JyF7x44IQxc9nGPLfT37wb8LibO_esJ-d8hI4XMyApoupt-hzCRNvPbmHRGyzoty9ubtkx_1mGLOMLjCDAEZqBpI1utKYL3j-U1eJDOJGBBugkvTCok9HkbMwWqsEUwMITfwpgz1Oc2ce-DK65Hg75KO55larQlJUU5QkjU65MRduSreCNT-8kLdWTSpyeReUGA1YhbmPhGNd3yzmEVnJV0VDxhrVjljabRpQIbYJ-13OXyRsrNWv386BDW5Wt8RH3MgyluTPh3azuaQkVn3u9C37cy1CgV67BaW0VPevpKFzAclVTQHcFI2zT4byccJSS8sOztnQ2Gzwl1ACFMGwAoso68JENQhEE8jMBLbI6Q-xENbSEaXj7E24oiTFTKsI--b8e1-dyLlTYl1aa-sdj6KKyx0Yr1MTWTZfzqo0Ep2-9JRJAeOBR_5_QMQBoRRwjJXmUeQGMSDynXaExHdn-lkggGxF6Rx_1iXwsvY_7n6uSM_Qg96KHS1eDFhyev1vBZ34MIgRFiYo8Ehr4uGJeXZqwAwFBQERkYR_xFPPgJ1ESk3J5xDa-WtvTgr7iEIulNfvbmx8rCZxvDwh0t6GhUmuLDf2xV0JS_hi7wRGSOLZ1Q4VtbDUr3q11FbKYIvoD_pHYKdqUovVn0oYUmwysWIKaZ-05GUF7Tu9SYluv5JB4cKf8r-Wi2GUQBC-KUnlfYsrGcLlje_puy8XGsU09NUzDDYeRkfeB3M6ZEk3agyfRf15_3813L05MoswWpQ2Kt5UUgY1SVgwxKAJltwN4tHzO2SUrxxalf7eBNV8PO8bPcIXMJwNh_jq6jPqzYbSBk2LRSuUWz_oQl2yUo2uBoL8kPAcR8WMp2uGymgHwPz9-msey2Vk1rfYcwK3yQY3P9KYN55heTdEua-QnS9d_rREqtsdToUH6WtPzMB9zwTrXe7wThP6u9FbqYkgzlCEqzdG-5OnOTZdRcQGhroxpL6fy17_B5RsTvBcjqvBiuR9X4C0mVgae1lwMQWF95ljH3j81oeUhFESdWUy94bluNAL-dHfTRoBwJQ9oaSWAT84sS6GyW98TUIM1M0pOphxLkFKndaD0lsHVxKQObKML0xb3QAACwt3lbcCAqA6_r33zBxreL4_GUGcPkG3eu-dTTztT-aQeL4DqgaOskOPdPuSi3ygUYMBLZ1slWpq6R9sT-pk9LtRMl192vy77fenhW2EEaPp3lgbwAzTsSmwL8Abtd_vEQ9gIAKHdZq0wBy0KUKQjPmho4Ry6tfsjJs2X-qpX0c-fsP_CCqZ8EMuMFVLd1xqtlA59Utp7lj9K-AObYX2ohAALIO4X146csvOyV0BgUoHu5ycNk6T93JcyeocSvOlgLjgn9YgAvgHw0tFSq8EyYGUb9ewrKyjNHuzFffjzvwgfupVJ1PiA8tO7TZuLMSY1NYnSQE3yLluKQNlH2oq9JN2XQ4wtr71yQq2R47GvcqpVqPn_VPCdcKnWqNRo4qlB8dRtfzyACWYRkLzeqWtQ5gEU5vipViECyBnQurpCBNVuMOckfff_dnBhMSkuhsvGbnecX7ThH5As8gDQG23TWb1agL-cnOKS6OPvZty1MiL0lB0jcvTNSHsgE2X1c9d_B_-yII9_EKnEoOh36y7YEWHN66sZE0qG2muawG31EnaYCtBU8FBUILcOI7xKwLZfZm2LxIdSd4oNd6fEWaRtYD-z4V0MkOhpWh2oUuxtpeB9tVMKv8UHBFifRrR87-3xykOEUSBDvTUb33tahvfSeDsEk24FEwa0ZJfq0NXma4a-MdpnvHDSblDPCrpw7AKY1wWWg-oEy4vMsO14qAIcFKgl6A4vWlGPO_rkunrgm9JlTXISRUqHDkgjxdFxdwlsDu-x1oIXvLpTbWveFM9E066Z7Rk0VKvaw8EPOw6FgqYH81yaHhhMzY8BMYiPgzteqtEwUceGoU2H3LXOK5-xw6_24c14nftqLjk0ujhY23HC8I3C8gA42LZsX6gD21rTVafSaS-XD4x2RMOfuhqsKvwODTu7tBx-HRBEekZRhVe_HNYHTi24XyDhQsCfLRZ4OtkI3j_-uGL34Am_qtapr3aQLTs0jLtBkeqmtpRVhw6Z3t2jcoHAzjhzlPUyTn_Pjc9RXWZ_mBNk_Fjl-waZZNii0kRqqvr99yjNZqopeweKfLtVLjHObpyL5DC9KTw7VUIAQgywFxFj7pgWmlPIdjQsBBIsqGFElOZmS-7UZ-ti79A2PEboqJYmDKOQXLMAdOt07O0GPornqeh-IYmaXWQ-BWdaMuaXVdq0Z1aRdi-mryOpcvy02N3L__vUdLXBQZIXG7iPA-Lu2t3S1ixn5ytVLPvCTmWPCl9BmCSZzy5vJK2BvSTF8spGW4sO2EAS_JktsvdnqH2RbTtenf7QcZP1c6aqyQTz44aW0KDnEMyTDBrwGwGesA4iVAZv6oxwSmD-d075paAXb5F9lu_9h8wkjllZyVDsYxpu2tRXNBynROQzSF4nvhdy3PGGSXKz0bPf5Ia9iZuUBg5ndH2SXgtFzW23lgbjNujgFfFi5bVqikyh8xJuIhMeRio8YwZP8IqSZwnezsIdoDEvihcclssrsyK4D9z9jx4UEHgK3dYTc5IpINmv4AnzKCEmMYgeHPnpTNWE7z7wk42rTQ--DuDe3mdwvAdqYfxSYMFu8MM-N1ZOqG2f_UljIbYnFQpYCiiXt8peffWYNx0NvKgRTuBzPZDJlZwGoi5H5Do_sht5kxX3fY4K9UegHcnnUPYvSm6aXOTNkHBC4fy3KGw-qxCrFpW8tx8twc0m2aYMXTR2XmHReLWOjrM6wFvGqf6JyDAieQEAJLCmAFjAgmeDHPpUymRvs4Cd9Xj821aCXoqDbE1MKNmr5OtIx8l8ktJzzzArrnfebu-S138_yD5ZtxddIx4D6jrUrdeTAb_IpSq5Ov9R4u7xZLhl19WhXDUQFcafVS19eyAZkh-JWkQKuVHuXg66rPCw4zFxeAHGnmu-Y7p7nsN303DGMD5b1ug4ameHGc9JpvGnfNEpw7dbbevmFwuAjkBOkutC1v2kVvmO4tnR5t3kEgJyBbgRMT4IldfFhWpMO0fdVjLAJCcTuJqm1jtE9xwbzL-OVmnNpjrG4Nh-kuOFEww8MjF9OgH8I1cGUqZpd9QSi6QfoVDA7Rb6DYcpRjgeSM2LVxD1nZT01ta1mD7AW-aprakQWk7MqVtU9RUbprmkNnL1td5AT7y9JoRukC0QhB-QtM8z2VwrX5k92bk7SoXXbmBpVysm-FKrzuY8yhYXCuyK996Pp7orkuZLbtAma1mRVOboRxx25GDKwPwZQN3vzBGxgcrTmr5Bw7uzaRIkPIO6kCLrRfgPHE0BPJcAI8jlDws1SSGrLZ1kpeOMwpoVtXij9jUFttwQWx0RGfXLYKK30H9cvIxrgaAwkIaq7J5-BeUmzPvZxZENTgyAgqFQWf_CbKgCDr8BTCtjCCsXsxk0QdgRL4B7ceBZ4orFjeCgWh2fEHg9YVNgegTL5vR5YH8hCnz4vBjA2diOU4ZMUvMdHQsIIbSK4Y29Lz3L27qsK8V55Go16-1u_ExHC5o5cV25cce4gzzJUugoHctrLWa73C8K5dlqh16W9gP_jekpfUPj52sfoi-aF9CteSvB8gyBjRtYNCEBjxNgAx_rTNZHL1jhEnZiGUmvs2B8ZSzdX8eWzr-NL5WN5xrysnMgPqCMBwnIRZrqgaccUGsuYJ9qag5WUcvhVS2QIwUj7_be41soNj1_5tA6Q-3dGdVNS8P7iPi79tSgP3FVcGCnW9-P2t8b6nBSn7FsbHLH-ytSNOVRcKyCt0jEa8x0-PRsnza67tWz_logEmPrRPrSaC4r7eCD04IIoZuSM4EcqaFWMIXEm_BNU9vcHSTRfZioxafIQAR7sMjZy0vxUZPIAsaodSu-QfmqJfH0eSXaEpfCngFiidD0YUz2pB8lQMRAvl_eXPynXccgyk7PsjtrMAjh-l48_C3t7hw1BYAPl8BLQzvOBB5__GOAofxItQa50VIx_FK2aT95n_6u-CcYSYP37y_y84AzuTEmPafqN0Y-0m-pjlq56P63RJXmH84VOHv1cfxV-5v4wf7vbrpU2WZOVrgudO0uvsU4dDjuzMkjiTSvqGNSnvp4HUrpZ0YSq8pwegHYTx8TpTFA8oo5UsM0jJY4nTDk9zPe2hRH_RDomNCJKYoTKNjcWaTn0apqq-0LyNtOBx2qAtYN9HKny-WMlI4EGIO4ZoU2j_Krln9NGXSo_CwuW58NBirfQ7RkMmByJFml7KymuhuCaN5SzKb3rTaOgU7Y-RI16c14YgC__8QDzDJeXKNDnlKs83qQWoFijrBAuSFw49G-OUpYEpx3pt7bmYpirL_NOaKfJ7_simblVpMJp6B3bbBnmg5YcnTNHwLOcW99CwTIximeASfGYuMqELYKnLw1nPTFOuZbw8M5IjacSwMiIWD0Oj0ZgiRaNzUWpubLXpRsk5Ap8fzVmIuQrN2BoyKdmvrvN3Ibwx8LolfWjE0I72R2bliQndIDbYkMVKUsZidigbCszLeQTm2wb8DOi4sryp3m7o6R-kEcw0aoFHnWezRqjA-h7oLUzwyM-Vd7o33HwxrxCiq5LbGvNmtQ4Y0uLndqWy4BaiIPKLXPx8hicexxyG_nb0TZ7MX2iDl0nmYvwe_-owxmw-0GQ7dVZfeLCJhjcR6R1ltjSe6KAeoOWBPymHwf2y7O_K31vw1VXfBG_Z8IP9LjMtNz9xNbDMat0V_MTCxDCUNLpKfRjjCr3jQOZQ8cEaBnIUC7ZXuqI6uZVNrAbc0zNSyC_PESFDV2-f1aQ426GpMZqXX2yFI5ieF2G9cPbpWgDez_J12EHTBFiUPoHxFi_0dSVz3qCWOgUCnbgBlQqyy1VXl38gJnKGSED6knhOrNZz0Y3CT1b_B1110EScTeePvzQRIx7R39ob1sxN'