Skip to content

Commit

Permalink
fix(predictions): use readData on textToSpeech bytestream (#3280)
Browse files Browse the repository at this point in the history
  • Loading branch information
@atierian
atierian authored Oct 5, 2023
1 parent f042a1c commit c56ff92
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 60 deletions.
13 changes: 2 additions & 11 deletions ...ns/Predictions/AWSPredictionsPlugin/Service/Predictions/AWSPredictionsService+Polly.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extension AWSPredictionsService: AWSPollyServiceBehavior {

do {
let synthesizedSpeechResult = try await awsPolly.synthesizeSpeech(input: input)
guard let speech = synthesizedSpeechResult.audioStream
guard let speech = try await synthesizedSpeechResult.audioStream?.readData()
else {
throw PredictionsError.service(
.init(
Expand All @@ -34,16 +34,7 @@ extension AWSPredictionsService: AWSPollyServiceBehavior {
)
}

switch speech {
case .data(let data?):
let textToSpeechResult = Predictions.Convert.TextToSpeech.Result(
audioData: data
)
return textToSpeechResult
// TODO: figure out what to throw here
default: throw PredictionsError.unknown("Missing respose", "", nil)
}

return .init(audioData: speech)
} catch let error as PredictionsErrorConvertible {
throw error.predictionsError
} catch {
Expand Down
53 changes: 4 additions & 49 deletions ...Plugins/Predictions/Tests/PredictionsHostApp/PredictionsHostApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
6875F90F2A3CCCB7001C9AAF /* InterpretBasicIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9054235A291425630000D108 /* InterpretBasicIntegrationTests.swift */; };
6875F9102A3CCCB7001C9AAF /* AWSPredictionsPluginTestBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90542359291425630000D108 /* AWSPredictionsPluginTestBase.swift */; };
6875F9112A3CCCB7001C9AAF /* ConvertBasicIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90542358291425630000D108 /* ConvertBasicIntegrationTests.swift */; };
6875F9142A3CCCB7001C9AAF /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F9092A3CCCB7001C9AAF /* Amplify */; };
6875F9152A3CCCB7001C9AAF /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F90B2A3CCCB7001C9AAF /* AWSPredictionsPlugin */; };
6875F9162A3CCCB7001C9AAF /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 6875F90A2A3CCCB7001C9AAF /* AWSCognitoAuthPlugin */; };
6875F9182A3CCCB7001C9AAF /* testImageText.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 9054235E291425630000D108 /* testImageText.jpg */; };
6875F9192A3CCCB7001C9AAF /* testImageCeleb.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542363291425630000D108 /* testImageCeleb.jpg */; };
6875F91A2A3CCCB7001C9AAF /* testImageTextWithTables.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 90542360291425630000D108 /* testImageTextWithTables.jpg */; };
Expand All @@ -38,10 +35,6 @@
9028304E2914042800897087 /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 9028304D2914042800897087 /* AWSCognitoAuthPlugin */; };
902830502914042800897087 /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 9028304F2914042800897087 /* AWSPredictionsPlugin */; };
902830522914042800897087 /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 902830512914042800897087 /* CoreMLPredictionsPlugin */; };
904D63AD291439890057D06F /* Amplify in Frameworks */ = {isa = PBXBuildFile; productRef = 904D63AC291439890057D06F /* Amplify */; };
904D63AF291439890057D06F /* AWSCognitoAuthPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 904D63AE291439890057D06F /* AWSCognitoAuthPlugin */; };
904D63B1291439890057D06F /* AWSPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 904D63B0291439890057D06F /* AWSPredictionsPlugin */; };
904D63B3291439890057D06F /* CoreMLPredictionsPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 904D63B2291439890057D06F /* CoreMLPredictionsPlugin */; };
905423522914254B0000D108 /* audio.wav in Resources */ = {isa = PBXBuildFile; fileRef = 9054234E2914254B0000D108 /* audio.wav */; };
905423532914254B0000D108 /* people.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 9054234F2914254B0000D108 /* people.jpg */; };
905423542914254B0000D108 /* CoreMLPredictionsPluginIntegrationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 905423502914254B0000D108 /* CoreMLPredictionsPluginIntegrationTest.swift */; };
Expand Down Expand Up @@ -132,9 +125,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
6875F9142A3CCCB7001C9AAF /* Amplify in Frameworks */,
6875F9152A3CCCB7001C9AAF /* AWSPredictionsPlugin in Frameworks */,
6875F9162A3CCCB7001C9AAF /* AWSCognitoAuthPlugin in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -160,10 +150,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
904D63B3291439890057D06F /* CoreMLPredictionsPlugin in Frameworks */,
904D63AD291439890057D06F /* Amplify in Frameworks */,
904D63B1291439890057D06F /* AWSPredictionsPlugin in Frameworks */,
904D63AF291439890057D06F /* AWSCognitoAuthPlugin in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -326,9 +312,6 @@
);
name = AWSPredictionsPluginIntegrationTestsWatch;
packageProductDependencies = (
6875F9092A3CCCB7001C9AAF /* Amplify */,
6875F90A2A3CCCB7001C9AAF /* AWSCognitoAuthPlugin */,
6875F90B2A3CCCB7001C9AAF /* AWSPredictionsPlugin */,
);
productName = AWSPredictionsPluginIntegrationTests;
productReference = 6875F9242A3CCCB7001C9AAF /* AWSPredictionsPluginIntegrationTestsWatch.xctest */;
Expand Down Expand Up @@ -391,10 +374,6 @@
);
name = AWSPredictionsPluginIntegrationTests;
packageProductDependencies = (
904D63AC291439890057D06F /* Amplify */,
904D63AE291439890057D06F /* AWSCognitoAuthPlugin */,
904D63B0291439890057D06F /* AWSPredictionsPlugin */,
904D63B2291439890057D06F /* CoreMLPredictionsPlugin */,
);
productName = AWSPredictionsPluginIntegrationTests;
productReference = 903555F829141355004B83C2 /* AWSPredictionsPluginIntegrationTests.xctest */;
Expand Down Expand Up @@ -882,6 +861,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.coffee.PredictionsHostApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
Expand Down Expand Up @@ -916,6 +896,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.coffee.PredictionsHostApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
Expand Down Expand Up @@ -943,6 +924,7 @@
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.coffee.CoreMLPredictionsPluginIntegrationTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
Expand Down Expand Up @@ -973,6 +955,7 @@
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = io.coffee.CoreMLPredictionsPluginIntegrationTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator";
Expand Down Expand Up @@ -1119,18 +1102,6 @@
isa = XCSwiftPackageProductDependency;
productName = AWSPredictionsPlugin;
};
6875F9092A3CCCB7001C9AAF /* Amplify */ = {
isa = XCSwiftPackageProductDependency;
productName = Amplify;
};
6875F90A2A3CCCB7001C9AAF /* AWSCognitoAuthPlugin */ = {
isa = XCSwiftPackageProductDependency;
productName = AWSCognitoAuthPlugin;
};
6875F90B2A3CCCB7001C9AAF /* AWSPredictionsPlugin */ = {
isa = XCSwiftPackageProductDependency;
productName = AWSPredictionsPlugin;
};
9028304B2914042800897087 /* Amplify */ = {
isa = XCSwiftPackageProductDependency;
productName = Amplify;
Expand All @@ -1147,22 +1118,6 @@
isa = XCSwiftPackageProductDependency;
productName = CoreMLPredictionsPlugin;
};
904D63AC291439890057D06F /* Amplify */ = {
isa = XCSwiftPackageProductDependency;
productName = Amplify;
};
904D63AE291439890057D06F /* AWSCognitoAuthPlugin */ = {
isa = XCSwiftPackageProductDependency;
productName = AWSCognitoAuthPlugin;
};
904D63B0291439890057D06F /* AWSPredictionsPlugin */ = {
isa = XCSwiftPackageProductDependency;
productName = AWSPredictionsPlugin;
};
904D63B2291439890057D06F /* CoreMLPredictionsPlugin */ = {
isa = XCSwiftPackageProductDependency;
productName = CoreMLPredictionsPlugin;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 90282FFA2914027000897087 /* Project object */;
Expand Down

0 comments on commit c56ff92

Please sign in to comment.