ENG-2425

Package.swift

@@ -41,6 +41,12 @@ let package = Package(
                 "Anthropic"
             ]
         ),
+        .library(
+            name: "ElevenLabs",
+            targets: [
+                "ElevenLabs"
+            ]
+        ),
         .library(
             name: "HumeAI",
             targets: [
@@ -92,6 +98,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/vmanot/CorePersistence.git", branch: "main"),
+        .package(url: "https://github.com/vmanot/Media", branch: "main"),
         .package(url: "https://github.com/vmanot/Merge.git", branch: "master"),
         .package(url: "https://github.com/vmanot/NetworkKit.git", branch: "master"),
         .package(url: "https://github.com/vmanot/Swallow.git", branch: "master"),
@@ -115,7 +122,7 @@ let package = Package(
                 "Merge",
                 "NetworkKit",
                 "Swallow",
-                "SwiftUIX",
+                "SwiftUIX"
             ],
             path: "Sources/LargeLanguageModels",
             resources: [
@@ -191,7 +198,8 @@ let package = Package(
                 "LargeLanguageModels",
                 "Merge",
                 "NetworkKit",
-                "Swallow"
+                "Swallow",
+                "Media"
             ],
             path: "Sources/_Gemini",
             swiftSettings: [
@@ -392,6 +400,7 @@ let package = Package(
                 "Ollama",
                 "OpenAI",
                 "Swallow",
+                "NeetsAI",
             ],
             path: "Sources/AI",
             swiftSettings: [
@@ -563,6 +572,17 @@ let package = Package(
             swiftSettings: [
                 .enableExperimentalFeature("AccessLevelOnImport")
             ]
+        ),
+        .testTarget(
+            name: "TogetherAITests",
+            dependencies: [
+                "AI",
+                "Swallow"
+            ],
+            path: "Tests/TogetherAI",
+            swiftSettings: [
+                .enableExperimentalFeature("AccessLevelOnImport")
+            ]
         )
     ]
 )

Sources/AI/AnySpeechSynthesisRequestHandling.swift

@@ -0,0 +1,44 @@
+//
+//  AnySpeechSynthesisRequestHandling.swift
+//  AI
+//
+//  Created by Jared Davidson on 1/14/25.
+//
+
+import ElevenLabs
+import LargeLanguageModels
+import NeetsAI
+
+// FIXME: - (@archetapp) Is this the best place to put this file?
+
+public struct AnySpeechSynthesisRequestHandling: Hashable {
+    private let _hashValue: Int
+
+    public let base: any CoreMI._ServiceClientProtocol & SpeechSynthesisRequestHandling
+
+    public var displayName: String {
+        switch base {
+            case is ElevenLabs.Client:
+                return "ElevenLabs"
+            case is NeetsAI.Client:
+                return "NeetsAI"
+            default:
+                fatalError()
+        }
+    }
+
+    public init(
+        _ base: any CoreMI._ServiceClientProtocol & SpeechSynthesisRequestHandling
+    ) {
+        self.base = base
+        self._hashValue = ObjectIdentifier(base as AnyObject).hashValue
+    }
+
+    public static func == (lhs: AnySpeechSynthesisRequestHandling, rhs: AnySpeechSynthesisRequestHandling) -> Bool {
+        lhs._hashValue == rhs._hashValue
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(_hashValue)
+    }
+}

Sources/CoreMI/Intramodular/Foundation/CoreMI.RequestHandling.swift

@@ -3,6 +3,7 @@
 //
 
 import Foundation
+import SwallowMacrosClient
 
 extension CoreMI {
     /// A type that handles generative machine learning requests.
@@ -12,7 +13,10 @@
         /// `nil` if unknown.
         var _availableModels: [ModelIdentifier]? { get }
 
-        func consider<R: CoreMI.Request>(_ request: R) async throws -> CoreMI.RequestConsideration
+        @__unused_method
+        func consider<R: CoreMI.Request>(
+            _ request: R
+        ) async throws -> CoreMI.RequestConsideration
 
         func perform<Request: CoreMI.Request, Result: CoreMI.RequestResult>(
             _ request: Request,
@@ -36,7 +40,7 @@
         _ request: Request,
         returning resultType: Result.Type
     ) async throws -> Result {
-        fatalError()
+        fatalError(.unimplemented)
     }
 }
 

Sources/CoreMI/Intramodular/Model Identifier/ModelIdentifier.Provider.swift

@@ -28,72 +28,9 @@ extension ModelIdentifier {
         case _Rime
         case _HumeAI
         case _NeetsAI
+        case _xAI
 
         case unknown(String)
-
-        public static var apple: Self {
-            Self._Apple
-        }
-
-        public static var fal: Self {
-            self._Fal
-        }
-
-        public static var openAI: Self {
-            Self._OpenAI
-        }
-
-        public static var anthropic: Self {
-            Self._Anthropic
-        }
-
-        public static var groq: Self {
-            Self._Groq
-        }
-
-        public static var gemini: Self {
-            Self._Gemini
-        }
-
-        public static var perplexity: Self {
-            Self._Perplexity
-        }
-
-        public static var jina: Self {
-            Self._Jina
-        }
-
-        public static var voyageAI: Self {
-            Self._VoyageAI
-        }
-
-        public static var cohere: Self {
-            Self._Cohere
-        }
-
-        public static var elevenLabs: Self {
-            Self._ElevenLabs
-        }
-
-        public static var togetherAI: Self {
-            Self._TogetherAI
-        }
-
-        public static var playHT: Self {
-            Self._PlayHT
-        }
-
-        public static var rime: Self {
-            Self._Rime
-        }
-
-        public static var humeAI: Self {
-            self._HumeAI
-        }
-
-        public static var neetsAI: Self {
-            self._NeetsAI
-        }
     }
 }
 
@@ -138,6 +75,8 @@ extension ModelIdentifier.Provider: CustomStringConvertible {
                 return "HumeAI"
             case ._NeetsAI:
                 return "NeetsAI"
+            case ._xAI:
+                return "xAI"
             case .unknown(let provider):
                 return provider
         }
@@ -151,6 +90,8 @@ extension ModelIdentifier.Provider: RawRepresentable {
                 return "anthropic"
             case ._Apple:
                 return "apple"
+            case ._Cohere:
+                return "cohere"
             case ._Fal:
                 return "fal"
             case ._Mistral:
@@ -169,8 +110,6 @@ extension ModelIdentifier.Provider: RawRepresentable {
                 return "jina"
             case ._VoyageAI:
                 return "voyageAI"
-            case ._Cohere:
-                return "cohere"
             case ._ElevenLabs:
                 return "elevenlabs"
             case ._TogetherAI:
@@ -183,6 +122,8 @@ extension ModelIdentifier.Provider: RawRepresentable {
                 return "humeAI"
             case ._NeetsAI:
                 return "neetsAI"
+            case ._xAI:
+                return "xAI"
             case .unknown(let provider):
                 return provider
         }
@@ -194,36 +135,38 @@ extension ModelIdentifier.Provider: RawRepresentable {
                 self = ._Anthropic
             case Self._Apple.rawValue:
                 self = ._Apple
+            case Self._Cohere.rawValue:
+                self = ._Cohere
             case Self._Fal.rawValue:
                 self = ._Fal
-            case Self._Mistral.rawValue:
-                self = ._Mistral
+            case Self._ElevenLabs.rawValue:
+                self = ._ElevenLabs
             case Self._Groq.rawValue:
                 self = ._Groq
             case Self._OpenAI.rawValue:
                 self = ._OpenAI
             case Self._Gemini.rawValue:
                 self = ._Gemini
-            case Self._Perplexity.rawValue:
-                self = ._Perplexity
+            case Self._HumeAI.rawValue:
+                self = ._HumeAI
             case Self._Jina.rawValue:
                 self = ._Jina
-            case Self._VoyageAI.rawValue:
-                self = ._VoyageAI
-            case Self._Cohere.rawValue:
-                self = ._Cohere
-            case Self._ElevenLabs.rawValue:
-                self = ._ElevenLabs
-            case Self._TogetherAI.rawValue:
-                self = ._TogetherAI
+            case Self._Mistral.rawValue:
+                self = ._Mistral
+            case Self._NeetsAI.rawValue:
+                self = ._NeetsAI
+            case Self._Perplexity.rawValue:
+                self = ._Perplexity
             case Self._PlayHT.rawValue:
                 self = ._PlayHT
             case Self._Rime.rawValue:
                 self = ._Rime
-            case Self._HumeAI.rawValue:
-                self = ._HumeAI
-            case Self._NeetsAI.rawValue:
-                self = ._NeetsAI
+            case Self._TogetherAI.rawValue:
+                self = ._TogetherAI
+            case Self._VoyageAI.rawValue:
+                self = ._VoyageAI
+            case Self._xAI.rawValue:
+                self = ._xAI
             default:
                 self = .unknown(rawValue)
         }
@@ -239,3 +182,71 @@ extension ModelIdentifier.Provider: Codable {
         try rawValue.encode(to: encoder)
     }
 }
+
+// MARK: - Supplementary
+
+extension ModelIdentifier.Provider {
+    public static var apple: Self {
+        Self._Apple
+    }
+
+    public static var fal: Self {
+        self._Fal
+    }
+
+    public static var openAI: Self {
+        Self._OpenAI
+    }
+
+    public static var anthropic: Self {
+        Self._Anthropic
+    }
+
+    public static var groq: Self {
+        Self._Groq
+    }
+
+    public static var gemini: Self {
+        Self._Gemini
+    }
+
+    public static var perplexity: Self {
+        Self._Perplexity
+    }
+
+    public static var jina: Self {
+        Self._Jina
+    }
+
+    public static var voyageAI: Self {
+        Self._VoyageAI
+    }
+
+    public static var cohere: Self {
+        Self._Cohere
+    }
+
+    public static var elevenLabs: Self {
+        Self._ElevenLabs
+    }
+
+    public static var togetherAI: Self {
+        Self._TogetherAI
+    }
+
+    public static var playHT: Self {
+        Self._PlayHT
+    }
+
+    public static var rime: Self {
+        Self._Rime
+    }
+
+    public static var humeAI: Self {
+        self._HumeAI
+    }
+
+    public static var neetsAI: Self {
+        self._NeetsAI
+    }
+}