✨ feat(ollama): improve connection check method and provide selector for user to control model options #1397

sjy · 2024-02-27T02:17:26Z

💻 变更类型 | Change Type

✨ feat port ollama-js with browser req support, enable donwload uninstalled model via pull service (client req)
🐛 fix ollama service check (client req)
♻️ refactor
💄 style
🔨 chore
⚡️ perf
📝 docs

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

[ollamajs updated (browser support)]https://github.com/ollama/ollama-js/releases/tag/v0.4.9

vercel · 2024-02-27T02:17:30Z

Someone is attempting to deploy a commit to the LobeHub Team on Vercel.

A member of the Team first needs to authorize it.

lobehubbot · 2024-02-27T02:17:40Z

👍 @sjy

Thank you for raising your pull request and contributing to our Community
Please make sure you have followed our contributing guidelines. We will review it as soon as possible.
If you encounter any problems, please feel free to connect with us.
非常感谢您提出拉取请求并为我们的社区做出贡献，请确保您已经遵循了我们的贡献指南，我们会尽快审查它。
如果您遇到任何问题，请随时与我们联系。

codecov · 2024-02-27T02:20:42Z

Codecov Report

Attention: Patch coverage is 81.00000% with 19 lines in your changes are missing coverage. Please review.

Project coverage is 92.96%. Comparing base (e472d6e) to head (fa8847c).

Files	Patch %	Lines
src/services/ollama.ts	70.31%	19 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1397      +/-   ##
==========================================
- Coverage   93.06%   92.96%   -0.10%     
==========================================
  Files         234      235       +1     
  Lines       12646    12730      +84     
  Branches     1528     1537       +9     
==========================================
+ Hits        11769    11835      +66     
- Misses        877      895      +18

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

arvinxx

还没全看完，粗看了下，有些细节先调整下

src/app/settings/llm/components/Checker.tsx

src/app/settings/llm/components/ModelSelector.tsx

src/services/ollama.ts

arvinxx · 2024-03-10T12:02:32Z

src/services/ollama.ts

