mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-06-12 16:56:02 +00:00
* feat(models): add provider model scanning * fix: double close button * feat: update plugin module * fix(monitoring): WeChat Work feedback recording bugs (#2108) * fix(monitoring): fix WeChat Work feedback recording bugs - Fix feedback events silently dropped when stream session expires: dispatch feedback handlers regardless of session availability - Fix IntegrityError on repeated feedback (like→dislike) for same message: implement UPSERT logic in record_feedback() - Fix cancel feedback (type=3) not removing records: add delete logic - Fix inaccurate_reasons validation error: convert int reason codes to strings before creating FeedbackEvent (Pydantic expects List[str]) - Fix feedback timestamps 8 hours off in frontend: use parseUTCTimestamp instead of new Date() for UTC timestamp parsing - Fix StreamSessionManager.cleanup missing _feedback_index cleanup Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(monitoring): apply ruff format to wecom feedback files Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: 6mvp6 <13727783693@163.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * feat: add feat for receive files in wecombot * fix: ruff error * fix: always show sidebar plus buttons on touch/mobile devices (#2115) Agent-Logs-Url: https://github.com/langbot-app/LangBot/sessions/e27a4886-fbad-4a7a-8558-67a387852753 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: RockChinQ <45992437+RockChinQ@users.noreply.github.com> * fix: SPA fallback for all frontend routes, not just /home/* After migrating from Next.js to Vite SPA, routes like /auth/space/callback returned 404 because the static file server only had SPA fallback for /home/*. Now all non-API routes fall back to index.html for React Router to handle. * style: ruff format main.py * feat: add marketplace link when no parser available for file upload Links to /home/market?category=Parser, same pattern as knowledge engine selector. * fix: lint error * fix(user): allow password login and password change for Space accounts with local password set Previously, Space accounts were unconditionally blocked from password login and password change based on account_type. Now the check verifies whether the user actually has a local password set, allowing Space users who have set a local password to authenticate and change it normally. * feat: add edition field to telemetry payload Sends constants.edition (community/saas) with each telemetry event so Space can distinguish between community and SaaS instances. * style: ruff format telemetry.py * fix(dingtalk): use voice recognition text instead of raw audio binary When DingTalk sends a voice message to the bot, the callback JSON contains a 'recognition' field with the speech-to-text result (powered by Qwen). Previously, LangBot only extracted the 'downloadCode' to download the raw audio binary and passed it as 'file_base64' to LLM APIs, which caused 400 errors since most models don't support this content type. This patch: - Extracts the 'recognition' field from DingTalk audio message content - Uses it as plain text input to the LLM instead of raw audio - Falls back to audio binary only when no recognition text is available - Fixes duplicate text issue for audio messages with recognition Fixes voice messages returning 'Request failed' on all LLM models. * feat: integrate Alembic for database migrations Replace manual if-sqlite/if-postgres branching with Alembic: - Add alembic dependency - Create programmatic alembic env (no CLI/alembic.ini needed) - Support async engines via run_sync passthrough - render_as_batch=True for SQLite ALTER TABLE compatibility - Auto-stamp baseline on first run (existing DB at version 25) - Run alembic upgrade head after legacy migrations - Include sample migration showing schema + data migration patterns - Add alembic dir to package-data for distribution * ci: add migration test workflow for SQLite and PostgreSQL Tests alembic upgrade on both databases: - Stamp baseline on existing schema - Upgrade to head - Idempotent re-upgrade - Fresh DB upgrade from scratch * feat: add autogenerate support and CLI entrypoint for alembic - autogenerate: compare ORM models vs DB schema to generate migrations - CLI: python -m langbot.pkg.persistence.alembic_runner <command> - autogenerate, upgrade, stamp, current - Reads data/config.yaml for DB connection * fix: add filereader for dingtalk,lark (#2122) * fix: add filereader for dingtalk * feat: add lark * feat: update uv.lock * chore: update version to 4.9.6 in pyproject.toml, __init__.py, and uv.lock * fix: update langbot-plugin version to 0.3.8 * fix: update langbot-plugin version to 0.3.8 * docs: update database migration instructions in AGENTS.md * fix(dashscopeapi): fix null value check in reasoning content processing logic (#2128) * fix(n8n-runner): fix output_key not applied when n8n returns plain JSON (#2119) * fix: bump dependencies to resolve Dependabot security alerts (#2130) * fix: bump dependencies to resolve Dependabot security alerts Python: - aiohttp: >=3.11.18 → >=3.13.4 (duplicate Host headers, header injection, redirect leak, multipart DoS) - cryptography: >=44.0.3 → >=46.0.7 (buffer overflow with non-contiguous buffers) - pillow: >=11.2.1 → >=12.2.0 (FITS GZIP decompression bomb, HIGH) - langchain-text-splitters: >=0.0.1 → >=1.1.2 (SSRF redirect bypass) - langchain-core: add >=1.2.28 (incomplete f-string validation) - langsmith: add >=0.7.31 (streaming token redaction bypass) - python-multipart: add >=0.0.26 (multipart DoS) - Mako: add >=1.3.11 (path traversal) - pytest: >=8.4.1 → >=9.0.3 (tmpdir handling) - uv: >=0.7.11 → >=0.11.6 (arbitrary file deletion) JavaScript (web/): - vite: ^8.0.3 → ^8.0.5 (fs.deny bypass, WebSocket file read, path traversal, HIGH) - axios: ^1.13.5 → ^1.15.0 (cloud metadata exfiltration) - lodash: ^4.17.23 → ^4.18.0 (code injection via _.template, prototype pollution, HIGH) * fix: update pnpm-lock.yaml for bumped dependencies * feat(ci): add i18n key consistency check for frontend locales (#2133) * feat(ci): add i18n key consistency check workflow Agent-Logs-Url: https://github.com/langbot-app/LangBot/sessions/c7bf50da-189b-49a5-9671-dbe8e70ff9d0 Co-authored-by: RockChinQ <45992437+RockChinQ@users.noreply.github.com> * feat(ci): replace eval with line-by-line parser, add permissions block Agent-Logs-Url: https://github.com/langbot-app/LangBot/sessions/c7bf50da-189b-49a5-9671-dbe8e70ff9d0 Co-authored-by: RockChinQ <45992437+RockChinQ@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: RockChinQ <45992437+RockChinQ@users.noreply.github.com> * feat(models): add provider model scanning * feat(models): add 'select all' functionality and enrich model abilities * fix:ruff * fix:ruff --------- Co-authored-by: WangCham <651122857@qq.com> Co-authored-by: 6mvp6 <119733319+6mvp6@users.noreply.github.com> Co-authored-by: 6mvp6 <13727783693@163.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Guanchao Wang <wangcham233@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: RockChinQ <45992437+RockChinQ@users.noreply.github.com> Co-authored-by: RockChinQ <rockchinq@gmail.com> Co-authored-by: haiyangbg <zhouhaiyangaa@gmail.com> Co-authored-by: Rock Chin <1010553892@qq.com> Co-authored-by: Amadeus <115918672+AmadeusKurisu1@users.noreply.github.com> Co-authored-by: hzhhong <hung.z.h916@gmail.com> Co-authored-by: fdc310 <2213070223@qq.com>
206 lines
8.1 KiB
Python
206 lines
8.1 KiB
Python
from __future__ import annotations
|
||
|
||
import typing
|
||
import httpx
|
||
|
||
from . import chatcmpl
|
||
|
||
import uuid
|
||
|
||
from .. import requester
|
||
import langbot_plugin.api.entities.builtin.provider.message as provider_message
|
||
import langbot_plugin.api.entities.builtin.pipeline.query as pipeline_query
|
||
import langbot_plugin.api.entities.builtin.resource.tool as resource_tool
|
||
|
||
|
||
class GeminiChatCompletions(chatcmpl.OpenAIChatCompletions):
|
||
"""Google Gemini API 请求器"""
|
||
|
||
default_config: dict[str, typing.Any] = {
|
||
'base_url': 'https://generativelanguage.googleapis.com/v1beta/openai',
|
||
'timeout': 120,
|
||
}
|
||
|
||
async def scan_models(self, api_key: str | None = None) -> dict[str, typing.Any]:
|
||
models_url = 'https://generativelanguage.googleapis.com/v1beta/models'
|
||
params = {'key': api_key} if api_key else {}
|
||
|
||
all_models: list[dict[str, typing.Any]] = []
|
||
next_page_token = ''
|
||
last_payload: dict[str, typing.Any] = {}
|
||
|
||
async with httpx.AsyncClient(trust_env=True, timeout=self.requester_cfg['timeout']) as client:
|
||
while True:
|
||
request_params = dict(params)
|
||
if next_page_token:
|
||
request_params['pageToken'] = next_page_token
|
||
|
||
response = await client.get(models_url, params=request_params)
|
||
response.raise_for_status()
|
||
payload = response.json()
|
||
last_payload = payload
|
||
|
||
for item in payload.get('models', []):
|
||
model_name = item.get('name', '')
|
||
model_id = model_name.replace('models/', '', 1)
|
||
if not model_id:
|
||
continue
|
||
|
||
supported_methods = item.get('supportedGenerationMethods', []) or []
|
||
if 'embedContent' in supported_methods and 'generateContent' not in supported_methods:
|
||
model_type = 'embedding'
|
||
else:
|
||
model_type = 'llm'
|
||
|
||
all_models.append(
|
||
{
|
||
'id': model_id,
|
||
'name': model_id,
|
||
'type': model_type,
|
||
'abilities': self._infer_model_abilities(item, model_id),
|
||
'display_name': item.get('displayName') or None,
|
||
'description': item.get('description') or None,
|
||
'context_length': item.get('inputTokenLimit'),
|
||
'input_modalities': self._normalize_modalities(item.get('inputModalities')),
|
||
'output_modalities': self._normalize_modalities(item.get('outputModalities')),
|
||
}
|
||
)
|
||
|
||
next_page_token = payload.get('nextPageToken', '')
|
||
if not next_page_token:
|
||
break
|
||
|
||
all_models.sort(key=lambda item: (item['type'] != 'llm', item['name'].lower()))
|
||
return {
|
||
'models': all_models,
|
||
'debug': {
|
||
'request': {
|
||
'method': 'GET',
|
||
'url': models_url,
|
||
'query': {'key': self._mask_api_key(api_key)} if api_key else {},
|
||
},
|
||
'response': last_payload,
|
||
},
|
||
}
|
||
|
||
async def _closure_stream(
|
||
self,
|
||
query: pipeline_query.Query,
|
||
req_messages: list[dict],
|
||
use_model: requester.RuntimeLLMModel,
|
||
use_funcs: list[resource_tool.LLMTool] = None,
|
||
extra_args: dict[str, typing.Any] = {},
|
||
remove_think: bool = False,
|
||
) -> provider_message.MessageChunk:
|
||
self.client.api_key = use_model.provider.token_mgr.get_token()
|
||
|
||
args = {}
|
||
args['model'] = use_model.model_entity.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
|
||
args['stream'] = True
|
||
|
||
# 流式处理状态
|
||
# tool_calls_map: dict[str, provider_message.ToolCall] = {}
|
||
chunk_idx = 0
|
||
thinking_started = False
|
||
thinking_ended = False
|
||
role = 'assistant' # 默认角色
|
||
tool_id = ''
|
||
tool_name = ''
|
||
# accumulated_reasoning = '' # 仅用于判断何时结束思维链
|
||
|
||
async for chunk in self._req_stream(args, extra_body=extra_args):
|
||
# 解析 chunk 数据
|
||
|
||
if hasattr(chunk, 'choices') and chunk.choices:
|
||
choice = chunk.choices[0]
|
||
delta = choice.delta.model_dump() if hasattr(choice, 'delta') else {}
|
||
|
||
finish_reason = getattr(choice, 'finish_reason', None)
|
||
else:
|
||
delta = {}
|
||
finish_reason = None
|
||
# 从第一个 chunk 获取 role,后续使用这个 role
|
||
if 'role' in delta and delta['role']:
|
||
role = delta['role']
|
||
|
||
# 获取增量内容
|
||
delta_content = delta.get('content', '')
|
||
reasoning_content = delta.get('reasoning_content', '')
|
||
|
||
# 处理 reasoning_content
|
||
if reasoning_content:
|
||
# accumulated_reasoning += reasoning_content
|
||
# 如果设置了 remove_think,跳过 reasoning_content
|
||
if remove_think:
|
||
chunk_idx += 1
|
||
continue
|
||
|
||
# 第一次出现 reasoning_content,添加 <think> 开始标签
|
||
if not thinking_started:
|
||
thinking_started = True
|
||
delta_content = '<think>\n' + reasoning_content
|
||
else:
|
||
# 继续输出 reasoning_content
|
||
delta_content = reasoning_content
|
||
elif thinking_started and not thinking_ended and delta_content:
|
||
# reasoning_content 结束,normal content 开始,添加 </think> 结束标签
|
||
thinking_ended = True
|
||
delta_content = '\n</think>\n' + delta_content
|
||
|
||
# 处理 content 中已有的 <think> 标签(如果需要移除)
|
||
# if delta_content and remove_think and '<think>' in delta_content:
|
||
# import re
|
||
#
|
||
# # 移除 <think> 标签及其内容
|
||
# delta_content = re.sub(r'<think>.*?</think>', '', delta_content, flags=re.DOTALL)
|
||
|
||
# 处理工具调用增量
|
||
# delta_tool_calls = None
|
||
if delta.get('tool_calls'):
|
||
for tool_call in delta['tool_calls']:
|
||
if tool_call['id'] == '' and tool_id == '':
|
||
tool_id = str(uuid.uuid4())
|
||
if tool_call['function']['name']:
|
||
tool_name = tool_call['function']['name']
|
||
tool_call['id'] = tool_id
|
||
tool_call['function']['name'] = tool_name
|
||
if tool_call['type'] is None:
|
||
tool_call['type'] = 'function'
|
||
|
||
# 跳过空的第一个 chunk(只有 role 没有内容)
|
||
if chunk_idx == 0 and not delta_content and not reasoning_content and not delta.get('tool_calls'):
|
||
chunk_idx += 1
|
||
continue
|
||
# 构建 MessageChunk - 只包含增量内容
|
||
chunk_data = {
|
||
'role': role,
|
||
'content': delta_content if delta_content else None,
|
||
'tool_calls': delta.get('tool_calls'),
|
||
'is_final': bool(finish_reason),
|
||
}
|
||
|
||
# 移除 None 值
|
||
chunk_data = {k: v for k, v in chunk_data.items() if v is not None}
|
||
|
||
yield provider_message.MessageChunk(**chunk_data)
|
||
chunk_idx += 1
|