simplified code and enhanced consistency

deep_translator/base.py

@@ -15,22 +15,26 @@ class BaseTranslator(ABC):
                  payload_key=None,
                  element_tag=None,
                  element_query=None,
-                 languages=GOOGLE_LANGUAGES_TO_CODES,
+                 languages=None,
                  **url_params):
         """
         @param source: source language to translate from
         @param target: target language to translate to
         """
-        self.__base_url = base_url
+        self._base_url = base_url
+        self.languages: dict = GOOGLE_LANGUAGES_TO_CODES if not languages else languages
+        self.supported_languages: list = list(self.languages.keys())
+
         self._source, self._target = self._map_language_to_code(source, target)
         self._url_params = url_params
         self._element_tag = element_tag
         self._element_query = element_query
         self.payload_key = payload_key
-        self.languages: dict = languages
-        self.supported_languages: list = list(self.languages.keys())
         super().__init__()
 
+    def _type(self):
+        return self.__class__.__name__
+
     def _map_language_to_code(self, *languages):
         """
         map language to its corresponding code (abbreviation) if the language was passed by its full name by the user

deep_translator/cli.py

@@ -4,14 +4,14 @@ from .base import BaseTranslator
 
 
 class CLI(object):
-    translators_dict = BaseTranslator.__subclasses__()
+    translators_dict = {
+        translator.__name__.replace('Translator', '').lower():
+        translator for translator in BaseTranslator.__subclasses__()}
     translator = None
 
     def __init__(self, custom_args=None):
         self.custom_args = custom_args
         self.args = self.parse_args()
-        print(f'translators_dict: {self.translators_dict}')
-        exit()
         translator_class = self.translators_dict.get(self.args.translator, None)
         if not translator_class:
             raise Exception(f"Translator {self.args.translator} is not supported."
@@ -25,7 +25,7 @@ class CLI(object):
         """
         res = self.translator.translate(self.args.text)
         print("Translation from {} to {}".format(self.args.source, self.args.target))
-        print("-"*50)
+        print("-" * 50)
         print("Translation result: {}".format(res))
 
     def get_supported_languages(self):

deep_translator/deepl.py

@@ -1,6 +1,6 @@
 import requests
 
