reimplemented changes removed by merging

Author: janvanrijn

openml/runs/functions.py

@@ -8,7 +8,7 @@
 
 from ..exceptions import PyOpenMLError
 from .. import config
-from ..flows import sklearn_to_flow, get_flow
+from ..flows import sklearn_to_flow, get_flow, flow_exists
 from ..flows.sklearn_converter import get_traceble_model
 from ..setups import setup_exists
 from ..exceptions import OpenMLCacheException, OpenMLServerException
@@ -67,14 +67,23 @@ def run_task(task, model, avoid_duplicate_runs=True):
 
     # execute the run
     run = OpenMLRun(task_id=task.task_id, flow_id=None, dataset_id=dataset.dataset_id, model=model)
-    run.data_content, run.trace_content = _run_task_get_arffcontent(model, task, class_labels)
-
     try:
         run.data_content, run.trace_content, run.trace_attributes = _run_task_get_arffcontent(model, task, class_labels)
     except PyOpenMLError as message:
         run.error_message = str(message)
         warnings.warn("Run terminated with error: %s" %run.error_message)
 
+    if flow_id == False:
+        # means the flow did not exists. As we could run it, publish it now
+        flow = flow.publish()
+    else:
+        # flow already existed, download it from server
+        # TODO (neccessary? is this a post condition of this function)
+        flow = get_flow(flow_id)
+
+    run.flow_id = flow.flow_id
+    config.logger.info('Executed Task %d with Flow id: %d' % (task.task_id, run.flow_id))
+
     return run
 
 def _run_exists(task_id, setup_id):

tests/test_runs/test_run_functions.py

@@ -41,9 +41,11 @@ def test_run_regression_on_classif_task(self):
 
         clf = LinearRegression()
         task = openml.tasks.get_task(task_id)
-        self.assertRaisesRegexp(AttributeError,
-                                "'LinearRegression' object has no attribute 'classes_'",
-                                openml.runs.run_task, task=task, model=clf)
+        run = openml.runs.run_task(task=task, model=clf)
+        run = run.publish()
+
+        downloaded_run = openml.runs.get_run(run.run_id)
+        assert(downloaded_run.error_message is not None)
 
     @mock.patch('openml.flows.sklearn_to_flow')
     def test_check_erronous_sklearn_flow_fails(self, sklearn_to_flow_mock):
@@ -291,7 +293,7 @@ def test_run_on_dataset_with_missing_labels(self):
         model = Pipeline(steps=[('Imputer', Imputer(strategy='median')),
                                 ('Estimator', DecisionTreeClassifier())])
 
-        data_content, _ = _run_task_get_arffcontent(model, task, class_labels)
+        data_content, _, _ = _run_task_get_arffcontent(model, task, class_labels)
         # 2 folds, 5 repeats; keep in mind that this task comes from the test
         # server, the task on the live server is different
         self.assertEqual(len(data_content), 4490)