Merge pull request #161 from allenai/160-disclose-download-size

Add download disclosure and confirmation

OLMoE.swift/Constants/AppConstants.swift

@@ -12,5 +12,6 @@ enum AppConstants {
     enum Model {
         static let filename = "OLMoE-latest"
         static let downloadURL = "https://dolma-artifacts.org/app/\(filename).gguf"
+        static let playgroundURL = "https://playground.allenai.org/?model=olmoe-0125"
     }
 }

OLMoE.swift/Constants/Localizable.xcstrings

@@ -80,6 +80,12 @@
     },
     "Proceed With Mocked Model" : {
 
+    },
+    "Start Download" : {
+
+    },
+    "The model requires 4.21GB of storage space. Would you like to proceed with the download?" : {
+
     },
     "This device does not have the 8GB physical RAM required to run OLMoE locally." : {
 

OLMoE.swift/Extensions/DeviceSupport.swift

@@ -9,30 +9,19 @@
 import SwiftUI
 import os
 
+func deviceHasEnoughRam() -> Bool {
+    let requiredRAM: UInt64 = 6 * 1024 * 1024 * 1024
+    let totalRAM = ProcessInfo.processInfo.physicalMemory
+    print("Total RAM (GB)", totalRAM / (1024 * 1024 * 1024))
+    return totalRAM >= requiredRAM
+}
+
 // Device support check function
 func isDeviceSupported() -> Bool {
     #if targetEnvironment(simulator)
     return true
     #else
-    let deviceModel = UIDevice.current.modelName
-
-    // Model identifiers for devices with 8GB of RAM or more (iPhones and iPads)
-    let supportedModels = [
-        // iPhone models with 8GB RAM
-        "iPhone16,1", "iPhone16,2", // iPhone 15 Pro and Pro Max
-        "iPhone17,1", "iPhone17,2", "iPhone17,3", "iPhone17,4", // all iPhone 16 models
-
-        // iPad models with 8GB or more RAM
-        "iPad14,3", "iPad14,4", // iPad Pro 11" 4th Gen
-        "iPad14,5", "iPad14,6", // iPad Pro 12.9" 6th Gen
-        "iPad16,3", "iPad16,4", // iPad Pro 11" 5th Gen
-        "iPad16,5", "iPad16,6", // iPad Pro 12.9" 7th Gen
-        "iPad13,16", "iPad13,17", // iPad Air 5th Gen
-        "iPad14,8", "iPad14,9", // iPad Air 6th Gen
-        "iPad15,1", "iPad15,2", // Hypothetical future iPad models with 8GB RAM
-    ]
-
-    return supportedModels.contains(deviceModel)
+    return deviceHasEnoughRam()
     #endif
 }
 

OLMoE.swift/Views/InfoPageView.swift

@@ -16,46 +16,73 @@ struct InfoButton: View {
             Image(systemName: "info.circle")
                 .foregroundColor(Color("TextColor"))
         }
+        .buttonStyle(.plain)
         .clipShape(Circle())
-        .background(
-            RadialGradient(
-                gradient: Gradient(colors: [
-                    Color("BackgroundColor").opacity(0.9), Color.clear,
-                ]),
-                center: .center,
-                startRadius: 20,
-                endRadius: 40)
-        )
+        .background(Color.clear)
+    }
+}
+
+struct CloseButton: View {
+    let action: () -> Void
+
+    var body: some View {
+        Button(action: action) {
+            Image(systemName: "xmark.circle")
+                .font(.system(size: 20))
+                .frame(width: 40, height: 40)
+                .foregroundColor(Color("TextColor"))
+        }
+        .buttonStyle(.plain)
+        .clipShape(Circle())
+    }
+}
+
+struct InfoContent: View {
+    var body: some View {
+        VStack(alignment: .leading, spacing: 20) {
+            ForEach(InfoText.content) { text in
+                HeaderTextPairView(header: text.header, text: text.text)
+                    .padding([.horizontal], 12)
+            }
+        }
+        .padding([.bottom], 24)
     }
 }
 
 struct InfoView: View {
     @Binding var isPresented: Bool
 
     var body: some View {
+        #if targetEnvironment(macCatalyst)
+        VStack(spacing: 0) {
+            // Fixed header
+            HStack {
+                Spacer()
+                CloseButton(action: { isPresented = false })
+            }
+            .padding([.top, .horizontal], 12)
+
+            // Scrollable content
+            ScrollView {
+                InfoContent()
+            }
+        }
+        #else
         ScrollView {
             VStack(alignment: .leading, spacing: 20) {
                 HStack {
                     Spacer()
-                    Button(action: { isPresented = false }) {
-                        Image(systemName: "xmark.circle")
-                            .font(.system(size: 20))
-                            .frame(width: 40, height: 40)
-                            .foregroundColor(Color("TextColor"))
-                    }
-                    .clipShape(Circle())
+                    CloseButton(action: { isPresented = false })
                 }
 
-                ForEach(InfoText.content) { text in
-                    HeaderTextPairView(header: text.header, text: text.text)
-                        .padding([.horizontal], 12)
-                }
+                InfoContent()
             }
             .padding([.bottom], 24)
         }
+        #endif
     }
 }
 
 #Preview("InfoView") {
     InfoView(isPresented: .constant(true))
-}
+}

OLMoE.swift/Views/ModelDownloadView.swift

@@ -204,6 +204,7 @@ struct Ai2Logo: View {
 /// A view that displays the model download progress and status.
 struct ModelDownloadView: View {
     @StateObject private var downloadManager = BackgroundDownloadManager.shared
+    @State private var showDownloadConfirmation = false
 
     public var body: some View {
         ZStack {
@@ -248,8 +249,42 @@ struct ModelDownloadView: View {
                     Spacer()
                         .frame(height: 16)
 
-                    Button("Download Model", action: downloadManager.startDownload)
-                        .buttonStyle(.PrimaryButton)
+                    Button("Download Model") {
+                        showDownloadConfirmation = true
+                    }
+                    .buttonStyle(.PrimaryButton)
+                    .sheet(isPresented: $showDownloadConfirmation) {
+                        SheetWrapper {
+                            HStack {
+                                Spacer()
+                                CloseButton(action: { showDownloadConfirmation = false })
+                            }
+                            Spacer()
+                            VStack(spacing: 20) {
+                                Text("Download Model")
+                                    .font(.title())
+
+                                Text("The model requires 4.21GB of storage space. Would you like to proceed with the download?")
+                                    .multilineTextAlignment(.center)
+                                    .font(.body())
+
+                                VStack(spacing: 12) {
+                                    Button {
+                                        showDownloadConfirmation = false
+                                        downloadManager.startDownload()
+                                    } label: {
+                                        HStack {
+                                            Image(systemName: "arrow.down.circle.fill")
+                                            Text("Start Download")
+                                        }
+                                    }
+                                    .buttonStyle(.PrimaryButton)
+                                }
+                            }
+                                .padding()
+                            Spacer()
+                        }
+                    }
                 }
 
                 if let error = downloadManager.downloadError {

OLMoE.swift/Views/UnsupportedDeviceView.swift

@@ -59,7 +59,7 @@ struct UnsupportedDeviceView: View {
                     .sheet(isPresented: $showWebView, onDismiss: nil) {
                         SheetWrapper {
                             WebViewWithBanner(
-                                url: URL(string: "https://playground.allenai.org/?model=olmoe-0125")!,
+                                url: URL(string: AppConstants.Model.playgroundURL)!,
                                 onDismiss: { showWebView = false }
                             )
                         }