🆕 Add Language Translator

germanattanasio · germanattanasio · commit 2121e5342b42 · 2016-09-30T20:36:09.000-04:00
* 🔥 remove Conversation v1 experimental
diff --git a/.env.enc b/.env.enc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Change Log
 ==========
 
+## Version 0.20.0
+
+_2016-09-30_
+
+* Added: Language Translator
+* Fixed: Deprecation to Language Translation
+* Removed: Conversation v1 experimental
+
+
 ## Version 0.19.0
 
 _2016-08-30_
diff --git a/examples/conversation_v1.py b/examples/conversation_v1.py
@@ -4,15 +4,15 @@
 conversation = ConversationV1(
     username='YOUR SERVICE USERNAME',
     password='YOUR SERVICE PASSWORD',
-    version='2016-07-11')
+    version='2016-09-20')
 
 # replace with your own workspace_id
-workspace_id = '293b58fc-3c5b-4ac5-a8f4-8d52c393d875'
+workspace_id = 'b42ee794-c019-4a0d-acd2-9e4d1d016767'
 
 response = conversation.message(workspace_id=workspace_id, message_input={'text': 'What\'s the weather like?'})
 print(json.dumps(response, indent=2))
 
 # When you send multiple requests for the same conversation, include the context object from the previous response.
 # response = conversation.message(workspace_id=workspace_id, message_input={'text': 'turn the wipers on'},
-                                context=response['context'])
+#                                context=response['context'])
 # print(json.dumps(response, indent=2))
diff --git a/examples/language_translation_v2.py b/examples/language_translation_v2.py
@@ -2,6 +2,8 @@
 import json
 from watson_developer_cloud import LanguageTranslationV2
 
+# Language translation was deprecated use Language Translator.
+
 language_translation = LanguageTranslationV2(
     username='YOUR SERVICE USERNAME',
     password='YOUR SERVICE PASSWORD')
diff --git a/examples/language_translator_v2.py b/examples/language_translator_v2.py
@@ -0,0 +1,28 @@
+# 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.translate('Messi is the best ever', model_id='en-es-conversational'), indent=2))
+
+print(json.dumps(language_translator.identify('Hello how are you?'), indent=2))
+
+print(json.dumps(language_translator.get_identifiable_languages(), indent=2))
diff --git a/test/test_conversation_v1.py b/test/test_conversation_v1.py
@@ -7,11 +7,11 @@ def test_message():
 # Ranker endpoints
     conversation = watson_developer_cloud.ConversationV1(username="username",
                                                          password="password",
-                                                         version='2016-07-11')
+                                                         version='2016-09-20')
 
     workspace_id = 'f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec'
     message_url = 'https://gateway.watsonplatform.net/conversation/api/v1/workspaces/%s/message' % workspace_id
-    message_url1 = 'https://gateway.watsonplatform.net/conversation/api/v1/workspaces/%s/message?version=2016-07-11' % workspace_id
+    message_url1 = 'https://gateway.watsonplatform.net/conversation/api/v1/workspaces/%s/message?version=2016-09-20' % workspace_id
     message_response = '{"context":{"conversation_id":"1b7b67c0-90ed-45dc-8508-9488bc483d5b","system":{"dialog_stack":["root"],"dialog_turn_counter":1,"dialog_request_counter":1}},"intents":[],"entities":[],"input":{}}'
 
     responses.add(responses.POST, message_url,
diff --git a/watson_developer_cloud/__init__.py b/watson_developer_cloud/__init__.py
@@ -20,10 +20,10 @@
 from .alchemy_vision_v1 import AlchemyVisionV1
 from .authorization_v1 import AuthorizationV1
 from .conversation_v1 import ConversationV1
-from .conversation_v1_experimental import ConversationV1Experimental
 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 .retrieve_and_rank_v1 import RetrieveAndRankV1
diff --git a/watson_developer_cloud/alchemy_vision_v1.py b/watson_developer_cloud/alchemy_vision_v1.py
@@ -15,10 +15,11 @@
 The AlchemyAPI Vision service
 (https://www.ibm.com/watson/developercloud/visual-recognition.html)
 """
-
+from __future__ import print_function
 from .watson_developer_cloud_service import WatsonDeveloperCloudService
 
 
+
 class AlchemyVisionV1(WatsonDeveloperCloudService):
     """AlchemyVision was deprecated, migrate your application to use VisualRecognition."""
     default_url = 'https://gateway-a.watsonplatform.net/calls'
diff --git a/watson_developer_cloud/conversation_v1.py b/watson_developer_cloud/conversation_v1.py
@@ -23,7 +23,7 @@ class ConversationV1(WatsonDeveloperCloudService):
     """Client for the Conversation service"""
 
     default_url = 'https://gateway.watsonplatform.net/conversation/api'
-    latest_version = '2016-07-11'
+    latest_version = '2016-09-20'
 
     def __init__(self, version, url=default_url, **kwargs):
         WatsonDeveloperCloudService.__init__(self, 'conversation', url, **kwargs)
diff --git a/watson_developer_cloud/conversation_v1_experimental.py b/watson_developer_cloud/conversation_v1_experimental.py
diff --git a/watson_developer_cloud/language_translation_v2.py b/watson_developer_cloud/language_translation_v2.py
@@ -17,6 +17,7 @@
 (https://www.ibm.com/watson/developercloud/language-translation.html)
 """
 
+from __future__ import print_function
 from .watson_developer_cloud_service import WatsonDeveloperCloudService
 from .watson_developer_cloud_service import WatsonInvalidArgument
 
@@ -26,7 +27,7 @@ class LanguageTranslationV2(WatsonDeveloperCloudService):
 
     def __init__(self, url=default_url, **kwargs):
         WatsonDeveloperCloudService.__init__(self, 'language_translation', url, **kwargs)
-
+        print('WARNING: The Language Translation service was deprecated, please migrate to Language Translator.')
     def identify(self, text):
         """
         Identifies the language of given source text
diff --git a/watson_developer_cloud/language_translator_v2.py b/watson_developer_cloud/language_translator_v2.py
@@ -0,0 +1,74 @@
+# Copyright 2016 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://www.ibm.com/watson/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_id=None):
+        """
+        Translates text from a source language to a target language
+        """
+        if model_id is None and (source is None or target is None):
+            raise WatsonInvalidArgument('Either model_id or source and target must be specified')
+
+        data = {'text': text, 'source': source, 'target': target, 'model_id': model_id}
+
+        # data=data or json=data
+        return self.request(method='POST', url='/v2/translate', json=data).text
