nidhal baccouri
commited on
Commit
·
f651d07
1
Parent(s):
aa9b475
fixed qcri and yandex
Browse files- deep_translator/base.py +9 -9
- deep_translator/qcri.py +1 -1
deep_translator/base.py
CHANGED
@@ -28,8 +28,8 @@ class BaseTranslator(ABC):
|
|
28 |
@param target: target language to translate to
|
29 |
"""
|
30 |
self._base_url = base_url
|
31 |
-
self.
|
32 |
-
self.
|
33 |
if not source:
|
34 |
raise InvalidSourceOrTargetLanguage(source)
|
35 |
if not target:
|
@@ -68,16 +68,16 @@ class BaseTranslator(ABC):
|
|
68 |
@return: mapped value of the language or raise an exception if the language is not supported
|
69 |
"""
|
70 |
for language in languages:
|
71 |
-
if language in self.
|
72 |
yield language
|
73 |
-
elif language in self.
|
74 |
-
yield self.
|
75 |
else:
|
76 |
raise LanguageNotSupportedException(
|
77 |
language,
|
78 |
message=f"No support for the provided language.\n"
|
79 |
f"Please select on of the supported languages:\n"
|
80 |
-
f"{self.
|
81 |
|
82 |
def _same_source_target(self) -> bool:
|
83 |
return self._source == self._target
|
@@ -90,7 +90,7 @@ class BaseTranslator(ABC):
|
|
90 |
@param as_dict: if True, the languages will be returned as a dictionary mapping languages to their abbreviations
|
91 |
@return: list or dict
|
92 |
"""
|
93 |
-
return self.
|
94 |
|
95 |
def is_language_supported(self, language: str, **kwargs) -> bool:
|
96 |
"""
|
@@ -100,8 +100,8 @@ class BaseTranslator(ABC):
|
|
100 |
"""
|
101 |
if (
|
102 |
language == "auto"
|
103 |
-
or language in self.
|
104 |
-
or language in self.
|
105 |
):
|
106 |
return True
|
107 |
else:
|
|
|
28 |
@param target: target language to translate to
|
29 |
"""
|
30 |
self._base_url = base_url
|
31 |
+
self._languages = languages
|
32 |
+
self._supported_languages = list(self._languages.keys())
|
33 |
if not source:
|
34 |
raise InvalidSourceOrTargetLanguage(source)
|
35 |
if not target:
|
|
|
68 |
@return: mapped value of the language or raise an exception if the language is not supported
|
69 |
"""
|
70 |
for language in languages:
|
71 |
+
if language in self._languages.values() or language == "auto":
|
72 |
yield language
|
73 |
+
elif language in self._languages.keys():
|
74 |
+
yield self._languages[language]
|
75 |
else:
|
76 |
raise LanguageNotSupportedException(
|
77 |
language,
|
78 |
message=f"No support for the provided language.\n"
|
79 |
f"Please select on of the supported languages:\n"
|
80 |
+
f"{self._languages}")
|
81 |
|
82 |
def _same_source_target(self) -> bool:
|
83 |
return self._source == self._target
|
|
|
90 |
@param as_dict: if True, the languages will be returned as a dictionary mapping languages to their abbreviations
|
91 |
@return: list or dict
|
92 |
"""
|
93 |
+
return self._supported_languages if not as_dict else self._languages
|
94 |
|
95 |
def is_language_supported(self, language: str, **kwargs) -> bool:
|
96 |
"""
|
|
|
100 |
"""
|
101 |
if (
|
102 |
language == "auto"
|
103 |
+
or language in self._languages.keys()
|
104 |
+
or language in self._languages.values()
|
105 |
):
|
106 |
return True
|
107 |
else:
|
deep_translator/qcri.py
CHANGED
@@ -34,7 +34,7 @@ class QcriTranslator(BaseTranslator):
|
|
34 |
|
35 |
self.params = {"key": self.api_key}
|
36 |
super().__init__(
|
37 |
-
base_url=BASE_URLS.get("
|
38 |
source=source,
|
39 |
target=target,
|
40 |
languages=QCRI_LANGUAGE_TO_CODE,
|
|
|
34 |
|
35 |
self.params = {"key": self.api_key}
|
36 |
super().__init__(
|
37 |
+
base_url=BASE_URLS.get("QCRI"),
|
38 |
source=source,
|
39 |
target=target,
|
40 |
languages=QCRI_LANGUAGE_TO_CODE,
|