Merge branch 'develop' into fix229

Author: janvanrijn

openml/__init__.py

@@ -18,15 +18,52 @@
 
 from .datasets import OpenMLDataset, OpenMLDataFeature
 from . import datasets
+from . import tasks
 from . import runs
 from . import flows
 from .runs import OpenMLRun
 from .tasks import OpenMLTask, OpenMLSplit
 from .flows import OpenMLFlow
 
+__version__ = "0.3.0"
+
+
+def populate_cache(task_ids=None, dataset_ids=None, flow_ids=None,
+                   run_ids=None):
+    """
+    Populate a cache for offline and parallel usage of the OpenML connector.
+
+    Parameters
+    ----------
+    task_ids : iterable
+
+    dataset_ids : iterable
+
+    flow_ids : iterable
+
+    run_ids : iterable
+
+    Returns
+    -------
+    None
+    """
+    if task_ids is not None:
+        for task_id in task_ids:
+            tasks.functions.get_task(task_id)
+
+    if dataset_ids is not None:
+        for dataset_id in dataset_ids:
+            datasets.functions.get_dataset(dataset_id)
+
+    if flow_ids is not None:
+        for flow_id in flow_ids:
+            flows.functions.get_flow(flow_id)
+
+    if run_ids is not None:
+        for run_id in run_ids:
+            runs.functions.get_run(run_id)
 
-__version__ = "0.2.1"
 
 __all__ = ['OpenMLDataset', 'OpenMLDataFeature', 'OpenMLRun',
            'OpenMLSplit', 'datasets', 'OpenMLTask', 'OpenMLFlow',
-           'config', 'runs', 'flows']
+           'config', 'runs', 'flows', 'tasks']

openml/_api_calls.py

@@ -110,7 +110,9 @@ def _parse_server_exception(response):
     try:
         server_exception = xmltodict.parse(response.text)
     except:
-        raise OpenMLServerError(('Status code: %d\n' % response.status_code) + response.text)
+        raise OpenMLServerError(('Unexpected server error. Please '
+                                 'contact the developers!\nStatus code: '
+                                 '%d\n' % response.status_code) + response.text)
 
     code = int(server_exception['oml:error']['oml:code'])
     message = server_exception['oml:error']['oml:message']

openml/tasks/functions.py

@@ -235,6 +235,11 @@ def _create_task_from_xml(xml):
         name = input_["@name"]
         inputs[name] = input_
 
+    evaluation_measures = None
+    if 'evaluation_measures' in inputs:
+        evaluation_measures = inputs["evaluation_measures"]["oml:evaluation_measures"]["oml:evaluation_measure"]
+
+
     # Convert some more parameters
     for parameter in \
             inputs["estimation_procedure"]["oml:estimation_procedure"][
@@ -251,5 +256,4 @@ def _create_task_from_xml(xml):
             "oml:type"],
         inputs["estimation_procedure"]["oml:estimation_procedure"][
             "oml:data_splits_url"], estimation_parameters,
-        inputs["evaluation_measures"]["oml:evaluation_measures"][
-            "oml:evaluation_measure"], None)
+        evaluation_measures, None)

tests/test_openml/__init__.py

@@ -0,0 +1,38 @@
+import sys
+
+if sys.version_info[0] >= 3:
+    from unittest import mock
+else:
+    import mock
+
+import six
+
+from openml.testing import TestBase
+import openml
+
+
+class TestInit(TestBase):
+
+    @mock.patch('openml.tasks.functions.get_task')
+    @mock.patch('openml.datasets.functions.get_dataset')
+    @mock.patch('openml.flows.functions.get_flow')
+    @mock.patch('openml.runs.functions.get_run')
+    def test_populate_cache(self, run_mock, flow_mock, dataset_mock, task_mock):
+        openml.populate_cache(task_ids=[1, 2], dataset_ids=[3, 4],
+                              flow_ids=[5, 6], run_ids=[7, 8])
+        self.assertEqual(run_mock.call_count, 2)
+        for argument, fixture in six.moves.zip(run_mock.call_args_list, [(7,), (8,)]):
+            self.assertEqual(argument[0], fixture)
+
+        self.assertEqual(flow_mock.call_count, 2)
+        for argument, fixture in six.moves.zip(flow_mock.call_args_list, [(5,), (6,)]):
+            self.assertEqual(argument[0], fixture)
+
+        self.assertEqual(dataset_mock.call_count, 2)
+        for argument, fixture in six.moves.zip(dataset_mock.call_args_list, [(3,), (4,)]):
+            self.assertEqual(argument[0], fixture)
+
+        self.assertEqual(task_mock.call_count, 2)
+        for argument, fixture in six.moves.zip(task_mock.call_args_list, [(1,), (2,)]):
+            self.assertEqual(argument[0], fixture)
+