From b8773004f8ac27991b3f3479fc594bc0dffe12e5 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 31 May 2019 16:45:55 +0000 Subject: [PATCH 1/2] Generated from 640862cb586fea960990d055baee48d8e766cad9 typo: mediaservices/resource-manager/Microsoft.Media - requet -> request - Double word "the" - modifed -> modified - exsiting -> existing - proprty -> property - speicified -> specified --- .../azure/mgmt/media/models/__init__.py | 6 +++ .../mgmt/media/models/absolute_clip_time.py | 43 +++++++++++++++++++ .../media/models/absolute_clip_time_py3.py | 43 +++++++++++++++++++ .../models/azure_media_services_enums.py | 1 + .../azure/mgmt/media/models/clip_time.py | 42 ++++++++++++++++++ .../azure/mgmt/media/models/clip_time_py3.py | 42 ++++++++++++++++++ .../models/filter_track_property_condition.py | 2 +- .../filter_track_property_condition_py3.py | 2 +- .../mgmt/media/models/job_input_asset.py | 8 ++++ .../mgmt/media/models/job_input_asset_py3.py | 12 +++++- .../azure/mgmt/media/models/job_input_clip.py | 10 +++++ .../mgmt/media/models/job_input_clip_py3.py | 12 +++++- .../azure/mgmt/media/models/job_input_http.py | 8 ++++ .../mgmt/media/models/job_input_http_py3.py | 12 +++++- .../azure/mgmt/media/models/live_event.py | 4 +- .../mgmt/media/models/live_event_encoding.py | 4 +- .../media/models/live_event_encoding_py3.py | 4 +- .../mgmt/media/models/live_event_input.py | 2 +- .../mgmt/media/models/live_event_input_py3.py | 2 +- .../azure/mgmt/media/models/live_event_py3.py | 4 +- .../azure/mgmt/media/models/live_output.py | 2 +- .../mgmt/media/models/live_output_py3.py | 2 +- .../media/models/presentation_time_range.py | 2 +- .../models/presentation_time_range_py3.py | 2 +- .../mgmt/media/models/streaming_endpoint.py | 2 +- .../media/models/streaming_endpoint_py3.py | 2 +- .../media/models/video_analyzer_preset.py | 15 ++++--- .../media/models/video_analyzer_preset_py3.py | 15 ++++--- .../media/operations/assets_operations.py | 2 +- .../content_key_policies_operations.py | 2 +- .../mgmt/media/operations/jobs_operations.py | 2 +- .../media/operations/transforms_operations.py | 2 +- .../azure/mgmt/media/version.py | 3 +- 33 files changed, 278 insertions(+), 38 deletions(-) create mode 100644 sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time.py create mode 100644 sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time_py3.py create mode 100644 sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time.py create mode 100644 sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time_py3.py diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/__init__.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/__init__.py index b288dbfab357..324f39a1d03b 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/__init__.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/__init__.py @@ -104,7 +104,9 @@ from .transform_output_py3 import TransformOutput from .transform_py3 import Transform from .job_input_py3 import JobInput + from .clip_time_py3 import ClipTime from .job_input_clip_py3 import JobInputClip + from .absolute_clip_time_py3 import AbsoluteClipTime from .job_inputs_py3 import JobInputs from .job_input_asset_py3 import JobInputAsset from .job_input_http_py3 import JobInputHttp @@ -247,7 +249,9 @@ from .transform_output import TransformOutput from .transform import Transform from .job_input import JobInput + from .clip_time import ClipTime from .job_input_clip import JobInputClip + from .absolute_clip_time import AbsoluteClipTime from .job_inputs import JobInputs from .job_input_asset import JobInputAsset from .job_input_http import JobInputHttp @@ -447,7 +451,9 @@ 'TransformOutput', 'Transform', 'JobInput', + 'ClipTime', 'JobInputClip', + 'AbsoluteClipTime', 'JobInputs', 'JobInputAsset', 'JobInputHttp', diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time.py new file mode 100644 index 000000000000..4349a27a2146 --- /dev/null +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time.py @@ -0,0 +1,43 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .clip_time import ClipTime + + +class AbsoluteClipTime(ClipTime): + """Specifies the clip time as an absolute time position in the media file. + The absolute time can point to a different position depending on whether + the media file starts from a timestamp of zero or not. + + All required parameters must be populated in order to send to Azure. + + :param odatatype: Required. Constant filled by server. + :type odatatype: str + :param time: Required. The time position on the timeline of the input + media. It is usually specified as an ISO8601 period. e.g PT30S for 30 + seconds. + :type time: timedelta + """ + + _validation = { + 'odatatype': {'required': True}, + 'time': {'required': True}, + } + + _attribute_map = { + 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, + 'time': {'key': 'time', 'type': 'duration'}, + } + + def __init__(self, **kwargs): + super(AbsoluteClipTime, self).__init__(**kwargs) + self.time = kwargs.get('time', None) + self.odatatype = '#Microsoft.Media.AbsoluteClipTime' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time_py3.py new file mode 100644 index 000000000000..6c6c2f21a809 --- /dev/null +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/absolute_clip_time_py3.py @@ -0,0 +1,43 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .clip_time_py3 import ClipTime + + +class AbsoluteClipTime(ClipTime): + """Specifies the clip time as an absolute time position in the media file. + The absolute time can point to a different position depending on whether + the media file starts from a timestamp of zero or not. + + All required parameters must be populated in order to send to Azure. + + :param odatatype: Required. Constant filled by server. + :type odatatype: str + :param time: Required. The time position on the timeline of the input + media. It is usually specified as an ISO8601 period. e.g PT30S for 30 + seconds. + :type time: timedelta + """ + + _validation = { + 'odatatype': {'required': True}, + 'time': {'required': True}, + } + + _attribute_map = { + 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, + 'time': {'key': 'time', 'type': 'duration'}, + } + + def __init__(self, *, time, **kwargs) -> None: + super(AbsoluteClipTime, self).__init__(**kwargs) + self.time = time + self.odatatype = '#Microsoft.Media.AbsoluteClipTime' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/azure_media_services_enums.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/azure_media_services_enums.py index ad5cb5143127..c8fb0f53e127 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/azure_media_services_enums.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/azure_media_services_enums.py @@ -290,6 +290,7 @@ class LiveEventEncodingType(str, Enum): none = "None" basic = "Basic" standard = "Standard" + premium1080p = "Premium1080p" class LiveEventResourceState(str, Enum): diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time.py new file mode 100644 index 000000000000..1d454984122f --- /dev/null +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ClipTime(Model): + """Base class for specifying a clip time. Use sub classes of this class to + specify the time position in the media. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: AbsoluteClipTime + + All required parameters must be populated in order to send to Azure. + + :param odatatype: Required. Constant filled by server. + :type odatatype: str + """ + + _validation = { + 'odatatype': {'required': True}, + } + + _attribute_map = { + 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, + } + + _subtype_map = { + 'odatatype': {'#Microsoft.Media.AbsoluteClipTime': 'AbsoluteClipTime'} + } + + def __init__(self, **kwargs): + super(ClipTime, self).__init__(**kwargs) + self.odatatype = None diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time_py3.py new file mode 100644 index 000000000000..590b6a643c7d --- /dev/null +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/clip_time_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ClipTime(Model): + """Base class for specifying a clip time. Use sub classes of this class to + specify the time position in the media. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: AbsoluteClipTime + + All required parameters must be populated in order to send to Azure. + + :param odatatype: Required. Constant filled by server. + :type odatatype: str + """ + + _validation = { + 'odatatype': {'required': True}, + } + + _attribute_map = { + 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, + } + + _subtype_map = { + 'odatatype': {'#Microsoft.Media.AbsoluteClipTime': 'AbsoluteClipTime'} + } + + def __init__(self, **kwargs) -> None: + super(ClipTime, self).__init__(**kwargs) + self.odatatype = None diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition.py index 4fb9b2ae53bc..2cd8b53a2549 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition.py @@ -20,7 +20,7 @@ class FilterTrackPropertyCondition(Model): :param property: Required. The track property type. Possible values include: 'Unknown', 'Type', 'Name', 'Language', 'FourCC', 'Bitrate' :type property: str or ~azure.mgmt.media.models.FilterTrackPropertyType - :param value: Required. The track proprty value. + :param value: Required. The track property value. :type value: str :param operation: Required. The track property condition operation. Possible values include: 'Equal', 'NotEqual' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition_py3.py index e3ff59ff555e..6e9bec9ea112 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/filter_track_property_condition_py3.py @@ -20,7 +20,7 @@ class FilterTrackPropertyCondition(Model): :param property: Required. The track property type. Possible values include: 'Unknown', 'Type', 'Name', 'Language', 'FourCC', 'Bitrate' :type property: str or ~azure.mgmt.media.models.FilterTrackPropertyType - :param value: Required. The track proprty value. + :param value: Required. The track property value. :type value: str :param operation: Required. The track property condition operation. Possible values include: 'Equal', 'NotEqual' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset.py index 687100fc2c90..4637428a380b 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset.py @@ -22,6 +22,12 @@ class JobInputAsset(JobInputClip): :param files: List of files. Required for JobInputHttp. Maximum of 4000 characters each. :type files: list[str] + :param start: Defines a point on the timeline of the input media at which + processing will start. Defaults to the beginning of the input media. + :type start: ~azure.mgmt.media.models.ClipTime + :param end: Defines a point on the timeline of the input media at which + processing will end. Defaults to the end of the input media. + :type end: ~azure.mgmt.media.models.ClipTime :param label: A label that is assigned to a JobInputClip, that is used to satisfy a reference used in the Transform. For example, a Transform can be authored so as to take an image file with the label 'xyz' and apply it as @@ -41,6 +47,8 @@ class JobInputAsset(JobInputClip): _attribute_map = { 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, 'files': {'key': 'files', 'type': '[str]'}, + 'start': {'key': 'start', 'type': 'ClipTime'}, + 'end': {'key': 'end', 'type': 'ClipTime'}, 'label': {'key': 'label', 'type': 'str'}, 'asset_name': {'key': 'assetName', 'type': 'str'}, } diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py index 263d4ac593c8..36298f70d120 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_asset_py3.py @@ -22,6 +22,12 @@ class JobInputAsset(JobInputClip): :param files: List of files. Required for JobInputHttp. Maximum of 4000 characters each. :type files: list[str] + :param start: Defines a point on the timeline of the input media at which + processing will start. Defaults to the beginning of the input media. + :type start: ~azure.mgmt.media.models.ClipTime + :param end: Defines a point on the timeline of the input media at which + processing will end. Defaults to the end of the input media. + :type end: ~azure.mgmt.media.models.ClipTime :param label: A label that is assigned to a JobInputClip, that is used to satisfy a reference used in the Transform. For example, a Transform can be authored so as to take an image file with the label 'xyz' and apply it as @@ -41,11 +47,13 @@ class JobInputAsset(JobInputClip): _attribute_map = { 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, 'files': {'key': 'files', 'type': '[str]'}, + 'start': {'key': 'start', 'type': 'ClipTime'}, + 'end': {'key': 'end', 'type': 'ClipTime'}, 'label': {'key': 'label', 'type': 'str'}, 'asset_name': {'key': 'assetName', 'type': 'str'}, } - def __init__(self, *, asset_name: str, files=None, label: str=None, **kwargs) -> None: - super(JobInputAsset, self).__init__(files=files, label=label, **kwargs) + def __init__(self, *, asset_name: str, files=None, start=None, end=None, label: str=None, **kwargs) -> None: + super(JobInputAsset, self).__init__(files=files, start=start, end=end, label=label, **kwargs) self.asset_name = asset_name self.odatatype = '#Microsoft.Media.JobInputAsset' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip.py index 5187d14e6234..95c4f7e67701 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip.py @@ -25,6 +25,12 @@ class JobInputClip(JobInput): :param files: List of files. Required for JobInputHttp. Maximum of 4000 characters each. :type files: list[str] + :param start: Defines a point on the timeline of the input media at which + processing will start. Defaults to the beginning of the input media. + :type start: ~azure.mgmt.media.models.ClipTime + :param end: Defines a point on the timeline of the input media at which + processing will end. Defaults to the end of the input media. + :type end: ~azure.mgmt.media.models.ClipTime :param label: A label that is assigned to a JobInputClip, that is used to satisfy a reference used in the Transform. For example, a Transform can be authored so as to take an image file with the label 'xyz' and apply it as @@ -41,6 +47,8 @@ class JobInputClip(JobInput): _attribute_map = { 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, 'files': {'key': 'files', 'type': '[str]'}, + 'start': {'key': 'start', 'type': 'ClipTime'}, + 'end': {'key': 'end', 'type': 'ClipTime'}, 'label': {'key': 'label', 'type': 'str'}, } @@ -51,5 +59,7 @@ class JobInputClip(JobInput): def __init__(self, **kwargs): super(JobInputClip, self).__init__(**kwargs) self.files = kwargs.get('files', None) + self.start = kwargs.get('start', None) + self.end = kwargs.get('end', None) self.label = kwargs.get('label', None) self.odatatype = '#Microsoft.Media.JobInputClip' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py index b6bbdb3e4e1e..47f77b4c1547 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_clip_py3.py @@ -25,6 +25,12 @@ class JobInputClip(JobInput): :param files: List of files. Required for JobInputHttp. Maximum of 4000 characters each. :type files: list[str] + :param start: Defines a point on the timeline of the input media at which + processing will start. Defaults to the beginning of the input media. + :type start: ~azure.mgmt.media.models.ClipTime + :param end: Defines a point on the timeline of the input media at which + processing will end. Defaults to the end of the input media. + :type end: ~azure.mgmt.media.models.ClipTime :param label: A label that is assigned to a JobInputClip, that is used to satisfy a reference used in the Transform. For example, a Transform can be authored so as to take an image file with the label 'xyz' and apply it as @@ -41,6 +47,8 @@ class JobInputClip(JobInput): _attribute_map = { 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, 'files': {'key': 'files', 'type': '[str]'}, + 'start': {'key': 'start', 'type': 'ClipTime'}, + 'end': {'key': 'end', 'type': 'ClipTime'}, 'label': {'key': 'label', 'type': 'str'}, } @@ -48,8 +56,10 @@ class JobInputClip(JobInput): 'odatatype': {'#Microsoft.Media.JobInputAsset': 'JobInputAsset', '#Microsoft.Media.JobInputHttp': 'JobInputHttp'} } - def __init__(self, *, files=None, label: str=None, **kwargs) -> None: + def __init__(self, *, files=None, start=None, end=None, label: str=None, **kwargs) -> None: super(JobInputClip, self).__init__(**kwargs) self.files = files + self.start = start + self.end = end self.label = label self.odatatype = '#Microsoft.Media.JobInputClip' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http.py index a12e24dec5a1..bbabe32f599b 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http.py @@ -22,6 +22,12 @@ class JobInputHttp(JobInputClip): :param files: List of files. Required for JobInputHttp. Maximum of 4000 characters each. :type files: list[str] + :param start: Defines a point on the timeline of the input media at which + processing will start. Defaults to the beginning of the input media. + :type start: ~azure.mgmt.media.models.ClipTime + :param end: Defines a point on the timeline of the input media at which + processing will end. Defaults to the end of the input media. + :type end: ~azure.mgmt.media.models.ClipTime :param label: A label that is assigned to a JobInputClip, that is used to satisfy a reference used in the Transform. For example, a Transform can be authored so as to take an image file with the label 'xyz' and apply it as @@ -43,6 +49,8 @@ class JobInputHttp(JobInputClip): _attribute_map = { 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, 'files': {'key': 'files', 'type': '[str]'}, + 'start': {'key': 'start', 'type': 'ClipTime'}, + 'end': {'key': 'end', 'type': 'ClipTime'}, 'label': {'key': 'label', 'type': 'str'}, 'base_uri': {'key': 'baseUri', 'type': 'str'}, } diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py index 0cc04900ba5e..1c7df3ed389e 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/job_input_http_py3.py @@ -22,6 +22,12 @@ class JobInputHttp(JobInputClip): :param files: List of files. Required for JobInputHttp. Maximum of 4000 characters each. :type files: list[str] + :param start: Defines a point on the timeline of the input media at which + processing will start. Defaults to the beginning of the input media. + :type start: ~azure.mgmt.media.models.ClipTime + :param end: Defines a point on the timeline of the input media at which + processing will end. Defaults to the end of the input media. + :type end: ~azure.mgmt.media.models.ClipTime :param label: A label that is assigned to a JobInputClip, that is used to satisfy a reference used in the Transform. For example, a Transform can be authored so as to take an image file with the label 'xyz' and apply it as @@ -43,11 +49,13 @@ class JobInputHttp(JobInputClip): _attribute_map = { 'odatatype': {'key': '@odata\\.type', 'type': 'str'}, 'files': {'key': 'files', 'type': '[str]'}, + 'start': {'key': 'start', 'type': 'ClipTime'}, + 'end': {'key': 'end', 'type': 'ClipTime'}, 'label': {'key': 'label', 'type': 'str'}, 'base_uri': {'key': 'baseUri', 'type': 'str'}, } - def __init__(self, *, files=None, label: str=None, base_uri: str=None, **kwargs) -> None: - super(JobInputHttp, self).__init__(files=files, label=label, **kwargs) + def __init__(self, *, files=None, start=None, end=None, label: str=None, base_uri: str=None, **kwargs) -> None: + super(JobInputHttp, self).__init__(files=files, start=start, end=end, label=label, **kwargs) self.base_uri = base_uri self.odatatype = '#Microsoft.Media.JobInputHttp' diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event.py index ee3e149c9db5..442d437e0d94 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event.py @@ -82,10 +82,10 @@ class LiveEvent(TrackedResource): 'preview': {'key': 'properties.preview', 'type': 'LiveEventPreview'}, 'encoding': {'key': 'properties.encoding', 'type': 'LiveEventEncoding'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'resource_state': {'key': 'properties.resourceState', 'type': 'LiveEventResourceState'}, + 'resource_state': {'key': 'properties.resourceState', 'type': 'str'}, 'cross_site_access_policies': {'key': 'properties.crossSiteAccessPolicies', 'type': 'CrossSiteAccessPolicies'}, 'vanity_url': {'key': 'properties.vanityUrl', 'type': 'bool'}, - 'stream_options': {'key': 'properties.streamOptions', 'type': '[StreamOptionsFlag]'}, + 'stream_options': {'key': 'properties.streamOptions', 'type': '[str]'}, 'created': {'key': 'properties.created', 'type': 'iso-8601'}, 'last_modified': {'key': 'properties.lastModified', 'type': 'iso-8601'}, } diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding.py index ccda7e13e359..cafbe5de507f 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding.py @@ -17,7 +17,7 @@ class LiveEventEncoding(Model): :param encoding_type: The encoding type for Live Event. This value is specified at creation time and cannot be updated. Possible values include: - 'None', 'Basic', 'Standard' + 'None', 'Basic', 'Standard', 'Premium1080p' :type encoding_type: str or ~azure.mgmt.media.models.LiveEventEncodingType :param preset_name: The encoding preset name. This value is specified at creation time and cannot be updated. @@ -25,7 +25,7 @@ class LiveEventEncoding(Model): """ _attribute_map = { - 'encoding_type': {'key': 'encodingType', 'type': 'LiveEventEncodingType'}, + 'encoding_type': {'key': 'encodingType', 'type': 'str'}, 'preset_name': {'key': 'presetName', 'type': 'str'}, } diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding_py3.py index f6dd61de8d2c..c678ab35adc6 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_encoding_py3.py @@ -17,7 +17,7 @@ class LiveEventEncoding(Model): :param encoding_type: The encoding type for Live Event. This value is specified at creation time and cannot be updated. Possible values include: - 'None', 'Basic', 'Standard' + 'None', 'Basic', 'Standard', 'Premium1080p' :type encoding_type: str or ~azure.mgmt.media.models.LiveEventEncodingType :param preset_name: The encoding preset name. This value is specified at creation time and cannot be updated. @@ -25,7 +25,7 @@ class LiveEventEncoding(Model): """ _attribute_map = { - 'encoding_type': {'key': 'encodingType', 'type': 'LiveEventEncodingType'}, + 'encoding_type': {'key': 'encodingType', 'type': 'str'}, 'preset_name': {'key': 'presetName', 'type': 'str'}, } diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input.py index 5182171471fa..c98ec94f2b4f 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input.py @@ -40,7 +40,7 @@ class LiveEventInput(Model): } _attribute_map = { - 'streaming_protocol': {'key': 'streamingProtocol', 'type': 'LiveEventInputProtocol'}, + 'streaming_protocol': {'key': 'streamingProtocol', 'type': 'str'}, 'access_control': {'key': 'accessControl', 'type': 'LiveEventInputAccessControl'}, 'key_frame_interval_duration': {'key': 'keyFrameIntervalDuration', 'type': 'str'}, 'access_token': {'key': 'accessToken', 'type': 'str'}, diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input_py3.py index 278eec4b9e0c..d903d6e6ab71 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_input_py3.py @@ -40,7 +40,7 @@ class LiveEventInput(Model): } _attribute_map = { - 'streaming_protocol': {'key': 'streamingProtocol', 'type': 'LiveEventInputProtocol'}, + 'streaming_protocol': {'key': 'streamingProtocol', 'type': 'str'}, 'access_control': {'key': 'accessControl', 'type': 'LiveEventInputAccessControl'}, 'key_frame_interval_duration': {'key': 'keyFrameIntervalDuration', 'type': 'str'}, 'access_token': {'key': 'accessToken', 'type': 'str'}, diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py index 75659a2a9e1c..540144359cac 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_event_py3.py @@ -82,10 +82,10 @@ class LiveEvent(TrackedResource): 'preview': {'key': 'properties.preview', 'type': 'LiveEventPreview'}, 'encoding': {'key': 'properties.encoding', 'type': 'LiveEventEncoding'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'resource_state': {'key': 'properties.resourceState', 'type': 'LiveEventResourceState'}, + 'resource_state': {'key': 'properties.resourceState', 'type': 'str'}, 'cross_site_access_policies': {'key': 'properties.crossSiteAccessPolicies', 'type': 'CrossSiteAccessPolicies'}, 'vanity_url': {'key': 'properties.vanityUrl', 'type': 'bool'}, - 'stream_options': {'key': 'properties.streamOptions', 'type': '[StreamOptionsFlag]'}, + 'stream_options': {'key': 'properties.streamOptions', 'type': '[str]'}, 'created': {'key': 'properties.created', 'type': 'iso-8601'}, 'last_modified': {'key': 'properties.lastModified', 'type': 'iso-8601'}, } diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output.py index aacba416697b..bf968787371c 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output.py @@ -78,7 +78,7 @@ class LiveOutput(ProxyResource): 'created': {'key': 'properties.created', 'type': 'iso-8601'}, 'last_modified': {'key': 'properties.lastModified', 'type': 'iso-8601'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'resource_state': {'key': 'properties.resourceState', 'type': 'LiveOutputResourceState'}, + 'resource_state': {'key': 'properties.resourceState', 'type': 'str'}, } def __init__(self, **kwargs): diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py index 529f2da31efa..7aa00dd1cc26 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/live_output_py3.py @@ -78,7 +78,7 @@ class LiveOutput(ProxyResource): 'created': {'key': 'properties.created', 'type': 'iso-8601'}, 'last_modified': {'key': 'properties.lastModified', 'type': 'iso-8601'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'resource_state': {'key': 'properties.resourceState', 'type': 'LiveOutputResourceState'}, + 'resource_state': {'key': 'properties.resourceState', 'type': 'str'}, } def __init__(self, *, asset_name: str, archive_window_length, description: str=None, manifest_name: str=None, hls=None, output_snap_time: int=None, **kwargs) -> None: diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range.py index 9e6e119a3f0d..b839d13e666e 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range.py @@ -26,7 +26,7 @@ class PresentationTimeRange(Model): :type live_backoff_duration: long :param timescale: The time scale of time stamps. :type timescale: long - :param force_end_timestamp: The indicator of forcing exsiting of end time + :param force_end_timestamp: The indicator of forcing existing of end time stamp. :type force_end_timestamp: bool """ diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range_py3.py index db3a2aeae583..2f9eadafc8d1 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/presentation_time_range_py3.py @@ -26,7 +26,7 @@ class PresentationTimeRange(Model): :type live_backoff_duration: long :param timescale: The time scale of time stamps. :type timescale: long - :param force_end_timestamp: The indicator of forcing exsiting of end time + :param force_end_timestamp: The indicator of forcing existing of end time stamp. :type force_end_timestamp: bool """ diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint.py index 9e09f9317e07..6ad950b2dd26 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint.py @@ -104,7 +104,7 @@ class StreamingEndpoint(TrackedResource): 'cdn_provider': {'key': 'properties.cdnProvider', 'type': 'str'}, 'cdn_profile': {'key': 'properties.cdnProfile', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'resource_state': {'key': 'properties.resourceState', 'type': 'StreamingEndpointResourceState'}, + 'resource_state': {'key': 'properties.resourceState', 'type': 'str'}, 'cross_site_access_policies': {'key': 'properties.crossSiteAccessPolicies', 'type': 'CrossSiteAccessPolicies'}, 'free_trial_end_time': {'key': 'properties.freeTrialEndTime', 'type': 'iso-8601'}, 'created': {'key': 'properties.created', 'type': 'iso-8601'}, diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py index 155128da3000..811e3bf9395b 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/streaming_endpoint_py3.py @@ -104,7 +104,7 @@ class StreamingEndpoint(TrackedResource): 'cdn_provider': {'key': 'properties.cdnProvider', 'type': 'str'}, 'cdn_profile': {'key': 'properties.cdnProfile', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'resource_state': {'key': 'properties.resourceState', 'type': 'StreamingEndpointResourceState'}, + 'resource_state': {'key': 'properties.resourceState', 'type': 'str'}, 'cross_site_access_policies': {'key': 'properties.crossSiteAccessPolicies', 'type': 'CrossSiteAccessPolicies'}, 'free_trial_end_time': {'key': 'properties.freeTrialEndTime', 'type': 'iso-8601'}, 'created': {'key': 'properties.created', 'type': 'iso-8601'}, diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset.py index fb9a378028d7..dd017d19143a 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset.py @@ -37,11 +37,16 @@ class VideoAnalyzerPreset(AudioAnalyzerPreset): clearly discernable speech. If automatic detection fails to find the language, transcription would fallback to 'en-US'." :type audio_language: str - :param insights_to_extract: The type of insights to be extracted. If not - set then based on the content the type will selected. If the content is - audio only then only audio insights are extracted and if it is video only. - Possible values include: 'AudioInsightsOnly', 'VideoInsightsOnly', - 'AllInsights' + :param insights_to_extract: Defines the type of insights that you want the + service to generate. The allowed values are 'AudioInsightsOnly', + 'VideoInsightsOnly', and 'AllInsights'. The default is AllInsights. If you + set this to AllInsights and the input is audio only, then only audio + insights are generated. Similarly if the input is video only, then only + video insights are generated. It is recommended that you not use + AudioInsightsOnly if you expect some of your inputs to be video only; or + use VideoInsightsOnly if you expect some of your inputs to be audio only. + Your Jobs in such conditions would error out. Possible values include: + 'AudioInsightsOnly', 'VideoInsightsOnly', 'AllInsights' :type insights_to_extract: str or ~azure.mgmt.media.models.InsightsType """ diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py index dfef85d00d06..26b496246d08 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/models/video_analyzer_preset_py3.py @@ -37,11 +37,16 @@ class VideoAnalyzerPreset(AudioAnalyzerPreset): clearly discernable speech. If automatic detection fails to find the language, transcription would fallback to 'en-US'." :type audio_language: str - :param insights_to_extract: The type of insights to be extracted. If not - set then based on the content the type will selected. If the content is - audio only then only audio insights are extracted and if it is video only. - Possible values include: 'AudioInsightsOnly', 'VideoInsightsOnly', - 'AllInsights' + :param insights_to_extract: Defines the type of insights that you want the + service to generate. The allowed values are 'AudioInsightsOnly', + 'VideoInsightsOnly', and 'AllInsights'. The default is AllInsights. If you + set this to AllInsights and the input is audio only, then only audio + insights are generated. Similarly if the input is video only, then only + video insights are generated. It is recommended that you not use + AudioInsightsOnly if you expect some of your inputs to be video only; or + use VideoInsightsOnly if you expect some of your inputs to be audio only. + Your Jobs in such conditions would error out. Possible values include: + 'AudioInsightsOnly', 'VideoInsightsOnly', 'AllInsights' :type insights_to_extract: str or ~azure.mgmt.media.models.InsightsType """ diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py index 02511f0c2476..6958c9d0a8d8 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/assets_operations.py @@ -54,7 +54,7 @@ def list( of items returned from a collection. The service returns the number of available items up to but not greater than the specified value n. :type top: int - :param orderby: Specifies the the key by which the result collection + :param orderby: Specifies the key by which the result collection should be ordered. :type orderby: str :param dict custom_headers: headers that will be added to the request diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py index 51a53ba8bfe7..196b02de82bb 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/content_key_policies_operations.py @@ -53,7 +53,7 @@ def list( of items returned from a collection. The service returns the number of available items up to but not greater than the specified value n. :type top: int - :param orderby: Specifies the the key by which the result collection + :param orderby: Specifies the key by which the result collection should be ordered. :type orderby: str :param dict custom_headers: headers that will be added to the request diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py index 1f578ae13075..5ca42f146c7b 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/jobs_operations.py @@ -51,7 +51,7 @@ def list( :type transform_name: str :param filter: Restricts the set of items returned. :type filter: str - :param orderby: Specifies the the key by which the result collection + :param orderby: Specifies the key by which the result collection should be ordered. :type orderby: str :param dict custom_headers: headers that will be added to the request diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py index 431b81934f67..57c21e1ba842 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/operations/transforms_operations.py @@ -49,7 +49,7 @@ def list( :type account_name: str :param filter: Restricts the set of items returned. :type filter: str - :param orderby: Specifies the the key by which the result collection + :param orderby: Specifies the key by which the result collection should be ordered. :type orderby: str :param dict custom_headers: headers that will be added to the request diff --git a/sdk/media/azure-mgmt-media/azure/mgmt/media/version.py b/sdk/media/azure-mgmt-media/azure/mgmt/media/version.py index 3ed20a28f4d8..8b09f47f15f0 100644 --- a/sdk/media/azure-mgmt-media/azure/mgmt/media/version.py +++ b/sdk/media/azure-mgmt-media/azure/mgmt/media/version.py @@ -9,4 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "1.1.1" +VERSION = "2018-07-01" + From 516512c97311ad8a6b4b555a05c116fdd324c418 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 31 May 2019 16:48:38 +0000 Subject: [PATCH 2/2] Packaging update of azure-mgmt-media --- sdk/media/azure-mgmt-media/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/media/azure-mgmt-media/setup.py b/sdk/media/azure-mgmt-media/setup.py index 3b6aca28ce9e..82f936287b0f 100644 --- a/sdk/media/azure-mgmt-media/setup.py +++ b/sdk/media/azure-mgmt-media/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com',