Update app.py

app.py

@@ -14,7 +14,7 @@ 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')}
 # 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'}
+# iso1_to_name = {iso[1]: iso[0] for iso in non_empty_isos} # {'ro': 'Romanian', 'de': 'German'}
 iso1toall = {iso[1]: (iso[0], iso[2], iso[3]) for iso in non_empty_isos} # {'ro': ('Romanian', 'rum', 'ron')}
 langs = list(favourite_langs.keys())
 langs.extend(list(all_langs.keys())) # Language options as list, add favourite languages first
@@ -83,7 +83,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
@@ -132,9 +132,9 @@ class Translators:
             pipe = pipeline("translation", model=hplt_model, device=self.device)
             translation = pipe(self.input_text)
             translated_text = translation[0]['translation_text']
-            message_text = f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with {hplt_model}.'
+            message_text = 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_text = f"Available models: {', '.join(hplt_models)}"
         return translated_text, message_text
 
@@ -159,7 +159,7 @@ class Translators:
         packages_info = ', '.join(f"{pkg.from_name} ({pkg.from_code}) -> {pkg.to_name} ({pkg.to_code})" for pkg in available_packages)
         # print(available_languages, combos, packages_info)
         if self.sl not in available_languages and self.tl not in available_languages:
-            translated_text = f'''No supported Argos model available from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]}!
+            translated_text = f'''No supported Argos model available from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]}!
             Try other model or languages combination from the available Argos models: {', '.join(available_languages)}.'''
         else:
             try:
@@ -171,12 +171,12 @@ class Translators:
                     translated_pivottext = argostranslate.translate.translate(self.input_text, self.sl, 'en') # Translate to pivot language English
                     self.__class__.download_argos_model(available_packages, 'en', self.tl) # Download model
                     translated_text = argostranslate.translate.translate(translated_pivottext, 'en', self.tl) # Translate from pivot language English
-                    message = f'Translated from {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]} with Argos using pivot language English.'
+                    message = f'Translated from {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]} with Argos using pivot language English.'
                 else:
-                    translated_text = f"No Argos model for {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]}. Try other model or languages combination from the available Argos models: {packages_info}."
+                    translated_text = f"No Argos model for {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]}. Try other model or languages combination from the available Argos models: {packages_info}."
             except StopIteration as IterationError:
                 # packages_info = ', '.join(f"{pkg.get_description()}->{str(pkg.links)} {str(pkg.source_languages)}" for pkg in available_packages)
-                translated_text = f"No Argos model for {iso1_to_name[self.sl]} to {iso1_to_name[self.tl]}. Error: {IterationError}. Try other model or languages combination from the available Argos models: {packages_info}."
+                translated_text = f"No Argos model for {iso1toall[self.sl][0]} to {iso1toall[self.tl][0]}. Error: {IterationError}. Try other model or languages combination from the available Argos models: {packages_info}."
             except Exception as generalerror:
                 translated_text = f"General error: {generalerror}"
         return translated_text
@@ -227,7 +227,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"
@@ -236,9 +236,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
         
@@ -256,13 +256,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()
@@ -402,18 +402,18 @@ class Translators:
 
     def seamlessm4t1(self):
         from transformers import AutoProcessor, SeamlessM4TModel
-        processor = AutoProcessor.from_pretrained(self.model)
-        model = SeamlessM4TModel.from_pretrained(self.model)
+        processor = AutoProcessor.from_pretrained(self.model_name)
+        model = SeamlessM4TModel.from_pretrained(self.model_name)
         src_lang = iso1toall.get(self.sl)[2] # 'deu', 'ron', 'eng', 'fra'        
         tgt_lang = iso1toall.get(self.tl)[2]
         text_inputs = processor(text = self.input_text, src_lang=src_lang, return_tensors="pt")
         output_tokens = model.generate(**text_inputs, tgt_lang=tgt_lang, generate_speech=False)
         return processor.decode(output_tokens[0].tolist()[0], skip_special_tokens=True)
-
+        
     def seamlessm4t2(self):
         from transformers import AutoProcessor, SeamlessM4Tv2ForTextToText
-        processor = AutoProcessor.from_pretrained(self.model)
-        model = SeamlessM4Tv2ForTextToText.from_pretrained(self.model)
+        processor = AutoProcessor.from_pretrained(self.model_name)
+        model = SeamlessM4Tv2ForTextToText.from_pretrained(self.model_name)
         src_lang = iso1toall.get(self.sl)[2] # 'deu', 'ron', 'eng', 'fra'        
         tgt_lang = iso1toall.get(self.tl)[2]
         text_inputs = processor(text=self.input_text, src_lang=src_lang, return_tensors="pt")