@lobehub/chat 0.148.2 → 0.148.3

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.148.3](https://github.com/lobehub/lobe-chat/compare/v0.148.2...v0.148.3)
+
+<sup>Released on **2024-04-21**</sup>
+
+#### 💄 Styles
+
+- **ollama**: Show size info while download, support cancel donwload, optimize calculation for speed.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **ollama**: Show size info while download, support cancel donwload, optimize calculation for speed, closes [#1664](https://github.com/lobehub/lobe-chat/issues/1664) ([9b18f47](https://github.com/lobehub/lobe-chat/commit/9b18f47))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.148.2](https://github.com/lobehub/lobe-chat/compare/v0.148.1...v0.148.2)
 
 <sup>Released on **2024-04-21**</sup>

package/locales/ar/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "إضافة عنوان وكيل OpenAI (اختياري)",
     "closeMessage": "إغلاق الرسالة",
     "confirm": "تأكيد وإعادة المحاولة",
-    "model": {
-      "Ollama": {
-        "confirm": "تحميل",
-        "description": "أدخل علامة نموذج Ollama الخاصة بك لاستكمال الجلسة",
-        "title": "تحميل نموذج Ollama المحدد"
-      }
-    },
     "oauth": {
       "description": "فتح المسؤول توثيق تسجيل الدخول الموحد، انقر فوق الزر أدناه لتسجيل الدخول وفتح التطبيق",
       "success": "تم تسجيل الدخول بنجاح",
       "title": "تسجيل الدخول إلى الحساب",
       "welcome": "مرحبا بك!"
     },
+    "ollama": {
+      "cancel": "إلغاء",
+      "confirm": "تأكيد",
+      "description": "أدخل علامة نموذج Ollama الخاصة بك لاستكمال الجلسة",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "بدء التحميل...",
+      "title": "تحميل نموذج Ollama المحدد"
+    },
     "password": {
       "description": "قام المسؤول بتشفير التطبيق، قم بإدخال كلمة مرور التطبيق لفتح التطبيق. يتعين إدخال كلمة المرور مرة واحدة فقط",
       "placeholder": "الرجاء إدخال كلمة المرور",

package/locales/bg-BG/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Добавете URL адрес на OpenAI прокси (по избор)",
     "closeMessage": "Затвори съобщението",
     "confirm": "Потвърди и опитай отново",
-    "model": {
-      "Ollama": {
-        "confirm": "Изтегли",
-        "description": "Въведете етикета на вашия модел Ollama, за да продължите с разговора",
-        "title": "Изтеглете посочения модел Ollama"
-      }
-    },
     "oauth": {
       "description": "Администраторът е активирал унифицирано удостоверяване за вход. Щракнете върху бутона по-долу, за да влезете и отключите приложението.",
       "success": "Входът е успешен",
       "title": "Влезте в акаунта си",
       "welcome": "Добре дошли!"
     },
+    "ollama": {
+      "cancel": "Отказ",
+      "confirm": "Изтегли",
+      "description": "Въведете етикета на вашия модел Ollama, за да продължите разговора",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Започване на изтеглянето...",
+      "title": "Изтегляне на определения модел Ollama"
+    },
     "password": {
       "description": "Криптирането на приложението е активирано от администратора. Въведете паролата за приложението, за да отключите приложението. Паролата трябва да бъде попълнена само веднъж.",
       "placeholder": "Моля, въведете парола",

package/locales/de-DE/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Fügen Sie die OpenAI-Proxy-URL hinzu (optional)",
     "closeMessage": "Hinweis schließen",
     "confirm": "Bestätigen und erneut versuchen",
-    "model": {
-      "Ollama": {
-        "confirm": "Herunterladen",
-        "description": "Geben Sie Ihre Ollama-Modellbezeichnung ein, um fortzufahren",
-        "title": "Bestimmtes Ollama-Modell herunterladen"
-      }
-    },
     "oauth": {
       "description": "Der Administrator hat die einheitliche Anmeldeauthentifizierung aktiviert. Klicken Sie unten auf die Schaltfläche, um sich anzumelden und die App zu entsperren.",
       "success": "Anmeldung erfolgreich",
       "title": "Anmelden",
       "welcome": "Willkommen!"
     },
+    "ollama": {
+      "cancel": "Abbrechen",
+      "confirm": "Herunterladen",
+      "description": "Geben Sie Ihre Ollama-Modellkennung ein, um fortzufahren",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Download startet...",
+      "title": "Bestimmtes Ollama-Modell herunterladen"
+    },
     "password": {
       "description": "Der Administrator hat die App-Verschlüsselung aktiviert. Gib das App-Passwort ein, um die App zu entsperren. Das Passwort muss nur einmal eingegeben werden.",
       "placeholder": "Passwort eingeben",

package/locales/en-US/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Add OpenAI proxy URL (optional)",
     "closeMessage": "Close message",
     "confirm": "Confirm and Retry",
-    "model": {
-      "Ollama": {
-        "confirm": "Download",
-        "description": "Enter your Ollama model label to proceed with the conversation",
-        "title": "Download specified Ollama model"
-      }
-    },
     "oauth": {
       "description": "The administrator has enabled unified login authentication. Click the button below to log in and unlock the application.",
       "success": "Login successful",
       "title": "Log in to your account",
       "welcome": "Welcome!"
     },
+    "ollama": {
+      "cancel": "Cancel Download",
+      "confirm": "Download",
+      "description": "Enter your Ollama model tag to proceed with the conversation",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Starting download...",
+      "title": "Download Specific Ollama Model"
+    },
     "password": {
       "description": "The application encryption has been enabled by the administrator. Enter the application password to unlock the application. The password only needs to be filled in once.",
       "placeholder": "Please enter password",

package/locales/es-ES/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Agregar URL de proxy de OpenAI (opcional)",
     "closeMessage": "Cerrar mensaje",
     "confirm": "Confirmar y volver a intentar",
-    "model": {
-      "Ollama": {
-        "confirm": "Descargar",
-        "description": "Ingresa las etiquetas de tu modelo Ollama para continuar la sesión",
-        "title": "Descargar el modelo Ollama especificado"
-      }
-    },
     "oauth": {
       "description": "El administrador ha habilitado la autenticación de inicio de sesión única. Haz clic en el botón a continuación para iniciar sesión y desbloquear la aplicación.",
       "success": "Inicio de sesión exitoso",
       "title": "Iniciar sesión",
       "welcome": "¡Bienvenido!"
     },
+    "ollama": {
+      "cancel": "Cancelar descarga",
+      "confirm": "Descargar",
+      "description": "Ingresa las etiquetas de tu modelo Ollama para continuar la sesión",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Iniciando descarga...",
+      "title": "Descargar modelo Ollama específico"
+    },
     "password": {
       "description": "El administrador ha activado el cifrado de la aplicación. Ingresa la contraseña de la aplicación para desbloquearla. La contraseña solo se necesita ingresar una vez",
       "placeholder": "Ingresa la contraseña",

package/locales/fr-FR/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Ajouter une adresse de proxy OpenAI (facultatif)",
     "closeMessage": "Fermer le message",
     "confirm": "Confirmer et réessayer",
-    "model": {
-      "Ollama": {
-        "confirm": "Télécharger",
-        "description": "Saisissez l'étiquette de votre modèle Ollama pour continuer la session",
-        "title": "Télécharger le modèle Ollama spécifié"
-      }
-    },
     "oauth": {
       "description": "L'administrateur a activé l'authentification de connexion unique. Cliquez sur le bouton ci-dessous pour vous connecter et déverrouiller l'application.",
       "success": "Connexion réussie",
       "title": "Se connecter",
       "welcome": "Bienvenue !"
     },
+    "ollama": {
+      "cancel": "Annuler le téléchargement",
+      "confirm": "Télécharger",
+      "description": "Entrez vos balises de modèle Ollama pour continuer la session",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Début du téléchargement...",
+      "title": "Télécharger le modèle Ollama spécifié"
+    },
     "password": {
       "description": "L'administrateur a activé le cryptage de l'application. Entrez le mot de passe de l'application pour déverrouiller. Le mot de passe ne doit être saisi qu'une seule fois.",
       "placeholder": "Entrez le mot de passe",

package/locales/it-IT/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Aggiungi URL del proxy OpenAI (opzionale)",
     "closeMessage": "Chiudi messaggio",
     "confirm": "Conferma e riprova",
-    "model": {
-      "Ollama": {
-        "confirm": "Scarica",
-        "description": "Inserisci l'etichetta del tuo modello Ollama per continuare la sessione",
-        "title": "Scarica il modello Ollama specificato"
-      }
-    },
     "oauth": {
       "description": "L'amministratore ha abilitato l'autenticazione di accesso unificata. Fai clic sul pulsante sottostante per accedere e sbloccare l'applicazione.",
       "success": "Accesso riuscito",
       "title": "Accedi all'account",
       "welcome": "Benvenuto!"
     },
+    "ollama": {
+      "cancel": "Annulla il download",
+      "confirm": "Scarica",
+      "description": "Inserisci l'etichetta del tuo modello Ollama per continuare la sessione",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Inizio download...",
+      "title": "Scarica il modello Ollama specificato"
+    },
     "password": {
       "description": "L'amministratore ha attivato la crittografia dell'applicazione. Inserisci la password dell'applicazione per sbloccarla. La password va inserita solo una volta.",
       "placeholder": "Inserisci la password",

package/locales/ja-JP/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "OpenAI 代理アドレスを追加する（オプション）",
     "closeMessage": "ヒントを閉じる",
     "confirm": "確認して再試行",
-    "model": {
-      "Ollama": {
-        "confirm": "ダウンロード",
-        "description": "Ollamaモデルのラベルを入力して、会話を続行してください",
-        "title": "指定のOllamaモデルをダウンロード"
-      }
-    },
     "oauth": {
       "description": "管理者が統一ログイン認証を有効にしました。下のボタンをクリックしてログインすると、アプリがロック解除されます。",
       "success": "ログインに成功しました",
       "title": "アカウントにログイン",
       "welcome": "ようこそ！"
     },
+    "ollama": {
+      "cancel": "キャンセル",
+      "confirm": "ダウンロード",
+      "description": "Ollamaモデルのタグを入力して、会話を続行してください",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "ダウンロードを開始しています...",
+      "title": "指定のOllamaモデルをダウンロード"
+    },
     "password": {
       "description": "管理者によってアプリが暗号化されました。アプリをロック解除するには、アプリのパスワードを入力してください。パスワードは1回だけ入力すればよいです",
       "placeholder": "パスワードを入力してください",

package/locales/ko-KR/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "OpenAI 프록시 주소 추가(선택 사항)",
     "closeMessage": "알림 닫기",
     "confirm": "확인 및 다시 시도",
-    "model": {
-      "Ollama": {
-        "confirm": "다운로드",
-        "description": "Ollama 모델 태그를 입력하여 세션을 계속할 수 있습니다.",
-        "title": "지정된 Ollama 모델 다운로드"
-      }
-    },
     "oauth": {
       "description": "관리자가 통합 로그인 인증을 활성화했습니다. 아래 버튼을 클릭하여 로그인하면 앱을 잠금 해제할 수 있습니다.",
       "success": "로그인 성공",
       "title": "계정 로그인",
       "welcome": "환영합니다!"
     },
+    "ollama": {
+      "cancel": "다운로드 취소",
+      "confirm": "다운로드",
+      "description": "Ollama 모델 태그를 입력하여 세션을 계속하세요.",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "다운로드 시작 중...",
+      "title": "지정된 Ollama 모델 다운로드"
+    },
     "password": {
       "description": "관리자가 애플리케이션 암호화를 활성화했습니다. 애플리케이션을 잠금 해제하려면 애플리케이션 비밀번호를 입력하십시오. 비밀번호는 한 번만 입력하면 됩니다.",
       "placeholder": "비밀번호를 입력하세요",

package/locales/nl-NL/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Voeg een optionele OpenAI-proxy-URL toe",
     "closeMessage": "Sluit bericht",
     "confirm": "Bevestigen en opnieuw proberen",
-    "model": {
-      "Ollama": {
-        "confirm": "Downloaden",
-        "description": "Voer je Ollama model tag in, voltooi om het gesprek voort te zetten",
-        "title": "Download het gespecificeerde Ollama model"
-      }
-    },
     "oauth": {
       "description": "De beheerder heeft een uniforme aanmeldingsverificatie ingeschakeld. Klik op de onderstaande knop om in te loggen en de app te ontgrendelen.",
       "success": "Succesvol ingelogd",
       "title": "Account inloggen",
       "welcome": "Welkom!"
     },
+    "ollama": {
+      "cancel": "Annuleren",
+      "confirm": "Bevestigen",
+      "description": "Voer uw Ollama-modeltag in om door te gaan met de sessie",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Downloaden begint...",
+      "title": "Specifiek Ollama-model downloaden"
+    },
     "password": {
       "description": "De beheerder heeft app-encryptie ingeschakeld. Voer het app-wachtwoord in om de app te ontgrendelen. Het wachtwoord hoeft slechts één keer te worden ingevoerd.",
       "placeholder": "Voer het wachtwoord in",

package/locales/pl-PL/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Dodaj adres proxy OpenAI (opcjonalnie)",
     "closeMessage": "Zamknij komunikat",
     "confirm": "Potwierdź i spróbuj ponownie",
-    "model": {
-      "Ollama": {
-        "confirm": "Pobierz",
-        "description": "Wprowadź etykietę modelu Ollama, aby kontynuować sesję.",
-        "title": "Pobierz określony model Ollama"
-      }
-    },
     "oauth": {
       "description": "Administrator włączył jednolite uwierzytelnianie logowania. Kliknij poniższy przycisk, aby się zalogować i odblokować aplikację.",
       "success": "Zalogowano pomyślnie",
       "title": "Zaloguj się",
       "welcome": "Witaj!"
     },
+    "ollama": {
+      "cancel": "Anuluj",
+      "confirm": "Potwierdź",
+      "description": "Wprowadź etykietę modelu Ollama, aby kontynuować sesję",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Rozpoczynanie pobierania...",
+      "title": "Pobierz określony model Ollama"
+    },
     "password": {
       "description": "Administrator włączył szyfrowanie aplikacji. Po wprowadzeniu hasła aplikacja zostanie odblokowana. Hasło należy wprowadzić tylko raz.",
       "placeholder": "Wprowadź hasło",

package/locales/pt-BR/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Adicionar URL de proxy OpenAI (opcional)",
     "closeMessage": "Fechar mensagem",
     "confirm": "Confirmar e tentar novamente",
-    "model": {
-      "Ollama": {
-        "confirm": "Baixar",
-        "description": "Digite as tags do seu modelo Ollama para continuar a sessão",
-        "title": "Baixar o modelo Ollama especificado"
-      }
-    },
     "oauth": {
       "description": "O administrador ativou a autenticação de login unificado. Clique no botão abaixo para fazer login e desbloquear o aplicativo.",
       "success": "Login bem-sucedido",
       "title": "Faça login na sua conta",
       "welcome": "Bem-vindo!"
     },
+    "ollama": {
+      "cancel": "Cancelar",
+      "confirm": "Confirmar",
+      "description": "Digite suas tags de modelo Ollama para continuar a sessão",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Iniciando download...",
+      "title": "Baixar modelo Ollama específico"
+    },
     "password": {
       "description": "O administrador ativou a criptografia do aplicativo. Insira a senha do aplicativo para desbloqueá-lo. A senha só precisa ser inserida uma vez.",
       "placeholder": "Insira a senha",

package/locales/ru-RU/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Добавить URL прокси-сервера OpenAI (необязательно)",
     "closeMessage": "Закрыть сообщение",
     "confirm": "Подтвердить и повторить попытку",
-    "model": {
-      "Ollama": {
-        "confirm": "Скачать",
-        "description": "Введите метку вашей модели Ollama, чтобы продолжить сеанс",
-        "title": "Скачать указанную модель Ollama"
-      }
-    },
     "oauth": {
       "description": "Администратор включил единую систему аутентификации. Нажмите кнопку ниже, чтобы войти и разблокировать приложение.",
       "success": "Успешный вход",
       "title": "Вход в аккаунт",
       "welcome": "Добро пожаловать!"
     },
+    "ollama": {
+      "cancel": "Отмена",
+      "confirm": "Подтвердить",
+      "description": "Введите метку вашей модели Ollama, чтобы продолжить разговор",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Начало загрузки...",
+      "title": "Загрузить указанную модель Ollama"
+    },
     "password": {
       "description": "Шифрование приложения включено администратором. Введите пароль приложения, чтобы разблокировать приложение. Пароль необходимо ввести только один раз.",
       "placeholder": "Введите пароль",

package/locales/tr-TR/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "OpenAI vekil adresi ekle (isteğe bağlı)",
     "closeMessage": "Mesajı kapat",
     "confirm": "Onayla ve Yeniden Dene",
-    "model": {
-      "Ollama": {
-        "confirm": "下载",
-        "description": "Ollama model etiketinizi girin ve devam etmek için tamamlayın",
-        "title": "Belirli Ollama modelini indir"
-      }
-    },
     "oauth": {
       "description": "Yönetici, tek oturum açma kimlik doğrulamasını etkinleştirdi. Aşağıdaki düğmeye tıklayarak giriş yapabilir ve uygulamayı kilidini açabilirsiniz.",
       "success": "Giriş başarılı",
       "title": "Hesaba giriş yap",
       "welcome": "Hoş geldiniz!"
     },
+    "ollama": {
+      "cancel": "İptal",
+      "confirm": "Onayla",
+      "description": "Ollama model etiketinizi girin ve sohbeti devam ettirmek için tamamlayın",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "İndirme başlıyor...",
+      "title": "Belirtilen Ollama modelini indir"
+    },
     "password": {
       "description": "Uygulama şifrelemesi yönetici tarafından etkinleştirilmiştir. Uygulamayı açmak için uygulama şifresini girin. Şifre sadece bir kez doldurulmalıdır.",
       "placeholder": "Lütfen şifre girin",

package/locales/vi-VN/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "Thêm URL proxy OpenAI (tùy chọn)",
     "closeMessage": "Đóng thông báo",
     "confirm": "Xác nhận và thử lại",
-    "model": {
-      "Ollama": {
-        "confirm": "Tải xuống",
-        "description": "Nhập nhãn mô hình Ollama của bạn để tiếp tục cuộc trò chuyện",
-        "title": "Tải xuống mô hình Ollama cụ thể"
-      }
-    },
     "oauth": {
       "description": "Quản trị viên đã mở tính năng xác thực đăng nhập thống nhất. Nhấn vào nút bên dưới để đăng nhập và mở khóa ứng dụng",
       "success": "Đăng nhập thành công",
       "title": "Đăng nhập tài khoản",
       "welcome": "Chào mừng bạn!"
     },
+    "ollama": {
+      "cancel": "Hủy bỏ",
+      "confirm": "Tải xuống",
+      "description": "Nhập nhãn mô hình Ollama của bạn để tiếp tục cuộc trò chuyện",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "Bắt đầu tải xuống...",
+      "title": "Tải xuống mô hình Ollama cụ thể"
+    },
     "password": {
       "description": "Quản trị viên đã kích hoạt mã hóa ứng dụng. Nhập mật khẩu ứng dụng để mở khóa. Chỉ cần nhập mật khẩu một lần",
       "placeholder": "Nhập mật khẩu",

package/locales/zh-CN/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "添加 OpenAI 代理地址（可选）",
     "closeMessage": "关闭提示",
     "confirm": "确认并重试",
-    "model": {
-      "Ollama": {
-        "confirm": "下载",
-        "description": "输入你的 Ollama 模型标签，完成即可继续会话",
-        "title": "下载指定的 Ollama 模型"
-      }
-    },
     "oauth": {
       "description": "管理员已开启统一登录认证，点击下方按钮登录，即可解锁应用",
       "success": "登录成功",
       "title": "登录账号",
       "welcome": "欢迎你！"
     },
+    "ollama": {
+      "cancel": "取消下载",
+      "confirm": "下载",
+      "description": "输入你的 Ollama 模型标签，完成即可继续会话",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "开始下载...",
+      "title": "下载指定的 Ollama 模型"
+    },
     "password": {
       "description": "管理员已开启应用加密，输入应用密码后即可解锁应用。密码只需填写一次",
       "placeholder": "请输入密码",

package/locales/zh-TW/error.json

@@ -88,19 +88,20 @@
     "addProxyUrl": "新增 OpenAI 代理網址（選填）",
     "closeMessage": "關閉提示",
     "confirm": "確認並重試",
-    "model": {
-      "Ollama": {
-        "confirm": "下載",
-        "description": "輸入你的 Ollama 模型標籤，完成即可繼續會話",
-        "title": "下載指定的 Ollama 模型"
-      }
-    },
     "oauth": {
       "description": "管理員已開啟統一登錄認證，點擊下方按鈕登錄，即可解鎖應用",
       "success": "登錄成功",
       "title": "登錄帳號",
       "welcome": "歡迎你！"
     },
+    "ollama": {
+      "cancel": "取消下載",
+      "confirm": "下載",
+      "description": "輸入您的 Ollama 模型標籤，完成後即可繼續會話",
+      "downloaded": "{{completed}} / {{total}}",
+      "starting": "開始下載...",
+      "title": "下載指定的 Ollama 模型"
+    },
     "password": {
       "description": "管理員已啟用應用程式加密，輸入應用程式密碼後即可解鎖應用程式。密碼只需填寫一次。",
       "placeholder": "請輸入密碼",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.148.2",
+  "version": "0.148.3",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/features/Conversation/Error/InvalidOllamaModel/index.tsx

@@ -10,7 +10,7 @@ import { ollamaService } from '@/services/ollama';
 import { useChatStore } from '@/store/chat';
 
 import { ErrorActionContainer, FormAction } from '../style';
-import { useDownloadMonitor } from './useDownloadMonitor';
+import { formatSize, useDownloadMonitor } from './useDownloadMonitor';
 
 interface OllamaModelFormProps {
   id: string;
@@ -61,12 +61,12 @@ const OllamaModelForm = memo<OllamaModelFormProps>(({ id, model }) => {
       <FormAction
         avatar={<Ollama color={theme.colorPrimary} size={64} />}
         description={
-          isDownloading ? settingT('ollama.download.desc') : t('unlock.model.Ollama.description')
+          isDownloading ? settingT('ollama.download.desc') : t('unlock.ollama.description')
         }
         title={
           isDownloading
             ? settingT('ollama.download.title', { model: modelToPull })
-            : t('unlock.model.Ollama.title')
+            : t('unlock.ollama.title')
         }
       >
         {!isDownloading && (
@@ -110,15 +110,33 @@ const OllamaModelForm = memo<OllamaModelFormProps>(({ id, model }) => {
           style={{ marginTop: 8 }}
           type={'primary'}
         >
-          {t('unlock.model.Ollama.confirm')}
-        </Button>
-        <Button
-          onClick={() => {
-            deleteMessage(id);
-          }}
-        >
-          {t('unlock.closeMessage')}
+          {!isDownloading
+            ? t('unlock.ollama.confirm')
+            : // if total is 0, show starting, else show downloaded
+              !total
+              ? t('unlock.ollama.starting')
+              : t('unlock.ollama.downloaded', {
+                  completed: formatSize(completed),
+                  total: formatSize(total),
+                })}
         </Button>
+        {isDownloading ? (
+          <Button
+            onClick={() => {
+              ollamaService.abort();
+            }}
+          >
+            {t('unlock.ollama.cancel')}
+          </Button>
+        ) : (
+          <Button
+            onClick={() => {
+              deleteMessage(id);
+            }}
+          >
+            {t('unlock.closeMessage')}
+          </Button>
+        )}
       </Flexbox>
     </Center>
   );

package/src/features/Conversation/Error/InvalidOllamaModel/useDownloadMonitor.ts

@@ -1,15 +1,22 @@
-import { useEffect, useMemo, useState } from 'react';
-
-const formatSpeed = (speed: number): string => {
-  const kbPerSecond = speed / 1024;
-  if (kbPerSecond < 1024) {
-    return `${kbPerSecond.toFixed(1)} KB/s`;
+import { useEffect, useRef, useState } from 'react';
+
+export const formatSize = (bytes: number): string => {
+  const kbSize = bytes / 1024;
+  if (kbSize < 1024) {
+    return `${kbSize.toFixed(1)} KB`;
+  } else if (kbSize < 1_048_576) {
+    const mbSize = kbSize / 1024;
+    return `${mbSize.toFixed(1)} MB`;
   } else {
-    const mbPerSecond = kbPerSecond / 1024;
-    return `${mbPerSecond.toFixed(1)} MB/s`;
+    const gbSize = kbSize / 1_048_576;
+    return `${gbSize.toFixed(1)} GB`;
   }
 };
 
+const formatSpeed = (speed: number): string => {
+  return `${formatSize(speed)}/s`;
+};
+
 const formatTime = (timeInSeconds: number): string => {
   if (timeInSeconds < 60) {
     return `${timeInSeconds.toFixed(1)} s`;
@@ -21,28 +28,27 @@ const formatTime = (timeInSeconds: number): string => {
 };
 
 export const useDownloadMonitor = (totalSize: number, completedSize: number) => {
-  const [startTime, setStartTime] = useState<number>(Date.now());
   const [downloadSpeed, setDownloadSpeed] = useState<string>('0 KB/s');
   const [remainingTime, setRemainingTime] = useState<string>('-');
 
-  const isReady = useMemo(() => completedSize > 0, [completedSize]);
+  const lastCompletedRef = useRef(completedSize);
+  const lastTimedRef = useRef(Date.now());
 
   useEffect(() => {
     const currentTime = Date.now();
-    // mark as start download
-    if (isReady) {
-      const elapsedTime = (currentTime - startTime) / 1000; // in seconds
-      const speed = completedSize / elapsedTime; // in bytes per second
+    const elapsedTime = (currentTime - lastTimedRef.current) / 1000; // in seconds
+    if (completedSize > 0 && elapsedTime > 1) {
+      const speed = Math.max(0, (completedSize - lastCompletedRef.current) / elapsedTime); // in bytes per second
+      setDownloadSpeed(formatSpeed(speed));
 
       const remainingSize = totalSize - completedSize;
       const time = remainingSize / speed; // in seconds
-
-      setDownloadSpeed(formatSpeed(speed));
       setRemainingTime(formatTime(time));
-    } else {
-      setStartTime(currentTime);
+
+      lastCompletedRef.current = completedSize;
+      lastTimedRef.current = currentTime;
     }
-  }, [isReady, completedSize]);
+  }, [completedSize]);
 
   return { downloadSpeed, remainingTime };
 };

package/src/locales/default/error.ts

@@ -111,19 +111,20 @@ export default {
     addProxyUrl: '添加 OpenAI 代理地址（可选）',
     closeMessage: '关闭提示',
     confirm: '确认并重试',
-    model: {
-      Ollama: {
-        confirm: '下载',
-        description: '输入你的 Ollama 模型标签，完成即可继续会话',
-        title: '下载指定的 Ollama 模型',
-      },
-    },
     oauth: {
       description: '管理员已开启统一登录认证，点击下方按钮登录，即可解锁应用',
       success: '登录成功',
       title: '登录账号',
       welcome: '欢迎你！',
     },
+    ollama: {
+      cancel: '取消下载',
+      confirm: '下载',
+      description: '输入你的 Ollama 模型标签，完成即可继续会话',
+      downloaded: '{{completed}} / {{total}}',
+      starting: '开始下载...',
+      title: '下载指定的 Ollama 模型',
+    },
     password: {
       description: '管理员已开启应用加密，输入应用密码后即可解锁应用。密码只需填写一次',
       placeholder: '请输入密码',

package/src/services/__tests__/ollama.test.ts

@@ -1,9 +1,11 @@
 import { Mock, describe, expect, it, vi } from 'vitest';
 
-import { ollamaService } from '../ollama';
+import { OllamaService } from '../ollama';
 
 vi.stubGlobal('fetch', vi.fn());
 
+const ollamaService = new OllamaService({ fetch });
+
 describe('OllamaService', () => {
   describe('list models', async () => {
     it('should make a GET request with the correct payload', async () => {
@@ -11,7 +13,7 @@ describe('OllamaService', () => {
 
       expect(await ollamaService.getModels()).toEqual({ models: [] });
 
-      expect(global.fetch).toHaveBeenCalled();
+      expect(fetch).toHaveBeenCalled();
     });
 
     it('should make a GET request with the error', async () => {
@@ -20,7 +22,7 @@ describe('OllamaService', () => {
 
       await expect(ollamaService.getModels()).rejects.toThrow();
 
-      expect(global.fetch).toHaveBeenCalled();
+      expect(fetch).toHaveBeenCalled();
     });
   });
 });

package/src/services/ollama.ts

@@ -9,7 +9,21 @@ import { getMessageError } from '@/utils/fetch';
 
 const DEFAULT_BASE_URL = 'http://127.0.0.1:11434/v1';
 
-class OllamaService {
+interface OllamaServiceParams {
+  fetch?: typeof fetch;
+}
+
+export class OllamaService {
+  private _host: string;
+  private _client: OllamaBrowser;
+  private _fetch?: typeof fetch;
+
+  constructor(params: OllamaServiceParams = {}) {
+    this._host = this.getHost();
+    this._fetch = params.fetch;
+    this._client = new OllamaBrowser({ fetch: params?.fetch, host: this._host });
+  }
+
   getHost = (): string => {
     const config = modelConfigSelectors.ollamaConfig(useGlobalStore.getState());
 
@@ -18,7 +32,15 @@ class OllamaService {
   };
 
   getOllamaClient = () => {
-    return new OllamaBrowser({ host: this.getHost() });
+    if (this.getHost() !== this._host) {
+      this._host = this.getHost();
+      this._client = new OllamaBrowser({ fetch: this._fetch, host: this.getHost() });
+    }
+    return this._client;
+  };
+
+  abort = () => {
+    this._client.abort();
   };
 
   pullModel = async (model: string): Promise<AsyncGenerator<ProgressResponse>> => {