💥🔥 rename language translation

Author: germanattanasio

examples/language_translation_v2.py

@@ -0,0 +1,27 @@
+# coding=utf-8
+import json
+from watson_developer_cloud import LanguageTranslatorV2
+
+language_translator = LanguageTranslatorV2(
+    username='YOUR SERVICE USERNAME',
+    password='YOUR SERVICE PASSWORD')
+
+# create new custom model
+# with open('../resources/language_translator_model.tmx', 'rb') as custom_model:
+#     print(json.dumps(language_translator.create_model(
+#         base_model_id='en-fr', name='test_glossary', forced_glossary=custom_model), indent=2))
+
+print(json.dumps(language_translator.get_models(), indent=2))
+
+print(json.dumps(language_translator.get_model('en-es-conversational'), indent=2))
+
+# delete custom model
+# print(json.dumps(language_translator.delete_model('13860c86-ec3f-4e60-8cbe-3ef0048f92af'), indent=2))
+
+print(json.dumps(language_translator.translate('Hola, cómo estás? €', source='es', target='en'), indent=2,
+                 ensure_ascii=False))
+
+print(json.dumps(language_translator.identify('Hello how are you?'), indent=2))
+
+
+print(json.dumps(language_translator.get_identifiable_languages(), indent=2))

examples/language_translator_v2.py

@@ -24,6 +24,7 @@
 from .document_conversion_v1 import DocumentConversionV1
 from .dialog_v1 import DialogV1
 from .language_translation_v2 import LanguageTranslationV2
+from .language_translator_v2 import LanguageTranslatorV2
 from .natural_language_classifier_v1 import NaturalLanguageClassifierV1
 from .personality_insights_v2 import PersonalityInsightsV2
 from .relationship_extraction_v1_beta import RelationshipExtractionV1Beta

resources/language_translation_model.tmx renamed to resources/language_translator_model.tmx

@@ -13,10 +13,12 @@
 # limitations under the License.
 
 """
-The v1 Language Translation service
+The v2 Language Translation service
 (https://http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/language-translation.html)
 """
 
+import warnings
+
 from .watson_developer_cloud_service import WatsonDeveloperCloudService
 from .watson_developer_cloud_service import WatsonInvalidArgument
 
@@ -25,6 +27,7 @@ class LanguageTranslationV2(WatsonDeveloperCloudService):
     default_url = "https://gateway.watsonplatform.net/language-translation/api"
 
     def __init__(self, url=default_url, **kwargs):
+        warnings.warn('deprecated. Use LanguageTranslatorV2', DeprecationWarning)
         WatsonDeveloperCloudService.__init__(
             self, 'language_translation', url, **kwargs)
 

watson_developer_cloud/__init__.py

@@ -0,0 +1,75 @@
+# Copyright 2015 IBM All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+The v2 Language Translator service
+(https://http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/language-translator.html)
+"""
+
+from .watson_developer_cloud_service import WatsonDeveloperCloudService
+from .watson_developer_cloud_service import WatsonInvalidArgument
+
+
+class LanguageTranslatorV2(WatsonDeveloperCloudService):
+    default_url = "https://gateway.watsonplatform.net/language-translator/api"
+
+    def __init__(self, url=default_url, **kwargs):
+        WatsonDeveloperCloudService.__init__(
+            self, 'language_translator', url, **kwargs)
+
+    def identify(self, text):
+        """
+        Identifies the language of given source text
+        """
+        return self.request(method='POST', url='/v2/identify', data=text, headers={'content-type': 'text/plain'},
+                            accept_json=True)
+
+    def get_identifiable_languages(self):
+        return self.request(method='GET', url='/v2/identifiable_languages', accept_json=True)
+
+    def get_models(self, default=None, source=None, target=None):
+        """
+        Get the available models for translation
+        """
+        params = {'default': default, 'source': source, 'target': target}
+        return self.request(method='GET', url='/v2/models', params=params, accept_json=True)
+
+    def create_model(self, base_model_id, name=None, forced_glossary=None, parallel_corpus=None,
+                     monolingual_corpus=None):
+        if forced_glossary is None and parallel_corpus is None and monolingual_corpus is None:
+            raise WatsonInvalidArgument('A glossary or corpus must be provided')
+        params = {'name': name,
+                  'base_model_id': base_model_id}
+        files = {'forced_glossary': forced_glossary,
+                 'parallel_corpus': parallel_corpus,
+                 'monolingual_corpus': monolingual_corpus}
+        return self.request(method='POST', url='/v2/models', params=params, files=files, accept_json=True)
+
+    def get_model(self, model_id):
+        return self.request(method='GET', url='/v2/models/{0}'.format(model_id), accept_json=True)
+
+    def delete_model(self, model_id):
+        return self.request(method='DELETE', url='/v2/models/{0}'.format(model_id), accept_json=True)
+
+    def translate(self, text, source=None, target=None, model=None):
+        """
+        Translates text from a source language to a target language
+        """
+        if model is None and (source is None or target is None):
+            raise WatsonInvalidArgument('Either model or source and target must be specified')
+
+        data = {'text': text, 'source': source, 'target': target, 'model': model}
+
+        # data=data or json=data
+        return self.request(method='POST', url='/v2/translate', json=data).text