diff --git a/app/services/grok/services/chat.py b/app/services/grok/services/chat.py index 673cf0708..be671bd41 100644 --- a/app/services/grok/services/chat.py +++ b/app/services/grok/services/chat.py @@ -411,7 +411,7 @@ async def completions( # 跨 Token 重试循环 tried_tokens = set() - max_token_retries = int(get_config("retry.max_retry")) + max_token_retries = int(get_config("retry.max_retry") or 3) last_error = None for attempt in range(max_token_retries): diff --git a/app/services/grok/services/image.py b/app/services/grok/services/image.py index 8072f54b0..b24ee0e2e 100644 --- a/app/services/grok/services/image.py +++ b/app/services/grok/services/image.py @@ -52,7 +52,7 @@ async def generate( enable_nsfw: Optional[bool] = None, chat_format: bool = False, ) -> ImageGenerationResult: - max_token_retries = int(get_config("retry.max_retry")) + max_token_retries = int(get_config("retry.max_retry") or 3) tried_tokens: set[str] = set() last_error: Optional[Exception] = None diff --git a/app/services/grok/services/image_edit.py b/app/services/grok/services/image_edit.py index fe0ad3539..0684a557d 100644 --- a/app/services/grok/services/image_edit.py +++ b/app/services/grok/services/image_edit.py @@ -66,7 +66,7 @@ async def edit( ) images = images[-3:] - max_token_retries = int(get_config("retry.max_retry")) + max_token_retries = int(get_config("retry.max_retry") or 3) tried_tokens: set[str] = set() last_error: Exception | None = None diff --git a/app/static/admin/js/config.js b/app/static/admin/js/config.js index 578a89617..48cd1a8f5 100644 --- a/app/static/admin/js/config.js +++ b/app/static/admin/js/config.js @@ -110,14 +110,6 @@ const LOCALE_MAP = { }, - "superimage": { - "label": "SuperImage 配置", - "n": { title: "生成数量", desc: "仅用于 grok-superimage-1.0 的服务端统一生成数量(1-10)。" }, - "size": { title: "图片尺寸", desc: "仅用于 grok-superimage-1.0 的服务端统一尺寸。" }, - "response_format": { title: "响应格式", desc: "仅用于 grok-superimage-1.0 的服务端统一返回格式。" } - }, - - "asset": { "label": "资产配置", "upload_concurrent": { title: "上传并发", desc: "上传接口的最大并发数。推荐 30。" }, diff --git a/config.defaults.toml b/config.defaults.toml index 753890a2a..61a7aa36d 100644 --- a/config.defaults.toml +++ b/config.defaults.toml @@ -113,17 +113,6 @@ final_min_bytes = 100000 blocked_parallel_attempts = 5 -# ==================== SuperImage 配置 ==================== -[superimage] -# 仅对 grok-superimage-1.0 生效,由服务端统一控制,不使用客户端 image_config -n = 1 -# 图片尺寸:1280x720 / 720x1280 / 1792x1024 / 1024x1792 / 1024x1024 -size = "1024x1024" -# 响应格式:url / b64_json / base64 -response_format = "url" - - - # ==================== SuperImage 配置 ==================== [superimage] # 仅对 grok-superimage-1.0 生效,由服务端统一控制,不使用客户端 image_config