Merge pull request #60 from SunburstEnzo/demoapp-listmodels

Add models example to Demo app

Demo/App/APIProvidedView.swift

@@ -12,6 +12,7 @@ import SwiftUI
 struct APIProvidedView: View {
     @Binding var apiKey: String
     @StateObject var chatStore: ChatStore
+    @StateObject var miscStore: MiscStore
     @State var isShowingAPIConfigModal: Bool = true
 
     @Environment(\.idProviderValue) var idProvider
@@ -28,11 +29,17 @@ struct APIProvidedView: View {
                 idProvider: idProvider
             )
         )
+        self._miscStore = StateObject(
+            wrappedValue: MiscStore(
+                openAIClient: OpenAI(apiToken: apiKey.wrappedValue)
+            )
+        )
     }
 
     var body: some View {
         ContentView(
-            chatStore: chatStore
+            chatStore: chatStore,
+            miscStore: miscStore
         )
         .onChange(of: apiKey) { newApiKey in
             chatStore.openAIClient = OpenAI(apiToken: newApiKey)

Demo/App/ContentView.swift

@@ -11,6 +11,7 @@ import SwiftUI
 
 struct ContentView: View {
     @ObservedObject var chatStore: ChatStore
+    @ObservedObject var miscStore: MiscStore
     @State private var selectedTab = 0
     @Environment(\.idProviderValue) var idProvider
 
@@ -37,6 +38,14 @@ struct ContentView: View {
                 Label("Image", systemImage: "photo")
             }
             .tag(2)
+
+            MiscView(
+                store: miscStore
+            )
+            .tabItem {
+                Label("Misc", systemImage: "ellipsis")
+            }
+            .tag(3)
         }
     }
 }

Demo/DemoChat/Sources/ChatStore.swift

@@ -1,5 +1,5 @@
 //
-//  Store.swift
+//  ChatStore.swift
 //  DemoChat
 //
 //  Created by Sihao Lu on 3/25/23.

Demo/DemoChat/Sources/MiscStore.swift

@@ -0,0 +1,32 @@
+//
+//  MiscStore.swift
+//  DemoChat
+//
+//  Created by Aled Samuel on 22/04/2023.
+//
+
+import Foundation
+import OpenAI
+
+public final class MiscStore: ObservableObject {
+    public var openAIClient: OpenAIProtocol
+
+    @Published var availableModels: [ModelResult] = []
+
+    public init(
+        openAIClient: OpenAIProtocol
+    ) {
+        self.openAIClient = openAIClient
+    }
+
+    @MainActor
+    func getModels() async {
+        do {
+            let response = try await openAIClient.models()
+            availableModels = response.data
+        } catch {
+            // TODO: Better error handling
+            print(error.localizedDescription)
+        }
+    }
+}

Demo/DemoChat/Sources/UI/Environment/IDProvider.swift

@@ -1,6 +1,6 @@
 //
 //  IDProvider.swift
-//  
+//  DemoChat
 //
 //  Created by Sihao Lu on 4/6/23.
 //

Demo/DemoChat/Sources/UI/Misc/ListModelsView.swift

@@ -0,0 +1,27 @@
+//
+//  ListModelsView.swift
+//  DemoChat
+//
+//  Created by Aled Samuel on 22/04/2023.
+//
+
+import SwiftUI
+
+public struct ListModelsView: View {
+    @ObservedObject var store: MiscStore
+
+    public var body: some View {
+        NavigationStack {
+            List($store.availableModels) { row in
+                Text(row.id)
+            }
+            .listStyle(.insetGrouped)
+            .navigationTitle("Models")
+        }
+        .onAppear {
+            Task {
+                await store.getModels()
+            }
+        }
+    }
+}

Demo/DemoChat/Sources/UI/Misc/MiscView.swift

@@ -0,0 +1,36 @@
+//
+//  MiscView.swift
+//  DemoChat
+//
+//  Created by Aled Samuel on 22/04/2023.
+//
+
+import SwiftUI
+
+public struct MiscView: View {
+    @ObservedObject var store: MiscStore
+
+    public init(store: MiscStore) {
+        self.store = store
+    }
+
+    public var body: some View {
+        NavigationStack {
+            List {
+                Section(header: Text("Models")) {
+                    NavigationLink("List Models", destination: ListModelsView(store: store))
+                    NavigationLink("Retrieve Model", destination: RetrieveModelView())
+                }
+            }
+            .listStyle(.insetGrouped)
+            .navigationTitle("Misc")
+        }
+    }
+}
+
+struct RetrieveModelView: View {
+    var body: some View {
+        Text("Retrieve Model: TBD")
+            .font(.largeTitle)
+    }
+}

Sources/OpenAI/Public/Models/Models/ModelResult.swift

@@ -19,3 +19,5 @@ public struct ModelResult: Codable, Equatable {
         case ownedBy = "owned_by"
     }
 }
+
+extension ModelResult: Identifiable {}