chore(predictions): resolve swiftformat errors and warnings

aws-amplify · Sep 3, 2024 · 51c5e82 · 51c5e82
1 parent ca6c65a
commit 51c5e82
Show file tree

Hide file tree

Showing 96 changed files with 323 additions and 300 deletions.
diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Configure.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Configure.swift
@@ -6,8 +6,8 @@
 //
 
 @_spi(InternalAmplifyConfiguration) import Amplify
-import Foundation
 import AWSPluginsCore
+import Foundation
 
 extension AWSPredictionsPlugin {
     /// Configures AWSPredictionsPlugin with the specified configuration.
@@ -68,7 +68,7 @@ extension AWSPredictionsPlugin {
         config: PredictionsPluginConfiguration
     ) {
         self.predictionsService = predictionsService
-        self.coreMLService = coreMLSerivce
+        coreMLService = coreMLSerivce
         self.authService = authService
         self.config = config
     }

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Convert.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Convert.swift
@@ -5,15 +5,15 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
+import Foundation
 @_spi(PredictionsConvertRequestKind) import Amplify
 import AWSPolly
 
 extension AWSPredictionsPlugin {
 
-    public func convert<Input, Options, Output>(
-        _ request: Predictions.Convert.Request<Input, Options, Output>,
+    public func convert<Options, Output>(
+        _ request: Predictions.Convert.Request<some Any, Options, Output>,
         options: Options?
     ) async throws -> Output {
         switch request.kind {
@@ -102,13 +102,15 @@ extension AWSPredictionsPlugin {
         voice: Predictions.Voice?,
         config: PredictionsPluginConfiguration
     ) -> PollyClientTypes.VoiceId {
-        if let voice = voice,
-           let pollyVoiceID = PollyClientTypes.VoiceId(rawValue: voice.id) {
+        if let voice,
+           let pollyVoiceID = PollyClientTypes.VoiceId(rawValue: voice.id)
+        {
             return pollyVoiceID
         }
 
         if let configVoice = config.convert.speechGenerator?.voiceID,
-           let pollyVoiceID = PollyClientTypes.VoiceId(rawValue: configVoice) {
+           let pollyVoiceID = PollyClientTypes.VoiceId(rawValue: configVoice)
+        {
             return pollyVoiceID
         }
 

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Identify.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Identify.swift
@@ -5,13 +5,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
+import Foundation
 @_spi(PredictionsConvertRequestKind) import Amplify
 import AWSPolly
 
-extension AWSPredictionsPlugin {
-    public func identify<Output>(
+public extension AWSPredictionsPlugin {
+    func identify<Output>(
         _ request: Predictions.Identify.Request<Output>,
         in image: URL,
         options: Predictions.Identify.Options?

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Interpret.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Interpret.swift
@@ -5,17 +5,17 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
+import Foundation
 @_spi(PredictionsConvertRequestKind) import Amplify
 
-extension AWSPredictionsPlugin {
+public extension AWSPredictionsPlugin {
     /// 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(
+    func interpret(
         text: String,
         options: Predictions.Interpret.Options?
     ) async throws -> Predictions.Interpret.Result {

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Reset.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin+Reset.swift
@@ -5,11 +5,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
+import Foundation
 
-extension AWSPredictionsPlugin {
-    public func reset() async {
+public extension AWSPredictionsPlugin {
+    func reset() async {
         if predictionsService != nil {
             let resettable = predictionsService as Resettable
             await resettable.reset()

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/AWSPredictionsPlugin.swift
@@ -6,10 +6,10 @@
 //
 
 import Amplify
-import Foundation
 import AWSPluginsCore
+import Foundation
 
-final public class AWSPredictionsPlugin: PredictionsCategoryPlugin {
+public final class AWSPredictionsPlugin: PredictionsCategoryPlugin {
     let awsPredictionsPluginKey = "awsPredictionsPlugin"
 
     /// An instance of the predictions  service

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Configuration/IdentifyConfiguration.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Configuration/IdentifyConfiguration.swift
@@ -119,7 +119,7 @@ extension IdentifyLabelsConfiguration: Decodable {
 
     public init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
-        type = try values.decode(Predictions.LabelType.self, forKey: .type)
+        self.type = try values.decode(Predictions.LabelType.self, forKey: .type)
     }
 }
 
@@ -151,7 +151,7 @@ extension IdentifyTextConfiguration: Decodable {
 
     public init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
-        format = try values.decode(Predictions.TextFormatType.self, forKey: .format)
+        self.format = try values.decode(Predictions.TextFormatType.self, forKey: .format)
     }
 }
 

diff --git a/...fyPlugins/Predictions/AWSPredictionsPlugin/Dependency/AWSTranscribeStreamingAdapter.swift b/...fyPlugins/Predictions/AWSPredictionsPlugin/Dependency/AWSTranscribeStreamingAdapter.swift
@@ -5,11 +5,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
+import AWSClientRuntime
 import AWSPluginsCore
 import AWSTranscribeStreaming
-import AWSClientRuntime
+import Foundation
 
 class AWSTranscribeStreamingAdapter: AWSTranscribeStreamingBehavior {
 
@@ -62,7 +62,7 @@ class AWSTranscribeStreamingAdapter: AWSTranscribeStreamingBehavior {
         var components = URLComponents()
         components.scheme = "wss"
         components.host = "transcribestreaming.\(region).amazonaws.com"
-        components.port = 8443
+        components.port = 8_443
         components.path = "/stream-transcription-websocket"
 
         components.queryItems = [
@@ -95,7 +95,7 @@ class AWSTranscribeStreamingAdapter: AWSTranscribeStreamingBehavior {
             var currentEnd = min(chunkSize, audioDataSize - currentStart)
 
             while currentStart < audioDataSize {
-                let dataChunk = input.audioStream[currentStart..<currentEnd]
+                let dataChunk = input.audioStream[currentStart ..< currentEnd]
                 let encodedChunk = EventStream.Encoder().encode(payload: dataChunk, headers: headers)
 
                 webSocket.send(message: .data(encodedChunk), onError: { _ in })

diff --git a/...yPlugins/Predictions/AWSPredictionsPlugin/Dependency/AWSTranscribeStreamingBehavior.swift b/...yPlugins/Predictions/AWSPredictionsPlugin/Dependency/AWSTranscribeStreamingBehavior.swift
@@ -5,9 +5,9 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
 import AWSTranscribeStreaming
+import Foundation
 
 protocol AWSTranscribeStreamingBehavior {
     func startStreamTranscription(

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/Date+EpochMillis.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/Date+EpochMillis.swift
@@ -9,6 +9,6 @@ import Foundation
 
 extension Date {
     var epochMilliseconds: UInt64 {
-        UInt64(self.timeIntervalSince1970 * 1_000)
+        UInt64(timeIntervalSince1970 * 1_000)
     }
 }
diff --git a/...ifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessFinalCientEvent.swift b/...ifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessFinalCientEvent.swift
@@ -24,9 +24,9 @@ public struct FinalClientEvent {
     let videoEndTimeStamp: UInt64
 }
 
-extension LivenessEvent where T == FinalClientEvent {
+public extension LivenessEvent where T == FinalClientEvent {
     @_spi(PredictionsFaceLiveness)
-    public static func final(event: FinalClientEvent) throws -> Self {
+    static func final(event: FinalClientEvent) throws -> Self {
 
         let clientEvent = ClientSessionInformationEvent(
             challenge: .init(

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessFreshnessEvent.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessFreshnessEvent.swift
@@ -24,9 +24,9 @@ public struct FreshnessEvent {
     }
 }
 
-extension LivenessEvent where T == FreshnessEvent {
+public extension LivenessEvent where T == FreshnessEvent {
     @_spi(PredictionsFaceLiveness)
-    public static func freshness(event: FreshnessEvent) throws -> Self {
+    static func freshness(event: FreshnessEvent) throws -> Self {
         let clientEvent = ClientSessionInformationEvent(
             challenge: .init(
                 faceMovementAndLightChallenge: .init(

diff --git a/...Plugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessInitialClientEvent.swift b/...Plugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessInitialClientEvent.swift
@@ -24,9 +24,9 @@ public struct InitialClientEvent {
     let videoStartTimestamp: UInt64
 }
 
-extension LivenessEvent where T == InitialClientEvent {
+public extension LivenessEvent where T == InitialClientEvent {
     @_spi(PredictionsFaceLiveness)
-    public static func initialFaceDetected(event: InitialClientEvent) throws -> Self {
+    static func initialFaceDetected(event: InitialClientEvent) throws -> Self {
         let initialFace = InitialFace(
             boundingBox: .init(boundingBox: event.initialFaceLocation.boundingBox),
             initialFaceDetectedTimeStamp: event.initialFaceLocation.startTimestamp

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessVideoEvent.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Events/LivenessVideoEvent.swift
@@ -18,9 +18,9 @@ public struct VideoEvent {
     }
 }
 
-extension LivenessEvent where T == VideoEvent {
+public extension LivenessEvent where T == VideoEvent {
     @_spi(PredictionsFaceLiveness)
-    public static func video(event: VideoEvent) throws -> Self {
+    static func video(event: VideoEvent) throws -> Self {
         let clientEvent = LivenessVideoEvent(
             timestampMillis: event.timestamp,
             videoChunk: event.chunk

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Model/DTOMapping.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/Model/DTOMapping.swift
@@ -40,7 +40,7 @@ func ovalChallenge(from event: ServerSessionInformationEvent) -> FaceLivenessSes
 func colorChallenge(from event: ServerSessionInformationEvent) -> FaceLivenessSession.ColorChallenge {
     let displayColors = event.sessionInformation.challenge
         .faceMovementAndLightChallenge.colorSequences
-        .map({ color -> FaceLivenessSession.DisplayColor in
+        .map { color -> FaceLivenessSession.DisplayColor in
 
             let duration: Double
             let shouldScroll: Bool
@@ -71,7 +71,7 @@ func colorChallenge(from event: ServerSessionInformationEvent) -> FaceLivenessSe
                 duration: duration,
                 shouldScroll: shouldScroll
             )
-        })
+        }
     return .init(
         colors: displayColors
     )

diff --git a/...ins/Predictions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+BoundingBox.swift b/...ins/Predictions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+BoundingBox.swift
@@ -8,9 +8,9 @@
 import Foundation
 
 // swiftlint:disable identifier_name
-extension FaceLivenessSession {
+public extension FaceLivenessSession {
     @_spi(PredictionsFaceLiveness)
-    public struct BoundingBox: Codable {
+    struct BoundingBox: Codable {
         public let x: Double
         public let y: Double
         public let width: Double

diff --git a/.../Predictions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+ColorChallenge.swift b/.../Predictions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+ColorChallenge.swift
@@ -7,9 +7,9 @@
 
 import Foundation
 
-extension FaceLivenessSession {
+public extension FaceLivenessSession {
     @_spi(PredictionsFaceLiveness)
-    public struct ColorChallenge {
+    struct ColorChallenge {
         public let colors: [DisplayColor]
 
         public init(colors: [DisplayColor]) {
@@ -18,9 +18,9 @@ extension FaceLivenessSession {
     }
 }
 // swiftlint:disable identifier_name
-extension FaceLivenessSession {
+public extension FaceLivenessSession {
     @_spi(PredictionsFaceLiveness)
-    public struct DisplayColor {
+    struct DisplayColor {
         public let rgb: RGB
         public let duration: Double
         public let shouldScroll: Bool
@@ -33,7 +33,7 @@ extension FaceLivenessSession {
     }
 
     @_spi(PredictionsFaceLiveness)
-    public struct RGB {
+    struct RGB {
         public let _values: [Int]
         public let red: Double
         public let green: Double

diff --git a/...dictions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+OvalMatchChallenge.swift b/...dictions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+OvalMatchChallenge.swift
@@ -7,9 +7,9 @@
 
 import Foundation
 
-extension FaceLivenessSession {
+public extension FaceLivenessSession {
     @_spi(PredictionsFaceLiveness)
-    public struct OvalMatchChallenge {
+    struct OvalMatchChallenge {
         public let faceDetectionThreshold: Double
         public let face: Face
         public let oval: Oval
@@ -22,9 +22,9 @@ extension FaceLivenessSession {
     }
 }
 
-extension FaceLivenessSession.OvalMatchChallenge {
+public extension FaceLivenessSession.OvalMatchChallenge {
     @_spi(PredictionsFaceLiveness)
-    public struct Face {
+    struct Face {
         public let distanceThreshold: Double
         public let distanceThresholdMax: Double
         public let distanceThresholdMin: Double
@@ -47,9 +47,9 @@ extension FaceLivenessSession.OvalMatchChallenge {
     }
 }
 
-extension FaceLivenessSession.OvalMatchChallenge {
+public extension FaceLivenessSession.OvalMatchChallenge {
     @_spi(PredictionsFaceLiveness)
-    public struct Oval {
+    struct Oval {
         public let boundingBox: FaceLivenessSession.BoundingBox
         public let heightWidthRatio: Double
         public let iouThreshold: Double

diff --git a/...ctions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+SessionConfiguration.swift b/...ctions/AWSPredictionsPlugin/Liveness/Model/FaceLivenessSession+SessionConfiguration.swift
@@ -7,9 +7,9 @@
 
 import Foundation
 
-extension FaceLivenessSession {
+public extension FaceLivenessSession {
     @_spi(PredictionsFaceLiveness)
-    public struct SessionConfiguration {
+    struct SessionConfiguration {
         public let colorChallenge: ColorChallenge
         public let ovalMatchChallenge: OvalMatchChallenge
 

diff --git a/...Plugins/Predictions/AWSPredictionsPlugin/Liveness/SPI/AWSPredictionsPlugin+Liveness.swift b/...Plugins/Predictions/AWSPredictionsPlugin/Liveness/SPI/AWSPredictionsPlugin+Liveness.swift
@@ -5,13 +5,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
 import AWSPluginsCore
+import Foundation
 
-extension AWSPredictionsPlugin {
+public extension AWSPredictionsPlugin {
     @_spi(PredictionsFaceLiveness)
-    public static func startFaceLivenessSession(
+    static func startFaceLivenessSession(
         withID sessionID: String,
         credentialsProvider: AWSCredentialsProvider? = nil,
         region: String,
@@ -45,9 +45,9 @@ extension AWSPredictionsPlugin {
     }
 }
 
-extension FaceLivenessSession {
+public extension FaceLivenessSession {
     @_spi(PredictionsFaceLiveness)
-    public struct Options {
+    struct Options {
         public init() {}
     }
 }

diff --git a/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/SPI/LivenessCredentials.swift b/AmplifyPlugins/Predictions/AWSPredictionsPlugin/Liveness/SPI/LivenessCredentials.swift
@@ -5,14 +5,14 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-import Foundation
 import Amplify
 import AWSPluginsCore
+import Foundation
 
 func credential(from credentialsProvider: AWSCredentialsProvider?) async throws -> SigV4Signer.Credential {
     let credentials: AWSCredentials
 
-    if let credentialsProvider = credentialsProvider {
+    if let credentialsProvider {
         let providedCredentials = try await credentialsProvider.fetchAWSCredentials()
         credentials = providedCredentials
     } else {