Merge pull request #164 from Microsoft/dev

0.1.24 -  Fix support for client uploads

Author: tedchamb

vsts/setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages
 
 NAME = "vsts"
-VERSION = "0.1.23"
+VERSION = "0.1.24"
 
 # To install the library, run the following
 #

vsts/vsts/build/v4_1/models/__init__.py

@@ -1,4 +1,4 @@
-# --------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
@@ -21,7 +21,6 @@
 from .build_controller import BuildController
 from .build_definition import BuildDefinition
 from .build_definition3_2 import BuildDefinition3_2
-from .build_definition_counter import BuildDefinitionCounter
 from .build_definition_reference import BuildDefinitionReference
 from .build_definition_reference3_2 import BuildDefinitionReference3_2
 from .build_definition_revision import BuildDefinitionRevision
@@ -95,7 +94,6 @@
     'BuildController',
     'BuildDefinition',
     'BuildDefinition3_2',
-    'BuildDefinitionCounter',
     'BuildDefinitionReference',
     'BuildDefinitionReference3_2',
     'BuildDefinitionRevision',

vsts/vsts/build/v4_1/models/build_definition.py

@@ -1,4 +1,4 @@
-# --------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
@@ -56,8 +56,6 @@ class BuildDefinition(BuildDefinitionReference):
     :type build_number_format: str
     :param comment: A save-time comment for the definition.
     :type comment: str
-    :param counters:
-    :type counters: dict
     :param demands:
     :type demands: list of :class:`object <build.v4_1.models.object>`
     :param description: The description.
@@ -115,7 +113,6 @@ class BuildDefinition(BuildDefinitionReference):
         'badge_enabled': {'key': 'badgeEnabled', 'type': 'bool'},
         'build_number_format': {'key': 'buildNumberFormat', 'type': 'str'},
         'comment': {'key': 'comment', 'type': 'str'},
-        'counters': {'key': 'counters', 'type': '{BuildDefinitionCounter}'},
         'demands': {'key': 'demands', 'type': '[object]'},
         'description': {'key': 'description', 'type': 'str'},
         'drop_location': {'key': 'dropLocation', 'type': 'str'},
@@ -134,12 +131,11 @@ class BuildDefinition(BuildDefinitionReference):
         'variables': {'key': 'variables', 'type': '{BuildDefinitionVariable}'}
     }
 
-    def __init__(self, created_date=None, id=None, name=None, path=None, project=None, queue_status=None, revision=None, type=None, uri=None, url=None, _links=None, authored_by=None, draft_of=None, drafts=None, latest_build=None, latest_completed_build=None, metrics=None, quality=None, queue=None, badge_enabled=None, build_number_format=None, comment=None, counters=None, demands=None, description=None, drop_location=None, job_authorization_scope=None, job_cancel_timeout_in_minutes=None, job_timeout_in_minutes=None, options=None, process=None, process_parameters=None, properties=None, repository=None, retention_rules=None, tags=None, triggers=None, variable_groups=None, variables=None):
+    def __init__(self, created_date=None, id=None, name=None, path=None, project=None, queue_status=None, revision=None, type=None, uri=None, url=None, _links=None, authored_by=None, draft_of=None, drafts=None, latest_build=None, latest_completed_build=None, metrics=None, quality=None, queue=None, badge_enabled=None, build_number_format=None, comment=None, demands=None, description=None, drop_location=None, job_authorization_scope=None, job_cancel_timeout_in_minutes=None, job_timeout_in_minutes=None, options=None, process=None, process_parameters=None, properties=None, repository=None, retention_rules=None, tags=None, triggers=None, variable_groups=None, variables=None):
         super(BuildDefinition, self).__init__(created_date=created_date, id=id, name=name, path=path, project=project, queue_status=queue_status, revision=revision, type=type, uri=uri, url=url, _links=_links, authored_by=authored_by, draft_of=draft_of, drafts=drafts, latest_build=latest_build, latest_completed_build=latest_completed_build, metrics=metrics, quality=quality, queue=queue)
         self.badge_enabled = badge_enabled
         self.build_number_format = build_number_format
         self.comment = comment
-        self.counters = counters
         self.demands = demands
         self.description = description
         self.drop_location = drop_location

vsts/vsts/gallery/v4_0/gallery_client.py

@@ -466,13 +466,17 @@ def query_extensions(self, extension_query, account_token=None):
                               content=content)
         return self._deserialize('ExtensionQueryResult', response)
 
-    def create_extension(self, upload_stream):
+    def create_extension(self, upload_stream, **kwargs):
         """CreateExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
         :rtype: :class:`<PublishedExtension> <gallery.v4_0.models.PublishedExtension>`
         """
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='POST',
                               location_id='a41192c8-9525-4b58-bc86-179fa549d80d',
                               version='4.0-preview.2',
