Merge pull request #167 from openml/feature/upload-flow

Feature/upload flow

Author: mfeurer

.travis.yml

@@ -15,9 +15,9 @@ env:
   - TEST_DIR=/tmp/test_dir/
   - MODULE=openml
   matrix:
-  - DISTRIB="conda" PYTHON_VERSION="2.7" NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.21"
-  - DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4"
-  - DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" NUMPY_VERSION="1.10.4" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4"
+  - DISTRIB="conda" PYTHON_VERSION="2.7" NUMPY_VERSION="1.11"   SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.21" SKLEARN_VERSION="0.18"
+  - DISTRIB="conda" PYTHON_VERSION="3.4" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18"
+  - DISTRIB="conda" PYTHON_VERSION="3.5" COVERAGE="true" NUMPY_VERSION="1.11" SCIPY_VERSION="0.17.0" CYTHON_VERSION="0.23.4" SKLEARN_VERSION="0.18"
 install: source ci_scripts/install.sh
 script: bash ci_scripts/test.sh
 after_success: source ci_scripts/success.sh

ci_scripts/install.sh

@@ -25,7 +25,9 @@ popd
 # Configure the conda environment and put it in the path using the
 # provided versions
 conda create -n testenv --yes python=$PYTHON_VERSION pip nose \
-   numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION matplotlib scikit-learn nbconvert nbformat jupyter_client ipython jupyter notebook ipykernel pandas
+   numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION cython=$CYTHON_VERSION matplotlib \
+   scikit-learn=$SKLEARN_VERSION nbconvert nbformat jupyter_client ipython \
+   jupyter notebook ipykernel pandas
 source activate testenv
 ipython kernel install
 

openml/__init__.py

@@ -19,12 +19,13 @@
 from .datasets import OpenMLDataset
 from . import datasets
 from . import runs
+from . import flows
 from .runs import OpenMLRun
 from .tasks import OpenMLTask, OpenMLSplit
 from .flows import OpenMLFlow
 
 
 __version__ = "0.2.1"
 
-__all__ = ['OpenMLDataset', 'OpenMLRun', 'OpenMLSplit',
-           'datasets', 'OpenMLTask', 'OpenMLFlow', 'config', 'runs']
+__all__ = ['OpenMLDataset', 'OpenMLRun', 'OpenMLSplit', 'datasets',
+           'OpenMLTask', 'OpenMLFlow', 'config', 'runs', 'flows']

openml/_api_calls.py

@@ -8,7 +8,7 @@
 from .exceptions import OpenMLServerError
 
 
-def _perform_api_call(call, file_dictionary=None,
+def _perform_api_call(call, data=None, file_dictionary=None,
                       file_elements=None, add_authentication=True):
     """
     Perform an API call at the OpenML server.
@@ -19,6 +19,8 @@ def _read_url(self, url, add_authentication=False, data=None, filePath=None):
     ----------
     call : str
         The API call. For example data/list
+    data : dict
+        Dictionary with post-request payload.
     file_dictionary : dict
         Mapping of {filename: path} of files which should be uploaded to the
         server.
@@ -39,17 +41,20 @@ def _read_url(self, url, add_authentication=False, data=None, filePath=None):
     if not url.endswith("/"):
         url += "/"
     url += call
+
+    url = url.replace('=', '%3d')
+
     if file_dictionary is not None or file_elements is not None:
-        return _read_url_files(url, file_dictionary=file_dictionary,
+        return _read_url_files(url, data=data, file_dictionary=file_dictionary,
                                file_elements=file_elements)
-    return _read_url(url)
+    return _read_url(url, data)
 
 
-def _read_url_files(url, file_dictionary=None, file_elements=None):
-    """do a post request to url with data None, file content of
+def _read_url_files(url, data=None, file_dictionary=None, file_elements=None):
+    """do a post request to url with data, file content of
     file_dictionary and sending file_elements as files"""
 
-    data = {}
+    data = {} if data is None else data
     data['api_key'] = config.apikey
     if file_elements is None:
         file_elements = {}
@@ -75,23 +80,24 @@ def _read_url_files(url, file_dictionary=None, file_elements=None):
     # 'gzip,deflate'
     response = requests.post(url, data=data, files=file_elements)
     if response.status_code != 200:
-        raise OpenMLServerError(response.text)
+        raise OpenMLServerError(('Status code: %d\n' % response.status_code) + response.text)
     if 'Content-Encoding' not in response.headers or \
             response.headers['Content-Encoding'] != 'gzip':
         warnings.warn('Received uncompressed content from OpenML for %s.' % url)
     return response.status_code, response.text
 
 
-def _read_url(url):
+def _read_url(url, data=None):
 
-    data = {}
+    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 response.status_code != 200:
-        raise OpenMLServerError(response.text)
+        raise OpenMLServerError(('Status code: %d\n' % response.status_code) + response.text)
     if 'Content-Encoding' not in response.headers or \
             response.headers['Content-Encoding'] != 'gzip':
         warnings.warn('Received uncompressed content from OpenML for %s.' % url)

openml/flows/__init__.py

@@ -1,3 +1,6 @@
 from .flow import OpenMLFlow
+from .sklearn_converter import sklearn_to_flow, flow_to_sklearn
+from .functions import get_flow
 
-__all__ = ['OpenMLFlow']
+__all__ = ['OpenMLFlow', 'create_flow_from_model', 'get_flow',
+           'sklearn_to_flow', 'flow_to_sklearn']