replace all iso1_to_name with iso1toall

app.py

@@ -12,13 +12,13 @@ favourite_langs = {"Romanian": "ro", "German": "de", "English": "en", "-----": "
 df = pl.read_parquet("isolanguages.parquet")
 non_empty_isos = df.slice(1).filter(pl.col("ISO639-1") != "").rows()
 all_langs = {iso[0]: (iso[1], iso[2], iso[3]) for iso in non_empty_isos} # {'Romanian': ('ro', 'rum', 'ron')}
+iso1toall = {iso[1]: (iso[0], iso[2], iso[3]) for iso in non_empty_isos} # {'ro': ('Romanian', 'rum', 'ron')}
 name_to_iso1 = {iso[0]: iso[1] for iso in non_empty_isos} # {'Romanian': 'ro', 'German': 'de'}
 # langs = ["German", "Romanian", "English", "French", "Spanish", "Italian"]
 langs = list(favourite_langs.keys())
 langs.extend(list(all_langs.keys())) # Language options as list, add favourite languages first
 # all_langs = languagecodes.iso_languages_byname
 # iso1_to_name = {codes[0]: lang for entry in all_langs for lang, codes in entry.items()} # {'ro': 'Romanian', 'de': 'German'}
-iso1_to_name = {iso[1]: iso[0] for iso in non_empty_isos} # {'ro': 'Romanian', 'de': 'German'}
 
 def timer(func):
     import time
@@ -28,7 +28,7 @@ def timer(func):
         end_time = time.time()
         execution_time = end_time - start_time
         # print(f"Function {func.__name__!r} executed in {execution_time:.4f} seconds.")
-        message_text = f'{message_text[:-1]} in {execution_time:.4f}!' if message_text.endswith(('.', '!')) else f'{message_text} in {execution_time:.4f}!' 
+        message_text = f'{message_text[:-1]} in {execution_time:.4f} seconds!' if message_text.endswith(('.', '!')) else f'{message_text} in {execution_time:.4f} seconds!' 
         return translated_text, message_text
     return wrapper
 
@@ -78,9 +78,9 @@ class Translators:
             pipe = pipeline("translation", model=hplt_model, device=self.device)
             translation = pipe(self.input_text)
             translated_text = translation[0]['translation_text']
-            message = f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {hplt_model}.'
+            message = f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with {hplt_model}.'
         else:
-            translated_text = f'HPLT model from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} not available!'
+            translated_text = f'HPLT model from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} not available!'
             message = f"Available models: {', '.join(hplt_models)}"
         return translated_text, message
 
@@ -126,7 +126,7 @@ class Translators:
         if f"{self.sl}-{self.tl}" in quickmt_models:
             model_path = Translators.quickmtdownload(model_name)
             translated_text = Translators.quickmttranslate(model_path, self.input_text)
-            message = f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {model_name}.'
+            message = f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with {model_name}.'
         # Pivot language English
         elif self.sl in available_languages and self.tl in available_languages:
             model_name = f"quickmt-{self.sl}-en"
@@ -135,9 +135,9 @@ class Translators:
             model_name = f"quickmt-en-{self.tl}"
             model_path = Translators.quickmtdownload(model_name)
             translated_text = Translators.quickmttranslate(model_path, entranslation)
-            message = f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with Quickmt using pivot language English.'
+            message = f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with Quickmt using pivot language English.'
         else:
-            translated_text = f'No Quickmt model available for translation from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]}!'
+            translated_text = f'No Quickmt model available for translation from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]}!'
             message = f"Available models: {', '.join(quickmt_models)}"
         return translated_text, message
     
@@ -206,7 +206,7 @@ class Translators:
         try:
             pipe = pipeline("translation", model=self.model_name, device=self.device)                
             translation = pipe(self.input_text)
-            message = f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {self.model_name}.'
+            message = f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with {self.model_name}.'
             return translation[0]['translation_text'], message
         except Exception as error:
             return f"Error translating with model: {self.model_name}! Try other available language combination or model.", error
@@ -222,7 +222,7 @@ class Translators:
             iso1to3 = {iso[1]: iso[3] for iso in non_empty_isos} # {'ro': 'ron'}
             iso3tl = iso1to3.get(self.tl) # 'deu', 'ron', 'eng', 'fra'
             translation = pipe(f'>>{iso3tl}<< {self.input_text}')
-            return translation[0]['translation_text'], f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {self.model_name}.'
+            return translation[0]['translation_text'], f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with {self.model_name}.'
         except Exception as error:
             return f"Error translating with model: {self.model_name}! Try other available language combination.", error
     
@@ -231,13 +231,13 @@ class Translators:
             model_name = f"Helsinki-NLP/opus-mt-{self.sl}-{self.tl}"
             pipe = pipeline("translation", model=model_name, device=self.device)
             translation = pipe(self.input_text)
-            return translation[0]['translation_text'], f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {model_name}.'
+            return translation[0]['translation_text'], f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with {model_name}.'
         except EnvironmentError:
             try: # Tatoeba models
                 model_name = f"Helsinki-NLP/opus-tatoeba-{self.sl}-{self.tl}"
                 pipe = pipeline("translation", model=model_name, device=self.device)
                 translation = pipe(self.input_text)
-                return translation[0]['translation_text'], f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {model_name}.'
+                return translation[0]['translation_text'], f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with {model_name}.'
             except EnvironmentError as error:
                 self.model_name = "Helsinki-NLP/opus-mt-tc-bible-big-mul-mul" # Last resort: try multi to multi
                 return self.HelsinkiNLP_mulroa()