Merge branch 'develop' into joaquinvanschoren-patch-1

Author: janvanrijn

openml/_api_calls.py

@@ -104,11 +104,16 @@ def _read_url_files(url, data=None, file_dictionary=None, file_elements=None):
 def _read_url(url, data=None):
 
     data = {} if data is None else data
-    data['api_key'] = config.apikey
-
-    # Using requests.post sets header 'Accept-encoding' automatically to
-    # 'gzip,deflate'
-    response = requests.post(url, data=data)
+    if config.apikey is not None:
+        data['api_key'] = config.apikey
+
+    if len(data) == 0 or (len(data) == 1 and 'api_key' in data):
+        # do a GET
+        response = requests.get(url, params=data)
+    else: # an actual post request
+        # Using requests.post sets header 'Accept-encoding' automatically to
+        #  'gzip,deflate'
+        response = requests.post(url, data=data)
 
     if response.status_code != 200:
         raise _parse_server_exception(response)

openml/flows/sklearn_converter.py

@@ -586,10 +586,13 @@ def check(param_dict, disallow_parameter=False):
         elif isinstance(model, sklearn.model_selection.RandomizedSearchCV):
             param_distributions = model.param_distributions
         else:
+            if hasattr(model, 'param_distributions'):
+                param_distributions = model.param_distributions
+            else:
+                raise AttributeError('Using subclass BaseSearchCV other than {GridSearchCV, RandomizedSearchCV}. Could not find attribute param_distributions. ')
             print('Warning! Using subclass BaseSearchCV other than ' \
                   '{GridSearchCV, RandomizedSearchCV}. Should implement param check. ')
-            pass
-
+            
         if not check(param_distributions, True):
             raise PyOpenMLError('openml-python should not be used to '
                                 'optimize the n_jobs parameter.')

openml/study/functions.py

@@ -12,13 +12,16 @@ def _multitag_to_list(result_dict, tag):
         raise TypeError()
 
 
-def get_study(study_id):
+def get_study(study_id, type=None):
     '''
     Retrieves all relevant information of an OpenML study from the server
     Note that some of the (data, tasks, flows, setups) fields can be empty
     (depending on information on the server)
     '''
-    xml_string = _perform_api_call("study/%d" %(study_id))
+    call_suffix = "study/%s" %str(study_id)
+    if type is not None:
+        call_suffix += "/" + type
+    xml_string = _perform_api_call(call_suffix)
     result_dict = xmltodict.parse(xml_string)['oml:study']
     id = int(result_dict['oml:id'])
     name = result_dict['oml:name']

tests/test_study/test_study_functions.py

@@ -13,4 +13,13 @@ def test_get_study(self):
         self.assertEquals(len(study.data), 105)
         self.assertEquals(len(study.tasks), 105)
         self.assertEquals(len(study.flows), 27)
-        self.assertEquals(len(study.setups), 30)
+        self.assertEquals(len(study.setups), 30)
+
+    def test_get_tasks(self):
+        study_id = 14
+
+        study = openml.study.get_study(study_id, 'tasks')
+        self.assertEquals(study.data, None)
+        self.assertGreater(len(study.tasks), 0)
+        self.assertEquals(study.flows, None)
+        self.assertEquals(study.setups, None)