Merge branch 'fix-65'

Author: jsstylos

.env.enc

@@ -0,0 +1,5 @@
+# lint Python modules using external checkers.
+[MASTER]
+ignore=SVN
+disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011
+disable=F0401,E0611,E1004,C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201,W0614,R0914,R0912,R0915,R0913,R0904,R0801,C0301,C0411,R0204

.pylintrc

@@ -3,26 +3,22 @@ sudo: false
 notifications:
   email: false
 python:
-- '2.6'
 - '2.7'
 - '3.2'
 - '3.3'
 - '3.4'
 - '3.5'
 - 3.5-dev
 before_install:
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_c3e85137836d_key
-  -iv $encrypted_c3e85137836d_iv -in .env.enc -out .env -d || true'
+- ! '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_6e98b3e8e789_key -iv $encrypted_6e98b3e8e789_iv -in .env.enc -out .env -d || true'
 install:
 - pip install -r requirements-dev.txt
 - pip install pylint
 - pip install codecov
 - pip install git+git://github.com/watson-developer-cloud/python-sdk.git#egg=watson-developer-cloud
-
 script:
-  - sh pylint.sh
-  - py.test test --cov=watson_developer_cloud
+- sh pylint.sh
+- py.test test --cov=watson_developer_cloud
 after_success:
-  - codecov
-  - docs/publish.sh
-
+- codecov
+- docs/publish.sh

.travis.yml

@@ -40,6 +40,9 @@ To get your service credentials, follow these steps:
 Tested 👌 (lightly) on: Python from 2.7 to 3.5-dev (development branch).
 Python 2.6 is partially supported but generates InsecurePlatformWarnings (and other warnings), which can be ignored.
 
+## CHANGELOG
+See [CHANGELOG][CHANGELOG.md].
+
 ## Known Issues
 There is a known incompatibility with this module with Python versions 3.x with Korean systems.
 
@@ -62,4 +65,6 @@ This library is licensed under the [Apache 2.0 license][license].
 [requests]: http://docs.python-requests.org/en/latest/
 [examples]: https://github.com/watson-developer-cloud/python-sdk/tree/master/examples
 [CONTRIBUTING]: https://github.com/watson-developer-cloud/python-sdk/blob/master/CONTRIBUTING.md
+[CHANGELOG.md]: https://github.com/watson-developer-cloud/python-sdk/blob/master/CHANGELOG.md
+
 [license]: http://www.apache.org/licenses/LICENSE-2.0

README.md

@@ -32,6 +32,10 @@
 corpora = concept_insights.list_corpora()
 print (json.dumps(corpora, indent=2))
 
+corpora = concept_insights.list_corpora(account='public')
+print (json.dumps(corpora, indent=2))
+
+
 corpus = concept_insights.get_corpus('ibmresearcher', account='public')
 print(json.dumps(corpus, indent=2))
 

examples/concept_expansion_v1.py

@@ -0,0 +1,14 @@
+import json
+from watson_developer_cloud import ConversationV1Experimental
+
+
+conversation = ConversationV1Experimental(
+    username='YOUR SERVICE USERNAME',
+    password='YOUR SERVICE PASSWORD',
+    version='2016-05-09')
+
+# replace with your own workspace_id
+workspace_id = '25dfa8a0-0263-471b-8980-317e68c30488'
+
+response = conversation.message(workspace_id=workspace_id, message_input={'text': 'What\'s the weather like?'})
+print(json.dumps(response, indent=2))

examples/concept_insights_v2.py

@@ -14,12 +14,16 @@
 # with open('../resources/weather_data_train.csv', 'rb') as training_data:
 #     print(json.dumps(natural_language_classifier.create(training_data=training_data, name='weather'), indent=2))
 
-# replace 4f1704ex55-nlc-2432" with your classifier id
-status = natural_language_classifier.status('3a84d1x62-nlc-18096')
+# replace 2374f9x68-nlc-2697 with your classifier id
+status = natural_language_classifier.status('2374f9x68-nlc-2697')
 print(json.dumps(status, indent=2))
-#
-classes = natural_language_classifier.classify('3a84d1x62-nlc-18096', 'How hot will it be tomorrow?')
-print(json.dumps(classes, indent=2))
+
+if status['status'] == 'Available':
+    classes = natural_language_classifier.classify('2374f9x68-nlc-2697', 'How hot will it be tomorrow?')
+    print(json.dumps(classes, indent=2))
+
+# delete = natural_language_classifier.remove('2374f9x68-nlc-2697')
+# print(json.dumps(delete, indent=2))
 
 # example of raising a WatsonException
 # print(json.dumps(natural_language_classifier.create(training_data='', name='weather3'), indent=2))

examples/conversation_v1_experimental.py

@@ -15,7 +15,7 @@
 # print(json.dumps(created_cluster, indent=2))
 
 # Replace with your own solr_cluster_id
-solr_cluster_id = 'sc31a30e84_9094_4af2_93af_a8751257d4cc'
+solr_cluster_id = 'sc1ca661d0_0c8d_430d_8132_51ac6df940e1'
 
 status = retrieve_and_rank.get_solr_cluster_status(solr_cluster_id=solr_cluster_id)
 print(json.dumps(status, indent=2))
@@ -34,12 +34,13 @@
 # collection = retrieve_and_rank.create_collection(solr_cluster_id, 'test-collection', 'test-config')
 # print(json.dumps(collection, indent=2))
 
-collections = retrieve_and_rank.list_collections(solr_cluster_id=solr_cluster_id)
-print(json.dumps(collections, indent=2))
+if (len(configs['solr_configs']) > 0):
+    collections = retrieve_and_rank.list_collections(solr_cluster_id=solr_cluster_id)
+    print(json.dumps(collections, indent=2))
 
-pysolr_client = retrieve_and_rank.get_pysolr_client(solr_cluster_id, 'test-collection')
-results = pysolr_client.search('bananas')
-print(results.docs)
+    pysolr_client = retrieve_and_rank.get_pysolr_client(solr_cluster_id, 'test-collection')
+    results = pysolr_client.search('bananas')
+    print(results)
 
 # Rankers