work for 332

Mikemosca · Mikemosca · commit 3c9cbcd32ef2 · 2016-07-22T14:40:37.000-04:00
Add a R&amp;R unit test
Add a R&amp;R integration test
Introduce a new facility to run integration tests much like the examples
diff --git a/test/test_integration.py b/test/test_integration.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+
+import os
+import watson_developer_cloud
+import pytest
+import sys
+from os import getcwd
+from subprocess import Popen, PIPE
+from os.path import join, dirname
+from glob import glob
+
+# tests to exclude
+excludes = []
+
+itests_path = join(dirname(__file__), '../', 'testintegration', '*.py')
+
+# environment variables
+try:
+    from dotenv import load_dotenv
+except:
+    print('warning: dotenv module could not be imported')
+
+try:
+    dotenv_path = join(dirname(__file__), '../', '.env')
+    load_dotenv(dotenv_path)
+except:
+    print('warning: no .env file loaded')
+
+
+@pytest.mark.skipif(os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
+def test_integration():
+    itests = glob(itests_path)
+    for itest in itests:
+        head, tail = os.path.split(itest)
+        # exclude some tests cases like authorization
+        if tail in excludes:
+            continue
+
+        try:
+            exec(open(itest).read(), globals())
+        except Exception as e:
+            assert False, 'itest in file ' + tail + ' failed with error: ' + str(e)
+
diff --git a/test/test_retrieve_and_rank_v1.py b/test/test_retrieve_and_rank_v1.py
@@ -0,0 +1,225 @@
+import os
+import responses
+import watson_developer_cloud
+
+@responses.activate
+def test_success():
+    
+# Ranker endpoints
+    retrieve_and_rank = watson_developer_cloud.RetrieveAndRankV1(username="username",
+                                                                 password="password")
+
+    listrank_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/rankers'
+    listrank_response = '{"rankers":[{"ranker_id":"3b140ax14-rank-10383","url":"https://gateway.watsonplatform.net/retrieve-and-rank' \
+                    '/api/v1/rankers/3b140ax14-rank-10383","name":"pythonRank","created":"2016-07-15T19:11:27.801Z"}]}'
+                    
+    responses.add(responses.GET, listrank_url,
+              body=listrank_response, status=200,
+              content_type='application/json')
+
+    retrieve_and_rank.list_rankers()
+    
+    assert responses.calls[0].request.url == listrank_url
+    assert responses.calls[0].response.text == listrank_response
+
+    statusrank_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/rankers/3b140ax14-rank-10383'
+    statusrank_response = '{"ranker_id":"3b140ax14-rank-10383","name":"pythonRank","created":"2016-07-15T19:11:27.801Z",' \
+                      '"url":"https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/rankers/3b140ax14-rank-10383",' \
+                      '"status":"Available","status_description":"The ranker instance is now available and is ready to take ranker requests."}'
+ 
+    responses.add(responses.GET, statusrank_url,
+                  body=statusrank_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.get_ranker_status('3b140ax14-rank-10383')
+    
+    assert responses.calls[1].request.url == statusrank_url
+    assert responses.calls[1].response.text == statusrank_response
+ 
+    rank_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/rankers/3b140ax14-rank-10383/rank'
+    rank_response =  '{"ranker_id":"3b140ax14-rank-10383","url":"https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/rankers/3b140ax14-rank-10383",' \
+                     '"top_answer":"30965a00-5415-4ef5-8e4a-bb21a7aeab44", "answers":[' \
+                     '{"answer_id":"30965a00-5415-4ef5-8e4a-bb21a7aeab44","score":180.0,"confidence":0.2636349925008873},' \
+                     '{"answer_id":"30965a00-5415-4ef5-8e4a-bb21a7aeab44","score":179.0,"confidence":0.262185794730098},' \
+                     '{"answer_id":"30965a00-5415-4ef5-8e4a-bb21a7aeab44","score":178.0,"confidence":0.25972667610243827}]}'
+ 
+    responses.add(responses.POST, rank_url,
+                  body=rank_response, status=200,
+                  content_type='application/json')
+ 
+    with open(os.path.join(os.path.dirname(__file__), '../resources/ranker_answer_data.csv'), 'rb') as answer_data:
+        retrieve_and_rank.rank('3b140ax14-rank-10383', answer_data=answer_data, top_answers=3)
+ 
+    assert responses.calls[2].request.url == rank_url
+    assert responses.calls[2].response.text == rank_response
+ 
+    createrank_url = listrank_url
+    createrank_response = '{"ranker_id":"3b140ax14-rank-10544","name":"pythonRank","created":"2016-07-19T15:19:28.485Z",' \
+                      '"url":"https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/rankers/3b140ax14-rank-10544",' \
+                      '"status":"Training","status_description":"The ranker instance is in its training phase, not yet ready to accept rank requests"}'
+
+    responses.add(responses.POST, createrank_url,
+                  body=createrank_response, status=200,
+                  content_type='application/json')
+    
+    with open(os.path.join(os.path.dirname(__file__), '../resources/ranker_training_data.csv'), 'rb') as training_data:
+        retrieve_and_rank.create_ranker(training_data=training_data, name='pythonRank')
+  
+    assert responses.calls[3].request.url == createrank_url
+    assert responses.calls[3].response.text == createrank_response
+ 
+    removerank_url = statusrank_url
+    removerank_response = '{}'
+ 
+    responses.add(responses.DELETE, removerank_url,
+                  body=removerank_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.delete_ranker('3b140ax14-rank-10383')
+ 
+    assert responses.calls[4].request.url == removerank_url
+    assert responses.calls[4].response.text == removerank_response
+ 
+    assert len(responses.calls) == 5
+    
+# Retrieve endpoints
+    listcluster_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters'
+    listcluster_response = '{"clusters":[{"solr_cluster_id":"sc0747112c_f978_4e1f_b97e_0e3a8101ac5b","cluster_name":"","cluster_size":"","solr_cluster_status":"READY"}]}'
+                    
+    responses.add(responses.GET, listcluster_url,
+              body=listcluster_response, status=200,
+              content_type='application/json')
+
+    retrieve_and_rank.list_solr_clusters()
+    
+    assert responses.calls[5].request.url == listcluster_url
+    assert responses.calls[5].response.text == listcluster_response
+
+    createcluster_url = listcluster_url
+    createcluster_response = '{"solr_cluster_id":"sc0747112c_f978_4e1f_b97e_0e3a8101ac5b","cluster_name":"","cluster_size":"","solr_cluster_status":"NOT_AVAILABLE"}'
+                    
+    responses.add(responses.POST, createcluster_url,
+              body=createcluster_response, status=200,
+              content_type='application/json')
+
+    retrieve_and_rank.create_solr_cluster(cluster_name='pythonCluster', cluster_size=None)
+    
+    assert responses.calls[6].request.url == createcluster_url
+    assert responses.calls[6].response.text == createcluster_response   
+
+    removecluster_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b'
+    removecluster_response = '{"message":"WRRCSR023: Successfully deleted Solr cluster [sc0747112c_f978_4e1f_b97e_0e3a8101ac5b].","statusCode":200}'
+ 
+    responses.add(responses.DELETE, removecluster_url,
+                  body=removecluster_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.delete_solr_cluster('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b')
+ 
+    assert responses.calls[7].request.url == removecluster_url
+    assert responses.calls[7].response.text == removecluster_response
+    
+    statuscluster_url = removecluster_url
+    statuscluster_response = '{"solr_cluster_id":"scecb989cb_b204_4ebd_bc8d_c2244a499d8c","cluster_name":"","cluster_size":"","solr_cluster_status":"READY"}'
+ 
+    responses.add(responses.GET, statuscluster_url,
+                  body=statuscluster_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.get_solr_cluster_status('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b')
+ 
+    assert responses.calls[8].request.url == statuscluster_url
+    assert responses.calls[8].response.text == statuscluster_response       
+    
+    listconfigs_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b/config'
+    listconfigs_response = '{"solr_configs":[]}'
+ 
+    responses.add(responses.GET, listconfigs_url,
+                  body=listconfigs_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.list_configs('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b')
+ 
+    assert responses.calls[9].request.url == listconfigs_url
+    assert responses.calls[9].response.text == listconfigs_response       
+
+    createconfig_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b/config/exampleconfig'
+    createconfig_response = '{"message":"WRRCSR026: Successfully uploaded named config [example-config] for Solr cluster [sc0747112c_f978_4e1f_b97e_0e3a8101ac5b].","statusCode":200}'
+ 
+    responses.add(responses.POST, createconfig_url,
+                  body=createconfig_response, status=200,
+                  content_type='application/json')
+     
+    with open(os.path.join(os.path.dirname(__file__), '../resources/solr_config.zip'), 'rb') as config_data:
+        retrieve_and_rank.create_config('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b', 'exampleconfig',   config=config_data)
+   
+    assert responses.calls[10].request.url == createconfig_url
+    assert responses.calls[10].response.text == createconfig_response
+
+    removeconfig_url = createconfig_url
+    removeconfig_response = '{"message":"WRRCSR025: Successfully deleted named config [example-config] for Solr cluster [sc0747112c_f978_4e1f_b97e_0e3a8101ac5b]].","statusCode":200}'
+                         
+    responses.add(responses.DELETE, removeconfig_url,
+                  body=removeconfig_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.delete_config('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b', 'exampleconfig')
+ 
+    assert responses.calls[11].request.url == removeconfig_url
+    assert responses.calls[11].response.text == removeconfig_response
+
+    getconfig_url = createconfig_url
+    getconfig_response = '% Total    % Received % Xferd  Average Speed   Time    Time     Time  Current' \
+                         '                               Dload  Upload   Total   Spent    Left  Speed' \
+                         '100   864    0   864    0     0   1627      0 --:--:-- --:--:-- --:--:--  1627'
+                         
+    responses.add(responses.GET, getconfig_url,
+                  body=getconfig_response, status=200,
+                  content_type='application/json')
+ 
+    retrieve_and_rank.get_config('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b', 'exampleconfig')
+ 
+    assert responses.calls[12].request.url == getconfig_url
+    assert responses.calls[12].response.text == getconfig_response
+
+    listcollection_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b/solr/admin/collections'
+    listcollection1_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b/solr/admin/collections?wt=json&action=LIST'
+    listcollection_response = '{"responseHeader":{"status":0,"QTime":0},"collections":["examplecollection"]}'
+                         
+    responses.add(responses.GET, listcollection_url,
+                  body=listcollection_response, status=200,
+                  content_type='application/json')
+  
+    retrieve_and_rank.list_collections('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b')
+ 
+# the response url changes every time the test is run   
+#    assert responses.calls[13].request.url == listcollection1_url
+    assert responses.calls[13].response.text == listcollection_response
+
+    createcollection_url = listcollection_url
+    createcollection1_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b/solr/admin/collections?name=examplecollection&collection.configName=exampleconfig&wt=json&action=CREATE'
+    createcollection_response = '{}'
+ 
+    responses.add(responses.POST, createcollection_url,
+                  body=createcollection_response, status=200,
+                  content_type='application/json')
+     
+    retrieve_and_rank.create_collection('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b', 'examplecollection',  'exampleconfig')
+
+#    assert responses.calls[14].request.url == createcollection1_url
+    assert responses.calls[14].response.text == createcollection_response
+
+    deletecollection_url = listcollection_url
+    deletecollection1_url = 'https://gateway.watsonplatform.net/retrieve-and-rank/api/v1/solr_clusters/sc0747112c_f978_4e1f_b97e_0e3a8101ac5b/solr/admin/collections?wt=json&name=examplecollection&action=DELETE'
+    deletecollection_response = '{}'
+ 
+    responses.add(responses.POST, deletecollection_url,
+                  body=deletecollection_response, status=200,
+                  content_type='application/json')
+     
+    retrieve_and_rank.delete_collection('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b', 'examplecollection',  'exampleconfig')
+  
+#   assert responses.calls[15].request.url == deletecollection1_url
+    assert responses.calls[15].response.text == deletecollection_response
+     
+    retrieve_and_rank.get_pysolr_client('sc0747112c_f978_4e1f_b97e_0e3a8101ac5b', 'examplecollection')
diff --git a/testintegration/retrieve_and_rank_v1.py b/testintegration/retrieve_and_rank_v1.py
@@ -0,0 +1,89 @@
+import json
+import os
+import time
+import sys
+from watson_developer_cloud import RetrieveAndRankV1
+
+
+retrieve_and_rank = RetrieveAndRankV1(
+    username='YOUR SERVICE USERNAME',
+    password='YOUR SERVICE PASSWORD')
+
+# End to End integration retrieve test
+mycluster = retrieve_and_rank.create_solr_cluster(cluster_name='Python Test Cluster', cluster_size=None)
+print(json.dumps(mycluster, indent=2))
+
+retrieve_results = retrieve_and_rank.list_solr_clusters()
+print(json.dumps(retrieve_results, indent=2))
+
+retrieve_status = retrieve_and_rank.get_solr_cluster_status(solr_cluster_id=mycluster['solr_cluster_id'])
+print(json.dumps(retrieve_status, indent=2))
+
+# 10 minutes should be plenty for a cluster to complete
+trainingtimeout = time.time() + 60 * 10
+print ('Waiting for Cluster to become available!')   
+while retrieve_status['solr_cluster_status'] != "READY":
+    time.sleep(5)
+    if time.time() > trainingtimeout:
+        print ('Cluster creation failed!')
+        retrieve_results = retrieve_and_rank.delete_solr_cluster(mycluster['solr_cluster_id'])
+        sys.exit(1)
+    retrieve_status = retrieve_and_rank.get_solr_cluster_status(solr_cluster_id=mycluster['solr_cluster_id'])
+
+with open(os.path.join(os.path.dirname(__file__), '../resources/solr_config.zip'), 'rb') as config:
+    retrieve_results = retrieve_and_rank.create_config(mycluster['solr_cluster_id'], 'python-test-config', config)
+    print(json.dumps(retrieve_results, indent=2))
+
+retrieve_results = retrieve_and_rank.list_configs(solr_cluster_id=mycluster['solr_cluster_id'])
+print(json.dumps(retrieve_results, indent=2))
+
+retrieve_results = retrieve_and_rank.get_config(mycluster['solr_cluster_id'], 'python-test-config')
+print(retrieve_results)
+
+retrieve_results = retrieve_and_rank.create_collection(mycluster['solr_cluster_id'], 'python-test-collection', 'python-test-config')
+print(json.dumps(retrieve_results, indent=2))
+
+retrieve_results = retrieve_and_rank.list_collections(solr_cluster_id=mycluster['solr_cluster_id'])
+print(json.dumps(retrieve_results, indent=2))
+
+pysolr_client = retrieve_and_rank.get_pysolr_client(mycluster['solr_cluster_id'], 'python-test-collection')
+query_results = pysolr_client.search('bananas')
+print('{0} documents found'.format(len(query_results.docs)))
+
+retrieve_results = retrieve_and_rank.delete_collection(mycluster['solr_cluster_id'], 'python-test-collection', 'python-test-config')
+print(json.dumps(retrieve_results, indent=2))
+
+retrieve_results = retrieve_and_rank.delete_config(mycluster['solr_cluster_id'], 'python-test-config')
+print(json.dumps(retrieve_results, indent=2))
+
+retrieve_results = retrieve_and_rank.delete_solr_cluster(mycluster['solr_cluster_id'])
+print(json.dumps(retrieve_results, indent=2))
+
+# End to End integration ranker test
+with open(os.path.join(os.path.dirname(__file__), '../resources/ranker_training_data.csv'), 'rb') as training_data:
+    myranker = retrieve_and_rank.create_ranker(training_data=training_data, name='Python Test Ranker')
+print(json.dumps(myranker, indent=2))
+ 
+ranker_results = retrieve_and_rank.list_rankers()
+print(json.dumps(ranker_results, indent=2))
+ 
+ranker_status = retrieve_and_rank.get_ranker_status(myranker['ranker_id'])
+print(json.dumps(ranker_status, indent=2))
+ 
+# 10 minutes should be plenty for a train to complete
+trainingtimeout = time.time() + 60 * 10
+print ('Waiting for Ranker to become available!')   
+while ranker_status['status'] != "Available":
+    time.sleep(5)
+    if time.time() > trainingtimeout:
+        print ('Ranker Training failed!')
+        ranker_results = retrieve_and_rank.delete_ranker(myranker['ranker_id'])
+        sys.exit(1)
+    ranker_status = retrieve_and_rank.get_ranker_status(myranker['ranker_id'])
+    
+with open(os.path.join(os.path.dirname(__file__), '../resources/ranker_answer_data.csv'), 'rb') as answer_data:
+    ranker_results = retrieve_and_rank.rank(myranker['ranker_id'], answer_data)
+    print(json.dumps(ranker_results, indent=2))
+ 
+ranker_results = retrieve_and_rank.delete_ranker(myranker['ranker_id'])
+print(json.dumps(ranker_results))
