Update package

Package.swift

@@ -27,7 +27,8 @@ let package = Package(
         .library(
             name: "Gemini",
             targets: [
-                "Gemini"
+                "Gemini",
+                "GoogleGenerativeAI",
             ]
         ),
     ],
@@ -40,12 +41,20 @@ let package = Package(
             dependencies: [
                 "AI"
             ],
-            path: "Sources"
+            path: "Sources/GoogleAI"
+        ),
+        .target(
+            name: "GoogleGenerativeAI",
+            dependencies: [
+                "Gemini"
+            ],
+            path: "Sources/GoogleGenerativeAI"
         ),
         .testTarget(
             name: "GeminiTests",
             dependencies: [
-                "Gemini"
+                "Gemini",
+                "GoogleGenerativeAI",
             ],
             path: "Tests",
             resources: [

Sources/GoogleAI/Preternatural/Gemini+AbstractLLM.swift → Sources/GoogleAI/Preternatural/ModelContent+LargeLanguageModels.swift

@@ -3,6 +3,7 @@
 //
 
 @_spi(Internal) import LargeLanguageModels
+import FoundationX
 import Swallow
 import SwiftUIX
 
@@ -17,18 +18,28 @@ extension ModelContent {
 
         for component in messageContent.components {
             switch component.payload {
-            case .string(let string):
-                parts.append(.text(string))
-            case .image(let image):
-                if case .url(let url) = image {
-                    let (data, response) = try await URLSession.shared.data(from: url)
-                    let mimeType = response.mimeType ?? "image/png"
-                    parts.append(.data(mimetype: mimeType, data))
-                }
-            case .functionCall(_):
-                TODO.unimplemented
-            case .resultOfFunctionCall(_):
-                TODO.unimplemented
+                case .string(let string):
+                    parts.append(.text(string))
+                case .image(let image):
+                    switch image {
+                        case .url(let url): do {
+                            let (data, response) = try await URLSession.shared.data(from: url)
+                            let mimeType: String = response.mimeType ?? "image/png"
+
+                            parts.append(.data(mimetype: mimeType, data))
+                        }
+                        case .image(let image):
+                            let data: Data = try image.jpegData.unwrap()
+                            let mimeType: String = _MediaAssetFileType.jpeg.mimeType
+
+                            parts.append(.data(mimetype: mimeType, data))
+                        case .base64DataURL:
+                            TODO.unimplemented
+                    }
+                case .functionCall(_):
+                    TODO.unimplemented
+                case .resultOfFunctionCall(_):
+                    TODO.unimplemented
             }
         }
 

Sources/GoogleGenerativeAI/module.swift

@@ -0,0 +1,5 @@
+//
+// Copyright (c) Preternatural AI, Inc.
+//
+
+@_exported import Gemini

Tests/GoogleAITests/ChatTests.swift

@@ -14,6 +14,7 @@
 
 import Foundation
 @testable import Gemini
+@testable import GoogleGenerativeAI
 import XCTest
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *)

Tests/GoogleAITests/CodeExecutionTests.swift

@@ -14,6 +14,7 @@
 
 import XCTest
 
+@testable import Gemini
 @testable import GoogleGenerativeAI
 
 @available(iOS 15.0, macOS 11.0, macCatalyst 15.0, *)

Tests/GoogleAITests/GenerateContentRequestTests.swift

@@ -16,6 +16,7 @@ import Foundation
 import XCTest
 
 @testable import Gemini
+@testable import GoogleGenerativeAI
 
 @available(iOS 15.0, macOS 11.0, macCatalyst 15.0, *)
 final class GenerateContentRequestTests: XCTestCase {

Tests/GoogleAITests/GenerateContentResponseTests.swift

@@ -15,6 +15,7 @@
 import Foundation
 import XCTest
 
+@testable import Gemini
 @testable import GoogleGenerativeAI
 
 @available(iOS 15.0, macOS 11.0, macCatalyst 15.0, *)

Tests/GoogleAITests/GenerationConfigTests.swift

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import Foundation
-import Gemini
+import GoogleGenerativeAI
 import XCTest
 
 @available(iOS 15.0, macOS 11.0, macCatalyst 15.0, *)

Tests/GoogleAITests/GenerativeModelTests.swift

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 @testable import Gemini
+@testable import GoogleGenerativeAI
 import XCTest
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, *)

Tests/GoogleAITests/GoogleAITests.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Gemini
+import GoogleGenerativeAI
 import XCTest
 #if canImport(AppKit)
   import AppKit // For NSImage extensions.

Tests/GoogleAITests/JSONValueTests.swift

@@ -13,7 +13,7 @@
 // limitations under the License.
 import XCTest
 
-@testable import Gemini
+@testable import GoogleGenerativeAI
 
 final class JSONValueTests: XCTestCase {
   let decoder = JSONDecoder()

Tests/GoogleAITests/ModelContentTests.swift

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import Foundation
-import Gemini
+import GoogleGenerativeAI
 import XCTest
 
 @available(iOS 15.0, macOS 11.0, macCatalyst 15.0, *)

Tests/GoogleAITests/PartsRepresentableTests.swift

@@ -14,7 +14,7 @@
 
 import CoreGraphics
 import CoreImage
-import Gemini
+import GoogleGenerativeAI
 import XCTest
 #if canImport(UIKit)
   import UIKit

Tests/GoogleAITests/GoogleLLMRequestHandlingTests.swift → Tests/GoogleAITests/Preternatural/PreternaturalAI_Tests.swift

@@ -14,11 +14,11 @@
 
 import AI
 import Gemini
-import XCTest
 import SwiftUIX
+import XCTest
 
-final class GoogleLLMRequestHandlingTestCase: XCTestCase {
-    let client: any LLMRequestHandling = Gemini.Client(apiKey: "AIzaSyB-HamvuejgTbWm6gRy1Bb_PnCclMWUloc")
+final class PreternaturalAI_Tests: XCTestCase {
+    let client: any LLMRequestHandling = Gemini.Client(apiKey: "API_KEY")
 
     func testAvailableModels() {
         let models = client._availableModels
@@ -122,9 +122,17 @@ final class GoogleLLMRequestHandlingTestCase: XCTestCase {
             Remember to ALWAYS respond in accordance to the testing rules.
             """
 
-        let parameters: AbstractLLM.ChatCompletionParameters = .init()
+        let parameters = AbstractLLM.ChatCompletionParameters()
+        let imageConfiguration = AppKitOrUIKitImage.SymbolConfiguration(
+            pointSize: 64
+        )
+        let image = AppKitOrUIKitImage(
+            _SwiftUIX_systemName: "arrow.up",
+            withConfiguration: imageConfiguration.applying(.init(hierarchicalColor: .blue))
+        )!
+
+        image.backgroundColor = AppKitOrUIKitColor.white
 
-        let image = AppKitOrUIKitImage(systemSymbolName: "arrow.right", accessibilityDescription: nil)!
         let imageLiteral = try PromptLiteral(image: image)
 
         let messagesWithSystemPrompt: [AbstractLLM.ChatMessage] = [
@@ -148,7 +156,7 @@ final class GoogleLLMRequestHandlingTestCase: XCTestCase {
             let completion1: String = try await client.complete(
                 messagesWithSystemPrompt,
                 parameters: parameters,
-                model: Gemini.Model.gemini_1_5_flash,
+                model: Gemini.Model.gemini_2_0_flash_exp,
                 as: .string
             )
 
@@ -157,7 +165,7 @@ final class GoogleLLMRequestHandlingTestCase: XCTestCase {
             let completion2: String = try await client.complete(
                 messagesWithOutPrompt,
                 parameters: parameters,
-                model: Gemini.Model.gemini_1_5_flash,
+                model: Gemini.Model.gemini_2_0_flash_exp,
                 as: .string
             )