mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-06-09 15:26:03 +00:00
Compare commits
50 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8a9000cc67 | ||
|
|
6e3514c0b2 | ||
|
|
2782c8cebe | ||
|
|
13e29a9966 | ||
|
|
601b0a8964 | ||
|
|
7c2ceb0aca | ||
|
|
42fabd5133 | ||
|
|
210a8856e2 | ||
|
|
c531cb11af | ||
|
|
07e073f526 | ||
|
|
c5457374a8 | ||
|
|
5198349591 | ||
|
|
8a4967525a | ||
|
|
30b068c6e2 | ||
|
|
ea3fff59ac | ||
|
|
b09ce8296f | ||
|
|
f9d07779a9 | ||
|
|
51634c1caf | ||
|
|
0e00da6617 | ||
|
|
5ee6baeaaa | ||
|
|
f11a036c60 | ||
|
|
0ac02ff4ce | ||
|
|
99cc50b5cb | ||
|
|
1d8fb02989 | ||
|
|
122cb1188c | ||
|
|
ca36ade288 | ||
|
|
0877046db7 | ||
|
|
ce9615a00e | ||
|
|
dbe5a41395 | ||
|
|
4a4ca54c6e | ||
|
|
47acb63feb | ||
|
|
038c5d41e2 | ||
|
|
011a795895 | ||
|
|
873a0339d8 | ||
|
|
715da548c8 | ||
|
|
5378c6ba35 | ||
|
|
8799f86ea4 | ||
|
|
686be4acbc | ||
|
|
5744eca37a | ||
|
|
70f8ddb1ba | ||
|
|
be1328cee9 | ||
|
|
c0dbf6fd13 | ||
|
|
512371cc25 | ||
|
|
cd4a06b692 | ||
|
|
432440d6bf | ||
|
|
71ffbb9eb5 | ||
|
|
e22c804deb | ||
|
|
c136e790ef | ||
|
|
3697afd9d6 | ||
|
|
c597c6482a |
16
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
16
.github/ISSUE_TEMPLATE/bug-report.yml
vendored
@@ -3,22 +3,6 @@ description: 报错或漏洞请使用这个模板创建,不使用此模板创
|
|||||||
title: "[Bug]: "
|
title: "[Bug]: "
|
||||||
labels: ["bug?"]
|
labels: ["bug?"]
|
||||||
body:
|
body:
|
||||||
- type: dropdown
|
|
||||||
attributes:
|
|
||||||
label: 消息平台适配器
|
|
||||||
description: "接入的消息平台类型"
|
|
||||||
options:
|
|
||||||
- 其他(或暂未使用)
|
|
||||||
- Nakuru(go-cqhttp)
|
|
||||||
- aiocqhttp(使用 OneBot 协议接入的)
|
|
||||||
- qq-botpy(QQ官方API WebSocket)
|
|
||||||
- qqofficial(QQ官方API Webhook)
|
|
||||||
- lark(飞书)
|
|
||||||
- wecom(企业微信)
|
|
||||||
- gewechat(个人微信)
|
|
||||||
- discord
|
|
||||||
validations:
|
|
||||||
required: true
|
|
||||||
- type: input
|
- type: input
|
||||||
attributes:
|
attributes:
|
||||||
label: 运行环境
|
label: 运行环境
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -39,3 +39,4 @@ botpy.log*
|
|||||||
/libs/wecom_api/test.py
|
/libs/wecom_api/test.py
|
||||||
/venv
|
/venv
|
||||||
/jp-tyo-churros-05.rockchin.top
|
/jp-tyo-churros-05.rockchin.top
|
||||||
|
test.py
|
||||||
@@ -87,13 +87,14 @@
|
|||||||
| QQ 个人号 | ✅ | QQ 个人号私聊、群聊 |
|
| QQ 个人号 | ✅ | QQ 个人号私聊、群聊 |
|
||||||
| QQ 官方机器人 | ✅ | QQ 官方机器人,支持频道、私聊、群聊 |
|
| QQ 官方机器人 | ✅ | QQ 官方机器人,支持频道、私聊、群聊 |
|
||||||
| 企业微信 | ✅ | |
|
| 企业微信 | ✅ | |
|
||||||
|
| 企微对外客服 | ✅ | |
|
||||||
| 个人微信 | ✅ | 使用 [Gewechat](https://github.com/Devo919/Gewechat) 接入 |
|
| 个人微信 | ✅ | 使用 [Gewechat](https://github.com/Devo919/Gewechat) 接入 |
|
||||||
| 微信公众号 | ✅ | |
|
| 微信公众号 | ✅ | |
|
||||||
| 飞书 | ✅ | |
|
| 飞书 | ✅ | |
|
||||||
| 钉钉 | ✅ | |
|
| 钉钉 | ✅ | |
|
||||||
| Discord | ✅ | |
|
| Discord | ✅ | |
|
||||||
| Telegram | ✅ | |
|
| Telegram | ✅ | |
|
||||||
| Slack | 🚧 | |
|
| Slack | ✅ | |
|
||||||
| LINE | 🚧 | |
|
| LINE | 🚧 | |
|
||||||
| WhatsApp | 🚧 | |
|
| WhatsApp | 🚧 | |
|
||||||
|
|
||||||
@@ -116,6 +117,7 @@
|
|||||||
| [SiliconFlow](https://siliconflow.cn/) | ✅ | 大模型聚合平台 |
|
| [SiliconFlow](https://siliconflow.cn/) | ✅ | 大模型聚合平台 |
|
||||||
| [阿里云百炼](https://bailian.console.aliyun.com/) | ✅ | 大模型聚合平台, LLMOps 平台 |
|
| [阿里云百炼](https://bailian.console.aliyun.com/) | ✅ | 大模型聚合平台, LLMOps 平台 |
|
||||||
| [火山方舟](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | 大模型聚合平台, LLMOps 平台 |
|
| [火山方舟](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | 大模型聚合平台, LLMOps 平台 |
|
||||||
|
| [ModelScope](https://modelscope.cn/docs/model-service/API-Inference/intro) | ✅ | 大模型聚合平台 |
|
||||||
| [MCP](https://modelcontextprotocol.io/) | ✅ | 支持通过 MCP 协议获取工具 |
|
| [MCP](https://modelcontextprotocol.io/) | ✅ | 支持通过 MCP 协议获取工具 |
|
||||||
|
|
||||||
### TTS
|
### TTS
|
||||||
|
|||||||
@@ -85,12 +85,13 @@ 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 | ✅ | |
|
||||||
|
| WeComCS | ✅ | |
|
||||||
| Personal WeChat | ✅ | Use [Gewechat](https://github.com/Devo919/Gewechat) to access |
|
| Personal WeChat | ✅ | Use [Gewechat](https://github.com/Devo919/Gewechat) to access |
|
||||||
| Lark | ✅ | |
|
| Lark | ✅ | |
|
||||||
| DingTalk | ✅ | |
|
| DingTalk | ✅ | |
|
||||||
| Discord | ✅ | |
|
| Discord | ✅ | |
|
||||||
| Telegram | ✅ | |
|
| Telegram | ✅ | |
|
||||||
| Slack | 🚧 | |
|
| Slack | ✅ | |
|
||||||
| LINE | 🚧 | |
|
| LINE | 🚧 | |
|
||||||
| WhatsApp | 🚧 | |
|
| WhatsApp | 🚧 | |
|
||||||
|
|
||||||
@@ -113,6 +114,7 @@ Directly use the released version to run, see the [Manual Deployment](https://do
|
|||||||
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLM gateway(MaaS) |
|
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLM gateway(MaaS) |
|
||||||
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLM gateway(MaaS), LLMOps platform |
|
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLM gateway(MaaS), LLMOps platform |
|
||||||
| [Volc Engine Ark](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | LLM gateway(MaaS), LLMOps platform |
|
| [Volc Engine Ark](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | LLM gateway(MaaS), LLMOps platform |
|
||||||
|
| [ModelScope](https://modelscope.cn/docs/model-service/API-Inference/intro) | ✅ | LLM gateway(MaaS) |
|
||||||
| [MCP](https://modelcontextprotocol.io/) | ✅ | Support tool access through MCP protocol |
|
| [MCP](https://modelcontextprotocol.io/) | ✅ | Support tool access through MCP protocol |
|
||||||
|
|
||||||
## 🤝 Community Contribution
|
## 🤝 Community Contribution
|
||||||
|
|||||||
@@ -84,12 +84,13 @@ LangBotはBTPanelにリストされています。BTPanelをインストール
|
|||||||
| 個人QQ | ✅ | |
|
| 個人QQ | ✅ | |
|
||||||
| QQ公式API | ✅ | |
|
| QQ公式API | ✅ | |
|
||||||
| WeCom | ✅ | |
|
| WeCom | ✅ | |
|
||||||
|
| WeComCS | ✅ | |
|
||||||
| 個人WeChat | ✅ | [Gewechat](https://github.com/Devo919/Gewechat)を使用して接続 |
|
| 個人WeChat | ✅ | [Gewechat](https://github.com/Devo919/Gewechat)を使用して接続 |
|
||||||
| Lark | ✅ | |
|
| Lark | ✅ | |
|
||||||
| DingTalk | ✅ | |
|
| DingTalk | ✅ | |
|
||||||
| Discord | ✅ | |
|
| Discord | ✅ | |
|
||||||
| Telegram | ✅ | |
|
| Telegram | ✅ | |
|
||||||
| Slack | 🚧 | |
|
| Slack | ✅ | |
|
||||||
| LINE | 🚧 | |
|
| LINE | 🚧 | |
|
||||||
| WhatsApp | 🚧 | |
|
| WhatsApp | 🚧 | |
|
||||||
|
|
||||||
@@ -112,6 +113,7 @@ LangBotはBTPanelにリストされています。BTPanelをインストール
|
|||||||
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLMゲートウェイ(MaaS) |
|
| [SiliconFlow](https://siliconflow.cn/) | ✅ | LLMゲートウェイ(MaaS) |
|
||||||
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム |
|
| [Aliyun Bailian](https://bailian.console.aliyun.com/) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム |
|
||||||
| [Volc Engine Ark](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム |
|
| [Volc Engine Ark](https://console.volcengine.com/ark/region:ark+cn-beijing/model?vendor=Bytedance&view=LIST_VIEW) | ✅ | LLMゲートウェイ(MaaS), LLMOpsプラットフォーム |
|
||||||
|
| [ModelScope](https://modelscope.cn/docs/model-service/API-Inference/intro) | ✅ | LLMゲートウェイ(MaaS) |
|
||||||
| [MCP](https://modelcontextprotocol.io/) | ✅ | MCPプロトコルをサポート |
|
| [MCP](https://modelcontextprotocol.io/) | ✅ | MCPプロトコルをサポート |
|
||||||
|
|
||||||
## 🤝 コミュニティ貢献
|
## 🤝 コミュニティ貢献
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ services:
|
|||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
- ./plugins:/app/plugins
|
- ./plugins:/app/plugins
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
|
environment:
|
||||||
|
- TZ=Asia/Shanghai
|
||||||
ports:
|
ports:
|
||||||
- 5300:5300 # 供 WebUI 使用
|
- 5300:5300 # 供 WebUI 使用
|
||||||
- 2280-2290:2280-2290 # 供消息平台适配器方向连接
|
- 2280-2290:2280-2290 # 供消息平台适配器方向连接
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import traceback
|
|||||||
|
|
||||||
|
|
||||||
class DingTalkClient:
|
class DingTalkClient:
|
||||||
def __init__(self, client_id: str, client_secret: str,robot_name:str,robot_code:str):
|
def __init__(self, client_id: str, client_secret: str,robot_name:str,robot_code:str,markdown_card:bool):
|
||||||
"""初始化 WebSocket 连接并自动启动"""
|
"""初始化 WebSocket 连接并自动启动"""
|
||||||
self.credential = dingtalk_stream.Credential(client_id, client_secret)
|
self.credential = dingtalk_stream.Credential(client_id, client_secret)
|
||||||
self.client = dingtalk_stream.DingTalkStreamClient(self.credential)
|
self.client = dingtalk_stream.DingTalkStreamClient(self.credential)
|
||||||
@@ -26,6 +26,7 @@ class DingTalkClient:
|
|||||||
self.robot_name = robot_name
|
self.robot_name = robot_name
|
||||||
self.robot_code = robot_code
|
self.robot_code = robot_code
|
||||||
self.access_token_expiry_time = ''
|
self.access_token_expiry_time = ''
|
||||||
|
self.markdown_card = markdown_card
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -128,7 +129,10 @@ class DingTalkClient:
|
|||||||
|
|
||||||
|
|
||||||
async def send_message(self,content:str,incoming_message):
|
async def send_message(self,content:str,incoming_message):
|
||||||
self.EchoTextHandler.reply_text(content,incoming_message)
|
if self.markdown_card:
|
||||||
|
self.EchoTextHandler.reply_markdown(title=self.robot_name+'的回答',text=content,incoming_message=incoming_message)
|
||||||
|
else:
|
||||||
|
self.EchoTextHandler.reply_text(content,incoming_message)
|
||||||
|
|
||||||
|
|
||||||
async def get_incoming_message(self):
|
async def get_incoming_message(self):
|
||||||
|
|||||||
0
libs/slack_api/__init__.py
Normal file
0
libs/slack_api/__init__.py
Normal file
111
libs/slack_api/api.py
Normal file
111
libs/slack_api/api.py
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import json
|
||||||
|
from quart import Quart, jsonify,request
|
||||||
|
from slack_sdk.web.async_client import AsyncWebClient
|
||||||
|
from .slackevent import SlackEvent
|
||||||
|
from typing import Callable, Dict, Any
|
||||||
|
from pkg.platform.types import events as platform_events, message as platform_message
|
||||||
|
|
||||||
|
class SlackClient():
|
||||||
|
|
||||||
|
def __init__(self,bot_token:str,signing_secret:str):
|
||||||
|
|
||||||
|
self.bot_token = bot_token
|
||||||
|
self.signing_secret = signing_secret
|
||||||
|
self.app = Quart(__name__)
|
||||||
|
self.client = AsyncWebClient(self.bot_token)
|
||||||
|
self.app.add_url_rule('/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST'])
|
||||||
|
self._message_handlers = {
|
||||||
|
"example":[],
|
||||||
|
}
|
||||||
|
self.bot_user_id = None # 避免机器人回复自己的消息
|
||||||
|
|
||||||
|
async def handle_callback_request(self):
|
||||||
|
try:
|
||||||
|
body = await request.get_data()
|
||||||
|
data = json.loads(body)
|
||||||
|
if 'type' in data:
|
||||||
|
if data['type'] == 'url_verification':
|
||||||
|
return data['challenge']
|
||||||
|
|
||||||
|
bot_user_id = data.get("event",{}).get("bot_id","")
|
||||||
|
|
||||||
|
if self.bot_user_id and bot_user_id == self.bot_user_id:
|
||||||
|
return jsonify({'status': 'ok'})
|
||||||
|
|
||||||
|
|
||||||
|
# 处理私信
|
||||||
|
if data and data.get("event", {}).get("channel_type") in ["im"]:
|
||||||
|
event = SlackEvent.from_payload(data)
|
||||||
|
await self._handle_message(event)
|
||||||
|
return jsonify({'status': 'ok'})
|
||||||
|
|
||||||
|
#处理群聊
|
||||||
|
if data.get("event",{}).get("type") == 'app_mention':
|
||||||
|
data.setdefault("event", {})["channel_type"] = "channel"
|
||||||
|
event = SlackEvent.from_payload(data)
|
||||||
|
await self._handle_message(event)
|
||||||
|
return jsonify({'status':'ok'})
|
||||||
|
|
||||||
|
return jsonify({'status': 'ok'})
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
raise(e)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
async def _handle_message(self, event: SlackEvent):
|
||||||
|
"""
|
||||||
|
处理消息事件。
|
||||||
|
"""
|
||||||
|
msg_type = event.type
|
||||||
|
if msg_type in self._message_handlers:
|
||||||
|
for handler in self._message_handlers[msg_type]:
|
||||||
|
await handler(event)
|
||||||
|
|
||||||
|
def on_message(self, msg_type: str):
|
||||||
|
"""注册消息类型处理器"""
|
||||||
|
def decorator(func: Callable[[platform_events.Event], None]):
|
||||||
|
if msg_type not in self._message_handlers:
|
||||||
|
self._message_handlers[msg_type] = []
|
||||||
|
self._message_handlers[msg_type].append(func)
|
||||||
|
return func
|
||||||
|
return decorator
|
||||||
|
|
||||||
|
async def send_message_to_channel(self,text:str,channel_id:str):
|
||||||
|
try:
|
||||||
|
response = await self.client.chat_postMessage(
|
||||||
|
channel=channel_id,
|
||||||
|
text=text
|
||||||
|
)
|
||||||
|
if self.bot_user_id is None and response.get("ok"):
|
||||||
|
self.bot_user_id = response["message"]["bot_id"]
|
||||||
|
return
|
||||||
|
except Exception as e:
|
||||||
|
raise e
|
||||||
|
|
||||||
|
async def send_message_to_one(self,text:str,user_id:str):
|
||||||
|
try:
|
||||||
|
response = await self.client.chat_postMessage(
|
||||||
|
channel = '@'+user_id,
|
||||||
|
text= text
|
||||||
|
)
|
||||||
|
if self.bot_user_id is None and response.get("ok"):
|
||||||
|
self.bot_user_id = response["message"]["bot_id"]
|
||||||
|
|
||||||
|
return
|
||||||
|
except Exception as e:
|
||||||
|
raise e
|
||||||
|
|
||||||
|
async def run_task(self, host: str, port: int, *args, **kwargs):
|
||||||
|
"""
|
||||||
|
启动 Quart 应用。
|
||||||
|
"""
|
||||||
|
await self.app.run_task(host=host, port=port, *args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
91
libs/slack_api/slackevent.py
Normal file
91
libs/slack_api/slackevent.py
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
from typing import Dict, Any, Optional
|
||||||
|
|
||||||
|
class SlackEvent(dict):
|
||||||
|
@staticmethod
|
||||||
|
def from_payload(payload: Dict[str, Any]) -> Optional["SlackEvent"]:
|
||||||
|
try:
|
||||||
|
event = SlackEvent(payload)
|
||||||
|
return event
|
||||||
|
except KeyError:
|
||||||
|
return None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def text(self) -> str:
|
||||||
|
|
||||||
|
if self.get("event", {}).get("channel_type") == "im":
|
||||||
|
blocks = self.get("event", {}).get("blocks", [])
|
||||||
|
if not blocks:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
elements = blocks[0].get("elements", [])
|
||||||
|
if not elements:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
elements = elements[0].get("elements", [])
|
||||||
|
text = ""
|
||||||
|
|
||||||
|
for el in elements:
|
||||||
|
if el.get("type") == "text":
|
||||||
|
text += el.get("text", "")
|
||||||
|
elif el.get("type") == "link":
|
||||||
|
text += el.get("url", "")
|
||||||
|
|
||||||
|
return text
|
||||||
|
|
||||||
|
|
||||||
|
if self.get("event",{}).get("channel_type") == 'channel':
|
||||||
|
message_text = ""
|
||||||
|
for block in self.get("event", {}).get("blocks", []):
|
||||||
|
if block.get("type") == "rich_text":
|
||||||
|
for element in block.get("elements", []):
|
||||||
|
if element.get("type") == "rich_text_section":
|
||||||
|
parts = []
|
||||||
|
for el in element.get("elements", []):
|
||||||
|
if el.get("type") == "text":
|
||||||
|
parts.append(el["text"])
|
||||||
|
elif el.get("type") == "link":
|
||||||
|
parts.append(el["url"])
|
||||||
|
message_text = "".join(parts)
|
||||||
|
|
||||||
|
return message_text
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def user_id(self) -> Optional[str]:
|
||||||
|
return self.get("event", {}).get("user","")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def channel_id(self) -> Optional[str]:
|
||||||
|
return self.get("event", {}).get("channel","")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def type(self) -> str:
|
||||||
|
""" message对应私聊,app_mention对应频道at """
|
||||||
|
return self.get("event", {}).get("channel_type", "")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def message_id(self) -> str:
|
||||||
|
return self.get("event_id","")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def pic_url(self) -> str:
|
||||||
|
"""提取 Slack 事件中的图片 URL"""
|
||||||
|
files = self.get("event", {}).get("files", [])
|
||||||
|
if files:
|
||||||
|
return files[0].get("url_private", "")
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def sender_name(self) -> str:
|
||||||
|
return self.get("event", {}).get("user","")
|
||||||
|
|
||||||
|
def __getattr__(self, key: str) -> Optional[Any]:
|
||||||
|
return self.get(key)
|
||||||
|
|
||||||
|
def __setattr__(self, key: str, value: Any) -> None:
|
||||||
|
self[key] = value
|
||||||
|
|
||||||
|
def __repr__(self) -> str:
|
||||||
|
return f"<SlackEvent {super().__repr__()}>"
|
||||||
0
libs/wecom_customer_service_api/__init__.py
Normal file
0
libs/wecom_customer_service_api/__init__.py
Normal file
337
libs/wecom_customer_service_api/api.py
Normal file
337
libs/wecom_customer_service_api/api.py
Normal file
@@ -0,0 +1,337 @@
|
|||||||
|
from quart import request
|
||||||
|
from ..wecom_api.WXBizMsgCrypt3 import WXBizMsgCrypt
|
||||||
|
import base64
|
||||||
|
import binascii
|
||||||
|
import httpx
|
||||||
|
import traceback
|
||||||
|
from quart import Quart
|
||||||
|
import xml.etree.ElementTree as ET
|
||||||
|
from typing import Callable, Dict, Any
|
||||||
|
from .wecomcsevent import WecomCSEvent
|
||||||
|
from pkg.platform.types import events as platform_events, message as platform_message
|
||||||
|
import aiofiles
|
||||||
|
|
||||||
|
|
||||||
|
class WecomCSClient():
|
||||||
|
def __init__(self,corpid:str,secret:str,token:str,EncodingAESKey:str):
|
||||||
|
self.corpid = corpid
|
||||||
|
self.secret = secret
|
||||||
|
self.access_token_for_contacts =''
|
||||||
|
self.token = token
|
||||||
|
self.aes = EncodingAESKey
|
||||||
|
self.base_url = 'https://qyapi.weixin.qq.com/cgi-bin'
|
||||||
|
self.access_token = ''
|
||||||
|
self.app = Quart(__name__)
|
||||||
|
self.wxcpt = WXBizMsgCrypt(self.token, self.aes, self.corpid)
|
||||||
|
self.app.add_url_rule('/callback/command', 'handle_callback', self.handle_callback_request, methods=['GET', 'POST'])
|
||||||
|
self._message_handlers = {
|
||||||
|
"example":[],
|
||||||
|
}
|
||||||
|
|
||||||
|
async def get_pic_url(self, media_id: str):
|
||||||
|
if not await self.check_access_token():
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
|
||||||
|
url = f"{self.base_url}/media/get?access_token={self.access_token}&media_id={media_id}"
|
||||||
|
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
response = await client.get(url)
|
||||||
|
if response.headers.get("Content-Type", "").startswith("application/json"):
|
||||||
|
data = response.json()
|
||||||
|
if data.get('errcode') in [40014, 42001]:
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
return await self.get_pic_url(media_id)
|
||||||
|
else:
|
||||||
|
raise Exception("Failed to get image: " + str(data))
|
||||||
|
|
||||||
|
# 否则是图片,转成 base64
|
||||||
|
image_bytes = response.content
|
||||||
|
content_type = response.headers.get("Content-Type", "")
|
||||||
|
base64_str = base64.b64encode(image_bytes).decode("utf-8")
|
||||||
|
base64_str = f"data:{content_type};base64,{base64_str}"
|
||||||
|
return base64_str
|
||||||
|
|
||||||
|
|
||||||
|
#access——token操作
|
||||||
|
async def check_access_token(self):
|
||||||
|
return bool(self.access_token and self.access_token.strip())
|
||||||
|
|
||||||
|
async def check_access_token_for_contacts(self):
|
||||||
|
return bool(self.access_token_for_contacts and self.access_token_for_contacts.strip())
|
||||||
|
|
||||||
|
async def get_access_token(self,secret):
|
||||||
|
url = f'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={self.corpid}&corpsecret={secret}'
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
response = await client.get(url)
|
||||||
|
data = response.json()
|
||||||
|
if 'access_token' in data:
|
||||||
|
return data['access_token']
|
||||||
|
else:
|
||||||
|
raise Exception(f"未获取access token: {data}")
|
||||||
|
|
||||||
|
async def get_detailed_message_list(self,xml_msg:str):
|
||||||
|
# 在本方法中解析消息,并且获得消息的具体内容
|
||||||
|
root = ET.fromstring(xml_msg)
|
||||||
|
token = root.find("Token").text
|
||||||
|
open_kfid = root.find("OpenKfId").text
|
||||||
|
|
||||||
|
# if open_kfid in self.openkfid_list:
|
||||||
|
# return None
|
||||||
|
# else:
|
||||||
|
# self.openkfid_list.append(open_kfid)
|
||||||
|
|
||||||
|
if not await self.check_access_token():
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
|
||||||
|
url = self.base_url+'/kf/sync_msg?access_token='+ self.access_token
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
params = {
|
||||||
|
"token": token,
|
||||||
|
"voice_format": 0,
|
||||||
|
"open_kfid": open_kfid,
|
||||||
|
}
|
||||||
|
response = await client.post(url,json=params)
|
||||||
|
data = response.json()
|
||||||
|
if data['errcode'] != 0:
|
||||||
|
raise Exception("Failed to get message")
|
||||||
|
if data['errcode'] == 40014 or data['errcode'] == 42001:
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
return await self.get_detailed_message_list(xml_msg)
|
||||||
|
last_msg_data = data['msg_list'][-1]
|
||||||
|
open_kfid = last_msg_data.get("open_kfid")
|
||||||
|
# 进行获取图片操作
|
||||||
|
if last_msg_data.get("msgtype") == "image":
|
||||||
|
media_id = last_msg_data.get("image").get("media_id")
|
||||||
|
picurl = await self.get_pic_url(media_id)
|
||||||
|
last_msg_data["picurl"] = picurl
|
||||||
|
# await self.change_service_status(userid=external_userid,openkfid=open_kfid,servicer=servicer)
|
||||||
|
return last_msg_data
|
||||||
|
|
||||||
|
|
||||||
|
async def change_service_status(self,userid:str,openkfid:str,servicer:str):
|
||||||
|
if not await self.check_access_token():
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
url = self.base_url+"/kf/service_state/get?access_token="+self.access_token
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
params = {
|
||||||
|
"open_kfid" : openkfid,
|
||||||
|
"external_userid" : userid,
|
||||||
|
"service_state" : 1,
|
||||||
|
"servicer_userid" : servicer,
|
||||||
|
}
|
||||||
|
response = await client.post(url,json=params)
|
||||||
|
data = response.json()
|
||||||
|
if data['errcode'] == 40014 or data['errcode'] == 42001:
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
return await self.change_service_status(userid,openkfid)
|
||||||
|
if data['errcode'] != 0:
|
||||||
|
raise Exception("Failed to change service status: "+str(data))
|
||||||
|
|
||||||
|
|
||||||
|
async def send_image(self,user_id:str,agent_id:int,media_id:str):
|
||||||
|
if not await self.check_access_token():
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
url = self.base_url+'/media/upload?access_token='+self.access_token
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
params = {
|
||||||
|
"touser" : user_id,
|
||||||
|
"toparty" : "",
|
||||||
|
"totag":"",
|
||||||
|
"agentid" : agent_id,
|
||||||
|
"msgtype" : "image",
|
||||||
|
"image" : {
|
||||||
|
"media_id" : media_id,
|
||||||
|
},
|
||||||
|
"safe":0,
|
||||||
|
"enable_id_trans": 0,
|
||||||
|
"enable_duplicate_check": 0,
|
||||||
|
"duplicate_check_interval": 1800
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
response = await client.post(url,json=params)
|
||||||
|
data = response.json()
|
||||||
|
except Exception as e:
|
||||||
|
raise Exception("Failed to send image: "+str(e))
|
||||||
|
|
||||||
|
# 企业微信错误码40014和42001,代表accesstoken问题
|
||||||
|
if data['errcode'] == 40014 or data['errcode'] == 42001:
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
return await self.send_image(user_id,agent_id,media_id)
|
||||||
|
|
||||||
|
if data['errcode'] != 0:
|
||||||
|
raise Exception("Failed to send image: "+str(data))
|
||||||
|
|
||||||
|
|
||||||
|
async def send_text_msg(self, open_kfid: str, external_userid: str, msgid: str,content:str):
|
||||||
|
if not await self.check_access_token():
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
|
||||||
|
url = f"https://qyapi.weixin.qq.com/cgi-bin/kf/send_msg?access_token={self.access_token}"
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"touser": external_userid,
|
||||||
|
"open_kfid": open_kfid,
|
||||||
|
"msgid": msgid,
|
||||||
|
"msgtype": "text",
|
||||||
|
"text": {
|
||||||
|
"content": content,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
response = await client.post(url, json=payload)
|
||||||
|
|
||||||
|
data = response.json()
|
||||||
|
if data.get("errcode") != 0:
|
||||||
|
raise Exception(f"消息发送失败: {data}")
|
||||||
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
async def handle_callback_request(self):
|
||||||
|
"""
|
||||||
|
处理回调请求,包括 GET 验证和 POST 消息接收。
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
|
||||||
|
msg_signature = request.args.get("msg_signature")
|
||||||
|
timestamp = request.args.get("timestamp")
|
||||||
|
nonce = request.args.get("nonce")
|
||||||
|
|
||||||
|
if request.method == "GET":
|
||||||
|
echostr = request.args.get("echostr")
|
||||||
|
ret, reply_echo_str = self.wxcpt.VerifyURL(msg_signature, timestamp, nonce, echostr)
|
||||||
|
if ret != 0:
|
||||||
|
raise Exception(f"验证失败,错误码: {ret}")
|
||||||
|
return reply_echo_str
|
||||||
|
|
||||||
|
elif request.method == "POST":
|
||||||
|
encrypt_msg = await request.data
|
||||||
|
ret, xml_msg = self.wxcpt.DecryptMsg(encrypt_msg, msg_signature, timestamp, nonce)
|
||||||
|
if ret != 0:
|
||||||
|
raise Exception(f"消息解密失败,错误码: {ret}")
|
||||||
|
|
||||||
|
# 解析消息并处理
|
||||||
|
message_data = await self.get_detailed_message_list(xml_msg)
|
||||||
|
if message_data is not None:
|
||||||
|
event = WecomCSEvent.from_payload(message_data)
|
||||||
|
if event:
|
||||||
|
await self._handle_message(event)
|
||||||
|
|
||||||
|
return "success"
|
||||||
|
except Exception as e:
|
||||||
|
traceback.print_exc()
|
||||||
|
return f"Error processing request: {str(e)}", 400
|
||||||
|
|
||||||
|
async def run_task(self, host: str, port: int, *args, **kwargs):
|
||||||
|
"""
|
||||||
|
启动 Quart 应用。
|
||||||
|
"""
|
||||||
|
await self.app.run_task(host=host, port=port, *args, **kwargs)
|
||||||
|
|
||||||
|
def on_message(self, msg_type: str):
|
||||||
|
"""
|
||||||
|
注册消息类型处理器。
|
||||||
|
"""
|
||||||
|
def decorator(func: Callable[[WecomCSEvent], None]):
|
||||||
|
if msg_type not in self._message_handlers:
|
||||||
|
self._message_handlers[msg_type] = []
|
||||||
|
self._message_handlers[msg_type].append(func)
|
||||||
|
return func
|
||||||
|
return decorator
|
||||||
|
|
||||||
|
async def _handle_message(self, event: WecomCSEvent):
|
||||||
|
"""
|
||||||
|
处理消息事件。
|
||||||
|
"""
|
||||||
|
msg_type = event.type
|
||||||
|
if msg_type in self._message_handlers:
|
||||||
|
for handler in self._message_handlers[msg_type]:
|
||||||
|
await handler(event)
|
||||||
|
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def get_image_type(image_bytes: bytes) -> str:
|
||||||
|
"""
|
||||||
|
通过图片的magic numbers判断图片类型
|
||||||
|
"""
|
||||||
|
magic_numbers = {
|
||||||
|
b'\xFF\xD8\xFF': 'jpg',
|
||||||
|
b'\x89\x50\x4E\x47': 'png',
|
||||||
|
b'\x47\x49\x46': 'gif',
|
||||||
|
b'\x42\x4D': 'bmp',
|
||||||
|
b'\x00\x00\x01\x00': 'ico'
|
||||||
|
}
|
||||||
|
|
||||||
|
for magic, ext in magic_numbers.items():
|
||||||
|
if image_bytes.startswith(magic):
|
||||||
|
return ext
|
||||||
|
return 'jpg' # 默认返回jpg
|
||||||
|
|
||||||
|
|
||||||
|
async def upload_to_work(self, image: platform_message.Image):
|
||||||
|
"""
|
||||||
|
获取 media_id
|
||||||
|
"""
|
||||||
|
if not await self.check_access_token():
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
|
||||||
|
url = self.base_url + '/media/upload?access_token=' + self.access_token + '&type=file'
|
||||||
|
file_bytes = None
|
||||||
|
file_name = "uploaded_file.txt"
|
||||||
|
|
||||||
|
# 获取文件的二进制数据
|
||||||
|
if image.path:
|
||||||
|
async with aiofiles.open(image.path, 'rb') as f:
|
||||||
|
file_bytes = await f.read()
|
||||||
|
file_name = image.path.split('/')[-1]
|
||||||
|
elif image.url:
|
||||||
|
file_bytes = await self.download_image_to_bytes(image.url)
|
||||||
|
file_name = image.url.split('/')[-1]
|
||||||
|
elif image.base64:
|
||||||
|
try:
|
||||||
|
base64_data = image.base64
|
||||||
|
if ',' in base64_data:
|
||||||
|
base64_data = base64_data.split(',', 1)[1]
|
||||||
|
padding = 4 - (len(base64_data) % 4) if len(base64_data) % 4 else 0
|
||||||
|
padded_base64 = base64_data + '=' * padding
|
||||||
|
file_bytes = base64.b64decode(padded_base64)
|
||||||
|
except binascii.Error as e:
|
||||||
|
raise ValueError(f"Invalid base64 string: {str(e)}")
|
||||||
|
else:
|
||||||
|
raise ValueError("image对象出错")
|
||||||
|
|
||||||
|
# 设置 multipart/form-data 格式的文件
|
||||||
|
boundary = "-------------------------acebdf13572468"
|
||||||
|
headers = {
|
||||||
|
'Content-Type': f'multipart/form-data; boundary={boundary}'
|
||||||
|
}
|
||||||
|
body = (
|
||||||
|
f"--{boundary}\r\n"
|
||||||
|
f"Content-Disposition: form-data; name=\"media\"; filename=\"{file_name}\"; filelength={len(file_bytes)}\r\n"
|
||||||
|
f"Content-Type: application/octet-stream\r\n\r\n"
|
||||||
|
).encode('utf-8') + file_bytes + f"\r\n--{boundary}--\r\n".encode('utf-8')
|
||||||
|
|
||||||
|
# 上传文件
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
response = await client.post(url, headers=headers, content=body)
|
||||||
|
data = response.json()
|
||||||
|
if data['errcode'] == 40014 or data['errcode'] == 42001:
|
||||||
|
self.access_token = await self.get_access_token(self.secret)
|
||||||
|
media_id = await self.upload_to_work(image)
|
||||||
|
if data.get('errcode', 0) != 0:
|
||||||
|
raise Exception("failed to upload file")
|
||||||
|
|
||||||
|
media_id = data.get('media_id')
|
||||||
|
return media_id
|
||||||
|
|
||||||
|
async def download_image_to_bytes(self,url:str) -> bytes:
|
||||||
|
async with httpx.AsyncClient() as client:
|
||||||
|
response = await client.get(url)
|
||||||
|
response.raise_for_status()
|
||||||
|
return response.content
|
||||||
|
|
||||||
|
#进行media_id的获取
|
||||||
|
async def get_media_id(self, image: platform_message.Image):
|
||||||
|
|
||||||
|
media_id = await self.upload_to_work(image=image)
|
||||||
|
return media_id
|
||||||
134
libs/wecom_customer_service_api/wecomcsevent.py
Normal file
134
libs/wecom_customer_service_api/wecomcsevent.py
Normal file
@@ -0,0 +1,134 @@
|
|||||||
|
from typing import Dict, Any, Optional
|
||||||
|
|
||||||
|
|
||||||
|
class WecomCSEvent(dict):
|
||||||
|
"""
|
||||||
|
封装从企业微信收到的事件数据对象(字典),提供属性以获取其中的字段。
|
||||||
|
|
||||||
|
除 `type` 和 `detail_type` 属性对于任何事件都有效外,其它属性是否存在(若不存在则返回 `None`)依事件类型不同而不同。
|
||||||
|
"""
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def from_payload(payload: Dict[str, Any]) -> Optional["WecomCSEvent"]:
|
||||||
|
"""
|
||||||
|
从企业微信(客服会话)事件数据构造 `WecomEvent` 对象。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
payload (Dict[str, Any]): 解密后的企业微信事件数据。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[WecomEvent]: 如果事件数据合法,则返回 WecomEvent 对象;否则返回 None。
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
event = WecomCSEvent(payload)
|
||||||
|
_ = event.type,
|
||||||
|
return event
|
||||||
|
except KeyError:
|
||||||
|
return None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def type(self) -> str:
|
||||||
|
"""
|
||||||
|
事件类型,例如 "message"、"event"、"text" 等。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: 事件类型。
|
||||||
|
"""
|
||||||
|
return self.get("msgtype", "")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def user_id(self) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
用户 ID,例如消息的发送者或事件的触发者。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[str]: 用户 ID。
|
||||||
|
"""
|
||||||
|
return self.get("external_userid")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def receiver_id(self) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
接收者 ID,例如机器人自身的企业微信 ID。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[str]: 接收者 ID。
|
||||||
|
"""
|
||||||
|
return self.get("open_kfid","")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def picurl(self) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
图片 URL,仅在图片消息中存在。
|
||||||
|
base64格式
|
||||||
|
Returns:
|
||||||
|
Optional[str]: 图片 URL。
|
||||||
|
"""
|
||||||
|
|
||||||
|
return self.get("picurl","")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def message_id(self) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
消息 ID,仅在消息类型事件中存在。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[str]: 消息 ID。
|
||||||
|
"""
|
||||||
|
return self.get("msgid")
|
||||||
|
|
||||||
|
@property
|
||||||
|
def message(self) -> Optional[str]:
|
||||||
|
"""
|
||||||
|
消息内容,仅在消息类型事件中存在。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[str]: 消息内容。
|
||||||
|
"""
|
||||||
|
if self.get("msgtype") == 'text':
|
||||||
|
return self.get("text").get("content","")
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
@property
|
||||||
|
def timestamp(self) -> Optional[int]:
|
||||||
|
"""
|
||||||
|
事件发生的时间戳。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[int]: 时间戳。
|
||||||
|
"""
|
||||||
|
return self.get("send_time")
|
||||||
|
|
||||||
|
|
||||||
|
def __getattr__(self, key: str) -> Optional[Any]:
|
||||||
|
"""
|
||||||
|
允许通过属性访问数据中的任意字段。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
key (str): 字段名。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Optional[Any]: 字段值。
|
||||||
|
"""
|
||||||
|
return self.get(key)
|
||||||
|
|
||||||
|
def __setattr__(self, key: str, value: Any) -> None:
|
||||||
|
"""
|
||||||
|
允许通过属性设置数据中的任意字段。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
key (str): 字段名。
|
||||||
|
value (Any): 字段值。
|
||||||
|
"""
|
||||||
|
self[key] = value
|
||||||
|
|
||||||
|
def __repr__(self) -> str:
|
||||||
|
"""
|
||||||
|
生成事件对象的字符串表示。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: 字符串表示。
|
||||||
|
"""
|
||||||
|
return f"<WecomEvent {super().__repr__()}>"
|
||||||
@@ -35,6 +35,7 @@ required_deps = {
|
|||||||
"telegram": "python-telegram-bot",
|
"telegram": "python-telegram-bot",
|
||||||
"certifi": "certifi",
|
"certifi": "certifi",
|
||||||
"mcp": "mcp",
|
"mcp": "mcp",
|
||||||
|
"telegramify_markdown":"telegramify-markdown",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
26
pkg/core/migrations/m038_tg_dingtalk_markdown.py
Normal file
26
pkg/core/migrations/m038_tg_dingtalk_markdown.py
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .. import migration
|
||||||
|
|
||||||
|
|
||||||
|
@migration.migration_class("tg-dingtalk-markdown", 38)
|
||||||
|
class TgDingtalkMarkdownMigration(migration.Migration):
|
||||||
|
"""迁移"""
|
||||||
|
|
||||||
|
async def need_migrate(self) -> bool:
|
||||||
|
"""判断当前环境是否需要运行此迁移"""
|
||||||
|
|
||||||
|
for adapter in self.ap.platform_cfg.data['platform-adapters']:
|
||||||
|
if adapter['adapter'] in ['dingtalk','telegram']:
|
||||||
|
if 'markdown_card' not in adapter:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
"""执行迁移"""
|
||||||
|
for adapter in self.ap.platform_cfg.data['platform-adapters']:
|
||||||
|
if adapter['adapter'] in ['dingtalk','telegram']:
|
||||||
|
if 'markdown_card' not in adapter:
|
||||||
|
adapter['markdown_card'] = False
|
||||||
|
await self.ap.platform_cfg.dump_config()
|
||||||
|
|
||||||
30
pkg/core/migrations/m039_modelscope_cfg_completion.py
Normal file
30
pkg/core/migrations/m039_modelscope_cfg_completion.py
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from .. import migration
|
||||||
|
|
||||||
|
|
||||||
|
@migration.migration_class("modelscope-config-completion", 4)
|
||||||
|
class ModelScopeConfigCompletionMigration(migration.Migration):
|
||||||
|
"""OpenAI配置迁移
|
||||||
|
"""
|
||||||
|
|
||||||
|
async def need_migrate(self) -> bool:
|
||||||
|
"""判断当前环境是否需要运行此迁移
|
||||||
|
"""
|
||||||
|
return 'modelscope-chat-completions' not in self.ap.provider_cfg.data['requester'] \
|
||||||
|
or 'modelscope' not in self.ap.provider_cfg.data['keys']
|
||||||
|
|
||||||
|
async def run(self):
|
||||||
|
"""执行迁移
|
||||||
|
"""
|
||||||
|
if 'modelscope-chat-completions' not in self.ap.provider_cfg.data['requester']:
|
||||||
|
self.ap.provider_cfg.data['requester']['modelscope-chat-completions'] = {
|
||||||
|
'base-url': 'https://api-inference.modelscope.cn/v1',
|
||||||
|
'args': {},
|
||||||
|
'timeout': 120,
|
||||||
|
}
|
||||||
|
|
||||||
|
if 'modelscope' not in self.ap.provider_cfg.data['keys']:
|
||||||
|
self.ap.provider_cfg.data['keys']['modelscope'] = []
|
||||||
|
|
||||||
|
await self.ap.provider_cfg.dump_config()
|
||||||
@@ -12,7 +12,7 @@ from ..migrations import m020_wecom_config, m021_lark_config, m022_lmstudio_conf
|
|||||||
from ..migrations import m026_qqofficial_config, m027_wx_official_account_config, m028_aliyun_requester_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, m032_volcark_config
|
from ..migrations import m029_dashscope_app_api_config, m030_lark_config_cmpl, m031_dingtalk_config, m032_volcark_config
|
||||||
from ..migrations import m033_dify_thinking_config, m034_gewechat_file_url_config, m035_wxoa_mode, m036_wxoa_loading_message
|
from ..migrations import m033_dify_thinking_config, m034_gewechat_file_url_config, m035_wxoa_mode, m036_wxoa_loading_message
|
||||||
from ..migrations import m037_mcp_config
|
from ..migrations import m037_mcp_config, m038_tg_dingtalk_markdown, m039_modelscope_cfg_completion
|
||||||
|
|
||||||
|
|
||||||
@stage.stage_class("MigrationStage")
|
@stage.stage_class("MigrationStage")
|
||||||
|
|||||||
@@ -131,7 +131,8 @@ class DingTalkAdapter(adapter.MessagePlatformAdapter):
|
|||||||
client_id=config["client_id"],
|
client_id=config["client_id"],
|
||||||
client_secret=config["client_secret"],
|
client_secret=config["client_secret"],
|
||||||
robot_name = config["robot_name"],
|
robot_name = config["robot_name"],
|
||||||
robot_code=config["robot_code"]
|
robot_code=config["robot_code"],
|
||||||
|
markdown_card=config["markdown_card"]
|
||||||
)
|
)
|
||||||
|
|
||||||
async def reply_message(
|
async def reply_message(
|
||||||
|
|||||||
@@ -47,6 +47,17 @@ class GewechatMessageConverter(adapter.MessageConverter):
|
|||||||
if not component.url:
|
if not component.url:
|
||||||
pass
|
pass
|
||||||
content_list.append({"type": "image", "image": component.url})
|
content_list.append({"type": "image", "image": component.url})
|
||||||
|
elif isinstance(component, platform_message.WeChatMiniPrograms):
|
||||||
|
content_list.append({"type": 'WeChatMiniPrograms', 'mini_app_id': component.mini_app_id, 'display_name': component.display_name,
|
||||||
|
'page_path': component.page_path, 'cover_img_url': component.image_url, 'title': component.title,
|
||||||
|
'user_name': component.user_name})
|
||||||
|
elif isinstance(component, platform_message.WeChatForwardMiniPrograms):
|
||||||
|
content_list.append({"type": 'WeChatForwardMiniPrograms', 'xml_data': component.xml_data, 'image_url': component.image_url})
|
||||||
|
elif isinstance(component, platform_message.WeChatEmoji):
|
||||||
|
content_list.append({'type': 'WeChatEmoji', 'emoji_md5': component.emoji_md5, 'emoji_size': component.emoji_size})
|
||||||
|
elif isinstance(component, platform_message.WeChatLink):
|
||||||
|
content_list.append({'type': 'WeChatLink', 'link_title': component.link_title, 'link_desc': component.link_desc,
|
||||||
|
'link_thumb_url': component.link_thumb_url, 'link_url': component.link_url})
|
||||||
|
|
||||||
|
|
||||||
elif isinstance(component, platform_message.Voice):
|
elif isinstance(component, platform_message.Voice):
|
||||||
@@ -364,6 +375,19 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
|
|||||||
elif msg['type'] == 'image':
|
elif msg['type'] == 'image':
|
||||||
|
|
||||||
self.bot.post_image(app_id=self.config['app_id'], to_wxid=target_id, img_url=msg["image"])
|
self.bot.post_image(app_id=self.config['app_id'], to_wxid=target_id, img_url=msg["image"])
|
||||||
|
elif msg['type'] == 'WeChatMiniPrograms':
|
||||||
|
self.bot.post_mini_app(app_id=self.config['app_id'], to_wxid=target_id, mini_app_id=msg['mini_app_id']
|
||||||
|
, display_name=msg['display_name'], page_path=msg['page_path']
|
||||||
|
, cover_img_url=msg['cover_img_url'], title=msg['title'], user_name=msg['user_name'])
|
||||||
|
elif msg['type'] == 'WeChatForwardMiniPrograms':
|
||||||
|
self.bot.forward_mini_app(app_id=self.config['app_id'], to_wxid=target_id, xml=msg['xml_data'], cover_img_url=msg['image_url'])
|
||||||
|
elif msg['type'] == 'WeChatEmoji':
|
||||||
|
self.bot.post_emoji(app_id=self.config['app_id'], to_wxid=target_id,
|
||||||
|
emoji_md5=msg['emoji_md5'], emoji_size=msg['emoji_size'])
|
||||||
|
elif msg['type'] == 'WeChatLink':
|
||||||
|
self.bot.post_link(app_id=self.config['app_id'], to_wxid=target_id
|
||||||
|
,title=msg['link_title'], desc=msg['link_desc']
|
||||||
|
, link_url=msg['link_url'], thumb_url=msg['link_thumb_url'])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -376,6 +400,7 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
|
|||||||
content_list = await self.message_converter.yiri2target(message)
|
content_list = await self.message_converter.yiri2target(message)
|
||||||
|
|
||||||
ats = [item["target"] for item in content_list if item["type"] == "at"]
|
ats = [item["target"] for item in content_list if item["type"] == "at"]
|
||||||
|
target_id = message_source.source_platform_object["Data"]["FromUserName"]["string"]
|
||||||
|
|
||||||
for msg in content_list:
|
for msg in content_list:
|
||||||
if msg["type"] == "text":
|
if msg["type"] == "text":
|
||||||
@@ -396,6 +421,22 @@ class GeWeChatAdapter(adapter.MessagePlatformAdapter):
|
|||||||
content=msg["content"],
|
content=msg["content"],
|
||||||
ats=",".join(ats)
|
ats=",".join(ats)
|
||||||
)
|
)
|
||||||
|
elif msg['type'] == 'image':
|
||||||
|
|
||||||
|
self.bot.post_image(app_id=self.config['app_id'], to_wxid=target_id, img_url=msg["image"])
|
||||||
|
elif msg['type'] == 'WeChatMiniPrograms':
|
||||||
|
self.bot.post_mini_app(app_id=self.config['app_id'], to_wxid=target_id, mini_app_id=msg['mini_app_id']
|
||||||
|
, display_name=msg['display_name'], page_path=msg['page_path']
|
||||||
|
, cover_img_url=msg['cover_img_url'], title=msg['title'], user_name=msg['user_name'])
|
||||||
|
elif msg['type'] == 'WeChatForwardMiniPrograms':
|
||||||
|
self.bot.forward_mini_app(app_id=self.config['app_id'], to_wxid=target_id, xml=msg['xml_data'], cover_img_url=msg['image_url'])
|
||||||
|
elif msg['type'] == 'WeChatEmoji':
|
||||||
|
self.bot.post_emoji(app_id=self.config['app_id'], to_wxid=target_id,
|
||||||
|
emoji_md5=msg['emoji_md5'], emoji_size=msg['emoji_size'])
|
||||||
|
elif msg['type'] == 'WeChatLink':
|
||||||
|
self.bot.post_link(app_id=self.config['app_id'], to_wxid=target_id
|
||||||
|
, title=msg['link_title'], desc=msg['link_desc']
|
||||||
|
, link_url=msg['link_url'], thumb_url=msg['link_thumb_url'])
|
||||||
|
|
||||||
async def is_muted(self, group_id: int) -> bool:
|
async def is_muted(self, group_id: int) -> bool:
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -343,7 +343,6 @@ class LarkAdapter(adapter.MessagePlatformAdapter):
|
|||||||
type = context.header.event_type
|
type = context.header.event_type
|
||||||
|
|
||||||
if 'url_verification' == type:
|
if 'url_verification' == type:
|
||||||
print(data.get("challenge"))
|
|
||||||
# todo 验证verification token
|
# todo 验证verification token
|
||||||
return {
|
return {
|
||||||
"challenge": data.get("challenge")
|
"challenge": data.get("challenge")
|
||||||
|
|||||||
204
pkg/platform/sources/slack.py
Normal file
204
pkg/platform/sources/slack.py
Normal file
@@ -0,0 +1,204 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
import typing
|
||||||
|
import asyncio
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
|
||||||
|
from libs.slack_api.api import SlackClient
|
||||||
|
from pkg.platform.adapter import MessagePlatformAdapter
|
||||||
|
from pkg.platform.types import events as platform_events, message as platform_message
|
||||||
|
from libs.slack_api.slackevent import SlackEvent
|
||||||
|
from pkg.core import app
|
||||||
|
from .. import adapter
|
||||||
|
from ...core import app
|
||||||
|
from ..types import message as platform_message
|
||||||
|
from ..types import events as platform_events
|
||||||
|
from ..types import entities as platform_entities
|
||||||
|
from ...command.errors import ParamNotEnoughError
|
||||||
|
from ...utils import image
|
||||||
|
|
||||||
|
class SlackMessageConverter(adapter.MessageConverter):
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def yiri2target(message_chain:platform_message.MessageChain):
|
||||||
|
content_list = []
|
||||||
|
for msg in message_chain:
|
||||||
|
if type(msg) is platform_message.Plain:
|
||||||
|
content_list.append({
|
||||||
|
"content":msg.text,
|
||||||
|
})
|
||||||
|
|
||||||
|
return content_list
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def target2yiri(message:str,message_id:str,pic_url:str,bot:SlackClient):
|
||||||
|
yiri_msg_list = []
|
||||||
|
yiri_msg_list.append(
|
||||||
|
platform_message.Source(id=message_id,time=datetime.datetime.now())
|
||||||
|
)
|
||||||
|
if pic_url is not None:
|
||||||
|
base64_url = await image.get_slack_image_to_base64(pic_url=pic_url,bot_token=bot.bot_token)
|
||||||
|
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
|
||||||
|
|
||||||
|
|
||||||
|
class SlackEventConverter(adapter.EventConverter):
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def yiri2target(event:platform_events.MessageEvent) -> SlackEvent:
|
||||||
|
return event.source_platform_object
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def target2yiri(event:SlackEvent,bot:SlackClient):
|
||||||
|
yiri_chain = await SlackMessageConverter.target2yiri(
|
||||||
|
message=event.text,message_id=event.message_id,pic_url=event.pic_url,bot=bot
|
||||||
|
)
|
||||||
|
|
||||||
|
if event.type == 'channel':
|
||||||
|
yiri_chain.insert(0, platform_message.At(target="SlackBot"))
|
||||||
|
|
||||||
|
sender = platform_entities.GroupMember(
|
||||||
|
id = event.user_id,
|
||||||
|
member_name= str(event.sender_name),
|
||||||
|
permission= 'MEMBER',
|
||||||
|
group = platform_entities.Group(
|
||||||
|
id = event.channel_id,
|
||||||
|
name = 'MEMBER',
|
||||||
|
permission= platform_entities.Permission.Member
|
||||||
|
),
|
||||||
|
special_title='',
|
||||||
|
join_timestamp=0,
|
||||||
|
last_speak_timestamp=0,
|
||||||
|
mute_time_remaining=0
|
||||||
|
)
|
||||||
|
time = int(datetime.datetime.utcnow().timestamp())
|
||||||
|
return platform_events.GroupMessage(
|
||||||
|
sender = sender,
|
||||||
|
message_chain=yiri_chain,
|
||||||
|
time = time,
|
||||||
|
source_platform_object=event
|
||||||
|
)
|
||||||
|
|
||||||
|
if event.type == 'im':
|
||||||
|
return platform_events.FriendMessage(
|
||||||
|
sender=platform_entities.Friend(
|
||||||
|
id=event.user_id,
|
||||||
|
nickname = event.sender_name,
|
||||||
|
remark=""
|
||||||
|
),
|
||||||
|
message_chain = yiri_chain,
|
||||||
|
time = float(datetime.datetime.now().timestamp()),
|
||||||
|
source_platform_object=event,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
class SlackAdapter(adapter.MessagePlatformAdapter):
|
||||||
|
bot: SlackClient
|
||||||
|
ap: app.Application
|
||||||
|
bot_account_id: str
|
||||||
|
message_converter: SlackMessageConverter = SlackMessageConverter()
|
||||||
|
event_converter: SlackEventConverter = SlackEventConverter()
|
||||||
|
config: dict
|
||||||
|
|
||||||
|
def __init__(self,config:dict,ap:app.Application):
|
||||||
|
self.config = config
|
||||||
|
self.ap = ap
|
||||||
|
required_keys = [
|
||||||
|
"bot_token",
|
||||||
|
"signing_secret",
|
||||||
|
]
|
||||||
|
missing_keys = [key for key in required_keys if key not in config]
|
||||||
|
if missing_keys:
|
||||||
|
raise ParamNotEnoughError("Slack机器人缺少相关配置项,请查看文档或联系管理员")
|
||||||
|
|
||||||
|
self.bot = SlackClient(
|
||||||
|
bot_token=self.config["bot_token"],
|
||||||
|
signing_secret=self.config["signing_secret"]
|
||||||
|
)
|
||||||
|
|
||||||
|
async def reply_message(
|
||||||
|
self,
|
||||||
|
message_source: platform_events.MessageEvent,
|
||||||
|
message: platform_message.MessageChain,
|
||||||
|
quote_origin: bool = False,
|
||||||
|
):
|
||||||
|
slack_event = await SlackEventConverter.yiri2target(
|
||||||
|
message_source
|
||||||
|
)
|
||||||
|
|
||||||
|
content_list = await SlackMessageConverter.yiri2target(message)
|
||||||
|
|
||||||
|
for content in content_list:
|
||||||
|
if slack_event.type == 'channel':
|
||||||
|
await self.bot.send_message_to_channel(
|
||||||
|
content['content'],slack_event.channel_id
|
||||||
|
)
|
||||||
|
if slack_event.type == 'im':
|
||||||
|
await self.bot.send_message_to_one(
|
||||||
|
content['content'],slack_event.user_id
|
||||||
|
)
|
||||||
|
|
||||||
|
async def send_message(self, target_type: str, target_id: str, message: platform_message.MessageChain):
|
||||||
|
content_list = await SlackMessageConverter.yiri2target(message)
|
||||||
|
for content in content_list:
|
||||||
|
if target_type == 'person':
|
||||||
|
await self.bot.send_message_to_one(content['content'],target_id)
|
||||||
|
if target_type == 'group':
|
||||||
|
await self.bot.send_message_to_channel(content['content'],target_id)
|
||||||
|
|
||||||
|
|
||||||
|
def register_listener(
|
||||||
|
self,
|
||||||
|
event_type: typing.Type[platform_events.Event],
|
||||||
|
callback: typing.Callable[
|
||||||
|
[platform_events.Event, adapter.MessagePlatformAdapter], None
|
||||||
|
],
|
||||||
|
):
|
||||||
|
async def on_message(event:SlackEvent):
|
||||||
|
self.bot_account_id = 'SlackBot'
|
||||||
|
try:
|
||||||
|
return await callback(
|
||||||
|
await self.event_converter.target2yiri(event,self.bot),self
|
||||||
|
)
|
||||||
|
except:
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
|
if event_type == platform_events.FriendMessage:
|
||||||
|
self.bot.on_message("im")(on_message)
|
||||||
|
elif event_type == platform_events.GroupMessage:
|
||||||
|
self.bot.on_message("channel")(on_message)
|
||||||
|
|
||||||
|
|
||||||
|
async def run_async(self):
|
||||||
|
async def shutdown_trigger_placeholder():
|
||||||
|
while True:
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
|
await self.bot.run_task(
|
||||||
|
host="0.0.0.0",
|
||||||
|
port=self.config["port"],
|
||||||
|
shutdown_trigger=shutdown_trigger_placeholder,
|
||||||
|
)
|
||||||
|
|
||||||
|
async def kill(self) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def unregister_listener(
|
||||||
|
self,
|
||||||
|
event_type: type,
|
||||||
|
callback: typing.Callable[[platform_events.Event, MessagePlatformAdapter], None],
|
||||||
|
):
|
||||||
|
return super().unregister_listener(event_type, callback)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
37
pkg/platform/sources/slack.yaml
Normal file
37
pkg/platform/sources/slack.yaml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: MessagePlatformAdapter
|
||||||
|
metadata:
|
||||||
|
name: slack
|
||||||
|
label:
|
||||||
|
en_US: Slack API
|
||||||
|
zh_CN: Slack API
|
||||||
|
description:
|
||||||
|
en_US: Slack API
|
||||||
|
zh_CN: Slack API
|
||||||
|
spec:
|
||||||
|
config:
|
||||||
|
- name: bot_token
|
||||||
|
label:
|
||||||
|
en_US: Bot Token
|
||||||
|
zh_CN: 机器人令牌
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: ""
|
||||||
|
- name: signing_secret
|
||||||
|
label:
|
||||||
|
en_US: signing_secret
|
||||||
|
zh_CN: 密钥
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: ""
|
||||||
|
- name: port
|
||||||
|
label:
|
||||||
|
en_US: Port
|
||||||
|
zh_CN: 监听端口
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
default: 2288
|
||||||
|
execution:
|
||||||
|
python:
|
||||||
|
path: ./slack.py
|
||||||
|
attr: SlackAdapter
|
||||||
@@ -4,7 +4,7 @@ import telegram
|
|||||||
import telegram.ext
|
import telegram.ext
|
||||||
from telegram import Update
|
from telegram import Update
|
||||||
from telegram.ext import ApplicationBuilder, ContextTypes, CommandHandler, MessageHandler, filters
|
from telegram.ext import ApplicationBuilder, ContextTypes, CommandHandler, MessageHandler, filters
|
||||||
|
import telegramify_markdown
|
||||||
import typing
|
import typing
|
||||||
import asyncio
|
import asyncio
|
||||||
import traceback
|
import traceback
|
||||||
@@ -88,7 +88,8 @@ class TelegramMessageConverter(adapter.MessageConverter):
|
|||||||
message_components.extend(parse_message_text(message_text))
|
message_components.extend(parse_message_text(message_text))
|
||||||
|
|
||||||
if message.photo:
|
if message.photo:
|
||||||
message_components.extend(parse_message_text(message.caption))
|
if message.caption:
|
||||||
|
message_components.extend(parse_message_text(message.caption))
|
||||||
|
|
||||||
file = await message.photo[-1].get_file()
|
file = await message.photo[-1].get_file()
|
||||||
|
|
||||||
@@ -126,7 +127,7 @@ class TelegramEventConverter(adapter.EventConverter):
|
|||||||
time=event.message.date.timestamp(),
|
time=event.message.date.timestamp(),
|
||||||
source_platform_object=event
|
source_platform_object=event
|
||||||
)
|
)
|
||||||
elif event.effective_chat.type == 'group':
|
elif event.effective_chat.type == 'group' or 'supergroup' :
|
||||||
return platform_events.GroupMessage(
|
return platform_events.GroupMessage(
|
||||||
sender=platform_entities.GroupMember(
|
sender=platform_entities.GroupMember(
|
||||||
id=event.effective_chat.id,
|
id=event.effective_chat.id,
|
||||||
@@ -201,16 +202,23 @@ class TelegramAdapter(adapter.MessagePlatformAdapter):
|
|||||||
|
|
||||||
for component in components:
|
for component in components:
|
||||||
if component['type'] == 'text':
|
if component['type'] == 'text':
|
||||||
|
if self.config['markdown_card'] is True:
|
||||||
|
content = telegramify_markdown.markdownify(
|
||||||
|
content= component['text'],
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
content = component['text']
|
||||||
args = {
|
args = {
|
||||||
"chat_id": message_source.source_platform_object.effective_chat.id,
|
"chat_id": message_source.source_platform_object.effective_chat.id,
|
||||||
"text": component['text'],
|
"text": content,
|
||||||
}
|
}
|
||||||
|
if self.config['markdown_card'] is True:
|
||||||
|
args["parse_mode"] = "MarkdownV2"
|
||||||
|
if quote_origin:
|
||||||
|
args['reply_to_message_id'] = message_source.source_platform_object.message.id
|
||||||
|
|
||||||
if quote_origin:
|
await self.bot.send_message(**args)
|
||||||
args['reply_to_message_id'] = message_source.source_platform_object.message.id
|
|
||||||
|
|
||||||
await self.bot.send_message(**args)
|
|
||||||
|
|
||||||
async def is_muted(self, group_id: int) -> bool:
|
async def is_muted(self, group_id: int) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|||||||
223
pkg/platform/sources/wecomcs.py
Normal file
223
pkg/platform/sources/wecomcs.py
Normal file
@@ -0,0 +1,223 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
import typing
|
||||||
|
import asyncio
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
|
||||||
|
from libs.wecom_customer_service_api.api import WecomCSClient
|
||||||
|
from pkg.platform.adapter import MessagePlatformAdapter
|
||||||
|
from pkg.platform.types import events as platform_events, message as platform_message
|
||||||
|
from libs.wecom_customer_service_api.wecomcsevent import WecomCSEvent
|
||||||
|
from pkg.core import app
|
||||||
|
from .. import adapter
|
||||||
|
from ...core import app
|
||||||
|
from ..types import message as platform_message
|
||||||
|
from ..types import events as platform_events
|
||||||
|
from ..types import entities as platform_entities
|
||||||
|
from ...command.errors import ParamNotEnoughError
|
||||||
|
from ...utils import image
|
||||||
|
|
||||||
|
class WecomMessageConverter(adapter.MessageConverter):
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def yiri2target(
|
||||||
|
message_chain: platform_message.MessageChain, bot: WecomCSClient
|
||||||
|
):
|
||||||
|
content_list = []
|
||||||
|
|
||||||
|
for msg in message_chain:
|
||||||
|
if type(msg) is platform_message.Plain:
|
||||||
|
content_list.append({
|
||||||
|
"type": "text",
|
||||||
|
"content": msg.text,
|
||||||
|
})
|
||||||
|
elif type(msg) is platform_message.Image:
|
||||||
|
content_list.append({
|
||||||
|
"type": "image",
|
||||||
|
"media_id": await bot.get_media_id(msg),
|
||||||
|
})
|
||||||
|
elif type(msg) is platform_message.Forward:
|
||||||
|
for node in msg.node_list:
|
||||||
|
content_list.extend((await WecomMessageConverter.yiri2target(node.message_chain, bot)))
|
||||||
|
else:
|
||||||
|
content_list.append({
|
||||||
|
"type": "text",
|
||||||
|
"content": str(msg),
|
||||||
|
})
|
||||||
|
|
||||||
|
return content_list
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def target2yiri(message: str, message_id: int = -1):
|
||||||
|
yiri_msg_list = []
|
||||||
|
yiri_msg_list.append(
|
||||||
|
platform_message.Source(id=message_id, time=datetime.datetime.now())
|
||||||
|
)
|
||||||
|
|
||||||
|
yiri_msg_list.append(platform_message.Plain(text=message))
|
||||||
|
chain = platform_message.MessageChain(yiri_msg_list)
|
||||||
|
|
||||||
|
return chain
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def target2yiri_image(picurl: str, message_id: int = -1):
|
||||||
|
yiri_msg_list = []
|
||||||
|
yiri_msg_list.append(
|
||||||
|
platform_message.Source(id=message_id, time=datetime.datetime.now())
|
||||||
|
)
|
||||||
|
yiri_msg_list.append(platform_message.Image(base64=picurl))
|
||||||
|
chain = platform_message.MessageChain(yiri_msg_list)
|
||||||
|
|
||||||
|
return chain
|
||||||
|
|
||||||
|
|
||||||
|
class WecomEventConverter:
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def yiri2target(
|
||||||
|
event: platform_events.Event, bot_account_id: int, bot: WecomCSClient
|
||||||
|
) -> WecomCSEvent:
|
||||||
|
# only for extracting user information
|
||||||
|
|
||||||
|
if type(event) is platform_events.GroupMessage:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if type(event) is platform_events.FriendMessage:
|
||||||
|
return event.source_platform_object
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
async def target2yiri(event: WecomCSEvent):
|
||||||
|
"""
|
||||||
|
将 WecomEvent 转换为平台的 FriendMessage 对象。
|
||||||
|
|
||||||
|
Args:
|
||||||
|
event (WecomEvent): 企业微信客服事件。
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
platform_events.FriendMessage: 转换后的 FriendMessage 对象。
|
||||||
|
"""
|
||||||
|
# 转换消息链
|
||||||
|
if event.type == "text":
|
||||||
|
yiri_chain = await WecomMessageConverter.target2yiri(
|
||||||
|
event.message, event.message_id
|
||||||
|
)
|
||||||
|
friend = platform_entities.Friend(
|
||||||
|
id=f"u{event.user_id}",
|
||||||
|
nickname=str(event.user_id),
|
||||||
|
remark="",
|
||||||
|
)
|
||||||
|
|
||||||
|
return platform_events.FriendMessage(
|
||||||
|
sender=friend, message_chain=yiri_chain, time=event.timestamp, source_platform_object=event
|
||||||
|
)
|
||||||
|
elif event.type == "image":
|
||||||
|
friend = platform_entities.Friend(
|
||||||
|
id=f"u{event.user_id}",
|
||||||
|
nickname=str(event.user_id),
|
||||||
|
remark="",
|
||||||
|
)
|
||||||
|
|
||||||
|
yiri_chain = await WecomMessageConverter.target2yiri_image(
|
||||||
|
picurl=event.picurl, message_id=event.message_id
|
||||||
|
)
|
||||||
|
|
||||||
|
return platform_events.FriendMessage(
|
||||||
|
sender=friend, message_chain=yiri_chain, time=event.timestamp, source_platform_object=event
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class WecomCSAdapter(adapter.MessagePlatformAdapter):
|
||||||
|
|
||||||
|
bot: WecomCSClient
|
||||||
|
ap: app.Application
|
||||||
|
bot_account_id: str
|
||||||
|
message_converter: WecomMessageConverter = WecomMessageConverter()
|
||||||
|
event_converter: WecomEventConverter = WecomEventConverter()
|
||||||
|
config: dict
|
||||||
|
|
||||||
|
def __init__(self, config: dict, ap: app.Application):
|
||||||
|
self.config = config
|
||||||
|
|
||||||
|
self.ap = ap
|
||||||
|
|
||||||
|
required_keys = [
|
||||||
|
"corpid",
|
||||||
|
"secret",
|
||||||
|
"token",
|
||||||
|
"EncodingAESKey",
|
||||||
|
]
|
||||||
|
missing_keys = [key for key in required_keys if key not in config]
|
||||||
|
if missing_keys:
|
||||||
|
raise ParamNotEnoughError("企业微信客服缺少相关配置项,请查看文档或联系管理员")
|
||||||
|
|
||||||
|
self.bot = WecomCSClient(
|
||||||
|
corpid=config["corpid"],
|
||||||
|
secret=config["secret"],
|
||||||
|
token=config["token"],
|
||||||
|
EncodingAESKey=config["EncodingAESKey"],
|
||||||
|
)
|
||||||
|
|
||||||
|
async def reply_message(
|
||||||
|
self,
|
||||||
|
message_source: platform_events.MessageEvent,
|
||||||
|
message: platform_message.MessageChain,
|
||||||
|
quote_origin: bool = False,
|
||||||
|
):
|
||||||
|
|
||||||
|
Wecom_event = await WecomEventConverter.yiri2target(
|
||||||
|
message_source, self.bot_account_id, self.bot
|
||||||
|
)
|
||||||
|
content_list = await WecomMessageConverter.yiri2target(message, self.bot)
|
||||||
|
|
||||||
|
for content in content_list:
|
||||||
|
if content["type"] == "text":
|
||||||
|
await self.bot.send_text_msg(open_kfid=Wecom_event.receiver_id,external_userid=Wecom_event.user_id,msgid=Wecom_event.message_id,content=content["content"])
|
||||||
|
|
||||||
|
async def send_message(
|
||||||
|
self, target_type: str, target_id: str, message: platform_message.MessageChain
|
||||||
|
):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def register_listener(
|
||||||
|
self,
|
||||||
|
event_type: typing.Type[platform_events.Event],
|
||||||
|
callback: typing.Callable[
|
||||||
|
[platform_events.Event, adapter.MessagePlatformAdapter], None
|
||||||
|
],
|
||||||
|
):
|
||||||
|
async def on_message(event: WecomCSEvent):
|
||||||
|
self.bot_account_id = event.receiver_id
|
||||||
|
try:
|
||||||
|
return await callback(
|
||||||
|
await self.event_converter.target2yiri(event), self
|
||||||
|
)
|
||||||
|
except:
|
||||||
|
traceback.print_exc()
|
||||||
|
|
||||||
|
if event_type == platform_events.FriendMessage:
|
||||||
|
self.bot.on_message("text")(on_message)
|
||||||
|
self.bot.on_message("image")(on_message)
|
||||||
|
elif event_type == platform_events.GroupMessage:
|
||||||
|
pass
|
||||||
|
|
||||||
|
async def run_async(self):
|
||||||
|
async def shutdown_trigger_placeholder():
|
||||||
|
while True:
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
|
||||||
|
await self.bot.run_task(
|
||||||
|
host="0.0.0.0",
|
||||||
|
port=self.config["port"],
|
||||||
|
shutdown_trigger=shutdown_trigger_placeholder,
|
||||||
|
)
|
||||||
|
|
||||||
|
async def kill(self) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
|
async def unregister_listener(
|
||||||
|
self,
|
||||||
|
event_type: type,
|
||||||
|
callback: typing.Callable[[platform_events.Event, MessagePlatformAdapter], None],
|
||||||
|
):
|
||||||
|
return super().unregister_listener(event_type, callback)
|
||||||
51
pkg/platform/sources/wecomcs.yaml
Normal file
51
pkg/platform/sources/wecomcs.yaml
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: MessagePlatformAdapter
|
||||||
|
metadata:
|
||||||
|
name: wecomcs
|
||||||
|
label:
|
||||||
|
en_US: WeComCustomerService
|
||||||
|
zh_CN: 企业微信客服
|
||||||
|
description:
|
||||||
|
en_US: WeComCSAdapter
|
||||||
|
zh_CN: 企业微信客服适配器
|
||||||
|
spec:
|
||||||
|
config:
|
||||||
|
- name: port
|
||||||
|
label:
|
||||||
|
en_US: Port
|
||||||
|
zh_CN: 监听端口
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
default: 2289
|
||||||
|
- name: corpid
|
||||||
|
label:
|
||||||
|
en_US: Corpid
|
||||||
|
zh_CN: 企业ID
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: ""
|
||||||
|
- name: secret
|
||||||
|
label:
|
||||||
|
en_US: Secret
|
||||||
|
zh_CN: 密钥
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: ""
|
||||||
|
- name: token
|
||||||
|
label:
|
||||||
|
en_US: Token
|
||||||
|
zh_CN: 令牌
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: ""
|
||||||
|
- name: EncodingAESKey
|
||||||
|
label:
|
||||||
|
en_US: EncodingAESKey
|
||||||
|
zh_CN: 消息加解密密钥
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: ""
|
||||||
|
execution:
|
||||||
|
python:
|
||||||
|
path: ./wecomcs.py
|
||||||
|
attr: WecomCSAdapter
|
||||||
@@ -807,6 +807,56 @@ class File(MessageComponent):
|
|||||||
"""文件名称。"""
|
"""文件名称。"""
|
||||||
size: int
|
size: int
|
||||||
"""文件大小。"""
|
"""文件大小。"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f'[文件]{self.name}'
|
return f'[文件]{self.name}'
|
||||||
|
|
||||||
|
# ================ 个人微信专用组件 ================
|
||||||
|
|
||||||
|
class WeChatMiniPrograms(MessageComponent):
|
||||||
|
"""小程序。个人微信专用组件。"""
|
||||||
|
type: str = 'WeChatMiniPrograms'
|
||||||
|
"""小程序id"""
|
||||||
|
mini_app_id: str
|
||||||
|
"""小程序归属用户id"""
|
||||||
|
user_name: str
|
||||||
|
"""小程序名称"""
|
||||||
|
display_name: typing.Optional[str] = ''
|
||||||
|
"""打开地址"""
|
||||||
|
page_path: typing.Optional[str] = ''
|
||||||
|
"""小程序标题"""
|
||||||
|
title: typing.Optional[str] = ''
|
||||||
|
"""首页图片"""
|
||||||
|
image_url: typing.Optional[str] = ''
|
||||||
|
|
||||||
|
|
||||||
|
class WeChatForwardMiniPrograms(MessageComponent):
|
||||||
|
"""转发小程序。个人微信专用组件。"""
|
||||||
|
type: str = 'WeChatForwardMiniPrograms'
|
||||||
|
"""xml数据"""
|
||||||
|
xml_data: str
|
||||||
|
"""首页图片"""
|
||||||
|
image_url: typing.Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
|
class WeChatEmoji(MessageComponent):
|
||||||
|
"""emoji表情。个人微信专用组件。"""
|
||||||
|
type: str = 'WeChatEmoji'
|
||||||
|
"""emojimd5"""
|
||||||
|
emoji_md5: str
|
||||||
|
"""emoji大小"""
|
||||||
|
emoji_size: int
|
||||||
|
|
||||||
|
|
||||||
|
class WeChatLink(MessageComponent):
|
||||||
|
"""发送链接。个人微信专用组件。"""
|
||||||
|
type: str = 'WeChatLink'
|
||||||
|
"""标题"""
|
||||||
|
link_title: str = ''
|
||||||
|
"""链接描述"""
|
||||||
|
link_desc: str = ''
|
||||||
|
"""链接地址"""
|
||||||
|
link_url: str = ''
|
||||||
|
"""链接略缩图"""
|
||||||
|
link_thumb_url: str = ''
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from . import entities, requester
|
|||||||
from ...core import app
|
from ...core import app
|
||||||
from ...discover import engine
|
from ...discover import engine
|
||||||
from . import token
|
from . import token
|
||||||
from .requesters import bailianchatcmpl, chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, volcarkchatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl, volcarkchatcmpl
|
from .requesters import bailianchatcmpl, chatcmpl, anthropicmsgs, moonshotchatcmpl, deepseekchatcmpl, ollamachat, giteeaichatcmpl, volcarkchatcmpl, xaichatcmpl, zhipuaichatcmpl, lmstudiochatcmpl, siliconflowchatcmpl, volcarkchatcmpl, modelscopechatcmpl
|
||||||
|
|
||||||
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"
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import typing
|
|||||||
import json
|
import json
|
||||||
import traceback
|
import traceback
|
||||||
import base64
|
import base64
|
||||||
|
import platform
|
||||||
|
import socket
|
||||||
|
|
||||||
import anthropic
|
import anthropic
|
||||||
import httpx
|
import httpx
|
||||||
@@ -23,6 +25,12 @@ class AnthropicMessages(requester.LLMAPIRequester):
|
|||||||
client: anthropic.AsyncAnthropic
|
client: anthropic.AsyncAnthropic
|
||||||
|
|
||||||
async def initialize(self):
|
async def initialize(self):
|
||||||
|
# 兼容 Windows 缺失 TCP_KEEPINTVL 和 TCP_KEEPCNT 的问题
|
||||||
|
if platform.system() == "Windows":
|
||||||
|
if not hasattr(socket, "TCP_KEEPINTVL"):
|
||||||
|
socket.TCP_KEEPINTVL = 0
|
||||||
|
if not hasattr(socket, "TCP_KEEPCNT"):
|
||||||
|
socket.TCP_KEEPCNT = 0
|
||||||
|
|
||||||
httpx_client = anthropic._base_client.AsyncHttpxClientWrapper(
|
httpx_client = anthropic._base_client.AsyncHttpxClientWrapper(
|
||||||
base_url=self.ap.provider_cfg.data['requester']['anthropic-messages']['base-url'].replace(' ', ''),
|
base_url=self.ap.provider_cfg.data['requester']['anthropic-messages']['base-url'].replace(' ', ''),
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import openai
|
import openai
|
||||||
|
|
||||||
from . import chatcmpl
|
from . import chatcmpl, modelscopechatcmpl
|
||||||
from .. import requester
|
from .. import requester
|
||||||
from ....core import app
|
from ....core import app
|
||||||
|
|
||||||
|
|
||||||
class BailianChatCompletions(chatcmpl.OpenAIChatCompletions):
|
class BailianChatCompletions(modelscopechatcmpl.ModelScopeChatCompletions):
|
||||||
"""阿里云百炼大模型平台 ChatCompletion API 请求器"""
|
"""阿里云百炼大模型平台 ChatCompletion API 请求器"""
|
||||||
|
|
||||||
client: openai.AsyncClient
|
client: openai.AsyncClient
|
||||||
@@ -18,3 +18,4 @@ class BailianChatCompletions(chatcmpl.OpenAIChatCompletions):
|
|||||||
self.ap = ap
|
self.ap = ap
|
||||||
|
|
||||||
self.requester_cfg = self.ap.provider_cfg.data['requester']['bailian-chat-completions']
|
self.requester_cfg = self.ap.provider_cfg.data['requester']['bailian-chat-completions']
|
||||||
|
|
||||||
@@ -61,6 +61,12 @@ class OpenAIChatCompletions(requester.LLMAPIRequester):
|
|||||||
if 'role' not in chatcmpl_message or chatcmpl_message['role'] is None:
|
if 'role' not in chatcmpl_message or chatcmpl_message['role'] is None:
|
||||||
chatcmpl_message['role'] = 'assistant'
|
chatcmpl_message['role'] = 'assistant'
|
||||||
|
|
||||||
|
reasoning_content = chatcmpl_message['reasoning_content'] if 'reasoning_content' in chatcmpl_message else None
|
||||||
|
|
||||||
|
# deepseek的reasoner模型
|
||||||
|
if reasoning_content is not None:
|
||||||
|
chatcmpl_message['content'] = "<think>\n" + reasoning_content + "\n</think>\n\n"+ chatcmpl_message['content']
|
||||||
|
|
||||||
message = llm_entities.Message(**chatcmpl_message)
|
message = llm_entities.Message(**chatcmpl_message)
|
||||||
|
|
||||||
return message
|
return message
|
||||||
|
|||||||
207
pkg/provider/modelmgr/requesters/modelscopechatcmpl.py
Normal file
207
pkg/provider/modelmgr/requesters/modelscopechatcmpl.py
Normal file
@@ -0,0 +1,207 @@
|
|||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import asyncio
|
||||||
|
import typing
|
||||||
|
import json
|
||||||
|
import base64
|
||||||
|
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
|
||||||
|
|
||||||
|
from .. import entities, errors, requester
|
||||||
|
from ....core import entities as core_entities, app
|
||||||
|
from ... import entities as llm_entities
|
||||||
|
from ...tools import entities as tools_entities
|
||||||
|
from ....utils import image
|
||||||
|
|
||||||
|
|
||||||
|
class ModelScopeChatCompletions(requester.LLMAPIRequester):
|
||||||
|
"""ModelScope 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']['modelscope-chat-completions']
|
||||||
|
|
||||||
|
async def initialize(self):
|
||||||
|
|
||||||
|
self.client = openai.AsyncClient(
|
||||||
|
api_key="",
|
||||||
|
base_url=self.requester_cfg['base-url'],
|
||||||
|
timeout=self.requester_cfg['timeout'],
|
||||||
|
http_client=httpx.AsyncClient(
|
||||||
|
trust_env=True,
|
||||||
|
timeout=self.requester_cfg['timeout']
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
async def _req(
|
||||||
|
self,
|
||||||
|
args: dict,
|
||||||
|
) -> chat_completion.ChatCompletion:
|
||||||
|
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
|
||||||
|
return await self.client.chat.completions.create(**args)
|
||||||
|
|
||||||
|
async def _make_msg(
|
||||||
|
self,
|
||||||
|
chat_completion: chat_completion.ChatCompletion,
|
||||||
|
) -> llm_entities.Message:
|
||||||
|
chatcmpl_message = chat_completion.choices[0].message.dict()
|
||||||
|
|
||||||
|
# 确保 role 字段存在且不为 None
|
||||||
|
if 'role' not in chatcmpl_message or chatcmpl_message['role'] is None:
|
||||||
|
chatcmpl_message['role'] = 'assistant'
|
||||||
|
|
||||||
|
message = llm_entities.Message(**chatcmpl_message)
|
||||||
|
|
||||||
|
return message
|
||||||
|
|
||||||
|
async def _closure(
|
||||||
|
self,
|
||||||
|
query: core_entities.Query,
|
||||||
|
req_messages: list[dict],
|
||||||
|
use_model: entities.LLMModelInfo,
|
||||||
|
use_funcs: list[tools_entities.LLMFunction] = None,
|
||||||
|
) -> llm_entities.Message:
|
||||||
|
self.client.api_key = use_model.token_mgr.get_token()
|
||||||
|
|
||||||
|
args = self.requester_cfg['args'].copy()
|
||||||
|
args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
|
||||||
|
|
||||||
|
if use_funcs:
|
||||||
|
tools = await self.ap.tool_mgr.generate_tools_for_openai(use_funcs)
|
||||||
|
|
||||||
|
if tools:
|
||||||
|
args["tools"] = tools
|
||||||
|
|
||||||
|
# 设置此次请求中的messages
|
||||||
|
messages = req_messages.copy()
|
||||||
|
|
||||||
|
# 检查vision
|
||||||
|
for msg in messages:
|
||||||
|
if 'content' in msg and isinstance(msg["content"], list):
|
||||||
|
for me in msg["content"]:
|
||||||
|
if me["type"] == "image_base64":
|
||||||
|
me["image_url"] = {
|
||||||
|
"url": me["image_base64"]
|
||||||
|
}
|
||||||
|
me["type"] = "image_url"
|
||||||
|
del me["image_base64"]
|
||||||
|
|
||||||
|
args["messages"] = messages
|
||||||
|
|
||||||
|
# 发送请求
|
||||||
|
resp = await self._req(args)
|
||||||
|
|
||||||
|
# 处理请求结果
|
||||||
|
message = await self._make_msg(resp)
|
||||||
|
|
||||||
|
return message
|
||||||
|
|
||||||
|
async def call(
|
||||||
|
self,
|
||||||
|
query: core_entities.Query,
|
||||||
|
model: entities.LLMModelInfo,
|
||||||
|
messages: typing.List[llm_entities.Message],
|
||||||
|
funcs: typing.List[tools_entities.LLMFunction] = None,
|
||||||
|
) -> llm_entities.Message:
|
||||||
|
req_messages = [] # req_messages 仅用于类内,外部同步由 query.messages 进行
|
||||||
|
for m in messages:
|
||||||
|
msg_dict = m.dict(exclude_none=True)
|
||||||
|
content = msg_dict.get("content")
|
||||||
|
if isinstance(content, list):
|
||||||
|
# 检查 content 列表中是否每个部分都是文本
|
||||||
|
if all(isinstance(part, dict) and part.get("type") == "text" for part in content):
|
||||||
|
# 将所有文本部分合并为一个字符串
|
||||||
|
msg_dict["content"] = "\n".join(part["text"] for part in content)
|
||||||
|
req_messages.append(msg_dict)
|
||||||
|
|
||||||
|
try:
|
||||||
|
return await self._closure(query=query, req_messages=req_messages, use_model=model, use_funcs=funcs)
|
||||||
|
except asyncio.TimeoutError:
|
||||||
|
raise errors.RequesterError('请求超时')
|
||||||
|
except openai.BadRequestError as e:
|
||||||
|
if 'context_length_exceeded' in e.message:
|
||||||
|
raise errors.RequesterError(f'上文过长,请重置会话: {e.message}')
|
||||||
|
else:
|
||||||
|
raise errors.RequesterError(f'请求参数错误: {e.message}')
|
||||||
|
except openai.AuthenticationError as e:
|
||||||
|
raise errors.RequesterError(f'无效的 api-key: {e.message}')
|
||||||
|
except openai.NotFoundError as e:
|
||||||
|
raise errors.RequesterError(f'请求路径错误: {e.message}')
|
||||||
|
except openai.RateLimitError as e:
|
||||||
|
raise errors.RequesterError(f'请求过于频繁或余额不足: {e.message}')
|
||||||
|
except openai.APIError as e:
|
||||||
|
raise errors.RequesterError(f'请求错误: {e.message}')
|
||||||
34
pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml
Normal file
34
pkg/provider/modelmgr/requesters/modelscopechatcmpl.yaml
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: LLMAPIRequester
|
||||||
|
metadata:
|
||||||
|
name: modelscope-chat-completions
|
||||||
|
label:
|
||||||
|
en_US: ModelScope
|
||||||
|
zh_CN: 魔搭社区
|
||||||
|
spec:
|
||||||
|
config:
|
||||||
|
- name: base-url
|
||||||
|
label:
|
||||||
|
en_US: Base URL
|
||||||
|
zh_CN: 基础 URL
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
default: "https://api-inference.modelscope.cn/v1"
|
||||||
|
- name: args
|
||||||
|
label:
|
||||||
|
en_US: Args
|
||||||
|
zh_CN: 附加参数
|
||||||
|
type: object
|
||||||
|
required: true
|
||||||
|
default: {}
|
||||||
|
- name: timeout
|
||||||
|
label:
|
||||||
|
en_US: Timeout
|
||||||
|
zh_CN: 超时时间
|
||||||
|
type: int
|
||||||
|
required: true
|
||||||
|
default: 120
|
||||||
|
execution:
|
||||||
|
python:
|
||||||
|
path: ./modelscopechatcmpl.py
|
||||||
|
attr: ModelScopeChatCompletions
|
||||||
@@ -42,8 +42,8 @@ class MoonshotChatCompletions(chatcmpl.OpenAIChatCompletions):
|
|||||||
if 'content' in m and isinstance(m["content"], list):
|
if 'content' in m and isinstance(m["content"], list):
|
||||||
m["content"] = " ".join([c["text"] for c in m["content"]])
|
m["content"] = " ".join([c["text"] for c in m["content"]])
|
||||||
|
|
||||||
# 删除空的
|
# 删除空的,不知道干嘛的,直接删了。
|
||||||
messages = [m for m in messages if m["content"].strip() != ""]
|
# messages = [m for m in messages if m["content"].strip() != "" and ('tool_calls' not in m or not m['tool_calls'])]
|
||||||
|
|
||||||
args["messages"] = messages
|
args["messages"] = messages
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
semantic_version = "v3.4.11.2"
|
semantic_version = "v3.4.14"
|
||||||
|
|
||||||
debug_mode = False
|
debug_mode = False
|
||||||
|
|
||||||
|
|||||||
@@ -213,3 +213,18 @@ async def extract_b64_and_format(image_base64_data: str) -> typing.Tuple[str, st
|
|||||||
base64_str = image_base64_data.split(',')[-1]
|
base64_str = image_base64_data.split(',')[-1]
|
||||||
image_format = image_base64_data.split(':')[-1].split(';')[0].split('/')[-1]
|
image_format = image_base64_data.split(':')[-1].split(';')[0].split('/')[-1]
|
||||||
return base64_str, image_format
|
return base64_str, image_format
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
async def get_slack_image_to_base64(pic_url:str, bot_token:str):
|
||||||
|
headers = {"Authorization": f"Bearer {bot_token}"}
|
||||||
|
try:
|
||||||
|
async with aiohttp.ClientSession() as session:
|
||||||
|
async with session.get(pic_url, headers=headers) as resp:
|
||||||
|
image_data = await resp.read()
|
||||||
|
return base64.b64encode(image_data).decode('utf-8')
|
||||||
|
except Exception as e:
|
||||||
|
raise(e)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,8 @@ dashscope
|
|||||||
python-telegram-bot
|
python-telegram-bot
|
||||||
certifi
|
certifi
|
||||||
mcp
|
mcp
|
||||||
|
slack_sdk
|
||||||
|
telegramify-markdown
|
||||||
# indirect
|
# indirect
|
||||||
taskgroup==0.0.0a4
|
taskgroup==0.0.0a4
|
||||||
|
python-socks
|
||||||
@@ -71,29 +71,47 @@
|
|||||||
"token": ""
|
"token": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"adapter":"officialaccount",
|
"adapter": "officialaccount",
|
||||||
"enable": false,
|
"enable": false,
|
||||||
"token": "",
|
"token": "",
|
||||||
"EncodingAESKey":"",
|
"EncodingAESKey": "",
|
||||||
"AppID":"",
|
"AppID": "",
|
||||||
"AppSecret":"",
|
"AppSecret": "",
|
||||||
"Mode":"drop",
|
"Mode": "drop",
|
||||||
"LoadingMessage":"AI正在思考中,请发送任意内容获取回复。",
|
"LoadingMessage": "AI正在思考中,请发送任意内容获取回复。",
|
||||||
"host": "0.0.0.0",
|
"host": "0.0.0.0",
|
||||||
"port": 2287
|
"port": 2287
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"adapter":"dingtalk",
|
"adapter": "dingtalk",
|
||||||
"enable": false,
|
"enable": false,
|
||||||
"client_id":"",
|
"client_id": "",
|
||||||
"client_secret":"",
|
"client_secret": "",
|
||||||
"robot_code":"",
|
"robot_code": "",
|
||||||
"robot_name":""
|
"robot_name": "",
|
||||||
|
"markdown_card": false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"adapter":"telegram",
|
"adapter": "telegram",
|
||||||
"enable": false,
|
"enable": false,
|
||||||
"token":""
|
"token": "",
|
||||||
|
"markdown_card": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"adapter": "slack",
|
||||||
|
"enable": false,
|
||||||
|
"bot_token": "",
|
||||||
|
"signing_secret": "",
|
||||||
|
"port": 2288
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"adapter": "wecomcs",
|
||||||
|
"enable": false,
|
||||||
|
"port": 2289,
|
||||||
|
"corpid": "",
|
||||||
|
"secret": "",
|
||||||
|
"token": "",
|
||||||
|
"EncodingAESKey": ""
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"track-function-calls": true,
|
"track-function-calls": true,
|
||||||
|
|||||||
@@ -31,6 +31,9 @@
|
|||||||
],
|
],
|
||||||
"volcark": [
|
"volcark": [
|
||||||
"xxxxxxxx"
|
"xxxxxxxx"
|
||||||
|
],
|
||||||
|
"modelscope": [
|
||||||
|
"xxxxxxxx"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"requester": {
|
"requester": {
|
||||||
@@ -95,12 +98,17 @@
|
|||||||
"args": {},
|
"args": {},
|
||||||
"base-url": "https://ark.cn-beijing.volces.com/api/v3",
|
"base-url": "https://ark.cn-beijing.volces.com/api/v3",
|
||||||
"timeout": 120
|
"timeout": 120
|
||||||
|
},
|
||||||
|
"modelscope-chat-completions": {
|
||||||
|
"base-url": "https://api-inference.modelscope.cn/v1",
|
||||||
|
"args": {},
|
||||||
|
"timeout": 120
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"model": "gpt-4o",
|
"model": "gpt-4o",
|
||||||
"prompt-mode": "normal",
|
"prompt-mode": "normal",
|
||||||
"prompt": {
|
"prompt": {
|
||||||
"default": ""
|
"default": "You are a helpful assistant."
|
||||||
},
|
},
|
||||||
"runner": "local-agent",
|
"runner": "local-agent",
|
||||||
"dify-service-api": {
|
"dify-service-api": {
|
||||||
|
|||||||
@@ -446,6 +446,11 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"default": "",
|
"default": "",
|
||||||
"description": "钉钉的robot_name"
|
"description": "钉钉的robot_name"
|
||||||
|
},
|
||||||
|
"markdown_card": {
|
||||||
|
"type": "boolean",
|
||||||
|
"default": false,
|
||||||
|
"description": "是否使用 Markdown 卡片发送消息"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -466,6 +471,41 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"default": "",
|
"default": "",
|
||||||
"description": "Telegram 的 token"
|
"description": "Telegram 的 token"
|
||||||
|
},
|
||||||
|
"markdown_card": {
|
||||||
|
"type": "boolean",
|
||||||
|
"default": false,
|
||||||
|
"description": "是否使用 Markdown 卡片发送消息"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"title": "Slack 适配器",
|
||||||
|
"description": "用于接入 Slack",
|
||||||
|
"properties": {
|
||||||
|
"adapter": {
|
||||||
|
"type": "string",
|
||||||
|
"const": "slack"
|
||||||
|
},
|
||||||
|
"enable": {
|
||||||
|
"type": "boolean",
|
||||||
|
"default": false,
|
||||||
|
"description": "是否启用此适配器"
|
||||||
|
},
|
||||||
|
"bot_token": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "Slack 的 bot_token"
|
||||||
|
},
|
||||||
|
"signing_secret": {
|
||||||
|
"type": "string",
|
||||||
|
"default": "",
|
||||||
|
"description": "Slack 的 signing_secret"
|
||||||
|
},
|
||||||
|
"port": {
|
||||||
|
"type": "integer",
|
||||||
|
"default": 2288,
|
||||||
|
"description": "监听的端口"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -368,7 +368,7 @@
|
|||||||
"type": "string",
|
"type": "string",
|
||||||
"title": "默认情景预设",
|
"title": "默认情景预设",
|
||||||
"description": "设置默认情景预设。值为空字符串时,将不使用情景预设(人格)",
|
"description": "设置默认情景预设。值为空字符串时,将不使用情景预设(人格)",
|
||||||
"default": ""
|
"default": "You are a helpful assistant."
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"patternProperties": {
|
"patternProperties": {
|
||||||
|
|||||||
Reference in New Issue
Block a user