diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 397c49fe..7181f918 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -11,9 +11,12 @@ body:
- 其他（或暂未使用）
- Nakuru（go-cqhttp）
- aiocqhttp（使用 OneBot 协议接入的）
- - qq-botpy（QQ官方API）
+ - qq-botpy（QQ官方API WebSocket）
+ - qqofficial（QQ官方API Webhook）
- lark（飞书）
- wecom（企业微信）
+ - gewechat（个人微信）
+ - discord
validations:
required: true
- type: input
diff --git a/README.md b/README.md
index fc78032c..8fa57c20 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
-
+
项目主页 ｜
功能介绍 ｜
@@ -22,12 +22,13 @@
+[](https://discord.gg/wdNEHETs87)
[](https://qm.qq.com/q/PF9OuQCCcM)
[](https://github.com/RockChinQ/LangBot/releases/latest)
-[简体中文](README.md) / [English](README_EN.md)
+[简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.md)
-
+
Home ｜
Features ｜
@@ -21,12 +21,12 @@
-
+[](https://discord.gg/wdNEHETs87)
[](https://github.com/RockChinQ/LangBot/releases/latest)
)
-[简体中文](README.md) / [English](README_EN.md)
+[简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.md)
+
+
+
+
+
+
+
+
+
ホーム ｜
+
機能 ｜
+
デプロイ ｜
+
FAQ ｜
+
プラグイン ｜
+
プラグインの提出
+
+
+😎高い安定性、🧩拡張サポート、🦄マルチモーダル - LLMネイティブインスタントメッセージングボットプラットフォーム🤖
+
+
+
+
+[](https://discord.gg/wdNEHETs87)
+[](https://github.com/RockChinQ/LangBot/releases/latest)
+ )
+
+
+[简体中文](README.md) / [English](README_EN.md) / [日本語](README_JP.md)
+
+
+
+- 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プラットフォーム |
+
+## 🤝 コミュニティ貢献
+
+以下の貢献者とコミュニティの皆さんの貢献に感謝します。
+
+
+
+ 
+
+
+
diff --git a/pkg/core/bootutils/deps.py b/pkg/core/bootutils/deps.py
index 89a03df8..7d779271 100644
--- a/pkg/core/bootutils/deps.py
+++ b/pkg/core/bootutils/deps.py
@@ -31,6 +31,7 @@ required_deps = {
"cryptography": "cryptography",
"gewechat_client": "gewechat-client",
"dingtalk_stream": "dingtalk_stream",
+ "dashscope": "dashscope",
}
diff --git a/pkg/core/migrations/m021_lark_config.py b/pkg/core/migrations/m021_lark_config.py
index 04c83caf..03d3c9a5 100644
--- a/pkg/core/migrations/m021_lark_config.py
+++ b/pkg/core/migrations/m021_lark_config.py
@@ -23,7 +23,10 @@ class LarkConfigMigration(migration.Migration):
"enable": False,
"app_id": "cli_abcdefgh",
"app_secret": "XXXXXXXXXX",
- "bot_name": "LangBot"
+ "bot_name": "LangBot",
+ "enable-webhook": False,
+ "port": 2285,
+ "encrypt-key": "xxxxxxxxx"
})
await self.ap.platform_cfg.dump_config()
diff --git a/pkg/core/migrations/m027_wx_official_account_config.py b/pkg/core/migrations/m027_wx_official_account_config.py
new file mode 100644
index 00000000..510b7108
--- /dev/null
+++ b/pkg/core/migrations/m027_wx_official_account_config.py
@@ -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()
diff --git a/pkg/core/migrations/m028_aliyun_requester_config.py b/pkg/core/migrations/m028_aliyun_requester_config.py
new file mode 100644
index 00000000..f28bc04f
--- /dev/null
+++ b/pkg/core/migrations/m028_aliyun_requester_config.py
@@ -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()
diff --git a/pkg/core/migrations/m029_dashscope_app_api_config.py b/pkg/core/migrations/m029_dashscope_app_api_config.py
new file mode 100644
index 00000000..3a069bac
--- /dev/null
+++ b/pkg/core/migrations/m029_dashscope_app_api_config.py
@@ -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()
diff --git a/pkg/core/migrations/m030_lark_config_cmpl.py b/pkg/core/migrations/m030_lark_config_cmpl.py
new file mode 100644
index 00000000..e016af7b
--- /dev/null
+++ b/pkg/core/migrations/m030_lark_config_cmpl.py
@@ -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()
diff --git a/pkg/core/notes/n003_print_version.py b/pkg/core/notes/n003_print_version.py
new file mode 100644
index 00000000..6eed21d6
--- /dev/null
+++ b/pkg/core/notes/n003_print_version.py
@@ -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
diff --git a/pkg/core/stages/migrate.py b/pkg/core/stages/migrate.py
index 78cc5e0b..5fab90c1 100644
--- a/pkg/core/stages/migrate.py
+++ b/pkg/core/stages/migrate.py
@@ -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 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 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")
class MigrationStage(stage.BootingStage):
diff --git a/pkg/core/stages/show_notes.py b/pkg/core/stages/show_notes.py
index 91cdbf01..63d8f580 100644
--- a/pkg/core/stages/show_notes.py
+++ b/pkg/core/stages/show_notes.py
@@ -1,7 +1,7 @@
from __future__ import annotations
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")
diff --git a/pkg/pipeline/wrapper/wrapper.py b/pkg/pipeline/wrapper/wrapper.py
index 1ffb3147..a06e4a80 100644
--- a/pkg/pipeline/wrapper/wrapper.py
+++ b/pkg/pipeline/wrapper/wrapper.py
@@ -102,7 +102,7 @@ class ResponseWrapper(stage.PipelineStage):
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]
diff --git a/pkg/platform/sources/lark.py b/pkg/platform/sources/lark.py
index b4b346db..81ae76c5 100644
--- a/pkg/platform/sources/lark.py
+++ b/pkg/platform/sources/lark.py
@@ -11,10 +11,16 @@ import base64
import uuid
import json
import datetime
+import hashlib
+import base64
+from Crypto.Cipher import AES
import aiohttp
import lark_oapi.ws.exception
+import quart
+from flask import jsonify
from lark_oapi.api.im.v1 import *
+from lark_oapi.api.verification.v1 import GetVerificationRequest
from .. import adapter
from ...pipeline.longtext.strategies import forward
@@ -25,6 +31,28 @@ from ..types import entities as platform_entities
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):
@staticmethod
@@ -288,12 +316,57 @@ class LarkMessageSourceAdapter(adapter.MessageSourceAdapter):
] = {}
config: dict
-
+ quart_app: quart.Quart
ap: app.Application
def __init__(self, config: dict, ap: app.Application):
self.config = config
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):
@@ -392,16 +465,29 @@ class LarkMessageSourceAdapter(adapter.MessageSourceAdapter):
self.listeners.pop(event_type)
async def run_async(self):
- 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
+ port = self.config['port']
+ enable_webhook = self.config['enable-webhook']
+ 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:
return False
diff --git a/pkg/platform/sources/qqofficial.py b/pkg/platform/sources/qqofficial.py
index 924e7ba0..7993062a 100644
--- a/pkg/platform/sources/qqofficial.py
+++ b/pkg/platform/sources/qqofficial.py
@@ -47,6 +47,7 @@ class QQOfficialMessageConverter(adapter.MessageConverter):
yiri_msg_list.append(
platform_message.Image(base64=base64_url)
)
+
yiri_msg_list.append(platform_message.Plain(text=message))
chain = platform_message.MessageChain(yiri_msg_list)
return chain
diff --git a/pkg/platform/sources/wecom.py b/pkg/platform/sources/wecom.py
index 5d127958..24f22bd4 100644
--- a/pkg/platform/sources/wecom.py
+++ b/pkg/platform/sources/wecom.py
@@ -130,7 +130,7 @@ class WecomEventConverter:
)
elif event.type == "image":
friend = platform_entities.Friend(
- id=event.user_id,
+ id=f"u{event.user_id}",
nickname=str(event.agent_id),
remark="",
)
diff --git a/pkg/provider/modelmgr/modelmgr.py b/pkg/provider/modelmgr/modelmgr.py
index 33a65ff3..489a322f 100644
--- a/pkg/provider/modelmgr/modelmgr.py
+++ b/pkg/provider/modelmgr/modelmgr.py
@@ -6,7 +6,7 @@ from . import entities, requester
from ...core import app
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"
diff --git a/pkg/provider/modelmgr/requesters/bailianchatcmpl.py b/pkg/provider/modelmgr/requesters/bailianchatcmpl.py
new file mode 100644
index 00000000..cce003bd
--- /dev/null
+++ b/pkg/provider/modelmgr/requesters/bailianchatcmpl.py
@@ -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']
diff --git a/pkg/provider/modelmgr/requesters/chatcmpl.py b/pkg/provider/modelmgr/requesters/chatcmpl.py
index 9e3014af..c2edcf9a 100644
--- a/pkg/provider/modelmgr/requesters/chatcmpl.py
+++ b/pkg/provider/modelmgr/requesters/chatcmpl.py
@@ -8,6 +8,7 @@ from typing import AsyncGenerator
import openai
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 aiohttp
import async_lru
@@ -40,6 +41,7 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
timeout=self.requester_cfg['timeout'],
http_client=httpx.AsyncClient(
trust_env=True,
+ timeout=self.requester_cfg['timeout']
)
)
@@ -47,7 +49,70 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
self,
args: dict,
) -> 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(
self,
diff --git a/pkg/provider/modelmgr/requesters/deepseekchatcmpl.py b/pkg/provider/modelmgr/requesters/deepseekchatcmpl.py
index bf414745..7b8c9ca8 100644
--- a/pkg/provider/modelmgr/requesters/deepseekchatcmpl.py
+++ b/pkg/provider/modelmgr/requesters/deepseekchatcmpl.py
@@ -46,6 +46,9 @@ class DeepseekChatCompletions(chatcmpl.OpenAIChatCompletions):
# 发送请求
resp = await self._req(args)
+ if resp is None:
+ raise errors.RequesterError('接口返回为空，请确定模型提供商服务是否正常')
+
# 处理请求结果
message = await self._make_msg(resp)
diff --git a/pkg/provider/runnermgr.py b/pkg/provider/runnermgr.py
index f45abfa4..52e1d8d2 100644
--- a/pkg/provider/runnermgr.py
+++ b/pkg/provider/runnermgr.py
@@ -5,6 +5,7 @@ from ..core import app
from .runners import localagent
from .runners import difysvapi
+from .runners import dashscopeapi
class RunnerManager:
@@ -22,6 +23,8 @@ class RunnerManager:
self.using_runner = r(self.ap)
await self.using_runner.initialize()
break
+ else:
+ raise ValueError(f"未找到请求运行器: {self.ap.provider_cfg.data['runner']}")
def get_runner(self) -> runner.RequestRunner:
return self.using_runner
diff --git a/pkg/provider/runners/dashscopeapi.py b/pkg/provider/runners/dashscopeapi.py
new file mode 100644
index 00000000..0201f35d
--- /dev/null
+++ b/pkg/provider/runners/dashscopeapi.py
@@ -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):
+ """阿里云百炼平台的自定义应用支持资料引用，此函数可以将引用标签替换为参考资料"""
+
+ # 匹配 [[index_id]] 形式的字符串
+ pattern = re.compile(r'[\[(.*?)\]]')
+
+ 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']}"
+ )
+
+
diff --git a/pkg/utils/constants.py b/pkg/utils/constants.py
index 0dce973c..abb7d50c 100644
--- a/pkg/utils/constants.py
+++ b/pkg/utils/constants.py
@@ -1,4 +1,4 @@
-semantic_version = "v3.4.6"
+semantic_version = "v3.4.7.2"
debug_mode = False
diff --git a/requirements.txt b/requirements.txt
index b6a3f066..63f5947f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,5 +30,7 @@ discord.py
cryptography
gewechat-client
dingtalk_stream
+dashscope
+
# indirect
taskgroup==0.0.0a4
\ No newline at end of file
diff --git a/templates/platform.json b/templates/platform.json
index 2efdf521..0c2b778e 100644
--- a/templates/platform.json
+++ b/templates/platform.json
@@ -49,7 +49,10 @@
"enable": false,
"app_id": "cli_abcdefgh",
"app_secret": "XXXXXXXXXX",
- "bot_name": "LangBot"
+ "bot_name": "LangBot",
+ "enable-webhook": false,
+ "port": 2285,
+ "encrypt-key": "xxxxxxxxx"
},
{
"adapter": "discord",
@@ -68,11 +71,11 @@
},
{
"adapter":"officialaccount",
- "enable": true,
+ "enable": false,
"token": "",
"EncodingAESKey":"",
- "AppSecret":"",
"AppID":"",
+ "AppSecret":"",
"host": "0.0.0.0",
"port": 2287
},
diff --git a/templates/provider.json b/templates/provider.json
index 5ab5cd64..3072a5de 100644
--- a/templates/provider.json
+++ b/templates/provider.json
@@ -25,6 +25,9 @@
],
"siliconflow": [
"xxxxxxx"
+ ],
+ "bailian": [
+ "sk-xxxxxxx"
]
},
"requester": {
@@ -79,12 +82,17 @@
"base-url": "https://api.siliconflow.cn/v1",
"args": {},
"timeout": 120
+ },
+ "bailian-chat-completions": {
+ "args": {},
+ "base-url": "https://dashscope.aliyuncs.com/compatible-mode/v1",
+ "timeout": 120
}
},
"model": "gpt-4o",
"prompt-mode": "normal",
"prompt": {
- "default": ""
+ "default": ""
},
"runner": "local-agent",
"dify-service-api": {
@@ -103,5 +111,21 @@
"output-key": "summary",
"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"
+ }
+ }
}
}
\ No newline at end of file
diff --git a/templates/schema/platform.json b/templates/schema/platform.json
index 4b43cfbe..8d2f436c 100644
--- a/templates/schema/platform.json
+++ b/templates/schema/platform.json
@@ -252,6 +252,21 @@
"type": "string",
"default": "",
"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": "钉钉适配器",
"description": "用于接入钉钉",
diff --git a/templates/schema/provider.json b/templates/schema/provider.json
index bd2084b8..30905c95 100644
--- a/templates/schema/provider.json
+++ b/templates/schema/provider.json
@@ -82,6 +82,14 @@
"type": "string"
},
"default": []
+ },
+ "bailian": {
+ "type": "array",
+ "title": "阿里云百炼大模型平台 API 密钥",
+ "items": {
+ "type": "string"
+ },
+ "default": []
}
}
},
@@ -288,6 +296,26 @@
"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": {}
+ }
+ }
+ }
+ }
}
}
}
\ No newline at end of file
diff --git a/web/package-lock.json b/web/package-lock.json
index d692c64b..331b2815 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -4410,14 +4410,14 @@
}
},
"node_modules/jsonpath-plus": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.1.0.tgz",
- "integrity": "sha512-gHfV1IYqH8uJHYVTs8BJX1XKy2/rR93+f8QQi0xhx95aCiXn1ettYAd5T+7FU6wfqyDoX/wy0pm/fL3jOKJ9Lg==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.2.0.tgz",
+ "integrity": "sha512-T9V+8iNYKFL2n2rF+w02LBOT2JjDnTjioaNFrxRy0Bv1y/hNsqR/EBK7Ojy2ythRHwmz2cRIls+9JitQGZC/sw==",
"license": "MIT",
"dependencies": {
- "@jsep-plugin/assignment": "^1.2.1",
- "@jsep-plugin/regex": "^1.0.3",
- "jsep": "^1.3.9"
+ "@jsep-plugin/assignment": "^1.3.0",
+ "@jsep-plugin/regex": "^1.0.4",
+ "jsep": "^1.4.0"
},
"bin": {
"jsonpath": "bin/jsonpath-cli.js",