Merge pull request #5 from laike9m/main

Fix build errors, set minimum target to macOS 13, specify the dependencies' versions

Author: jamesrochabrun

.swiftformat

@@ -0,0 +1 @@
+--disable all

Package.resolved

@@ -7,7 +7,7 @@ let package = Package(
     name: "PolyAI",
     platforms: [
          .iOS(.v15),
-         .macOS(.v14)
+         .macOS(.v13)
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
@@ -17,8 +17,8 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/jamesrochabrun/SwiftOpenAI", branch: "main"),
-        .package(url: "https://github.com/jamesrochabrun/SwiftAnthropic", branch: "main"),
+        .package(url: "https://github.com/jamesrochabrun/SwiftOpenAI", from: "4.0.6"),
+        .package(url: "https://github.com/jamesrochabrun/SwiftAnthropic", from: "2.1.3"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

Package.swift

@@ -97,7 +97,7 @@ Currently, the package supports OpenAI, Azure, Anthropic, Gemini, Groq, DeepSeek
 ```swift
 
 // OpenAI
-let openAIConfiguration: LLMConfiguration = .openAI(.api(key: "your_openai_api_key_here")
+let openAIConfiguration: LLMConfiguration = .openAI(.api(key: "your_openai_api_key_here"))
 
 // Gemini
 let geminiConfiguration: LLMConfiguration = .openAI(.gemini(apiKey: "your_gemini_api_key_here"))

README.md

@@ -11,26 +11,35 @@ import SwiftAnthropic
 // MARK: Anthropic
 
 extension MessageResponse: LLMMessageResponse {
-   
+   public var id: String? {
+      nil
+   }
+
+   public var model: String? {
+      nil
+   }
+
    public var createdAt: Int? {
       nil
    }
-   
+
    public var contentDescription: String {
       content.map { contentItem in
          switch contentItem {
-         case .text(let text, _):
+         case let .text(text, _):
             return text
-         case .toolUse(let toolUSe):
+         case let .toolUse(toolUSe):
             return "Tool: \(toolUSe.name)"
+         case .thinking:
+            return ""
          }
       }.first ?? ""
    }
-   
+
    public var usageMetrics: UsageMetrics {
       ChatUsageMetrics(inputTokens: usage.inputTokens ?? 0, outputTokens: usage.outputTokens, totalTokens: nil)
    }
-   
+
    public var tools: [ToolUsage] {
       []
    }

Sources/PolyAI/Interfaces/Response/Message/LLMMessageResponse+Anthropic.swift

@@ -1,6 +1,6 @@
 //
 //  LLMMessageResponse+OpenAI.swift
-//  
+//
 //
 //  Created by James Rochabrun on 4/15/24.
 //
@@ -11,24 +11,27 @@ import SwiftOpenAI
 // MARK: OpenAI
 
 extension ChatCompletionObject: LLMMessageResponse {
-   
    public var createdAt: Int? {
       created
    }
-   
+
    public var contentDescription: String {
-      choices.first?.message.content ?? ""
+      choices?.first?.message?.content ?? ""
    }
-   
+
    public var usageMetrics: UsageMetrics {
-      ChatUsageMetrics(inputTokens: usage?.promptTokens ?? 0, outputTokens: usage?.completionTokens ?? 0, totalTokens: usage?.totalTokens)
+      ChatUsageMetrics(
+         inputTokens: usage?.promptTokens ?? 0,
+         outputTokens: usage?.completionTokens ?? 0,
+         totalTokens: usage?.totalTokens ?? 0
+      )
    }
-   
+
    public var tools: [ToolUsage] {
       []
    }
-   
+
    public var role: String {
-      choices.first?.message.role ?? "unknown"
+      choices?.first?.message?.role ?? "unknown"
    }
 }

Sources/PolyAI/Interfaces/Response/Message/LLMMessageResponse+OpenAI.swift

@@ -12,10 +12,10 @@ import Foundation
 /// A protocol defining the required properties for a response from an LLM service.
 public protocol LLMMessageResponse {
    /// A unique identifier for the message.
-   var id: String { get }
+   var id: String? { get }
 
    /// The model of the LLM that processed the message.
-   var model: String { get }
+   var model: String? { get }
 
    /// The role associated with the message, such as "user" or "assistant".
    var role: String { get }

Sources/PolyAI/Interfaces/Response/Message/LLMMessageResponse.swift

@@ -11,8 +11,7 @@ import SwiftOpenAI
 // MARK: OpenAI
 
 extension ChatCompletionChunkObject: LLMMessageStreamResponse {
-   
    public var content: String? {
-      choices.first?.delta.content
+      choices?.first?.delta?.content
    }
 }