Merge pull request #2851 from aws-amplify/liveness.main

Author: atierian

.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme

@@ -342,6 +342,20 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AWSPredictionsPlugin"
+               BuildableName = "AWSPredictionsPlugin"
+               BlueprintName = "AWSPredictionsPlugin"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -495,6 +509,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AWSPredictionsPluginUnitTests"
+               BuildableName = "AWSPredictionsPluginUnitTests"
+               BlueprintName = "AWSPredictionsPluginUnitTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

AmplifyPlugins/Core/AWSPluginsCore/Auth/Provider/AuthAWSCredentialsProvider.swift

@@ -12,6 +12,10 @@ public protocol AuthAWSCredentialsProvider {
     func getAWSCredentials() -> Result<AWSCredentials, AuthError>
 }
 
+public protocol AWSCredentialsProvider {
+    func fetchAWSCredentials() async throws -> AWSCredentials
+}
+
 public protocol AWSTemporaryCredentials: AWSCredentials {
 
     var sessionToken: String { get }

AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+ClientBehavior.swift

@@ -10,100 +10,53 @@ import Amplify
 
 extension AWSPredictionsPlugin {
 
-    public func convert(textToTranslate: String,
-                        language: LanguageType?,
-                        targetLanguage: LanguageType?,
-                        options: PredictionsTranslateTextRequest.Options?,
-                        listener: PredictionsTranslateTextOperation.ResultListener? = nil)
-        -> PredictionsTranslateTextOperation {
-
-            let request = PredictionsTranslateTextRequest(textToTranslate: textToTranslate,
-                                                          targetLanguage: targetLanguage,
-                                                          language: language,
-                                                          options: options ?? PredictionsTranslateTextRequest.Options())
-            let convertOperation = AWSTranslateOperation(request,
-                                                         predictionsService: predictionsService,
-                                                         resultListener: listener)
-            queue.addOperation(convertOperation)
-            return convertOperation
+    public func convert(
+        textToTranslate: String,
+        language: LanguageType?,
+        targetLanguage: LanguageType?,
+        options: PredictionsTranslateTextRequest.Options?,
+        listener: PredictionsTranslateTextOperation.ResultListener? = nil
+    )
+    -> PredictionsTranslateTextOperation {
+        fatalError()
     }
 
-    public func convert(textToSpeech: String,
-                        options: PredictionsTextToSpeechRequest.Options?,
-                        listener: PredictionsTextToSpeechOperation.ResultListener? = nil)
-        -> PredictionsTextToSpeechOperation {
-            let request = PredictionsTextToSpeechRequest(
-                textToSpeech: textToSpeech,
-                options: options ?? PredictionsTextToSpeechRequest.Options())
-
-            let convertOperation = AWSPollyOperation(request,
-                                                     predictionsService: predictionsService,
-                                                     resultListener: listener)
-
-            queue.addOperation(convertOperation)
-            return convertOperation
-
+    public func convert(
+        textToSpeech: String,
+        options: PredictionsTextToSpeechRequest.Options?,
+        listener: PredictionsTextToSpeechOperation.ResultListener? = nil
+    )
+    -> PredictionsTextToSpeechOperation {
+        fatalError()
     }
 
     public func convert(
         speechToText: URL,
         options: PredictionsSpeechToTextRequest.Options?,
         listener: PredictionsSpeechToTextOperation.ResultListener?
     ) -> PredictionsSpeechToTextOperation {
-        let request = PredictionsSpeechToTextRequest(speechToText: speechToText,
-                                                     options: options ?? PredictionsSpeechToTextRequest.Options())
-
-        let multiService = TranscribeMultiService(coreMLService: coreMLService, predictionsService: predictionsService)
-
-        // only one transcription request can be sent at a time otherwise you receive an error
-        let requestInProcess = queue.operations.contains(where: { $0 is AWSTranscribeOperation})
-
-        let operation = AWSTranscribeOperation(request: request,
-                                               multiService: multiService,
-                                               requestInProcess: requestInProcess,
-                                               resultListener: listener)
-        queue.addOperation(operation)
-        return operation
-
+        fatalError()
     }
 
-    public func identify(type: IdentifyAction,
-                         image: URL,
-                         options: PredictionsIdentifyRequest.Options?,
-                         listener: PredictionsIdentifyOperation.ResultListener? = nil) -> PredictionsIdentifyOperation {
-        let options = options
-
-        let request = PredictionsIdentifyRequest(image: image,
-                                                 identifyType: type,
-                                                 options: options ?? PredictionsIdentifyRequest.Options())
-        let multiService = IdentifyMultiService(coreMLService: coreMLService,
-                                                predictionsService: predictionsService)
-        let operation = IdentifyOperation(request: request,
-                                          multiService: multiService,
-                                          resultListener: listener)
-
-        queue.addOperation(operation)
-        return operation
-
+    public func identify(
+        type: IdentifyAction,
+        image: URL,
+        options: PredictionsIdentifyRequest.Options?,
+        listener: PredictionsIdentifyOperation.ResultListener? = nil
+    ) -> PredictionsIdentifyOperation {
+        fatalError()
     }
 
     /// Interprets the input text and detects sentiment, language, syntax, and key phrases
     ///
     /// - Parameter text: input text
     /// - Parameter options: Option for the plugin
     /// - Parameter resultListener: Listener to which events are send
-    public func interpret(text: String,
-                          options: PredictionsInterpretRequest.Options?,
-                          listener: PredictionsInterpretOperation.ResultListener?) -> PredictionsInterpretOperation {
-
-        let request = PredictionsInterpretRequest(textToInterpret: text,
-                                                  options: options ?? PredictionsInterpretRequest.Options())
-        let multiService = InterpretTextMultiService(coreMLService: coreMLService,
-                                                     predictionsService: predictionsService)
-        let operation = InterpretTextOperation(request,
-                                               multiService: multiService,
-                                               resultListener: listener)
-        queue.addOperation(operation)
-        return operation
+    public func interpret(
+        text: String,
+        options: PredictionsInterpretRequest.Options?,
+        listener: PredictionsInterpretOperation.ResultListener?
+    ) -> PredictionsInterpretOperation {
+        fatalError()
     }
 }

AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Configure.swift

@@ -8,7 +8,6 @@
 import Amplify
 import Foundation
 import AWSPluginsCore
-import AWSCore
 
 extension AWSPredictionsPlugin {
 
@@ -21,7 +20,7 @@ extension AWSPredictionsPlugin {
     /// - Throws:
     ///   - PluginError.pluginConfigurationError: If one of the configuration values is invalid or empty
     public func configure(using configuration: Any?) throws {
-
+        /*
         guard let jsonValueConfiguration = configuration as? JSONValue else {
             throw PluginError.pluginConfigurationError(PluginErrorMessage.decodeConfigurationError.errorDescription,
                                                        PluginErrorMessage.decodeConfigurationError.recoverySuggestion)
@@ -40,8 +39,10 @@ extension AWSPredictionsPlugin {
                   coreMLSerivce: coremlService,
                   authService: authService,
                   config: predictionsConfiguration)
+         */
     }
 
+    /*
     func configure(predictionsService: AWSPredictionsService,
                    coreMLSerivce: CoreMLPredictionBehavior,
                    authService: AWSAuthServiceBehavior,
@@ -53,4 +54,5 @@ extension AWSPredictionsPlugin {
         self.config = config
         self.queue = queue
     }
+     */
 }

AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Reset.swift

@@ -9,21 +9,8 @@ import Foundation
 import Amplify
 
 extension AWSPredictionsPlugin {
-
-    public func reset(onComplete: @escaping BasicClosure) {
-        if predictionsService != nil {
-            predictionsService.reset()
-            predictionsService = nil
-        }
-
-        if authService != nil {
-            authService = nil
-        }
-
-        if queue != nil {
-            queue = nil
-        }
-
-        onComplete()
+    public func reset() async {
+        // TODO: Reset services
+        queue = nil
     }
 }

AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin.swift

@@ -8,7 +8,6 @@
 import Amplify
 import Foundation
 import AWSPluginsCore
-import AWSCore
 
 final public class AWSPredictionsPlugin: PredictionsCategoryPlugin {
 
@@ -18,13 +17,15 @@ final public class AWSPredictionsPlugin: PredictionsCategoryPlugin {
     var queue: OperationQueue!
 
     /// An instance of the predictions  service
+     /*
     var predictionsService: AWSPredictionsService!
 
     var coreMLService: CoreMLPredictionBehavior!
 
     var authService: AWSAuthServiceBehavior!
 
     var config: PredictionsPluginConfiguration!
+     */
 
     /// public limit rekognition has on number of faces it can detect.
     public static let rekognitionMaxEntitiesLimit = 50
@@ -34,9 +35,11 @@ final public class AWSPredictionsPlugin: PredictionsCategoryPlugin {
         return awsPredictionsPluginKey
     }
 
+    /*
     public func getEscapeHatch(key: PredictionsAWSService) -> AWSService {
         return predictionsService.getEscapeHatch(key: key)
     }
+     */
 
     public init() {
     }

AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/Date+EpochMillis.swift

@@ -0,0 +1,14 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+extension Date {
+    var epochMilliseconds: UInt64 {
+        UInt64(self.timeIntervalSince1970 * 1_000)
+    }
+}

AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessCompletedEvent.swift

@@ -0,0 +1,19 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+@_spi(PredictionsFaceLiveness)
+public struct CompletedEvent<T> {
+    public init(initialEvent: T, endTimestamp: UInt64) {
+        self.initialEvent = initialEvent
+        self.endTimestamp = endTimestamp
+    }
+
+    let initialEvent: T
+    let endTimestamp: UInt64
+}

AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessEvent.swift

@@ -0,0 +1,60 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+@_spi(PredictionsFaceLiveness)
+public struct LivenessEvent<T> {
+    let payload: Data
+    let eventKind: LivenessEventKind
+    let eventTypeHeader: String
+}
+
+@_spi(PredictionsFaceLiveness)
+public enum LivenessEventKind {
+    public struct Server: Hashable {
+        public static let challenge = Server()
+        public static let disconnect = Server()
+    }
+    case server(Server)
+
+    public struct Client: Equatable {
+        let id: UInt8
+
+        public static let initialFaceDetected = Client(id: 0)
+        public static let video = Client(id: 1)
+        public static let freshness = Client(id: 2)
+        public static let final = Client(id: 3)
+    }
+    case client(Client)
+}
+
+extension LivenessEventKind: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        switch self {
+        case .server(.challenge): return ".server(.challenge)"
+        case .server(.disconnect): return ".server(.disconnect)"
+        case .client(.initialFaceDetected): return ".client(.initialFaceDetected)"
+        case .client(.video): return ".client(.video)"
+        case .client(.freshness): return ".client(.freshness)"
+        case .client(.final): return ".client(.final)"
+        default: return "unknown"
+        }
+    }
+}
+
+extension LivenessEvent: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        return """
+        LivenessEvent<\(T.self)>(
+            payload: \(payload),
+            eventKind: \(eventKind),
+            eventTypeHeader: \(eventTypeHeader)
+        )
+        """
+    }
+}

AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessFaceDetectionEvent.swift

@@ -0,0 +1,19 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+@_spi(PredictionsFaceLiveness)
+public struct FaceDetection {
+    let boundingBox: FaceLivenessSession.BoundingBox
+    let startTimestamp: UInt64
+
+    public init(boundingBox: FaceLivenessSession.BoundingBox, startTimestamp: UInt64) {
+        self.boundingBox = boundingBox
+        self.startTimestamp = startTimestamp
+    }
+}