[PR #5762] [MERGED] chore: merge with main #6995

New issue

Closed

opened 2026-03-23 23:17:38 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 23:17:38 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/5762
Author: @speed2exe
Created: 7/19/2024
Status: ✅ Merged
Merged: 7/19/2024
Merged by: @appflowy

Base: feat/ai-billing ← Head: feat/ai-billing-2

📝 Commits (1)

37d8342 chore: merge with main

📊 Changes

38 files changed (+1502 additions, -636 deletions)

View changed files

📝 frontend/.vscode/launch.json (+0 -1)
📝 frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_file_bloc.dart (+24 -21)
➕ frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_input_bloc.dart (+73 -0)
📝 frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart (+119 -103)
📝 frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input.dart (+13 -14)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_model_bloc.dart (+8 -1)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_bloc.dart (+50 -210)
➕ frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_bloc.dart (+261 -0)
➕ frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_toggle_bloc.dart (+95 -0)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_llm_listener.dart (+11 -5)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/ai/plugin_state_bloc.dart (+16 -7)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart (+2 -2)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_chat_setting.dart (+167 -68)
➕ frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting.dart (+162 -0)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/model_selection.dart (+0 -3)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/plugin_state.dart (+24 -26)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/settings_ai_view.dart (+1 -5)
📝 frontend/appflowy_tauri/src-tauri/Cargo.lock (+16 -16)
📝 frontend/appflowy_tauri/src-tauri/Cargo.toml (+3 -3)
📝 frontend/appflowy_web_app/src-tauri/Cargo.lock (+16 -16)

...and 18 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/5762 **Author:** [@speed2exe](https://github.com/speed2exe) **Created:** 7/19/2024 **Status:** ✅ Merged **Merged:** 7/19/2024 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `feat/ai-billing` ← **Head:** `feat/ai-billing-2` --- ### 📝 Commits (1) - [`37d8342`](https://github.com/AppFlowy-IO/AppFlowy/commit/37d8342babdb6dfc78566c1c6bc926a7154672dd) chore: merge with main ### 📊 Changes **38 files changed** (+1502 additions, -636 deletions) <details> <summary>View changed files</summary> 📝 `frontend/.vscode/launch.json` (+0 -1) 📝 `frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_file_bloc.dart` (+24 -21) ➕ `frontend/appflowy_flutter/lib/plugins/ai_chat/application/chat_input_bloc.dart` (+73 -0) 📝 `frontend/appflowy_flutter/lib/plugins/ai_chat/chat_page.dart` (+119 -103) 📝 `frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/chat_input.dart` (+13 -14) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/ai/download_model_bloc.dart` (+8 -1) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_bloc.dart` (+50 -210) ➕ `frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_bloc.dart` (+261 -0) ➕ `frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_ai_chat_toggle_bloc.dart` (+95 -0) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/ai/local_llm_listener.dart` (+11 -5) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/ai/plugin_state_bloc.dart` (+16 -7) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/init_local_ai.dart` (+2 -2) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_chat_setting.dart` (+167 -68) ➕ `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/local_ai_setting.dart` (+162 -0) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/model_selection.dart` (+0 -3) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/plugin_state.dart` (+24 -26) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/setting_ai_view/settings_ai_view.dart` (+1 -5) 📝 `frontend/appflowy_tauri/src-tauri/Cargo.lock` (+16 -16) 📝 `frontend/appflowy_tauri/src-tauri/Cargo.toml` (+3 -3) 📝 `frontend/appflowy_web_app/src-tauri/Cargo.lock` (+16 -16) _...and 18 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>