-from validate import is_empty
+from .validate import is_empty
 from .constants import BASE_URLS, DEEPL_LANGUAGE_TO_CODE
 from .exceptions import (ServerException,
                          TranslationNotFound,
@@ -25,10 +25,10 @@ class DeepL(BaseTranslator):
         self.version = 'v2'
         self.api_key = api_key
         if use_free_api:
-            self.__base_url = BASE_URLS.get(
+            self._base_url = BASE_URLS.get(
                 "DEEPL_FREE").format(version=self.version)
         else:
-            self.__base_url = BASE_URLS.get(
+            self._base_url = BASE_URLS.get(
                 "DEEPL").format(version=self.version)
         super().__init__(source=source,
                          target=target,
@@ -53,7 +53,7 @@ class DeepL(BaseTranslator):
         # Do the request and check the connection.
         try:
             response = requests.get(
-                self.__base_url + translate_endpoint, params=params)
+                self._base_url + translate_endpoint, params=params)
         except ConnectionError:
             raise ServerException(503)
         # If the answer is not success, raise server exception.

deep_translator/detection.py

@@ -7,6 +7,7 @@ from requests.exceptions import HTTPError
 # Module global config
 config = {"url": 'https://ws.detectlanguage.com/0.2/detect',"headers": {'User-Agent': 'Detect Language API Python Client 1.4.0','Authorization': 'Bearer {}',}}
 
+
 def get_request_body(text, api_key, *args, **kwargs):
     """
     send a request and return the response body parsed as dictionary

deep_translator/google_trans.py

@@ -2,10 +2,10 @@
 google translator API
 """
 
-from .constants import BASE_URLS
-from .exceptions import TooManyRequests, TranslationNotFound, RequestError
-from .base import BaseTranslator
-from .validate import validate_input, is_empty
+from deep_translator.constants import BASE_URLS
+from deep_translator.exceptions import TooManyRequests, TranslationNotFound, RequestError
+from deep_translator.base import BaseTranslator
+from deep_translator.validate import validate_input, is_empty
 from bs4 import BeautifulSoup
 import requests
 
@@ -20,16 +20,13 @@ class GoogleTranslator(BaseTranslator):
         @param source: source language to translate from
         @param target: target language to translate to
         """
-        self.__base_url = BASE_URLS.get("GOOGLE_TRANSLATE")
         self.proxies = proxies
-        super().__init__(base_url=self.__base_url,
+        super().__init__(base_url=BASE_URLS.get("GOOGLE_TRANSLATE"),
                          source=source,
                          target=target,
                          element_tag='div',
                          element_query={"class": "t0"},
                          payload_key='q',  # key of text in the url
-                         tl=self._target,
-                         sl=self._source,
                          **kwargs)
 
         self._alt_element_query = {"class": "result-container"}
@@ -45,11 +42,13 @@ class GoogleTranslator(BaseTranslator):
 
         if validate_input(text):
             text = text.strip()
+            self._url_params['tl'] = self._target
+            self._url_params['sl'] = self._source
 
             if self.payload_key:
                 self._url_params[self.payload_key] = text
 
-            response = requests.get(self.__base_url,
+            response = requests.get(self._base_url,
                                     params=self._url_params,
                                     proxies=self.proxies)
             if response.status_code == 429:
@@ -96,3 +95,8 @@ class GoogleTranslator(BaseTranslator):
         @return: list of translations
         """
         return self._translate_batch(batch, **kwargs)
+
+
+if __name__ == '__main__':
+    t = GoogleTranslator().translate("hallo welt")
+    print("translation: ", t)

deep_translator/libre.py

@@ -4,7 +4,7 @@ LibreTranslate API
 
 import requests
 
-from validate import is_empty
+from .validate import is_empty
 from .base import BaseTranslator
 from .constants import BASE_URLS,LIBRE_LANGUAGES_TO_CODES
 from .exceptions import (ServerException,
@@ -26,7 +26,7 @@ class LibreTranslator(BaseTranslator):
         """
         if not api_key:
             raise ServerException(401)
-        self.__base_url = BASE_URLS.get("LIBRE")
+        self._base_url = BASE_URLS.get("LIBRE")
         self.api_key = api_key
         super().__init__(source=source,
                          target=target,
@@ -53,7 +53,7 @@ class LibreTranslator(BaseTranslator):
             params["api_key"] = self.api_key
         # Do the request and check the connection.
         try:
-            response = requests.post(self.__base_url + translate_endpoint, params=params)
+            response = requests.post(self._base_url + translate_endpoint, params=params)
         except ConnectionError:
             raise ServerException(503)
         # If the answer is not success, raise server exception.

deep_translator/linguee.py

@@ -1,7 +1,7 @@
 """
 linguee translator API
 """
-from validate import validate_input, is_empty
+from .validate import validate_input, is_empty
 from .constants import BASE_URLS, LINGUEE_LANGUAGES_TO_CODES
 from .exceptions import (
                         TranslationNotFound,
@@ -25,9 +25,9 @@ class LingueeTranslator(BaseTranslator):
         @param source: source language to translate from
         @param target: target language to translate to
         """
-        self.__base_url = BASE_URLS.get("LINGUEE")
+        self._base_url = BASE_URLS.get("LINGUEE")
         self.proxies = proxies
-        super().__init__(base_url=self.__base_url,
+        super().__init__(base_url=self._base_url,
                          source=source,
                          target=target,
                          languages=LINGUEE_LANGUAGES_TO_CODES,
@@ -50,7 +50,7 @@ class LingueeTranslator(BaseTranslator):
 
         if validate_input(word, max_chars=50):
             # %s-%s/translation/%s.html
-            url = "{}{}-{}/translation/{}.html".format(self.__base_url, self._source, self._target, word)
+            url = "{}{}-{}/translation/{}.html".format(self._base_url, self._source, self._target, word)
             url = requote_uri(url)
             response = requests.get(url, proxies=self.proxies)
 

deep_translator/microsoft.py

@@ -35,7 +35,7 @@ class MicrosoftTranslator(BaseTranslator):
         if region:
             self.region = region
             self.headers["Ocp-Apim-Subscription-Region"] = self.region
-        self.__base_url = BASE_URLS.get("MICROSOFT_TRANSLATE")
+        self._base_url = BASE_URLS.get("MICROSOFT_TRANSLATE")
         super().__init__(
             source=source,
             target=target,
@@ -66,7 +66,7 @@ class MicrosoftTranslator(BaseTranslator):
 
         valid_microsoft_json = [{'text': text}]
         try:
-            requested = requests.post(self.__base_url,
+            requested = requests.post(self._base_url,
                                       params=self._url_params,
                                       headers=self.headers,
                                       json=valid_microsoft_json,

deep_translator/mymemory.py

@@ -1,7 +1,7 @@
 """
 mymemory translator API
 """
-from validate import is_empty, validate_input
+from .validate import is_empty, validate_input
 from .constants import BASE_URLS
 from .exceptions import (
                         TranslationNotFound,
@@ -20,10 +20,10 @@ class MyMemoryTranslator(BaseTranslator):
         @param source: source language to translate from
         @param target: target language to translate to
         """
-        self.__base_url = BASE_URLS.get("MYMEMORY")
+        self._base_url = BASE_URLS.get("MYMEMORY")
         self.proxies = proxies
         self.email = kwargs.get('email', None)
-        super(MyMemoryTranslator, self).__init__(base_url=self.__base_url,
+        super(MyMemoryTranslator, self).__init__(base_url=self._base_url,
                                                  source=self._source,
                                                  target=self._target,
                                                  payload_key='q',
@@ -49,7 +49,7 @@ class MyMemoryTranslator(BaseTranslator):
             if self.email:
                 self._url_params['de'] = self.email
 
-            response = requests.get(self.__base_url,
+            response = requests.get(self._base_url,
                                     params=self._url_params,
                                     proxies=self.proxies)
 

deep_translator/papago.py

@@ -3,11 +3,9 @@ google translator API
 """
 import json
 from .constants import BASE_URLS, PAPAGO_LANGUAGE_TO_CODE
-from .exceptions import LanguageNotSupportedException, TranslationNotFound, NotValidPayload
+from .exceptions import TranslationNotFound
 from .base import BaseTranslator
 import requests
-import warnings
-import logging
 
 
 class PapagoTranslator(BaseTranslator):
@@ -24,7 +22,7 @@ class PapagoTranslator(BaseTranslator):
             raise Exception(
                 "Please pass your client id and secret key! visit the papago website for more infos")
 
-        self.__base_url = BASE_URLS.get("PAPAGO_API")
+        self._base_url = BASE_URLS.get("PAPAGO_API")
         self.client_id = client_id
         self.secret_key = secret_key
         super().__init__(
@@ -52,7 +50,7 @@ class PapagoTranslator(BaseTranslator):
             'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
         }
         response = requests.post(
-            self.__base_url, headers=headers, data=payload)
+            self._base_url, headers=headers, data=payload)
         if response.status_code != 200:
             raise Exception(
                 f'Translation error! -> status code: {response.status_code}')

deep_translator/pons.py

@@ -4,9 +4,9 @@ pons translator API
 from bs4 import BeautifulSoup
 import requests
 
-from validate import validate_input, is_empty
-from .constants import BASE_URLS, PONS_LANGUAGES_TO_CODES, PONS_CODES_TO_LANGUAGES
-from .exceptions import (LanguageNotSupportedException,
+from .validate import validate_input, is_empty
+from .constants import BASE_URLS, PONS_CODES_TO_LANGUAGES
+from .exceptions import (
                         TranslationNotFound,
                         NotValidPayload,
                         ElementNotFoundInGetRequest,
@@ -26,15 +26,16 @@ class PonsTranslator(BaseTranslator):
         @param source: source language to translate from
         @param target: target language to translate to
         """
-        self.__base_url = BASE_URLS.get("PONS")
+        self._base_url = BASE_URLS.get("PONS")
         self.proxies = proxies
-        super().__init__(base_url=self.__base_url,
-                         languages=PONS_LANGUAGES_TO_CODES,
-                         source=self._source,
-                         target=self._target,
+        super().__init__(base_url=self._base_url,
+                         languages=PONS_CODES_TO_LANGUAGES,
+                         source=source,
+                         target=target,
                          payload_key=None,
                          element_tag='div',
-                         element_query={"class": "target"}
+                         element_query={"class": "target"},
+                         **kwargs
                          )
 
     def translate(self, word, return_all=False, **kwargs):
@@ -50,7 +51,7 @@ class PonsTranslator(BaseTranslator):
             return word
 
         if validate_input(word, max_chars=50):
-            url = "{}{}-{}/{}".format(self.__base_url, self._source, self._target, word)
+            url = "{}{}-{}/{}".format(self._base_url, self._source, self._target, word)
             url = requote_uri(url)
             response = requests.get(url, proxies=self.proxies)
 
@@ -70,9 +71,7 @@ class PonsTranslator(BaseTranslator):
             for el in elements:
                 temp = ''
                 for e in el.findAll('a'):
-                    if e.base.name == 'div':
-                        if e and "/translate/{}-{}/".format(self._target, self._source) in e.get('href'):
-                            temp += e.get_text() + ' '
+                    temp += e.get_text() + ' '
                 filtered_elements.append(temp)
 
             if not filtered_elements:

deep_translator/qcri.py

@@ -17,7 +17,7 @@ class QCRI(BaseTranslator):
 
         if not api_key:
             raise ServerException(401)
-        self.__base_url = BASE_URLS.get("QCRI")
+        self._base_url = BASE_URLS.get("QCRI")
         self.api_key = api_key
         self.api_endpoints = {
             "get_languages": "getLanguagePairs",
@@ -39,7 +39,7 @@ class QCRI(BaseTranslator):
         if not params:
             params = self.params
         try:
-            res = requests.get(self.__base_url.format(
+            res = requests.get(self._base_url.format(
                 endpoint=self.api_endpoints[endpoint]), params=params)
             return res.text if return_text else res
         except Exception as e:

deep_translator/yandex.py

@@ -19,7 +19,7 @@ class YandexTranslator(BaseTranslator):
         """
         if not api_key:
             raise ServerException(401)
-        self.__base_url = BASE_URLS.get("YANDEX")
+        self._base_url = BASE_URLS.get("YANDEX")
         self.api_key = api_key
         self.api_version = "v1.5"
         self.api_endpoints = {
@@ -44,7 +44,7 @@ class YandexTranslator(BaseTranslator):
     def dirs(self, proxies=None):
 
         try:
-            url = self.__base_url.format(
+            url = self._base_url.format(
                 version=self.api_version, endpoint="getLangs")
             print("url: ", url)
             response = requests.get(
@@ -66,7 +66,7 @@ class YandexTranslator(BaseTranslator):
             "key": self.api_key,
         }
         try:
-            url = self.__base_url.format(
+            url = self._base_url.format(
                 version=self.api_version, endpoint="detect")
             response = requests.post(url, data=params, proxies=proxies)
 
@@ -94,7 +94,7 @@ class YandexTranslator(BaseTranslator):
             "key": self.api_key
         }
         try:
-            url = self.__base_url.format(
+            url = self._base_url.format(
                 version=self.api_version, endpoint="translate")
             response = requests.post(url, data=params, proxies=proxies)
         except ConnectionError:

examples/trans.py

@@ -5,12 +5,16 @@ from deep_translator import GoogleTranslator, PonsTranslator, LingueeTranslator
 
 english_text = 'happy coding'
 chinese_text = '這很好'
+translator = GoogleTranslator(source='english', target='german')
+result1 = translator.translate(text=english_text)
+result2 = translator.translate(text=chinese_text)
 
-result_german = GoogleTranslator(source='english', target='german').translate(text=english_text)
-result_french = GoogleTranslator(source='auto', target='french').translate(text=chinese_text)
+print(f"original english text: {english_text} | translated text: {result1}")
+print(f"original chinese text: {chinese_text} | translated text: {result2}")
 
-print(f"original english text: {english_text} | translated text: {result_german}")  # result: fröhliche Codierung
-print(f"original chinese text: {chinese_text} | translated text: {result_french}")  # result: C' est bon
+# file translation
+result_file = translator.translate_file('./test.txt')
+print("file translation: ", result_file)
 
 # examples using linguee:
 text = 'cute'
@@ -19,5 +23,6 @@ print("Using Linguee ==> the translated text: ", translated)
 
 # examples using pons:
 text = 'good'
-translated = PonsTranslator(source='english', target='arabic').translate(word=text)
+translated = PonsTranslator(source='en', target='ar').translate(word=text)
 print("using Pons ==> the translated text: ", translated)
+