💚 End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Hide image picker for text-only models
setalp98c2d54537fc
diff --git a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatInputBar.kt b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatInputBar.ktindex 9c403e57bb..b54de38b48 100644--- a/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatInputBar.kt+++ b/android/apps/ensu/app/src/main/java/io/ente/ensu/chat/ChatInputBar.kt@@ -259,27 +259,29 @@ internal fun MessageInput(modifier = Modifier.fillMaxWidth(),verticalAlignment = Alignment.CenterVertically,) {- IconButton(- onClick = {- haptic.perform(HapticFeedbackType.TextHandleMove)- onAttachmentSelected(AttachmentType.Image)- },- enabled =- editingMessage == null &&- supportsImageAttachments &&- !isGenerating &&- !isDownloading &&- !isImageAttachmentLimitReached,- modifier = Modifier.size(width = 32.dp, height = 36.dp),- ) {- Icon(- painterResource(HugeIcons.ImagePlusIcon),- contentDescription = "Add photos",- modifier = Modifier.size(composerIconSize),- )- }+ if (supportsImageAttachments) {+ IconButton(+ onClick = {+ haptic.perform(HapticFeedbackType.TextHandleMove)+ onAttachmentSelected(AttachmentType.Image)+ },+ enabled =+ editingMessage == null &&+ supportsImageAttachments &&+ !isGenerating &&+ !isDownloading &&+ !isImageAttachmentLimitReached,+ modifier = Modifier.size(width = 32.dp, height = 36.dp),+ ) {+ Icon(+ painterResource(HugeIcons.ImagePlusIcon),+ contentDescription = "Add photos",+ modifier = Modifier.size(composerIconSize),+ )+ }- Spacer(modifier = Modifier.width(EnsuSpacing.xs.dp))+ Spacer(modifier = Modifier.width(EnsuSpacing.xs.dp))+ }BasicTextField(value = fieldValue,diff --git a/apple/apps/ensu/Ensu/Chat/MessageInputView.swift b/apple/apps/ensu/Ensu/Chat/MessageInputView.swiftindex e765195ccd..17f78d90bd 100644--- a/apple/apps/ensu/Ensu/Chat/MessageInputView.swift+++ b/apple/apps/ensu/Ensu/Chat/MessageInputView.swift@@ -122,31 +122,33 @@ struct MessageInputView: View {}HStack(alignment: .bottom, spacing: EnsuSpacing.xs) {- ActionButton(- icon: "ImagePlusIcon", tooltip: "Add photos",- color: EnsuColor.textPrimary, size: 32- ) {- dismissInput()- showPhotos = true- }- .disabled(- editingMessage != nil || !supportsImageAttachments- || isGenerating || isSendPending || isDownloading- || isImageAttachmentLimitReached- )- .photosPicker(- isPresented: $showPhotos, selection: $selectedPhotoItem,- matching: .images- )- .onChange(of: selectedPhotoItem) { item in- guard let item, !isImageAttachmentLimitReached else {- selectedPhotoItem = nil; return+ if supportsImageAttachments {+ ActionButton(+ icon: "ImagePlusIcon", tooltip: "Add photos",+ color: EnsuColor.textPrimary, size: 32+ ) {+ dismissInput()+ showPhotos = true}- Task {- let data = try? await item.loadTransferable(type: Data.self)- await MainActor.run {- if let data { onAddImage(data, nil) }- selectedPhotoItem = nil+ .disabled(+ editingMessage != nil || !supportsImageAttachments+ || isGenerating || isSendPending || isDownloading+ || isImageAttachmentLimitReached+ )+ .photosPicker(+ isPresented: $showPhotos, selection: $selectedPhotoItem,+ matching: .images+ )+ .onChange(of: selectedPhotoItem) { item in+ guard let item, !isImageAttachmentLimitReached else {+ selectedPhotoItem = nil; return+ }+ Task {+ let data = try? await item.loadTransferable(type: Data.self)+ await MainActor.run {+ if let data { onAddImage(data, nil) }+ selectedPhotoItem = nil+ }}}}diff --git a/web/apps/ensu/src/pages/chat.tsx b/web/apps/ensu/src/pages/chat.tsxindex e507ed2863..50735d02e4 100644--- a/web/apps/ensu/src/pages/chat.tsx+++ b/web/apps/ensu/src/pages/chat.tsx@@ -576,6 +576,9 @@ const Page: React.FC = () => {ResolvedModelPreset[] | null>(null);const [selectedModelId, setSelectedModelId] = useState("");+ const [imageAttachmentModelId, setImageAttachmentModelId] = useState<+ string | null+ >(null);const [contextLength, setContextLength] = useState("");const [systemPrompt, setSystemPrompt] = useState(DEFAULT_CHAT_SYSTEM_PROMPT_BODY,@@ -1683,7 +1686,8 @@ const Page: React.FC = () => {const drawerWidth = isSmall ? 300 : drawerCollapsed ? 0 : 320;const desktopBreakpoint = theme.breakpoints.values.lg;const isDesktopOverlay = !isSmall && chatViewportWidth >= desktopBreakpoint;- const showImageAttachment = isTauriRuntime;+ const showImageAttachment =+ isTauriRuntime && imageAttachmentModelId === selectedModelId;const showDownloadProgress =!!downloadStatus?.status && downloadStatus.status !== "Ready";const showModelGate =@@ -2173,6 +2177,9 @@ const Page: React.FC = () => {const availability =await provider.checkModelAvailability(settings);if (!isCurrentRequest()) return;+ setImageAttachmentModelId(+ availability.model.mmprojUrl ? (settings.modelId ?? "") : null,+ );const mmprojReady =availability.mmprojAvailable === undefined ||availability.mmprojAvailable;@@ -2240,7 +2247,11 @@ const Page: React.FC = () => {downloadIfMissing: true,});if (!isCurrentRequest()) return;- setLoadedModelName(provider.getCurrentModel()?.name ?? null);+ const model = provider.getCurrentModel();+ setImageAttachmentModelId(+ model?.mmprojUrl ? (settings.modelId ?? "") : null,+ );+ setLoadedModelName(model?.name ?? null);setIsDownloading(false);setDownloadStatus({ percent: 100, status: "Ready" });setModelGateStatus("ready");@@ -4742,7 +4753,7 @@ const Page: React.FC = () => {: "Loading sources for this chat…": undefined}- showAttachmentPicker={isTauriRuntime}+ showAttachmentPicker={showImageAttachment}openPhotoPicker={openPhotoPicker}showImageAttachment={showImageAttachment}isImageAttachmentLimitReached={