Fixes in preparation for 1.5.0 release (#87)

* Fixes in preparation for 1.5.0 release

* Address flake8 warnings

datadotworld/__init__.py

@@ -35,7 +35,7 @@
 )
 from datadotworld.datadotworld import DataDotWorld, UriParam  # noqa: F401
 
-__version__ = '1.4.3'
+__version__ = '1.5.0'
 
 # Convenience top-level functions
 

datadotworld/client/_swagger/models/file_source_create_or_update_request.py

@@ -78,7 +78,7 @@ def url(self, url):
             raise ValueError("Invalid value for `url`, length must be less than or equal to `4096`")
         if url is not None and len(url) < 1:
             raise ValueError("Invalid value for `url`, length must be greater than or equal to `1`")
-        if url is not None and not re.search('^https?.*', url):
+        if url is not None and not re.search('^(https?|stream).*', url):
             raise ValueError("Invalid value for `url`, must be a follow pattern or equal to `/^https?.*/`")
 
         self._url = url

datadotworld/client/_swagger/models/file_source_summary_response.py

@@ -97,7 +97,7 @@ def url(self, url):
             raise ValueError("Invalid value for `url`, length must be less than or equal to `4096`")
         if url is not None and len(url) < 1:
             raise ValueError("Invalid value for `url`, length must be greater than or equal to `1`")
-        if url is not None and not re.search('^https?.*', url):
+        if url is not None and not re.search('^(https?|stream).*', url):
             raise ValueError("Invalid value for `url`, must be a follow pattern or equal to `/^https?.*/`")
 
         self._url = url

datadotworld/client/api.py

@@ -29,6 +29,7 @@
 import functools
 
 import requests
+import six
 
 from datadotworld.client import _swagger
 from datadotworld.client.content_negotiating_api_client import (
@@ -197,7 +198,8 @@ def update_dataset(self, dataset_key, **kwargs):
                     name=name,
                     source=_swagger.FileSourceCreateOrUpdateRequest(
                             url=url,
-                            expand_archive=expand_archive),
+                            expand_archive=expand_archive)
+                    if url is not None else None,
                     description=description,
                     labels=labels),
             kwargs)
@@ -614,7 +616,7 @@ def sql(self, dataset_key, query, desired_mimetype='application/json',
         :type include_table_schema: bool
         :returns: file object that can be used in file parsers and
             data handling modules.
-        :rtype: file object
+        :rtype: file-like object
         :raises RestApiException: If a server error occurs
 
         Examples
@@ -628,7 +630,9 @@ def sql(self, dataset_key, query, desired_mimetype='application/json',
         sql_api = kwargs.get('sql_api_mock', _swagger.SqlApi(api_client))
         owner_id, dataset_id = parse_dataset_key(dataset_key)
         try:
-            return sql_api.sql_post(owner_id, dataset_id, query, **kwargs)
+            response = sql_api.sql_post(
+                owner_id, dataset_id, query, _preload_content=False, **kwargs)
+            return six.BytesIO(response.data)
         except _swagger.rest.ApiException as e:
             raise RestApiError(cause=e)
 
@@ -660,8 +664,9 @@ def sparql(self, dataset_key, query,
                                 _swagger.SparqlApi(api_client))
         owner_id, dataset_id = parse_dataset_key(dataset_key)
         try:
-            return sparql_api.sparql_post(owner_id, dataset_id, query,
-                                          **kwargs)
+            response = sparql_api.sparql_post(
+                owner_id, dataset_id, query, _preload_content=False, **kwargs)
+            return six.BytesIO(response.data)
         except _swagger.rest.ApiException as e:
             raise RestApiError(cause=e)
 

tests/datadotworld/client/test_client.py

@@ -24,7 +24,7 @@
 
 import pytest
 import responses
-from doublex import assert_that, Spy, called
+from doublex import assert_that, Spy, called, Mock
 from hamcrest import (equal_to, has_entries, has_properties, is_, described_as,
                       empty, raises, calling, has_key)
 
@@ -61,7 +61,6 @@ def datasets_api(self):
     @pytest.fixture()
     def uploads_api(self):
         with Spy(UploadsApi) as api:
-            api.get_dataset = lambda o, d: DatasetSummaryResponse(o, d)
             return api
 
     @pytest.fixture()
@@ -72,15 +71,23 @@ def download_api(self):
             return api
 
     @pytest.fixture()
-    def sql_api(self):
+    def query_resp(self):
+        with Mock() as response:
+            response.data = 'result'.encode()
+            return response
+
+    @pytest.fixture()
+    def sql_api(self, query_resp):
         with Spy(SqlApi) as api:
-            api.sql_post
+            api.sql_post = \
+                lambda o, d, q, sql_api_mock, _preload_content: query_resp
             return api
 
     @pytest.fixture()
-    def sparql_api(self):
+    def sparql_api(self, query_resp):
         with Spy(SparqlApi) as api:
-            api.sparql_post
+            api.sparql_post = \
+                lambda o, d, q, sparql_api_mock, _preload_content: query_resp
             return api
 
     @pytest.fixture()
@@ -272,17 +279,13 @@ def test_download_file(self, api_client, dataset_key, download_api):
                                                 'file'))
 
     def test_sql(self, api_client, dataset_key, sql_api):
-        api_client.sql(dataset_key, 'query', sql_api_mock=sql_api)
-        assert_that(sql_api.sql_post,
-                    called().times(1).with_args('agentid', 'datasetid',
-                                                'query', sql_api_mock=sql_api))
+        result = api_client.sql(dataset_key, 'query', sql_api_mock=sql_api)
+        assert_that(result.read().decode('utf-8'), equal_to('result'))
 
     def test_sparql(self, api_client, dataset_key, sparql_api):
-        api_client.sparql(dataset_key, 'query', sparql_api_mock=sparql_api)
-        assert_that(sparql_api.sparql_post,
-                    called().times(1).with_args('agentid', 'datasetid',
-                                                'query',
-                                                sparql_api_mock=sparql_api))
+        result = api_client.sparql(dataset_key, 'query',
+                                   sparql_api_mock=sparql_api)
+        assert_that(result.read().decode('utf-8'), equal_to('result'))
 
     def test_get_user_data(self, api_client):
         user_data_response = api_client.get_user_data()