Update app.py

app.py

@@ -13,10 +13,10 @@ df = pl.read_parquet("isolanguages.parquet")
 non_empty_isos = df.slice(1).filter(pl.col("ISO639-1") != "").rows()
 # all_langs = languagecodes.iso_languages_byname
 all_langs = {iso[0]: (iso[1], iso[2], iso[3]) for iso in non_empty_isos} # {'Romanian': ('ro', 'rum', 'ron')}
-
-# Language options as list, add favourite languages first
+# 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'}
 langs = list(favourite_langs.keys())
-langs.extend(list(all_langs.keys()))
+langs.extend(list(all_langs.keys())) # Language options as list, add favourite languages first
 
 models = ["Helsinki-NLP",
           "Helsinki-NLP/opus-mt-tc-bible-big-mul-mul", "Helsinki-NLP/opus-mt-tc-bible-big-mul-deu_eng_nld",
@@ -106,10 +106,10 @@ class Translators:
     def HelsinkiNLP_mulroa(self):
         try:
             pipe = pipeline("translation", model=self.model_name, device=self.device)                
-            iso_dict = {iso[1]: iso[3] for iso in non_empty_isos}
-            iso3tl = iso_dict.get(self.tl) # 'deu', 'ron', 'eng', 'fra'
+            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 {self.sl} to {self.tl} with {self.model_name}.'
+            return translation[0]['translation_text'], f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {self.model_name}.'
         except Exception as error:
             return f"Error translating with model: {self.model_name}! Try other available language combination.", error
     
@@ -118,16 +118,16 @@ 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 {self.sl} to {self.tl} with {model_name}.'
+            return translation[0]['translation_text'], f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} 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 {self.sl} to {self.tl} with {model_name}.'
+                return translation[0]['translation_text'], f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} 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_mulmul()
+                return self.HelsinkiNLP_mulroa()
         except KeyError as error:
             return f"Error: Translation direction {self.sl} to {self.tl} is not supported by Helsinki Translation Models", error