Merge branch 'master' of https://github.com/watson-developer-cloud/python-sdk into deprecate-services

Author: germanattanasio

examples/alchemy_language_v1.py

@@ -12,6 +12,7 @@
 # print(json.dumps(alchemy_language.keywords(max_items=5, url=url), indent=2))
 # print(json.dumps(alchemy_language.concepts(max_items=2, url=url), indent=2))
 # print(json.dumps(alchemy_language.entities(url=url), indent=2))
+# print(json.dumps(alchemy_language.dates(url=url, anchor_date='2016-03-22 00:00:00'), indent=2))
 # print(json.dumps(alchemy_language.category(url=url), indent=2))
 # print(json.dumps(alchemy_language.typed_relations(url=url), indent=2))
 # print(json.dumps(alchemy_language.relations(url=url), indent=2))

watson_developer_cloud/alchemy_language_v1.py

@@ -57,9 +57,15 @@ def concepts(self, html=None, text=None, url=None, max_items=8, linked_data=True
         params = {'maxRetrieve': max_items,
                   'linkedData': linked_data,
                   'showSourceText': show_source_text,
-                  'langauge': language}
+                  'language': language}
         return self._alchemy_html_request('GetRankedConcepts', html=html, text=text, url=url, params=params)
 
+    def dates(self, html=None, text=None, url=None, anchor_date=None, show_source_text=False, language=None):
+        params = {'anchorDate': anchor_date,
+                  'showSourceText': show_source_text,
+                  'language': language}
+        return self._alchemy_html_request('ExtractDates', html=html, text=text, url=url, params=params)
+
     def entities(self, html=None, text=None, url=None, disambiguate=True, linked_data=True, coreference=True,
                  quotations=False, sentiment=False, show_source_text=False, max_items=50, language=None, model=None):
         params = {'disambiguate': disambiguate,

watson_developer_cloud/conversation_v1.py

@@ -29,7 +29,8 @@ def __init__(self, version, url=default_url, **kwargs):
         WatsonDeveloperCloudService.__init__(self, 'conversation', url, **kwargs)
         self.version = version
 
-    def message(self, workspace_id, message_input=None, context=None, entities=None, intents=None, output=None, alternate_intents=None):
+    def message(self, workspace_id, message_input=None, context=None, entities=None, intents=None, output=None,
+                alternate_intents=False):
         """
         Retrieves information about a specific classifier.
         :param workspace_id: The workspace to use