@@ -536,7 +540,7 @@ def update_extension_by_id(self, extension_id):
                               route_values=route_values)
         return self._deserialize('PublishedExtension', response)
 
-    def create_extension_with_publisher(self, upload_stream, publisher_name):
+    def create_extension_with_publisher(self, upload_stream, publisher_name, **kwargs):
         """CreateExtensionWithPublisher.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -546,7 +550,11 @@ def create_extension_with_publisher(self, upload_stream, publisher_name):
         route_values = {}
         if publisher_name is not None:
             route_values['publisherName'] = self._serialize.url('publisher_name', publisher_name, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='POST',
                               location_id='e11ea35a-16fe-4b80-ab11-c4cab88a0966',
                               version='4.0-preview.2',
@@ -605,7 +613,7 @@ def get_extension(self, publisher_name, extension_name, version=None, flags=None
                               query_parameters=query_parameters)
         return self._deserialize('PublishedExtension', response)
 
-    def update_extension(self, upload_stream, publisher_name, extension_name):
+    def update_extension(self, upload_stream, publisher_name, extension_name, **kwargs):
         """UpdateExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -618,7 +626,11 @@ def update_extension(self, upload_stream, publisher_name, extension_name):
             route_values['publisherName'] = self._serialize.url('publisher_name', publisher_name, 'str')
         if extension_name is not None:
             route_values['extensionName'] = self._serialize.url('extension_name', extension_name, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='e11ea35a-16fe-4b80-ab11-c4cab88a0966',
                               version='4.0-preview.2',

vsts/vsts/gallery/v4_1/gallery_client.py

@@ -447,7 +447,7 @@ def perform_edit_extension_draft_operation(self, draft_patch, publisher_name, ex
                               content=content)
         return self._deserialize('ExtensionDraft', response)
 
-    def update_payload_in_draft_for_edit_extension(self, upload_stream, publisher_name, extension_name, draft_id, file_name=None):
+    def update_payload_in_draft_for_edit_extension(self, upload_stream, publisher_name, extension_name, draft_id, file_name=None, **kwargs):
         """UpdatePayloadInDraftForEditExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -464,7 +464,11 @@ def update_payload_in_draft_for_edit_extension(self, upload_stream, publisher_na
             route_values['extensionName'] = self._serialize.url('extension_name', extension_name, 'str')
         if draft_id is not None:
             route_values['draftId'] = self._serialize.url('draft_id', draft_id, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='02b33873-4e61-496e-83a2-59d1df46b7d8',
                               version='4.1-preview.1',
@@ -473,7 +477,7 @@ def update_payload_in_draft_for_edit_extension(self, upload_stream, publisher_na
                               media_type='application/octet-stream')
         return self._deserialize('ExtensionDraft', response)
 
-    def add_asset_for_edit_extension_draft(self, upload_stream, publisher_name, extension_name, draft_id, asset_type):
+    def add_asset_for_edit_extension_draft(self, upload_stream, publisher_name, extension_name, draft_id, asset_type, **kwargs):
         """AddAssetForEditExtensionDraft.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -492,7 +496,11 @@ def add_asset_for_edit_extension_draft(self, upload_stream, publisher_name, exte
             route_values['draftId'] = self._serialize.url('draft_id', draft_id, 'str')
         if asset_type is not None:
             route_values['assetType'] = self._serialize.url('asset_type', asset_type, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='f1db9c47-6619-4998-a7e5-d7f9f41a4617',
                               version='4.1-preview.1',
@@ -501,7 +509,7 @@ def add_asset_for_edit_extension_draft(self, upload_stream, publisher_name, exte
                               media_type='application/octet-stream')
         return self._deserialize('ExtensionDraftAsset', response)
 
-    def create_draft_for_new_extension(self, upload_stream, publisher_name, product, file_name=None):
+    def create_draft_for_new_extension(self, upload_stream, publisher_name, product, file_name=None, **kwargs):
         """CreateDraftForNewExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -513,7 +521,11 @@ def create_draft_for_new_extension(self, upload_stream, publisher_name, product,
         route_values = {}
         if publisher_name is not None:
             route_values['publisherName'] = self._serialize.url('publisher_name', publisher_name, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='POST',
                               location_id='b3ab127d-ebb9-4d22-b611-4e09593c8d79',
                               version='4.1-preview.1',
@@ -543,7 +555,7 @@ def perform_new_extension_draft_operation(self, draft_patch, publisher_name, dra
                               content=content)
         return self._deserialize('ExtensionDraft', response)
 
-    def update_payload_in_draft_for_new_extension(self, upload_stream, publisher_name, draft_id, file_name=None):
+    def update_payload_in_draft_for_new_extension(self, upload_stream, publisher_name, draft_id, file_name=None, **kwargs):
         """UpdatePayloadInDraftForNewExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -557,7 +569,11 @@ def update_payload_in_draft_for_new_extension(self, upload_stream, publisher_nam
             route_values['publisherName'] = self._serialize.url('publisher_name', publisher_name, 'str')
         if draft_id is not None:
             route_values['draftId'] = self._serialize.url('draft_id', draft_id, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='b3ab127d-ebb9-4d22-b611-4e09593c8d79',
                               version='4.1-preview.1',
@@ -566,7 +582,7 @@ def update_payload_in_draft_for_new_extension(self, upload_stream, publisher_nam
                               media_type='application/octet-stream')
         return self._deserialize('ExtensionDraft', response)
 
-    def add_asset_for_new_extension_draft(self, upload_stream, publisher_name, draft_id, asset_type):
+    def add_asset_for_new_extension_draft(self, upload_stream, publisher_name, draft_id, asset_type, **kwargs):
         """AddAssetForNewExtensionDraft.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -582,7 +598,11 @@ def add_asset_for_new_extension_draft(self, upload_stream, publisher_name, draft
             route_values['draftId'] = self._serialize.url('draft_id', draft_id, 'str')
         if asset_type is not None:
             route_values['assetType'] = self._serialize.url('asset_type', asset_type, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='88c0b1c8-b4f1-498a-9b2a-8446ef9f32e7',
                               version='4.1-preview.1',
@@ -709,13 +729,17 @@ def query_extensions(self, extension_query, account_token=None):
                               content=content)
         return self._deserialize('ExtensionQueryResult', response)
 
-    def create_extension(self, upload_stream):
+    def create_extension(self, upload_stream, **kwargs):
         """CreateExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
         :rtype: :class:`<PublishedExtension> <gallery.v4_1.models.PublishedExtension>`
         """
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='POST',
                               location_id='a41192c8-9525-4b58-bc86-179fa549d80d',
                               version='4.1-preview.2',
@@ -779,7 +803,7 @@ def update_extension_by_id(self, extension_id):
                               route_values=route_values)
         return self._deserialize('PublishedExtension', response)
 
-    def create_extension_with_publisher(self, upload_stream, publisher_name):
+    def create_extension_with_publisher(self, upload_stream, publisher_name, **kwargs):
         """CreateExtensionWithPublisher.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -789,7 +813,11 @@ def create_extension_with_publisher(self, upload_stream, publisher_name):
         route_values = {}
         if publisher_name is not None:
             route_values['publisherName'] = self._serialize.url('publisher_name', publisher_name, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='POST',
                               location_id='e11ea35a-16fe-4b80-ab11-c4cab88a0966',
                               version='4.1-preview.2',
@@ -848,7 +876,7 @@ def get_extension(self, publisher_name, extension_name, version=None, flags=None
                               query_parameters=query_parameters)
         return self._deserialize('PublishedExtension', response)
 
-    def update_extension(self, upload_stream, publisher_name, extension_name):
+    def update_extension(self, upload_stream, publisher_name, extension_name, **kwargs):
         """UpdateExtension.
         [Preview API]
         :param object upload_stream: Stream to upload
@@ -861,7 +889,11 @@ def update_extension(self, upload_stream, publisher_name, extension_name):
             route_values['publisherName'] = self._serialize.url('publisher_name', publisher_name, 'str')
         if extension_name is not None:
             route_values['extensionName'] = self._serialize.url('extension_name', extension_name, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='e11ea35a-16fe-4b80-ab11-c4cab88a0966',
                               version='4.1-preview.2',
@@ -1032,7 +1064,7 @@ def get_publisher_asset(self, publisher_name, asset_type=None, **kwargs):
             callback = None
         return self._client.stream_download(response, callback=callback)
 
-    def update_publisher_asset(self, upload_stream, publisher_name, asset_type=None, file_name=None):
+    def update_publisher_asset(self, upload_stream, publisher_name, asset_type=None, file_name=None, **kwargs):
         """UpdatePublisherAsset.
         [Preview API] Update publisher asset like logo. It accepts asset file as an octet stream and file name is passed in header values.
         :param object upload_stream: Stream to upload
@@ -1047,7 +1079,11 @@ def update_publisher_asset(self, upload_stream, publisher_name, asset_type=None,
         query_parameters = {}
         if asset_type is not None:
             query_parameters['assetType'] = self._serialize.query('asset_type', asset_type, 'str')
-        content = self._serialize.body(upload_stream, 'object')
+        if "callback" in kwargs:
+            callback = kwargs["callback"]
+        else:
+            callback = None
+        content = self._client.stream_upload(upload_stream, callback=callback)
         response = self._send(http_method='PUT',
                               location_id='21143299-34f9-4c62-8ca8-53da691192f9',
                               version='4.1-preview.1',