more solr capabilities; pulling in pysolr

Author: jsstylos

examples/retrieve_and_rank_v1.py

@@ -5,21 +5,41 @@
 retrieve_and_rank = RetrieveAndRank(username='YOUR SERVICE USERNAME',
                                     password='YOUR SERVICE PASSWORD')
 
-rankers = retrieve_and_rank.list_rankers()
-print(json.dumps(rankers, indent=2))
+# Solr clusters
+
+solr_clusters = retrieve_and_rank.list_solr_clusters()
+print(json.dumps(solr_clusters, indent=2))
+
+# created_cluster = retrieve_and_rank.create_solr_cluster(cluster_name='Test Cluster', cluster_size='1')
+# print(json.dumps(created_cluster, indent=2))
+
+solr_cluster_id = 'sc31a30e84_9094_4af2_93af_a8751257d4cc'
+
+status = retrieve_and_rank.get_solr_cluster_status(solr_cluster_id=solr_cluster_id)
+print(json.dumps(status, indent=2))
+
+# Solr cluster config
+with open('../resources/solr_config.zip', 'rb') as config:
+    config_status = retrieve_and_rank.create_config(solr_cluster_id, 'test config', config)
+    print(json.dumps(config_status, indent=2))
+
+# Rankers
+
+# rankers = retrieve_and_rank.list_rankers()
+# print(json.dumps(rankers, indent=2))
 
 # create a ranker
 # with open('../resources/ranker_training_data.csv', 'rb') as training_data:
 #     print(json.dumps(retrieve_and_rank.create_ranker(training_data=training_data, name='Ranker Test'), indent=2))
 
 # replace YOUR RANKER ID
-status = retrieve_and_rank.get_ranker_status('42AF7Ex10-rank-47')
-print(json.dumps(status, indent=2))
+# status = retrieve_and_rank.get_ranker_status('42AF7Ex10-rank-47')
+# print(json.dumps(status, indent=2))
 
 # delete_results = retrieve_and_rank.delete_ranker('YOUR RANKER ID')
 # print(json.dumps(delete_results))
 
 # replace '42AF7Ex10-rank-47' with your ranker_id
-with open('../resources/ranker_answer_data.csv', 'rb') as answer_data:
-    ranker_results = retrieve_and_rank.rank('42AF7Ex10-rank-47', answer_data)
-    print(json.dumps(ranker_results, indent=2))
+# with open('../resources/ranker_answer_data.csv', 'rb') as answer_data:
+#     ranker_results = retrieve_and_rank.rank('42AF7Ex10-rank-47', answer_data)
+#     print(json.dumps(ranker_results, indent=2))

requirements.txt

@@ -1 +1,2 @@
 requests>=2.0,<3.0
+pysolr>=3.3,<4.0

resources/solr_config.zip

@@ -55,7 +55,7 @@ def run_tests(self):
       version=__version__,
       description='Client library to use the IBM Watson Services',
       license='Apache 2.0',
-      install_requires=['requests>=2.0, <3.0'],
+      install_requires=['requests>=2.0, <3.0', 'pysolr>= 3.3, <4.0'],
       tests_require=['responses', 'pytest', 'python_dotenv'],
       cmdclass={'test': PyTest},
       author='Jeffrey Stylos',

setup.py

@@ -18,6 +18,7 @@
 """
 
 import json
+import pysolr
 from watson_developer_cloud.watson_developer_cloud_service import WatsonDeveloperCloudService
 
 
@@ -28,6 +29,56 @@ def __init__(self, url=default_url, username=None, password=None, use_vcap_servi
         WatsonDeveloperCloudService.__init__(self, 'retrieve_and_rank', url, username, password,
                                              use_vcap_services)
 
+    def list_solr_clusters(self):
+        return self.request(method='GET', url='/v1/solr_clusters', accept_json=True)
+
+    def create_solr_cluster(self, cluster_name=None, cluster_size=None):
+        if cluster_size and isinstance(cluster_size, (int, long)):
+            cluster_size = str(cluster_size)
+        params = {'cluster_name': cluster_name, 'cluster_size': cluster_size}
+        return self.request(method='POST', url='/v1/solr_clusters', accept_json=True, json=params)
+
+    def delete_solr_cluster(self, solr_cluster_id):
+        return self.request(method='DELETE', url='/v1/solr_clusters/{}'.format(solr_cluster_id), accept_json=True)
+
+    def get_solr_cluster_status(self, solr_cluster_id):
+        return self.request(method='GET', url='/v1/solr_clusters/{}'.format(solr_cluster_id), accept_json=True)
+
+    def list_configs(self, solr_cluster_id):
+        return self.request(method='GET', url='/v1/solr_clusters/{}/config'.format(solr_cluster_id), accept_json=True)
+
+    # Need to test
+    def create_config(self, solr_cluster_id, config_name, config):
+        return self.request(method='POST', url='/v1/solr_clusters/{}/config/{}'.format(solr_cluster_id, config_name),
+                            files={'body': config}, accept_json=True)
+
+    def delete_config(self, solr_cluster_id, config_name):
+        return self.request(method='DELETE', url='/v1/solr_clusters/{}/config/{}'.format(solr_cluster_id, config_name),
+                            accept_json=True)
+
+    def get_config(self, solr_cluster_id, config_name):
+        return self.request(method='GET', url='/v1/solr_clusters/{}/config/{}'.format(solr_cluster_id, config_name),
+                            accept_json=True)
+
+    def list_collections(self, solr_cluster_id):
+        return self.request(method='GET', url='/v1/solr_clusters/{}/collections'.format(solr_cluster_id),
+                            accept_json=True)
+
+    def create_collection(self, solr_cluster_id, collection_name, config_name):
+        params = {'collection.configName': config_name, 'name': collection_name}
+        return self.request(method='POST', url='/v1/solr_clusters/{}/collections'.format(solr_cluster_id),
+                            params=params, accept_json=True)
+
+    def delete_collection(self, solr_cluster_id, collection_name, config_name):
+        params = {'name': collection_name, 'action': 'DELETE'}
+        return self.request(method='POST', url='/v1/solr_clusters/{}/collections'.format(solr_cluster_id),
+                            params=params, accept_json=True)
+
+    def get_pysolr_client(self, solr_cluster_id, collection_name):
+        base_url = self.url.replace('https://', 'https://' + self.username + ':' + self.password + '@')
+        url = base_url + '/v1/solr_clusters/{}/solr/{}'.format(solr_cluster_id, collection_name)
+        return pysolr.Solr(url)
+
     def create_ranker(self, training_data, name=None):
         data = None
         if name: