refactor: correcting notebook examples

BREAKING CHANGE: This is a breaking change.
BREAKING CHANGE: This is a breaking change.

Author: ehdsouza

examples/notebooks/assistant_v1.ipynb

@@ -17,7 +17,7 @@
     "import sys\n",
     "import os\n",
     "sys.path.append(os.path.join(os.getcwd(),'..','..'))\n",
-    "import watson_developer_cloud"
+    "import ibm_watson"
    ]
   },
   {
@@ -35,7 +35,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "assistant = watson_developer_cloud.AssistantV1(iam_apikey=API_KEY,\n",
+    "assistant = ibm_watson.AssistantV1(iam_apikey=API_KEY,\n",
     "                                               version='2018-07-10')"
    ]
   },

examples/notebooks/natural_language_understanding_v1.ipynb

@@ -2,105 +2,103 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {
-    "collapsed": true,
-    "deletable": true,
-    "editable": true
-   },
+   "execution_count": 1,
+   "metadata": {},
    "outputs": [],
    "source": [
     "import sys\n",
     "import os\n",
     "sys.path.append(os.path.join(os.getcwd(),'..'))\n",
-    "import watson_developer_cloud\n",
-    "from watson_developer_cloud.natural_language_understanding_v1 import Features, EntitiesOptions, KeywordsOptions"
+    "import ibm_watson\n",
+    "from ibm_watson.natural_language_understanding_v1 import Features, EntitiesOptions, KeywordsOptions"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
-   "metadata": {
-    "collapsed": false,
-    "deletable": true,
-    "editable": true
-   },
+   "execution_count": 2,
+   "metadata": {},
    "outputs": [],
    "source": [
-    "nlu = watson_developer_cloud.NaturalLanguageUnderstandingV1(version='2017-02-27',\n",
-    "                                                            username='USERNAME',\n",
-    "                                                            password='PASSWORD')"
+    "nlu = ibm_watson.NaturalLanguageUnderstandingV1(version='2018-03-16',\n",
+    "                                                            iam_apikey='YOUR API KEY')"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {
-    "collapsed": false,
-    "deletable": true,
-    "editable": true
-   },
+   "execution_count": 3,
+   "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "{'entities': [{'count': 3,\n",
-       "   'relevance': 0.915411,\n",
-       "   'text': 'Bruce Banner',\n",
-       "   'type': 'Person'},\n",
-       "  {'count': 1, 'relevance': 0.296395, 'text': 'Wayne', 'type': 'Person'}],\n",
-       " 'keywords': [{'relevance': 0.984789, 'text': 'Bruce Banner'},\n",
-       "  {'relevance': 0.958833, 'text': 'Bruce Wayne'},\n",
-       "  {'relevance': 0.853322, 'text': 'experimental text'},\n",
-       "  {'relevance': 0.627454, 'text': 'Hulk'},\n",
-       "  {'relevance': 0.619956, 'text': 'Superman'},\n",
-       "  {'relevance': 0.583188, 'text': 'BATMAN'}],\n",
-       " 'language': 'en'}"
+       "{u'entities': [{u'count': 2,\n",
+       "   u'relevance': 0.919052,\n",
+       "   u'text': u'Bruce Banner',\n",
+       "   u'type': u'Person'},\n",
+       "  {u'count': 2,\n",
+       "   u'relevance': 0.861216,\n",
+       "   u'text': u'Bruce Wayne',\n",
+       "   u'type': u'Person'}],\n",
+       " u'keywords': [{u'count': 1,\n",
+       "   u'relevance': 0.997922,\n",
+       "   u'text': u'Bruce Banner iis'},\n",
+       "  {u'count': 1, u'relevance': 0.968563, u'text': u'Bruce Wayne'},\n",
+       "  {u'count': 1, u'relevance': 0.939485, u'text': u'Superman fears'},\n",
+       "  {u'count': 1, u'relevance': 0.633474, u'text': u'Hulk'},\n",
+       "  {u'count': 1, u'relevance': 0.620977, u'text': u'Banner'},\n",
+       "  {u'count': 1, u'relevance': 0.550403, u'text': u'BATMAN'},\n",
+       "  {u'count': 1, u'relevance': 0.530623, u'text': u'Wayne'},\n",
+       "  {u'count': 1, u'relevance': 0.374627, u'text': u'experimental text'}],\n",
+       " u'language': u'en',\n",
+       " u'usage': {u'features': 2, u'text_characters': 121, u'text_units': 1}}"
       ]
      },
-     "execution_count": 6,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "nlu.analyze(text='this is my experimental text.  Bruce Banner is the Hulk and Bruce Wayne is BATMAN! Superman fears not Banner, but Wayne.',\n",
-    "            features=Features(entities=EntitiesOptions(), keywords=KeywordsOptions()))"
+    "nlu.analyze(text='this is my experimental text.  Bruce Banner iis the Hulk and Bruce Wayne is BATMAN! Superman fears not Banner, but Wayne.',\n",
+    "            features=Features(entities=EntitiesOptions(), keywords=KeywordsOptions())).get_result()"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "deletable": true,
-    "editable": true
+    "collapsed": true
    },
    "outputs": [],
-   "source": [
-    ""
-   ]
+   "source": []
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python with Pixiedust (Spark 2.2)",
    "language": "python",
-   "name": "python3"
+   "name": "pythonwithpixiedustspark22"
   },
   "language_info": {
    "codemirror_mode": {
     "name": "ipython",
-    "version": 3.0
+    "version": 2
    },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.6.0"
+   "pygments_lexer": "ipython2",
+   "version": "2.7.10"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 0
+ "nbformat_minor": 1
 }