将客户端 system prompt 透传到上游 customPersonality#2
Open
buddhism5080 wants to merge 304 commits intoXianYuDaXian:mainfrom
Open
将客户端 system prompt 透传到上游 customPersonality#2buddhism5080 wants to merge 304 commits intoXianYuDaXian:mainfrom
buddhism5080 wants to merge 304 commits intoXianYuDaXian:mainfrom
Conversation
…-grok-superimage-1.0-pg7sej Add grok-superimage model with server-side image config, improve SSE error handling and transient retry logic
…-grok-superimage-1.0-ql75b8 Add grok-superimage server-side image mode; improve streaming error handling and transient retry logic
…-grok-superimage-1.0-q2pii5 Add grok-superimage support, server-side image config and resilient streaming/error handling
…-grok-superimage-1.0-fxv5c7 Add grok-superimage server-side config, robust SSE streaming errors, transient retry and proxy handling
…-grok-superimage-1.0-63a3ay Add grok-superimage server-side support, robust SSE streaming/errors, and proxy/imagine fixes
…-grok-superimage-1.0-65x674 Add grok-superimage support, safer SSE streaming, image recovery & proxy/ retry improvements
…-grok-superimage-1.0-y2p5rd Add grok-superimage support, robust SSE streaming, image recovery and proxy/ retry fixes
…-grok-superimage-1.0-b6oi4l Support grok-superimage and improve image streaming/retry, SSE error handling, proxy and config safety
…-grok-superimage-1.0-db29lm Add grok-superimage support, streaming/error handling, image recovery, and config/proxy improvements
fix: share SQL engine during startup
fix: 修正账号封禁分类与状态转换，支持webui配置日志等级/轮转配置等
…est-models feat: 新增 auto/fast/expert/heavy 简洁模型，优先使用高等级号池
feat: Enhance proxy clearance management with scheduler and warm-up functionality
…nd adjust status code handling for errors.
fix: Update invalid credentials checks and error status handling
…arance refresh logic
feat: Enhance proxy management with improved failure handling and clearance refresh logic
…to optimize rendering
…to optimize rendering
feat: reduce webui/admin rerenders and cache header metadata
…API-Key header for enhanced compatibility with Anthropic SDK
feat: Update API key verification to support both Bearer token and X-API-Key header for enhanced compatibility with Anthropic SDK
feat: Add KaTeX support for rendering mathematical expressions
… improve SSL context handling in SQL connection
feat: Enhance SQL account repository with serverless support and initialization logic
…_should_retry_upstream function
…credential-retry fix: Fix proxy reload and invalid-credential retries
…date # Conflicts: # app/api/v1/admin_api/config.py # app/core/config.py # app/services/grok/services/image.py # app/services/grok/services/image_edit.py # app/services/grok/utils/download.py # app/services/grok/utils/upload.py # app/static/admin/js/config.js # config.defaults.toml
# Conflicts: # .github/workflows/docker.yml # .gitignore # Dockerfile # app/api/pages/admin.py # app/api/pages/public.py # app/api/v1/admin_api/cache.py # app/api/v1/admin_api/config.py # app/api/v1/admin_api/token.py # app/api/v1/chat.py # app/api/v1/files.py # app/api/v1/image.py # app/api/v1/public_api/__init__.py # app/api/v1/public_api/imagine.py # app/api/v1/public_api/video.py # app/api/v1/public_api/voice.py # app/core/auth.py # app/core/config.py # app/core/exceptions.py # app/core/logger.py # app/core/response_middleware.py # app/core/storage.py # app/services/grok/batch_services/nsfw.py # app/services/grok/batch_services/usage.py # app/services/grok/services/chat.py # app/services/grok/services/image.py # app/services/grok/services/image_edit.py # app/services/grok/services/model.py # app/services/grok/services/video.py # app/services/grok/utils/cache.py # app/services/grok/utils/download.py # app/services/grok/utils/process.py # app/services/grok/utils/retry.py # app/services/grok/utils/upload.py # app/services/reverse/app_chat.py # app/services/reverse/assets_delete.py # app/services/reverse/assets_download.py # app/services/reverse/assets_list.py # app/services/reverse/assets_upload.py # app/services/reverse/media_post.py # app/services/reverse/utils/headers.py # app/services/reverse/utils/retry.py # app/services/reverse/video_upscale.py # app/services/reverse/ws_imagine.py # app/services/reverse/ws_livekit.py # app/services/token/manager.py # app/services/token/models.py # app/services/token/service.py # app/static/admin/css/cache.css # app/static/admin/css/config.css # app/static/admin/css/token.css # app/static/admin/js/cache.js # app/static/admin/js/config.js # app/static/admin/js/token.js # app/static/admin/pages/cache.html # app/static/admin/pages/config.html # app/static/admin/pages/login.html # app/static/admin/pages/token.html # app/static/common/css/common.css # app/static/common/css/login.css # app/static/common/css/toast.css # app/static/common/html/header.html # app/static/common/html/public-header.html # app/static/common/js/admin-auth.js # app/static/common/js/header.js # app/static/common/js/public-header.js # app/static/common/js/toast.js # app/static/public/css/imagine.css # app/static/public/css/video.css # app/static/public/css/voice.css # app/static/public/js/imagine.js # app/static/public/js/login.js # app/static/public/js/video.js # app/static/public/js/voice.js # app/static/public/pages/imagine.html # app/static/public/pages/login.html # app/static/public/pages/video.html # app/static/public/pages/voice.html # config.defaults.toml # docker-compose.yml # docs/README.en.md # main.py # pyproject.toml # readme.md # uv.lock
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
摘要
system消息，并通过上游customPersonality字段透传，不再把system prompt混入messageapp.custom_instruction配置项的上游注入逻辑，并在配置加载/保存时清理旧键，避免与客户端system prompt冲突custom_instruction配置项及对应中英文文案自测
python3 -m py_compile app/services/grok/services/chat.py app/services/reverse/app_chat.py app/core/config.pysystem提取、customPersonality透传、message中不再包含system、旧配置键清理说明
system没有user，会发送空message和非空customPersonality；这是为了保证system prompt不再回流进message🤖 Generated with Claude Code