Update package

PreternaturalAI · Dec 11, 2024 · 939c487 · 939c487
1 parent ecf11cb
commit 939c487
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 1,124 deletions.
diff --git a/Package.swift b/Package.swift
@@ -18,19 +18,14 @@ let package = Package(
                 "CoreMI",
                 "LargeLanguageModels",
                 "Anthropic",
-                "Cohere",
                 "ElevenLabs",
                 "_Gemini",
                 "Groq",
                 "HuggingFace",
-                "Jina",
                 "Mistral",
                 "Ollama",
                 "OpenAI",
                 "Perplexity",
-                "XAI",
-                "TogetherAI",
-                "VoyageAI",
                 "AI",
             ]
         ),
@@ -40,6 +35,18 @@ let package = Package(
                 "Anthropic"
             ]
         ),
+        .library(
+            name: "Cohere",
+            targets: [
+                "Cohere"
+            ]
+        ),
+        .library(
+            name: "HumeAI",
+            targets: [
+                "HumeAI"
+            ]
+        ),
         .library(
             name: "OpenAI",
             targets: [
@@ -53,9 +60,21 @@ let package = Package(
             ]
         ),
         .library(
-            name: "XAI",
+            name: "Jina",
+            targets: [
+                "Jina"
+            ]
+        ),
+        .library(
+            name: "TogetherAI",
+            targets: [
+                "TogetherAI"
+            ]
+        ),
+        .library(
+            name: "VoyageAI",
             targets: [
-                "XAI"
+                "VoyageAI"
             ]
         )
     ],
@@ -242,22 +261,6 @@ let package = Package(
                 .enableExperimentalFeature("AccessLevelOnImport")
             ]
         ),
-        .target(
-            name: "XAI",
-            dependencies: [
-                "CorePersistence",
-                "CoreMI",
-                "LargeLanguageModels",
-                "OpenAI",
-                "Merge",
-                "NetworkKit",
-                "Swallow"
-            ],
-            path: "Sources/XAI",
-            swiftSettings: [
-                .enableExperimentalFeature("AccessLevelOnImport")
-            ]
-        ),
         .target(
             name: "Jina",
             dependencies: [
@@ -376,7 +379,6 @@ let package = Package(
                 "Ollama",
                 "OpenAI",
                 "Perplexity",
-                "XAI",
                 "PlayHT",
                 "Rime",
                 "Swallow",
@@ -443,17 +445,6 @@ let package = Package(
                 .enableExperimentalFeature("AccessLevelOnImport")
             ]
         ),
-        .testTarget(
-            name: "XAITests",
-            dependencies: [
-                "AI",
-                "Swallow"
-            ],
-            path: "Tests/XAI",
-            swiftSettings: [
-                .enableExperimentalFeature("AccessLevelOnImport")
-            ]
-        ),
         .testTarget(
             name: "PerplexityTests",
             dependencies: [

diff --git a/Sources/CoreMI/Intramodular/Service/CoreMI._ServiceClientProtocol.swift b/Sources/CoreMI/Intramodular/Service/CoreMI._ServiceClientProtocol.swift
@@ -7,7 +7,7 @@ import Swallow
 
 extension CoreMI {
     /// A client for an AI/ML service.
-    public protocol _ServiceClientProtocol: PersistentlyRepresentableType {
+    public protocol _ServiceClientProtocol: AnyObject, PersistentlyRepresentableType {
         init(account: (any CoreMI._ServiceAccountProtocol)?) async throws
     }
 

diff --git a/Sources/Ollama/Intramodular/Ollama.swift b/Sources/Ollama/Intramodular/Ollama.swift
@@ -86,7 +86,7 @@ extension Ollama: CoreMI._ServiceClientProtocol {
 
 }
 
-extension CoreMI._ServiceClientProtocol where Self == Ollama {
+extension PersistentlyRepresentableType where Self == Ollama {
     public init(
         account: (any CoreMI._ServiceAccountProtocol)?
     ) async throws {