+      const response = await this.getOllamaClient().list();
+      return response;
+    } catch {
+      response = createErrorResponse(ChatErrorType.ServiceUnavailable, {


我建议新增一个 Ollama 的 error 类型，然后针对这个类型展示明确的 Ollama 未启动的提示。

现在这样看上去对用户来说不太友好，不一定清楚具体发生了啥。真正有用的信息反而是 'please check whether your ollama service is available' 这条

src/app/settings/llm/Ollama/Checker.tsx

src/features/Conversation/Error/InvalidOllamaModel.tsx

arvinxx

其他我感觉差不多了，后续要调整的我再给改改。

src/app/settings/llm/Ollama/Checker.tsx

src/hooks/useDownloadMonitor.ts

…time

arvinxx · 2024-03-15T14:16:25Z

优化了一版下载样式：

但同样发现了一些问题:

用户不知道模型本身有多大，不知道当前下载了多少尺寸了；
如果是中途断点下载，那么下载的速度会不准。
不支持取消下载；
下载过程中允许关闭提示可能不太合理。

lobehubbot · 2024-03-15T14:16:39Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Optimized the download style of the first version:

But some problems were also discovered:

The user does not know how big the model itself is or how many sizes are currently downloaded;
If the download is interrupted midway, the download speed will be inaccurate.
Cancel downloading is not supported;
It may not be reasonable to allow the prompt to be turned off during the download process.

arvinxx

上面提到的几个点是进一步的优化项，这一版我觉得可以先合了~

vercel · 2024-03-15T14:23:13Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
lobe-chat	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Mar 15, 2024 2:28pm

lobehubbot · 2024-03-15T14:47:36Z

❤️ Great PR @sjy ❤️

The growth of project is inseparable from user feedback and contribution, thanks for your contribution! If you are interesting with the lobehub developer community, please join our discord and then dm @arvinxx or @canisminor1990. They will invite you to our private developer channel. We are talking about the lobe-chat development or sharing ai newsletter around the world.
项目的成长离不开用户反馈和贡献，感谢您的贡献! 如果您对 LobeHub 开发者社区感兴趣，请加入我们的 discord，然后私信 @arvinxx 或 @canisminor1990。他们会邀请您加入我们的私密开发者频道。我们将会讨论关于 Lobe Chat 的开发，分享和讨论全球范围内的 AI 消息。

## [Version 0.137.0](v0.136.0...v0.137.0) <sup>Released on **2024-03-15**</sup> #### ✨ Features - **ollama**: Improve connection check method and provide selector for user to control model options. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's improved * **ollama**: Improve connection check method and provide selector for user to control model options, closes [#1397](#1397) ([675902f](675902f)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

lobehubbot · 2024-03-15T14:51:00Z

🎉 This PR is included in version 0.137.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

## [Version 1.19.0](v1.18.0...v1.19.0) <sup>Released on **2024-03-16**</sup> #### ✨ Features - **ollama**: Improve connection check method and provide selector for user to control model options. - **misc**: Support groq as a model provider. #### 🐛 Bug Fixes - **misc**: Fix rename, Fix URL typo. #### 💄 Styles - **misc**: Update Markdown in ChatItem. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's improved * **ollama**: Improve connection check method and provide selector for user to control model options, closes [lobehub#1397](https://github.com/bentwnghk/lobe-chat/issues/1397) ([675902f](675902f)) * **misc**: Support groq as a model provider, closes [lobehub#1569](https://github.com/bentwnghk/lobe-chat/issues/1569) [lobehub#1562](https://github.com/bentwnghk/lobe-chat/issues/1562) [lobehub#1570](https://github.com/bentwnghk/lobe-chat/issues/1570) ([a04c364](a04c364)) #### What's fixed * **misc**: Fix rename ([2faf6cf](2faf6cf)) * **misc**: Fix URL typo, closes [lobehub#1590](https://github.com/bentwnghk/lobe-chat/issues/1590) ([97137a9](97137a9)) #### Styles * **misc**: Update Markdown in ChatItem ([be75549](be75549)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

…for user to control model options (lobehub#1397) * 🐛 fix(ollama): change checker with ollama's tags api * ✨feat(ollama): add error card to pull model * 🚚 chore: move files * 💄 style: update llava logo * 🐛 fix: add ollama service unavailable error type * 🐛 fix: ollama show passed with error message exists * ✨ feat(ollama): add download moniter to show speed and eta remaining time * 🚨 ci: fix lint * 💄 style: improve download style * 🌐 style: add i18n --------- Co-authored-by: shijianyue <[email protected]> Co-authored-by: arvinxx <[email protected]>

## [Version 0.137.0](lobehub/lobe-chat@v0.136.0...v0.137.0) <sup>Released on **2024-03-15**</sup> #### ✨ Features - **ollama**: Improve connection check method and provide selector for user to control model options. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's improved * **ollama**: Improve connection check method and provide selector for user to control model options, closes [lobehub#1397](lobehub#1397) ([675902f](lobehub@675902f)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

sjy · 2024-03-21T03:05:03Z

优化了一版下载样式：
但同样发现了一些问题:

用户不知道模型本身有多大，不知道当前下载了多少尺寸了；

如果是中途断点下载，那么下载的速度会不准。

不支持取消下载；

下载过程中允许关闭提示可能不太合理。

Create another PR here: https://github.com/lobehub/lobe-chat/pull/1659/checks

lobehubbot · 2024-03-21T03:05:13Z

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Optimized the download style of version 1:
But some problems were also found:

The user does not know how big the model itself is or how many sizes are currently downloaded;

If the download is interrupted midway, the download speed will be inaccurate.

Cancel download is not supported;

It may not be reasonable to allow the prompt to be turned off during the download process.

Create another PR here: https://github.com/lobehub/lobe-chat/pull/1659/checks

## [Version 0.137.0](lobehub/lobe-chat@v0.136.0...v0.137.0) <sup>Released on **2024-03-15**</sup> #### ✨ Features - **ollama**: Improve connection check method and provide selector for user to control model options. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's improved * **ollama**: Improve connection check method and provide selector for user to control model options, closes [#1397](lobehub/lobe-chat#1397) ([675902f](lobehub/lobe-chat@675902f)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

sjy changed the title ~~Fix/ollama checker~~ fix(ollama): change connection check way and provide selector for user to control model options Feb 27, 2024

arvinxx requested changes Feb 27, 2024

View reviewed changes

src/app/settings/llm/components/Checker.tsx Outdated Show resolved Hide resolved

src/app/settings/llm/components/ModelSelector.tsx Outdated Show resolved Hide resolved

src/services/ollama.ts Outdated Show resolved Hide resolved

sjy marked this pull request as draft February 27, 2024 08:01

sjy force-pushed the fix/ollama_checker branch 6 times, most recently from 014bf58 to 57ec878 Compare March 3, 2024 13:29

sjy requested a review from arvinxx March 3, 2024 13:34

sjy marked this pull request as ready for review March 3, 2024 13:35

arvinxx force-pushed the fix/ollama_checker branch from 57ec878 to 64beb7a Compare March 10, 2024 11:12

arvinxx reviewed Mar 10, 2024

View reviewed changes

src/services/ollama.ts Show resolved Hide resolved

arvinxx reviewed Mar 10, 2024

View reviewed changes

arvinxx requested changes Mar 13, 2024

View reviewed changes

src/app/settings/llm/Ollama/Checker.tsx Outdated Show resolved Hide resolved

src/hooks/useDownloadMonitor.ts Outdated Show resolved Hide resolved

arvinxx changed the title ~~fix(ollama): change connection check way and provide selector for user to control model options~~ ✨ feat(ollama): improve connection check method and provide selector for user to control model options Mar 13, 2024

sjy force-pushed the fix/ollama_checker branch from ce018e1 to 6b1862b Compare March 13, 2024 14:48

shijianyue and others added 7 commits March 15, 2024 21:20

🐛 fix(ollama): change checker with ollama's tags api

adb2818

✨feat(ollama): add error card to pull model

7db1c22

🚚 chore: move files

56101dc

💄 style: update llava logo

84305d8

🐛 fix: add ollama service unavailable error type

4ca53f6

🐛 fix: ollama show passed with error message exists

3ecdf59

✨ feat(ollama): add download moniter to show speed and eta remaining …

0c71a6b

…time

arvinxx force-pushed the fix/ollama_checker branch from 9878ddb to 0c71a6b Compare March 15, 2024 13:21

arvinxx added 2 commits March 15, 2024 21:25

🚨 ci: fix lint

275fe3f

💄 style: improve download style

0f5d730

arvinxx approved these changes Mar 15, 2024

View reviewed changes

🌐 style: add i18n

fa8847c

vercel bot deployed to Preview March 15, 2024 14:28 View deployment

arvinxx merged commit 675902f into lobehub:main Mar 15, 2024
4 of 6 checks passed

lobehubbot added the released label Mar 15, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ feat(ollama): improve connection check method and provide selector for user to control model options #1397

✨ feat(ollama): improve connection check method and provide selector for user to control model options #1397

sjy commented Feb 27, 2024 •

edited

Loading

vercel bot commented Feb 27, 2024

lobehubbot commented Feb 27, 2024

codecov bot commented Feb 27, 2024 •

edited

Loading

arvinxx left a comment

arvinxx Mar 10, 2024

arvinxx left a comment

arvinxx commented Mar 15, 2024

lobehubbot commented Mar 15, 2024

arvinxx left a comment

vercel bot commented Mar 15, 2024 •

edited

Loading

lobehubbot commented Mar 15, 2024

lobehubbot commented Mar 15, 2024

sjy commented Mar 21, 2024 •

edited

Loading

lobehubbot commented Mar 21, 2024

✨ feat(ollama): improve connection check method and provide selector for user to control model options #1397

✨ feat(ollama): improve connection check method and provide selector for user to control model options #1397

Conversation

sjy commented Feb 27, 2024 • edited Loading

💻 变更类型 | Change Type

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

vercel bot commented Feb 27, 2024

lobehubbot commented Feb 27, 2024

codecov bot commented Feb 27, 2024 • edited Loading

Codecov Report

arvinxx left a comment

Choose a reason for hiding this comment

arvinxx Mar 10, 2024

Choose a reason for hiding this comment

arvinxx left a comment

Choose a reason for hiding this comment

arvinxx commented Mar 15, 2024

lobehubbot commented Mar 15, 2024

arvinxx left a comment

Choose a reason for hiding this comment

vercel bot commented Mar 15, 2024 • edited Loading

lobehubbot commented Mar 15, 2024

lobehubbot commented Mar 15, 2024

sjy commented Mar 21, 2024 • edited Loading

lobehubbot commented Mar 21, 2024

sjy commented Feb 27, 2024 •

edited

Loading

codecov bot commented Feb 27, 2024 •

edited

Loading

vercel bot commented Mar 15, 2024 •

edited

Loading

sjy commented Mar 21, 2024 •

edited

Loading