Merge pull request #12 from nidhaloff/dev

deep_translator/exceptions.py

@@ -21,10 +21,17 @@ class NotValidPayload(BaseError):
         super(NotValidPayload, self).__init__(val, message)
 
 
+class TranslationNotFound(BaseError):
+    def __init__(self,
+                 val,
+                 message='No translation was found using the current translator. Try another translator?'):
+        super(TranslationNotFound, self).__init__(val, message)
+
+
 class ElementNotFoundInGetRequest(BaseError):
     def __init__(self,
                  val,
-                 message='Element was not found in the get request.'):
+                 message='Required element was not found in the API response'):
         super(ElementNotFoundInGetRequest, self).__init__(val, message)
 
 

deep_translator/google_trans.py

@@ -1,6 +1,6 @@
 
 from deep_translator.constants import BASE_URLS, GOOGLE_LANGUAGES_TO_CODES
-from deep_translator.exceptions import LanguageNotSupportedException, ElementNotFoundInGetRequest, NotValidPayload
+from deep_translator.exceptions import LanguageNotSupportedException, TranslationNotFound, NotValidPayload
 from deep_translator.parent import BaseTranslator
 from bs4 import BeautifulSoup
 import requests
@@ -36,7 +36,7 @@ class GoogleTranslator(BaseTranslator):
     def get_supported_languages(as_dict=False):
         return GoogleTranslator.supported_languages if not as_dict else GoogleTranslator._languages
 
-    def _map_language_to_code(self, *languages, **kwargs):
+    def _map_language_to_code(self, *languages):
         """
 
         @param language: type of language
@@ -50,7 +50,7 @@ class GoogleTranslator(BaseTranslator):
             else:
                 raise LanguageNotSupportedException(language)
 
-    def is_language_supported(self, *languages, **kwargs):
+    def is_language_supported(self, *languages):
         for lang in languages:
             if lang != 'auto' and lang not in GOOGLE_LANGUAGES_TO_CODES.keys():
                 if lang != 'auto' and lang not in GOOGLE_LANGUAGES_TO_CODES.values():
@@ -76,7 +76,8 @@ class GoogleTranslator(BaseTranslator):
             soup = BeautifulSoup(response.text, 'html.parser')
             element = soup.find(self._element_tag, self._element_query)
             if not element:
-                raise ElementNotFoundInGetRequest(element)
+                # raise ElementNotFoundInGetRequest(element)
+                raise TranslationNotFound(text)
 
             return element.get_text(strip=True)
 

deep_translator/linguee.py

@@ -1,5 +1,5 @@
 from deep_translator.constants import BASE_URLS, LINGUEE_LANGUAGES_TO_CODES, LINGUEE_CODE_TO_LANGUAGE
-from deep_translator.exceptions import LanguageNotSupportedException, ElementNotFoundInGetRequest, NotValidPayload, NotValidLength
+from deep_translator.exceptions import LanguageNotSupportedException, TranslationNotFound, NotValidPayload, ElementNotFoundInGetRequest
 from deep_translator.parent import BaseTranslator
 from bs4 import BeautifulSoup
 import requests
@@ -72,6 +72,9 @@ class LingueeTranslator(BaseTranslator):
                     pronoun = ''
                 filtered_elements.append(el.get_text(strip=True).replace(pronoun, ''))
 
+            if not filtered_elements:
+                raise TranslationNotFound(word)
+
             return filtered_elements if return_all else filtered_elements[0]
 
     def translate_words(self, words, **kwargs):

deep_translator/mymemory.py

@@ -1,6 +1,6 @@
 
 from deep_translator.constants import BASE_URLS, GOOGLE_LANGUAGES_TO_CODES
-from deep_translator.exceptions import NotValidPayload
+from deep_translator.exceptions import NotValidPayload, TranslationNotFound
 from deep_translator.parent import BaseTranslator
 import requests
 
@@ -52,7 +52,7 @@ class MyMemoryTranslator(BaseTranslator):
                                     headers=self.headers)
             data = response.json()
             if not data:
-                raise Exception("Translation was not found in response!")
+                TranslationNotFound(text)
 
             translation = data.get('responseData').get('translatedText')
             if translation:

deep_translator/pons.py

@@ -2,7 +2,7 @@
 from bs4 import BeautifulSoup
 import requests
 from deep_translator.constants import BASE_URLS, PONS_LANGUAGES_TO_CODES, PONS_CODES_TO_LANGUAGES
-from deep_translator.exceptions import LanguageNotSupportedException, ElementNotFoundInGetRequest, NotValidPayload
+from deep_translator.exceptions import LanguageNotSupportedException, TranslationNotFound, NotValidPayload, ElementNotFoundInGetRequest
 from deep_translator.parent import BaseTranslator
 from requests.utils import requote_uri
 
@@ -66,18 +66,25 @@ class PonsTranslator(BaseTranslator):
             soup = BeautifulSoup(response.text, 'html.parser')
             elements = soup.findAll(self._element_tag, self._element_query)
             if not elements:
-                raise ElementNotFoundInGetRequest(elements)
+                raise ElementNotFoundInGetRequest(word)
 
-            eof = []
+            filtered_elements = []
             for el in elements:
                 temp = ''
                 for e in el.findAll('a'):
                     if e.parent.name == 'div':
                         if e and "/translate/{}-{}/".format(self._target, self._source) in e.get('href'):
                             temp += e.get_text() + ' '
-                eof.append(temp)
+                filtered_elements.append(temp)
+
+            if not filtered_elements:
+                raise ElementNotFoundInGetRequest(word)
+
+            word_list = [word for word in filtered_elements if word and len(word) > 1]
+
+            if not word_list:
+                raise TranslationNotFound(word)
 
-            word_list = [word for word in eof if word and len(word) > 1]
             return word_list if return_all else word_list[0]
 
     def translate_words(self, words, **kwargs):

examples/mymemory.py

@@ -0,0 +1,7 @@
+
+from deep_translator import MyMemoryTranslator
+
+
+res = MyMemoryTranslator(source='ar', target='en').translate('آخُذ اَلْباص.')
+
+print(res)

examples/pons.py

@@ -4,4 +4,7 @@ from deep_translator import PonsTranslator
 
 res = PonsTranslator(source='de', target='en').translate('übersetzen', return_all=False)
 
-print(res)
+
+e2a = PonsTranslator('ar', 'en').translate('آخُذ اَلْباص.', return_all=True)
+
+print(e2a)