Fixed the upload_run method to be more clear.

Author: zardaloop

openml/apiconnector.py

@@ -936,19 +936,13 @@ def upload_flow(self, description, file_path):
             raise e
         return return_code, dataset_xml
 
-    def upload_run(self, files):
-        file_dictionary = {}
-        if 'predictions' in files:
-            try:
-                for key, value in files.items():
-                    file_dictionary[key] = value
-
-                return_code, dataset_xml = self._perform_api_call("/run/", file_dictionary=file_dictionary)
+    def upload_run(self, prediction_file_path, description_path):
+        try:
+            file_dictionary = {'predictions': prediction_file_path, 'description': description_path}
+            return_code, dataset_xml = self._perform_api_call("/run/", file_dictionary=file_dictionary)
 
-            except URLError as e:
-                # TODO logger.debug
-                print(e)
-                raise e
-            return return_code, dataset_xml
-        else:
-            raise ValueError("prediction files doesn't exist")
+        except URLError as e:
+        # TODO logger.debug
+            print(e)
+            raise e
+        return return_code, dataset_xml

tests/test_apiconnector.py

@@ -324,18 +324,16 @@ def test_upload_flow(self):
     def test_upload_run(self):
         file = urlopen("http://www.openml.org/data/download/224/weka_generated_predictions1977525485999711307.arff")
         file_text = file.read()
-        file_path = os.path.join(self.connector.dataset_cache_dir, "weka_generated_predictions1977525485999711307.arff")
-        with open(file_path, "wb") as prediction_file:
+        prediction_file_path = os.path.join(self.connector.dataset_cache_dir, "weka_generated_predictions1977525485999711307.arff")
+        with open(prediction_file_path, "wb") as prediction_file:
             prediction_file.write(file_text)
 
         description_text = '''<oml:run xmlns:oml="http://openml.org/openml"><oml:task_id>59</oml:task_id><oml:flow_id>67</oml:flow_id></oml:run>'''
         description_path = os.path.join(self.connector.dataset_cache_dir, "description.xml")
         with open(description_path, "w") as description_file:
             description_file.write(description_text)
 
-        file_dictionary = {'predictions': file_path, 'description': description_path}
-
-        return_code, dataset_xml = self.connector.upload_run(file_dictionary)
+        return_code, dataset_xml = self.connector.upload_run(prediction_file_path, description_path)
         self.assertEqual(return_code, 200)