renamed input validation func

deep_translator/deepl.py

@@ -1,6 +1,6 @@
 import requests
 from typing import Optional, List
-from deep_translator.validate import is_empty, validate_input
+from deep_translator.validate import is_empty, is_input_valid
 from deep_translator.constants import BASE_URLS, DEEPL_LANGUAGE_TO_CODE
 from deep_translator.exceptions import (
     ServerException,
@@ -51,7 +51,7 @@ class DeeplTranslator(BaseTranslator):
         @param text: text to translate
         @return: translated text
         """
-        if validate_input(text):
+        if is_input_valid(text):
             if self._same_source_target() or is_empty(text):
                 return text
 

deep_translator/google.py

@@ -9,7 +9,7 @@ from deep_translator.exceptions import (
     RequestError,
 )
 from deep_translator.base import BaseTranslator
-from deep_translator.validate import validate_input, is_empty
+from deep_translator.validate import is_input_valid, is_empty
 from bs4 import BeautifulSoup
 import requests
 from typing import Optional, List
@@ -17,7 +17,7 @@ from typing import Optional, List
 
 class GoogleTranslator(BaseTranslator):
     """
-    class that wraps functions, which use google translate under the hood to translate text(s)
+    class that wraps functions, which use Google Translate under the hood to translate text(s)
     """
 
     def __init__(
@@ -46,11 +46,11 @@ class GoogleTranslator(BaseTranslator):
 
     def translate(self, text: str, **kwargs) -> str:
         """
-        function that uses google translate to translate a text
+        function to translate a text
         @param text: desired text to translate
         @return: str: translated text
         """
-        if validate_input(text):
+        if is_input_valid(text):
             text = text.strip()
             if self._same_source_target() or is_empty(text):
                 return text

deep_translator/libre.py

@@ -4,7 +4,7 @@ LibreTranslate API
 
 import requests
 from typing import Optional, List
-from deep_translator.validate import is_empty, validate_input
+from deep_translator.validate import is_empty, is_input_valid
 from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, LIBRE_LANGUAGES_TO_CODES
 from deep_translator.exceptions import (
@@ -48,7 +48,7 @@ class LibreTranslator(BaseTranslator):
         @param text: desired text to translate
         @return: str: translated text
         """
-        if validate_input(text):
+        if is_input_valid(text):
             if self._same_source_target() or is_empty(text):
                 return text
 

deep_translator/linguee.py

@@ -1,7 +1,7 @@
 """
 linguee translator API
 """
-from deep_translator.validate import validate_input, is_empty
+from deep_translator.validate import is_input_valid, is_empty
 from deep_translator.constants import BASE_URLS, LINGUEE_LANGUAGES_TO_CODES
 from deep_translator.exceptions import (
     TranslationNotFound,
@@ -54,7 +54,7 @@ class LingueeTranslator(BaseTranslator):
         if self._same_source_target() or is_empty(word):
             return word
 
-        if validate_input(word, max_chars=50):
+        if is_input_valid(word, max_chars=50):
             # %s-%s/translation/%s.html
             url = (
                 f"{self._base_url}{self._source}-{self._target}/translation/{word}.html"

deep_translator/microsoft.py

@@ -6,7 +6,7 @@ import sys
 from deep_translator.constants import BASE_URLS
 from deep_translator.exceptions import ServerException, MicrosoftAPIerror
 from deep_translator.base import BaseTranslator
-from deep_translator.validate import validate_input
+from deep_translator.validate import is_input_valid
 from typing import Optional, List
 
 
@@ -70,7 +70,7 @@ class MicrosoftTranslator(BaseTranslator):
         # a body must be a list of dicts to process multiple texts;
         # I have not added multiple text processing here since it is covered by the translate_batch method
 
-        if validate_input(text):
+        if is_input_valid(text):
             self._url_params["from"] = self._source
             self._url_params["to"] = self._target
 

deep_translator/mymemory.py

@@ -1,7 +1,7 @@
 """
 mymemory translator API
 """
-from deep_translator.validate import is_empty, validate_input
+from deep_translator.validate import is_empty, is_input_valid
 from deep_translator.constants import BASE_URLS
 from deep_translator.exceptions import (
     TranslationNotFound,
@@ -48,7 +48,7 @@ class MyMemoryTranslator(BaseTranslator):
         @param return_all: set to True to return all synonym/similars of the translated text
         @return: str or list
         """
-        if validate_input(text, max_chars=500):
+        if is_input_valid(text, max_chars=500):
             text = text.strip()
             if self._same_source_target() or is_empty(text):
                 return text

deep_translator/papago.py

@@ -7,7 +7,7 @@ from deep_translator.exceptions import TranslationNotFound
 from deep_translator.base import BaseTranslator
 import requests
 from typing import Optional, List
-from deep_translator.validate import validate_input
+from deep_translator.validate import is_input_valid
 
 
 class PapagoTranslator(BaseTranslator):
@@ -48,7 +48,7 @@ class PapagoTranslator(BaseTranslator):
         @param text: desired text to translate
         @return: str: translated text
         """
-        if validate_input(text):
+        if is_input_valid(text):
             payload = {"source": self._source, "target": self._target, "text": text}
             headers = {
                 "X-Naver-Client-Id": self.client_id,

deep_translator/pons.py

@@ -4,7 +4,7 @@ pons translator API
 from bs4 import BeautifulSoup
 import requests
 
-from deep_translator.validate import validate_input, is_empty
+from deep_translator.validate import is_input_valid, is_empty
 from deep_translator.constants import BASE_URLS, PONS_CODES_TO_LANGUAGES
 from deep_translator.exceptions import (
     TranslationNotFound,
@@ -53,7 +53,7 @@ class PonsTranslator(BaseTranslator):
         @type return_all: bool
         @return: str: translated word
         """
-        if validate_input(word, max_chars=50):
+        if is_input_valid(word, max_chars=50):
             if self._same_source_target() or is_empty(word):
                 return word
             url = f"{self._base_url}{self._source}-{self._target}/{word}"

deep_translator/validate.py

@@ -5,7 +5,7 @@ def is_empty(text: str) -> bool:
     return text == ""
 
 
-def validate_input(text: str, min_chars: int = 0, max_chars: int = 5000) -> bool:
+def is_input_valid(text: str, min_chars: int = 0, max_chars: int = 5000) -> bool:
     """
     validate the target text to translate
     @param min_chars: min characters

deep_translator/yandex.py

@@ -10,7 +10,7 @@ from deep_translator.exceptions import (
     TooManyRequests,
 )
 from deep_translator.base import BaseTranslator
-from deep_translator.validate import validate_input
+from deep_translator.validate import is_input_valid
 from typing import Optional, List
 
 
@@ -93,7 +93,7 @@ class YandexTranslator(BaseTranslator):
         return language
 
     def translate(self, text: str, proxies: Optional[dict] = None, **kwargs) -> str:
-        if validate_input(text):
+        if is_input_valid(text):
             params = {
                 "text": text,
                 "format": "plain",

tests/test_deepl.py

@@ -1,5 +1,5 @@
 import pytest
-from unittest.mock import Mock, PropertyMock, patch
+from unittest.mock import Mock, patch
 from deep_translator.deepl import DeeplTranslator
 from deep_translator.exceptions import AuthorizationException
 

tests/test_google.py

@@ -4,7 +4,7 @@
 
 import pytest
 from deep_translator import exceptions, GoogleTranslator
-from deep_translator.constants import GOOGLE_CODES_TO_LANGUAGES
+from deep_translator.constants import GOOGLE_LANGUAGES_TO_CODES
 
 
 @pytest.fixture
@@ -21,7 +21,7 @@ def test_content(google_translator):
 
 
 def test_abbreviations_and_languages_mapping():
-    for abb, lang in GOOGLE_CODES_TO_LANGUAGES.items():
+    for abb, lang in GOOGLE_LANGUAGES_TO_CODES.items():
         g1 = GoogleTranslator(abb)
         g2 = GoogleTranslator(lang)
         assert g1._source == g2._source

tests/test_libre.py

@@ -4,7 +4,7 @@
 
 import pytest
 from deep_translator import exceptions, LibreTranslator
-from deep_translator.constants import LIBRE_CODES_TO_LANGUAGES
+from deep_translator.constants import LIBRE_LANGUAGES_TO_CODES
 
 
 @pytest.fixture
@@ -24,9 +24,9 @@ def test_inputs():
 
 
 def test_abbreviations_and_languages_mapping():
-    for abb, lang in LIBRE_CODES_TO_LANGUAGES.items():
-        l1 = LibreTranslator(abb, api_key="some_key")
-        l2 = LibreTranslator(lang, api_key="some_key")
+    for abb, lang in LIBRE_LANGUAGES_TO_CODES.items():
+        l1 = LibreTranslator(source=abb, api_key="some_key")
+        l2 = LibreTranslator(source=lang, api_key="some_key")
         assert l1._source == l2._source