diff --git a/AWSPolly.podspec b/AWSPolly.podspec index 010660f164a..f7d72691a2b 100644 --- a/AWSPolly.podspec +++ b/AWSPolly.podspec @@ -14,5 +14,5 @@ Pod::Spec.new do |s| s.requires_arc = true s.dependency 'AWSCore', '2.36.2' s.source_files = 'AWSPolly/*.{h,m}' - s.resource_bundle = { 'AWSPolly' => ['AWSPolly/PrivacyInfo.xcprivacy']} + s.resource_bundle = { 'AWSPolly' => ['AWSPolly/PrivacyInfo.xcprivacy'] } end diff --git a/AWSPolly/AWSPollyModel.h b/AWSPolly/AWSPollyModel.h index 80394453075..0cd81ca6b9e 100644 --- a/AWSPolly/AWSPollyModel.h +++ b/AWSPolly/AWSPollyModel.h @@ -51,6 +51,7 @@ typedef NS_ENUM(NSInteger, AWSPollyEngine) { AWSPollyEngineStandard, AWSPollyEngineNeural, AWSPollyEngineLongForm, + AWSPollyEngineGenerative, }; typedef NS_ENUM(NSInteger, AWSPollyGender) { @@ -284,7 +285,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { /** -

Specifies the engine (standard, neural or long-form) used by Amazon Polly when processing input text for speech synthesis.

+

Specifies the engine (standard, neural, long-form or generative) used by Amazon Polly when processing input text for speech synthesis.

*/ @property (nonatomic, assign) AWSPollyEngine engine; @@ -559,7 +560,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { /** -

Specifies the engine (standard, neural or long-form) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

+

Specifies the engine (standard, neural, long-form or generative) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

*/ @property (nonatomic, assign) AWSPollyEngine engine; @@ -589,7 +590,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { @property (nonatomic, strong) NSString * _Nullable outputS3KeyPrefix; /** -

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are "8000", "16000", "22050", and "24000". The default value for standard voices is "22050". The default value for neural voices is "24000". The default value for long-form voices is "24000".

Valid values for pcm are "8000" and "16000" The default value is "16000".

+

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are "8000", "16000", "22050", and "24000". The default value for standard voices is "22050". The default value for neural voices is "24000". The default value for long-form voices is "24000". The default value for generative voices is "24000".

Valid values for pcm are "8000" and "16000" The default value is "16000".

*/ @property (nonatomic, strong) NSString * _Nullable sampleRate; @@ -645,7 +646,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { @property (nonatomic, strong) NSDate * _Nullable creationTime; /** -

Specifies the engine (standard, neural or long-form) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

+

Specifies the engine (standard, neural, long-form or generative) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

*/ @property (nonatomic, assign) AWSPollyEngine engine; @@ -675,7 +676,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { @property (nonatomic, strong) NSNumber * _Nullable requestCharacters; /** -

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are "8000", "16000", "22050", and "24000". The default value for standard voices is "22050". The default value for neural voices is "24000". The default value for long-form voices is "24000".

Valid values for pcm are "8000" and "16000" The default value is "16000".

+

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are "8000", "16000", "22050", and "24000". The default value for standard voices is "22050". The default value for neural voices is "24000". The default value for long-form voices is "24000". The default value for generative voices is "24000".

Valid values for pcm are "8000" and "16000" The default value is "16000".

*/ @property (nonatomic, strong) NSString * _Nullable sampleRate; @@ -723,7 +724,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { /** -

Specifies the engine (standard, neural or long-form) for Amazon Polly to use when processing input text for speech synthesis. For information on Amazon Polly voices and which voices are available for each engine, see Available Voices.

NTTS-only voices

When using NTTS-only voices such as Kevin (en-US), this parameter is required and must be set to neural. If the engine is not specified, or is set to standard, this will result in an error.

long-form-only voices

When using long-form-only voices such as Danielle (en-US), this parameter is required and must be set to long-form. If the engine is not specified, or is set to standard or neural, this will result in an error.

Type: String

Valid Values: standard | neural | long-form

Required: Yes

Standard voices

For standard voices, this is not required; the engine parameter defaults to standard. If the engine is not specified, or is set to standard and an NTTS-only voice is selected, this will result in an error.

+

Specifies the engine (standard, neural, long-form, or generative) for Amazon Polly to use when processing input text for speech synthesis. Provide an engine that is supported by the voice you select. If you don't provide an engine, the standard engine is selected by default. If a chosen voice isn't supported by the standard engine, this will result in an error. For information on Amazon Polly voices and which voices are available for each engine, see Available Voices.

Type: String

Valid Values: standard | neural | long-form | generative

Required: Yes

*/ @property (nonatomic, assign) AWSPollyEngine engine; @@ -743,7 +744,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { @property (nonatomic, assign) AWSPollyOutputFormat outputFormat; /** -

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are "8000", "16000", "22050", and "24000". The default value for standard voices is "22050". The default value for neural voices is "24000". The default value for long-form voices is "24000".

Valid values for pcm are "8000" and "16000" The default value is "16000".

+

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are "8000", "16000", "22050", and "24000". The default value for standard voices is "22050". The default value for neural voices is "24000". The default value for long-form voices is "24000". The default value for generative voices is "24000".

Valid values for pcm are "8000" and "16000" The default value is "16000".

*/ @property (nonatomic, strong) NSString * _Nullable sampleRate; @@ -829,7 +830,7 @@ typedef NS_ENUM(NSInteger, AWSPollyVoiceId) { @property (nonatomic, strong) NSString * _Nullable name; /** -

Specifies which engines (standard, neural or long-form) are supported by a given voice.

+

Specifies which engines (standard, neural, long-form or generative) are supported by a given voice.

*/ @property (nonatomic, strong) NSArray * _Nullable supportedEngines; diff --git a/AWSPolly/AWSPollyModel.m b/AWSPolly/AWSPollyModel.m index 83f6882a369..170fe17cc66 100644 --- a/AWSPolly/AWSPollyModel.m +++ b/AWSPolly/AWSPollyModel.m @@ -66,6 +66,9 @@ + (NSValueTransformer *)engineJSONTransformer { if ([value caseInsensitiveCompare:@"long-form"] == NSOrderedSame) { return @(AWSPollyEngineLongForm); } + if ([value caseInsensitiveCompare:@"generative"] == NSOrderedSame) { + return @(AWSPollyEngineGenerative); + } return @(AWSPollyEngineUnknown); } reverseBlock:^NSString *(NSNumber *value) { switch ([value integerValue]) { @@ -75,6 +78,8 @@ + (NSValueTransformer *)engineJSONTransformer { return @"neural"; case AWSPollyEngineLongForm: return @"long-form"; + case AWSPollyEngineGenerative: + return @"generative"; default: return nil; } @@ -800,6 +805,9 @@ + (NSValueTransformer *)engineJSONTransformer { if ([value caseInsensitiveCompare:@"long-form"] == NSOrderedSame) { return @(AWSPollyEngineLongForm); } + if ([value caseInsensitiveCompare:@"generative"] == NSOrderedSame) { + return @(AWSPollyEngineGenerative); + } return @(AWSPollyEngineUnknown); } reverseBlock:^NSString *(NSNumber *value) { switch ([value integerValue]) { @@ -809,6 +817,8 @@ + (NSValueTransformer *)engineJSONTransformer { return @"neural"; case AWSPollyEngineLongForm: return @"long-form"; + case AWSPollyEngineGenerative: + return @"generative"; default: return nil; } @@ -1629,6 +1639,9 @@ + (NSValueTransformer *)engineJSONTransformer { if ([value caseInsensitiveCompare:@"long-form"] == NSOrderedSame) { return @(AWSPollyEngineLongForm); } + if ([value caseInsensitiveCompare:@"generative"] == NSOrderedSame) { + return @(AWSPollyEngineGenerative); + } return @(AWSPollyEngineUnknown); } reverseBlock:^NSString *(NSNumber *value) { switch ([value integerValue]) { @@ -1638,6 +1651,8 @@ + (NSValueTransformer *)engineJSONTransformer { return @"neural"; case AWSPollyEngineLongForm: return @"long-form"; + case AWSPollyEngineGenerative: + return @"generative"; default: return nil; } @@ -2457,6 +2472,9 @@ + (NSValueTransformer *)engineJSONTransformer { if ([value caseInsensitiveCompare:@"long-form"] == NSOrderedSame) { return @(AWSPollyEngineLongForm); } + if ([value caseInsensitiveCompare:@"generative"] == NSOrderedSame) { + return @(AWSPollyEngineGenerative); + } return @(AWSPollyEngineUnknown); } reverseBlock:^NSString *(NSNumber *value) { switch ([value integerValue]) { @@ -2466,6 +2484,8 @@ + (NSValueTransformer *)engineJSONTransformer { return @"neural"; case AWSPollyEngineLongForm: return @"long-form"; + case AWSPollyEngineGenerative: + return @"generative"; default: return nil; } diff --git a/AWSPolly/AWSPollyResources.m b/AWSPolly/AWSPollyResources.m index dd333874886..ebde7dbd2de 100644 --- a/AWSPolly/AWSPollyResources.m +++ b/AWSPolly/AWSPollyResources.m @@ -257,7 +257,7 @@ - (NSString *)definitionString { \"members\":{\ \"Engine\":{\ \"shape\":\"Engine\",\ - \"documentation\":\"

Specifies the engine (standard, neural or long-form) used by Amazon Polly when processing input text for speech synthesis.

\",\ + \"documentation\":\"

Specifies the engine (standard, neural, long-form or generative) used by Amazon Polly when processing input text for speech synthesis.

\",\ \"location\":\"querystring\",\ \"locationName\":\"Engine\"\ },\ @@ -299,7 +299,8 @@ - (NSString *)definitionString { \"enum\":[\ \"standard\",\ \"neural\",\ - \"long-form\"\ + \"long-form\",\ + \"generative\"\ ]\ },\ \"EngineList\":{\ @@ -750,7 +751,7 @@ - (NSString *)definitionString { \"Size\":{\"type\":\"integer\"},\ \"SnsTopicArn\":{\ \"type\":\"string\",\ - \"pattern\":\"^arn:aws(-(cn|iso(-b)?|us-gov))?:sns:[a-z0-9_-]{1,50}:\\\\d{12}:[a-zA-Z0-9_-]{1,256}$\"\ + \"pattern\":\"^arn:aws(-(cn|iso(-b)?|us-gov))?:sns:[a-z0-9_-]{1,50}:\\\\d{12}:[a-zA-Z0-9_-]{1,251}([a-zA-Z0-9_-]{0,5}|\\\\.fifo)$\"\ },\ \"SpeechMarkType\":{\ \"type\":\"string\",\ @@ -786,7 +787,7 @@ - (NSString *)definitionString { \"members\":{\ \"Engine\":{\ \"shape\":\"Engine\",\ - \"documentation\":\"

Specifies the engine (standard, neural or long-form) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

\"\ + \"documentation\":\"

Specifies the engine (standard, neural, long-form or generative) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

\"\ },\ \"LanguageCode\":{\ \"shape\":\"LanguageCode\",\ @@ -810,7 +811,7 @@ - (NSString *)definitionString { },\ \"SampleRate\":{\ \"shape\":\"SampleRate\",\ - \"documentation\":\"

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are \\\"8000\\\", \\\"16000\\\", \\\"22050\\\", and \\\"24000\\\". The default value for standard voices is \\\"22050\\\". The default value for neural voices is \\\"24000\\\". The default value for long-form voices is \\\"24000\\\".

Valid values for pcm are \\\"8000\\\" and \\\"16000\\\" The default value is \\\"16000\\\".

\"\ + \"documentation\":\"

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are \\\"8000\\\", \\\"16000\\\", \\\"22050\\\", and \\\"24000\\\". The default value for standard voices is \\\"22050\\\". The default value for neural voices is \\\"24000\\\". The default value for long-form voices is \\\"24000\\\". The default value for generative voices is \\\"24000\\\".

Valid values for pcm are \\\"8000\\\" and \\\"16000\\\" The default value is \\\"16000\\\".

\"\ },\ \"SnsTopicArn\":{\ \"shape\":\"SnsTopicArn\",\ @@ -848,7 +849,7 @@ - (NSString *)definitionString { \"members\":{\ \"Engine\":{\ \"shape\":\"Engine\",\ - \"documentation\":\"

Specifies the engine (standard, neural or long-form) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

\"\ + \"documentation\":\"

Specifies the engine (standard, neural, long-form or generative) for Amazon Polly to use when processing input text for speech synthesis. Using a voice that is not supported for the engine selected will result in an error.

\"\ },\ \"TaskId\":{\ \"shape\":\"TaskId\",\ @@ -888,7 +889,7 @@ - (NSString *)definitionString { },\ \"SampleRate\":{\ \"shape\":\"SampleRate\",\ - \"documentation\":\"

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are \\\"8000\\\", \\\"16000\\\", \\\"22050\\\", and \\\"24000\\\". The default value for standard voices is \\\"22050\\\". The default value for neural voices is \\\"24000\\\". The default value for long-form voices is \\\"24000\\\".

Valid values for pcm are \\\"8000\\\" and \\\"16000\\\" The default value is \\\"16000\\\".

\"\ + \"documentation\":\"

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are \\\"8000\\\", \\\"16000\\\", \\\"22050\\\", and \\\"24000\\\". The default value for standard voices is \\\"22050\\\". The default value for neural voices is \\\"24000\\\". The default value for long-form voices is \\\"24000\\\". The default value for generative voices is \\\"24000\\\".

Valid values for pcm are \\\"8000\\\" and \\\"16000\\\" The default value is \\\"16000\\\".

\"\ },\ \"SpeechMarkTypes\":{\ \"shape\":\"SpeechMarkTypeList\",\ @@ -932,7 +933,7 @@ - (NSString *)definitionString { \"members\":{\ \"Engine\":{\ \"shape\":\"Engine\",\ - \"documentation\":\"

Specifies the engine (standard, neural or long-form) for Amazon Polly to use when processing input text for speech synthesis. For information on Amazon Polly voices and which voices are available for each engine, see Available Voices.

NTTS-only voices

When using NTTS-only voices such as Kevin (en-US), this parameter is required and must be set to neural. If the engine is not specified, or is set to standard, this will result in an error.

long-form-only voices

When using long-form-only voices such as Danielle (en-US), this parameter is required and must be set to long-form. If the engine is not specified, or is set to standard or neural, this will result in an error.

Type: String

Valid Values: standard | neural | long-form

Required: Yes

Standard voices

For standard voices, this is not required; the engine parameter defaults to standard. If the engine is not specified, or is set to standard and an NTTS-only voice is selected, this will result in an error.

\"\ + \"documentation\":\"

Specifies the engine (standard, neural, long-form, or generative) for Amazon Polly to use when processing input text for speech synthesis. Provide an engine that is supported by the voice you select. If you don't provide an engine, the standard engine is selected by default. If a chosen voice isn't supported by the standard engine, this will result in an error. For information on Amazon Polly voices and which voices are available for each engine, see Available Voices.

Type: String

Valid Values: standard | neural | long-form | generative

Required: Yes

\"\ },\ \"LanguageCode\":{\ \"shape\":\"LanguageCode\",\ @@ -948,7 +949,7 @@ - (NSString *)definitionString { },\ \"SampleRate\":{\ \"shape\":\"SampleRate\",\ - \"documentation\":\"

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are \\\"8000\\\", \\\"16000\\\", \\\"22050\\\", and \\\"24000\\\". The default value for standard voices is \\\"22050\\\". The default value for neural voices is \\\"24000\\\". The default value for long-form voices is \\\"24000\\\".

Valid values for pcm are \\\"8000\\\" and \\\"16000\\\" The default value is \\\"16000\\\".

\"\ + \"documentation\":\"

The audio frequency specified in Hz.

The valid values for mp3 and ogg_vorbis are \\\"8000\\\", \\\"16000\\\", \\\"22050\\\", and \\\"24000\\\". The default value for standard voices is \\\"22050\\\". The default value for neural voices is \\\"24000\\\". The default value for long-form voices is \\\"24000\\\". The default value for generative voices is \\\"24000\\\".

Valid values for pcm are \\\"8000\\\" and \\\"16000\\\" The default value is \\\"16000\\\".

\"\ },\ \"SpeechMarkTypes\":{\ \"shape\":\"SpeechMarkTypeList\",\ @@ -1068,7 +1069,7 @@ - (NSString *)definitionString { },\ \"SupportedEngines\":{\ \"shape\":\"EngineList\",\ - \"documentation\":\"

Specifies which engines (standard, neural or long-form) are supported by a given voice.

\"\ + \"documentation\":\"

Specifies which engines (standard, neural, long-form or generative) are supported by a given voice.

\"\ }\ },\ \"documentation\":\"

Description of the voice.

\"\