backend: renaming

Author: monadierickx

backend/Package.swift

@@ -21,35 +21,35 @@ let package = Package(
         .executableTarget(
             name: "App",
             dependencies: [
-                .target(name: "SwiftBedrockService"),
+                .target(name: "BedrockService"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 .product(name: "Hummingbird", package: "hummingbird"),
             ],
             path: "Sources/App"
         ),
         .target(
-            name: "SwiftBedrockService",
+            name: "BedrockService",
             dependencies: [
-                .target(name: "SwiftBedrockTypes"),
+                .target(name: "BedrockTypes"),
                 .product(name: "AWSClientRuntime", package: "aws-sdk-swift"),
                 .product(name: "AWSBedrock", package: "aws-sdk-swift"),
                 .product(name: "AWSBedrockRuntime", package: "aws-sdk-swift"),
                 .product(name: "Smithy", package: "smithy-swift"),
                 .product(name: "Logging", package: "swift-log"),
             ],
-            path: "Sources/SwiftBedrockService"
+            path: "Sources/BedrockService"
         ),
         .target(
-            name: "SwiftBedrockTypes",
-            path: "Sources/SwiftBedrockTypes"
+            name: "BedrockTypes",
+            path: "Sources/BedrockTypes"
         ),
         .testTarget(
-            name: "SwiftBedrockServiceTests",
+            name: "BedrockServiceTests",
             dependencies: [
-                .target(name: "SwiftBedrockService"),
+                .target(name: "BedrockService"),
                 .product(name: "Testing", package: "swift-testing"),
             ],
-            path: "Tests/SwiftBedrockServiceTests"
+            path: "Tests/BedrockServiceTests"
         ),
         // .testTarget(name: "AppTests",
         //     dependencies: [

backend/Sources/App/Application+build.swift

@@ -15,8 +15,8 @@
 
 import Hummingbird
 import Logging
-import SwiftBedrockService
-import SwiftBedrockTypes
+import BedrockService
+import BedrockTypes
 
 /// Application arguments protocol. We use a protocol so we can call
 /// `buildApplication` inside Tests as well as in the App executable.
@@ -75,7 +75,7 @@ func buildRouter(useSSO: Bool, logger: Logger) async throws -> Router<AppRequest
     }
 
     // SwiftBedrock
-    let bedrock = try await SwiftBedrock(useSSO: useSSO)
+    let bedrock = try await BedrockService(useSSO: useSSO)
 
     // List models
     // GET /foundation-models lists all models

backend/Sources/App/Types/Chat.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import Hummingbird
-import SwiftBedrockTypes
+import BedrockTypes
 
 extension Message: ResponseCodable {}
 

backend/Sources/App/Types/ImageGeneration.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import Hummingbird
-import SwiftBedrockTypes
+import BedrockTypes
 
 extension ImageGenerationOutput: ResponseCodable {}
 

backend/Sources/App/Types/ListModels.swift

@@ -15,6 +15,6 @@
 
 import Foundation
 import Hummingbird
-import SwiftBedrockService
+import BedrockService
 
 extension ModelSummary: ResponseEncodable {}

backend/Sources/App/Types/TextGeneration.swift

@@ -15,7 +15,7 @@
 
 import Foundation
 import Hummingbird
-import SwiftBedrockTypes
+import BedrockTypes
 
 extension TextCompletion: ResponseCodable {}
 

backend/Sources/SwiftBedrockService/Converse/ConverseRequest.swift renamed to backend/Sources/BedrockService/Converse/ConverseRequest.swift

@@ -15,7 +15,7 @@
 
 @preconcurrency import AWSBedrockRuntime
 import Foundation
-import SwiftBedrockTypes
+import BedrockTypes
 
 public struct ConverseRequest {
     let model: BedrockModel

backend/Sources/SwiftBedrockService/Converse/ConverseResponse.swift renamed to backend/Sources/BedrockService/Converse/ConverseResponse.swift

@@ -15,14 +15,14 @@
 
 @preconcurrency import AWSBedrockRuntime
 import Foundation
-import SwiftBedrockTypes
+import BedrockTypes
 
 public struct ConverseResponse {
     let message: Message
 
     public init(_ output: BedrockRuntimeClientTypes.ConverseOutput) throws {
         guard case .message(let sdkMessage) = output else {
-            throw SwiftBedrockError.invalidSDKResponse("Could not extract message from ConverseOutput")
+            throw BedrockServiceError.invalidSDKResponse("Could not extract message from ConverseOutput")
         }
         self.message = try Message(from: sdkMessage)
     }

backend/Sources/SwiftBedrockService/Converse/ConversionExtensions.swift renamed to backend/Sources/BedrockService/Converse/ConversionExtensions.swift

@@ -15,16 +15,16 @@
 
 @preconcurrency import AWSBedrockRuntime
 import Foundation
-import SwiftBedrockTypes
+import BedrockTypes
 
 extension Message {
 
     init(from sdkMessage: BedrockRuntimeClientTypes.Message) throws {
         guard let sdkRole = sdkMessage.role else {
-            throw SwiftBedrockError.decodingError("Could not extract role from BedrockRuntimeClientTypes.Message")
+            throw BedrockServiceError.decodingError("Could not extract role from BedrockRuntimeClientTypes.Message")
         }
         guard let sdkContent = sdkMessage.content else {
-            throw SwiftBedrockError.decodingError("Could not extract content from BedrockRuntimeClientTypes.Message")
+            throw BedrockServiceError.decodingError("Could not extract content from BedrockRuntimeClientTypes.Message")
         }
         let content: [Content] = try sdkContent.map { try Content(from: $0) }
         self = Message(from: try Role(from: sdkRole), content: content)
@@ -49,11 +49,11 @@ extension Content {
         case .text(let text):
             self = .text(text)
         case .sdkUnknown(let unknownContentBlock):
-            throw SwiftBedrockError.notImplemented(
+            throw BedrockServiceError.notImplemented(
                 "ContentBlock \(unknownContentBlock) is not implemented by BedrockRuntimeClientTypes"
             )
         default:
-            throw SwiftBedrockError.notImplemented(
+            throw BedrockServiceError.notImplemented(
                 "\(sdkContentBlock.self) is not implemented by this library"
             )
         }
@@ -73,7 +73,7 @@ extension Role {
         case .user: self = .user
         case .assistant: self = .assistant
         case .sdkUnknown(let unknownRole):
-            throw SwiftBedrockError.notImplemented(
+            throw BedrockServiceError.notImplemented(
                 "Role \(unknownRole) is not implemented by BedrockRuntimeClientTypes"
             )
         }

backend/Sources/SwiftBedrockService/InvokeModel/InvokeModelRequest.swift renamed to backend/Sources/BedrockService/InvokeModel/InvokeModelRequest.swift

@@ -15,7 +15,7 @@
 
 @preconcurrency import AWSBedrockRuntime
 import Foundation
-import SwiftBedrockTypes
+import BedrockTypes
 
 struct InvokeModelRequest {
     let model: BedrockModel
@@ -43,7 +43,7 @@ struct InvokeModelRequest {
     ///   - maxTokens: Maximum number of tokens to generate (default: 300)
     ///   - temperature: Temperature for text generation (default: 0.6)
     /// - Returns: A configured BedrockRequest for a text request
-    /// - Throws: SwiftBedrockError if the model doesn't support text output
+    /// - Throws: BedrockServiceError if the model doesn't support text output
     static func createTextRequest(
         model: BedrockModel,
         prompt: String,
@@ -92,7 +92,7 @@ struct InvokeModelRequest {
     ///   - prompt: The text description of the image to generate
     ///   - nrOfImages: The number of images to generate
     /// - Returns: A configured BedrockRequest for image generation
-    /// - Throws: SwiftBedrockError if the model doesn't support text input or image output
+    /// - Throws: BedrockServiceError if the model doesn't support text input or image output
     public static func createTextToImageRequest(
         model: BedrockModel,
         prompt: String,
@@ -149,7 +149,7 @@ struct InvokeModelRequest {
     ///   - similarity: A value between 0 and 1 indicating how similar the variations should be to the source image
     ///   - nrOfImages: The number of image variations to generate
     /// - Returns: A configured BedrockRequest for image variation generation
-    /// - Throws: SwiftBedrockError if the model doesn't support text and image input, or image output
+    /// - Throws: BedrockServiceError if the model doesn't support text and image input, or image output
     public static func createImageVariationRequest(
         model: BedrockModel,
         prompt: String,
@@ -205,7 +205,7 @@ struct InvokeModelRequest {
 
     /// Creates an InvokeModelInput instance for making a request to Amazon Bedrock
     /// - Returns: A configured InvokeModelInput containing the model ID, content type, and encoded request body
-    /// - Throws: SwiftBedrockError.encodingError if the request body cannot be encoded to JSON
+    /// - Throws: BedrockServiceError.encodingError if the request body cannot be encoded to JSON
     public func getInvokeModelInput() throws -> InvokeModelInput {
         do {
             let jsonData: Data = try JSONEncoder().encode(self.body)
@@ -216,7 +216,7 @@ struct InvokeModelRequest {
                 modelId: model.id
             )
         } catch {
-            throw SwiftBedrockError.encodingError(
+            throw BedrockServiceError.encodingError(
                 "Something went wrong while encoding the request body to JSON for InvokeModelInput: \(error)"
             )
         }