build-on-aws · sebsto · Aug 8, 2025 · Aug 8, 2025 · Aug 8, 2025 · Aug 8, 2025
diff --git a/.amazonq/rules/swift.md b/.amazonq/rules/swift.md
@@ -63,7 +63,10 @@ struct AddingTwoNumbersTests {
 
 }
 ```
-When asked to write unit tests, always prefer the new Swift testing framework over XCTest.
+
+Always use standard Swift 6 tools by preference. For example, 
+when asked to write unit tests, always prefer the new Swift testing framework over XCTest.
+When asked to format files, use swift format instead of swift-format.
 
 In general, prefer the use of Swift Concurrency (async/await, 
 actors, etc.) over tools like Dispatch or Combine, but if the 

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,7 +8,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Run tests
+      - name: Build
+        run: swift build --configuration release
+      - name: Tests
         run: swift test
 
   soundness:

diff --git a/Sources/BedrockModel.swift b/Sources/BedrockModel.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct BedrockModel: Hashable, Sendable, Equatable, RawRepresentable {
     public var rawValue: String { id }

diff --git a/Sources/BedrockService.swift b/Sources/BedrockService.swift
@@ -17,9 +17,14 @@
 @preconcurrency import AWSBedrockRuntime
 import AWSClientRuntime
 import AwsCommonRuntimeKit
-import Foundation
 import Logging
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 // for setenv and unsetenv functions
 #if os(Linux)
 import Glibc

diff --git a/Sources/BedrockServiceError.swift b/Sources/BedrockServiceError.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 //TODO: split in two structs : BedrockModelError and BedrockLibraryError
 public enum BedrockLibraryError: Error {

diff --git a/Sources/Converse/BedrockService+Converse.swift b/Sources/Converse/BedrockService+Converse.swift
@@ -15,7 +15,12 @@
 
 @preconcurrency import AWSBedrockRuntime
 import AwsCommonRuntimeKit
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

diff --git a/Sources/Converse/BedrockService+ConverseStreaming.swift b/Sources/Converse/BedrockService+ConverseStreaming.swift
@@ -15,7 +15,12 @@
 
 @preconcurrency import AWSBedrockRuntime
 import AwsCommonRuntimeKit
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

diff --git a/Sources/Converse/ContentBlocks/Content.swift b/Sources/Converse/ContentBlocks/Content.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public enum Content: Codable, CustomStringConvertible, Sendable {
     case text(String)

diff --git a/Sources/Converse/ContentBlocks/DocumentBlock.swift b/Sources/Converse/ContentBlocks/DocumentBlock.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct DocumentBlock: Codable, Sendable {
     public let name: String

diff --git a/Sources/Converse/ContentBlocks/DocumentToJSON.swift b/Sources/Converse/ContentBlocks/DocumentToJSON.swift
@@ -13,9 +13,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Smithy
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 // FIXME: avoid extensions on structs you do not control
 extension SmithyDocument {
     public func toJSON() throws -> JSON {

diff --git a/Sources/Converse/ContentBlocks/ImageBlock.swift b/Sources/Converse/ContentBlocks/ImageBlock.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct ImageBlock: Codable, Sendable {
     public let format: Format

diff --git a/Sources/Converse/ContentBlocks/JSON.swift b/Sources/Converse/ContentBlocks/JSON.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct JSON: Codable, @unchecked Sendable {  // FIXME: make Sendable
     public var value: Any?

diff --git a/Sources/Converse/ContentBlocks/JSONtoDocument.swift b/Sources/Converse/ContentBlocks/JSONtoDocument.swift
@@ -13,9 +13,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import Smithy
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 extension JSON {
     public func toDocument() throws -> Document {
         let encoder = JSONEncoder()

diff --git a/Sources/Converse/ContentBlocks/ReasoningBlock.swift b/Sources/Converse/ContentBlocks/ReasoningBlock.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct EncryptedReasoning: Codable, Sendable {
     public var reasoning: Data

diff --git a/Sources/Converse/ContentBlocks/S3Location.swift b/Sources/Converse/ContentBlocks/S3Location.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct S3Location: Codable, Sendable {
     public let bucketOwner: String?

diff --git a/Sources/Converse/ContentBlocks/ToolResultBlock.swift b/Sources/Converse/ContentBlocks/ToolResultBlock.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct ToolResultBlock: Codable, Sendable {
     public let id: String

diff --git a/Sources/Converse/ContentBlocks/ToolUseBlock.swift b/Sources/Converse/ContentBlocks/ToolUseBlock.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct ToolUseBlock: Codable, Sendable {
     public let id: String

diff --git a/Sources/Converse/ContentBlocks/VideoBlock.swift b/Sources/Converse/ContentBlocks/VideoBlock.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct VideoBlock: Codable, Sendable {
     public let format: Format

diff --git a/Sources/Converse/ConverseRequest.swift b/Sources/Converse/ConverseRequest.swift
@@ -14,9 +14,14 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
-import Foundation
 import Smithy
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 public struct ConverseRequest {
     let model: BedrockModel
     let messages: [Message]

diff --git a/Sources/Converse/ConverseRequestBuilder.swift b/Sources/Converse/ConverseRequestBuilder.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct ConverseRequestBuilder {
 

diff --git a/Sources/Converse/Message.swift b/Sources/Converse/Message.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct Message: Codable, CustomStringConvertible, Sendable {
 

diff --git a/Sources/Converse/Role.swift b/Sources/Converse/Role.swift
@@ -14,7 +14,12 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct Role: Codable, Sendable, Equatable, CustomStringConvertible {
     private enum RoleType: Codable, Sendable, Equatable {

diff --git a/Sources/Converse/Streaming/ConverseReplyStream.swift b/Sources/Converse/Streaming/ConverseReplyStream.swift
@@ -13,9 +13,14 @@
 //
 //===----------------------------------------------------------------------===//
 @preconcurrency import AWSBedrockRuntime
-import Foundation
 import Logging
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 public struct ConverseReplyStream: Sendable {
 
     private let logger: Logger

diff --git a/Sources/Converse/Tool.swift b/Sources/Converse/Tool.swift
@@ -14,9 +14,14 @@
 //===----------------------------------------------------------------------===//
 
 @preconcurrency import AWSBedrockRuntime
-import Foundation
 import Smithy
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
+import Foundation
+#endif
+
 public struct Tool: Codable, CustomStringConvertible {
     public let name: String
     public let inputSchema: JSON

diff --git a/Sources/InvokeModel/BedrockService+ImageParameterValidation.swift b/Sources/InvokeModel/BedrockService+ImageParameterValidation.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

diff --git a/Sources/InvokeModel/BedrockService+InvokeModelImage.swift b/Sources/InvokeModel/BedrockService+InvokeModelImage.swift
@@ -15,7 +15,12 @@
 
 @preconcurrency import AWSBedrockRuntime
 import AwsCommonRuntimeKit
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

diff --git a/Sources/InvokeModel/BedrockService+InvokeModelText.swift b/Sources/InvokeModel/BedrockService+InvokeModelText.swift
@@ -15,7 +15,12 @@
 
 @preconcurrency import AWSBedrockRuntime
 import AwsCommonRuntimeKit
+
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 extension BedrockService {
 

diff --git a/Sources/InvokeModel/ContentType.swift b/Sources/InvokeModel/ContentType.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public enum ContentType {
     case json

diff --git a/Sources/InvokeModel/ImageGenerationOutput.swift b/Sources/InvokeModel/ImageGenerationOutput.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct ImageGenerationOutput: Codable {
     public let images: [Data]

diff --git a/Sources/InvokeModel/ImageResolution.swift b/Sources/InvokeModel/ImageResolution.swift
@@ -13,7 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if canImport(FoundationEssentials)
+import FoundationEssentials
+#else
 import Foundation
+#endif
 
 public struct ImageResolution: Codable, Equatable, Sendable {
     public let width: Int