updated base urls

deep_translator/__init__.py

@@ -1,12 +1,12 @@
 """Top-level package for Deep Translator"""
 
-from .google_trans import GoogleTranslator
+from .google import GoogleTranslator
 from .pons import PonsTranslator
 from .linguee import LingueeTranslator
 from .mymemory import MyMemoryTranslator
 from .yandex import YandexTranslator
-from .qcri import QCRI
-from .deepl import DeepL
+from .qcri import QcriTranslator
+from .deepl import DeeplTranslator
 from .detection import single_detection, batch_detection
 from .microsoft import MicrosoftTranslator
 from .papago import PapagoTranslator
@@ -23,8 +23,8 @@ __all__ = [
     "MyMemoryTranslator",
     "YandexTranslator",
     "MicrosoftTranslator",
-    "QCRI",
-    "DeepL",
+    "QcriTranslator",
+    "DeeplTranslator",
     "LibreTranslator",
     "PapagoTranslator",
     "single_detection",

deep_translator/base.py

@@ -24,7 +24,6 @@ class BaseTranslator(ABC):
         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

deep_translator/constants.py

@@ -6,7 +6,7 @@ BASE_URLS = {
     "YANDEX": "https://translate.yandex.net/api/{version}/tr.json/{endpoint}",
     "LINGUEE": "https://www.linguee.com/",
     "MYMEMORY": "http://api.mymemory.translated.net/get",
-    "QCRI": "https://mt.qcri.org/api/v1/{endpoint}?",
+    "QcriTranslator": "https://mt.qcri.org/api/v1/{endpoint}?",
     "DEEPL": "https://api.deepl.com/{version}/",
     "DEEPL_FREE": "https://api-free.deepl.com/v2/",
     "MICROSOFT_TRANSLATE": "https://api.cognitive.microsofttranslator.com/translate?api-version=3.0",

deep_translator/deepl.py

@@ -8,14 +8,14 @@ from .exceptions import (ServerException,
 from .base import BaseTranslator
 
 
-class DeepL(BaseTranslator):
+class DeeplTranslator(BaseTranslator):
     """
-    class that wraps functions, which use the DeepL translator under the hood to translate word(s)
+    class that wraps functions, which use the DeeplTranslator translator under the hood to translate word(s)
     """
 
     def __init__(self, api_key=None, source="de", target="en", use_free_api=True, **kwargs):
         """
-        @param api_key: your DeepL api key.
+        @param api_key: your DeeplTranslator api key.
         Get one here: https://www.deepl.com/docs-api/accessing-the-api/
         @param source: source language
         @param target: target language
@@ -80,6 +80,6 @@ class DeepL(BaseTranslator):
 
 
 if __name__ == '__main__':
-    d = DeepL(target="de")
+    d = DeeplTranslator(target="de")
     t = d.translate("I have no idea")
     print("text: ", t)

deep_translator/libre.py

@@ -8,8 +8,8 @@ from .validate import is_empty
 from .base import BaseTranslator
 from .constants import BASE_URLS,LIBRE_LANGUAGES_TO_CODES
 from .exceptions import (ServerException,
-                        TranslationNotFound,
-                        AuthorizationException)
+                         TranslationNotFound,
+                         AuthorizationException)
 
 
 class LibreTranslator(BaseTranslator):
@@ -26,9 +26,9 @@ class LibreTranslator(BaseTranslator):
         """
         if not api_key:
             raise ServerException(401)
-        self._base_url = BASE_URLS.get("LIBRE")
         self.api_key = api_key
-        super().__init__(source=source,
+        super().__init__(base_url=BASE_URLS.get("LIBRE"),
+                         source=source,
                          target=target,
                          languages=LIBRE_LANGUAGES_TO_CODES)
 

deep_translator/linguee.py

@@ -25,9 +25,8 @@ 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.proxies = proxies
-        super().__init__(base_url=self._base_url,
+        super().__init__(base_url=BASE_URLS.get("LINGUEE"),
                          source=source,
                          target=target,
                          languages=LINGUEE_LANGUAGES_TO_CODES,

deep_translator/microsoft.py

@@ -35,8 +35,8 @@ class MicrosoftTranslator(BaseTranslator):
         if region:
             self.region = region
             self.headers["Ocp-Apim-Subscription-Region"] = self.region
-        self._base_url = BASE_URLS.get("MICROSOFT_TRANSLATE")
         super().__init__(
+            base_url=BASE_URLS.get("MICROSOFT_TRANSLATE"),
             source=source,
             target=target,
             languages=MICROSOFT_CODES_TO_LANGUAGES,

deep_translator/mymemory.py

@@ -20,10 +20,9 @@ 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.proxies = proxies
         self.email = kwargs.get('email', None)
-        super(MyMemoryTranslator, self).__init__(base_url=self._base_url,
+        super(MyMemoryTranslator, self).__init__(base_url=BASE_URLS.get("MYMEMORY"),
                                                  source=self._source,
                                                  target=self._target,
                                                  payload_key='q',

deep_translator/papago.py

@@ -22,10 +22,10 @@ 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.client_id = client_id
         self.secret_key = secret_key
         super().__init__(
+            base_url=BASE_URLS.get("PAPAGO_API"),
             source=source,
             target=target,
             languages=PAPAGO_LANGUAGE_TO_CODE,

deep_translator/pons.py

@@ -26,9 +26,8 @@ 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.proxies = proxies
-        super().__init__(base_url=self._base_url,
+        super().__init__(base_url=BASE_URLS.get("PONS"),
                          languages=PONS_CODES_TO_LANGUAGES,
                          source=source,
                          target=target,

deep_translator/qcri.py

@@ -5,7 +5,7 @@ from .exceptions import (ServerException, TranslationNotFound)
 from .base import BaseTranslator
 
 
-class QCRI(BaseTranslator):
+class QcriTranslator(BaseTranslator):
     """
     class that wraps functions, which use the QRCI translator under the hood to translate word(s)
     """
@@ -17,7 +17,6 @@ class QCRI(BaseTranslator):
 
         if not api_key:
             raise ServerException(401)
-        self._base_url = BASE_URLS.get("QCRI")
         self.api_key = api_key
         self.api_endpoints = {
             "get_languages": "getLanguagePairs",
@@ -29,6 +28,7 @@ class QCRI(BaseTranslator):
             "key": self.api_key
         }
         super().__init__(
+            base_url=BASE_URLS.get("QcriTranslator"),
             source=source,
             target=target,
             languages=QCRI_LANGUAGE_TO_CODE,

deep_translator/yandex.py

@@ -19,7 +19,6 @@ class YandexTranslator(BaseTranslator):
         """
         if not api_key:
             raise ServerException(401)
-        self._base_url = BASE_URLS.get("YANDEX")
         self.api_key = api_key
         self.api_version = "v1.5"
         self.api_endpoints = {
@@ -28,6 +27,7 @@ class YandexTranslator(BaseTranslator):
             "translate": "translate",
         }
         super().__init__(
+            base_url=BASE_URLS.get("YANDEX"),
             source=source,
             target=target,
             **kwargs

docs/README.rst

@@ -106,8 +106,8 @@ Features
 * Support for the `Linguee translator <https://www.linguee.com/>`_
 * Support for the `Mymemory translator <https://mymemory.translated.net/>`_
 * Support for the `Yandex translator <https://yandex.com/>`_ (version >= 1.2.1)
-* Support for the `QCRI translator <https://mt.qcri.org/api/>`_ (version >= 1.2.4)
-* Support for the `DeepL translator <https://www.deepl.com/en/translator/>`_ (version >= 1.2.5)
+* Support for the `QcriTranslator translator <https://mt.qcri.org/api/>`_ (version >= 1.2.4)
+* Support for the `DeeplTranslator translator <https://www.deepl.com/en/translator/>`_ (version >= 1.2.5)
 * Support for the `Papago translator <https://papago.naver.com/>`_ (version >= 1.4.4)
 * Support for the `Libre translator <https://libretranslate.com/>`_
 * Support for proxy usage
@@ -187,8 +187,8 @@ Imports
                                  MyMemoryTranslator,
                                  YandexTranslator,
                                  PapagoTranslator,
-                                 DeepL,
-                                 QCRI,
+                                 DeeplTranslator,
+                                 QcriTranslator,
                                  single_detection,
                                  batch_detection)
 
@@ -306,12 +306,12 @@ Mymemory Translator
     translated = MyMemoryTranslator(source='en', target='fr').translate_file(path)
 
 
-DeepL Translator
+DeeplTranslator Translator
 -----------------
 
 .. note::
 
-    In order to use the DeepL translator, you need to generate an api key. Deepl offers a Pro and a free API.
+    In order to use the DeeplTranslator translator, you need to generate an api key. Deepl offers a Pro and a free API.
     deep-translator supports both Pro and free APIs. Just check the examples below.
     Visit https://www.deepl.com/en/docs-api/ for more information on how to generate your Deepl api key
 
@@ -321,7 +321,7 @@ DeepL Translator
 
     text = 'Keep it up. You are awesome'
 
-    translated = DeepL(api_key="your_api_key", source="en", target="en", use_free_api=True).translate(text)
+    translated = DeeplTranslator(api_key="your_api_key", source="en", target="en", use_free_api=True).translate(text)
 
 .. note::
         deep-translator uses free deepl api by default. If you have the pro version then simply set the use_free_api to false.
@@ -334,14 +334,14 @@ DeepL Translator
     texts = ["hallo welt", "guten morgen"]
 
     # the translate_sentences function is deprecated, use the translate_batch function instead
-    translated = DeepL("your_api_key").translate_batch(texts)
+    translated = DeeplTranslator("your_api_key").translate_batch(texts)
 
-QCRI Translator
+QcriTranslator Translator
 --------------------
 
 .. note::
 
-    In order to use the QCRI translator, you need to generate a free api key. Visit https://mt.qcri.org/api/
+    In order to use the QcriTranslator translator, you need to generate a free api key. Visit https://mt.qcri.org/api/
     for more information
 
 - Check languages
@@ -349,14 +349,14 @@ QCRI Translator
 .. code-block:: python
 
     # as a property
-    print("language pairs: ", QCRI("your_api_key").languages)
+    print("language pairs: ", QcriTranslator("your_api_key").languages)
 
 - Check domains
 
 .. code-block:: python
 
     # as a property
-    print("domains: ", QCRI("your_api_key").domains)
+    print("domains: ", QcriTranslator("your_api_key").domains)
 
 - Text translation
 
@@ -364,7 +364,7 @@ QCRI Translator
 
     text = 'Education is great'
 
-    translated = QCRI("your_api_key").translate(source='en', target='ar', domain="news", text=text)
+    translated = QcriTranslator("your_api_key").translate(source='en', target='ar', domain="news", text=text)
     # output -> التعليم هو عظيم
 
     # see docs for batch translation and more.

docs/history.rst

@@ -11,8 +11,8 @@ Important History
 - 1.3.4 bug fixes for the dutch language
 - 1.3.3 fixed bug in google translate
 
-- 1.2.5: added support for the DeepL translator
-- 1.2.4: added support for the QCRI translator
+- 1.2.5: added support for the DeeplTranslator translator
+- 1.2.4: added support for the QcriTranslator translator
 - 1.2.1: added support for the yandex translator
 - 1.1.9: fixed bug in requests
 - 1.1.5: added language detection

docs/modules.rst

@@ -20,7 +20,7 @@ Exceptions
     :undoc-members:
     :show-inheritance:
 
-    
+
 Language Detection Library
 ----------------------------------
 
@@ -40,7 +40,7 @@ Google Translator
     :undoc-members:
     :show-inheritance:
 
-DeepL
+DeeplTranslator
 ----------------------------------
 
 .. automodule:: deep_translator.deepl
@@ -88,7 +88,7 @@ Pons
     :undoc-members:
     :show-inheritance:
 
-QCRI
+QcriTranslator
 ----------------------------------
 
 .. automodule:: deep_translator.qcri
@@ -102,4 +102,4 @@ Yandex
 .. automodule:: deep_translator.yandex
     :members:
     :undoc-members:
-    :show-inheritance:
+    :show-inheritance:

docs/usage.rst

@@ -22,8 +22,8 @@ Imports
                                  LingueeTranslator,
                                  MyMemoryTranslator,
                                  YandexTranslator,
-                                 DeepL,
-                                 QCRI,
+                                 DeeplTranslator,
+                                 QcriTranslator,
                                  single_detection,
                                  batch_detection)
 
@@ -140,12 +140,12 @@ Mymemory Translator
     translated = MyMemoryTranslator(source='en', target='fr').translate_file(path)
 
 
-DeepL Translator
+DeeplTranslator Translator
 -----------------
 
 .. note::
 
-    In order to use the DeepL translator, you need to generate an api key. Visit https://www.deepl.com/en/docs-api/
+    In order to use the DeeplTranslator translator, you need to generate an api key. Visit https://www.deepl.com/en/docs-api/
     for more information
 
 - Simple translation
@@ -154,7 +154,7 @@ DeepL Translator
 
     text = 'Keep it up. You are awesome'
 
-    translated = DeepL("your_api_key").translate(text)
+    translated = DeeplTranslator("your_api_key").translate(text)
 
 - Translate batch of texts
 
@@ -163,14 +163,14 @@ DeepL Translator
     texts = ["hallo welt", "guten morgen"]
 
     # the translate_sentences function is deprecated, use the translate_batch function instead
-    translated = DeepL("your_api_key").translate_batch(texts)
+    translated = DeeplTranslator("your_api_key").translate_batch(texts)
 
-QCRI Translator
+QcriTranslator Translator
 --------------------
 
 .. note::
 
-    In order to use the QCRI translator, you need to generate a free api key. Visit https://mt.qcri.org/api/
+    In order to use the QcriTranslator translator, you need to generate a free api key. Visit https://mt.qcri.org/api/
     for more information
 
 - Check languages
@@ -178,14 +178,14 @@ QCRI Translator
 .. code-block:: python
 
     # as a property
-    print("language pairs: ", QCRI("your_api_key").languages)
+    print("language pairs: ", QcriTranslator("your_api_key").languages)
 
 - Check domains
 
 .. code-block:: python
 
     # as a property
-    print("domains: ", QCRI("your_api_key").domains)
+    print("domains: ", QcriTranslator("your_api_key").domains)
 
 - Text translation
 
@@ -193,7 +193,7 @@ QCRI Translator
 
     text = 'Education is great'
 
-    translated = QCRI("your_api_key").translate(source='en', target='ar', domain="news", text=text)
+    translated = QcriTranslator("your_api_key").translate(source='en', target='ar', domain="news", text=text)
     # output -> التعليم هو عظيم
 
     # see docs for batch translation and more.
@@ -306,7 +306,7 @@ Libre Translator
 .. note::
 
     Libre translate has multiple  `mirrors <https://github.com/LibreTranslate/LibreTranslate#mirrors>`_ which can be used for the API endpoint.
-    Some require an API key to be used. By default the base url is set to `libretranslate.de <https://libretranslate.de/>`_ . 
+    Some require an API key to be used. By default the base url is set to `libretranslate.de <https://libretranslate.de/>`_ .
     This can be set using the "base_url" input parameter.
 
 .. code-block:: python

pyproject.toml

@@ -9,7 +9,7 @@ readme = "docs/README.rst"
 homepage = "https://github.com/nidhaloff/deep_translator"
 repository = "https://github.com/nidhaloff/deep_translator"
 documentation = "https://deep-translator.readthedocs.io/en/latest/"
-keywords = ["deep_translator", "deepL", "DeepL", "translator", "translation", "automation", "web scraping", "google translator", "google translation", "google trans", "PONS", "YANDEX", "MyMemory translator", "Linguee", "QCRI", "Language", "Language detection", "detect language", "free translation", "unlimited translation", "translate for free"]
+keywords = ["deep_translator", "deepL", "DeeplTranslator", "translator", "translation", "automation", "web scraping", "google translator", "google translation", "google trans", "PONS", "YANDEX", "MyMemory translator", "Linguee", "QcriTranslator", "Language", "Language detection", "detect language", "free translation", "unlimited translation", "translate for free"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",

tests/test_deepl.py

@@ -1,12 +1,12 @@
 import pytest
 from unittest.mock import Mock, PropertyMock, patch
-from deep_translator.deepl import DeepL
+from deep_translator.deepl import DeeplTranslator
 from deep_translator.exceptions import AuthorizationException
 
 
 @patch('deep_translator.deepl.requests')
 def test_simple_translation(mock_requests):
-    translator = DeepL(api_key='imagine-this-is-an-valid-api-key', source='en', target='es')
+    translator = DeeplTranslator(api_key='imagine-this-is-an-valid-api-key', source='en', target='es')
     # Set the request response mock.
     mock_response = Mock()
     mock_response.status_code = 200
@@ -22,7 +22,7 @@ def test_simple_translation(mock_requests):
 
 @patch('deep_translator.deepl.requests.get')
 def test_wrong_api_key(mock_requests):
-    translator = DeepL(api_key='this-is-a-wrong-api-key!', source="en", target="es")
+    translator = DeeplTranslator(api_key='this-is-a-wrong-api-key!', source="en", target="es")
     # Set the response status_code only.
     mock_requests.return_value = Mock(status_code=403)
     with pytest.raises(AuthorizationException):