fix download operations (4.0)

Author: tedchamb

vsts/vsts/build/v4_0/build_client.py

@@ -69,7 +69,7 @@ def get_artifact(self, build_id, artifact_name, project=None):
                               query_parameters=query_parameters)
         return self._deserialize('BuildArtifact', response)
 
-    def get_artifact_content_zip(self, build_id, artifact_name, project=None):
+    def get_artifact_content_zip(self, build_id, artifact_name, project=None, **kwargs):
         """GetArtifactContentZip.
         Gets a specific artifact for a build
         :param int build_id:
@@ -89,8 +89,13 @@ def get_artifact_content_zip(self, build_id, artifact_name, project=None):
                               location_id='1db06c96-014e-44e1-ac91-90b2d4b3e984',
                               version='4.0',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
+                              query_parameters=query_parameters,
+                              accept_media_type='application/zip')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def get_artifacts(self, build_id, project=None):
         """GetArtifacts.
@@ -700,7 +705,7 @@ def update_folder(self, folder, project, path):
                               content=content)
         return self._deserialize('Folder', response)
 
-    def get_build_log(self, project, build_id, log_id, start_line=None, end_line=None):
+    def get_build_log(self, project, build_id, log_id, start_line=None, end_line=None, **kwargs):
         """GetBuildLog.
         Gets a log
         :param str project: Project ID or project name
@@ -726,8 +731,13 @@ def get_build_log(self, project, build_id, log_id, start_line=None, end_line=Non
                               location_id='35a80daf-7f30-45fc-86e8-6b813d9c90df',
                               version='4.0',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
+                              query_parameters=query_parameters,
+                              accept_media_type='text/plain')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def get_build_log_lines(self, project, build_id, log_id, start_line=None, end_line=None):
         """GetBuildLogLines.
@@ -776,7 +786,7 @@ def get_build_logs(self, project, build_id):
                               route_values=route_values)
         return self._deserialize('[BuildLog]', self._unwrap_collection(response))
 
-    def get_build_logs_zip(self, project, build_id):
+    def get_build_logs_zip(self, project, build_id, **kwargs):
         """GetBuildLogsZip.
         Gets logs for a build
         :param str project: Project ID or project name
@@ -791,8 +801,13 @@ def get_build_logs_zip(self, project, build_id):
         response = self._send(http_method='GET',
                               location_id='35a80daf-7f30-45fc-86e8-6b813d9c90df',
                               version='4.0',
-                              route_values=route_values)
-        return self._deserialize('object', response)
+                              route_values=route_values,
+                              accept_media_type='application/zip')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def get_project_metrics(self, project, metric_aggregation_type=None, min_metrics_time=None):
         """GetProjectMetrics.
@@ -970,7 +985,7 @@ def get_build_report(self, project, build_id, type=None):
                               query_parameters=query_parameters)
         return self._deserialize('BuildReportMetadata', response)
 
-    def get_build_report_html_content(self, project, build_id, type=None):
+    def get_build_report_html_content(self, project, build_id, type=None, **kwargs):
         """GetBuildReportHtmlContent.
         [Preview API] Gets report for a build
         :param str project: Project ID or project name
@@ -990,8 +1005,13 @@ def get_build_report_html_content(self, project, build_id, type=None):
                               location_id='45bcaa88-67e1-4042-a035-56d3b4a7d44c',
                               version='4.0-preview.2',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
+                              query_parameters=query_parameters,
+                              accept_media_type='text/html')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def get_resource_usage(self):
         """GetResourceUsage.

vsts/vsts/gallery/v4_0/gallery_client.py

@@ -134,7 +134,7 @@ def request_acquisition(self, acquisition_request):
                               content=content)
         return self._deserialize('ExtensionAcquisitionRequest', response)
 
-    def get_asset_by_name(self, publisher_name, extension_name, version, asset_type, account_token=None, accept_default=None):
+    def get_asset_by_name(self, publisher_name, extension_name, version, asset_type, account_token=None, accept_default=None, **kwargs):
         """GetAssetByName.
         [Preview API]
         :param str publisher_name:
@@ -163,10 +163,15 @@ def get_asset_by_name(self, publisher_name, extension_name, version, asset_type,
                               location_id='7529171f-a002-4180-93ba-685f358a0482',
                               version='4.0-preview.1',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
-
-    def get_asset(self, extension_id, version, asset_type, account_token=None, accept_default=None):
+                              query_parameters=query_parameters,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
+
+    def get_asset(self, extension_id, version, asset_type, account_token=None, accept_default=None, **kwargs):
         """GetAsset.
         [Preview API]
         :param str extension_id:
