update baseurl + add new lang

willisapi_client/services/metadata/language_choices.py

@@ -1,85 +1,123 @@
 # https://docs.aws.amazon.com/transcribe/latest/dg/supported-languages.html
-Afrikaans = "af-ZA"
-Arabic_gulf = "ar-AE"
-Arabic_modern_standard = "ar-SA"
-Chinese_simplified = "zh-CN"
-Chinese_traditional = "zh-TW"
-Danish = "da-DK"
-Dutch = "nl-NL"
-English_aus = "en-AU"
-English_birtish = "en-GB"
-English_ind = "en-IN"
-English_irish = "en-IE"
-English_new_zealand = "en-NZ"
-English_scottish = "en-AB"
-English_south_african = "en-ZA"
-English_us = "en-US"
-English_welsh = "en-WL"
-French = "fr-FR"
-French_canadian = "fr-CA"
-Farsi = "fa-IR"
-German = "de-DE"
-German_swiss = "de-CH"
-Hebrew = "he-IL"
-Hindi_ind = "hi-IN"
-Indonesian = "id-ID"
-Italian = "it-IT"
-Japanese = "ja-JP"
-Korean = "ko-KR"
-Malay = "ms-MY"
-Portuguese = "pt-PT"
-Portuguese_brazilian = "pt-BR"
-Russian = "ru-RU"
-Spanish = "es-ES"
-Spanish_us = "es-US"
-Swedish = "sv-SE"
-Tamil = "ta-IN"
-Telugu = "te-IN"
-Thai = "th-TH"
-Turkish = "tr-TR"
-Vietnamese = "vi-VN"
-
-LANGUAGE_CHOICES = [
-    Afrikaans,
-    Arabic_gulf,
-    Arabic_modern_standard,
-    Chinese_simplified,
-    Chinese_traditional,
-    Danish,
-    Dutch,
-    English_aus,
-    English_birtish,
-    English_ind,
-    English_irish,
-    English_new_zealand,
-    English_scottish,
-    English_south_african,
-    English_us,
-    English_welsh,
-    French,
-    French_canadian,
-    Farsi,
-    German,
-    German_swiss,
-    Hebrew,
-    Hindi_ind,
-    Indonesian,
-    Italian,
-    Japanese,
-    Korean,
-    Malay,
-    Portuguese,
-    Portuguese_brazilian,
-    Russian,
-    Spanish,
-    Spanish_us,
-    Swedish,
-    Tamil,
-    Telugu,
-    Thai,
-    Turkish,
-    Vietnamese,
+# (language_code, display_name)
+SUPPORTED_LANGUAGES = [
+    ("en-US", "English (US)"),
+    ("es-US", "Spanish (US)"),
+    ("ab-GE", "Abkhaz"),
+    ("af-ZA", "Afrikaans"),
+    ("sq-AL", "Albanian"),
+    ("am-ET", "Amharic"),
+    ("ar-AE", "Arabic, Gulf"),
+    ("ar-SA", "Arabic, Modern Standard"),
+    ("hy-AM", "Armenian"),
+    ("ast-ES", "Asturian"),
+    ("az-AZ", "Azerbaijani"),
+    ("ba-RU", "Bashkir"),
+    ("eu-ES", "Basque"),
+    ("be-BY", "Belarusian"),
+    ("bn-IN", "Bengali"),
+    ("bs-BA", "Bosnian"),
+    ("my-MM", "Burmese"),
+    ("bg-BG", "Bulgarian"),
+    ("ca-ES", "Catalan"),
+    ("ckb-IR", "Central Kurdish (Iran)"),
+    ("ckb-IQ", "Central Kurdish (Iraq)"),
+    ("zh-HK", "Chinese, Cantonese"),
+    ("zh-CN", "Chinese, Simplified"),
+    ("zh-TW", "Chinese, Traditional"),
+    ("hr-HR", "Croatian"),
+    ("cs-CZ", "Czech"),
+    ("da-DK", "Danish"),
+    ("nl-NL", "Dutch"),
+    ("en-AU", "English, Australian"),
+    ("en-GB", "English, British"),
+    ("en-IN", "English, Indian"),
+    ("en-IE", "English, Irish"),
+    ("en-NZ", "English, New Zealand"),
+    ("en-AB", "English, Scottish"),
+    ("en-ZA", "English, South African"),
+    ("en-WL", "English, Welsh"),
+    ("et-EE", "Estonian"),
+    ("et-ET", "Estonian (et-ET)"),
+    ("fa-IR", "Farsi"),
+    ("fa-AF", "Farsi, Afghan"),
+    ("fi-FI", "Finnish"),
+    ("fr-FR", "French"),
+    ("fr-CA", "French, Canadian"),
+    ("gl-ES", "Galician"),
+    ("ka-GE", "Georgian"),
+    ("de-DE", "German"),
+    ("de-CH", "German, Swiss"),
+    ("el-GR", "Greek"),
+    ("gu-IN", "Gujarati"),
+    ("ht-HT", "Haitian Creole"),
+    ("ha-NG", "Hausa"),
+    ("he-IL", "Hebrew"),
+    ("hi-IN", "Hindi, Indian"),
+    ("hu-HU", "Hungarian"),
+    ("is-IS", "Icelandic"),
+    ("id-ID", "Indonesian"),
+    ("it-IT", "Italian"),
+    ("ja-JP", "Japanese"),
+    ("jv-ID", "Javanese"),
+    ("kab-DZ", "Kabyle"),
+    ("kn-IN", "Kannada"),
+    ("kk-KZ", "Kazakh"),
+    ("km-KH", "Khmer"),
+    ("rw-RW", "Kinyarwanda"),
+    ("ko-KR", "Korean"),
+    ("ky-KG", "Kyrgyz"),
+    ("lv-LV", "Latvian"),
+    ("lt-LT", "Lithuanian"),
+    ("lg-IN", "Luganda"),
+    ("mk-MK", "Macedonian"),
+    ("ms-MY", "Malay"),
+    ("ml-IN", "Malayalam"),
+    ("mt-MT", "Maltese"),
+    ("mr-IN", "Marathi"),
+    ("mhr-RU", "Meadow Mari"),
+    ("mn-MN", "Mongolian"),
+    ("ne-NP", "Nepali"),
+    ("no-NO", "Norwegian Bokmål"),
+    ("or-IN", "Odia/Oriya"),
+    ("ps-AF", "Pashto"),
+    ("pl-PL", "Polish"),
+    ("pt-PT", "Portuguese"),
+    ("pt-BR", "Portuguese, Brazilian"),
+    ("pa-IN", "Punjabi"),
+    ("ro-RO", "Romanian"),
+    ("ru-RU", "Russian"),
+    ("sr-RS", "Serbian"),
+    ("si-LK", "Sinhala"),
+    ("sk-SK", "Slovak"),
+    ("sl-SI", "Slovenian"),
+    ("so-SO", "Somali"),
+    ("es-ES", "Spanish"),
+    ("es-MX", "Spanish, Mexican"),
+    ("su-ID", "Sundanese"),
+    ("sw-KE", "Swahili, Kenya"),
+    ("sw-BI", "Swahili, Burundi"),
+    ("sw-RW", "Swahili, Rwanda"),
+    ("sw-TZ", "Swahili, Tanzania"),
+    ("sw-UG", "Swahili, Uganda"),
+    ("sv-SE", "Swedish"),
+    ("tl-PH", "Tagalog/Filipino"),
+    ("ta-IN", "Tamil"),
+    ("tt-RU", "Tatar"),
+    ("te-IN", "Telugu"),
+    ("th-TH", "Thai"),
+    ("tr-TR", "Turkish"),
+    ("uk-UA", "Ukrainian"),
+    ("ug-CN", "Uyghur"),
+    ("uz-UZ", "Uzbek"),
+    ("vi-VN", "Vietnamese"),
+    ("cy-WL", "Welsh"),
+    ("wo-SN", "Wolof"),
+    ("zu-ZA", "Zulu"),
 ]
+
+LANGUAGE_CHOICES = [code for code, _ in SUPPORTED_LANGUAGES]
+
 SEX_CHOICES = [
     ("Male", "M"),
     ("Female", "F"),

willisapi_client/willisapi_client.py

@@ -14,18 +14,19 @@ class WillisapiClient:
     def __init__(self, *args, **kwargs) -> None:
         self.client_version = get_client_version()
         self.api_version = math.floor(self.client_version)
-        self.api_uri = "api.brooklyn.health"
+        self.api_uri = "api.willis.health"
         self.env = kwargs["env"] if "env" in kwargs else None
 
-    def get_base_url(self):
+    def get_api_host(self):
         if self.env:
-            return f"https://{self.env}-{self.api_uri}/v{self.api_version}/"
-        return f"https://{self.api_uri}/v{self.api_version}/"
+            return f"api.{self.env}.willis.health"
+        return self.api_uri
+
+    def get_base_url(self):
+        return f"https://{self.get_api_host()}/v{self.api_version}/"
 
     def get_base_v2_url(self):
-        if self.env:
-            return f"https://{self.env}-{self.api_uri}/api/v2/"
-        return f"https://{self.api_uri}/api/v2/"
+        return f"https://{self.get_api_host()}/api/v2/"
 
     def get_diarize_remaining_calls_url(self):
         return self.get_base_url() + "willis-diarize-call-remaining"
@@ -35,7 +36,7 @@ def get_diarize(self):
 
     def get_upload_url(self):
         return self.get_base_v2_url() + "metadata/upload"
-    
+
     def get_processed_upload_url(self):
         return self.get_base_v2_url() + "metadata/processed-data/upload"