mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-21 01:40:58 +00:00
Merge branch 'master' into feat/dingtalk
This commit is contained in:
@@ -11,9 +11,12 @@ body:
|
|||||||
- 其他(或暂未使用)
|
- 其他(或暂未使用)
|
||||||
- Nakuru(go-cqhttp)
|
- Nakuru(go-cqhttp)
|
||||||
- aiocqhttp(使用 OneBot 协议接入的)
|
- aiocqhttp(使用 OneBot 协议接入的)
|
||||||
- qq-botpy(QQ官方API)
|
- qq-botpy(QQ官方API WebSocket)
|
||||||
|
- qqofficial(QQ官方API Webhook)
|
||||||
- lark(飞书)
|
- lark(飞书)
|
||||||
- wecom(企业微信)
|
- wecom(企业微信)
|
||||||
|
- gewechat(个人微信)
|
||||||
|
- discord
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
- type: input
|
- type: input
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
<a href="https://trendshift.io/repositories/6187" target="_blank"><img src="https://trendshift.io/api/badge/repositories/6187" alt="RockChinQ%2FQChatGPT | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/12901" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12901" alt="RockChinQ%2FLangBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||
<a href="https://docs.langbot.app">项目主页</a> |
|
<a href="https://docs.langbot.app">项目主页</a> |
|
||||||
<a href="https://docs.langbot.app/insight/intro.htmll">功能介绍</a> |
|
<a href="https://docs.langbot.app/insight/intro.htmll">功能介绍</a> |
|
||||||
@@ -22,12 +22,13 @@
|
|||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
|
|
||||||
|
[](https://discord.gg/wdNEHETs87)
|
||||||
[](https://qm.qq.com/q/PF9OuQCCcM)
|
[](https://qm.qq.com/q/PF9OuQCCcM)
|
||||||
[](https://github.com/RockChinQ/LangBot/releases/latest)
|
[](https://github.com/RockChinQ/LangBot/releases/latest)
|
||||||

|

|
||||||
<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
|
<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
|
||||||
|
|
||||||
[简体中文](README.md) / [English](README_EN.md)
|
[简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.md)
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -85,6 +86,7 @@
|
|||||||
| QQ 个人号 | ✅ | QQ 个人号私聊、群聊 |
|
| QQ 个人号 | ✅ | QQ 个人号私聊、群聊 |
|
||||||
| QQ 官方机器人 | ✅ | QQ 官方机器人,支持频道、私聊、群聊 |
|
| QQ 官方机器人 | ✅ | QQ 官方机器人,支持频道、私聊、群聊 |
|
||||||
| 企业微信 | ✅ | |
|
| 企业微信 | ✅ | |
|
||||||
|
| 微信公众号 | ✅ | |
|
||||||
| 飞书 | ✅ | |
|
| 飞书 | ✅ | |
|
||||||
| Discord | ✅ | |
|
| Discord | ✅ | |
|
||||||
| 个人微信 | ✅ | 使用 [Gewechat](https://github.com/Devo919/Gewechat) 接入 |
|
| 个人微信 | ✅ | 使用 [Gewechat](https://github.com/Devo919/Gewechat) 接入 |
|
||||||
@@ -109,7 +111,7 @@
|
|||||||
| [LMStudio](https://lmstudio.ai/) | ✅ | 本地大模型运行平台 |
|
| [LMStudio](https://lmstudio.ai/) | ✅ | 本地大模型运行平台 |
|
||||||
| [GiteeAI](https://ai.gitee.com/) | ✅ | 大模型接口聚合平台 |
|
| [GiteeAI](https://ai.gitee.com/) | ✅ | 大模型接口聚合平台 |
|
||||||
| [SiliconFlow](https://siliconflow.cn/) | ✅ | 大模型聚合平台 |
|
| [SiliconFlow](https://siliconflow.cn/) | ✅ | 大模型聚合平台 |
|
||||||
| [阿里云百炼](https://bailian.console.aliyun.com/) | ✅ | 大模型聚合平台 |
|
| [阿里云百炼](https://bailian.console.aliyun.com/) | ✅ | 大模型聚合平台, LLMOps 平台 |
|
||||||
|
|
||||||
## 😘 社区贡献
|
## 😘 社区贡献
|
||||||
|
|
||||||
|
|||||||
+5
-4
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
<a href="https://trendshift.io/repositories/6187" target="_blank"><img src="https://trendshift.io/api/badge/repositories/6187" alt="RockChinQ%2FQChatGPT | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
<a href="https://trendshift.io/repositories/12901" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12901" alt="RockChinQ%2FLangBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||
<a href="https://docs.langbot.app">Home</a> |
|
<a href="https://docs.langbot.app">Home</a> |
|
||||||
<a href="https://docs.langbot.app/insight/intro.htmll">Features</a> |
|
<a href="https://docs.langbot.app/insight/intro.htmll">Features</a> |
|
||||||
@@ -21,12 +21,12 @@
|
|||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
|
|
||||||
|
[](https://discord.gg/wdNEHETs87)
|
||||||
[](https://github.com/RockChinQ/LangBot/releases/latest)
|
[](https://github.com/RockChinQ/LangBot/releases/latest)
|
||||||
)
|
)
|
||||||
<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
|
<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
|
||||||
|
|
||||||
[简体中文](README.md) / [English](README_EN.md)
|
[简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.md)
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -85,6 +85,7 @@ Directly use the released version to run, see the [Manual Deployment](https://do
|
|||||||
| Personal QQ | ✅ | |
|
| Personal QQ | ✅ | |
|
||||||
| QQ Official API | ✅ | |
|
| QQ Official API | ✅ | |
|
||||||
| WeCom | ✅ | |
|
| WeCom | ✅ | |
|
||||||
|
| WeChat Official Account | ✅ | |
|
||||||
| Lark | ✅ | |
|
| Lark | ✅ | |
|
||||||
| Discord | ✅ | |
|
| Discord | ✅ | |
|
||||||
| Personal WeChat | ✅ | Use [Gewechat](https://github.com/Devo919/Gewechat) to access |
|
| Personal WeChat | ✅ | Use [Gewechat](https://github.com/Devo919/Gewechat) to access |
|
||||||
@@ -109,7 +110,7 @@ Directly use the released version to run, see the [Manual Deployment](https://do
|
|||||||
| [LMStudio](https://lmstudio.ai/) | ✅ | Local LLM running platform |
|
| [LMStudio](https://lmstudio.ai/) | ✅ | Local LLM running platform |
|
||||||
| [GiteeAI](https://ai.gitee.com/) | ✅ | LLM interface gateway(MaaS) |
|
| [GiteeAI](https://ai.gitee.com/) | ✅ | LLM interface gateway(MaaS) |
|
||||||
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLM gateway(MaaS) |
|
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLM gateway(MaaS) |
|
||||||
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLM gateway(MaaS) |
|
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLM gateway(MaaS), LLMOps platform |
|
||||||
|
|
||||||
## 🤝 Community Contribution
|
## 🤝 Community Contribution
|
||||||
|
|
||||||
|
|||||||
+122
@@ -0,0 +1,122 @@
|
|||||||
|
<p align="center">
|
||||||
|
<a href="https://langbot.app">
|
||||||
|
<img src="https://docs.langbot.app/social.png" alt="LangBot"/>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
<div align="center">
|
||||||
|
|
||||||
|
<a href="https://trendshift.io/repositories/12901" target="_blank"><img src="https://trendshift.io/api/badge/repositories/12901" alt="RockChinQ%2FLangBot | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
|
||||||
|
|
||||||
|
<a href="https://docs.langbot.app">ホーム</a> |
|
||||||
|
<a href="https://docs.langbot.app/insight/intro.htmll">機能</a> |
|
||||||
|
<a href="https://docs.langbot.app/insight/guide.html">デプロイ</a> |
|
||||||
|
<a href="https://docs.langbot.app/usage/faq.html">FAQ</a> |
|
||||||
|
<a href="https://docs.langbot.app/plugin/plugin-intro.html">プラグイン</a> |
|
||||||
|
<a href="https://github.com/RockChinQ/LangBot/issues/new?assignees=&labels=%E7%8B%AC%E7%AB%8B%E6%8F%92%E4%BB%B6&projects=&template=submit-plugin.yml&title=%5BPlugin%5D%3A+%E8%AF%B7%E6%B1%82%E7%99%BB%E8%AE%B0%E6%96%B0%E6%8F%92%E4%BB%B6">プラグインの提出</a>
|
||||||
|
|
||||||
|
<div align="center">
|
||||||
|
😎高い安定性、🧩拡張サポート、🦄マルチモーダル - LLMネイティブインスタントメッセージングボットプラットフォーム🤖
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
|
||||||
|
[](https://discord.gg/wdNEHETs87)
|
||||||
|
[](https://github.com/RockChinQ/LangBot/releases/latest)
|
||||||
|
)
|
||||||
|
<img src="https://img.shields.io/badge/python-3.10 | 3.11 | 3.12-blue.svg" alt="python">
|
||||||
|
|
||||||
|
[简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.md)
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</p>
|
||||||
|
|
||||||
|
## ✨ 機能
|
||||||
|
|
||||||
|
- 💬 LLM / エージェントとのチャット: 複数のLLMをサポートし、グループチャットとプライベートチャットに対応。マルチラウンドの会話、ツールの呼び出し、マルチモーダル機能をサポート。 [Dify](https://dify.ai) と深く統合。現在、QQ、QQチャンネル、WeCom、Lark、Discord、個人WeChatをサポートし、将来的にはWhatsApp、Telegramなどもサポート予定。
|
||||||
|
- 🛠️ 高い安定性、豊富な機能: ネイティブのアクセス制御、レート制限、敏感な単語のフィルタリングなどのメカニズムをサポート。使いやすく、複数のデプロイ方法をサポート。
|
||||||
|
- 🧩 プラグイン拡張、活発なコミュニティ: イベント駆動、コンポーネント拡張などのプラグインメカニズムをサポート。豊富なエコシステム、現在数十の[プラグイン](https://docs.langbot.app/plugin/plugin-intro.html)が存在。
|
||||||
|
- 😻 [新機能] Web UI: ブラウザを通じてLangBotインスタンスを管理することをサポート。詳細は[ドキュメント](https://docs.langbot.app/webui/intro.html)を参照。
|
||||||
|
|
||||||
|
## 📦 始め方
|
||||||
|
|
||||||
|
> [!IMPORTANT]
|
||||||
|
>
|
||||||
|
> - どのデプロイ方法を始める前に、必ず[新規ユーザーガイド](https://docs.langbot.app/insight/guide.html)をお読みください。
|
||||||
|
> - すべてのドキュメントは中国語で提供されています。近い将来、i18nバージョンを提供する予定です。
|
||||||
|
|
||||||
|
#### Docker Compose デプロイ
|
||||||
|
|
||||||
|
Dockerに慣れているユーザーに適しています。[Dockerデプロイ](https://docs.langbot.app/deploy/langbot/docker.html)のドキュメントを参照してください。
|
||||||
|
|
||||||
|
#### BTPanelでのワンクリックデプロイ
|
||||||
|
|
||||||
|
LangBotはBTPanelにリストされています。BTPanelをインストールしている場合は、[ドキュメント](https://docs.langbot.app/deploy/langbot/one-click/bt.html)を使用して使用できます。
|
||||||
|
|
||||||
|
#### Zeaburクラウドデプロイ
|
||||||
|
|
||||||
|
コミュニティが提供するZeaburテンプレート。
|
||||||
|
|
||||||
|
[](https://zeabur.com/zh-CN/templates/ZKTBDH)
|
||||||
|
|
||||||
|
#### Railwayクラウドデプロイ
|
||||||
|
|
||||||
|
[](https://railway.app/template/yRrAyL?referralCode=vogKPF)
|
||||||
|
|
||||||
|
#### その他のデプロイ方法
|
||||||
|
|
||||||
|
リリースバージョンを直接使用して実行します。[手動デプロイ](https://docs.langbot.app/deploy/langbot/manual.html)のドキュメントを参照してください。
|
||||||
|
|
||||||
|
## 📸 デモ
|
||||||
|
|
||||||
|
<img alt="返信効果(インターネットプラグイン付き)" src="https://docs.langbot.app/QChatGPT-0516.png" width="500px"/>
|
||||||
|
|
||||||
|
- WebUIデモ: https://demo.langbot.dev/
|
||||||
|
- ログイン情報: メール: `demo@langbot.app` パスワード: `langbot123456`
|
||||||
|
- 注意: WebUIの効果のみを示しています。公開環境では、機密情報を入力しないでください。
|
||||||
|
|
||||||
|
## 🔌 コンポーネントの互換性
|
||||||
|
|
||||||
|
### メッセージプラットフォーム
|
||||||
|
|
||||||
|
| プラットフォーム | ステータス | 備考 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| 個人QQ | ✅ | |
|
||||||
|
| QQ公式API | ✅ | |
|
||||||
|
| WeCom | ✅ | |
|
||||||
|
| Lark | ✅ | |
|
||||||
|
| Discord | ✅ | |
|
||||||
|
| 個人WeChat | ✅ | [Gewechat](https://github.com/Devo919/Gewechat)を使用して接続 |
|
||||||
|
| Telegram | 🚧 | |
|
||||||
|
| WhatsApp | 🚧 | |
|
||||||
|
| DingTalk | 🚧 | |
|
||||||
|
|
||||||
|
🚧: 開発中
|
||||||
|
|
||||||
|
### LLMs
|
||||||
|
|
||||||
|
| LLM | ステータス | 備考 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| [OpenAI](https://platform.openai.com/) | ✅ | 任意のOpenAIインターフェース形式モデルに対応 |
|
||||||
|
| [DeepSeek](https://www.deepseek.com/) | ✅ | |
|
||||||
|
| [Moonshot](https://www.moonshot.cn/) | ✅ | |
|
||||||
|
| [Anthropic](https://www.anthropic.com/) | ✅ | |
|
||||||
|
| [xAI](https://x.ai/) | ✅ | |
|
||||||
|
| [Zhipu AI](https://open.bigmodel.cn/) | ✅ | |
|
||||||
|
| [Dify](https://dify.ai) | ✅ | LLMOpsプラットフォーム |
|
||||||
|
| [Ollama](https://ollama.com/) | ✅ | ローカルLLM実行プラットフォーム |
|
||||||
|
| [LMStudio](https://lmstudio.ai/) | ✅ | ローカルLLM実行プラットフォーム |
|
||||||
|
| [GiteeAI](https://ai.gitee.com/) | ✅ | LLMインターフェースゲートウェイ(MaaS) |
|
||||||
|
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLMゲートウェイ(MaaS) |
|
||||||
|
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム |
|
||||||
|
|
||||||
|
## 🤝 コミュニティ貢献
|
||||||
|
|
||||||
|
以下の貢献者とコミュニティの皆さんの貢献に感謝します。
|
||||||
|
|
||||||
|
|
||||||
|
<a href="https://github.com/RockChinQ/LangBot/graphs/contributors">
|
||||||
|
<img src="https://contrib.rocks/image?repo=RockChinQ/LangBot" />
|
||||||
|
</a>
|
||||||
|
|
||||||
|
|
||||||
@@ -31,6 +31,7 @@ required_deps = {
|
|||||||
"cryptography": "cryptography",
|
"cryptography": "cryptography",
|
||||||
"gewechat_client": "gewechat-client",
|
"gewechat_client": "gewechat-client",
|
||||||
"dingtalk_stream": "dingtalk_stream",
|
"dingtalk_stream": "dingtalk_stream",
|
||||||
|
"dashscope": "dashscope",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,10 @@ class LarkConfigMigration(migration.Migration):
|
|||||||
"enable": False,
|
"enable": False,
|
||||||
"app_id": "cli_abcdefgh",
|
"app_id": "cli_abcdefgh",
|
||||||
"app_secret": "XXXXXXXXXX",
|
"app_secret": "XXXXXXXXXX",
|
||||||
"bot_name": "LangBot"
|
"bot_name": "LangBot",
|
||||||
|
"enable-webhook": False,
|
||||||
|
"port": 2285,
|
||||||
|
"encrypt-key": "xxxxxxxxx"
|
||||||
})
|
})
|
||||||
|
|
||||||
await self.ap.platform_cfg.dump_config()
|
await self.ap.platform_cfg.dump_config()
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .. import migration
|
||||||
|
|
||||||
|
|
||||||
|
@migration.migration_class("wx-official-account-config", 27)
|
||||||
|
class WXOfficialAccountConfigMigration(migration.Migration):
|
||||||
|
"""迁移"""
|
||||||
|
|
||||||
|
async def need_migrate(self) -> bool:
|
||||||
|
"""判断当前环境是否需要运行此迁移"""
|
||||||
|
|
||||||
|
for adapter in self.ap.platform_cfg.data['platform-adapters']:
|
||||||
|
if adapter['adapter'] == 'officialaccount':
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
"""执行迁移"""
|
||||||
|
self.ap.platform_cfg.data['platform-adapters'].append({
|
||||||
|
"adapter": "officialaccount",
|
||||||
|
"enable": False,
|
||||||
|
"token": "",
|
||||||
|
"EncodingAESKey": "",
|
||||||
|
"AppID": "",
|
||||||
|
"AppSecret": "",
|
||||||
|
"host": "0.0.0.0",
|
||||||
|
"port": 2287
|
||||||
|
})
|
||||||
|
|
||||||
|
await self.ap.platform_cfg.dump_config()
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .. import migration
|
||||||
|
|
||||||
|
|
||||||
|
@migration.migration_class("bailian-requester-config", 28)
|
||||||
|
class BailianRequesterConfigMigration(migration.Migration):
|
||||||
|
"""迁移"""
|
||||||
|
|
||||||
|
async def need_migrate(self) -> bool:
|
||||||
|
"""判断当前环境是否需要运行此迁移"""
|
||||||
|
|
||||||
|
return 'bailian-chat-completions' not in self.ap.provider_cfg.data['requester']
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
"""执行迁移"""
|
||||||
|
self.ap.provider_cfg.data['keys']['bailian'] = [
|
||||||
|
"sk-xxxxxxx"
|
||||||
|
]
|
||||||
|
|
||||||
|
self.ap.provider_cfg.data['requester']['bailian-chat-completions'] = {
|
||||||
|
"base-url": "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
||||||
|
"args": {},
|
||||||
|
"timeout": 120
|
||||||
|
}
|
||||||
|
|
||||||
|
await self.ap.provider_cfg.dump_config()
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .. import migration
|
||||||
|
|
||||||
|
|
||||||
|
@migration.migration_class("dashscope-app-api-config", 29)
|
||||||
|
class DashscopeAppAPICfgMigration(migration.Migration):
|
||||||
|
"""迁移"""
|
||||||
|
|
||||||
|
async def need_migrate(self) -> bool:
|
||||||
|
"""判断当前环境是否需要运行此迁移"""
|
||||||
|
return 'dashscope-app-api' not in self.ap.provider_cfg.data
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
"""执行迁移"""
|
||||||
|
self.ap.provider_cfg.data['dashscope-app-api'] = {
|
||||||
|
"app-type": "agent",
|
||||||
|
"api-key": "sk-1234567890",
|
||||||
|
"agent": {
|
||||||
|
"app-id": "Your_app_id",
|
||||||
|
"references_quote": "参考资料来自:"
|
||||||
|
},
|
||||||
|
"workflow": {
|
||||||
|
"app-id": "Your_app_id",
|
||||||
|
"references_quote": "参考资料来自:",
|
||||||
|
"biz_params": {
|
||||||
|
"city": "北京",
|
||||||
|
"date": "2023-08-10"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await self.ap.provider_cfg.dump_config()
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .. import migration
|
||||||
|
|
||||||
|
|
||||||
|
@migration.migration_class("lark-config-cmpl", 30)
|
||||||
|
class LarkConfigCmplMigration(migration.Migration):
|
||||||
|
"""迁移"""
|
||||||
|
|
||||||
|
async def need_migrate(self) -> bool:
|
||||||
|
"""判断当前环境是否需要运行此迁移"""
|
||||||
|
|
||||||
|
for adapter in self.ap.platform_cfg.data['platform-adapters']:
|
||||||
|
if adapter['adapter'] == 'lark':
|
||||||
|
if 'enable-webhook' not in adapter:
|
||||||
|
return True
|
||||||
|
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
"""执行迁移"""
|
||||||
|
for adapter in self.ap.platform_cfg.data['platform-adapters']:
|
||||||
|
if adapter['adapter'] == 'lark':
|
||||||
|
if 'enable-webhook' not in adapter:
|
||||||
|
adapter['enable-webhook'] = False
|
||||||
|
if 'port' not in adapter:
|
||||||
|
adapter['port'] = 2285
|
||||||
|
if 'encrypt-key' not in adapter:
|
||||||
|
adapter['encrypt-key'] = "xxxxxxxxx"
|
||||||
|
|
||||||
|
await self.ap.platform_cfg.dump_config()
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import typing
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from .. import note, app
|
||||||
|
|
||||||
|
|
||||||
|
@note.note_class("PrintVersion", 3)
|
||||||
|
class PrintVersion(note.LaunchNote):
|
||||||
|
"""打印版本信息
|
||||||
|
"""
|
||||||
|
|
||||||
|
async def need_show(self) -> bool:
|
||||||
|
return True
|
||||||
|
|
||||||
|
async def yield_note(self) -> typing.AsyncGenerator[typing.Tuple[str, int], None]:
|
||||||
|
|
||||||
|
yield f"当前版本:{self.ap.ver_mgr.get_current_version()}", logging.INFO
|
||||||
@@ -9,7 +9,9 @@ from ..migrations import m005_deepseek_cfg_completion, m006_vision_config, m007_
|
|||||||
from ..migrations import m010_ollama_requester_config, m011_command_prefix_config, m012_runner_config, m013_http_api_config, m014_force_delay_config
|
from ..migrations import m010_ollama_requester_config, m011_command_prefix_config, m012_runner_config, m013_http_api_config, m014_force_delay_config
|
||||||
from ..migrations import m015_gitee_ai_config, m016_dify_service_api, m017_dify_api_timeout_params, m018_xai_config, m019_zhipuai_config
|
from ..migrations import m015_gitee_ai_config, m016_dify_service_api, m017_dify_api_timeout_params, m018_xai_config, m019_zhipuai_config
|
||||||
from ..migrations import m020_wecom_config, m021_lark_config, m022_lmstudio_config, m023_siliconflow_config, m024_discord_config, m025_gewechat_config
|
from ..migrations import m020_wecom_config, m021_lark_config, m022_lmstudio_config, m023_siliconflow_config, m024_discord_config, m025_gewechat_config
|
||||||
from ..migrations import m026_qqofficial_config, m031_dingtalk_config
|
from ..migrations import m026_qqofficial_config, m027_wx_official_account_config, m028_aliyun_requester_config
|
||||||
|
from ..migrations import m029_dashscope_app_api_config, m030_lark_config_cmpl, m031_dingtalk_config
|
||||||
|
|
||||||
|
|
||||||
@stage.stage_class("MigrationStage")
|
@stage.stage_class("MigrationStage")
|
||||||
class MigrationStage(stage.BootingStage):
|
class MigrationStage(stage.BootingStage):
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from .. import stage, app, note
|
from .. import stage, app, note
|
||||||
from ..notes import n001_classic_msgs, n002_selection_mode_on_windows
|
from ..notes import n001_classic_msgs, n002_selection_mode_on_windows, n003_print_version
|
||||||
|
|
||||||
|
|
||||||
@stage.stage_class("ShowNotesStage")
|
@stage.stage_class("ShowNotesStage")
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ class ResponseWrapper(stage.PipelineStage):
|
|||||||
new_query=query
|
new_query=query
|
||||||
)
|
)
|
||||||
|
|
||||||
if result.tool_calls is not None: # 有函数调用
|
if result.tool_calls is not None and len(result.tool_calls) > 0: # 有函数调用
|
||||||
|
|
||||||
function_names = [tc.function.name for tc in result.tool_calls]
|
function_names = [tc.function.name for tc in result.tool_calls]
|
||||||
|
|
||||||
|
|||||||
@@ -11,10 +11,16 @@ import base64
|
|||||||
import uuid
|
import uuid
|
||||||
import json
|
import json
|
||||||
import datetime
|
import datetime
|
||||||
|
import hashlib
|
||||||
|
import base64
|
||||||
|
from Crypto.Cipher import AES
|
||||||
|
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import lark_oapi.ws.exception
|
import lark_oapi.ws.exception
|
||||||
|
import quart
|
||||||
|
from flask import jsonify
|
||||||
from lark_oapi.api.im.v1 import *
|
from lark_oapi.api.im.v1 import *
|
||||||
|
from lark_oapi.api.verification.v1 import GetVerificationRequest
|
||||||
|
|
||||||
from .. import adapter
|
from .. import adapter
|
||||||
from ...pipeline.longtext.strategies import forward
|
from ...pipeline.longtext.strategies import forward
|
||||||
@@ -25,6 +31,28 @@ from ..types import entities as platform_entities
|
|||||||
from ...utils import image
|
from ...utils import image
|
||||||
|
|
||||||
|
|
||||||
|
class AESCipher(object):
|
||||||
|
def __init__(self, key):
|
||||||
|
self.bs = AES.block_size
|
||||||
|
self.key=hashlib.sha256(AESCipher.str_to_bytes(key)).digest()
|
||||||
|
@staticmethod
|
||||||
|
def str_to_bytes(data):
|
||||||
|
u_type = type(b"".decode('utf8'))
|
||||||
|
if isinstance(data, u_type):
|
||||||
|
return data.encode('utf8')
|
||||||
|
return data
|
||||||
|
@staticmethod
|
||||||
|
def _unpad(s):
|
||||||
|
return s[:-ord(s[len(s) - 1:])]
|
||||||
|
def decrypt(self, enc):
|
||||||
|
iv = enc[:AES.block_size]
|
||||||
|
cipher = AES.new(self.key, AES.MODE_CBC, iv)
|
||||||
|
return self._unpad(cipher.decrypt(enc[AES.block_size:]))
|
||||||
|
def decrypt_string(self, enc):
|
||||||
|
enc = base64.b64decode(enc)
|
||||||
|
return self.decrypt(enc).decode('utf8')
|
||||||
|
|
||||||
|
|
||||||
class LarkMessageConverter(adapter.MessageConverter):
|
class LarkMessageConverter(adapter.MessageConverter):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -288,12 +316,57 @@ class LarkMessageSourceAdapter(adapter.MessageSourceAdapter):
|
|||||||
] = {}
|
] = {}
|
||||||
|
|
||||||
config: dict
|
config: dict
|
||||||
|
quart_app: quart.Quart
|
||||||
ap: app.Application
|
ap: app.Application
|
||||||
|
|
||||||
def __init__(self, config: dict, ap: app.Application):
|
def __init__(self, config: dict, ap: app.Application):
|
||||||
self.config = config
|
self.config = config
|
||||||
self.ap = ap
|
self.ap = ap
|
||||||
|
self.quart_app = quart.Quart(__name__)
|
||||||
|
|
||||||
|
@self.quart_app.route('/lark/callback', methods=['POST'])
|
||||||
|
async def lark_callback():
|
||||||
|
try:
|
||||||
|
data = await quart.request.json
|
||||||
|
|
||||||
|
if 'encrypt' in data:
|
||||||
|
cipher = AESCipher(self.config['encrypt-key'])
|
||||||
|
data = cipher.decrypt_string(data['encrypt'])
|
||||||
|
data = json.loads(data)
|
||||||
|
|
||||||
|
type = data.get("type")
|
||||||
|
if type is None :
|
||||||
|
context = EventContext(data)
|
||||||
|
type = context.header.event_type
|
||||||
|
|
||||||
|
if 'url_verification' == type:
|
||||||
|
print(data.get("challenge"))
|
||||||
|
# todo 验证verification token
|
||||||
|
return {
|
||||||
|
"challenge": data.get("challenge")
|
||||||
|
}
|
||||||
|
context = EventContext(data)
|
||||||
|
type = context.header.event_type
|
||||||
|
p2v1 = P2ImMessageReceiveV1()
|
||||||
|
p2v1.header = context.header
|
||||||
|
event = P2ImMessageReceiveV1Data()
|
||||||
|
event.message = EventMessage(context.event['message'])
|
||||||
|
event.sender = EventSender(context.event['sender'])
|
||||||
|
p2v1.event = event
|
||||||
|
p2v1.schema = context.schema
|
||||||
|
if 'im.message.receive_v1' == type:
|
||||||
|
try:
|
||||||
|
event = await self.event_converter.target2yiri(p2v1, self.api_client)
|
||||||
|
except Exception as e:
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
|
if event.__class__ in self.listeners:
|
||||||
|
await self.listeners[event.__class__](event, self)
|
||||||
|
|
||||||
|
return {"code": 200, "message": "ok"}
|
||||||
|
except Exception as e:
|
||||||
|
traceback.print_exc()
|
||||||
|
return {"code": 500, "message": "error"}
|
||||||
|
|
||||||
async def on_message(event: lark_oapi.im.v1.P2ImMessageReceiveV1):
|
async def on_message(event: lark_oapi.im.v1.P2ImMessageReceiveV1):
|
||||||
|
|
||||||
@@ -392,16 +465,29 @@ class LarkMessageSourceAdapter(adapter.MessageSourceAdapter):
|
|||||||
self.listeners.pop(event_type)
|
self.listeners.pop(event_type)
|
||||||
|
|
||||||
async def run_async(self):
|
async def run_async(self):
|
||||||
try:
|
port = self.config['port']
|
||||||
await self.bot._connect()
|
enable_webhook = self.config['enable-webhook']
|
||||||
except lark_oapi.ws.exception.ClientException as e:
|
|
||||||
raise e
|
|
||||||
except Exception as e:
|
|
||||||
await self.bot._disconnect()
|
|
||||||
if self.bot._auto_reconnect:
|
|
||||||
await self.bot._reconnect()
|
|
||||||
else:
|
|
||||||
raise e
|
|
||||||
|
|
||||||
|
if not enable_webhook:
|
||||||
|
try:
|
||||||
|
await self.bot._connect()
|
||||||
|
except lark_oapi.ws.exception.ClientException as e:
|
||||||
|
raise e
|
||||||
|
except Exception as e:
|
||||||
|
await self.bot._disconnect()
|
||||||
|
if self.bot._auto_reconnect:
|
||||||
|
await self.bot._reconnect()
|
||||||
|
else:
|
||||||
|
raise e
|
||||||
|
else:
|
||||||
|
async def shutdown_trigger_placeholder():
|
||||||
|
while True:
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
|
await self.quart_app.run_task(
|
||||||
|
host='0.0.0.0',
|
||||||
|
port=port,
|
||||||
|
shutdown_trigger=shutdown_trigger_placeholder,
|
||||||
|
)
|
||||||
async def kill(self) -> bool:
|
async def kill(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ class QQOfficialMessageConverter(adapter.MessageConverter):
|
|||||||
yiri_msg_list.append(
|
yiri_msg_list.append(
|
||||||
platform_message.Image(base64=base64_url)
|
platform_message.Image(base64=base64_url)
|
||||||
)
|
)
|
||||||
|
|
||||||
yiri_msg_list.append(platform_message.Plain(text=message))
|
yiri_msg_list.append(platform_message.Plain(text=message))
|
||||||
chain = platform_message.MessageChain(yiri_msg_list)
|
chain = platform_message.MessageChain(yiri_msg_list)
|
||||||
return chain
|
return chain
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ class WecomEventConverter:
|
|||||||
)
|
)
|
||||||
elif event.type == "image":
|
elif event.type == "image":
|
||||||
friend = platform_entities.Friend(
|
friend = platform_entities.Friend(
|
||||||
id=event.user_id,
|
id=f"u{event.user_id}",
|
||||||
nickname=str(event.agent_id),
|
nickname=str(event.agent_id),
|
||||||
remark="",
|
remark="",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from . import entities, requester
|
|||||||
from ...core import app
|
from ...core import app
|
||||||
|
|
||||||
from . import token
|
from . import token
|
||||||
from .requesters import chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl
|
from .requesters import bailianchatcmpl, chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl
|
||||||
|
|
||||||
FETCH_MODEL_LIST_URL = "https://api.qchatgpt.rockchin.top/api/v2/fetch/model_list"
|
FETCH_MODEL_LIST_URL = "https://api.qchatgpt.rockchin.top/api/v2/fetch/model_list"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import openai
|
||||||
|
|
||||||
|
from . import chatcmpl
|
||||||
|
from .. import requester
|
||||||
|
from ....core import app
|
||||||
|
|
||||||
|
|
||||||
|
@requester.requester_class("bailian-chat-completions")
|
||||||
|
class BailianChatCompletions(chatcmpl.OpenAIChatCompletions):
|
||||||
|
"""阿里云百炼大模型平台 ChatCompletion API 请求器"""
|
||||||
|
|
||||||
|
client: openai.AsyncClient
|
||||||
|
|
||||||
|
requester_cfg: dict
|
||||||
|
|
||||||
|
def __init__(self, ap: app.Application):
|
||||||
|
self.ap = ap
|
||||||
|
|
||||||
|
self.requester_cfg = self.ap.provider_cfg.data['requester']['bailian-chat-completions']
|
||||||
@@ -8,6 +8,7 @@ from typing import AsyncGenerator
|
|||||||
|
|
||||||
import openai
|
import openai
|
||||||
import openai.types.chat.chat_completion as chat_completion
|
import openai.types.chat.chat_completion as chat_completion
|
||||||
|
import openai.types.chat.chat_completion_message_tool_call as chat_completion_message_tool_call
|
||||||
import httpx
|
import httpx
|
||||||
import aiohttp
|
import aiohttp
|
||||||
import async_lru
|
import async_lru
|
||||||
@@ -40,6 +41,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
|
|||||||
timeout=self.requester_cfg['timeout'],
|
timeout=self.requester_cfg['timeout'],
|
||||||
http_client=httpx.AsyncClient(
|
http_client=httpx.AsyncClient(
|
||||||
trust_env=True,
|
trust_env=True,
|
||||||
|
timeout=self.requester_cfg['timeout']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -47,7 +49,70 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
|
|||||||
self,
|
self,
|
||||||
args: dict,
|
args: dict,
|
||||||
) -> chat_completion.ChatCompletion:
|
) -> chat_completion.ChatCompletion:
|
||||||
return await self.client.chat.completions.create(**args)
|
args["stream"] = True
|
||||||
|
|
||||||
|
chunk = None
|
||||||
|
|
||||||
|
pending_content = ""
|
||||||
|
|
||||||
|
tool_calls = []
|
||||||
|
|
||||||
|
resp_gen: openai.AsyncStream = await self.client.chat.completions.create(**args)
|
||||||
|
|
||||||
|
async for chunk in resp_gen:
|
||||||
|
# print(chunk)
|
||||||
|
if not chunk or not chunk.id or not chunk.choices or not chunk.choices[0] or not chunk.choices[0].delta:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if chunk.choices[0].delta.content is not None:
|
||||||
|
pending_content += chunk.choices[0].delta.content
|
||||||
|
|
||||||
|
if chunk.choices[0].delta.tool_calls is not None:
|
||||||
|
for tool_call in chunk.choices[0].delta.tool_calls:
|
||||||
|
for tc in tool_calls:
|
||||||
|
if tc.index == tool_call.index:
|
||||||
|
tc.function.arguments += tool_call.function.arguments
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
tool_calls.append(tool_call)
|
||||||
|
|
||||||
|
if chunk.choices[0].finish_reason is not None:
|
||||||
|
break
|
||||||
|
|
||||||
|
real_tool_calls = []
|
||||||
|
|
||||||
|
for tc in tool_calls:
|
||||||
|
function = chat_completion_message_tool_call.Function(
|
||||||
|
name=tc.function.name,
|
||||||
|
arguments=tc.function.arguments
|
||||||
|
)
|
||||||
|
real_tool_calls.append(chat_completion_message_tool_call.ChatCompletionMessageToolCall(
|
||||||
|
id=tc.id,
|
||||||
|
function=function,
|
||||||
|
type="function"
|
||||||
|
))
|
||||||
|
|
||||||
|
return chat_completion.ChatCompletion(
|
||||||
|
id=chunk.id,
|
||||||
|
object="chat.completion",
|
||||||
|
created=chunk.created,
|
||||||
|
choices=[
|
||||||
|
chat_completion.Choice(
|
||||||
|
index=0,
|
||||||
|
message=chat_completion.ChatCompletionMessage(
|
||||||
|
role="assistant",
|
||||||
|
content=pending_content,
|
||||||
|
tool_calls=real_tool_calls if len(real_tool_calls) > 0 else None
|
||||||
|
),
|
||||||
|
finish_reason=chunk.choices[0].finish_reason if hasattr(chunk.choices[0], 'finish_reason') and chunk.choices[0].finish_reason is not None else 'stop',
|
||||||
|
logprobs=chunk.choices[0].logprobs,
|
||||||
|
)
|
||||||
|
],
|
||||||
|
model=chunk.model,
|
||||||
|
service_tier=chunk.service_tier if hasattr(chunk, 'service_tier') else None,
|
||||||
|
system_fingerprint=chunk.system_fingerprint if hasattr(chunk, 'system_fingerprint') else None,
|
||||||
|
usage=chunk.usage if hasattr(chunk, 'usage') else None
|
||||||
|
) if chunk else None
|
||||||
|
|
||||||
async def _make_msg(
|
async def _make_msg(
|
||||||
self,
|
self,
|
||||||
|
|||||||
@@ -46,6 +46,9 @@ class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
|
|||||||
# 发送请求
|
# 发送请求
|
||||||
resp = await self._req(args)
|
resp = await self._req(args)
|
||||||
|
|
||||||
|
if resp is None:
|
||||||
|
raise errors.RequesterError('接口返回为空,请确定模型提供商服务是否正常')
|
||||||
|
|
||||||
# 处理请求结果
|
# 处理请求结果
|
||||||
message = await self._make_msg(resp)
|
message = await self._make_msg(resp)
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ from ..core import app
|
|||||||
|
|
||||||
from .runners import localagent
|
from .runners import localagent
|
||||||
from .runners import difysvapi
|
from .runners import difysvapi
|
||||||
|
from .runners import dashscopeapi
|
||||||
|
|
||||||
class RunnerManager:
|
class RunnerManager:
|
||||||
|
|
||||||
@@ -22,6 +23,8 @@ class RunnerManager:
|
|||||||
self.using_runner = r(self.ap)
|
self.using_runner = r(self.ap)
|
||||||
await self.using_runner.initialize()
|
await self.using_runner.initialize()
|
||||||
break
|
break
|
||||||
|
else:
|
||||||
|
raise ValueError(f"未找到请求运行器: {self.ap.provider_cfg.data['runner']}")
|
||||||
|
|
||||||
def get_runner(self) -> runner.RequestRunner:
|
def get_runner(self) -> runner.RequestRunner:
|
||||||
return self.using_runner
|
return self.using_runner
|
||||||
|
|||||||
@@ -0,0 +1,236 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import typing
|
||||||
|
import json
|
||||||
|
import base64
|
||||||
|
import re
|
||||||
|
|
||||||
|
import dashscope
|
||||||
|
|
||||||
|
from .. import runner
|
||||||
|
from ...core import entities as core_entities
|
||||||
|
from .. import entities as llm_entities
|
||||||
|
from ...utils import image
|
||||||
|
|
||||||
|
class DashscopeAPIError(Exception):
|
||||||
|
"""Dashscope API 请求失败"""
|
||||||
|
|
||||||
|
def __init__(self, message: str):
|
||||||
|
self.message = message
|
||||||
|
super().__init__(self.message)
|
||||||
|
|
||||||
|
|
||||||
|
@runner.runner_class("dashscope-app-api")
|
||||||
|
class DashScopeAPIRunner(runner.RequestRunner):
|
||||||
|
"阿里云百炼DashsscopeAPI对话请求器"
|
||||||
|
|
||||||
|
# 运行器内部使用的配置
|
||||||
|
app_type: str # 应用类型
|
||||||
|
app_id: str # 应用ID
|
||||||
|
api_key: str # API Key
|
||||||
|
references_quote: str # 引用资料提示(当展示回答来源功能开启时,这个变量会作为引用资料名前的提示,可在provider.json中配置)
|
||||||
|
biz_params: dict = {} # 工作流应用参数(仅在工作流应用中生效)
|
||||||
|
|
||||||
|
async def initialize(self):
|
||||||
|
"""初始化"""
|
||||||
|
valid_app_types = ["agent", "workflow"]
|
||||||
|
self.app_type = self.ap.provider_cfg.data["dashscope-app-api"]["app-type"]
|
||||||
|
#检查配置文件中使用的应用类型是否支持
|
||||||
|
if (self.app_type not in valid_app_types):
|
||||||
|
raise DashscopeAPIError(
|
||||||
|
f"不支持的 Dashscope 应用类型: {self.app_type}"
|
||||||
|
)
|
||||||
|
|
||||||
|
#初始化Dashscope 参数配置
|
||||||
|
self.app_id = self.ap.provider_cfg.data["dashscope-app-api"][self.app_type]["app-id"]
|
||||||
|
self.api_key = self.ap.provider_cfg.data["dashscope-app-api"]["api-key"]
|
||||||
|
self.references_quote = self.ap.provider_cfg.data["dashscope-app-api"][self.app_type]["references_quote"]
|
||||||
|
self.biz_params = self.ap.provider_cfg.data["dashscope-app-api"]["workflow"]["biz_params"]
|
||||||
|
|
||||||
|
def _replace_references(self, text, references_dict):
|
||||||
|
"""阿里云百炼平台的自定义应用支持资料引用,此函数可以将引用标签替换为参考资料"""
|
||||||
|
|
||||||
|
# 匹配 <ref>[index_id]</ref> 形式的字符串
|
||||||
|
pattern = re.compile(r'<ref>\[(.*?)\]</ref>')
|
||||||
|
|
||||||
|
def replacement(match):
|
||||||
|
# 获取引用编号
|
||||||
|
ref_key = match.group(1)
|
||||||
|
if ref_key in references_dict:
|
||||||
|
# 如果有对应的参考资料按照provider.json中的reference_quote返回提示,来自哪个参考资料文件
|
||||||
|
return f"({self.references_quote} {references_dict[ref_key]})"
|
||||||
|
else:
|
||||||
|
# 如果没有对应的参考资料,保留原样
|
||||||
|
return match.group(0)
|
||||||
|
|
||||||
|
# 使用 re.sub() 进行替换
|
||||||
|
return pattern.sub(replacement, text)
|
||||||
|
|
||||||
|
async def _preprocess_user_message(
|
||||||
|
self, query: core_entities.Query
|
||||||
|
) -> tuple[str, list[str]]:
|
||||||
|
"""预处理用户消息,提取纯文本,阿里云提供的上传文件方法过于复杂,暂不支持上传文件(包括图片)"""
|
||||||
|
plain_text = ""
|
||||||
|
image_ids = []
|
||||||
|
if isinstance(query.user_message.content, list):
|
||||||
|
for ce in query.user_message.content:
|
||||||
|
if ce.type == "text":
|
||||||
|
plain_text += ce.text
|
||||||
|
# 暂时不支持上传图片,保留代码以便后续扩展
|
||||||
|
# elif ce.type == "image_base64":
|
||||||
|
# image_b64, image_format = await image.extract_b64_and_format(ce.image_base64)
|
||||||
|
# file_bytes = base64.b64decode(image_b64)
|
||||||
|
# file = ("img.png", file_bytes, f"image/{image_format}")
|
||||||
|
# file_upload_resp = await self.dify_client.upload_file(
|
||||||
|
# file,
|
||||||
|
# f"{query.session.launcher_type.value}_{query.session.launcher_id}",
|
||||||
|
# )
|
||||||
|
# image_id = file_upload_resp["id"]
|
||||||
|
# image_ids.append(image_id)
|
||||||
|
elif isinstance(query.user_message.content, str):
|
||||||
|
plain_text = query.user_message.content
|
||||||
|
|
||||||
|
return plain_text, image_ids
|
||||||
|
|
||||||
|
|
||||||
|
async def _agent_messages(
|
||||||
|
self, query: core_entities.Query
|
||||||
|
) -> typing.AsyncGenerator[llm_entities.Message, None]:
|
||||||
|
"""Dashscope 智能体对话请求"""
|
||||||
|
|
||||||
|
#局部变量
|
||||||
|
chunk = None # 流式传输的块
|
||||||
|
pending_content = "" # 待处理的Agent输出内容
|
||||||
|
references_dict = {} # 用于存储引用编号和对应的参考资料
|
||||||
|
plain_text = "" # 用户输入的纯文本信息
|
||||||
|
image_ids = [] # 用户输入的图片ID列表 (暂不支持)
|
||||||
|
|
||||||
|
plain_text, image_ids = await self._preprocess_user_message(query)
|
||||||
|
|
||||||
|
#发送对话请求
|
||||||
|
response = dashscope.Application.call(
|
||||||
|
api_key=self.api_key, # 智能体应用的API Key
|
||||||
|
app_id=self.app_id, # 智能体应用的ID
|
||||||
|
prompt=plain_text, # 用户输入的文本信息
|
||||||
|
stream=True, # 流式输出
|
||||||
|
incremental_output=True, # 增量输出,使用流式输出需要开启增量输出
|
||||||
|
session_id=query.session.using_conversation.uuid, # 会话ID用于,多轮对话
|
||||||
|
# rag_options={ # 主要用于文件交互,暂不支持
|
||||||
|
# "session_file_ids": ["FILE_ID1"], # FILE_ID1 替换为实际的临时文件ID,逗号隔开多个
|
||||||
|
# }
|
||||||
|
)
|
||||||
|
|
||||||
|
for chunk in response:
|
||||||
|
if chunk.get("status_code") != 200:
|
||||||
|
raise DashscopeAPIError(
|
||||||
|
f"Dashscope API 请求失败: status_code={chunk.get('status_code')} message={chunk.get('message')} request_id={chunk.get('request_id')} "
|
||||||
|
)
|
||||||
|
if not chunk:
|
||||||
|
continue
|
||||||
|
|
||||||
|
#获取流式传输的output
|
||||||
|
stream_output = chunk.get("output", {})
|
||||||
|
if stream_output.get("text") is not None:
|
||||||
|
pending_content += stream_output.get("text")
|
||||||
|
|
||||||
|
#保存当前会话的session_id用于下次对话的语境
|
||||||
|
query.session.using_conversation.uuid = stream_output.get("session_id")
|
||||||
|
|
||||||
|
#获取模型传出的参考资料列表
|
||||||
|
references_dict_list = stream_output.get("doc_references", [])
|
||||||
|
|
||||||
|
#从模型传出的参考资料信息中提取用于替换的字典
|
||||||
|
if references_dict_list is not None:
|
||||||
|
for doc in references_dict_list:
|
||||||
|
if doc.get("index_id") is not None:
|
||||||
|
references_dict[doc.get("index_id")] = doc.get("doc_name")
|
||||||
|
|
||||||
|
#将参考资料替换到文本中
|
||||||
|
pending_content = self._replace_references(pending_content, references_dict)
|
||||||
|
|
||||||
|
yield llm_entities.Message(
|
||||||
|
role="assistant",
|
||||||
|
content=pending_content,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def _workflow_messages(
|
||||||
|
self, query: core_entities.Query
|
||||||
|
) -> typing.AsyncGenerator[llm_entities.Message, None]:
|
||||||
|
"""Dashscope 工作流对话请求"""
|
||||||
|
|
||||||
|
#局部变量
|
||||||
|
chunk = None # 流式传输的块
|
||||||
|
pending_content = "" # 待处理的Agent输出内容
|
||||||
|
references_dict = {} # 用于存储引用编号和对应的参考资料
|
||||||
|
plain_text = "" # 用户输入的纯文本信息
|
||||||
|
image_ids = [] # 用户输入的图片ID列表 (暂不支持)
|
||||||
|
|
||||||
|
plain_text, image_ids = await self._preprocess_user_message(query)
|
||||||
|
|
||||||
|
#发送对话请求
|
||||||
|
response = dashscope.Application.call(
|
||||||
|
api_key=self.api_key, # 智能体应用的API Key
|
||||||
|
app_id=self.app_id, # 智能体应用的ID
|
||||||
|
prompt=plain_text, # 用户输入的文本信息
|
||||||
|
stream=True, # 流式输出
|
||||||
|
incremental_output=True, # 增量输出,使用流式输出需要开启增量输出
|
||||||
|
session_id=query.session.using_conversation.uuid, # 会话ID用于,多轮对话
|
||||||
|
biz_params=self.biz_params # 工作流应用的自定义输入参数传递
|
||||||
|
# rag_options={ # 主要用于文件交互,暂不支持
|
||||||
|
# "session_file_ids": ["FILE_ID1"], # FILE_ID1 替换为实际的临时文件ID,逗号隔开多个
|
||||||
|
# }
|
||||||
|
)
|
||||||
|
|
||||||
|
#处理API返回的流式输出
|
||||||
|
for chunk in response:
|
||||||
|
if chunk.get("status_code") != 200:
|
||||||
|
raise DashscopeAPIError(
|
||||||
|
f"Dashscope API 请求失败: status_code={chunk.get('status_code')} message={chunk.get('message')} request_id={chunk.get('request_id')} "
|
||||||
|
)
|
||||||
|
if not chunk:
|
||||||
|
continue
|
||||||
|
|
||||||
|
#获取流式传输的output
|
||||||
|
stream_output = chunk.get("output", {})
|
||||||
|
if stream_output.get("text") is not None:
|
||||||
|
pending_content += stream_output.get("text")
|
||||||
|
|
||||||
|
#保存当前会话的session_id用于下次对话的语境
|
||||||
|
query.session.using_conversation.uuid = stream_output.get("session_id")
|
||||||
|
|
||||||
|
#获取模型传出的参考资料列表
|
||||||
|
references_dict_list = stream_output.get("doc_references", [])
|
||||||
|
|
||||||
|
#从模型传出的参考资料信息中提取用于替换的字典
|
||||||
|
if references_dict_list is not None:
|
||||||
|
for doc in references_dict_list:
|
||||||
|
if doc.get("index_id") is not None:
|
||||||
|
references_dict[doc.get("index_id")] = doc.get("doc_name")
|
||||||
|
|
||||||
|
#将参考资料替换到文本中
|
||||||
|
pending_content = self._replace_references(pending_content, references_dict)
|
||||||
|
|
||||||
|
yield llm_entities.Message(
|
||||||
|
role="assistant",
|
||||||
|
content=pending_content,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
async def run(
|
||||||
|
self, query: core_entities.Query
|
||||||
|
) -> typing.AsyncGenerator[llm_entities.Message, None]:
|
||||||
|
"""运行"""
|
||||||
|
if self.ap.provider_cfg.data["dashscope-app-api"]["app-type"] == "agent":
|
||||||
|
async for msg in self._agent_messages(query):
|
||||||
|
yield msg
|
||||||
|
elif self.ap.provider_cfg.data["dashscope-app-api"]["app-type"] == "workflow":
|
||||||
|
async for msg in self._workflow_messages(query):
|
||||||
|
yield msg
|
||||||
|
else:
|
||||||
|
raise DashscopeAPIError(
|
||||||
|
f"不支持的 Dashscope 应用类型: {self.ap.provider_cfg.data['dashscope-app-api']['app-type']}"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
semantic_version = "v3.4.6"
|
semantic_version = "v3.4.7.2"
|
||||||
|
|
||||||
debug_mode = False
|
debug_mode = False
|
||||||
|
|
||||||
|
|||||||
@@ -30,5 +30,7 @@ discord.py
|
|||||||
cryptography
|
cryptography
|
||||||
gewechat-client
|
gewechat-client
|
||||||
dingtalk_stream
|
dingtalk_stream
|
||||||
|
dashscope
|
||||||
|
|
||||||
# indirect
|
# indirect
|
||||||
taskgroup==0.0.0a4
|
taskgroup==0.0.0a4
|
||||||
@@ -49,7 +49,10 @@
|
|||||||
"enable": false,
|
"enable": false,
|
||||||
"app_id": "cli_abcdefgh",
|
"app_id": "cli_abcdefgh",
|
||||||
"app_secret": "XXXXXXXXXX",
|
"app_secret": "XXXXXXXXXX",
|
||||||
"bot_name": "LangBot"
|
"bot_name": "LangBot",
|
||||||
|
"enable-webhook": false,
|
||||||
|
"port": 2285,
|
||||||
|
"encrypt-key": "xxxxxxxxx"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"adapter": "discord",
|
"adapter": "discord",
|
||||||
@@ -68,11 +71,11 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"adapter":"officialaccount",
|
"adapter":"officialaccount",
|
||||||
"enable": true,
|
"enable": false,
|
||||||
"token": "",
|
"token": "",
|
||||||
"EncodingAESKey":"",
|
"EncodingAESKey":"",
|
||||||
"AppSecret":"",
|
|
||||||
"AppID":"",
|
"AppID":"",
|
||||||
|
"AppSecret":"",
|
||||||
"host": "0.0.0.0",
|
"host": "0.0.0.0",
|
||||||
"port": 2287
|
"port": 2287
|
||||||
},
|
},
|
||||||
|
|||||||
+25
-1
@@ -25,6 +25,9 @@
|
|||||||
],
|
],
|
||||||
"siliconflow": [
|
"siliconflow": [
|
||||||
"xxxxxxx"
|
"xxxxxxx"
|
||||||
|
],
|
||||||
|
"bailian": [
|
||||||
|
"sk-xxxxxxx"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"requester": {
|
"requester": {
|
||||||
@@ -79,12 +82,17 @@
|
|||||||
"base-url": "https://api.siliconflow.cn/v1",
|
"base-url": "https://api.siliconflow.cn/v1",
|
||||||
"args": {},
|
"args": {},
|
||||||
"timeout": 120
|
"timeout": 120
|
||||||
|
},
|
||||||
|
"bailian-chat-completions": {
|
||||||
|
"args": {},
|
||||||
|
"base-url": "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
||||||
|
"timeout": 120
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"model": "gpt-4o",
|
"model": "gpt-4o",
|
||||||
"prompt-mode": "normal",
|
"prompt-mode": "normal",
|
||||||
"prompt": {
|
"prompt": {
|
||||||
"default": ""
|
"default": ""
|
||||||
},
|
},
|
||||||
"runner": "local-agent",
|
"runner": "local-agent",
|
||||||
"dify-service-api": {
|
"dify-service-api": {
|
||||||
@@ -103,5 +111,21 @@
|
|||||||
"output-key": "summary",
|
"output-key": "summary",
|
||||||
"timeout": 120
|
"timeout": 120
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"dashscope-app-api": {
|
||||||
|
"app-type": "agent",
|
||||||
|
"api-key": "sk-1234567890",
|
||||||
|
"agent": {
|
||||||
|
"app-id": "Your_app_id",
|
||||||
|
"references_quote": "参考资料来自:"
|
||||||
|
},
|
||||||
|
"workflow": {
|
||||||
|
"app-id": "Your_app_id",
|
||||||
|
"references_quote": "参考资料来自:",
|
||||||
|
"biz_params": {
|
||||||
|
"city": "北京",
|
||||||
|
"date": "2023-08-10"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -252,6 +252,21 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"default": "",
|
"default": "",
|
||||||
"description": "飞书的bot_name"
|
"description": "飞书的bot_name"
|
||||||
|
},
|
||||||
|
"enable-webhook": {
|
||||||
|
"type": "boolean",
|
||||||
|
"default": false,
|
||||||
|
"description": "是否启用webhook模式"
|
||||||
|
},
|
||||||
|
"port": {
|
||||||
|
"type": "integer",
|
||||||
|
"description": "设置监听的端口,开启callback event时需要设置",
|
||||||
|
"default": 2285
|
||||||
|
},
|
||||||
|
"encrypt-key": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "设置加密密钥"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -332,6 +347,51 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"title": "微信公众号适配器",
|
||||||
|
"description": "用于接入微信公众号",
|
||||||
|
"properties": {
|
||||||
|
"adapter": {
|
||||||
|
"type": "string",
|
||||||
|
"const": "officialaccount"
|
||||||
|
},
|
||||||
|
"enable": {
|
||||||
|
"type": "boolean",
|
||||||
|
"default": false,
|
||||||
|
"description": "是否启用此适配器"
|
||||||
|
},
|
||||||
|
"token": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "微信公众号的token"
|
||||||
|
},
|
||||||
|
"EncodingAESKey": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "微信公众号的EncodingAESKey"
|
||||||
|
},
|
||||||
|
"AppID": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "微信公众号的AppID"
|
||||||
|
},
|
||||||
|
"AppSecret": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "微信公众号的AppSecret"
|
||||||
|
},
|
||||||
|
"host": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "0.0.0.0",
|
||||||
|
"description": "监听的IP地址"
|
||||||
|
},
|
||||||
|
"port": {
|
||||||
|
"type": "integer",
|
||||||
|
"default": 2287,
|
||||||
|
"description": "监听的端口"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"title": "钉钉适配器",
|
"title": "钉钉适配器",
|
||||||
"description": "用于接入钉钉",
|
"description": "用于接入钉钉",
|
||||||
|
|||||||
@@ -82,6 +82,14 @@
|
|||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"default": []
|
"default": []
|
||||||
|
},
|
||||||
|
"bailian": {
|
||||||
|
"type": "array",
|
||||||
|
"title": "阿里云百炼大模型平台 API 密钥",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
},
|
||||||
|
"default": []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -288,6 +296,26 @@
|
|||||||
"default": 120
|
"default": 120
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"bailian-chat-completions": {
|
||||||
|
"type": "object",
|
||||||
|
"title": "阿里云百炼大模型平台 API 请求配置",
|
||||||
|
"description": "仅可编辑 URL 和 超时时间,额外请求参数不支持可视化编辑,请到编辑器编辑",
|
||||||
|
"properties": {
|
||||||
|
"base-url": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "API URL"
|
||||||
|
},
|
||||||
|
"args": {
|
||||||
|
"type": "object",
|
||||||
|
"default": {}
|
||||||
|
},
|
||||||
|
"timeout": {
|
||||||
|
"type": "number",
|
||||||
|
"title": "API 请求超时时间",
|
||||||
|
"default": 120
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -397,6 +425,59 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"dashscope-app-api": {
|
||||||
|
"type": "object",
|
||||||
|
"title": "阿里百炼平台自建应用 API 配置",
|
||||||
|
"properties": {
|
||||||
|
"app-type": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "应用类型",
|
||||||
|
"description": "支持 workflow 和 agent,workflow:智能体编排;agent:普通智能体;请填写下方对应的应用类型 API 参数",
|
||||||
|
"enum": ["workflow", "agent"],
|
||||||
|
"default": "agent"
|
||||||
|
},
|
||||||
|
"api-key": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "API 密钥"
|
||||||
|
},
|
||||||
|
"agent": {
|
||||||
|
"type": "object",
|
||||||
|
"title": "Agent API 参数",
|
||||||
|
"properties": {
|
||||||
|
"app-id": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "应用 ID"
|
||||||
|
},
|
||||||
|
"references_quote": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "参考资料引用",
|
||||||
|
"description": "设置参考资料引用,用于从 Dashscope App API 结束节点返回的 JSON 数据中提取引用内容",
|
||||||
|
"default": "参考资料来自:"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"workflow": {
|
||||||
|
"type": "object",
|
||||||
|
"title": "工作流 API 参数",
|
||||||
|
"properties": {
|
||||||
|
"app-id": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "应用 ID"
|
||||||
|
},
|
||||||
|
"references_quote": {
|
||||||
|
"type": "string",
|
||||||
|
"title": "参考资料引用",
|
||||||
|
"default": "参考资料来自:"
|
||||||
|
},
|
||||||
|
"biz_params": {
|
||||||
|
"type": "object",
|
||||||
|
"title": "传入参数",
|
||||||
|
"default": {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Generated
+6
-6
@@ -4410,14 +4410,14 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/jsonpath-plus": {
|
"node_modules/jsonpath-plus": {
|
||||||
"version": "10.1.0",
|
"version": "10.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.2.0.tgz",
|
||||||
"integrity": "sha512-gHfV1IYqH8uJHYVTs8BJX1XKy2/rR93+f8QQi0xhx95aCiXn1ettYAd5T+7FU6wfqyDoX/wy0pm/fL3jOKJ9Lg==",
|
"integrity": "sha512-T9V+8iNYKFL2n2rF+w02LBOT2JjDnTjioaNFrxRy0Bv1y/hNsqR/EBK7Ojy2ythRHwmz2cRIls+9JitQGZC/sw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@jsep-plugin/assignment": "^1.2.1",
|
"@jsep-plugin/assignment": "^1.3.0",
|
||||||
"@jsep-plugin/regex": "^1.0.3",
|
"@jsep-plugin/regex": "^1.0.4",
|
||||||
"jsep": "^1.3.9"
|
"jsep": "^1.4.0"
|
||||||
},
|
},
|
||||||
"bin": {
|
"bin": {
|
||||||
"jsonpath": "bin/jsonpath-cli.js",
|
"jsonpath": "bin/jsonpath-cli.js",
|
||||||
|
|||||||
Reference in New Issue
Block a user