more refactoring (and a minor setup.py tweak)

README.rst

@@ -647,7 +647,7 @@ Next Steps
 
 Take a look in the examples folder for more :)
 Contributions are always welcome.
-Read the Contribution guildlines `Here <https://deep-translator.readthedocs.io/en/latest/contributing.html/>`_
+Read the Contribution guidelines `Here <https://deep-translator.readthedocs.io/en/latest/contributing.html/>`_
 
 ==========
 Credits
@@ -673,7 +673,7 @@ The Translator++ mobile app
     :alt: Icon of the app
 
 
-After developing the deep_translator, I realised how cool this would be if I can use it as an app on my mobile phone.
+After developing the deep_translator, I realized how cool this would be if I can use it as an app on my mobile phone.
 Sure, there is google translate, pons and linguee apps etc.. but isn't it cooler to make an app where all these
 translators are integrated?
 

deep_translator/__init__.py

@@ -1,14 +1,15 @@
 """Top-level package for deep_translator."""
 
-from .google_trans 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 .detection import single_detection, batch_detection
-from .microsoft import MicrosoftTranslator
+from deep_translator.google_trans import GoogleTranslator
+from deep_translator.pons import PonsTranslator
+from deep_translator.linguee import LingueeTranslator
+from deep_translator.mymemory import MyMemoryTranslator
+from deep_translator.yandex import YandexTranslator
+from deep_translator.qcri import QCRI
+from deep_translator.deepl import DeepL
+from deep_translator.detection import single_detection, batch_detection
+from deep_translator.microsoft import MicrosoftTranslator
+from deep_translator.cli import main
 
 
 __author__ = """Nidhal Baccouri"""
@@ -23,5 +24,6 @@ __all__ = [GoogleTranslator,
            MicrosoftTranslator,
            QCRI,
            DeepL,
+           main,
            single_detection,
            batch_detection]

deep_translator/cli.py

@@ -13,6 +13,75 @@ from papago import PapagoTranslator
 
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
+def main(translator, source, target, text, api_key, languages):
+    """
+    Use TRANSLATOR to translate source material into another language.\n
+    Available translators include: Google, MyMemory, QCRI, Linguee, Pons, Yandex, Microsoft (Bing), and Papago.\n
+    \n
+    \f
+    function responsible for parsing terminal arguments and provide them for
+    further use in the translation process
+    """
+    api_key_required = ["deepl", "qcri", "yandex", "microsoft", "papago"]
+    if translator in api_key_required and not api_key:
+        click.echo(
+            "This translator requires an api key provided through --api-key"
+        )
+    elif languages:
+        print_supported_languages(translator, api_key)
+    else:
+        translate(translator, source, target, text, api_key)
+    # sys.exit()
+
+@click.command(context_settings=CONTEXT_SETTINGS)
+# @click.option(
+#     "--translator",
+#     "-trans",
+#     default="google",
+#     type=str,
+#     help="name of the translator you want to use",
+#     show_default=True,
+# )
+
+@click.argument(
+    'translator',
+    required=True,
+    default='google',
+    type=str,
+)
+
+@click.option(
+    "--source",
+    "-src",
+    required=True,
+    type=str,
+    help="source language to translate from"
+)
+@click.option(
+    "--target",
+    "-tgt",
+    required=True,
+    type=str,
+    help="target language to translate to"
+)
+@click.option(
+    "--text",
+    "-txt",
+    type=str,
+    help="text you want to translate"
+)
+@click.option(
+    "--api-key",
+    type=str,
+    help="required for DeepL, QCRI, Yandex, Microsoft and Papago translators"
+)
+@click.option(
+    "--languages",
+    "-lang",
+    is_flag=True,
+    help="list all the languages available with the translator."
+    " Run with deep_translator <translator service> -lang",
+)
 
 def translate(translator, source, target, text, api_key):
     """
@@ -65,7 +134,6 @@ def translate(translator, source, target, text, api_key):
     click.echo(f" | Translation from {source} to {target} |")
     click.echo(f"Translated text: \n {res}")
 
-
 def print_supported_languages(requested_translator, api_key):
     """
     function used to print the languages supported by the translator service
@@ -102,75 +170,5 @@ def print_supported_languages(requested_translator, api_key):
     for k, v in supported_languages.items():
         click.echo(f"|- {k}: {v}")
 
-
-@click.command(context_settings=CONTEXT_SETTINGS)
-# @click.option(
-#     "--translator",
-#     "-trans",
-#     default="google",
-#     type=str,
-#     help="name of the translator you want to use",
-#     show_default=True,
-# )
-
-@click.argument(
-    'translator',
-    required=True,
-    default='google',
-    type=str,
-)
-
-@click.option(
-    "--source",
-    "-src",
-    required=True
-    type=str,
-    help="source language to translate from"
-)
-@click.option(
-    "--target",
-    "-tg",
-    required=True
-    type=str,
-    help="target language to translate to"
-)
-@click.option(
-    "--text",
-    "-txt",
-    type=str,
-    help="text you want to translate"
-)
-@click.option(
-    "--api-key",
-    type=str,
-    help="required for DeepL, QCRI, Yandex, Microsoft and Papago translators"
-)
-@click.option(
-    "--languages",
-    "-lang",
-    is_flag=True,
-    help="list all the languages available with the translator."
-    " Run with deep_translator -trans <translator service> -lang",
-)
-def main(translator, source, target, text, api_key, languages):
-    """
-    Use TRANSLATOR to translate source material into another language.
-    Available translators include: Google, MyMemory, QCRI, Linguee, Pons, Yandex, Microsoft (Bing), and Papago.
-    \f
-    function responsible for parsing terminal arguments and provide them for
-    further use in the translation process
-    """
-    api_key_required = ["deepl", "qcri", "yandex", "microsoft", "papago"]
-    if translator in api_key_required and not api_key:
-        click.echo(
-            "This translator requires an api key provided through --api-key"
-        )
-    elif languages:
-        print_supported_languages(translator, api_key)
-    else:
-        translate(translator, source, target, text, api_key)
-    # sys.exit()
-
-
 if __name__ == "__main__":
     main()

deep_translator/tests/test_cli.py

@@ -3,10 +3,10 @@
 """Tests for `deep_translator` package."""
 
 from click.testing import CliRunner
-import cli
+from deep_translator.cli import main
 
-def cli():
+def results_test():
     runner = CliRunner()
-    result = runner.invoke(cli.translate, [ 'google', 'auto', 'en', '좋은'])
+    result = runner.invoke(cli.main, [ 'google', 'auto', 'en', '좋은'])
     assert result.exit_code == 0
     assert result == 'good'

setup.py

@@ -47,10 +47,11 @@ setup(
     description="A flexible python tool to translate between different languages in a simple way.",
     entry_points={
         'console_scripts': [
-            'deep_translator=deep_translator.cli:main',
+            'deep_translator = cli:main',
+            'dt = cli:main',
         ],
     },
-    install_requires=['requests', 'beautifulsoup4'],
+    install_requires=['requests', 'beautifulsoup4', 'Click'],
     license="MIT license",
     long_description=readme + '\n\n' + history,
     include_package_data=True,