Merge branch 'develop' into fix373

Author: janvanrijn

openml/_api_calls.py

@@ -139,9 +139,9 @@ def _parse_server_exception(response, url=None):
     additional = None
     if 'oml:additional_information' in server_exception['oml:error']:
         additional = server_exception['oml:error']['oml:additional_information']
-    if code in [370, 372, 512, 500, 482]:
-        # 512 for runs, 370 for datasets (should be 372), 500 for flows
-        # 482 for tasks
+    if code in [372, 512, 500, 482, 542, 674]: # datasets,
+        # 512 for runs, 372 for datasets, 500 for flows
+        # 482 for tasks, 542 for evaluations, 674 for setups
         return OpenMLServerNoResult(code, message, additional)
     return OpenMLServerException(
         code=code,

openml/datasets/functions.py

@@ -189,7 +189,7 @@ def _list_datasets(api_call):
     try:
         xml_string = _perform_api_call(api_call)
     except OpenMLServerNoResult:
-        return []
+        return dict()
     datasets_dict = xmltodict.parse(xml_string, force_list=('oml:dataset',))
 
     # Minimalistic check if the XML is useful

openml/evaluations/functions.py

@@ -1,5 +1,6 @@
 import xmltodict
 
+from openml.exceptions import OpenMLServerNoResult
 from .._api_calls import _perform_api_call
 from ..evaluations import OpenMLEvaluation
 
@@ -59,8 +60,10 @@ def list_evaluations(function, offset=None, size=None, id=None, task=None,
 
 def _list_evaluations(api_call):
     """Helper function to parse API calls which are lists of runs"""
-
-    xml_string = _perform_api_call(api_call)
+    try:
+        xml_string = _perform_api_call(api_call)
+    except OpenMLServerNoResult:
+        return dict()
 
     evals_dict = xmltodict.parse(xml_string, force_list=('oml:evaluation',))
     # Minimalistic check if the XML is useful

openml/flows/functions.py

@@ -112,7 +112,7 @@ def _list_flows(api_call):
     try:
         xml_string = _perform_api_call(api_call)
     except OpenMLServerNoResult:
-        return []
+        return dict()
     flows_dict = xmltodict.parse(xml_string, force_list=('oml:flow',))
 
     # Minimalistic check if the XML is useful

openml/runs/functions.py

@@ -953,7 +953,7 @@ def _list_runs(api_call):
     try:
         xml_string = _perform_api_call(api_call)
     except OpenMLServerNoResult:
-        return []
+        return dict()
 
     runs_dict = xmltodict.parse(xml_string, force_list=('oml:run',))
     # Minimalistic check if the XML is useful

openml/setups/functions.py

@@ -8,6 +8,7 @@
 from .. import config
 from .setup import OpenMLSetup, OpenMLParameter
 from openml.flows import flow_exists
+from openml.exceptions import OpenMLServerNoResult
 
 
 def setup_exists(flow, model=None):
@@ -145,7 +146,10 @@ def list_setups(flow=None, tag=None, setup=None, offset=None, size=None):
 def _list_setups(api_call):
     """Helper function to parse API calls which are lists of setups"""
 
-    xml_string = openml._api_calls._perform_api_call(api_call)
+    try:
+        xml_string = openml._api_calls._perform_api_call(api_call)
+    except OpenMLServerNoResult:
+        return dict()
 
     setups_dict = xmltodict.parse(xml_string, force_list=('oml:setup',))
     # Minimalistic check if the XML is useful

openml/study/functions.py

@@ -3,6 +3,7 @@
 from openml.study import OpenMLStudy
 from .._api_calls import _perform_api_call
 
+
 def _multitag_to_list(result_dict, tag):
     if isinstance(result_dict[tag], list):
         return result_dict[tag]

openml/tasks/functions.py

@@ -141,7 +141,7 @@ def _list_tasks(api_call):
     try:
         xml_string = _perform_api_call(api_call)
     except OpenMLServerNoResult:
-        return []
+        return dict()
     tasks_dict = xmltodict.parse(xml_string, force_list=('oml:task','oml:input'))
     # Minimalistic check if the XML is useful
     if 'oml:tasks' not in tasks_dict:

tests/test_datasets/test_dataset_functions.py

@@ -147,6 +147,14 @@ def test_list_datasets_paginate(self):
             for did in datasets:
                 self._check_dataset(datasets[did])
 
+    def test_list_datasets_empty(self):
+        datasets = openml.datasets.list_datasets(tag='NoOneWouldUseThisTagAnyway')
+        if len(datasets) > 0:
+            raise ValueError('UnitTest Outdated, tag was already used (please remove)')
+
+        self.assertIsInstance(datasets, dict)
+
+
     @unittest.skip('See https://github.com/openml/openml-python/issues/149')
     def test_check_datasets_active(self):
         active = openml.datasets.check_datasets_active([1, 17])

tests/test_evaluations/test_evaluation_functions.py

@@ -63,3 +63,10 @@ def test_evaluation_list_limit(self):
 
         evaluations = openml.evaluations.list_evaluations("predictive_accuracy", size=100, offset=100)
         self.assertEquals(len(evaluations), 100)
+
+    def test_list_evaluations_empty(self):
+        evaluations = openml.evaluations.list_evaluations('unexisting_measure')
+        if len(evaluations) > 0:
+            raise ValueError('UnitTest Outdated, got somehow results')
+
+        self.assertIsInstance(evaluations, dict)