@@ -192,10 +197,15 @@ def get_asset(self, extension_id, version, asset_type, account_token=None, accep
                               location_id='5d545f3d-ef47-488b-8be3-f5ee1517856c',
                               version='4.0-preview.1',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
-
-    def get_asset_authenticated(self, publisher_name, extension_name, version, asset_type, account_token=None):
+                              query_parameters=query_parameters,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
+
+    def get_asset_authenticated(self, publisher_name, extension_name, version, asset_type, account_token=None, **kwargs):
         """GetAssetAuthenticated.
         [Preview API]
         :param str publisher_name:
@@ -221,8 +231,13 @@ def get_asset_authenticated(self, publisher_name, extension_name, version, asset
                               location_id='506aff36-2622-4f70-8063-77cce6366d20',
                               version='4.0-preview.1',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
+                              query_parameters=query_parameters,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def associate_azure_publisher(self, publisher_name, azure_publisher_id):
         """AssociateAzurePublisher.
@@ -364,7 +379,7 @@ def get_root_categories(self, product, lcid=None, source=None, product_version=N
                               query_parameters=query_parameters)
         return self._deserialize('ProductCategoriesResult', response)
 
-    def get_certificate(self, publisher_name, extension_name, version=None):
+    def get_certificate(self, publisher_name, extension_name, version=None, **kwargs):
         """GetCertificate.
         [Preview API]
         :param str publisher_name:
@@ -382,8 +397,13 @@ def get_certificate(self, publisher_name, extension_name, version=None):
         response = self._send(http_method='GET',
                               location_id='e905ad6a-3f1f-4d08-9f6d-7d357ff8b7d0',
                               version='4.0-preview.1',
-                              route_values=route_values)
-        return self._deserialize('object', response)
+                              route_values=route_values,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def get_extension_events(self, publisher_name, extension_name, count=None, after_date=None, include=None, include_property=None):
         """GetExtensionEvents.
@@ -652,7 +672,7 @@ def send_notifications(self, notification_data):
                    version='4.0-preview.1',
                    content=content)
 
-    def get_package(self, publisher_name, extension_name, version, account_token=None, accept_default=None):
+    def get_package(self, publisher_name, extension_name, version, account_token=None, accept_default=None, **kwargs):
         """GetPackage.
         [Preview API]
         :param str publisher_name:
@@ -678,10 +698,15 @@ def get_package(self, publisher_name, extension_name, version, account_token=Non
                               location_id='7cb576f8-1cae-4c4b-b7b1-e4af5759e965',
                               version='4.0-preview.1',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
-
-    def get_asset_with_token(self, publisher_name, extension_name, version, asset_type, asset_token=None, account_token=None, accept_default=None):
+                              query_parameters=query_parameters,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
+
+    def get_asset_with_token(self, publisher_name, extension_name, version, asset_type, asset_token=None, account_token=None, accept_default=None, **kwargs):
         """GetAssetWithToken.
         [Preview API]
         :param str publisher_name:
@@ -713,8 +738,13 @@ def get_asset_with_token(self, publisher_name, extension_name, version, asset_ty
                               location_id='364415a1-0077-4a41-a7a0-06edd4497492',
                               version='4.0-preview.1',
                               route_values=route_values,
-                              query_parameters=query_parameters)
-        return self._deserialize('object', response)
+                              query_parameters=query_parameters,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)
 
     def query_publishers(self, publisher_query):
         """QueryPublishers.
@@ -1307,7 +1337,7 @@ def increment_extension_daily_stat(self, publisher_name, extension_name, version
                    route_values=route_values,
                    query_parameters=query_parameters)
 
-    def get_verification_log(self, publisher_name, extension_name, version):
+    def get_verification_log(self, publisher_name, extension_name, version, **kwargs):
         """GetVerificationLog.
         [Preview API]
         :param str publisher_name:
@@ -1325,6 +1355,11 @@ def get_verification_log(self, publisher_name, extension_name, version):
         response = self._send(http_method='GET',
                               location_id='c5523abe-b843-437f-875b-5833064efe4d',
                               version='4.0-preview.1',
-                              route_values=route_values)
-        return self._deserialize('object', response)
+                              route_values=route_values,
+                              accept_media_type='application/octet-stream')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        return self._client.stream_download(response, callback=callback)